Cleanup WebKit prefixed names for classes in css directory.

Make sure we don't use prefixed naming inside Blink. The features are still exposed prefixed
to the web, unprefixing them is a different story.

This is part one of the renaming.

R=eseidel@chromium.org, kenneth.r.christiansen@intel.com

Review URL: https://codereview.chromium.org/15797004

git-svn-id: svn://svn.chromium.org/blink/trunk@151418 bbb929c8-8fbe-4397-9dbb-9b2b20218538
diff --git a/Source/bindings/scripts/CodeGeneratorV8.pm b/Source/bindings/scripts/CodeGeneratorV8.pm
index 5d487ce..c74e12a 100644
--- a/Source/bindings/scripts/CodeGeneratorV8.pm
+++ b/Source/bindings/scripts/CodeGeneratorV8.pm
@@ -543,9 +543,9 @@
 {
     my $interface = shift;
 
-    # FIXME: Expose indexed getter of WebKitCSSMixFunctionValue by removing this special case
-    # because CSSValueList(which is parent of WebKitCSSMixFunctionValue) has indexed property getter.
-    if ($interface->name eq "WebKitCSSMixFunctionValue") {
+    # FIXME: Expose indexed getter of CSSMixFunctionValue by removing this special case
+    # because CSSValueList(which is parent of CSSMixFunctionValue) has indexed property getter.
+    if ($interface->name eq "CSSMixFunctionValue") {
         return 0;
     }
 
diff --git a/Source/bindings/v8/custom/V8CSSRuleCustom.cpp b/Source/bindings/v8/custom/V8CSSRuleCustom.cpp
index 97ff75f..d2af3d1 100644
--- a/Source/bindings/v8/custom/V8CSSRuleCustom.cpp
+++ b/Source/bindings/v8/custom/V8CSSRuleCustom.cpp
@@ -37,15 +37,15 @@
 #include "V8CSSImportRule.h"
 #include "V8CSSMediaRule.h"
 #include "V8CSSPageRule.h"
+#include "V8CSSRegionRule.h"
 #include "V8CSSStyleRule.h"
 #include "V8CSSSupportsRule.h"
 #include "V8WebKitCSSFilterRule.h"
 #include "V8WebKitCSSKeyframeRule.h"
 #include "V8WebKitCSSKeyframesRule.h"
-#include "V8WebKitCSSRegionRule.h"
 
 #if ENABLE(CSS_DEVICE_ADAPTATION)
-#include "V8WebKitCSSViewportRule.h"
+#include "V8CSSViewportRule.h"
 #endif
 
 namespace WebCore {
@@ -82,7 +82,7 @@
         return wrap(static_cast<WebKitCSSViewportRule*>(impl), creationContext, isolate);
 #endif
     case CSSRule::WEBKIT_REGION_RULE:
-        return wrap(static_cast<WebKitCSSRegionRule*>(impl), creationContext, isolate);
+        return wrap(static_cast<CSSRegionRule*>(impl), creationContext, isolate);
     case CSSRule::HOST_RULE:
         return wrap(static_cast<CSSHostRule*>(impl), creationContext, isolate);
     case CSSRule::WEBKIT_FILTER_RULE:
diff --git a/Source/bindings/v8/custom/V8CSSValueCustom.cpp b/Source/bindings/v8/custom/V8CSSValueCustom.cpp
index d8f02c9..3f0a47a 100644
--- a/Source/bindings/v8/custom/V8CSSValueCustom.cpp
+++ b/Source/bindings/v8/custom/V8CSSValueCustom.cpp
@@ -31,26 +31,26 @@
 #include "config.h"
 #include "V8CSSValue.h"
 
+#include "V8CSSMixFunctionValue.h"
 #include "V8CSSPrimitiveValue.h"
+#include "V8CSSTransformValue.h"
 #include "V8CSSValueList.h"
 #include "V8SVGColor.h"
 #include "V8SVGPaint.h"
 #include "V8WebKitCSSFilterValue.h"
-#include "V8WebKitCSSMixFunctionValue.h"
-#include "V8WebKitCSSTransformValue.h"
-#include "core/css/WebKitCSSMixFunctionValue.h"
+#include "core/css/CSSMixFunctionValue.h"
 
 namespace WebCore {
 
 v8::Handle<v8::Object> wrap(CSSValue* impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
 {
     ASSERT(impl);
-    if (impl->isWebKitCSSTransformValue())
-        return wrap(static_cast<WebKitCSSTransformValue*>(impl), creationContext, isolate);
+    if (impl->isCSSTransformValue())
+        return wrap(static_cast<CSSTransformValue*>(impl), creationContext, isolate);
     if (impl->isWebKitCSSFilterValue())
         return wrap(static_cast<WebKitCSSFilterValue*>(impl), creationContext, isolate);
-    if (impl->isWebKitCSSMixFunctionValue())
-        return wrap(static_cast<WebKitCSSMixFunctionValue*>(impl), creationContext, isolate);
+    if (impl->isCSSMixFunctionValue())
+        return wrap(static_cast<CSSMixFunctionValue*>(impl), creationContext, isolate);
     if (impl->isValueList())
         return wrap(static_cast<CSSValueList*>(impl), creationContext, isolate);
     if (impl->isPrimitiveValue())
diff --git a/Source/core/core.gypi b/Source/core/core.gypi
index 84ec399..259b899 100644
--- a/Source/core/core.gypi
+++ b/Source/core/core.gypi
@@ -8,19 +8,23 @@
             'css/CSSHostRule.idl',
             'css/CSSImportRule.idl',
             'css/CSSMediaRule.idl',
+            'css/CSSMixFunctionValue.idl',
             'css/CSSPageRule.idl',
             'css/CSSPrimitiveValue.idl',
+            'css/CSSRegionRule.idl',
             'css/CSSRule.idl',
             'css/CSSRuleList.idl',
             'css/CSSStyleDeclaration.idl',
             'css/CSSStyleRule.idl',
             'css/CSSStyleSheet.idl',
             'css/CSSSupportsRule.idl',
+            'css/CSSTransformValue.idl',
             # We should probably add CSSUnknownRule.idl to this list,
             # but it currently causes a compile error.
             # 'css/CSSUnknownRule.idl',
             'css/CSSValue.idl',
             'css/CSSValueList.idl',
+            'css/CSSViewportRule.idl',
             'css/Counter.idl',
             'css/FontLoader.idl',
             'css/MediaList.idl',
@@ -35,10 +39,6 @@
             'css/WebKitCSSKeyframeRule.idl',
             'css/WebKitCSSKeyframesRule.idl',
             'css/WebKitCSSMatrix.idl',
-            'css/WebKitCSSMixFunctionValue.idl',
-            'css/WebKitCSSRegionRule.idl',
-            'css/WebKitCSSTransformValue.idl',
-            'css/WebKitCSSViewportRule.idl',
             'dom/AnimationEvent.idl',
             'dom/Attr.idl',
             'dom/AutocompleteErrorEvent.idl',
@@ -578,6 +578,8 @@
             'css/CSSLineBoxContainValue.cpp',
             'css/CSSMediaRule.cpp',
             'css/CSSMediaRule.h',
+            'css/CSSMixFunctionValue.cpp',
+            'css/CSSMixFunctionValue.h',
             'css/CSSOMUtils.cpp',
             'css/CSSOMUtils.h',
             'css/CSSPageRule.cpp',
@@ -591,6 +593,8 @@
             'css/CSSProperty.cpp',
             'css/CSSPropertySourceData.cpp',
             'css/CSSReflectValue.cpp',
+            'css/CSSRegionRule.cpp',
+            'css/CSSRegionRule.h',
             'css/CSSRule.cpp',
             'css/CSSRule.h',
             'css/CSSRuleList.cpp',
@@ -600,6 +604,8 @@
             'css/CSSSelector.cpp',
             'css/CSSSelectorList.cpp',
             'css/CSSSelectorList.h',
+            'css/CSSShaderValue.cpp',
+            'css/CSSShaderValue.h',
             'css/CSSStyleDeclaration.h',
             'css/CSSStyleDeclaration.cpp',
             'css/CSSStyleRule.cpp',
@@ -608,10 +614,13 @@
             'css/CSSStyleSheet.h',
             'css/CSSSupportsRule.cpp',
             'css/CSSSupportsRule.h',
+            'css/CSSSVGDocumentValue.cpp',
+            'css/CSSSVGDocumentValue.h',
             'css/CSSTimingFunctionValue.cpp',
             'css/CSSTimingFunctionValue.h',
             'css/CSSToStyleMap.cpp',
             'css/CSSToStyleMap.h',
+            'css/CSSTransformValue.cpp',
             'css/CSSUnicodeRangeValue.cpp',
             'css/CSSUnicodeRangeValue.h',
             'css/CSSUnknownRule.h',
@@ -620,6 +629,8 @@
             'css/CSSValuePool.cpp',
             'css/CSSValuePool.h',
             'css/CSSVariableValue.h',
+            'css/CSSViewportRule.h',
+            'css/CSSViewportRule.cpp',
             'css/Counter.h',
             'css/DeprecatedStyleBuilder.cpp',
             'css/DeprecatedStyleBuilder.h',
@@ -708,17 +719,6 @@
             'css/WebKitCSSKeyframesRule.h',
             'css/WebKitCSSMatrix.cpp',
             'css/WebKitCSSMatrix.h',
-            'css/WebKitCSSMixFunctionValue.cpp',
-            'css/WebKitCSSMixFunctionValue.h',
-            'css/WebKitCSSRegionRule.cpp',
-            'css/WebKitCSSRegionRule.h',
-            'css/WebKitCSSShaderValue.cpp',
-            'css/WebKitCSSShaderValue.h',
-            'css/WebKitCSSSVGDocumentValue.cpp',
-            'css/WebKitCSSSVGDocumentValue.h',
-            'css/WebKitCSSTransformValue.cpp',
-            'css/WebKitCSSViewportRule.h',
-            'css/WebKitCSSViewportRule.cpp',
             'css/resolver/FilterOperationResolver.cpp',
             'css/resolver/FilterOperationResolver.h',
             'css/resolver/ScopedStyleResolver.cpp',
diff --git a/Source/core/css/CSSComputedStyleDeclaration.cpp b/Source/core/css/CSSComputedStyleDeclaration.cpp
index 144be51..b855040 100644
--- a/Source/core/css/CSSComputedStyleDeclaration.cpp
+++ b/Source/core/css/CSSComputedStyleDeclaration.cpp
@@ -31,12 +31,14 @@
 #include "core/css/CSSBorderImage.h"
 #include "core/css/CSSFunctionValue.h"
 #include "core/css/CSSLineBoxContainValue.h"
+#include "core/css/CSSMixFunctionValue.h"
 #include "core/css/CSSParser.h"
 #include "core/css/CSSPrimitiveValue.h"
 #include "core/css/CSSPrimitiveValueMappings.h"
 #include "core/css/CSSReflectValue.h"
 #include "core/css/CSSSelector.h"
 #include "core/css/CSSTimingFunctionValue.h"
+#include "core/css/CSSTransformValue.h"
 #include "core/css/CSSValueList.h"
 #include "core/css/CSSValuePool.h"
 #include "core/css/FontFeatureValue.h"
@@ -46,7 +48,6 @@
 #include "core/css/ShadowValue.h"
 #include "core/css/StylePropertySet.h"
 #include "core/css/StylePropertyShorthand.h"
-#include "core/css/WebKitCSSTransformValue.h"
 #include "core/css/resolver/StyleResolver.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
@@ -65,7 +66,6 @@
 #include <wtf/text/StringBuilder.h>
 
 #include "core/css/WebKitCSSArrayFunctionValue.h"
-#include "core/css/WebKitCSSMixFunctionValue.h"
 #include "core/platform/graphics/filters/custom/CustomFilterArrayParameter.h"
 #include "core/platform/graphics/filters/custom/CustomFilterNumberParameter.h"
 #include "core/platform/graphics/filters/custom/CustomFilterOperation.h"
@@ -733,11 +733,11 @@
     return box->style()->boxSizing() == BORDER_BOX ? box->borderBoxRect() : box->computedCSSContentBoxRect();
 }
 
-static PassRefPtr<WebKitCSSTransformValue> matrixTransformValue(const TransformationMatrix& transform, const RenderStyle* style)
+static PassRefPtr<CSSTransformValue> matrixTransformValue(const TransformationMatrix& transform, const RenderStyle* style)
 {
-    RefPtr<WebKitCSSTransformValue> transformValue;
+    RefPtr<CSSTransformValue> transformValue;
     if (transform.isAffine()) {
-        transformValue = WebKitCSSTransformValue::create(WebKitCSSTransformValue::MatrixTransformOperation);
+        transformValue = CSSTransformValue::create(CSSTransformValue::MatrixTransformOperation);
 
         transformValue->append(cssValuePool().createValue(transform.a(), CSSPrimitiveValue::CSS_NUMBER));
         transformValue->append(cssValuePool().createValue(transform.b(), CSSPrimitiveValue::CSS_NUMBER));
@@ -746,7 +746,7 @@
         transformValue->append(zoomAdjustedNumberValue(transform.e(), style));
         transformValue->append(zoomAdjustedNumberValue(transform.f(), style));
     } else {
-        transformValue = WebKitCSSTransformValue::create(WebKitCSSTransformValue::Matrix3DTransformOperation);
+        transformValue = CSSTransformValue::create(CSSTransformValue::Matrix3DTransformOperation);
 
         transformValue->append(cssValuePool().createValue(transform.m11(), CSSPrimitiveValue::CSS_NUMBER));
         transformValue->append(cssValuePool().createValue(transform.m12(), CSSPrimitiveValue::CSS_NUMBER));
@@ -939,7 +939,7 @@
             const CustomFilterProgramMixSettings mixSettings = program->mixSettings();
             if (program->fragmentShader()) {
                 if (program->programType() == PROGRAM_TYPE_BLENDS_ELEMENT_TEXTURE) {
-                    RefPtr<WebKitCSSMixFunctionValue> mixFunction = WebKitCSSMixFunctionValue::create();
+                    RefPtr<CSSMixFunctionValue> mixFunction = CSSMixFunctionValue::create();
                     mixFunction->append(program->fragmentShader()->cssValue());
                     mixFunction->append(cssValuePool().createValue(mixSettings.blendMode));
                     mixFunction->append(cssValuePool().createValue(mixSettings.compositeOperator));
diff --git a/Source/core/css/WebKitCSSMixFunctionValue.cpp b/Source/core/css/CSSMixFunctionValue.cpp
similarity index 73%
rename from Source/core/css/WebKitCSSMixFunctionValue.cpp
rename to Source/core/css/CSSMixFunctionValue.cpp
index 01d1bdb..f056a06 100644
--- a/Source/core/css/WebKitCSSMixFunctionValue.cpp
+++ b/Source/core/css/CSSMixFunctionValue.cpp
@@ -28,38 +28,38 @@
  */
 
 #include "config.h"
-#include "core/css/WebKitCSSMixFunctionValue.h"
+#include "core/css/CSSMixFunctionValue.h"
 
 #include "core/dom/WebCoreMemoryInstrumentation.h"
 
 namespace WebCore {
-    
-WebKitCSSMixFunctionValue::WebKitCSSMixFunctionValue()
-    : CSSValueList(WebKitCSSMixFunctionValueClass, SpaceSeparator)
+
+CSSMixFunctionValue::CSSMixFunctionValue()
+    : CSSValueList(CSSMixFunctionValueClass, SpaceSeparator)
 {
 }
 
-WebKitCSSMixFunctionValue::WebKitCSSMixFunctionValue(const WebKitCSSMixFunctionValue& cloneFrom)
+CSSMixFunctionValue::CSSMixFunctionValue(const CSSMixFunctionValue& cloneFrom)
     : CSSValueList(cloneFrom)
 {
 }
 
-String WebKitCSSMixFunctionValue::customCssText() const
+String CSSMixFunctionValue::customCssText() const
 {
     return "mix(" + CSSValueList::customCssText() + ")";
 }
 
-PassRefPtr<WebKitCSSMixFunctionValue> WebKitCSSMixFunctionValue::cloneForCSSOM() const
+PassRefPtr<CSSMixFunctionValue> CSSMixFunctionValue::cloneForCSSOM() const
 {
-    return adoptRef(new WebKitCSSMixFunctionValue(*this));
+    return adoptRef(new CSSMixFunctionValue(*this));
 }
 
-bool WebKitCSSMixFunctionValue::equals(const WebKitCSSMixFunctionValue& other) const
+bool CSSMixFunctionValue::equals(const CSSMixFunctionValue& other) const
 {
     return CSSValueList::equals(other);
 }
 
-void WebKitCSSMixFunctionValue::reportDescendantMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
+void CSSMixFunctionValue::reportDescendantMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
 {
     MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS);
     CSSValueList::reportDescendantMemoryUsage(memoryObjectInfo);
diff --git a/Source/core/css/WebKitCSSMixFunctionValue.h b/Source/core/css/CSSMixFunctionValue.h
similarity index 76%
rename from Source/core/css/WebKitCSSMixFunctionValue.h
rename to Source/core/css/CSSMixFunctionValue.h
index bb36b66..b3b1489 100644
--- a/Source/core/css/WebKitCSSMixFunctionValue.h
+++ b/Source/core/css/CSSMixFunctionValue.h
@@ -27,34 +27,34 @@
  * SUCH DAMAGE.
  */
 
-#ifndef WebKitCSSMixFunctionValue_h
-#define WebKitCSSMixFunctionValue_h
+#ifndef CSSMixFunctionValue_h
+#define CSSMixFunctionValue_h
 
 #include "core/css/CSSValueList.h"
-#include <wtf/PassRefPtr.h>
+#include "wtf/PassRefPtr.h"
 
 namespace WebCore {
 
-class WebKitCSSMixFunctionValue : public CSSValueList {
+class CSSMixFunctionValue : public CSSValueList {
 public:
-    static PassRefPtr<WebKitCSSMixFunctionValue> create()
+    static PassRefPtr<CSSMixFunctionValue> create()
     {
-        return adoptRef(new WebKitCSSMixFunctionValue());
+        return adoptRef(new CSSMixFunctionValue());
     }
 
     String customCssText() const;
 
-    PassRefPtr<WebKitCSSMixFunctionValue> cloneForCSSOM() const;
+    PassRefPtr<CSSMixFunctionValue> cloneForCSSOM() const;
 
-    bool equals(const WebKitCSSMixFunctionValue&) const;
+    bool equals(const CSSMixFunctionValue&) const;
 
     void reportDescendantMemoryUsage(MemoryObjectInfo*) const;
 
 private:
-    WebKitCSSMixFunctionValue();
-    WebKitCSSMixFunctionValue(const WebKitCSSMixFunctionValue& cloneFrom);
+    CSSMixFunctionValue();
+    CSSMixFunctionValue(const CSSMixFunctionValue& cloneFrom);
 };
-    
+
 } // namespace WebCore
 
 
diff --git a/Source/core/css/WebKitCSSMixFunctionValue.idl b/Source/core/css/CSSMixFunctionValue.idl
similarity index 93%
rename from Source/core/css/WebKitCSSMixFunctionValue.idl
rename to Source/core/css/CSSMixFunctionValue.idl
index c4a2abd..3519f33 100644
--- a/Source/core/css/WebKitCSSMixFunctionValue.idl
+++ b/Source/core/css/CSSMixFunctionValue.idl
@@ -28,6 +28,7 @@
  */
 
 [
-] interface WebKitCSSMixFunctionValue : CSSValueList {
+    InterfaceName=WebKitCSSMixFunctionValue
+] interface CSSMixFunctionValue : CSSValueList {
 };
 
diff --git a/Source/core/css/CSSParser.cpp b/Source/core/css/CSSParser.cpp
index 8b9845c..a9faeb2 100644
--- a/Source/core/css/CSSParser.cpp
+++ b/Source/core/css/CSSParser.cpp
@@ -42,12 +42,16 @@
 #include "core/css/CSSInheritedValue.h"
 #include "core/css/CSSInitialValue.h"
 #include "core/css/CSSLineBoxContainValue.h"
+#include "core/css/CSSMixFunctionValue.h"
 #include "core/css/CSSPrimitiveValue.h"
 #include "core/css/CSSPropertySourceData.h"
 #include "core/css/CSSReflectValue.h"
+#include "core/css/CSSSVGDocumentValue.h"
 #include "core/css/CSSSelector.h"
+#include "core/css/CSSShaderValue.h"
 #include "core/css/CSSStyleSheet.h"
 #include "core/css/CSSTimingFunctionValue.h"
+#include "core/css/CSSTransformValue.h"
 #include "core/css/CSSUnicodeRangeValue.h"
 #include "core/css/CSSValueList.h"
 #include "core/css/CSSValuePool.h"
@@ -68,10 +72,6 @@
 #include "core/css/WebKitCSSFilterValue.h"
 #include "core/css/WebKitCSSKeyframeRule.h"
 #include "core/css/WebKitCSSKeyframesRule.h"
-#include "core/css/WebKitCSSMixFunctionValue.h"
-#include "core/css/WebKitCSSSVGDocumentValue.h"
-#include "core/css/WebKitCSSShaderValue.h"
-#include "core/css/WebKitCSSTransformValue.h"
 #include "core/dom/Document.h"
 #include "core/html/parser/HTMLParserIdioms.h"
 #include "core/inspector/InspectorInstrumentation.h"
@@ -1091,7 +1091,7 @@
 }
 
 template <typename CharacterType>
-static bool parseTransformArguments(WebKitCSSTransformValue* transformValue, CharacterType* characters, unsigned length, unsigned start, unsigned expectedCount)
+static bool parseTransformArguments(CSSTransformValue* transformValue, CharacterType* characters, unsigned length, unsigned start, unsigned expectedCount)
 {
     while (expectedCount) {
         size_t end = WTF::find(characters, length, expectedCount == 1 ? ')' : ',', start);
@@ -1124,27 +1124,27 @@
     UChar c9 = toASCIILower(string[9]);
     UChar c10 = toASCIILower(string[10]);
 
-    WebKitCSSTransformValue::TransformOperationType transformType;
+    CSSTransformValue::TransformOperationType transformType;
     unsigned expectedArgumentCount = 1;
     unsigned argumentStart = 11;
     if (c9 == 'x' && c10 == '(')
-        transformType = WebKitCSSTransformValue::TranslateXTransformOperation;
+        transformType = CSSTransformValue::TranslateXTransformOperation;
     else if (c9 == 'y' && c10 == '(')
-        transformType = WebKitCSSTransformValue::TranslateYTransformOperation;
+        transformType = CSSTransformValue::TranslateYTransformOperation;
     else if (c9 == 'z' && c10 == '(')
-        transformType = WebKitCSSTransformValue::TranslateZTransformOperation;
+        transformType = CSSTransformValue::TranslateZTransformOperation;
     else if (c9 == '(') {
-        transformType = WebKitCSSTransformValue::TranslateTransformOperation;
+        transformType = CSSTransformValue::TranslateTransformOperation;
         expectedArgumentCount = 2;
         argumentStart = 10;
     } else if (c9 == '3' && c10 == 'd' && string[11] == '(') {
-        transformType = WebKitCSSTransformValue::Translate3DTransformOperation;
+        transformType = CSSTransformValue::Translate3DTransformOperation;
         expectedArgumentCount = 3;
         argumentStart = 12;
     } else
         return false;
 
-    RefPtr<WebKitCSSTransformValue> transformValue = WebKitCSSTransformValue::create(transformType);
+    RefPtr<CSSTransformValue> transformValue = CSSTransformValue::create(transformType);
     bool success;
     if (string.is8Bit())
         success = parseTransformArguments(transformValue.get(), string.characters8(), string.length(), argumentStart, expectedArgumentCount);
@@ -7671,7 +7671,7 @@
 class TransformOperationInfo {
 public:
     TransformOperationInfo(const CSSParserString& name)
-        : m_type(WebKitCSSTransformValue::UnknownTransformOperation)
+        : m_type(CSSTransformValue::UnknownTransformOperation)
         , m_argCount(1)
         , m_allowSingleArgument(false)
         , m_unit(CSSParser::FUnknown)
@@ -7699,7 +7699,7 @@
                 & ((characters[3] == 'w') || (characters[3] == 'W'))
                 & (characters[4] == '(')) {
                 m_unit = CSSParser::FAngle;
-                m_type = WebKitCSSTransformValue::SkewTransformOperation;
+                m_type = CSSTransformValue::SkewTransformOperation;
                 m_allowSingleArgument = true;
                 m_argCount = 3;
             }
@@ -7713,7 +7713,7 @@
                     & ((characters[4] == 'e') || (characters[4] == 'E'))
                     & (characters[5] == '(')) {
                     m_unit = CSSParser::FNumber;
-                    m_type = WebKitCSSTransformValue::ScaleTransformOperation;
+                    m_type = CSSTransformValue::ScaleTransformOperation;
                     m_allowSingleArgument = true;
                     m_argCount = 3;
                 }
@@ -7724,10 +7724,10 @@
                        & (characters[5] == '(')) {
                 if ((characters[4] == 'x') || (characters[4] == 'X')) {
                     m_unit = CSSParser::FAngle;
-                    m_type = WebKitCSSTransformValue::SkewXTransformOperation;
+                    m_type = CSSTransformValue::SkewXTransformOperation;
                 } else if ((characters[4] == 'y') || (characters[4] == 'Y')) {
                     m_unit = CSSParser::FAngle;
-                    m_type = WebKitCSSTransformValue::SkewYTransformOperation;
+                    m_type = CSSTransformValue::SkewYTransformOperation;
                 }
             }
             break;
@@ -7741,7 +7741,7 @@
                     & ((characters[5] == 'x') || (characters[5] == 'X'))
                     & (characters[6] == '(')) {
                     m_unit = CSSParser::FNumber;
-                    m_type = WebKitCSSTransformValue::MatrixTransformOperation;
+                    m_type = CSSTransformValue::MatrixTransformOperation;
                     m_argCount = 11;
                 }
             } else if ((characters[0] == 'r') || (characters[0] == 'R')) {
@@ -7752,7 +7752,7 @@
                     & ((characters[5] == 'e') || (characters[5] == 'E'))
                     & (characters[6] == '(')) {
                     m_unit = CSSParser::FAngle;
-                    m_type = WebKitCSSTransformValue::RotateTransformOperation;
+                    m_type = CSSTransformValue::RotateTransformOperation;
                 }
             } else if (((characters[0] == 's') || (characters[0] == 'S'))
                        & ((characters[1] == 'c') || (characters[1] == 'C'))
@@ -7762,13 +7762,13 @@
                        & (characters[6] == '(')) {
                 if ((characters[5] == 'x') || (characters[5] == 'X')) {
                     m_unit = CSSParser::FNumber;
-                    m_type = WebKitCSSTransformValue::ScaleXTransformOperation;
+                    m_type = CSSTransformValue::ScaleXTransformOperation;
                 } else if ((characters[5] == 'y') || (characters[5] == 'Y')) {
                     m_unit = CSSParser::FNumber;
-                    m_type = WebKitCSSTransformValue::ScaleYTransformOperation;
+                    m_type = CSSTransformValue::ScaleYTransformOperation;
                 } else if ((characters[5] == 'z') || (characters[5] == 'Z')) {
                     m_unit = CSSParser::FNumber;
-                    m_type = WebKitCSSTransformValue::ScaleZTransformOperation;
+                    m_type = CSSTransformValue::ScaleZTransformOperation;
                 }
             }
             break;
@@ -7783,7 +7783,7 @@
                     & ((characters[6] == 'd') || (characters[6] == 'D'))
                     & (characters[7] == '(')) {
                     m_unit = CSSParser::FNumber;
-                    m_type = WebKitCSSTransformValue::Scale3DTransformOperation;
+                    m_type = CSSTransformValue::Scale3DTransformOperation;
                     m_argCount = 5;
                 }
             } else if (((characters[0] == 'r') || (characters[0] == 'R'))
@@ -7795,13 +7795,13 @@
                        & (characters[7] == '(')) {
                 if ((characters[6] == 'x') || (characters[6] == 'X')) {
                     m_unit = CSSParser::FAngle;
-                    m_type = WebKitCSSTransformValue::RotateXTransformOperation;
+                    m_type = CSSTransformValue::RotateXTransformOperation;
                 } else if ((characters[6] == 'y') || (characters[6] == 'Y')) {
                     m_unit = CSSParser::FAngle;
-                    m_type = WebKitCSSTransformValue::RotateYTransformOperation;
+                    m_type = CSSTransformValue::RotateYTransformOperation;
                 } else if ((characters[6] == 'z') || (characters[6] == 'Z')) {
                     m_unit = CSSParser::FAngle;
-                    m_type = WebKitCSSTransformValue::RotateZTransformOperation;
+                    m_type = CSSTransformValue::RotateZTransformOperation;
                 }
             }
             break;
@@ -7817,7 +7817,7 @@
                     & ((characters[7] == 'd') || (characters[7] == 'D'))
                     & (characters[8] == '(')) {
                     m_unit = CSSParser::FNumber;
-                    m_type = WebKitCSSTransformValue::Matrix3DTransformOperation;
+                    m_type = CSSTransformValue::Matrix3DTransformOperation;
                     m_argCount = 31;
                 }
             } else if (((characters[0] == 'r') || (characters[0] == 'R'))
@@ -7830,7 +7830,7 @@
                        & ((characters[7] == 'd') || (characters[7] == 'D'))
                        & (characters[8] == '(')) {
                 m_unit = CSSParser::FNumber;
-                m_type = WebKitCSSTransformValue::Rotate3DTransformOperation;
+                m_type = CSSTransformValue::Rotate3DTransformOperation;
                 m_argCount = 7;
             }
             break;
@@ -7847,7 +7847,7 @@
                 & ((characters[8] == 'e') || (characters[8] == 'E'))
                 & (characters[9] == '(')) {
                 m_unit = CSSParser::FLength | CSSParser::FPercent;
-                m_type = WebKitCSSTransformValue::TranslateTransformOperation;
+                m_type = CSSTransformValue::TranslateTransformOperation;
                 m_allowSingleArgument = true;
                 m_argCount = 3;
             }
@@ -7866,13 +7866,13 @@
                 & (characters[10] == '(')) {
                 if ((characters[9] == 'x') || (characters[9] == 'X')) {
                     m_unit = CSSParser::FLength | CSSParser::FPercent;
-                    m_type = WebKitCSSTransformValue::TranslateXTransformOperation;
+                    m_type = CSSTransformValue::TranslateXTransformOperation;
                 } else if ((characters[9] == 'y') || (characters[9] == 'Y')) {
                     m_unit = CSSParser::FLength | CSSParser::FPercent;
-                    m_type = WebKitCSSTransformValue::TranslateYTransformOperation;
+                    m_type = CSSTransformValue::TranslateYTransformOperation;
                 } else if ((characters[9] == 'z') || (characters[9] == 'Z')) {
                     m_unit = CSSParser::FLength | CSSParser::FPercent;
-                    m_type = WebKitCSSTransformValue::TranslateZTransformOperation;
+                    m_type = CSSTransformValue::TranslateZTransformOperation;
                 }
             }
             break;
@@ -7891,7 +7891,7 @@
                     & ((characters[10] == 'e') || (characters[10] == 'E'))
                     & (characters[11] == '(')) {
                     m_unit = CSSParser::FNumber;
-                    m_type = WebKitCSSTransformValue::PerspectiveTransformOperation;
+                    m_type = CSSTransformValue::PerspectiveTransformOperation;
                 }
             } else if (((characters[0] == 't') || (characters[0] == 'T'))
                        & ((characters[1] == 'r') || (characters[1] == 'R'))
@@ -7906,22 +7906,22 @@
                        & ((characters[10] == 'd') || (characters[10] == 'D'))
                        & (characters[11] == '(')) {
                 m_unit = CSSParser::FLength | CSSParser::FPercent;
-                m_type = WebKitCSSTransformValue::Translate3DTransformOperation;
+                m_type = CSSTransformValue::Translate3DTransformOperation;
                 m_argCount = 5;
             }
             break;
         } // end switch ()
     }
 
