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:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@160023 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 249919bb
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>
Checking second-to-last bit in address is a typo
......@@ -533,73 +533,5 @@ bool CSSBasicShapeInset::equals(const CSSBasicShape& shape) const
&& 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
......@@ -161,11 +161,6 @@ public:
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() { }
......
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>
Remove VTableSpectrum
......
......@@ -37,7 +37,6 @@ CSS_REGIONS
CSS_SHADERS
CSS_SHAPES
CSS_STICKY_POSITION
CSS_VARIABLES
CURSOR_VISIBILITY
CUSTOM_PROTOCOLS
CUSTOM_SCHEME_HANDLER
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment