Source/core/paint/BoxClipper.cpp - Issue 1284203004: Generate scroll/clip display item hierarchy for SPv2

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/paint/BoxClipper.cpp

Issue 1284203004: Generate scroll/clip display item hierarchy for SPv2 (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: stripped localPaintingInfo cleanup and fixed-pos workarounds Created 5 years, 3 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

« Source/core/layout/compositing/CompositedDeprecatedPaintLayerMapping.cpp ('K') | « Source/core/layout/compositing/CompositedDeprecatedPaintLayerMapping.cpp ('k') | Source/core/paint/DeprecatedPaintLayer.h » ('j') | Source/core/paint/DeprecatedPaintLayer.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/paint/BoxClipper.cpp

diff --git a/Source/core/paint/BoxClipper.cpp b/Source/core/paint/BoxClipper.cpp

index f1d83cc246d23b0c02a73768ba4c4c153728c1a8..591bf743153dd2c409cb549c9bb09b0090835cbb 100644

--- a/Source/core/paint/BoxClipper.cpp

+++ b/Source/core/paint/BoxClipper.cpp

@@ -24,7 +24,7 @@ BoxClipper::BoxClipper(const LayoutBox& box, const PaintInfo& paintInfo, const L

return;

bool isControlClip = m_box.hasControlClip();

- bool isOverflowClip = m_box.hasOverflowClip() && !m_box.layer()->isSelfPaintingLayer();

+ bool isOverflowClip = m_box.hasOverflowClip() && (!m_box.layer()->isSelfPaintingLayer() || RuntimeEnabledFeatures::slimmingPaintV2Enabled());

chrishtr 2015/09/17 18:07:53 Why this change?

if (!isControlClip && !isOverflowClip)

return;

@@ -35,7 +35,7 @@ BoxClipper::BoxClipper(const LayoutBox& box, const PaintInfo& paintInfo, const L

if (hasBorderRadius)

clipRoundedRect = m_box.style()->getRoundedInnerBorderFor(LayoutRect(accumulatedOffset, m_box.size()));

- if (contentsClipBehavior == SkipContentsClipIfPossible) {

+ if (contentsClipBehavior == SkipContentsClipIfPossible && !RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {

chrishtr 2015/09/17 18:07:53 Is this change because we want to preserve clips i

LayoutRect contentsVisualOverflow = m_box.contentsVisualOverflowRect();

if (contentsVisualOverflow.isEmpty())

return;

@@ -65,7 +65,7 @@ BoxClipper::~BoxClipper()

if (m_clipType == DisplayItem::UninitializedType)

return;

- ASSERT(m_box.hasControlClip() || (m_box.hasOverflowClip() && !m_box.layer()->isSelfPaintingLayer()));

+ ASSERT(m_box.hasControlClip() || (m_box.hasOverflowClip() && (!m_box.layer()->isSelfPaintingLayer() || RuntimeEnabledFeatures::slimmingPaintV2Enabled())));

ASSERT(m_paintInfo.context->displayItemList());

if (!m_paintInfo.context->displayItemList()->displayItemConstructionIsDisabled()) {

if (m_paintInfo.context->displayItemList()->lastDisplayItemIsNoopBegin())