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

Unified Diff: Source/core/page/Frame.cpp

Issue 23728003: Return Frame&, not Frame* from RenderView::frame() (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fixed PopupMenuTest build Created 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/page/EventHandler.cpp ('k') | Source/core/page/FrameView.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/page/Frame.cpp
diff --git a/Source/core/page/Frame.cpp b/Source/core/page/Frame.cpp
index 217a5fd9e3bcac298c43158177a11d950eb042ce..ebd3167f25b401af5be08fb2bcf2e5f076d4ab21 100644
--- a/Source/core/page/Frame.cpp
+++ b/Source/core/page/Frame.cpp
@@ -311,18 +311,16 @@ Frame* Frame::frameForWidget(const Widget* widget)
// Assume all widgets are either a FrameView or owned by a RenderWidget.
// FIXME: That assumption is not right for scroll bars!
ASSERT_WITH_SECURITY_IMPLICATION(widget->isFrameView());
- return toFrameView(widget)->frame();
+ return &toFrameView(widget)->frame();
}
void Frame::clearTimers(FrameView *view, Document *document)
{
if (view) {
view->unscheduleRelayout();
- if (view->frame()) {
- if (!RuntimeEnabledFeatures::webAnimationsCSSEnabled())
- view->frame()->animation()->suspendAnimationsForDocument(document);
- view->frame()->eventHandler()->stopAutoscrollTimer();
- }
+ if (!RuntimeEnabledFeatures::webAnimationsCSSEnabled())
+ view->frame().animation()->suspendAnimationsForDocument(document);
+ view->frame().eventHandler()->stopAutoscrollTimer();
}
}
« no previous file with comments | « Source/core/page/EventHandler.cpp ('k') | Source/core/page/FrameView.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698