third_party/WebKit/Source/core/layout/FloatingObjects.h - Issue 2164813002: Revert "Add a hack to set shouldPaint to true for force-composited iframes."

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/FloatingObjects.h

Issue 2164813002: Revert "Add a hack to set shouldPaint to true for force-composited iframes." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 5 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 | « third_party/WebKit/LayoutTests/compositing/iframes/floating-self-painting-frame-expected.html ('k') | third_party/WebKit/Source/core/layout/FloatingObjects.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/layout/FloatingObjects.h

diff --git a/third_party/WebKit/Source/core/layout/FloatingObjects.h b/third_party/WebKit/Source/core/layout/FloatingObjects.h

index a43103515bb0559d2d8e009fa5aa3770106ae017..71ae474e57872005d11cac85f8f859a6a5e822ac 100644

--- a/third_party/WebKit/Source/core/layout/FloatingObjects.h

+++ b/third_party/WebKit/Source/core/layout/FloatingObjects.h

@@ -78,7 +78,7 @@ public:

void setIsInPlacedTree(bool value) { m_isInPlacedTree = value; }

#endif

- bool shouldPaint() const;

+ bool shouldPaint() const { return m_shouldPaint; }

void setShouldPaint(bool shouldPaint) { m_shouldPaint = shouldPaint; }

bool isDescendant() const { return m_isDescendant; }

void setIsDescendant(bool isDescendant) { m_isDescendant = isDescendant; }

@@ -93,8 +93,6 @@ private:

explicit FloatingObject(LayoutBox*);

FloatingObject(LayoutBox*, Type, const LayoutRect&, bool shouldPaint, bool isDescendant, bool isLowestNonOverhangingFloatInChild, bool performingUnsafeClone = false);

- bool shouldPaintForCompositedLayoutPart();

LayoutBox* m_layoutObject;

RootInlineBox* m_originatingLine;

LayoutRect m_frameRect;