third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp - Issue 1490063002: Implement Paint Containment

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 1490063002: Implement Paint Containment (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix merge Created 5 years 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 | « third_party/WebKit/Source/core/layout/PaintContainmentTest.cpp ('k') | third_party/WebKit/Source/core/layout/compositing/CompositingInputsUpdater.h » ('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 485f65d7905ca889b7c467aee17743f15ed5529e..54678941fa1419a063ce961d2b2aea487a3d5a3e 100644

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

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

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

static IntRect clipBox(LayoutBox* layoutObject)

{

LayoutRect result = LayoutRect(LayoutRect::infiniteIntRect());

- if (layoutObject->hasOverflowClip())

+ if (layoutObject->hasOverflowClip() || layoutObject->style()->containsPaint())

result = layoutObject->overflowClipRect(LayoutPoint());

if (layoutObject->hasClip())