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

Unified Diff: Source/core/page/scrolling/ScrollingCoordinator.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/FrameView.cpp ('k') | Source/core/platform/Scrollbar.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/page/scrolling/ScrollingCoordinator.cpp
diff --git a/Source/core/page/scrolling/ScrollingCoordinator.cpp b/Source/core/page/scrolling/ScrollingCoordinator.cpp
index 5a05988ff8b2e3a5ea30d28366f6cd2ff68b07b7..68a4ddd5b6043e67311961ce598f018fdc64ee0a 100644
--- a/Source/core/page/scrolling/ScrollingCoordinator.cpp
+++ b/Source/core/page/scrolling/ScrollingCoordinator.cpp
@@ -526,7 +526,7 @@ bool ScrollingCoordinator::coordinatesScrollingForFrameView(FrameView* frameView
ASSERT(m_page);
// We currently only handle the main frame.
- if (frameView->frame() != m_page->mainFrame())
+ if (&frameView->frame() != m_page->mainFrame())
return false;
// We currently only support composited mode.
@@ -711,7 +711,7 @@ bool ScrollingCoordinator::isForMainFrame(ScrollableArea* scrollableArea) const
GraphicsLayer* ScrollingCoordinator::scrollLayerForFrameView(FrameView* frameView)
{
- RenderView* renderView = frameView->frame()->contentRenderer();
+ RenderView* renderView = frameView->frame().contentRenderer();
if (!renderView)
return 0;
return renderView->compositor()->scrollLayer();
« no previous file with comments | « Source/core/page/FrameView.cpp ('k') | Source/core/platform/Scrollbar.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698