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

Timestamp:

Oct 5, 2013, 10:06:13 AM (12 years ago)

Author:

[email protected]

Message:

Add *CSS* prefix to FontValue to generate toCSSFontValue()
​https://bugs.webkit.org/show_bug.cgi?id=122201

Reviewed by Darin Adler.

*CSS* prefix needs to be added to FontValue class in order to generate toCSSFontValue().
static_cast<FontValue*> is changed with toCSSFontValue() by 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/CSSFontValue.cpp: Renamed from Source/WebCore/css/FontValue.cpp.

(WebCore::CSSFontValue::customCSSText):
(WebCore::CSSFontValue::equals):

• css/CSSFontValue.h: Renamed from Source/WebCore/css/FontValue.h.

(WebCore::CSSFontValue::create):
(WebCore::CSSFontValue::CSSFontValue):

• css/CSSParser.cpp:
• 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) (6 diffs)

trunk/Source/WebCore/css/CSSValue.cpp

@@ -37 +37 @@
 #include "CSSFilterImageValue.h"
 #include "CSSFontFaceSrcValue.h"
+#include "CSSFontValue.h"
 #include "CSSFunctionValue.h"
 #include "CSSGradientValue.h"
@@ -50 +51 @@
 #include "CSSUnicodeRangeValue.h"
 #include "CSSValueList.h"
-#if ENABLE(CSS_VARIABLES)
-#include "CSSVariableValue.h"
-#endif
-#include "FontValue.h"
 #include "FontFeatureValue.h"
 #include "ShadowValue.h"
@@ -65 +62 @@
 #include "WebKitCSSTransformValue.h"
 
+#if ENABLE(CSS_VARIABLES)
+#include "CSSVariableValue.h"
+#endif
+
 #if ENABLE(SVG)
 #include "WebKitCSSSVGDocumentValue.h"
@@ -179 +180 @@
 #endif
         case FontClass:
-            return compareCSSValues<FontValue>(*this, other);
+            return compareCSSValues<CSSFontValue>(*this, other);
         case FontFaceSrcClass:
             return compareCSSValues<CSSFontFaceSrcValue>(*this, other);
@@ -281 +282 @@
 #endif
     case FontClass:
-        return static_cast<const FontValue*>(this)->customCSSText();
+        return static_cast<const CSSFontValue*>(this)->customCSSText();
     case FontFaceSrcClass:
         return static_cast<const CSSFontFaceSrcValue*>(this)->customCSSText();
@@ -396 +397 @@
         return;
     case FontClass:
-        delete static_cast<FontValue*>(this);
+        delete toCSSFontValue(this);
         return;
     case FontFaceSrcClass: