| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 if (!page) | 54 if (!page) |
| 55 return 0; | 55 return 0; |
| 56 if (!page->mainFrame()->isLocalFrame()) | 56 if (!page->mainFrame()->isLocalFrame()) |
| 57 return 0; | 57 return 0; |
| 58 return toLocalFrame(page->mainFrame())->view(); | 58 return toLocalFrame(page->mainFrame())->view(); |
| 59 } | 59 } |
| 60 | 60 |
| 61 void PageWidgetDelegate::animate(Page* page, double monotonicFrameBeginTime, Loc
alFrame* rootFrame) | 61 void PageWidgetDelegate::animate(Page* page, double monotonicFrameBeginTime, Loc
alFrame* rootFrame) |
| 62 { | 62 { |
| 63 RefPtr<FrameView> view = rootFrameView(page, rootFrame); | 63 RefPtr<FrameView> view = rootFrameView(page, rootFrame); |
| 64 WTF_LOG(ScriptedAnimationController, "PageWidgetDelegate::animate: view = %d
", !view ? 0 : 1); | |
| 65 if (!view) | 64 if (!view) |
| 66 return; | 65 return; |
| 67 page->autoscrollController().animate(monotonicFrameBeginTime); | 66 page->autoscrollController().animate(monotonicFrameBeginTime); |
| 68 page->animator().serviceScriptedAnimations(monotonicFrameBeginTime); | 67 page->animator().serviceScriptedAnimations(monotonicFrameBeginTime); |
| 69 } | 68 } |
| 70 | 69 |
| 71 void PageWidgetDelegate::layout(Page* page, LocalFrame* rootFrame) | 70 void PageWidgetDelegate::layout(Page* page, LocalFrame* rootFrame) |
| 72 { | 71 { |
| 73 if (!page) | 72 if (!page) |
| 74 return; | 73 return; |
| (...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 212 { | 211 { |
| 213 return mainFrame.eventHandler().handleWheelEvent(PlatformWheelEventBuilder(m
ainFrame.view(), event)); | 212 return mainFrame.eventHandler().handleWheelEvent(PlatformWheelEventBuilder(m
ainFrame.view(), event)); |
| 214 } | 213 } |
| 215 | 214 |
| 216 bool PageWidgetEventHandler::handleTouchEvent(LocalFrame& mainFrame, const WebTo
uchEvent& event) | 215 bool PageWidgetEventHandler::handleTouchEvent(LocalFrame& mainFrame, const WebTo
uchEvent& event) |
| 217 { | 216 { |
| 218 return mainFrame.eventHandler().handleTouchEvent(PlatformTouchEventBuilder(m
ainFrame.view(), event)); | 217 return mainFrame.eventHandler().handleTouchEvent(PlatformTouchEventBuilder(m
ainFrame.view(), event)); |
| 219 } | 218 } |
| 220 | 219 |
| 221 } // namespace blink | 220 } // namespace blink |
| OLD | NEW |