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

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

Issue 225303014: [Pinch-to-zoom] Moved scale factor into PinchViewport (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed layout test breakage Created 6 years, 8 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/FrameHost.h ('k') | Source/core/frame/FrameView.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/FrameHost.cpp
diff --git a/Source/core/frame/FrameHost.cpp b/Source/core/frame/FrameHost.cpp
index df8617944ee3f865d7d06d7c1eaebe53e44314c4..002bb72ae95fe48dd95599a41ede2cf0f2267dd5 100644
--- a/Source/core/frame/FrameHost.cpp
+++ b/Source/core/frame/FrameHost.cpp
@@ -44,7 +44,7 @@ PassOwnPtr<FrameHost> FrameHost::create(Page& page)
FrameHost::FrameHost(Page& page)
: m_page(page)
- , m_pinchViewport(*this)
+ , m_pinchViewport(adoptPtr(new PinchViewport(*this)))
{
}
@@ -73,9 +73,9 @@ float FrameHost::deviceScaleFactor() const
return m_page.deviceScaleFactor();
}
-PinchViewport& FrameHost::pinchViewport()
+PinchViewport& FrameHost::pinchViewport() const
{
- return m_pinchViewport;
+ return *m_pinchViewport;
}
}
« no previous file with comments | « Source/core/frame/FrameHost.h ('k') | Source/core/frame/FrameView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698