-    WebKitCSSTransformValue::TransformOperationType type() const { return m_type; }
+    CSSTransformValue::TransformOperationType type() const { return m_type; }
     unsigned argCount() const { return m_argCount; }
     CSSParser::Units unit() const { return m_unit; }
 
-    bool unknown() const { return m_type == WebKitCSSTransformValue::UnknownTransformOperation; }
+    bool unknown() const { return m_type == CSSTransformValue::UnknownTransformOperation; }
     bool hasCorrectArgCount(unsigned argCount) { return m_argCount == argCount || (m_allowSingleArgument && argCount == 1); }
 
 private:
-    WebKitCSSTransformValue::TransformOperationType m_type;
+    CSSTransformValue::TransformOperationType m_type;
     unsigned m_argCount;
     bool m_allowSingleArgument;
     CSSParser::Units m_unit;
@@ -7963,10 +7963,10 @@
         return 0;
 
     // The transform is a list of functional primitives that specify transform operations.
-    // We collect a list of WebKitCSSTransformValues, where each value specifies a single operation.
+    // We collect a list of CSSTransformValues, where each value specifies a single operation.
 
-    // Create the new WebKitCSSTransformValue for this operation and add it to our list.
-    RefPtr<WebKitCSSTransformValue> transformValue = WebKitCSSTransformValue::create(info.type());
+    // Create the new CSSTransformValue for this operation and add it to our list.
+    RefPtr<CSSTransformValue> transformValue = CSSTransformValue::create(info.type());
 
     // Snag our values.
     CSSParserValue* a = args->current();
