third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp - Issue 2701993002: DO NOT COMMIT: Results of running new (proposed) clang-format on Blink

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

Issue 2701993002: DO NOT COMMIT: Results of running new (proposed) clang-format on Blink (Closed)

Patch Set: Created 3 years, 10 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/paint/PaintLayer.cpp ('k') | third_party/WebKit/Source/core/paint/PaintLayerPainterTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index d7d7cdb1ae7e1d8fa87a293786686914c7cb5244..45976a49430ea4bbca8d68c0a538da5d6aebc08a 100644

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

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

@@ -371,8 +371,9 @@ PaintResult PaintLayerPainter::paintLayerContents(

// scrolling contents and scrollbars.

if (m_paintLayer.layoutObject()->hasClipPath() &&

(!m_paintLayer.needsCompositedScrolling() ||

- (paintFlags & (PaintLayerPaintingChildClippingMaskPhase |

- PaintLayerPaintingAncestorClippingMaskPhase)))) {

+ (paintFlags &

+ (PaintLayerPaintingChildClippingMaskPhase |

+ PaintLayerPaintingAncestorClippingMaskPhase)))) {

paintingInfo.ancestorHasClipPathClipping = true;

LayoutRect referenceBox(m_paintLayer.boxForClipPath());

@@ -579,8 +580,9 @@ PaintResult PaintLayerPainter::paintLayerContents(

shouldPaintContent && m_paintLayer.layoutObject()->hasMask() &&

!selectionOnly;

bool shouldPaintClippingMask =

- (paintFlags & (PaintLayerPaintingChildClippingMaskPhase |

- PaintLayerPaintingAncestorClippingMaskPhase)) &&

+ (paintFlags &

+ (PaintLayerPaintingChildClippingMaskPhase |

+ PaintLayerPaintingAncestorClippingMaskPhase)) &&

shouldPaintContent && !selectionOnly;

if (shouldPaintMask) {

@@ -813,8 +815,9 @@ PaintResult PaintLayerPainter::paintFragmentByApplyingTransform(

// Now do a paint with the root layer shifted to be us.

PaintLayerPaintingInfo transformedPaintingInfo(

- &m_paintLayer, LayoutRect(enclosingIntRect(transform.inverse().mapRect(

- paintingInfo.paintDirtyRect))),

+ &m_paintLayer,

+ LayoutRect(enclosingIntRect(

+ transform.inverse().mapRect(paintingInfo.paintDirtyRect))),

paintingInfo.getGlobalPaintFlags(), adjustedSubPixelAccumulation);

transformedPaintingInfo.ancestorHasClipPathClipping =

paintingInfo.ancestorHasClipPathClipping;