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

Unified Diff: Source/core/frame/PinchViewport.cpp

Issue 336553003: Change Page::m_mainFrame to be a Frame. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/frame/FrameView.cpp ('k') | Source/core/inspector/InspectorDOMAgent.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/PinchViewport.cpp
diff --git a/Source/core/frame/PinchViewport.cpp b/Source/core/frame/PinchViewport.cpp
index 7f4c53750af671437b62b0c609daa6250b9de812..09947a9b41d18b64067f9b2c28efd9dfe30be44e 100644
--- a/Source/core/frame/PinchViewport.cpp
+++ b/Source/core/frame/PinchViewport.cpp
@@ -313,9 +313,10 @@ void PinchViewport::registerLayersWithTreeView(WebLayerTreeView* layerTreeView)
TRACE_EVENT0("webkit", "PinchViewport::registerLayersWithTreeView");
ASSERT(layerTreeView);
ASSERT(m_frameHost.page().mainFrame());
- ASSERT(m_frameHost.page().mainFrame()->contentRenderer());
+ ASSERT(m_frameHost.page().mainFrame()->isLocalFrame());
+ ASSERT(m_frameHost.page().deprecatedLocalMainFrame()->contentRenderer());
- RenderLayerCompositor* compositor = m_frameHost.page().mainFrame()->contentRenderer()->compositor();
+ RenderLayerCompositor* compositor = m_frameHost.page().deprecatedLocalMainFrame()->contentRenderer()->compositor();
// Get the outer viewport scroll layer.
WebLayer* scrollLayer = compositor->scrollLayer()->platformLayer();
@@ -418,7 +419,7 @@ void PinchViewport::paintContents(const GraphicsLayer*, GraphicsContext&, Graphi
LocalFrame* PinchViewport::mainFrame() const
{
- return m_frameHost.page().mainFrame();
+ return m_frameHost.page().mainFrame() && m_frameHost.page().mainFrame()->isLocalFrame() ? m_frameHost.page().deprecatedLocalMainFrame() : 0;
}
FloatPoint PinchViewport::clampOffsetToBoundaries(const FloatPoint& offset)
« no previous file with comments | « Source/core/frame/FrameView.cpp ('k') | Source/core/inspector/InspectorDOMAgent.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698