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

Unified Diff: Source/core/css/CSSFontValue.cpp

Issue 203523002: Reland "Add plumbing for font-stretch" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: w/fix for ASSERT Created 6 years, 5 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
« no previous file with comments | « Source/core/css/CSSFontValue.h ('k') | Source/core/css/CSSPrimitiveValueMappings.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/CSSFontValue.cpp
diff --git a/Source/core/css/CSSFontValue.cpp b/Source/core/css/CSSFontValue.cpp
index 7c73f960e7eb9b0c13de56e05c0512007c746e91..2cfe53c3e04cb5e266b1e7bcf056ef38970fbea5 100644
--- a/Source/core/css/CSSFontValue.cpp
+++ b/Source/core/css/CSSFontValue.cpp
@@ -44,6 +44,11 @@ String CSSFontValue::customCSSText() const
result.append(' ');
result.append(weight->cssText());
}
+ if (stretch) {
+ if (!result.isEmpty())
+ result.append(' ');
+ result.append(stretch->cssText());
+ }
if (size) {
if (!result.isEmpty())
result.append(' ');
@@ -69,6 +74,7 @@ bool CSSFontValue::equals(const CSSFontValue& other) const
return compareCSSValuePtr(style, other.style)
&& compareCSSValuePtr(variant, other.variant)
&& compareCSSValuePtr(weight, other.weight)
+ && compareCSSValuePtr(stretch, other.stretch)
&& compareCSSValuePtr(size, other.size)
&& compareCSSValuePtr(lineHeight, other.lineHeight)
&& compareCSSValuePtr(family, other.family);
@@ -76,10 +82,10 @@ bool CSSFontValue::equals(const CSSFontValue& other) const
void CSSFontValue::traceAfterDispatch(Visitor* visitor)
{
-
visitor->trace(style);
visitor->trace(variant);
visitor->trace(weight);
+ visitor->trace(stretch);
visitor->trace(size);
visitor->trace(lineHeight);
visitor->trace(family);
« no previous file with comments | « Source/core/css/CSSFontValue.h ('k') | Source/core/css/CSSPrimitiveValueMappings.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698