Changeset 156985 in webkit for trunk/Source/WebCore/css/CSSValue.cpp

Timestamp:

Oct 6, 2013, 12:33:19 AM (12 years ago)

Author:

[email protected]

Message:

Add *CSS* prefix to FontFeatureValue to generate toCSSFontFeatureValue(), and use it
​https://bugs.webkit.org/show_bug.cgi?id=122204

Reviewed by Darin Adler.

*CSS* prefix needs to be added to FontFeatureValue class in order to generate toCSSFontFeatureValue().
static_cast<FontFeatureValue*> is changed with toCSSFontFeatureValue() by using this change.

No new tests, no behavior changes.

• CMakeLists.txt:
• GNUmakefile.list.am:
• Target.pri:
• WebCore.vcxproj/WebCore.vcxproj:
• WebCore.vcxproj/WebCore.vcxproj.filters:
• WebCore.xcodeproj/project.pbxproj:
• css/CSSComputedStyleDeclaration.cpp:

(WebCore::ComputedStyleExtractor::propertyValue):

• css/CSSFontFeatureValue.cpp: Renamed from Source/WebCore/css/FontFeatureValue.cpp.

(WebCore::CSSFontFeatureValue::CSSFontFeatureValue):
(WebCore::CSSFontFeatureValue::customCSSText):
(WebCore::CSSFontFeatureValue::equals):

• css/CSSFontFeatureValue.h: Renamed from Source/WebCore/css/FontFeatureValue.h.

(WebCore::CSSFontFeatureValue::create):
(WebCore::CSSFontFeatureValue::tag):
(WebCore::CSSFontFeatureValue::value):

• css/CSSParser.cpp:

(WebCore::CSSParser::parseFontFeatureTag):

• css/CSSValue.cpp:

(WebCore::CSSValue::equals):
(WebCore::CSSValue::cssText):
(WebCore::CSSValue::destroy):

• css/StyleResolver.cpp:

(WebCore::StyleResolver::applyProperty):

File:

• trunk/Source/WebCore/css/CSSValue.cpp (modified) (5 diffs)

trunk/Source/WebCore/css/CSSValue.cpp

@@ -37 +37 @@
 #include "CSSFilterImageValue.h"
 #include "CSSFontFaceSrcValue.h"
+#include "CSSFontFeatureValue.h"
 #include "CSSFontValue.h"
 #include "CSSFunctionValue.h"
@@ -51 +52 @@
 #include "CSSUnicodeRangeValue.h"
 #include "CSSValueList.h"
-#include "FontFeatureValue.h"
 #include "ShadowValue.h"
 #include "SVGColor.h"
@@ -184 +184 @@
             return compareCSSValues<CSSFontFaceSrcValue>(*this, other);
         case FontFeatureClass:
-            return compareCSSValues<FontFeatureValue>(*this, other);
+            return compareCSSValues<CSSFontFeatureValue>(*this, other);
         case FunctionClass:
             return compareCSSValues<CSSFunctionValue>(*this, other);
@@ -286 +286 @@
         return static_cast<const CSSFontFaceSrcValue*>(this)->customCSSText();
     case FontFeatureClass:
-        return static_cast<const FontFeatureValue*>(this)->customCSSText();
+        return static_cast<const CSSFontFeatureValue*>(this)->customCSSText();
     case FunctionClass:
         return static_cast<const CSSFunctionValue*>(this)->customCSSText();
@@ -403 +403 @@
         return;
     case FontFeatureClass:
-        delete static_cast<FontFeatureValue*>(this);
+        delete toCSSFontFeatureValue(this);
         return;
     case FunctionClass: