third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp - 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/LayoutBlockFlow.cpp

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/Source/core/layout/FloatingObjects.cpp ('k') | third_party/WebKit/Source/core/paint/BlockFlowPainter.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 8872d9016e7e66048e593dad232b9c7db6ef8038..7148dcf83b9c7158784d0508ce8366d8c2697208 100644

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

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

@@ -3303,7 +3303,7 @@ bool LayoutBlockFlow::hitTestFloats(HitTestResult& result, const HitTestLocation

for (FloatingObjectSetIterator it = floatingObjectSet.end(); it != begin;) {

--it;

const FloatingObject& floatingObject = *it->get();

- if (floatingObject.shouldPaint()) {

+ if (floatingObject.shouldPaint() && !floatingObject.layoutObject()->hasSelfPaintingLayer()) {

LayoutUnit xOffset = xPositionForFloatIncludingMargin(floatingObject) - floatingObject.layoutObject()->location().x();

LayoutUnit yOffset = yPositionForFloatIncludingMargin(floatingObject) - floatingObject.layoutObject()->location().y();

LayoutPoint childPoint = flipFloatForWritingModeForChild(floatingObject, adjustedLocation + LayoutSize(xOffset, yOffset));