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

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

Issue 643473002: Made top controls work with virtual viewport pinch-to-zoom. (Blink) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed mac breakage (UseMockScrollbars) Created 6 years, 2 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 | « no previous file | Source/core/frame/PinchViewport.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/FrameView.cpp
diff --git a/Source/core/frame/FrameView.cpp b/Source/core/frame/FrameView.cpp
index e87ee438000f7cdccbbd7d5d1b373c83cd69aa19..7d51be2ee2da3dbd8da3d1a36a7ab5b8b0a90dde 100644
--- a/Source/core/frame/FrameView.cpp
+++ b/Source/core/frame/FrameView.cpp
@@ -3082,16 +3082,23 @@ void FrameView::setTopControlsViewportAdjustment(float adjustment)
IntPoint FrameView::maximumScrollPosition() const
{
- FloatSize visibleContentSizeF = unscaledVisibleContentSize(ExcludeScrollbars);
- visibleContentSizeF.expand(0, -m_topControlsViewportAdjustment);
- visibleContentSizeF.scale(1 / visibleContentScaleFactor());
- IntSize visibleSize = expandedIntSize(visibleContentSizeF);
-
- IntPoint maximumOffset(
- contentsWidth() - visibleSize.width() - scrollOrigin().x(),
- contentsHeight() - visibleSize.height() - scrollOrigin().y());
- maximumOffset.clampNegativeToZero();
- return maximumOffset;
+ // Make the same calculation as in CC's LayerImpl::MaxScrollOffset()
+ // FIXME: We probably shouldn't be storing the bounds in a float. crbug.com/422331.
+ FloatSize visibleSize = unscaledVisibleContentSize(ExcludeScrollbars);
+ visibleSize.expand(0, m_topControlsViewportAdjustment);
+
+ FloatSize contentBounds = contentsSize();
+ contentBounds.scale(visibleContentScaleFactor());
+ contentBounds = flooredIntSize(contentBounds);
+
+ FloatSize maximumOffset = contentBounds - visibleSize - toIntSize(scrollOrigin());
+
+ // Convert back to CSS pixels.
+ maximumOffset.scale(1 / visibleContentScaleFactor());
+
+ IntPoint snappedMaximumOffset = flooredIntPoint(maximumOffset);
+ snappedMaximumOffset.clampNegativeToZero();
+ return snappedMaximumOffset;
}
void FrameView::addChild(PassRefPtrWillBeRawPtr<Widget> prpChild)
« no previous file with comments | « no previous file | Source/core/frame/PinchViewport.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698