Source/core/rendering/compositing/CompositedLayerMapping.cpp - Issue 486493002: Merge AcceleratedCompositingForOverflowScroll into PreferCompositingToLCDText.

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/rendering/compositing/CompositedLayerMapping.cpp

Issue 486493002: Merge AcceleratedCompositingForOverflowScroll into PreferCompositingToLCDText. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: rm-overflowscroll: imagefailure Created 6 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/rendering/RenderLayerScrollableArea.cpp ('k') | Source/core/rendering/compositing/CompositingReasonFinder.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/rendering/compositing/CompositedLayerMapping.cpp

diff --git a/Source/core/rendering/compositing/CompositedLayerMapping.cpp b/Source/core/rendering/compositing/CompositedLayerMapping.cpp

index a65bbddaf9cd0a7c61f1dba1c3fffb1a1b27c91e..1924a3268a64f8c9bdbe32b0526ef477db51102e 100644

--- a/Source/core/rendering/compositing/CompositedLayerMapping.cpp

+++ b/Source/core/rendering/compositing/CompositedLayerMapping.cpp

@@ -369,7 +369,7 @@ bool CompositedLayerMapping::updateGraphicsLayerConfiguration()

if (m_owningLayer.needsCompositedScrolling())

needsDescendantsClippingLayer = false;

- RenderLayer* scrollParent = compositor->acceleratedCompositingForOverflowScrollEnabled() ? m_owningLayer.scrollParent() : 0;

+ RenderLayer* scrollParent = compositor->preferCompositingToLCDTextEnabled() ? m_owningLayer.scrollParent() : 0;

// This is required because compositing layers are parented

// according to the z-order hierarchy, yet clipping goes down the renderer hierarchy.

@@ -671,7 +671,7 @@ void CompositedLayerMapping::updateGraphicsLayerGeometry(const RenderLayer* comp

updateRenderingContext();

updateShouldFlattenTransform();

updateChildrenTransform();

- updateScrollParent(compositor()->acceleratedCompositingForOverflowScrollEnabled() ? m_owningLayer.scrollParent() : 0);

+ updateScrollParent(compositor()->preferCompositingToLCDTextEnabled() ? m_owningLayer.scrollParent() : 0);

registerScrollingLayers();

updateCompositingReasons();