Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1450)

Unified Diff: Source/core/paint/DeprecatedPaintLayerClipper.cpp

Issue 1349473003: Remove DeprecatedPaintLayerFragment::outlineRect (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 3 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
Index: Source/core/paint/DeprecatedPaintLayerClipper.cpp
diff --git a/Source/core/paint/DeprecatedPaintLayerClipper.cpp b/Source/core/paint/DeprecatedPaintLayerClipper.cpp
index 5f692a1d6748bccde66739412ce7deaf45f715b5..2a5feb53e06b4639eed2777aadd31e3932f51a78 100644
--- a/Source/core/paint/DeprecatedPaintLayerClipper.cpp
+++ b/Source/core/paint/DeprecatedPaintLayerClipper.cpp
@@ -175,10 +175,10 @@ LayoutRect DeprecatedPaintLayerClipper::childrenClipRect() const
// FIXME: Flow thread based columns not accounted for.
DeprecatedPaintLayer* clippingRootLayer = clippingRootForPainting();
LayoutRect layerBounds;
- ClipRect backgroundRect, foregroundRect, outlineRect;
+ ClipRect backgroundRect, foregroundRect;
// Need to use uncached clip rects, because the value of 'dontClipToOverflow' may be different from the painting path (<rdar://problem/11844909>).
ClipRectsContext context(clippingRootLayer, UncachedClipRects);
- calculateRects(context, LayoutRect(m_layoutObject.view()->unscaledDocumentRect()), layerBounds, backgroundRect, foregroundRect, outlineRect);
+ calculateRects(context, LayoutRect(m_layoutObject.view()->unscaledDocumentRect()), layerBounds, backgroundRect, foregroundRect);
return LayoutRect(clippingRootLayer->layoutObject()->localToAbsoluteQuad(FloatQuad(FloatRect(foregroundRect.rect()))).enclosingBoundingBox());
}
@@ -187,9 +187,9 @@ LayoutRect DeprecatedPaintLayerClipper::localClipRect() const
// FIXME: border-radius not accounted for.
DeprecatedPaintLayer* clippingRootLayer = clippingRootForPainting();
LayoutRect layerBounds;
- ClipRect backgroundRect, foregroundRect, outlineRect;
+ ClipRect backgroundRect, foregroundRect;
ClipRectsContext context(clippingRootLayer, PaintingClipRects);
- calculateRects(context, LayoutRect(LayoutRect::infiniteIntRect()), layerBounds, backgroundRect, foregroundRect, outlineRect);
+ calculateRects(context, LayoutRect(LayoutRect::infiniteIntRect()), layerBounds, backgroundRect, foregroundRect);
LayoutRect clipRect = backgroundRect.rect();
// TODO(chrishtr): avoid converting to IntRect and back.
@@ -204,7 +204,7 @@ LayoutRect DeprecatedPaintLayerClipper::localClipRect() const
}
void DeprecatedPaintLayerClipper::calculateRects(const ClipRectsContext& context, const LayoutRect& paintDirtyRect, LayoutRect& layerBounds,
- ClipRect& backgroundRect, ClipRect& foregroundRect, ClipRect& outlineRect, const LayoutPoint* offsetFromRoot) const
+ ClipRect& backgroundRect, ClipRect& foregroundRect, const LayoutPoint* offsetFromRoot) const
{
bool isClippingRoot = m_layoutObject.layer() == context.rootLayer;
@@ -217,7 +217,6 @@ void DeprecatedPaintLayerClipper::calculateRects(const ClipRectsContext& context
}
foregroundRect = backgroundRect;
- outlineRect = backgroundRect;
LayoutPoint offset;
if (offsetFromRoot)
@@ -265,8 +264,6 @@ void DeprecatedPaintLayerClipper::calculateRects(const ClipRectsContext& context
backgroundRect.setIsClippedByClipCss();
foregroundRect.intersect(newPosClip);
foregroundRect.setIsClippedByClipCss();
- outlineRect.intersect(newPosClip);
- outlineRect.setIsClippedByClipCss();
}
}

Powered by Google App Engine
This is Rietveld 408576698