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

Unified Diff: Source/core/rendering/RenderBox.cpp

Issue 853103003: Fix drag-and-drop autoscrolling with --enable-pinch-virtual-viewport (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 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
« Source/core/frame/PinchViewport.cpp ('K') | « Source/core/frame/PinchViewport.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderBox.cpp
diff --git a/Source/core/rendering/RenderBox.cpp b/Source/core/rendering/RenderBox.cpp
index b754afafc1e32a275d56dd9bde21cf3e70306770..a6930a24d14f493f66fa0e4df28499c8dadea426 100644
--- a/Source/core/rendering/RenderBox.cpp
+++ b/Source/core/rendering/RenderBox.cpp
@@ -526,7 +526,9 @@ void RenderBox::scrollRectToVisible(const LayoutRect& rect, const ScrollAlignmen
} else {
if (frame()->settings()->pinchVirtualViewportEnabled()) {
PinchViewport& pinchViewport = frame()->page()->frameHost().pinchViewport();
- LayoutRect r = ScrollAlignment::getRectToExpose(LayoutRect(pinchViewport.visibleRectInDocument()), rect, alignX, alignY);
+ LayoutRect viewRect = intersection(
+ LayoutRect(pinchViewport.visibleRectInDocument()), frameView->visibleContentRect());
+ LayoutRect r = ScrollAlignment::getRectToExpose(viewRect, rect, alignX, alignY);
pinchViewport.scrollIntoView(r);
} else {
LayoutRect viewRect = frameView->visibleContentRect();
« Source/core/frame/PinchViewport.cpp ('K') | « Source/core/frame/PinchViewport.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698