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

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: 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 8e77ef818173edc0eaee8ada1afc6ed859f4391d..b2027a040885ae41d535611fcd09d22c9fdae3d2 100644
--- a/Source/core/style/ComputedStyle.cpp
+++ b/Source/core/style/ComputedStyle.cpp
@@ -1642,13 +1642,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