@@ -7974,19 +7974,19 @@
     while (a) {
         CSSParser::Units unit = info.unit();
 
-        if (info.type() == WebKitCSSTransformValue::Rotate3DTransformOperation && argNumber == 3) {
+        if (info.type() == CSSTransformValue::Rotate3DTransformOperation && argNumber == 3) {
             // 4th param of rotate3d() is an angle rather than a bare number, validate it as such
             if (!validUnit(a, FAngle, CSSStrictMode))
                 return 0;
-        } else if (info.type() == WebKitCSSTransformValue::Translate3DTransformOperation && argNumber == 2) {
+        } else if (info.type() == CSSTransformValue::Translate3DTransformOperation && argNumber == 2) {
             // 3rd param of translate3d() cannot be a percentage
             if (!validUnit(a, FLength, CSSStrictMode))
                 return 0;
-        } else if (info.type() == WebKitCSSTransformValue::TranslateZTransformOperation && !argNumber) {
+        } else if (info.type() == CSSTransformValue::TranslateZTransformOperation && !argNumber) {
             // 1st param of translateZ() cannot be a percentage
             if (!validUnit(a, FLength, CSSStrictMode))
                 return 0;
-        } else if (info.type() == WebKitCSSTransformValue::PerspectiveTransformOperation && !argNumber) {
+        } else if (info.type() == CSSTransformValue::PerspectiveTransformOperation && !argNumber) {
             // 1st param of perspective() must be a non-negative number (deprecated) or length.
             if (!validUnit(a, FNumber | FLength | FNonNeg, CSSStrictMode))
                 return 0;
@@ -8095,7 +8095,7 @@
     return arrayFunction;
 }
 
-PassRefPtr<WebKitCSSMixFunctionValue> CSSParser::parseMixFunction(CSSParserValue* value)
+PassRefPtr<CSSMixFunctionValue> CSSParser::parseMixFunction(CSSParserValue* value)
 {
     ASSERT(value->unit == CSSParserValue::Function && value->function);
 
@@ -8110,7 +8110,7 @@
     if (numArgs < 1 || numArgs > 3)
         return 0;
 
-    RefPtr<WebKitCSSMixFunctionValue> mixFunction = WebKitCSSMixFunctionValue::create();
+    RefPtr<CSSMixFunctionValue> mixFunction = CSSMixFunctionValue::create();
 
     bool hasBlendMode = false;
     bool hasAlphaCompositing = false;
@@ -8122,7 +8122,7 @@
         if (!argNumber) {
             if (arg->unit == CSSPrimitiveValue::CSS_URI) {
                 KURL shaderURL = completeURL(arg->string);
-                value = WebKitCSSShaderValue::create(shaderURL.string());
+                value = CSSShaderValue::create(shaderURL.string());
             }
         } else if (argNumber == 1 || argNumber == 2) {
             if (!hasBlendMode && isBlendMode(arg->id)) {
@@ -8300,7 +8300,7 @@
             value = cssValuePool().createIdentifierValue(CSSValueNone);
         else if (arg->unit == CSSPrimitiveValue::CSS_URI) {
             KURL shaderURL = completeURL(arg->string);
-            value = WebKitCSSShaderValue::create(shaderURL.string());
+            value = CSSShaderValue::create(shaderURL.string());
             hadAtLeastOneCustomShader = true;
         } else if (argsList->currentIndex() == 1 && arg->unit == CSSParserValue::Function) {
             if (!(value = parseMixFunction(arg)))
@@ -8405,11 +8405,11 @@
     return list.release();
 }
 
-PassRefPtr<WebKitCSSShaderValue> CSSParser::parseFilterRuleSrcUriAndFormat(CSSParserValueList* valueList)
+PassRefPtr<CSSShaderValue> CSSParser::parseFilterRuleSrcUriAndFormat(CSSParserValueList* valueList)
 {
     CSSParserValue* value = valueList->current();
     ASSERT(value && value->unit == CSSPrimitiveValue::CSS_URI);
-    RefPtr<WebKitCSSShaderValue> shaderValue = WebKitCSSShaderValue::create(completeURL(value->string));
+    RefPtr<CSSShaderValue> shaderValue = CSSShaderValue::create(completeURL(value->string));
 
     value = valueList->next();
     if (value && value->unit == CSSParserValue::Function && equalIgnoringCase(value->function->name, "format(")) {
@@ -8437,7 +8437,7 @@
         if (value->unit != CSSPrimitiveValue::CSS_URI)
             return false;
 
-        RefPtr<WebKitCSSShaderValue> shaderValue = parseFilterRuleSrcUriAndFormat(m_valueList.get());
+        RefPtr<CSSShaderValue> shaderValue = parseFilterRuleSrcUriAndFormat(m_valueList.get());
         if (!shaderValue)
             return false;
         srcList->append(shaderValue.release());
@@ -8576,7 +8576,7 @@
         if (value->unit == CSSPrimitiveValue::CSS_URI) {
             RefPtr<WebKitCSSFilterValue> referenceFilterValue = WebKitCSSFilterValue::create(WebKitCSSFilterValue::ReferenceFilterOperation);
             list->append(referenceFilterValue);
-            referenceFilterValue->append(WebKitCSSSVGDocumentValue::create(value->string));
+            referenceFilterValue->append(CSSSVGDocumentValue::create(value->string));
         } else {
             const CSSParserString name = value->function->name;
             unsigned maximumArgumentCount = 1;
diff --git a/Source/core/css/CSSParser.h b/Source/core/css/CSSParser.h
index e7099ae..76fab91 100644
--- a/Source/core/css/CSSParser.h
+++ b/Source/core/css/CSSParser.h
@@ -45,8 +45,10 @@
 
 class AnimationParseContext;
 class CSSBorderImageSliceValue;
+class CSSMixFunctionValue;
 class CSSPrimitiveValue;
 class CSSSelectorList;
+class CSSShaderValue;
 class CSSValue;
 class CSSValueList;
 class CSSBasicShape;
@@ -65,8 +67,6 @@
 class StyledElement;
 
 class WebKitCSSArrayFunctionValue;
-class WebKitCSSMixFunctionValue;
-class WebKitCSSShaderValue;
 
 struct CSSParserLocation;
 
@@ -236,7 +236,7 @@
 
     PassRefPtr<CSSValueList> parseFilter();
     PassRefPtr<WebKitCSSFilterValue> parseBuiltinFilterArguments(CSSParserValueList*, WebKitCSSFilterValue::FilterOperationType);
-    PassRefPtr<WebKitCSSMixFunctionValue> parseMixFunction(CSSParserValue*);
+    PassRefPtr<CSSMixFunctionValue> parseMixFunction(CSSParserValue*);
     PassRefPtr<WebKitCSSArrayFunctionValue> parseCustomFilterArrayFunction(CSSParserValue*);
     PassRefPtr<CSSValueList> parseCustomFilterTransform(CSSParserValueList*);
     PassRefPtr<CSSValueList> parseCustomFilterParameters(CSSParserValueList*);
@@ -244,7 +244,7 @@
     PassRefPtr<WebKitCSSFilterValue> parseCustomFilterFunctionWithInlineSyntax(CSSParserValue*);
     PassRefPtr<WebKitCSSFilterValue> parseCustomFilterFunction(CSSParserValue*);
     bool parseFilterRuleSrc();
-    PassRefPtr<WebKitCSSShaderValue> parseFilterRuleSrcUriAndFormat(CSSParserValueList*);
+    PassRefPtr<CSSShaderValue> parseFilterRuleSrcUriAndFormat(CSSParserValueList*);
 
     static bool isBlendMode(int ident);
     static bool isCompositeOperator(int ident);
diff --git a/Source/core/css/WebKitCSSRegionRule.cpp b/Source/core/css/CSSRegionRule.cpp
similarity index 88%
rename from Source/core/css/WebKitCSSRegionRule.cpp
rename to Source/core/css/CSSRegionRule.cpp
index 704c912..7a34ab1 100644
--- a/Source/core/css/WebKitCSSRegionRule.cpp
+++ b/Source/core/css/CSSRegionRule.cpp
@@ -30,23 +30,23 @@
 
 #include "config.h"
 
-#include "core/css/WebKitCSSRegionRule.h"
+#include "core/css/CSSRegionRule.h"
 
 #include "RuntimeEnabledFeatures.h"
 #include "core/css/CSSParser.h"
 #include "core/css/CSSRuleList.h"
 #include "core/css/StyleRule.h"
-#include <wtf/MemoryInstrumentationVector.h>
-#include <wtf/text/StringBuilder.h>
+#include "wtf/MemoryInstrumentationVector.h"
+#include "wtf/text/StringBuilder.h"
 
 namespace WebCore {
-WebKitCSSRegionRule::WebKitCSSRegionRule(StyleRuleRegion* regionRule, CSSStyleSheet* parent)
+CSSRegionRule::CSSRegionRule(StyleRuleRegion* regionRule, CSSStyleSheet* parent)
     : CSSGroupingRule(regionRule, parent)
 {
     ASSERT(RuntimeEnabledFeatures::cssRegionsEnabled());
 }
 
-String WebKitCSSRegionRule::cssText() const
+String CSSRegionRule::cssText() const
 {
     StringBuilder result;
     result.appendLiteral("@-webkit-region ");
diff --git a/Source/core/css/WebKitCSSRegionRule.h b/Source/core/css/CSSRegionRule.h
similarity index 81%
rename from Source/core/css/WebKitCSSRegionRule.h
rename to Source/core/css/CSSRegionRule.h
index 7a65eb5..f6f82e1 100644
--- a/Source/core/css/WebKitCSSRegionRule.h
+++ b/Source/core/css/CSSRegionRule.h
@@ -28,8 +28,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef WebKitCSSRegionRule_h
-#define WebKitCSSRegionRule_h
+#ifndef CSSRegionRule_h
+#define CSSRegionRule_h
 
 #include "core/css/CSSGroupingRule.h"
 
@@ -37,17 +37,17 @@
 
 class StyleRuleRegion;
 
-class WebKitCSSRegionRule : public CSSGroupingRule {
+class CSSRegionRule : public CSSGroupingRule {
 public:
-    static PassRefPtr<WebKitCSSRegionRule> create(StyleRuleRegion* rule, CSSStyleSheet* sheet) { return adoptRef(new WebKitCSSRegionRule(rule, sheet)); }
+    static PassRefPtr<CSSRegionRule> create(StyleRuleRegion* rule, CSSStyleSheet* sheet) { return adoptRef(new CSSRegionRule(rule, sheet)); }
 
     virtual CSSRule::Type type() const OVERRIDE { return WEBKIT_REGION_RULE; }
     virtual String cssText() const OVERRIDE;
 
 private:
-    WebKitCSSRegionRule(StyleRuleRegion*, CSSStyleSheet* parent);
+    CSSRegionRule(StyleRuleRegion*, CSSStyleSheet* parent);
 };
 
 }
 
-#endif // WebKitCSSRegionRule_h
+#endif // CSSRegionRule_h
diff --git a/Source/core/css/WebKitCSSRegionRule.idl b/Source/core/css/CSSRegionRule.idl
similarity index 92%
rename from Source/core/css/WebKitCSSRegionRule.idl
rename to Source/core/css/CSSRegionRule.idl
index 2dfbf39..0b264a3 100644
--- a/Source/core/css/WebKitCSSRegionRule.idl
+++ b/Source/core/css/CSSRegionRule.idl
@@ -28,8 +28,9 @@
  */
 
 [
-    EnabledAtRuntime=cssRegions
-] interface WebKitCSSRegionRule : CSSRule {
+    EnabledAtRuntime=cssRegions,
+    InterfaceName=WebKitCSSRegionRule
+] interface CSSRegionRule : CSSRule {
     readonly attribute CSSRuleList cssRules;
 };
 
diff --git a/Source/core/css/WebKitCSSSVGDocumentValue.cpp b/Source/core/css/CSSSVGDocumentValue.cpp
similarity index 81%
rename from Source/core/css/WebKitCSSSVGDocumentValue.cpp
rename to Source/core/css/CSSSVGDocumentValue.cpp
index a7afd99..d372374 100644
--- a/Source/core/css/WebKitCSSSVGDocumentValue.cpp
+++ b/Source/core/css/CSSSVGDocumentValue.cpp
@@ -24,7 +24,7 @@
 
 #include "config.h"
 
-#include "core/css/WebKitCSSSVGDocumentValue.h"
+#include "core/css/CSSSVGDocumentValue.h"
 
 #include "core/css/CSSParser.h"
 #include "core/dom/Document.h"
@@ -36,18 +36,18 @@
 
 namespace WebCore {
 
-WebKitCSSSVGDocumentValue::WebKitCSSSVGDocumentValue(const String& url)
-    : CSSValue(WebKitCSSSVGDocumentClass)
+CSSSVGDocumentValue::CSSSVGDocumentValue(const String& url)
+    : CSSValue(CSSSVGDocumentClass)
     , m_url(url)
     , m_loadRequested(false)
 {
 }
 
-WebKitCSSSVGDocumentValue::~WebKitCSSSVGDocumentValue()
+CSSSVGDocumentValue::~CSSSVGDocumentValue()
 {
 }
 
-CachedDocument* WebKitCSSSVGDocumentValue::load(CachedResourceLoader* loader)
+CachedDocument* CSSSVGDocumentValue::load(CachedResourceLoader* loader)
 {
     ASSERT(loader);
 
@@ -61,17 +61,17 @@
     return m_document.get();
 }
 
-String WebKitCSSSVGDocumentValue::customCssText() const
+String CSSSVGDocumentValue::customCssText() const
 {
     return quoteCSSStringIfNeeded(m_url);
 }
 
-bool WebKitCSSSVGDocumentValue::equals(const WebKitCSSSVGDocumentValue& other) const
+bool CSSSVGDocumentValue::equals(const CSSSVGDocumentValue& other) const
 {
     return m_url == other.m_url;
 }
 
-void WebKitCSSSVGDocumentValue::reportDescendantMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
+void CSSSVGDocumentValue::reportDescendantMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
 {
     MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS);
     info.addMember(m_url, "url");
diff --git a/Source/core/css/WebKitCSSSVGDocumentValue.h b/Source/core/css/CSSSVGDocumentValue.h
similarity index 81%
rename from Source/core/css/WebKitCSSSVGDocumentValue.h
rename to Source/core/css/CSSSVGDocumentValue.h
index c6af8c6..fdb5631 100644
--- a/Source/core/css/WebKitCSSSVGDocumentValue.h
+++ b/Source/core/css/CSSSVGDocumentValue.h
@@ -22,8 +22,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef WebKitCSSSVGDocumentValue_h
-#define WebKitCSSSVGDocumentValue_h
+#ifndef CSSSVGDocumentValue_h
+#define CSSSVGDocumentValue_h
 
 #include "core/css/CSSValue.h"
 #include "core/loader/cache/CachedDocument.h"
@@ -33,10 +33,10 @@
 
 class CachedResourceLoader;
 
-class WebKitCSSSVGDocumentValue : public CSSValue {
+class CSSSVGDocumentValue : public CSSValue {
 public:
-    static PassRefPtr<WebKitCSSSVGDocumentValue> create(const String& url) { return adoptRef(new WebKitCSSSVGDocumentValue(url)); }
-    ~WebKitCSSSVGDocumentValue();
+    static PassRefPtr<CSSSVGDocumentValue> create(const String& url) { return adoptRef(new CSSSVGDocumentValue(url)); }
+    ~CSSSVGDocumentValue();
 
     CachedDocument* cachedSVGDocument() const { return m_document.get(); }
     CachedDocument* load(CachedResourceLoader*);
@@ -44,12 +44,12 @@
     String customCssText() const;
     const String& url() const { return m_url; }
     bool loadRequested() const { return m_loadRequested; }
-    bool equals(const WebKitCSSSVGDocumentValue&) const;
+    bool equals(const CSSSVGDocumentValue&) const;
 
     void reportDescendantMemoryUsage(MemoryObjectInfo*) const;
 
 private:
-    WebKitCSSSVGDocumentValue(const String& url);
+    CSSSVGDocumentValue(const String& url);
 
     String m_url;
     CachedResourceHandle<CachedDocument> m_document;
@@ -58,4 +58,4 @@
 
 } // namespace WebCore
 
-#endif // WebKitCSSSVGDocumentValue_h
+#endif // CSSSVGDocumentValue_h
diff --git a/Source/core/css/WebKitCSSShaderValue.cpp b/Source/core/css/CSSShaderValue.cpp
similarity index 82%
rename from Source/core/css/WebKitCSSShaderValue.cpp
rename to Source/core/css/CSSShaderValue.cpp
index 23b49d0..d3db8e1 100644
--- a/Source/core/css/WebKitCSSShaderValue.cpp
+++ b/Source/core/css/CSSShaderValue.cpp
@@ -29,7 +29,7 @@
 
 #include "config.h"
 
-#include "core/css/WebKitCSSShaderValue.h"
+#include "core/css/CSSShaderValue.h"
 
 #include "core/css/CSSParser.h"
 #include "core/dom/Document.h"
@@ -42,23 +42,23 @@
 
 namespace WebCore {
 
-WebKitCSSShaderValue::WebKitCSSShaderValue(const String& url)
-    : CSSValue(WebKitCSSShaderClass)
+CSSShaderValue::CSSShaderValue(const String& url)
+    : CSSValue(CSSShaderClass)
     , m_url(url)
     , m_accessedShader(false)
 {
 }
 
-WebKitCSSShaderValue::~WebKitCSSShaderValue()
+CSSShaderValue::~CSSShaderValue()
 {
 }
 
-KURL WebKitCSSShaderValue::completeURL(CachedResourceLoader* loader) const
+KURL CSSShaderValue::completeURL(CachedResourceLoader* loader) const
 {
     return loader->document()->completeURL(m_url);
 }
 
-StyleCachedShader* WebKitCSSShaderValue::cachedShader(CachedResourceLoader* loader)
+StyleCachedShader* CSSShaderValue::cachedShader(CachedResourceLoader* loader)
 {
     ASSERT(loader);
 
@@ -73,7 +73,7 @@
     return (m_shader && m_shader->isCachedShader()) ? static_cast<StyleCachedShader*>(m_shader.get()) : 0;
 }
 
-StyleShader* WebKitCSSShaderValue::cachedOrPendingShader()
+StyleShader* CSSShaderValue::cachedOrPendingShader()
 {
     if (!m_shader)
         m_shader = StylePendingShader::create(this);
@@ -81,7 +81,7 @@
     return m_shader.get();
 }
 
-String WebKitCSSShaderValue::customCssText() const
+String CSSShaderValue::customCssText() const
 {
     StringBuilder result;
     result.appendLiteral("url(");
@@ -95,17 +95,17 @@
     return result.toString();
 }
 
-bool WebKitCSSShaderValue::equals(const WebKitCSSShaderValue& other) const
+bool CSSShaderValue::equals(const CSSShaderValue& other) const
 {
     return m_url == other.m_url;
 }
 
-void WebKitCSSShaderValue::reportDescendantMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
+void CSSShaderValue::reportDescendantMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
 {
     MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS);
     info.addMember(m_url, "url");
     info.addMember(m_format, "format");
 }
-    
+
 } // namespace WebCore
 
diff --git a/Source/core/css/WebKitCSSShaderValue.h b/Source/core/css/CSSShaderValue.h
similarity index 77%
rename from Source/core/css/WebKitCSSShaderValue.h
rename to Source/core/css/CSSShaderValue.h
index 773eb6e..07387cf 100644
--- a/Source/core/css/WebKitCSSShaderValue.h
+++ b/Source/core/css/CSSShaderValue.h
@@ -27,8 +27,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef WebKitCSSShaderValue_h
-#define WebKitCSSShaderValue_h
+#ifndef CSSShaderValue_h
+#define CSSShaderValue_h
 
 #include "core/css/CSSValue.h"
 
@@ -39,10 +39,10 @@
 class StyleCachedShader;
 class StyleShader;
 
-class WebKitCSSShaderValue : public CSSValue {
+class CSSShaderValue : public CSSValue {
 public:
-    static PassRefPtr<WebKitCSSShaderValue> create(const String& url) { return adoptRef(new WebKitCSSShaderValue(url)); }
-    ~WebKitCSSShaderValue();
+    static PassRefPtr<CSSShaderValue> create(const String& url) { return adoptRef(new CSSShaderValue(url)); }
+    ~CSSShaderValue();
 
     const String& format() const { return m_format; }
     void setFormat(const String& format) { m_format = format; }
@@ -53,12 +53,12 @@
 
     String customCssText() const;
 
-    bool equals(const WebKitCSSShaderValue&) const;
+    bool equals(const CSSShaderValue&) const;
 
     void reportDescendantMemoryUsage(MemoryObjectInfo*) const;
 
 private:
-    WebKitCSSShaderValue(const String& url);
+    CSSShaderValue(const String& url);
 
     String m_url;
     String m_format;
@@ -67,14 +67,14 @@
 };
 
 // This will catch anyone doing an unnecessary cast.
-WebKitCSSShaderValue* toWebKitCSSShaderValue(const WebKitCSSShaderValue*);
+CSSShaderValue* toCSSShaderValue(const CSSShaderValue*);
 
-inline WebKitCSSShaderValue* toWebKitCSSShaderValue(CSSValue* value)
+inline CSSShaderValue* toCSSShaderValue(CSSValue* value)
 {
-    return value->isWebKitCSSShaderValue() ? static_cast<WebKitCSSShaderValue*>(value) : 0;
+    return value->isCSSShaderValue() ? static_cast<CSSShaderValue*>(value) : 0;
 }
 
 } // namespace WebCore
 
 
-#endif // WebKitCSSShaderValue_h
+#endif // CSSShaderValue_h
diff --git a/Source/core/css/WebKitCSSTransformValue.cpp b/Source/core/css/CSSTransformValue.cpp
similarity index 73%
rename from Source/core/css/WebKitCSSTransformValue.cpp
rename to Source/core/css/CSSTransformValue.cpp
index 6719d9e..20f291d 100644
--- a/Source/core/css/WebKitCSSTransformValue.cpp
+++ b/Source/core/css/CSSTransformValue.cpp
@@ -24,12 +24,12 @@
  */
 
 #include "config.h"
-#include "core/css/WebKitCSSTransformValue.h"
+#include "core/css/CSSTransformValue.h"
 
 #include "core/css/CSSValueList.h"
 #include "core/dom/WebCoreMemoryInstrumentation.h"
-#include <wtf/PassRefPtr.h>
-#include <wtf/text/WTFString.h>
+#include "wtf/PassRefPtr.h"
+#include "wtf/text/WTFString.h"
 
 namespace WebCore {
 
@@ -59,43 +59,43 @@
     "matrix3d("
 };
 
-static inline String transformValueToCssString(WebKitCSSTransformValue::TransformOperationType operation, const String& value)
+static inline String transformValueToCssString(CSSTransformValue::TransformOperationType operation, const String& value)
 {
-    if (operation != WebKitCSSTransformValue::UnknownTransformOperation) {
+    if (operation != CSSTransformValue::UnknownTransformOperation) {
         ASSERT_WITH_SECURITY_IMPLICATION(static_cast<size_t>(operation) < WTF_ARRAY_LENGTH(transformNamePrefixes));
         return transformNamePrefixes[operation] + value + ")";
     }
     return String();
 }
 
-WebKitCSSTransformValue::WebKitCSSTransformValue(TransformOperationType op)
-    : CSSValueList(WebKitCSSTransformClass, CommaSeparator)
+CSSTransformValue::CSSTransformValue(TransformOperationType op)
+    : CSSValueList(CSSTransformClass, CommaSeparator)
     , m_type(op)
 {
 }
 
-String WebKitCSSTransformValue::customCssText() const
+String CSSTransformValue::customCssText() const
 {
     return transformValueToCssString(m_type, CSSValueList::customCssText());
 }
 
-String WebKitCSSTransformValue::customSerializeResolvingVariables(const HashMap<AtomicString, String>& variables) const
+String CSSTransformValue::customSerializeResolvingVariables(const HashMap<AtomicString, String>& variables) const
 {
     return transformValueToCssString(m_type, CSSValueList::customSerializeResolvingVariables(variables));
 }
 
-WebKitCSSTransformValue::WebKitCSSTransformValue(const WebKitCSSTransformValue& cloneFrom)
+CSSTransformValue::CSSTransformValue(const CSSTransformValue& cloneFrom)
     : CSSValueList(cloneFrom)
     , m_type(cloneFrom.m_type)
 {
 }
 
-PassRefPtr<WebKitCSSTransformValue> WebKitCSSTransformValue::cloneForCSSOM() const
+PassRefPtr<CSSTransformValue> CSSTransformValue::cloneForCSSOM() const
 {
-    return adoptRef(new WebKitCSSTransformValue(*this));
+    return adoptRef(new CSSTransformValue(*this));
 }
 
-void WebKitCSSTransformValue::reportDescendantMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
+void CSSTransformValue::reportDescendantMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
 {
     MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS);
     CSSValueList::reportDescendantMemoryUsage(memoryObjectInfo);
diff --git a/Source/core/css/WebKitCSSTransformValue.h b/Source/core/css/CSSTransformValue.h
similarity index 80%
rename from Source/core/css/WebKitCSSTransformValue.h
rename to Source/core/css/CSSTransformValue.h
index c35cde7..635a608 100644
--- a/Source/core/css/WebKitCSSTransformValue.h
+++ b/Source/core/css/CSSTransformValue.h
@@ -23,16 +23,16 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef WebKitCSSTransformValue_h
-#define WebKitCSSTransformValue_h
+#ifndef CSSTransformValue_h
+#define CSSTransformValue_h
 
 #include "core/css/CSSValueList.h"
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefPtr.h>
+#include "wtf/PassRefPtr.h"
+#include "wtf/RefPtr.h"
 
 namespace WebCore {
 
-class WebKitCSSTransformValue : public CSSValueList {
+class CSSTransformValue : public CSSValueList {
 public:
     // NOTE: these have to match the values in the IDL
     enum TransformOperationType {
@@ -60,24 +60,24 @@
         Matrix3DTransformOperation
     };
 
-    static PassRefPtr<WebKitCSSTransformValue> create(TransformOperationType type)
+    static PassRefPtr<CSSTransformValue> create(TransformOperationType type)
     {
-        return adoptRef(new WebKitCSSTransformValue(type));
+        return adoptRef(new CSSTransformValue(type));
     }
 
     String customCssText() const;
-    bool equals(const WebKitCSSTransformValue& other) const { return m_type == other.m_type && CSSValueList::equals(other); }
+    bool equals(const CSSTransformValue& other) const { return m_type == other.m_type && CSSValueList::equals(other); }
     String customSerializeResolvingVariables(const HashMap<AtomicString, String>&) const;
 
     TransformOperationType operationType() const { return m_type; }
-    
-    PassRefPtr<WebKitCSSTransformValue> cloneForCSSOM() const;
+
+    PassRefPtr<CSSTransformValue> cloneForCSSOM() const;
 
     void reportDescendantMemoryUsage(MemoryObjectInfo*) const;
 
 private:
-    WebKitCSSTransformValue(TransformOperationType);
-    WebKitCSSTransformValue(const WebKitCSSTransformValue& cloneFrom);
+    CSSTransformValue(TransformOperationType);
+    CSSTransformValue(const CSSTransformValue& cloneFrom);
 
     TransformOperationType m_type;
 };
diff --git a/Source/core/css/WebKitCSSTransformValue.idl b/Source/core/css/CSSTransformValue.idl
similarity index 95%
rename from Source/core/css/WebKitCSSTransformValue.idl
rename to Source/core/css/CSSTransformValue.idl
index 97a5430..f6a3942 100644
--- a/Source/core/css/WebKitCSSTransformValue.idl
+++ b/Source/core/css/CSSTransformValue.idl
@@ -27,8 +27,9 @@
  */
 
 [
-        DoNotCheckConstants
-] interface WebKitCSSTransformValue : CSSValueList {
+        DoNotCheckConstants,
+        InterfaceName=WebKitCSSTransformValue
+] interface CSSTransformValue : CSSValueList {
 
     // OperationTypes
 
diff --git a/Source/core/css/CSSValue.cpp b/Source/core/css/CSSValue.cpp
index 802cd93..c6b3cc0 100644
--- a/Source/core/css/CSSValue.cpp
+++ b/Source/core/css/CSSValue.cpp
@@ -41,9 +41,13 @@
 #include "core/css/CSSInheritedValue.h"
 #include "core/css/CSSInitialValue.h"
 #include "core/css/CSSLineBoxContainValue.h"
+#include "core/css/CSSMixFunctionValue.h"
 #include "core/css/CSSPrimitiveValue.h"
 #include "core/css/CSSReflectValue.h"
+#include "core/css/CSSSVGDocumentValue.h"
+#include "core/css/CSSShaderValue.h"
 #include "core/css/CSSTimingFunctionValue.h"
+#include "core/css/CSSTransformValue.h"
 #include "core/css/CSSUnicodeRangeValue.h"
 #include "core/css/CSSValueList.h"
 #include "core/css/CSSVariableValue.h"
@@ -52,10 +56,6 @@
 #include "core/css/ShadowValue.h"
 #include "core/css/WebKitCSSArrayFunctionValue.h"
 #include "core/css/WebKitCSSFilterValue.h"
-#include "core/css/WebKitCSSMixFunctionValue.h"
-#include "core/css/WebKitCSSSVGDocumentValue.h"
-#include "core/css/WebKitCSSShaderValue.h"
-#include "core/css/WebKitCSSTransformValue.h"
 #include "core/dom/WebCoreMemoryInstrumentation.h"
 #include "core/svg/SVGColor.h"
 #include "core/svg/SVGPaint.h"
@@ -225,11 +225,11 @@
     case WebKitCSSArrayFunctionValueClass:
         static_cast<const WebKitCSSArrayFunctionValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo);
         return;
-    case WebKitCSSMixFunctionValueClass:
-        static_cast<const WebKitCSSMixFunctionValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo);
+    case CSSMixFunctionValueClass:
+        static_cast<const CSSMixFunctionValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo);
         return;
-    case WebKitCSSShaderClass:
-        static_cast<const WebKitCSSShaderValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo);
+    case CSSShaderClass:
+        static_cast<const CSSShaderValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo);
         return;
     case VariableClass:
         static_cast<const CSSVariableValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo);
@@ -240,8 +240,8 @@
     case SVGPaintClass:
         static_cast<const SVGPaint*>(this)->reportDescendantMemoryUsage(memoryObjectInfo);
         return;
-    case WebKitCSSSVGDocumentClass:
-        static_cast<const WebKitCSSSVGDocumentValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo);
+    case CSSSVGDocumentClass:
+        static_cast<const CSSSVGDocumentValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo);
         return;
     case ValueListClass:
         toCSSValueList(this)->reportDescendantMemoryUsage(memoryObjectInfo);
@@ -252,8 +252,8 @@
     case WebKitCSSFilterClass:
         static_cast<const WebKitCSSFilterValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo);
         return;
-    case WebKitCSSTransformClass:
-        static_cast<const WebKitCSSTransformValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo);
+    case CSSTransformClass:
+        static_cast<const CSSTransformValue*>(this)->reportDescendantMemoryUsage(memoryObjectInfo);
         return;
     }
     ASSERT_NOT_REACHED();
@@ -318,8 +318,8 @@
             return compareCSSValues<CSSUnicodeRangeValue>(*this, other);
         case ValueListClass:
             return compareCSSValues<CSSValueList>(*this, other);
-        case WebKitCSSTransformClass:
-            return compareCSSValues<WebKitCSSTransformValue>(*this, other);
+        case CSSTransformClass:
+            return compareCSSValues<CSSTransformValue>(*this, other);
         case LineBoxContainClass:
             return compareCSSValues<CSSLineBoxContainValue>(*this, other);
         case CalculationClass:
@@ -330,18 +330,18 @@
             return compareCSSValues<WebKitCSSFilterValue>(*this, other);
         case WebKitCSSArrayFunctionValueClass:
             return compareCSSValues<WebKitCSSArrayFunctionValue>(*this, other);
-        case WebKitCSSMixFunctionValueClass:
-            return compareCSSValues<WebKitCSSMixFunctionValue>(*this, other);
-        case WebKitCSSShaderClass:
-            return compareCSSValues<WebKitCSSShaderValue>(*this, other);
+        case CSSMixFunctionValueClass:
+            return compareCSSValues<CSSMixFunctionValue>(*this, other);
+        case CSSShaderClass:
+            return compareCSSValues<CSSShaderValue>(*this, other);
         case VariableClass:
             return compareCSSValues<CSSVariableValue>(*this, other);
         case SVGColorClass:
             return compareCSSValues<SVGColor>(*this, other);
         case SVGPaintClass:
             return compareCSSValues<SVGPaint>(*this, other);
-        case WebKitCSSSVGDocumentClass:
-            return compareCSSValues<WebKitCSSSVGDocumentValue>(*this, other);
+        case CSSSVGDocumentClass:
+            return compareCSSValues<CSSSVGDocumentValue>(*this, other);
         default:
             ASSERT_NOT_REACHED();
             return false;
@@ -406,8 +406,8 @@
         return static_cast<const CSSUnicodeRangeValue*>(this)->customCssText();
     case ValueListClass:
         return toCSSValueList(this)->customCssText();
-    case WebKitCSSTransformClass:
-        return static_cast<const WebKitCSSTransformValue*>(this)->customCssText();
+    case CSSTransformClass:
+        return static_cast<const CSSTransformValue*>(this)->customCssText();
     case LineBoxContainClass:
         return static_cast<const CSSLineBoxContainValue*>(this)->customCssText();
     case CalculationClass:
@@ -418,18 +418,18 @@
         return static_cast<const WebKitCSSFilterValue*>(this)->customCssText();
     case WebKitCSSArrayFunctionValueClass:
         return static_cast<const WebKitCSSArrayFunctionValue*>(this)->customCssText();
-    case WebKitCSSMixFunctionValueClass:
-        return static_cast<const WebKitCSSMixFunctionValue*>(this)->customCssText();
-    case WebKitCSSShaderClass:
-        return static_cast<const WebKitCSSShaderValue*>(this)->customCssText();
+    case CSSMixFunctionValueClass:
+        return static_cast<const CSSMixFunctionValue*>(this)->customCssText();
+    case CSSShaderClass:
+        return static_cast<const CSSShaderValue*>(this)->customCssText();
     case VariableClass:
         return static_cast<const CSSVariableValue*>(this)->value();
     case SVGColorClass:
         return static_cast<const SVGColor*>(this)->customCssText();
     case SVGPaintClass:
         return static_cast<const SVGPaint*>(this)->customCssText();
-    case WebKitCSSSVGDocumentClass:
-        return static_cast<const WebKitCSSSVGDocumentValue*>(this)->customCssText();
+    case CSSSVGDocumentClass:
+        return static_cast<const CSSSVGDocumentValue*>(this)->customCssText();
     }
     ASSERT_NOT_REACHED();
     return String();
@@ -444,8 +444,8 @@
         return static_cast<const CSSReflectValue*>(this)->customSerializeResolvingVariables(variables);
     case ValueListClass:
         return toCSSValueList(this)->customSerializeResolvingVariables(variables);
-    case WebKitCSSTransformClass:
-        return static_cast<const WebKitCSSTransformValue*>(this)->customSerializeResolvingVariables(variables);
+    case CSSTransformClass:
+        return static_cast<const CSSTransformValue*>(this)->customSerializeResolvingVariables(variables);
     default:
         return cssText();
     }
@@ -527,8 +527,8 @@
     case ValueListClass:
         delete toCSSValueList(this);
         return;
-    case WebKitCSSTransformClass:
-        delete static_cast<WebKitCSSTransformValue*>(this);
+    case CSSTransformClass:
+        delete static_cast<CSSTransformValue*>(this);
         return;
     case LineBoxContainClass:
         delete static_cast<CSSLineBoxContainValue*>(this);
@@ -545,11 +545,11 @@
     case WebKitCSSArrayFunctionValueClass:
         delete static_cast<WebKitCSSArrayFunctionValue*>(this);
         return;
-    case WebKitCSSMixFunctionValueClass:
-        delete static_cast<WebKitCSSMixFunctionValue*>(this);
+    case CSSMixFunctionValueClass:
+        delete static_cast<CSSMixFunctionValue*>(this);
         return;
-    case WebKitCSSShaderClass:
-        delete static_cast<WebKitCSSShaderValue*>(this);
+    case CSSShaderClass:
+        delete static_cast<CSSShaderValue*>(this);
         return;
     case VariableClass:
         delete static_cast<CSSVariableValue*>(this);
@@ -560,8 +560,8 @@
     case SVGPaintClass:
         delete static_cast<SVGPaint*>(this);
         return;
-    case WebKitCSSSVGDocumentClass:
-        delete static_cast<WebKitCSSSVGDocumentValue*>(this);
+    case CSSSVGDocumentClass:
+        delete static_cast<CSSSVGDocumentValue*>(this);
         return;
     }
     ASSERT_NOT_REACHED();
@@ -581,10 +581,10 @@
         return static_cast<const WebKitCSSFilterValue*>(this)->cloneForCSSOM();
     case WebKitCSSArrayFunctionValueClass:
         return static_cast<const WebKitCSSArrayFunctionValue*>(this)->cloneForCSSOM();
-    case WebKitCSSMixFunctionValueClass:
-        return static_cast<const WebKitCSSMixFunctionValue*>(this)->cloneForCSSOM();
-    case WebKitCSSTransformClass:
-        return static_cast<const WebKitCSSTransformValue*>(this)->cloneForCSSOM();
+    case CSSMixFunctionValueClass:
+        return static_cast<const CSSMixFunctionValue*>(this)->cloneForCSSOM();
+    case CSSTransformClass:
+        return static_cast<const CSSTransformValue*>(this)->cloneForCSSOM();
     case ImageSetClass:
         return static_cast<const CSSImageSetValue*>(this)->cloneForCSSOM();
     case SVGColorClass:
diff --git a/Source/core/css/CSSValue.h b/Source/core/css/CSSValue.h
index 0de2548..7be91bc 100644
--- a/Source/core/css/CSSValue.h
+++ b/Source/core/css/CSSValue.h
@@ -83,17 +83,17 @@
     bool isCubicBezierTimingFunctionValue() const { return m_classType == CubicBezierTimingFunctionClass; }
     bool isLinearTimingFunctionValue() const { return m_classType == LinearTimingFunctionClass; }
     bool isStepsTimingFunctionValue() const { return m_classType == StepsTimingFunctionClass; }
-    bool isWebKitCSSTransformValue() const { return m_classType == WebKitCSSTransformClass; }
+    bool isCSSTransformValue() const { return m_classType == CSSTransformClass; }
     bool isCSSLineBoxContainValue() const { return m_classType == LineBoxContainClass; }
     bool isCalculationValue() const {return m_classType == CalculationClass; }
     bool isWebKitCSSFilterValue() const { return m_classType == WebKitCSSFilterClass; }
     bool isWebKitCSSArrayFunctionValue() const { return m_classType == WebKitCSSArrayFunctionValueClass; }
-    bool isWebKitCSSMixFunctionValue() const { return m_classType == WebKitCSSMixFunctionValueClass; }
-    bool isWebKitCSSShaderValue() const { return m_classType == WebKitCSSShaderClass; }
+    bool isCSSMixFunctionValue() const { return m_classType == CSSMixFunctionValueClass; }
+    bool isCSSShaderValue() const { return m_classType == CSSShaderClass; }
     bool isVariableValue() const { return m_classType == VariableClass; }
     bool isSVGColor() const { return m_classType == SVGColorClass || m_classType == SVGPaintClass; }
     bool isSVGPaint() const { return m_classType == SVGPaintClass; }
-    bool isWebKitCSSSVGDocumentValue() const { return m_classType == WebKitCSSSVGDocumentClass; }
+    bool isCSSSVGDocumentValue() const { return m_classType == CSSSVGDocumentClass; }
     
     bool isCSSOMSafe() const { return m_isCSSOMSafe; }
     bool isSubtypeExposedToCSSOM() const
@@ -148,21 +148,21 @@
         UnicodeRangeClass,
         LineBoxContainClass,
         CalculationClass,
-        WebKitCSSShaderClass,
+        CSSShaderClass,
         VariableClass,
 
         // SVG classes.
         SVGColorClass,
         SVGPaintClass,
-        WebKitCSSSVGDocumentClass,
+        CSSSVGDocumentClass,
 
         // List class types must appear after ValueListClass.
         ValueListClass,
         ImageSetClass,
         WebKitCSSFilterClass,
         WebKitCSSArrayFunctionValueClass,
-        WebKitCSSMixFunctionValueClass,
-        WebKitCSSTransformClass,
+        CSSMixFunctionValueClass,
+        CSSTransformClass,
         // Do not append non-list class types here.
     };
 
