third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp - Issue 2196583002: Paint local background colors onto foreground layer.

Unified Diff: third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp

Issue 2196583002: Paint local background colors onto foreground layer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rename PaintLayerPaintingBackgroundOntoForeground to PaintLayerPaintingRootBackgroundOntoForeground 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/paint/BoxPainter.cpp ('K') | « third_party/WebKit/Source/core/paint/PaintLayer.cpp ('k') | third_party/WebKit/Source/core/paint/PaintLayerPaintingInfo.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp

diff --git a/third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp b/third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp

index 58a6e0af7fa78625423459c75e00e5de63f499e1..62cfb9522e5415d370bb75d48411c80a0bc52ff7 100644

--- a/third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp

+++ b/third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp

@@ -265,6 +265,7 @@ PaintLayerPainter::PaintResult PaintLayerPainter::paintLayerContents(GraphicsCon

bool isPaintingCompositedForeground = paintFlags & PaintLayerPaintingCompositingForegroundPhase;

bool isPaintingCompositedBackground = paintFlags & PaintLayerPaintingCompositingBackgroundPhase;

bool isPaintingOverflowContents = paintFlags & PaintLayerPaintingOverflowContents;

+ bool isPaintingBackgroundOntoForeground = paintFlags & PaintLayerPaintingRootBackgroundOntoForeground;

// Outline always needs to be painted even if we have no visible content. Also,

// the outline is painted in the background phase during composited scrolling.

// If it were painted in the foreground phase, it would move with the scrolled

@@ -381,7 +382,9 @@ PaintLayerPainter::PaintResult PaintLayerPainter::paintLayerContents(GraphicsCon

scopedPaintChunkProperties.emplace(context.getPaintController(), m_paintLayer, properties);

}

- bool shouldPaintBackground = isPaintingCompositedBackground && shouldPaintContent && !selectionOnly;

+ bool shouldPaintBackground = shouldPaintContent && !selectionOnly

+ && ((isPaintingBackgroundOntoForeground && isPaintingCompositedForeground)

+ || isPaintingCompositedBackground);

bool shouldPaintNegZOrderList = (isPaintingScrollingContent && isPaintingOverflowContents) || (!isPaintingScrollingContent && isPaintingCompositedBackground);

bool shouldPaintOwnContents = isPaintingCompositedForeground && shouldPaintContent;

bool shouldPaintNormalFlowAndPosZOrderLists = isPaintingCompositedForeground;

@@ -746,7 +749,7 @@ void PaintLayerPainter::paintForegroundForFragments(const PaintLayerFragments& l

paintForegroundForFragmentsWithPhase(PaintPhaseSelection, layerFragments, context, localPaintingInfo, paintFlags, clipState);

} else {

if (!RuntimeEnabledFeatures::paintOptimizationsEnabled() || m_paintLayer.needsPaintPhaseDescendantBlockBackgrounds())

- paintForegroundForFragmentsWithPhase(PaintPhaseDescendantBlockBackgroundsOnly, layerFragments, context, localPaintingInfo, paintFlags, clipState);

+ paintForegroundForFragmentsWithPhase(PaintPhaseDescendantBlockBackgroundsOnly, layerFragments, context, localPaintingInfo, paintFlags & ~PaintLayerPaintingRootBackgroundOntoForeground, clipState);

if (!RuntimeEnabledFeatures::paintOptimizationsEnabled() || m_paintLayer.needsPaintPhaseFloat())

paintForegroundForFragmentsWithPhase(PaintPhaseFloat, layerFragments, context, localPaintingInfo, paintFlags, clipState);

paintForegroundForFragmentsWithPhase(PaintPhaseForeground, layerFragments, context, localPaintingInfo, paintFlags, clipState);