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):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156985 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
index 241b2aa..9565f64 100644
--- a/Source/WebCore/CMakeLists.txt
+++ b/Source/WebCore/CMakeLists.txt
@@ -970,6 +970,7 @@
css/CSSFontFaceRule.cpp
css/CSSFontFaceSource.cpp
css/CSSFontFaceSrcValue.cpp
+ css/CSSFontFeatureValue.cpp
css/CSSFontSelector.cpp
css/CSSFontValue.cpp
css/CSSFunctionValue.cpp
@@ -1010,7 +1011,6 @@
css/DeprecatedStyleBuilder.cpp
css/DocumentRuleSets.cpp
css/ElementRuleCollector.cpp
- css/FontFeatureValue.cpp
css/FontLoader.cpp
css/InspectorCSSOMWrappers.cpp
css/LengthFunctions.cpp
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index db503d2..5151462 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,40 @@
+2013-10-06 Gyuyoung Kim <gyuyoung.kim@samsung.com>
+
+ 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):
+
2013-10-05 Andreas Kling <akling@apple.com>
FrameSelection: Remove two unused member functions.
diff --git a/Source/WebCore/GNUmakefile.list.am b/Source/WebCore/GNUmakefile.list.am
index d2079a0..49573bd 100644
--- a/Source/WebCore/GNUmakefile.list.am
+++ b/Source/WebCore/GNUmakefile.list.am
@@ -2475,6 +2475,8 @@
Source/WebCore/css/CSSFontFaceSource.h \
Source/WebCore/css/CSSFontFaceSrcValue.cpp \
Source/WebCore/css/CSSFontFaceSrcValue.h \
+ Source/WebCore/css/CSSFontFeatureValue.cpp \
+ Source/WebCore/css/CSSFontFeatureValue.h \
Source/WebCore/css/CSSFontSelector.cpp \
Source/WebCore/css/CSSFontSelector.h \
Source/WebCore/css/CSSFontValue.cpp \
@@ -2563,8 +2565,6 @@
Source/WebCore/css/DocumentRuleSets.h \
Source/WebCore/css/ElementRuleCollector.cpp \
Source/WebCore/css/ElementRuleCollector.h \
- Source/WebCore/css/FontFeatureValue.cpp \
- Source/WebCore/css/FontFeatureValue.h \
Source/WebCore/css/FontLoader.cpp \
Source/WebCore/css/FontLoader.h \
Source/WebCore/css/InspectorCSSOMWrappers.cpp \
diff --git a/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj b/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
index b3e32c2..9c5262e 100644
--- a/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
+++ b/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
@@ -8648,6 +8648,7 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</ClCompile>
+ <ClCompile Include="..\css\CSSFontFeatureValue.cpp" />
<ClCompile Include="..\css\CSSFontSelector.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -9086,7 +9087,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</ClCompile>
- <ClCompile Include="..\css\FontFeatureValue.cpp" />
<ClCompile Include="..\css\FontLoader.cpp" />
<ClCompile Include="..\css\LengthFunctions.cpp" />
<ClCompile Include="..\css\MediaAllInOne.cpp">
@@ -19357,6 +19357,7 @@
<ClInclude Include="..\css\CSSFontFaceRule.h" />
<ClInclude Include="..\css\CSSFontFaceSource.h" />
<ClInclude Include="..\css\CSSFontFaceSrcValue.h" />
+ <ClInclude Include="..\css\CSSFontFeatureValue.h" />
<ClInclude Include="..\css\CSSFontSelector.h" />
<ClInclude Include="..\css\CSSFontValue.h" />
<ClInclude Include="..\css\CSSFunctionValue.h" />
@@ -19399,7 +19400,6 @@
<ClInclude Include="..\css\CSSValuePool.h" />
<ClInclude Include="..\css\CSSVariableValue.h" />
<ClInclude Include="..\css\DashboardRegion.h" />
- <ClInclude Include="..\css\FontFeatureValue.h" />
<ClInclude Include="..\css\FontLoader.h" />
<ClInclude Include="..\css\LengthFunctions.h" />
<ClInclude Include="..\css\MediaFeatureNames.h" />
diff --git a/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters b/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters
index 6055f40..7327a3a 100644
--- a/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters
+++ b/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters
@@ -2121,6 +2121,9 @@
<ClCompile Include="..\css\CSSFontFaceSrcValue.cpp">
<Filter>css</Filter>
</ClCompile>
+ <ClCompile Include="..\css\CSSFontFeatureValue.cpp">
+ <Filter>css</Filter>
+ </ClCompile>
<ClCompile Include="..\css\CSSFontSelector.cpp">
<Filter>css</Filter>
</ClCompile>
@@ -2226,9 +2229,6 @@
<ClCompile Include="..\css\CSSValuePool.cpp">
<Filter>css</Filter>
</ClCompile>
- <ClCompile Include="..\css\FontFeatureValue.cpp">
- <Filter>css</Filter>
- </ClCompile>
<ClCompile Include="..\css\FontLoader.cpp">
<Filter>css</Filter>
</ClCompile>
@@ -8868,6 +8868,9 @@
<ClInclude Include="..\css\CSSFontFaceSrcValue.h">
<Filter>css</Filter>
</ClInclude>
+ <ClInclude Include="..\css\CSSFontFeatureValue.h">
+ <Filter>css</Filter>
+ </ClInclude>
<ClInclude Include="..\css\CSSFontSelector.h">
<Filter>css</Filter>
</ClInclude>
@@ -8994,9 +8997,6 @@
<ClInclude Include="..\css\DashboardRegion.h">
<Filter>css</Filter>
</ClInclude>
- <ClInclude Include="..\css\FontFeatureValue.h">
- <Filter>css</Filter>
- </ClInclude>
<ClInclude Include="..\css\FontLoader.h">
<Filter>css</Filter>
</ClInclude>
diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
index 35d237c..a631d44 100644
--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -1507,8 +1507,8 @@
4A5A2ADC161E7E00005889DD /* WebSocketExtensionParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A5A2ADA161E7E00005889DD /* WebSocketExtensionParser.h */; };
4A5CB1C516C3A5FD00AB2886 /* EventRetargeter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A5CB1C316C3A5FD00AB2886 /* EventRetargeter.cpp */; };
4A5CB1C616C3A5FD00AB2886 /* EventRetargeter.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A5CB1C416C3A5FD00AB2886 /* EventRetargeter.h */; };
- 4A6E9FC313C17D1D0046A7F8 /* FontFeatureValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A6E9FC113C17D1D0046A7F8 /* FontFeatureValue.cpp */; };
- 4A6E9FC413C17D1D0046A7F8 /* FontFeatureValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A6E9FC213C17D1D0046A7F8 /* FontFeatureValue.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 4A6E9FC313C17D1D0046A7F8 /* CSSFontFeatureValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A6E9FC113C17D1D0046A7F8 /* CSSFontFeatureValue.cpp */; };
+ 4A6E9FC413C17D1D0046A7F8 /* CSSFontFeatureValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A6E9FC213C17D1D0046A7F8 /* CSSFontFeatureValue.h */; settings = {ATTRIBUTES = (Private, ); }; };
4A6E9FC713C17D570046A7F8 /* FontFeatureSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A6E9FC513C17D570046A7F8 /* FontFeatureSettings.cpp */; };
4A6E9FC813C17D570046A7F8 /* FontFeatureSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A6E9FC613C17D570046A7F8 /* FontFeatureSettings.h */; settings = {ATTRIBUTES = (Private, ); }; };
4A8C96EB0BE69032004EEFF0 /* FrameSelectionMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4A8C96EA0BE69032004EEFF0 /* FrameSelectionMac.mm */; };
@@ -8022,8 +8022,8 @@
4A5A2ADA161E7E00005889DD /* WebSocketExtensionParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebSocketExtensionParser.h; path = Modules/websockets/WebSocketExtensionParser.h; sourceTree = "<group>"; };
4A5CB1C316C3A5FD00AB2886 /* EventRetargeter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EventRetargeter.cpp; sourceTree = "<group>"; };
4A5CB1C416C3A5FD00AB2886 /* EventRetargeter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventRetargeter.h; sourceTree = "<group>"; };
- 4A6E9FC113C17D1D0046A7F8 /* FontFeatureValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FontFeatureValue.cpp; sourceTree = "<group>"; };
- 4A6E9FC213C17D1D0046A7F8 /* FontFeatureValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FontFeatureValue.h; sourceTree = "<group>"; };
+ 4A6E9FC113C17D1D0046A7F8 /* CSSFontFeatureValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSFontFeatureValue.cpp; sourceTree = "<group>"; };
+ 4A6E9FC213C17D1D0046A7F8 /* CSSFontFeatureValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSFontFeatureValue.h; sourceTree = "<group>"; };
4A6E9FC513C17D570046A7F8 /* FontFeatureSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FontFeatureSettings.cpp; sourceTree = "<group>"; };
4A6E9FC613C17D570046A7F8 /* FontFeatureSettings.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; path = FontFeatureSettings.h; sourceTree = "<group>"; };
4A8C96EA0BE69032004EEFF0 /* FrameSelectionMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; name = FrameSelectionMac.mm; path = mac/FrameSelectionMac.mm; sourceTree = "<group>"; };
@@ -20088,6 +20088,8 @@
BC64B4D00CB4298A005F2B62 /* CSSFontFaceSource.h */,
BC64B4D10CB4298A005F2B62 /* CSSFontFaceSrcValue.cpp */,
BC64B4D20CB4298A005F2B62 /* CSSFontFaceSrcValue.h */,
+ 4A6E9FC113C17D1D0046A7F8 /* CSSFontFeatureValue.cpp */,
+ 4A6E9FC213C17D1D0046A7F8 /* CSSFontFeatureValue.h */,
BC64B4D30CB4298A005F2B62 /* CSSFontSelector.cpp */,
BC64B4D40CB4298A005F2B62 /* CSSFontSelector.h */,
A80E6CC70A1989CA007FB8C5 /* CSSFontValue.cpp */,
@@ -20192,8 +20194,6 @@
FC9A0F73164094CF003D6B8D /* DOMWindowCSS.idl */,
FBDB619A16D6032A00BB3394 /* ElementRuleCollector.cpp */,
FBDB619E16D6036500BB3394 /* ElementRuleCollector.h */,
- 4A6E9FC113C17D1D0046A7F8 /* FontFeatureValue.cpp */,
- 4A6E9FC213C17D1D0046A7F8 /* FontFeatureValue.h */,
409EBDB516B7EEA300CBA3FC /* FontLoader.h */,
409EBDB716B7EEBA00CBA3FC /* FontLoader.idl */,
CD4E0AFA11F7BC27009D3811 /* fullscreen.css */,
@@ -21635,6 +21635,7 @@
A80E6CFD0A1989CA007FB8C5 /* CSSFontFaceRule.h in Headers */,
BC64B4D80CB4298A005F2B62 /* CSSFontFaceSource.h in Headers */,
BC64B4DA0CB4298A005F2B62 /* CSSFontFaceSrcValue.h in Headers */,
+ 4A6E9FC413C17D1D0046A7F8 /* CSSFontFeatureValue.h in Headers */,
BC64B4DC0CB4298A005F2B62 /* CSSFontSelector.h in Headers */,
A80E6CED0A1989CA007FB8C5 /* CSSFontValue.h in Headers */,
BC02A63C0E09A9CF004B6D2B /* CSSFunctionValue.h in Headers */,
@@ -22283,7 +22284,6 @@
371F4F400D25B9AF00ECE0D5 /* FontData.h in Headers */,
B2C3DA660D006CD600EF6F26 /* FontDescription.h in Headers */,
4A6E9FC813C17D570046A7F8 /* FontFeatureSettings.h in Headers */,
- 4A6E9FC413C17D1D0046A7F8 /* FontFeatureValue.h in Headers */,
B2C3DA680D006CD600EF6F26 /* FontGlyphs.h in Headers */,
409EBDB616B7EEA300CBA3FC /* FontLoader.h in Headers */,
0845680812B90DA600960A9F /* FontMetrics.h in Headers */,
@@ -25093,6 +25093,7 @@
A80E6CE70A1989CA007FB8C5 /* CSSFontFaceRule.cpp in Sources */,
BC64B4D70CB4298A005F2B62 /* CSSFontFaceSource.cpp in Sources */,
BC64B4D90CB4298A005F2B62 /* CSSFontFaceSrcValue.cpp in Sources */,
+ 4A6E9FC313C17D1D0046A7F8 /* CSSFontFeatureValue.cpp in Sources */,
BC64B4DB0CB4298A005F2B62 /* CSSFontSelector.cpp in Sources */,
A80E6CF10A1989CA007FB8C5 /* CSSFontValue.cpp in Sources */,
BC02A6460E09AAE9004B6D2B /* CSSFunctionValue.cpp in Sources */,
@@ -25539,7 +25540,6 @@
37ACCF690DA414E70089E602 /* FontDescription.cpp in Sources */,
72626E020EF022FE00A07E20 /* FontFastPath.cpp in Sources */,
4A6E9FC713C17D570046A7F8 /* FontFeatureSettings.cpp in Sources */,
- 4A6E9FC313C17D1D0046A7F8 /* FontFeatureValue.cpp in Sources */,
E44EE3A817577EBD00EEE8CF /* FontGenericFamilies.cpp in Sources */,
B2C3DA670D006CD600EF6F26 /* FontGlyphs.cpp in Sources */,
B2AFFC800D00A5C10030074D /* FontMac.mm in Sources */,
diff --git a/Source/WebCore/css/CSSComputedStyleDeclaration.cpp b/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
index b18726e..d81565c 100644
--- a/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
+++ b/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
@@ -30,6 +30,7 @@
#include "CSSAspectRatioValue.h"
#include "CSSBasicShapes.h"
#include "CSSBorderImage.h"
+#include "CSSFontFeatureValue.h"
#include "CSSFontValue.h"
#include "CSSFunctionValue.h"
#include "CSSLineBoxContainValue.h"
@@ -48,7 +49,6 @@
#include "Document.h"
#include "ExceptionCode.h"
#include "FontFeatureSettings.h"
-#include "FontFeatureValue.h"
#include "HTMLFrameOwnerElement.h"
#include "Pair.h"
#include "PseudoElement.h"
@@ -2114,7 +2114,7 @@
RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
for (unsigned i = 0; i < featureSettings->size(); ++i) {
const FontFeature& feature = featureSettings->at(i);
- RefPtr<FontFeatureValue> featureValue = FontFeatureValue::create(feature.tag(), feature.value());
+ RefPtr<CSSFontFeatureValue> featureValue = CSSFontFeatureValue::create(feature.tag(), feature.value());
list->append(featureValue.release());
}
return list.release();
diff --git a/Source/WebCore/css/FontFeatureValue.cpp b/Source/WebCore/css/CSSFontFeatureValue.cpp
similarity index 88%
rename from Source/WebCore/css/FontFeatureValue.cpp
rename to Source/WebCore/css/CSSFontFeatureValue.cpp
index 670b270..33ae132 100644
--- a/Source/WebCore/css/FontFeatureValue.cpp
+++ b/Source/WebCore/css/CSSFontFeatureValue.cpp
@@ -24,7 +24,7 @@
*/
#include "config.h"
-#include "FontFeatureValue.h"
+#include "CSSFontFeatureValue.h"
#include "CSSParser.h"
#include "CSSValueKeywords.h"
@@ -32,14 +32,14 @@
namespace WebCore {
-FontFeatureValue::FontFeatureValue(const String& tag, int value)
+CSSFontFeatureValue::CSSFontFeatureValue(const String& tag, int value)
: CSSValue(FontFeatureClass)
, m_tag(tag)
, m_value(value)
{
}
-String FontFeatureValue::customCSSText() const
+String CSSFontFeatureValue::customCSSText() const
{
StringBuilder builder;
builder.append('\'');
@@ -49,7 +49,7 @@
return builder.toString();
}
-bool FontFeatureValue::equals(const FontFeatureValue& other) const
+bool CSSFontFeatureValue::equals(const CSSFontFeatureValue& other) const
{
return m_tag == other.m_tag && m_value == other.m_value;
}
diff --git a/Source/WebCore/css/FontFeatureValue.h b/Source/WebCore/css/CSSFontFeatureValue.h
similarity index 81%
rename from Source/WebCore/css/FontFeatureValue.h
rename to Source/WebCore/css/CSSFontFeatureValue.h
index dd3c35c..26127ec 100644
--- a/Source/WebCore/css/FontFeatureValue.h
+++ b/Source/WebCore/css/CSSFontFeatureValue.h
@@ -23,34 +23,36 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef FontFeatureValue_h
-#define FontFeatureValue_h
+#ifndef CSSFontFeatureValue_h
+#define CSSFontFeatureValue_h
#include "CSSValue.h"
#include <wtf/text/WTFString.h>
namespace WebCore {
-class FontFeatureValue : public CSSValue {
+class CSSFontFeatureValue : public CSSValue {
public:
- static PassRefPtr<FontFeatureValue> create(const String& tag, int value)
+ static PassRefPtr<CSSFontFeatureValue> create(const String& tag, int value)
{
- return adoptRef(new FontFeatureValue(tag, value));
+ return adoptRef(new CSSFontFeatureValue(tag, value));
}
const String& tag() const { return m_tag; }
int value() const { return m_value; }
String customCSSText() const;
- bool equals(const FontFeatureValue&) const;
+ bool equals(const CSSFontFeatureValue&) const;
private:
- FontFeatureValue(const String&, int);
+ CSSFontFeatureValue(const String&, int);
String m_tag;
const int m_value;
};
+CSS_VALUE_TYPE_CASTS(FontFeatureValue)
+
} // namespace
#endif
diff --git a/Source/WebCore/css/CSSParser.cpp b/Source/WebCore/css/CSSParser.cpp
index bb49c87..50dbcc1 100644
--- a/Source/WebCore/css/CSSParser.cpp
+++ b/Source/WebCore/css/CSSParser.cpp
@@ -36,6 +36,7 @@
#include "CSSFilterImageValue.h"
#include "CSSFontFaceRule.h"
#include "CSSFontFaceSrcValue.h"
+#include "CSSFontFeatureValue.h"
#include "CSSFontValue.h"
#include "CSSFunctionValue.h"
#include "CSSGradientValue.h"
@@ -55,13 +56,9 @@
#include "CSSValueKeywords.h"
#include "CSSValueList.h"
#include "CSSValuePool.h"
-#if ENABLE(CSS_VARIABLES)
-#include "CSSVariableValue.h"
-#endif
#include "Counter.h"
#include "Document.h"
#include "FloatConversion.h"
-#include "FontFeatureValue.h"
#include "HTMLParserIdioms.h"
#include "HashTools.h"
#include "HistogramSupport.h"
@@ -99,6 +96,10 @@
#include "CSSImageSetValue.h"
#endif
+#if ENABLE(CSS_VARIABLES)
+#include "CSSVariableValue.h"
+#endif
+
#if ENABLE(CSS_FILTERS)
#include "WebKitCSSFilterValue.h"
#if ENABLE(SVG)
@@ -9830,7 +9831,7 @@
m_valueList->next();
}
}
- settings->append(FontFeatureValue::create(tag, tagValue));
+ settings->append(CSSFontFeatureValue::create(tag, tagValue));
return true;
}
diff --git a/Source/WebCore/css/CSSValue.cpp b/Source/WebCore/css/CSSValue.cpp
index 3cbc8ef..df883316 100644
--- a/Source/WebCore/css/CSSValue.cpp
+++ b/Source/WebCore/css/CSSValue.cpp
@@ -36,6 +36,7 @@
#include "CSSCursorImageValue.h"
#include "CSSFilterImageValue.h"
#include "CSSFontFaceSrcValue.h"
+#include "CSSFontFeatureValue.h"
#include "CSSFontValue.h"
#include "CSSFunctionValue.h"
#include "CSSGradientValue.h"
@@ -50,7 +51,6 @@
#include "CSSTimingFunctionValue.h"
#include "CSSUnicodeRangeValue.h"
#include "CSSValueList.h"
-#include "FontFeatureValue.h"
#include "ShadowValue.h"
#include "SVGColor.h"
#include "SVGPaint.h"
@@ -183,7 +183,7 @@
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:
@@ -285,7 +285,7 @@
case FontFaceSrcClass:
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();
case LinearGradientClass:
@@ -402,7 +402,7 @@
delete toCSSFontFaceSrcValue(this);
return;
case FontFeatureClass:
- delete static_cast<FontFeatureValue*>(this);
+ delete toCSSFontFeatureValue(this);
return;
case FunctionClass:
delete toCSSFunctionValue(this);
diff --git a/Source/WebCore/css/StyleResolver.cpp b/Source/WebCore/css/StyleResolver.cpp
index 23d183f..0049e88 100644
--- a/Source/WebCore/css/StyleResolver.cpp
+++ b/Source/WebCore/css/StyleResolver.cpp
@@ -36,6 +36,7 @@
#include "CSSDefaultStyleSheets.h"
#include "CSSFilterImageValue.h"
#include "CSSFontFaceRule.h"
+#include "CSSFontFeatureValue.h"
#include "CSSFontSelector.h"
#include "CSSFontValue.h"
#include "CSSLineBoxContainValue.h"
@@ -59,7 +60,6 @@
#include "DeprecatedStyleBuilder.h"
#include "DocumentStyleSheetCollection.h"
#include "ElementRuleCollector.h"
-#include "FontFeatureValue.h"
#include "Frame.h"
#include "FrameSelection.h"
#include "FrameView.h"
@@ -2706,7 +2706,7 @@
CSSValue* item = list->itemWithoutBoundsCheck(i);
if (!item->isFontFeatureValue())
continue;
- FontFeatureValue* feature = static_cast<FontFeatureValue*>(item);
+ CSSFontFeatureValue* feature = toCSSFontFeatureValue(item);
settings->append(FontFeature(feature->tag(), feature->value()));
}
fontDescription.setFeatureSettings(settings.release());