diff --git a/Source/core/css/WebKitCSSViewportRule.cpp b/Source/core/css/CSSViewportRule.cpp
similarity index 83%
rename from Source/core/css/WebKitCSSViewportRule.cpp
rename to Source/core/css/CSSViewportRule.cpp
index 55c9ea5..3d6afeb6 100644
--- a/Source/core/css/WebKitCSSViewportRule.cpp
+++ b/Source/core/css/CSSViewportRule.cpp
@@ -29,7 +29,7 @@
  */
 
 #include "config.h"
-#include "core/css/WebKitCSSViewportRule.h"
+#include "core/css/CSSViewportRule.h"
 
 #if ENABLE(CSS_DEVICE_ADAPTATION)
 
@@ -37,31 +37,31 @@
 #include "core/css/StylePropertySet.h"
 #include "core/css/StyleRule.h"
 #include "core/dom/WebCoreMemoryInstrumentation.h"
-#include <wtf/text/StringBuilder.h>
+#include "wtf/text/StringBuilder.h"
 
 namespace WebCore {
 
-WebKitCSSViewportRule::WebKitCSSViewportRule(StyleRuleViewport* viewportRule, CSSStyleSheet* sheet)
+CSSViewportRule::CSSViewportRule(StyleRuleViewport* viewportRule, CSSStyleSheet* sheet)
     : CSSRule(sheet)
     , m_viewportRule(viewportRule)
 {
 }
 
-WebKitCSSViewportRule::~WebKitCSSViewportRule()
+CSSViewportRule::~CSSViewportRule()
 {
     if (m_propertiesCSSOMWrapper)
         m_propertiesCSSOMWrapper->clearParentRule();
 }
 
-CSSStyleDeclaration* WebKitCSSViewportRule::style() const
+CSSStyleDeclaration* CSSViewportRule::style() const
 {
     if (!m_propertiesCSSOMWrapper)
-        m_propertiesCSSOMWrapper = StyleRuleCSSStyleDeclaration::create(m_viewportRule->mutableProperties(), const_cast<WebKitCSSViewportRule*>(this));
+        m_propertiesCSSOMWrapper = StyleRuleCSSStyleDeclaration::create(m_viewportRule->mutableProperties(), const_cast<CSSViewportRule*>(this));
 
     return m_propertiesCSSOMWrapper.get();
 }
 
-String WebKitCSSViewportRule::cssText() const
+String CSSViewportRule::cssText() const
 {
     StringBuilder result;
     result.appendLiteral("@-webkit-viewport { ");
@@ -76,7 +76,7 @@
     return result.toString();
 }
 
-void WebKitCSSViewportRule::reattach(StyleRuleBase* rule)
+void CSSViewportRule::reattach(StyleRuleBase* rule)
 {
     ASSERT(rule);
     ASSERT_WITH_SECURITY_IMPLICATION(rule->isViewportRule());
@@ -86,7 +86,7 @@
         m_propertiesCSSOMWrapper->reattach(m_viewportRule->mutableProperties());
 }
 
-void WebKitCSSViewportRule::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
+void CSSViewportRule::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
 {
     MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS);
     CSSRule::reportMemoryUsage(memoryObjectInfo);
diff --git a/Source/core/css/WebKitCSSViewportRule.h b/Source/core/css/CSSViewportRule.h
similarity index 83%
rename from Source/core/css/WebKitCSSViewportRule.h
rename to Source/core/css/CSSViewportRule.h
index f275f4c..d800e16 100644
--- a/Source/core/css/WebKitCSSViewportRule.h
+++ b/Source/core/css/CSSViewportRule.h
@@ -28,8 +28,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef WebKitCSSViewportRule_h
-#define WebKitCSSViewportRule_h
+#ifndef CSSViewportRule_h
+#define CSSViewportRule_h
 
 #if ENABLE(CSS_DEVICE_ADAPTATION)
 
@@ -41,13 +41,13 @@
 class StyleRuleViewport;
 class StyleRuleCSSStyleDeclaration;
 
-class WebKitCSSViewportRule: public CSSRule {
+class CSSViewportRule: public CSSRule {
 public:
-    static PassRefPtr<WebKitCSSViewportRule> create(StyleRuleViewport* viewportRule, CSSStyleSheet* sheet)
+    static PassRefPtr<CSSViewportRule> create(StyleRuleViewport* viewportRule, CSSStyleSheet* sheet)
     {
-        return adoptRef(new WebKitCSSViewportRule(viewportRule, sheet));
+        return adoptRef(new CSSViewportRule(viewportRule, sheet));
     }
-    ~WebKitCSSViewportRule();
+    ~CSSViewportRule();
 
     virtual CSSRule::Type type() const OVERRIDE { return WEBKIT_VIEWPORT_RULE; }
     virtual String cssText() const OVERRIDE;
@@ -57,7 +57,7 @@
     CSSStyleDeclaration* style() const;
 
 private:
-    WebKitCSSViewportRule(StyleRuleViewport*, CSSStyleSheet*);
+    CSSViewportRule(StyleRuleViewport*, CSSStyleSheet*);
 
     RefPtr<StyleRuleViewport> m_viewportRule;
     mutable RefPtr<StyleRuleCSSStyleDeclaration> m_propertiesCSSOMWrapper;
@@ -65,6 +65,6 @@
 
 } // namespace WebCore
 
-#endif // WebKitCSSViewportRule_h
+#endif // CSSViewportRule_h
 
 #endif // ENABLE(CSS_DEVICE_ADAPTATION)
diff --git a/Source/core/css/WebKitCSSViewportRule.idl b/Source/core/css/CSSViewportRule.idl
similarity index 92%
rename from Source/core/css/WebKitCSSViewportRule.idl
rename to Source/core/css/CSSViewportRule.idl
index f2cc09f..c4e69e1 100644
--- a/Source/core/css/WebKitCSSViewportRule.idl
+++ b/Source/core/css/CSSViewportRule.idl
@@ -28,7 +28,8 @@
  */
 
 [
-    Conditional=CSS_DEVICE_ADAPTATION
-] interface WebKitCSSViewportRule : CSSRule {
+    Conditional=CSS_DEVICE_ADAPTATION,
+    InterfaceName=WebKitCSSViewportRule
+] interface CSSViewportRule : CSSRule {
     readonly attribute CSSStyleDeclaration style;
 };
diff --git a/Source/core/css/InspectorCSSOMWrappers.cpp b/Source/core/css/InspectorCSSOMWrappers.cpp
index 8877e00..a84449a 100644
--- a/Source/core/css/InspectorCSSOMWrappers.cpp
+++ b/Source/core/css/InspectorCSSOMWrappers.cpp
@@ -33,12 +33,12 @@
 #include "core/css/CSSHostRule.h"
 #include "core/css/CSSImportRule.h"
 #include "core/css/CSSMediaRule.h"
+#include "core/css/CSSRegionRule.h"
 #include "core/css/CSSRule.h"
 #include "core/css/CSSStyleRule.h"
 #include "core/css/CSSStyleSheet.h"
 #include "core/css/CSSSupportsRule.h"
 #include "core/css/StyleSheetContents.h"
-#include "core/css/WebKitCSSRegionRule.h"
 #include "core/dom/DocumentStyleSheetCollection.h"
 
 #include <wtf/MemoryInstrumentationHashMap.h>
@@ -77,7 +77,7 @@
             collect(static_cast<CSSSupportsRule*>(cssRule));
             break;
         case CSSRule::WEBKIT_REGION_RULE:
-            collect(static_cast<WebKitCSSRegionRule*>(cssRule));
+            collect(static_cast<CSSRegionRule*>(cssRule));
             break;
         case CSSRule::HOST_RULE:
             collect(static_cast<CSSHostRule*>(cssRule));
diff --git a/Source/core/css/StyleRule.cpp b/Source/core/css/StyleRule.cpp
index 41cda8c..e04c912 100644
--- a/Source/core/css/StyleRule.cpp
+++ b/Source/core/css/StyleRule.cpp
@@ -29,18 +29,18 @@
 #include "core/css/CSSImportRule.h"
 #include "core/css/CSSMediaRule.h"
 #include "core/css/CSSPageRule.h"
+#include "core/css/CSSRegionRule.h"
 #include "core/css/CSSStyleRule.h"
 #include "core/css/CSSSupportsRule.h"
 #include "core/css/CSSUnknownRule.h"
+#include "core/css/CSSViewportRule.h"
 #include "core/css/StylePropertySet.h"
 #include "core/css/StyleRuleImport.h"
 #include "core/css/WebKitCSSFilterRule.h"
 #include "core/css/WebKitCSSKeyframeRule.h"
 #include "core/css/WebKitCSSKeyframesRule.h"
-#include "core/css/WebKitCSSRegionRule.h"
-#include "core/css/WebKitCSSViewportRule.h"
 #include "core/dom/WebCoreMemoryInstrumentation.h"
-#include <wtf/MemoryInstrumentationVector.h>
+#include "wtf/MemoryInstrumentationVector.h"
 
 namespace WebCore {
 
@@ -212,7 +212,7 @@
         rule = CSSSupportsRule::create(static_cast<StyleRuleSupports*>(self), parentSheet);
         break;
     case Region:
-        rule = WebKitCSSRegionRule::create(static_cast<StyleRuleRegion*>(self), parentSheet);
+        rule = CSSRegionRule::create(static_cast<StyleRuleRegion*>(self), parentSheet);
         break;
     case Import:
         rule = CSSImportRule::create(static_cast<StyleRuleImport*>(self), parentSheet);
diff --git a/Source/core/css/resolver/FilterOperationResolver.cpp b/Source/core/css/resolver/FilterOperationResolver.cpp
index 9cdd4e4..06799ca 100644
--- a/Source/core/css/resolver/FilterOperationResolver.cpp
+++ b/Source/core/css/resolver/FilterOperationResolver.cpp
@@ -29,12 +29,12 @@
 #include "config.h"
 #include "core/css/resolver/FilterOperationResolver.h"
 
+#include "core/css/CSSMixFunctionValue.h"
 #include "core/css/CSSParser.h"
 #include "core/css/CSSPrimitiveValueMappings.h"
+#include "core/css/CSSShaderValue.h"
 #include "core/css/ShadowValue.h"
 #include "core/css/WebKitCSSFilterValue.h"
-#include "core/css/WebKitCSSMixFunctionValue.h"
-#include "core/css/WebKitCSSShaderValue.h"
 #include "core/css/resolver/TransformBuilder.h"
 #include "core/platform/graphics/filters/custom/CustomFilterArrayParameter.h"
 #include "core/platform/graphics/filters/custom/CustomFilterConstants.h"
@@ -94,7 +94,7 @@
     return codePointCompareLessThan(a->name(), b->name());
 }
 
-static StyleShader* cachedOrPendingStyleShaderFromValue(WebKitCSSShaderValue* value, StyleResolverState& state)
+static StyleShader* cachedOrPendingStyleShaderFromValue(CSSShaderValue* value, StyleResolverState& state)
 {
     StyleShader* shader = value->cachedOrPendingShader();
     if (shader && shader->isPendingShader())
@@ -104,8 +104,8 @@
 
 static StyleShader* styleShader(CSSValue* value, StyleResolverState& state)
 {
-    if (value->isWebKitCSSShaderValue())
-        return cachedOrPendingStyleShaderFromValue(static_cast<WebKitCSSShaderValue*>(value), state);
+    if (value->isCSSShaderValue())
+        return cachedOrPendingStyleShaderFromValue(static_cast<CSSShaderValue*>(value), state);
     return 0;
 }
 
@@ -170,7 +170,7 @@
     // then we could safely assume that all the remaining items
     // are transforms. parseCustomFilterTransformParameter will
     // return 0 if that assumption is incorrect.
-    if (values->itemWithoutBoundsCheck(0)->isWebKitCSSTransformValue())
+    if (values->itemWithoutBoundsCheck(0)->isCSSTransformValue())
         return parseCustomFilterTransformParameter(name, values, state);
 
     // We can have only arrays of booleans or numbers, so use the first value to choose between those two.
@@ -232,7 +232,7 @@
     return 0;
 }
 
-static PassRefPtr<CustomFilterProgram> lookupCustomFilterProgram(WebKitCSSShaderValue* vertexShader, WebKitCSSShaderValue* fragmentShader,
+static PassRefPtr<CustomFilterProgram> lookupCustomFilterProgram(CSSShaderValue* vertexShader, CSSShaderValue* fragmentShader,
     CustomFilterProgramType programType, const CustomFilterProgramMixSettings& mixSettings, CustomFilterMeshType meshType,
     StyleCustomFilterProgramCache* customFilterProgramCache, StyleResolverState& state)
 {
@@ -260,19 +260,19 @@
     unsigned shadersListLength = shadersList->length();
     ASSERT(shadersListLength);
 
-    WebKitCSSShaderValue* vertexShader = toWebKitCSSShaderValue(shadersList->itemWithoutBoundsCheck(0));
-    WebKitCSSShaderValue* fragmentShader = 0;
+    CSSShaderValue* vertexShader = toCSSShaderValue(shadersList->itemWithoutBoundsCheck(0));
+    CSSShaderValue* fragmentShader = 0;
     CustomFilterProgramType programType = PROGRAM_TYPE_BLENDS_ELEMENT_TEXTURE;
     CustomFilterProgramMixSettings mixSettings;
 
     if (shadersListLength > 1) {
         CSSValue* fragmentShaderOrMixFunction = shadersList->itemWithoutBoundsCheck(1);
-        if (fragmentShaderOrMixFunction->isWebKitCSSMixFunctionValue()) {
-            WebKitCSSMixFunctionValue* mixFunction = static_cast<WebKitCSSMixFunctionValue*>(fragmentShaderOrMixFunction);
+        if (fragmentShaderOrMixFunction->isCSSMixFunctionValue()) {
+            CSSMixFunctionValue* mixFunction = static_cast<CSSMixFunctionValue*>(fragmentShaderOrMixFunction);
             CSSValueListIterator iterator(mixFunction);
 
             ASSERT(mixFunction->length());
-            fragmentShader = toWebKitCSSShaderValue(iterator.value());
+            fragmentShader = toCSSShaderValue(iterator.value());
             iterator.advance();
 
             ASSERT(mixFunction->length() <= 3);
@@ -288,7 +288,7 @@
             }
         } else {
             programType = PROGRAM_TYPE_NO_ELEMENT_TEXTURE;
-            fragmentShader = toWebKitCSSShaderValue(fragmentShaderOrMixFunction);
+            fragmentShader = toCSSShaderValue(fragmentShaderOrMixFunction);
         }
     }
 
@@ -406,10 +406,10 @@
                 continue;
             CSSValue* argument = filterValue->itemWithoutBoundsCheck(0);
 
-            if (!argument->isWebKitCSSSVGDocumentValue())
+            if (!argument->isCSSSVGDocumentValue())
                 continue;
 
-            WebKitCSSSVGDocumentValue* svgDocumentValue = static_cast<WebKitCSSSVGDocumentValue*>(argument);
+            CSSSVGDocumentValue* svgDocumentValue = static_cast<CSSSVGDocumentValue*>(argument);
             KURL url = state.document()->completeURL(svgDocumentValue->url());
 
             RefPtr<ReferenceFilterOperation> operation = ReferenceFilterOperation::create(svgDocumentValue->url(), url.fragmentIdentifier(), operationType);
diff --git a/Source/core/css/resolver/ScopedStyleResolver.h b/Source/core/css/resolver/ScopedStyleResolver.h
index 50b8776..d58baba 100644
--- a/Source/core/css/resolver/ScopedStyleResolver.h
+++ b/Source/core/css/resolver/ScopedStyleResolver.h
@@ -28,6 +28,7 @@
 #define ScopedStyleResolver_h
 
 #include "core/css/CSSRuleList.h"
+#include "core/css/CSSSVGDocumentValue.h"
 #include "core/css/CSSToStyleMap.h"
 #include "core/css/CSSValueList.h"
 #include "core/css/DocumentRuleSets.h"
@@ -38,7 +39,6 @@
 #include "core/css/SelectorChecker.h"
 #include "core/css/SelectorFilter.h"
 #include "core/css/SiblingTraversalStrategies.h"
-#include "core/css/WebKitCSSSVGDocumentValue.h"
 #include "core/css/WebKitCSSKeyframeRule.h"
 #include "core/css/WebKitCSSKeyframesRule.h"
 #include "core/css/resolver/ViewportStyleResolver.h"
diff --git a/Source/core/css/resolver/StyleResolver.cpp b/Source/core/css/resolver/StyleResolver.cpp
index dfda920..cc8638c 100644
--- a/Source/core/css/resolver/StyleResolver.cpp
+++ b/Source/core/css/resolver/StyleResolver.cpp
@@ -51,8 +51,10 @@
 #include "core/css/CSSParser.h"
 #include "core/css/CSSPrimitiveValueMappings.h"
 #include "core/css/CSSReflectValue.h"
+#include "core/css/CSSSVGDocumentValue.h"
 #include "core/css/CSSSelector.h"
 #include "core/css/CSSSelectorList.h"
+#include "core/css/CSSShaderValue.h"
 #include "core/css/CSSStyleRule.h"
 #include "core/css/CSSSupportsRule.h"
 #include "core/css/CSSTimingFunctionValue.h"
@@ -79,10 +81,6 @@
 #include "core/css/StyleSheetList.h"
 #include "core/css/WebKitCSSKeyframeRule.h"
 #include "core/css/WebKitCSSKeyframesRule.h"
-#include "core/css/WebKitCSSMixFunctionValue.h"
-#include "core/css/WebKitCSSRegionRule.h"
-#include "core/css/WebKitCSSSVGDocumentValue.h"
-#include "core/css/WebKitCSSShaderValue.h"
 #include "core/css/resolver/FilterOperationResolver.h"
 #include "core/css/resolver/StyleBuilder.h"
 #include "core/css/resolver/TransformBuilder.h"
@@ -3634,7 +3632,7 @@
         if (filterOperation->getOperationType() == FilterOperation::REFERENCE) {
             ReferenceFilterOperation* referenceFilter = static_cast<ReferenceFilterOperation*>(filterOperation.get());
 
-            WebKitCSSSVGDocumentValue* value = state.pendingSVGDocuments().get(referenceFilter);
+            CSSSVGDocumentValue* value = state.pendingSVGDocuments().get(referenceFilter);
             if (!value)
                 continue;
             CachedDocument* cachedDocument = value->load(cachedResourceLoader);
@@ -3674,11 +3672,11 @@
                 customFilter->setProgram(styleProgram.release());
             else {
                 if (program->vertexShader() && program->vertexShader()->isPendingShader()) {
-                    WebKitCSSShaderValue* shaderValue = static_cast<StylePendingShader*>(program->vertexShader())->cssShaderValue();
+                    CSSShaderValue* shaderValue = static_cast<StylePendingShader*>(program->vertexShader())->cssShaderValue();
                     program->setVertexShader(shaderValue->cachedShader(cachedResourceLoader));
                 }
                 if (program->fragmentShader() && program->fragmentShader()->isPendingShader()) {
-                    WebKitCSSShaderValue* shaderValue = static_cast<StylePendingShader*>(program->fragmentShader())->cssShaderValue();
+                    CSSShaderValue* shaderValue = static_cast<StylePendingShader*>(program->fragmentShader())->cssShaderValue();
                     program->setFragmentShader(shaderValue->cachedShader(cachedResourceLoader));
                 }
                 m_customFilterProgramCache->add(program);
diff --git a/Source/core/css/resolver/StyleResolver.h b/Source/core/css/resolver/StyleResolver.h
index 97732d1..1a44b33 100644
--- a/Source/core/css/resolver/StyleResolver.h
+++ b/Source/core/css/resolver/StyleResolver.h
@@ -24,6 +24,7 @@
 
 #include "RuntimeEnabledFeatures.h"
 #include "core/css/CSSRuleList.h"
+#include "core/css/CSSSVGDocumentValue.h"
 #include "core/css/CSSToStyleMap.h"
 #include "core/css/CSSValueList.h"
 #include "core/css/DocumentRuleSets.h"
@@ -35,7 +36,6 @@
 #include "core/css/SelectorChecker.h"
 #include "core/css/SelectorFilter.h"
 #include "core/css/SiblingTraversalStrategies.h"
-#include "core/css/WebKitCSSSVGDocumentValue.h"
 #include "core/css/resolver/ScopedStyleResolver.h"
 #include "core/css/resolver/StyleResolverState.h"
 #include "core/css/resolver/ViewportStyleResolver.h"
@@ -108,8 +108,6 @@
 class StyledElement;
 class ViewportStyleResolver;
 class WebKitCSSFilterValue;
-class WebKitCSSShaderValue;
-class WebKitCSSSVGDocumentValue;
 
 class MediaQueryResult {
     WTF_MAKE_NONCOPYABLE(MediaQueryResult); WTF_MAKE_FAST_ALLOCATED;
diff --git a/Source/core/css/resolver/StyleResolverState.h b/Source/core/css/resolver/StyleResolverState.h
index 3920e2a..6c3b2fb 100644
--- a/Source/core/css/resolver/StyleResolverState.h
+++ b/Source/core/css/resolver/StyleResolverState.h
@@ -24,8 +24,8 @@
 
 #include "CSSPropertyNames.h"
 
+#include "core/css/CSSSVGDocumentValue.h"
 #include "core/css/CSSValueList.h"
-#include "core/css/WebKitCSSSVGDocumentValue.h"
 #include "core/dom/Element.h"
 #include "core/platform/graphics/Color.h"
 #include "core/platform/graphics/filters/FilterOperations.h"
@@ -43,7 +43,7 @@
 class StyledElement;
 
 typedef HashMap<CSSPropertyID, RefPtr<CSSValue> > PendingImagePropertyMap;
-typedef HashMap<FilterOperation*, RefPtr<WebKitCSSSVGDocumentValue> > PendingSVGDocumentMap;
+typedef HashMap<FilterOperation*, RefPtr<CSSSVGDocumentValue> > PendingSVGDocumentMap;
 
 class StyleResolverState {
 WTF_MAKE_NONCOPYABLE(StyleResolverState);
diff --git a/Source/core/css/resolver/TransformBuilder.cpp b/Source/core/css/resolver/TransformBuilder.cpp
index e57c8e4..f4f1df6 100644
--- a/Source/core/css/resolver/TransformBuilder.cpp
+++ b/Source/core/css/resolver/TransformBuilder.cpp
@@ -30,7 +30,7 @@
 #include "core/css/resolver/TransformBuilder.h"
 
 #include "core/css/CSSPrimitiveValueMappings.h"
-#include "core/css/WebKitCSSTransformValue.h"
+#include "core/css/CSSTransformValue.h"
 #include "core/platform/graphics/transforms/Matrix3DTransformOperation.h"
 #include "core/platform/graphics/transforms/MatrixTransformOperation.h"
 #include "core/platform/graphics/transforms/PerspectiveTransformOperation.h"
@@ -56,31 +56,31 @@
     return primitiveValue ? primitiveValue->convertToLength<FixedFloatConversion | PercentConversion | CalculatedConversion | FractionConversion | ViewportPercentageConversion>(style, rootStyle, multiplier) : Length(Undefined);
 }
 
-static TransformOperation::OperationType getTransformOperationType(WebKitCSSTransformValue::TransformOperationType type)
+static TransformOperation::OperationType getTransformOperationType(CSSTransformValue::TransformOperationType type)
 {
     switch (type) {
-    case WebKitCSSTransformValue::ScaleTransformOperation: return TransformOperation::SCALE;
-    case WebKitCSSTransformValue::ScaleXTransformOperation: return TransformOperation::SCALE_X;
-    case WebKitCSSTransformValue::ScaleYTransformOperation: return TransformOperation::SCALE_Y;
-    case WebKitCSSTransformValue::ScaleZTransformOperation: return TransformOperation::SCALE_Z;
-    case WebKitCSSTransformValue::Scale3DTransformOperation: return TransformOperation::SCALE_3D;
-    case WebKitCSSTransformValue::TranslateTransformOperation: return TransformOperation::TRANSLATE;
-    case WebKitCSSTransformValue::TranslateXTransformOperation: return TransformOperation::TRANSLATE_X;
-    case WebKitCSSTransformValue::TranslateYTransformOperation: return TransformOperation::TRANSLATE_Y;
-    case WebKitCSSTransformValue::TranslateZTransformOperation: return TransformOperation::TRANSLATE_Z;
-    case WebKitCSSTransformValue::Translate3DTransformOperation: return TransformOperation::TRANSLATE_3D;
-    case WebKitCSSTransformValue::RotateTransformOperation: return TransformOperation::ROTATE;
-    case WebKitCSSTransformValue::RotateXTransformOperation: return TransformOperation::ROTATE_X;
-    case WebKitCSSTransformValue::RotateYTransformOperation: return TransformOperation::ROTATE_Y;
-    case WebKitCSSTransformValue::RotateZTransformOperation: return TransformOperation::ROTATE_Z;
-    case WebKitCSSTransformValue::Rotate3DTransformOperation: return TransformOperation::ROTATE_3D;
-    case WebKitCSSTransformValue::SkewTransformOperation: return TransformOperation::SKEW;
-    case WebKitCSSTransformValue::SkewXTransformOperation: return TransformOperation::SKEW_X;
-    case WebKitCSSTransformValue::SkewYTransformOperation: return TransformOperation::SKEW_Y;
-    case WebKitCSSTransformValue::MatrixTransformOperation: return TransformOperation::MATRIX;
-    case WebKitCSSTransformValue::Matrix3DTransformOperation: return TransformOperation::MATRIX_3D;
-    case WebKitCSSTransformValue::PerspectiveTransformOperation: return TransformOperation::PERSPECTIVE;
-    case WebKitCSSTransformValue::UnknownTransformOperation: return TransformOperation::NONE;
+    case CSSTransformValue::ScaleTransformOperation: return TransformOperation::SCALE;
+    case CSSTransformValue::ScaleXTransformOperation: return TransformOperation::SCALE_X;
+    case CSSTransformValue::ScaleYTransformOperation: return TransformOperation::SCALE_Y;
+    case CSSTransformValue::ScaleZTransformOperation: return TransformOperation::SCALE_Z;
+    case CSSTransformValue::Scale3DTransformOperation: return TransformOperation::SCALE_3D;
+    case CSSTransformValue::TranslateTransformOperation: return TransformOperation::TRANSLATE;
+    case CSSTransformValue::TranslateXTransformOperation: return TransformOperation::TRANSLATE_X;
+    case CSSTransformValue::TranslateYTransformOperation: return TransformOperation::TRANSLATE_Y;
+    case CSSTransformValue::TranslateZTransformOperation: return TransformOperation::TRANSLATE_Z;
+    case CSSTransformValue::Translate3DTransformOperation: return TransformOperation::TRANSLATE_3D;
+    case CSSTransformValue::RotateTransformOperation: return TransformOperation::ROTATE;
+    case CSSTransformValue::RotateXTransformOperation: return TransformOperation::ROTATE_X;
+    case CSSTransformValue::RotateYTransformOperation: return TransformOperation::ROTATE_Y;
+    case CSSTransformValue::RotateZTransformOperation: return TransformOperation::ROTATE_Z;
+    case CSSTransformValue::Rotate3DTransformOperation: return TransformOperation::ROTATE_3D;
+    case CSSTransformValue::SkewTransformOperation: return TransformOperation::SKEW;
+    case CSSTransformValue::SkewXTransformOperation: return TransformOperation::SKEW_X;
+    case CSSTransformValue::SkewYTransformOperation: return TransformOperation::SKEW_Y;
+    case CSSTransformValue::MatrixTransformOperation: return TransformOperation::MATRIX;
+    case CSSTransformValue::Matrix3DTransformOperation: return TransformOperation::MATRIX_3D;
+    case CSSTransformValue::PerspectiveTransformOperation: return TransformOperation::PERSPECTIVE;
+    case CSSTransformValue::UnknownTransformOperation: return TransformOperation::NONE;
     }
     return TransformOperation::NONE;
 }
@@ -97,10 +97,10 @@
     for (CSSValueListIterator i = inValue; i.hasMore(); i.advance()) {
         CSSValue* currValue = i.value();
 
-        if (!currValue->isWebKitCSSTransformValue())
+        if (!currValue->isCSSTransformValue())
             continue;
 
-        WebKitCSSTransformValue* transformValue = static_cast<WebKitCSSTransformValue*>(i.value());
+        CSSTransformValue* transformValue = static_cast<CSSTransformValue*>(i.value());
         if (!transformValue->length())
             continue;
 
@@ -117,16 +117,16 @@
         CSSPrimitiveValue* firstValue = toCSSPrimitiveValue(transformValue->itemWithoutBoundsCheck(0));
 
         switch (transformValue->operationType()) {
-        case WebKitCSSTransformValue::ScaleTransformOperation:
-        case WebKitCSSTransformValue::ScaleXTransformOperation:
-        case WebKitCSSTransformValue::ScaleYTransformOperation: {
+        case CSSTransformValue::ScaleTransformOperation:
+        case CSSTransformValue::ScaleXTransformOperation:
+        case CSSTransformValue::ScaleYTransformOperation: {
             double sx = 1.0;
             double sy = 1.0;
-            if (transformValue->operationType() == WebKitCSSTransformValue::ScaleYTransformOperation)
+            if (transformValue->operationType() == CSSTransformValue::ScaleYTransformOperation)
                 sy = firstValue->getDoubleValue();
             else {
                 sx = firstValue->getDoubleValue();
-                if (transformValue->operationType() != WebKitCSSTransformValue::ScaleXTransformOperation) {
+                if (transformValue->operationType() != CSSTransformValue::ScaleXTransformOperation) {
                     if (transformValue->length() > 1) {
                         CSSPrimitiveValue* secondValue = toCSSPrimitiveValue(transformValue->itemWithoutBoundsCheck(1));
                         sy = secondValue->getDoubleValue();
@@ -137,18 +137,18 @@
             operations.operations().append(ScaleTransformOperation::create(sx, sy, 1.0, getTransformOperationType(transformValue->operationType())));
             break;
         }
-        case WebKitCSSTransformValue::ScaleZTransformOperation:
-        case WebKitCSSTransformValue::Scale3DTransformOperation: {
+        case CSSTransformValue::ScaleZTransformOperation:
+        case CSSTransformValue::Scale3DTransformOperation: {
             double sx = 1.0;
             double sy = 1.0;
             double sz = 1.0;
-            if (transformValue->operationType() == WebKitCSSTransformValue::ScaleZTransformOperation)
+            if (transformValue->operationType() == CSSTransformValue::ScaleZTransformOperation)
                 sz = firstValue->getDoubleValue();
-            else if (transformValue->operationType() == WebKitCSSTransformValue::ScaleYTransformOperation)
+            else if (transformValue->operationType() == CSSTransformValue::ScaleYTransformOperation)
                 sy = firstValue->getDoubleValue();
             else {
                 sx = firstValue->getDoubleValue();
-                if (transformValue->operationType() != WebKitCSSTransformValue::ScaleXTransformOperation) {
+                if (transformValue->operationType() != CSSTransformValue::ScaleXTransformOperation) {
                     if (transformValue->length() > 2) {
                         CSSPrimitiveValue* thirdValue = toCSSPrimitiveValue(transformValue->itemWithoutBoundsCheck(2));
                         sz = thirdValue->getDoubleValue();
@@ -163,16 +163,16 @@
             operations.operations().append(ScaleTransformOperation::create(sx, sy, sz, getTransformOperationType(transformValue->operationType())));
             break;
         }
-        case WebKitCSSTransformValue::TranslateTransformOperation:
-        case WebKitCSSTransformValue::TranslateXTransformOperation:
-        case WebKitCSSTransformValue::TranslateYTransformOperation: {
+        case CSSTransformValue::TranslateTransformOperation:
+        case CSSTransformValue::TranslateXTransformOperation:
+        case CSSTransformValue::TranslateYTransformOperation: {
             Length tx = Length(0, Fixed);
             Length ty = Length(0, Fixed);
-            if (transformValue->operationType() == WebKitCSSTransformValue::TranslateYTransformOperation)
+            if (transformValue->operationType() == CSSTransformValue::TranslateYTransformOperation)
                 ty = convertToFloatLength(firstValue, style, rootStyle, zoomFactor);
             else {
                 tx = convertToFloatLength(firstValue, style, rootStyle, zoomFactor);
-                if (transformValue->operationType() != WebKitCSSTransformValue::TranslateXTransformOperation) {
+                if (transformValue->operationType() != CSSTransformValue::TranslateXTransformOperation) {
                     if (transformValue->length() > 1) {
                         CSSPrimitiveValue* secondValue = toCSSPrimitiveValue(transformValue->itemWithoutBoundsCheck(1));
                         ty = convertToFloatLength(secondValue, style, rootStyle, zoomFactor);
@@ -186,18 +186,18 @@
             operations.operations().append(TranslateTransformOperation::create(tx, ty, Length(0, Fixed), getTransformOperationType(transformValue->operationType())));
             break;
         }
-        case WebKitCSSTransformValue::TranslateZTransformOperation:
-        case WebKitCSSTransformValue::Translate3DTransformOperation: {
+        case CSSTransformValue::TranslateZTransformOperation:
+        case CSSTransformValue::Translate3DTransformOperation: {
             Length tx = Length(0, Fixed);
             Length ty = Length(0, Fixed);
             Length tz = Length(0, Fixed);
-            if (transformValue->operationType() == WebKitCSSTransformValue::TranslateZTransformOperation)
+            if (transformValue->operationType() == CSSTransformValue::TranslateZTransformOperation)
                 tz = convertToFloatLength(firstValue, style, rootStyle, zoomFactor);
-            else if (transformValue->operationType() == WebKitCSSTransformValue::TranslateYTransformOperation)
+            else if (transformValue->operationType() == CSSTransformValue::TranslateYTransformOperation)
                 ty = convertToFloatLength(firstValue, style, rootStyle, zoomFactor);
             else {
                 tx = convertToFloatLength(firstValue, style, rootStyle, zoomFactor);
-                if (transformValue->operationType() != WebKitCSSTransformValue::TranslateXTransformOperation) {
+                if (transformValue->operationType() != CSSTransformValue::TranslateXTransformOperation) {
                     if (transformValue->length() > 2) {
                         CSSPrimitiveValue* thirdValue = toCSSPrimitiveValue(transformValue->itemWithoutBoundsCheck(2));
                         tz = convertToFloatLength(thirdValue, style, rootStyle, zoomFactor);
@@ -215,29 +215,29 @@
             operations.operations().append(TranslateTransformOperation::create(tx, ty, tz, getTransformOperationType(transformValue->operationType())));
             break;
         }
-        case WebKitCSSTransformValue::RotateTransformOperation: {
+        case CSSTransformValue::RotateTransformOperation: {
             double angle = firstValue->computeDegrees();
             operations.operations().append(RotateTransformOperation::create(0, 0, 1, angle, getTransformOperationType(transformValue->operationType())));
             break;
         }
-        case WebKitCSSTransformValue::RotateXTransformOperation:
-        case WebKitCSSTransformValue::RotateYTransformOperation:
-        case WebKitCSSTransformValue::RotateZTransformOperation: {
+        case CSSTransformValue::RotateXTransformOperation:
+        case CSSTransformValue::RotateYTransformOperation:
+        case CSSTransformValue::RotateZTransformOperation: {
             double x = 0;
             double y = 0;
             double z = 0;
             double angle = firstValue->computeDegrees();
 
-            if (transformValue->operationType() == WebKitCSSTransformValue::RotateXTransformOperation)
+            if (transformValue->operationType() == CSSTransformValue::RotateXTransformOperation)
                 x = 1;
-            else if (transformValue->operationType() == WebKitCSSTransformValue::RotateYTransformOperation)
+            else if (transformValue->operationType() == CSSTransformValue::RotateYTransformOperation)
                 y = 1;
             else
                 z = 1;
             operations.operations().append(RotateTransformOperation::create(x, y, z, angle, getTransformOperationType(transformValue->operationType())));
             break;
         }
-        case WebKitCSSTransformValue::Rotate3DTransformOperation: {
+        case CSSTransformValue::Rotate3DTransformOperation: {
             if (transformValue->length() < 4)
                 break;
             CSSPrimitiveValue* secondValue = toCSSPrimitiveValue(transformValue->itemWithoutBoundsCheck(1));
@@ -250,17 +250,17 @@
             operations.operations().append(RotateTransformOperation::create(x, y, z, angle, getTransformOperationType(transformValue->operationType())));
             break;
         }
-        case WebKitCSSTransformValue::SkewTransformOperation:
-        case WebKitCSSTransformValue::SkewXTransformOperation:
-        case WebKitCSSTransformValue::SkewYTransformOperation: {
+        case CSSTransformValue::SkewTransformOperation:
+        case CSSTransformValue::SkewXTransformOperation:
+        case CSSTransformValue::SkewYTransformOperation: {
             double angleX = 0;
             double angleY = 0;
             double angle = firstValue->computeDegrees();
-            if (transformValue->operationType() == WebKitCSSTransformValue::SkewYTransformOperation)
+            if (transformValue->operationType() == CSSTransformValue::SkewYTransformOperation)
                 angleY = angle;
             else {
                 angleX = angle;
-                if (transformValue->operationType() == WebKitCSSTransformValue::SkewTransformOperation) {
+                if (transformValue->operationType() == CSSTransformValue::SkewTransformOperation) {
                     if (transformValue->length() > 1) {
                         CSSPrimitiveValue* secondValue = toCSSPrimitiveValue(transformValue->itemWithoutBoundsCheck(1));
                         angleY = secondValue->computeDegrees();
@@ -270,7 +270,7 @@
             operations.operations().append(SkewTransformOperation::create(angleX, angleY, getTransformOperationType(transformValue->operationType())));
             break;
         }
-        case WebKitCSSTransformValue::MatrixTransformOperation: {
+        case CSSTransformValue::MatrixTransformOperation: {
             if (transformValue->length() < 6)
                 break;
             double a = firstValue->getDoubleValue();
@@ -282,7 +282,7 @@
             operations.operations().append(MatrixTransformOperation::create(a, b, c, d, e, f));
             break;
         }
-        case WebKitCSSTransformValue::Matrix3DTransformOperation: {
+        case CSSTransformValue::Matrix3DTransformOperation: {
             if (transformValue->length() < 16)
                 break;
             TransformationMatrix matrix(toCSSPrimitiveValue(transformValue->itemWithoutBoundsCheck(0))->getDoubleValue(),
@@ -304,7 +304,7 @@
             operations.operations().append(Matrix3DTransformOperation::create(matrix));
             break;
         }
-        case WebKitCSSTransformValue::PerspectiveTransformOperation: {
+        case CSSTransformValue::PerspectiveTransformOperation: {
             Length p = Length(0, Fixed);
             if (firstValue->isLength())
                 p = convertToFloatLength(firstValue, style, rootStyle, zoomFactor);
@@ -320,7 +320,7 @@
             operations.operations().append(PerspectiveTransformOperation::create(p));
             break;
         }
-        case WebKitCSSTransformValue::UnknownTransformOperation:
+        case CSSTransformValue::UnknownTransformOperation:
             ASSERT_NOT_REACHED();
             break;
         }
diff --git a/Source/core/rendering/style/StylePendingShader.h b/Source/core/rendering/style/StylePendingShader.h
index c29de55..a97c66a 100644
--- a/Source/core/rendering/style/StylePendingShader.h
+++ b/Source/core/rendering/style/StylePendingShader.h
@@ -30,8 +30,8 @@
 #ifndef StylePendingShader_h
 #define StylePendingShader_h
 
+#include "core/css/CSSShaderValue.h"
 #include "core/css/CSSValue.h"
-#include "core/css/WebKitCSSShaderValue.h"
 #include "core/rendering/style/StyleShader.h"
 #include <wtf/PassRefPtr.h>
 
@@ -41,18 +41,18 @@
 
 class StylePendingShader : public StyleShader {
 public:
-    static PassRefPtr<StylePendingShader> create(WebKitCSSShaderValue* value) { return adoptRef(new StylePendingShader(value)); }
+    static PassRefPtr<StylePendingShader> create(CSSShaderValue* value) { return adoptRef(new StylePendingShader(value)); }
     
     virtual PassRefPtr<CSSValue> cssValue() const { return m_value; }
-    WebKitCSSShaderValue* cssShaderValue() const { return m_value; }
+    CSSShaderValue* cssShaderValue() const { return m_value; }
 private:
-    StylePendingShader(WebKitCSSShaderValue* value)
+    StylePendingShader(CSSShaderValue* value)
         : m_value(value)
     {
          m_isPendingShader = true;
     }
     
-    WebKitCSSShaderValue* m_value; // Not retained; it owns us.
+    CSSShaderValue* m_value; // Not retained; it owns us.
 };
 
 }