Changeset 160023 in webkit

Timestamp:

Dec 3, 2013 11:43:25 AM (10 years ago)

Author:

commit-queue@webkit.org

Message:

Remove some CSS Variables leftovers
​https://bugs.webkit.org/show_bug.cgi?id=125167

Patch by Nick Diego Yamane <​nick.yamane@openbossa.org> on 2013-12-03
Reviewed by Darin Adler.

Source/WebCore:

No new tests needed. Only removing leftover code.

• css/CSSBasicShapes.cpp:
• css/CSSBasicShapes.h:

Source/WebKit/blackberry:

• WebCoreSupport/AboutDataEnableFeatures.in:

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/css/CSSBasicShapes.cpp (modified) (1 diff)
• WebCore/css/CSSBasicShapes.h (modified) (1 diff)
• WebKit/blackberry/ChangeLog (modified) (1 diff)
• WebKit/blackberry/WebCoreSupport/AboutDataEnableFeatures.in (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-12-03  Nick Diego Yamane  <nick.yamane@openbossa.org>
+
+        Remove some CSS Variables leftovers
+        https://bugs.webkit.org/show_bug.cgi?id=125167
+
+        Reviewed by Darin Adler.
+
+        No new tests needed. Only removing leftover code.
+
+        * css/CSSBasicShapes.cpp:
+        * css/CSSBasicShapes.h:
+
 2013-12-03  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/css/CSSBasicShapes.cpp

@@ -534 +534 @@
 }
 
-#if ENABLE(CSS_VARIABLES)
-String CSSBasicShapeInset::serializeResolvingVariables(const HashMap<AtomicString, String>& variables) const
-{
-    String topLeftRadiusWidth;
-    String topLeftRadiusHeight;
-    if (topLeftRadius()) {
-        if (m_topLeftRadius->getPairValue()->first())
-            topLeftRadiusWidth = m_topLeftRadius->getPairValue()->first()->serializeResolvingVariables(variables);
-        if (m_topLeftRadius->getPairValue()->second())
-            topLeftRadiusHeight = m_topLeftRadius->getPairValue()->second()->serializeResolvingVariables(variables);
-    }
-
-    String topRightRadiusWidth;
-    String topRightRadiusHeight;
-    if (topRightRadius()) {
-        if (m_topRightRadius->getPairValue()->first())
-            topRightRadiusWidth = m_topRightRadius->getPairValue()->first()->serializeResolvingVariables(variables);
-        if (m_topRightRadius->getPairValue()->second())
-            topRightRadiusHeight = m_topRightRadius->getPairValue()->second()->serializeResolvingVariables(variables);
-    }
-
-    String bottomRightRadiusWidth;
-    String bottomRightRadiusHeight;
-    if (bottomRightRadius()) {
-        if (m_bottomRightRadius->getPairValue()->first())
-            bottomRightRadiusWidth = m_bottomRightRadius->getPairValue()->first()->serializeResolvingVariables(variables);
-        if (m_bottomRightRadius->getPairValue()->second())
-            bottomRightRadiusHeight = m_bottomRightRadius->getPairValue()->second()->serializeResolvingVariables(variables);
-    }
-
-    String bottomLeftRadiusWidth;
-    String bottomLeftRadiusHeight;
-    if (bottomLeftRadius()) {
-        if (m_bottomLeftRadius->getPairValue()->first())
-            bottomLeftRadiusWidth = m_bottomLeftRadius->getPairValue()->first()->serializeResolvingVariables(variables);
-        if (m_bottomLeftRadius->getPairValue()->second())
-            bottomLeftRadiusHeight = m_bottomLeftRadius->getPairValue()->second()->serializeResolvingVariables(variables);
-    }
-
-    return buildInsetString(m_top->serializeResolvingVariables(variables),
-        m_right->serializeResolvingVariables(variables),
-        m_bottom->serializeResolvingVariables(variables),
-        m_left->serializeResolvingVariables(variables),
-        topLeftRadiusWidth,
-        topLeftRadiusHeight,
-        topRightRadiusWidth,
-        topRightRadiusHeight,
-        bottomRightRadiusWidth,
-        bottomRightRadiusHeight,
-        bottomLeftRadiusWidth,
-        bottomLeftRadiusHeight,
-        m_box ? m_box->serializeResolvingVariables(variables) : String());
-}
-
-bool CSSBasicShapeInset::hasVariableReference() const
-{
-    return m_top->hasVariableReference()
-        || m_right->hasVariableReference()
-        || m_bottom->hasVariableReference()
-        || m_left->hasVariableReference()
-        || (topLeftRadius() && m_topLeftRadius->hasVariableReference())
-        || (topRightRadius() && m_topRightRadius->hasVariableReference())
-        || (bottomRightRadius() && m_bottomRightRadius->hasVariableReference())
-        || (bottomLeftRadius() && m_bottomLeftRadius->hasVariableReference())
-        || (m_box && m_box->hasVariableReference());
-}
-#endif
-
 } // namespace WebCore
 

trunk/Source/WebCore/css/CSSBasicShapes.h

@@ -162 +162 @@
     virtual bool equals(const CSSBasicShape&) const OVERRIDE;
 
-#if ENABLE(CSS_VARIABLES)
-    virtual String serializeResolvingVariables(const HashMap<AtomicString, String>&) const;
-    virtual bool hasVariableReference() const;
-#endif
-
 private:
     CSSBasicShapeInset() { }

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2013-12-03  Nick Diego Yamane  <nick.yamane@openbossa.org>
+
+        Remove some CSS Variables leftovers
+        https://bugs.webkit.org/show_bug.cgi?id=125167
+
+        Reviewed by Darin Adler.
+
+        * WebCoreSupport/AboutDataEnableFeatures.in:
+
 2013-11-15  Mark Hahnenberg  <mhahnenberg@apple.com>
 

trunk/Source/WebKit/blackberry/WebCoreSupport/AboutDataEnableFeatures.in

@@ -38 +38 @@
 CSS_SHAPES
 CSS_STICKY_POSITION
-CSS_VARIABLES
 CURSOR_VISIBILITY
 CUSTOM_PROTOCOLS