Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(129)

Side by Side Diff: Source/web/PageWidgetDelegate.cpp

Issue 321373003: Changing animate to beginFrame and use struct rather than naked double to allow extension. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebasing onto master. Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 if (!page) 53 if (!page)
54 return 0; 54 return 0;
55 // FIXME: Can we remove this check? 55 // FIXME: Can we remove this check?
56 if (!page->mainFrame()) 56 if (!page->mainFrame())
57 return 0; 57 return 0;
58 if (!page->mainFrame()->isLocalFrame()) 58 if (!page->mainFrame()->isLocalFrame())
59 return 0; 59 return 0;
60 return page->deprecatedLocalMainFrame()->view(); 60 return page->deprecatedLocalMainFrame()->view();
61 } 61 }
62 62
63 void PageWidgetDelegate::animate(Page* page, double monotonicFrameBeginTime) 63 void PageWidgetDelegate::animate(Page* page, WebFrameTime frameTime)
64 { 64 {
65 RefPtr<FrameView> view = mainFrameView(page); 65 RefPtr<FrameView> view = mainFrameView(page);
66 if (!view) 66 if (!view)
67 return; 67 return;
68 page->autoscrollController().animate(monotonicFrameBeginTime); 68 page->autoscrollController().animate(frameTime);
69 page->animator().serviceScriptedAnimations(monotonicFrameBeginTime); 69 page->animator().serviceScriptedAnimations(frameTime.displayFrameTime);
70 } 70 }
71 71
72 void PageWidgetDelegate::layout(Page* page) 72 void PageWidgetDelegate::layout(Page* page)
73 { 73 {
74 if (!page || !page->mainFrame()) 74 if (!page || !page->mainFrame())
75 return; 75 return;
76 page->animator().updateLayoutAndStyleForPainting(); 76 page->animator().updateLayoutAndStyleForPainting();
77 } 77 }
78 78
79 void PageWidgetDelegate::paint(Page* page, PageOverlayList* overlays, WebCanvas* canvas, const WebRect& rect, CanvasBackground background) 79 void PageWidgetDelegate::paint(Page* page, PageOverlayList* overlays, WebCanvas* canvas, const WebRect& rect, CanvasBackground background)
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 { 205 {
206 return mainFrame.eventHandler().handleWheelEvent(PlatformWheelEventBuilder(m ainFrame.view(), event)); 206 return mainFrame.eventHandler().handleWheelEvent(PlatformWheelEventBuilder(m ainFrame.view(), event));
207 } 207 }
208 208
209 bool PageWidgetEventHandler::handleTouchEvent(LocalFrame& mainFrame, const WebTo uchEvent& event) 209 bool PageWidgetEventHandler::handleTouchEvent(LocalFrame& mainFrame, const WebTo uchEvent& event)
210 { 210 {
211 return mainFrame.eventHandler().handleTouchEvent(PlatformTouchEventBuilder(m ainFrame.view(), event)); 211 return mainFrame.eventHandler().handleTouchEvent(PlatformTouchEventBuilder(m ainFrame.view(), event));
212 } 212 }
213 213
214 } 214 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698