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

Unified Diff: Source/core/style/ComputedStyle.cpp

Issue 1269123002: Preparation for combining paths of focus rings and outlines (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Remove debug from fast/css/focus-ring-recursive-continuations.html 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/style/ComputedStyle.cpp
diff --git a/Source/core/style/ComputedStyle.cpp b/Source/core/style/ComputedStyle.cpp
index 2a794d9b9ffcf0615e5f60a824cafb78d3d7db61..d240465c8e5c34b9c1efbbed9a847d8b5127c66f 100644
--- a/Source/core/style/ComputedStyle.cpp
+++ b/Source/core/style/ComputedStyle.cpp
@@ -1643,13 +1643,13 @@ void ComputedStyle::resetMotionPath()
rareNonInheritedData.access()->m_transform.access()->m_motion.m_path = nullptr;
}
-int ComputedStyle::outlineOutset() const
+int ComputedStyle::outlineOutsetExtent() const
{
if (!hasOutline())
return 0;
if (outlineStyleIsAuto())
return GraphicsContext::focusRingOutsetExtent(outlineOffset(), outlineWidth());
- return outlineSize();
+ return std::max(0, outlineWidth() + outlineOffset());
}
bool ComputedStyle::columnRuleEquivalent(const ComputedStyle* otherStyle) const

Powered by Google App Engine
This is Rietveld 408576698