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

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

Issue 26134002: Add *CSS* prefix to FontValue and FontFeatureValue (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 2 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/CSSParser-in.cpp ('k') | Source/core/css/FontFeatureValue.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/CSSValue.cpp
diff --git a/Source/core/css/CSSValue.cpp b/Source/core/css/CSSValue.cpp
index 46f2b82d7a67bcb97d5372bead774537477e9594..44494a4e214101536ba23c28a21a95682d564503 100644
--- a/Source/core/css/CSSValue.cpp
+++ b/Source/core/css/CSSValue.cpp
@@ -36,6 +36,8 @@
#include "core/css/CSSCursorImageValue.h"
#include "core/css/CSSFilterValue.h"
#include "core/css/CSSFontFaceSrcValue.h"
+#include "core/css/CSSFontFeatureValue.h"
+#include "core/css/CSSFontValue.h"
#include "core/css/CSSFunctionValue.h"
#include "core/css/CSSGradientValue.h"
#include "core/css/CSSGridTemplateValue.h"
@@ -54,8 +56,6 @@
#include "core/css/CSSUnicodeRangeValue.h"
#include "core/css/CSSValueList.h"
#include "core/css/CSSVariableValue.h"
-#include "core/css/FontFeatureValue.h"
-#include "core/css/FontValue.h"
#include "core/css/ShadowValue.h"
#include "core/svg/SVGColor.h"
#include "core/svg/SVGPaint.h"
@@ -161,11 +161,11 @@ bool CSSValue::equals(const CSSValue& other) const
case CursorImageClass:
return compareCSSValues<CSSCursorImageValue>(*this, other);
case FontClass:
- return compareCSSValues<FontValue>(*this, other);
+ return compareCSSValues<CSSFontValue>(*this, other);
case FontFaceSrcClass:
return compareCSSValues<CSSFontFaceSrcValue>(*this, other);
case FontFeatureClass:
- return compareCSSValues<FontFeatureValue>(*this, other);
+ return compareCSSValues<CSSFontFeatureValue>(*this, other);
case FunctionClass:
return compareCSSValues<CSSFunctionValue>(*this, other);
case LinearGradientClass:
@@ -249,11 +249,11 @@ String CSSValue::cssText() const
case CursorImageClass:
return static_cast<const CSSCursorImageValue*>(this)->customCssText();
case FontClass:
- return static_cast<const FontValue*>(this)->customCssText();
+ return toCSSFontValue(this)->customCssText();
case FontFaceSrcClass:
return static_cast<const CSSFontFaceSrcValue*>(this)->customCssText();
case FontFeatureClass:
- return static_cast<const FontFeatureValue*>(this)->customCssText();
+ return toCSSFontFeatureValue(this)->customCssText();
case FunctionClass:
return static_cast<const CSSFunctionValue*>(this)->customCssText();
case LinearGradientClass:
@@ -352,13 +352,13 @@ void CSSValue::destroy()
delete toCSSCursorImageValue(this);
return;
case FontClass:
- delete static_cast<FontValue*>(this);
+ delete toCSSFontValue(this);
return;
case FontFaceSrcClass:
delete toCSSFontFaceSrcValue(this);
return;
case FontFeatureClass:
- delete static_cast<FontFeatureValue*>(this);
+ delete toCSSFontFeatureValue(this);
return;
case FunctionClass:
delete toCSSFunctionValue(this);
« no previous file with comments | « Source/core/css/CSSParser-in.cpp ('k') | Source/core/css/FontFeatureValue.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698