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

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

Issue 879163002: Hook up window.scrollTo and friends. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@sa
Patch Set: rebase Created 5 years, 11 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/LocalDOMWindow.cpp ('k') | Source/core/rendering/RenderLayerScrollableArea.h » ('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 bddeb9fd968b1cda944875dad7666ca1dd138179..88882211ef5723a545bd12b4d4f8657242f2691a 100644
--- a/Source/core/frame/PinchViewport.cpp
+++ b/Source/core/frame/PinchViewport.cpp
@@ -128,7 +128,7 @@ FloatRect PinchViewport::visibleRectInDocument() const
if (!mainFrame() || !mainFrame()->view())
return FloatRect();
- FloatRect viewRect = mainFrame()->view()->visibleContentRect();
+ FloatRect viewRect = mainFrame()->view()->scrollableArea()->visibleContentRect();
FloatRect pinchRect = visibleRect();
pinchRect.moveBy(viewRect.location());
return pinchRect;
« no previous file with comments | « Source/core/frame/LocalDOMWindow.cpp ('k') | Source/core/rendering/RenderLayerScrollableArea.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698