Source/core/layout/compositing/DeprecatedPaintLayerCompositor.cpp - Issue 1318603005: Revert of Replace pinch scrollbars with regular scrollbars.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/core/layout/compositing/DeprecatedPaintLayerCompositor.cpp

Issue 1318603005: Revert of Replace pinch scrollbars with regular scrollbars. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 5 years, 4 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/layout/compositing/CompositedDeprecatedPaintLayerMapping.cpp ('k') | Source/core/page/scrolling/ScrollingCoordinator.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/layout/compositing/DeprecatedPaintLayerCompositor.cpp

diff --git a/Source/core/layout/compositing/DeprecatedPaintLayerCompositor.cpp b/Source/core/layout/compositing/DeprecatedPaintLayerCompositor.cpp

index 0758e5f999cbdd82c45d3a0eee9c16c83beb3b02..1f1e46a5bdcb9954b087fab11b4e5bc039c923d7 100644

--- a/Source/core/layout/compositing/DeprecatedPaintLayerCompositor.cpp

+++ b/Source/core/layout/compositing/DeprecatedPaintLayerCompositor.cpp

@@ -907,12 +907,14 @@

void DeprecatedPaintLayerCompositor::updateOverflowControlsLayers()

{

GraphicsLayer* controlsParent = m_rootTransformLayer.get() ? m_rootTransformLayer.get() : m_overflowControlsHostLayer.get();

- // Main frame scrollbars should always be stuck to the sides of the screen (in overscroll and in pinch-zoom), so

+ // On Mac, main frame scrollbars should always be stuck to the sides of the screen (in overscroll and in pinch-zoom), so

// make the parent for the scrollbars be the viewport container layer.

+#if OS(MACOSX)

if (m_layoutView.frame()->isMainFrame()) {

VisualViewport& visualViewport = m_layoutView.frameView()->page()->frameHost().visualViewport();

controlsParent = visualViewport.containerLayer();

}

+#endif

if (requiresHorizontalScrollbarLayer()) {

if (!m_layerForHorizontalScrollbar) {