third_party/WebKit/Source/core/paint/ObjectPainter.cpp - Issue 2614093002: Combine LayoutObject::previousPaintOffset and paintOffset in paint properties

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

Issue 2614093002: Combine LayoutObject::previousPaintOffset and paintOffset in paint properties (Closed)

Patch Set: Resolve conflict Created 3 years, 11 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:

Index: third_party/WebKit/Source/core/paint/ObjectPainter.cpp

diff --git a/third_party/WebKit/Source/core/paint/ObjectPainter.cpp b/third_party/WebKit/Source/core/paint/ObjectPainter.cpp

index eb6ddfcc3de5c31d23949ae00d2d73a0342fea5c..f716d17045d1717f67da7ce04baf944aa4574870 100644

--- a/third_party/WebKit/Source/core/paint/ObjectPainter.cpp

+++ b/third_party/WebKit/Source/core/paint/ObjectPainter.cpp

@@ -707,10 +707,10 @@ void ObjectPainter::doCheckPaintOffset(const PaintInfo& paintInfo,

LayoutPoint adjustedPaintOffset = paintOffset;

if (m_layoutObject.isBox())

adjustedPaintOffset += toLayoutBox(m_layoutObject).location();

- DCHECK(m_layoutObject.previousPaintOffset() == adjustedPaintOffset)

+ DCHECK(m_layoutObject.paintOffset() == adjustedPaintOffset)

<< " Paint offset mismatch: " << m_layoutObject.debugName()

<< " from PaintPropertyTreeBuilder: "

- << m_layoutObject.previousPaintOffset().toString()

+ << m_layoutObject.paintOffset().toString()

<< " from painter: " << adjustedPaintOffset.toString();

}

#endif