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

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

Issue 517043003: Move Frame to the Oilpan heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Update OilpanExpectations Created 6 years, 3 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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
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); 64 WTF_LOG(ScriptedAnimationController, "PageWidgetDelegate::animate: view = %d ", !view ? 0 : 1);
65 if (!view) 65 if (!view)
66 return; 66 return;
67
67 page->autoscrollController().animate(monotonicFrameBeginTime); 68 page->autoscrollController().animate(monotonicFrameBeginTime);
68 page->animator().serviceScriptedAnimations(monotonicFrameBeginTime); 69 page->animator().serviceScriptedAnimations(monotonicFrameBeginTime);
69 } 70 }
70 71
71 void PageWidgetDelegate::layout(Page* page, LocalFrame* rootFrame) 72 void PageWidgetDelegate::layout(Page* page, LocalFrame* rootFrame)
72 { 73 {
73 if (!page) 74 if (!page)
74 return; 75 return;
75 76
76 if (!rootFrame) { 77 if (!rootFrame) {
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 { 213 {
213 return mainFrame.eventHandler().handleWheelEvent(PlatformWheelEventBuilder(m ainFrame.view(), event)); 214 return mainFrame.eventHandler().handleWheelEvent(PlatformWheelEventBuilder(m ainFrame.view(), event));
214 } 215 }
215 216
216 bool PageWidgetEventHandler::handleTouchEvent(LocalFrame& mainFrame, const WebTo uchEvent& event) 217 bool PageWidgetEventHandler::handleTouchEvent(LocalFrame& mainFrame, const WebTo uchEvent& event)
217 { 218 {
218 return mainFrame.eventHandler().handleTouchEvent(PlatformTouchEventBuilder(m ainFrame.view(), event)); 219 return mainFrame.eventHandler().handleTouchEvent(PlatformTouchEventBuilder(m ainFrame.view(), event));
219 } 220 }
220 221
221 } // namespace blink 222 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698