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

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: Fixing Adam+Shane's feedback. Created 6 years, 6 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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 if (!page) 52 if (!page)
53 return 0; 53 return 0;
54 // FIXME: Can we remove this check? 54 // FIXME: Can we remove this check?
55 if (!page->mainFrame()) 55 if (!page->mainFrame())
56 return 0; 56 return 0;
57 if (!page->mainFrame()->isLocalFrame()) 57 if (!page->mainFrame()->isLocalFrame())
58 return 0; 58 return 0;
59 return page->deprecatedLocalMainFrame()->view(); 59 return page->deprecatedLocalMainFrame()->view();
60 } 60 }
61 61
62 void PageWidgetDelegate::animate(Page* page, double monotonicFrameBeginTime) 62 void PageWidgetDelegate::animate(Page* page, WebFrameTime frameTime)
63 { 63 {
64 RefPtr<FrameView> view = mainFrameView(page); 64 RefPtr<FrameView> view = mainFrameView(page);
65 if (!view) 65 if (!view)
66 return; 66 return;
67 page->autoscrollController().animate(monotonicFrameBeginTime); 67 page->autoscrollController().animate(frameTime);
68 page->animator().serviceScriptedAnimations(monotonicFrameBeginTime); 68 page->animator().serviceScriptedAnimations(frameTime.displayFrameTime);
69 } 69 }
70 70
71 void PageWidgetDelegate::layout(Page* page) 71 void PageWidgetDelegate::layout(Page* page)
72 { 72 {
73 if (!page || !page->mainFrame()) 73 if (!page || !page->mainFrame())
74 return; 74 return;
75 page->animator().updateLayoutAndStyleForPainting(); 75 page->animator().updateLayoutAndStyleForPainting();
76 } 76 }
77 77
78 void PageWidgetDelegate::paint(Page* page, PageOverlayList* overlays, WebCanvas* canvas, const WebRect& rect, CanvasBackground background) 78 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
204 { 204 {
205 return mainFrame.eventHandler().handleWheelEvent(PlatformWheelEventBuilder(m ainFrame.view(), event)); 205 return mainFrame.eventHandler().handleWheelEvent(PlatformWheelEventBuilder(m ainFrame.view(), event));
206 } 206 }
207 207
208 bool PageWidgetEventHandler::handleTouchEvent(LocalFrame& mainFrame, const WebTo uchEvent& event) 208 bool PageWidgetEventHandler::handleTouchEvent(LocalFrame& mainFrame, const WebTo uchEvent& event)
209 { 209 {
210 return mainFrame.eventHandler().handleTouchEvent(PlatformTouchEventBuilder(m ainFrame.view(), event)); 210 return mainFrame.eventHandler().handleTouchEvent(PlatformTouchEventBuilder(m ainFrame.view(), event));
211 } 211 }
212 212
213 } 213 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698