Title: [160023] trunk/Source
- Revision
- 160023
- Author
- [email protected]
- Date
- 2013-12-03 11:43:25 -0800 (Tue, 03 Dec 2013)
Log Message
Remove some CSS Variables leftovers
https://bugs.webkit.org/show_bug.cgi?id=125167
Patch by Nick Diego Yamane <[email protected]> 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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (160022 => 160023)
--- trunk/Source/WebCore/ChangeLog 2013-12-03 19:37:35 UTC (rev 160022)
+++ trunk/Source/WebCore/ChangeLog 2013-12-03 19:43:25 UTC (rev 160023)
@@ -1,3 +1,15 @@
+2013-12-03 Nick Diego Yamane <[email protected]>
+
+ 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 <[email protected]>
Checking second-to-last bit in address is a typo
Modified: trunk/Source/WebCore/css/CSSBasicShapes.cpp (160022 => 160023)
--- trunk/Source/WebCore/css/CSSBasicShapes.cpp 2013-12-03 19:37:35 UTC (rev 160022)
+++ trunk/Source/WebCore/css/CSSBasicShapes.cpp 2013-12-03 19:43:25 UTC (rev 160023)
@@ -533,73 +533,5 @@
&& compareCSSValuePtr(m_bottomLeftRadius, other.m_bottomLeftRadius);
}
-#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
Modified: trunk/Source/WebCore/css/CSSBasicShapes.h (160022 => 160023)
--- trunk/Source/WebCore/css/CSSBasicShapes.h 2013-12-03 19:37:35 UTC (rev 160022)
+++ trunk/Source/WebCore/css/CSSBasicShapes.h 2013-12-03 19:43:25 UTC (rev 160023)
@@ -161,11 +161,6 @@
virtual String cssText() const OVERRIDE;
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() { }
Modified: trunk/Source/WebKit/blackberry/ChangeLog (160022 => 160023)
--- trunk/Source/WebKit/blackberry/ChangeLog 2013-12-03 19:37:35 UTC (rev 160022)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2013-12-03 19:43:25 UTC (rev 160023)
@@ -1,3 +1,12 @@
+2013-12-03 Nick Diego Yamane <[email protected]>
+
+ 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 <[email protected]>
Remove VTableSpectrum
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/AboutDataEnableFeatures.in (160022 => 160023)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/AboutDataEnableFeatures.in 2013-12-03 19:37:35 UTC (rev 160022)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/AboutDataEnableFeatures.in 2013-12-03 19:43:25 UTC (rev 160023)
@@ -37,7 +37,6 @@
CSS_SHADERS
CSS_SHAPES
CSS_STICKY_POSITION
-CSS_VARIABLES
CURSOR_VISIBILITY
CUSTOM_PROTOCOLS
CUSTOM_SCHEME_HANDLER
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
