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 99a217ea891822244bcdcb4c8ef4925719edf1da..80d05ff5d5c79da844f4cc5533d06d47412cde10 100644 |
--- a/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp |
+++ b/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp |
@@ -1556,13 +1556,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(); |