third_party/WebKit/Source/core/layout/LayoutObject.cpp - Issue 2014093002: Fix LayoutObject::paintingLayer() about multicol spanner

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/LayoutObject.cpp

Issue 2014093002: Fix LayoutObject::paintingLayer() about multicol spanner (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 7 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

Index: third_party/WebKit/Source/core/layout/LayoutObject.cpp

diff --git a/third_party/WebKit/Source/core/layout/LayoutObject.cpp b/third_party/WebKit/Source/core/layout/LayoutObject.cpp

index 1b5a5a6eebe7e370286f4b30fdfc014dbb480643..3dbd08ba1b38c814c6e685d48b34c51f1e388934 100644

--- a/third_party/WebKit/Source/core/layout/LayoutObject.cpp

+++ b/third_party/WebKit/Source/core/layout/LayoutObject.cpp

@@ -628,8 +628,8 @@ PaintLayer* LayoutObject::enclosingLayer() const

PaintLayer* LayoutObject::paintingLayer() const

{

for (const LayoutObject* current = this; current; current = current->isColumnSpanAll() ? current->containingBlock() : current->parent()) {

- if (current->hasLayer())

- return toLayoutBoxModelObject(current)->layer()->enclosingSelfPaintingLayer();

+ if (current->hasLayer() && toLayoutBoxModelObject(current)->layer()->isSelfPaintingLayer())

+ return toLayoutBoxModelObject(current)->layer();

}

return nullptr;

}

« no previous file with comments | « no previous file | third_party/WebKit/Source/core/layout/LayoutObjectTest.cpp » ('j') | no next file with comments »