third_party/WebKit/Source/core/paint/PaintLayerClipper.cpp - Issue 2521033003: Reland: Don't early out recursion into PaintLayerChildren when computing composited bounds.

Side by Side Diff: third_party/WebKit/Source/core/paint/PaintLayerClipper.cpp

Issue 2521033003: Reland: Don't early out recursion into PaintLayerChildren when computing composited bounds. (Closed)

Patch Set: none Created 4 years 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 /*	1 /*

2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights	2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights

3 * reserved.	3 * reserved.

4 *	4 *

5 * Portions are Copyright (C) 1998 Netscape Communications Corporation.	5 * Portions are Copyright (C) 1998 Netscape Communications Corporation.

6 *	6 *

7 * Other contributors:	7 * Other contributors:

8 * Robert O'Callahan <roc+@cs.cmu.edu>	8 * Robert O'Callahan <roc+@cs.cmu.edu>

9 * David Baron <dbaron@fas.harvard.edu>	9 * David Baron <dbaron@fas.harvard.edu>

10 * Christian Biesinger <cbiesinger@web.de>	10 * Christian Biesinger <cbiesinger@web.de>

(...skipping 76 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
87 (layoutObject.styleRef().containsPaint() && layoutObject.isBox())) {	87 (layoutObject.styleRef().containsPaint() && layoutObject.isBox())) {

88 ClipRect newOverflowClip =	88 ClipRect newOverflowClip =

89 toLayoutBox(layoutObject)	89 toLayoutBox(layoutObject)

90 .overflowClipRect(offset, context.overlayScrollbarClipBehavior);	90 .overflowClipRect(offset, context.overlayScrollbarClipBehavior);

91 newOverflowClip.setHasRadius(layoutObject.styleRef().hasBorderRadius());	91 newOverflowClip.setHasRadius(layoutObject.styleRef().hasBorderRadius());

92 clipRects.setOverflowClipRect(	92 clipRects.setOverflowClipRect(

93 intersection(newOverflowClip, clipRects.overflowClipRect()));	93 intersection(newOverflowClip, clipRects.overflowClipRect()));

94 if (layoutObject.isPositioned())	94 if (layoutObject.isPositioned())

95 clipRects.setPosClipRect(	95 clipRects.setPosClipRect(

96 intersection(newOverflowClip, clipRects.posClipRect()));	96 intersection(newOverflowClip, clipRects.posClipRect()));

97 if (layoutObject.isLayoutView())	97 if (layoutObject.isLayoutView() \|\|

	98 layoutObject.hasTransformRelatedProperty())

98 clipRects.setFixedClipRect(	99 clipRects.setFixedClipRect(

99 intersection(newOverflowClip, clipRects.fixedClipRect()));	100 intersection(newOverflowClip, clipRects.fixedClipRect()));

100 if (layoutObject.styleRef().containsPaint()) {	101 if (layoutObject.styleRef().containsPaint()) {

101 clipRects.setPosClipRect(	102 clipRects.setPosClipRect(

102 intersection(newOverflowClip, clipRects.posClipRect()));	103 intersection(newOverflowClip, clipRects.posClipRect()));

103 clipRects.setFixedClipRect(	104 clipRects.setFixedClipRect(

104 intersection(newOverflowClip, clipRects.fixedClipRect()));	105 intersection(newOverflowClip, clipRects.fixedClipRect()));

105 }	106 }

106 }	107 }

107 if (layoutObject.hasClip()) {	108 if (layoutObject.hasClip()) {

(...skipping 443 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
551 const LayoutSize& subpixelAccumulation) const {	552 const LayoutSize& subpixelAccumulation) const {

552 DCHECK(!m_geometryMapper);	553 DCHECK(!m_geometryMapper);

553 ClipRectsContext context(rootLayer, PaintingClipRects,	554 ClipRectsContext context(rootLayer, PaintingClipRects,

554 IgnoreOverlayScrollbarSize, subpixelAccumulation);	555 IgnoreOverlayScrollbarSize, subpixelAccumulation);

555 if (respectOverflowClip == IgnoreOverflowClip)	556 if (respectOverflowClip == IgnoreOverflowClip)

556 context.setIgnoreOverflowClip();	557 context.setIgnoreOverflowClip();

557 return getClipRects(context);	558 return getClipRects(context);

558 }	559 }

559	560

560 } // namespace blink	561 } // namespace blink

OLD	NEW