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

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side 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:

View unified diff | Download patch

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "core/paint/ObjectPainter.h"	5 #include "core/paint/ObjectPainter.h"

6	6

7 #include "core/layout/LayoutBlock.h"	7 #include "core/layout/LayoutBlock.h"

8 #include "core/layout/LayoutInline.h"	8 #include "core/layout/LayoutInline.h"

9 #include "core/layout/LayoutObject.h"	9 #include "core/layout/LayoutObject.h"

10 #include "core/layout/LayoutTheme.h"	10 #include "core/layout/LayoutTheme.h"

(...skipping 689 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
700 DCHECK(RuntimeEnabledFeatures::slimmingPaintV2Enabled());	700 DCHECK(RuntimeEnabledFeatures::slimmingPaintV2Enabled());

701	701

702 // TODO(pdr): Let painter and paint property tree builder generate the same	702 // TODO(pdr): Let painter and paint property tree builder generate the same

703 // paint offset for LayoutScrollbarPart. crbug.com/664249.	703 // paint offset for LayoutScrollbarPart. crbug.com/664249.

704 if (m_layoutObject.isLayoutScrollbarPart())	704 if (m_layoutObject.isLayoutScrollbarPart())

705 return;	705 return;

706	706

707 LayoutPoint adjustedPaintOffset = paintOffset;	707 LayoutPoint adjustedPaintOffset = paintOffset;

708 if (m_layoutObject.isBox())	708 if (m_layoutObject.isBox())

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

710 DCHECK(m_layoutObject.previousPaintOffset() == adjustedPaintOffset)	710 DCHECK(m_layoutObject.paintOffset() == adjustedPaintOffset)

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

712 << " from PaintPropertyTreeBuilder: "	712 << " from PaintPropertyTreeBuilder: "

713 << m_layoutObject.previousPaintOffset().toString()	713 << m_layoutObject.paintOffset().toString()

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

715 }	715 }

716 #endif	716 #endif

717	717

718 } // namespace blink	718 } // namespace blink

OLD	NEW