CSSValue: isInheritedValue() doesn't need a dedicated bit.

<http://webkit.org/b/72514>

Patch by Andreas Kling <kling@webkit.org> on 2011-11-16
Reviewed by Antti Koivisto.

Remove CSSValue::m_isInherited and have isInheritedValue() check the
class type instead. There's no compelling reason for CSSInheritedValue
to have a dedicated bit, since nobody subclasses it anyway.

* css/CSSValue.h:
(WebCore::CSSValue::isInheritedValue):
(WebCore::CSSValue::CSSValue):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@100481 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index a38fa2a8fccebedd1b23850611cac9009f36b66e..8c1d4b7c2008276c64d3ff7ce71a2166d6af87f7 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2011-11-16  Andreas Kling  <kling@webkit.org>
+
+        CSSValue: isInheritedValue() doesn't need a dedicated bit.
+        <http://webkit.org/b/72514>
+
+        Reviewed by Antti Koivisto.
+
+        Remove CSSValue::m_isInherited and have isInheritedValue() check the
+        class type instead. There's no compelling reason for CSSInheritedValue
+        to have a dedicated bit, since nobody subclasses it anyway.
+
+        * css/CSSValue.h:
+        (WebCore::CSSValue::isInheritedValue):
+        (WebCore::CSSValue::CSSValue):
+
 2011-11-16  Robert Hogan  <robert@webkit.org>
 
         Fix build on Windows and Mac after r100473

diff --git a/Source/WebCore/css/CSSValue.h b/Source/WebCore/css/CSSValue.h
index a19029bcaae2663238f9f9e4dc7c1c03bd2eb28c..63b16ea18bbc4570e524b9c5e0317eef4b10c553 100644 (file)
--- a/Source/WebCore/css/CSSValue.h
+++ b/Source/WebCore/css/CSSValue.h
@@ -58,7 +58,6 @@ public:
 
     bool isPrimitiveValue() const { return m_isPrimitive; }
     bool isValueList() const { return m_isList; }
-    bool isInheritedValue() const { return m_isInherited; }
 
     bool isBorderImageValue() const { return m_classType == BorderImageClass; }
     bool isBorderImageSliceValue() const { return m_classType == BorderImageSliceClass; }
@@ -69,6 +68,7 @@ public:
     bool isImageGeneratorValue() const { return m_classType == CanvasClass || m_classType == CrossfadeClass || m_classType == LinearGradientClass || m_classType == RadialGradientClass; }
     bool isImageValue() const { return m_classType == ImageClass || m_classType == CursorImageClass; }
     bool isImplicitInitialValue() const { return m_classType == InitialClass && m_isImplicit; }
+    bool isInheritedValue() const { return m_classType == InheritedClass; }
     bool isInitialValue() const { return m_classType == InitialClass; }
     bool isReflectValue() const { return m_classType == ReflectClass; }
     bool isShadowValue() const { return m_classType == ShadowClass; }
@@ -141,7 +141,6 @@ protected:
         , m_classType(classType)
         , m_isPrimitive(isPrimitiveType(classType))
         , m_isList(isListType(classType))
-        , m_isInherited(isInheritedType(classType))
     {
     }
 
@@ -168,11 +167,6 @@ private:
             || type == WebKitCSSTransformClass;
     }
 
-    static bool isInheritedType(ClassType type)
-    {
-        return type == InheritedClass;
-    }
-
     void destroy();
 
 protected:
@@ -191,7 +185,6 @@ private:
     unsigned m_classType : 5; // ClassType
     bool m_isPrimitive : 1;
     bool m_isList : 1;
-    bool m_isInherited : 1;
 };
 
 } // namespace WebCore