third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp - Issue 2258523006: Convert Settings::rootLayerScrolls to RuntimeEnabledFeatures

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: third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp

Issue 2258523006: Convert Settings::rootLayerScrolls to RuntimeEnabledFeatures (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 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

« third_party/WebKit/Source/core/frame/FrameViewTest.cpp ('K') | « third_party/WebKit/Source/core/layout/PaintInvalidationState.cpp ('k') | third_party/WebKit/Source/core/layout/compositing/CompositedLayerMappingTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp

diff --git a/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp b/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp

index 6248097b19031e13208183b785a026fa7d0538de..5dd7d087f91bf94e72e07e33688bfc268dd51de9 100644

--- a/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp

+++ b/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp

@@ -1553,13 +1553,10 @@ void CompositedLayerMapping::updateElementIdAndCompositorMutableProperties()

if (owningNode) {

Document& document = owningNode->document();

Element* scrollingElement = document.scrollingElement();

- LocalFrame* frame = document.frame();

- Settings* settings = frame ? frame->settings() : nullptr;

- bool rootLayerScrolls = settings && settings->rootLayerScrolls();

- if (owningNode->isElementNode() && (!rootLayerScrolls || owningNode != scrollingElement)) {

+ if (owningNode->isElementNode() && (!RuntimeEnabledFeatures::rootLayerScrollingEnabled() || owningNode != scrollingElement)) {

animatingElement = toElement(owningNode);

animatingStyle = m_owningLayer.layoutObject()->style();

- } else if (owningNode->isDocumentNode() && rootLayerScrolls) {

+ } else if (owningNode->isDocumentNode() && RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {

owningNode = animatingElement = scrollingElement;

if (scrollingElement)

animatingStyle = scrollingElement->layoutObject()->style();