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

Unified Diff: Source/core/layout/LayoutObject.cpp

Issue 1269123002: Preparation for combining paths of focus rings and outlines (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 4 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/layout/LayoutObject.cpp
diff --git a/Source/core/layout/LayoutObject.cpp b/Source/core/layout/LayoutObject.cpp
index 7037025a8fff00f2645a457082c524125d6f95cb..d458e2232d0d8c21b0c12b9dacc024ddc6c30136 100644
--- a/Source/core/layout/LayoutObject.cpp
+++ b/Source/core/layout/LayoutObject.cpp
@@ -998,11 +998,11 @@ IntRect LayoutObject::absoluteBoundingBoxRectIgnoringTransforms() const
return result;
}
-IntRect LayoutObject::absoluteFocusRingBoundingBoxRect() const
+IntRect LayoutObject::absoluteOutlineBoundingBoxRect() const
{
Vector<LayoutRect> rects;
const LayoutBoxModelObject* container = enclosingLayer()->layoutObject();
- addFocusRingRects(rects, LayoutPoint(localToContainerPoint(FloatPoint(), container)));
+ addOutlineRects(rects, LayoutPoint(localToContainerPoint(FloatPoint(), container)));
return container->localToAbsoluteQuad(FloatQuad(unionRect(rects))).enclosingBoundingBox();
}
@@ -1397,8 +1397,9 @@ PaintInvalidationReason LayoutObject::paintInvalidationReason(const LayoutBoxMod
// The focus ring may change because of position change of descendants. For simplicity,
// just force full paint invalidation if this object is marked for checking paint invalidation
// for any reason.
+ // TODO(wangxianzhu): extend this to all outlines.
if (styleRef().outlineStyleIsAuto())
- return PaintInvalidationFocusRing;
+ return PaintInvalidationOutline;
// If the bounds are the same then we know that none of the statements below
// can match, so we can early out since we will not need to do any

Powered by Google App Engine
This is Rietveld 408576698