<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[160023] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/160023">160023</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-03 11:43:25 -0800 (Tue, 03 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSBasicShapescpp">trunk/Source/WebCore/css/CSSBasicShapes.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSBasicShapesh">trunk/Source/WebCore/css/CSSBasicShapes.h</a></li>
<li><a href="#trunkSourceWebKitblackberryChangeLog">trunk/Source/WebKit/blackberry/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitblackberryWebCoreSupportAboutDataEnableFeaturesin">trunk/Source/WebKit/blackberry/WebCoreSupport/AboutDataEnableFeatures.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160022 => 160023)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+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:
+
</ins><span class="cx"> 2013-12-03 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Checking second-to-last bit in address is a typo
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSBasicShapescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSBasicShapes.cpp (160022 => 160023)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -533,73 +533,5 @@
</span><span class="cx"> && compareCSSValuePtr(m_bottomLeftRadius, other.m_bottomLeftRadius);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#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
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSBasicShapesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSBasicShapes.h (160022 => 160023)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -161,11 +161,6 @@
</span><span class="cx"> virtual String cssText() const OVERRIDE;
</span><span class="cx"> virtual bool equals(const CSSBasicShape&) const OVERRIDE;
</span><span class="cx">
</span><del>-#if ENABLE(CSS_VARIABLES)
- virtual String serializeResolvingVariables(const HashMap<AtomicString, String>&) const;
- virtual bool hasVariableReference() const;
-#endif
-
</del><span class="cx"> private:
</span><span class="cx"> CSSBasicShapeInset() { }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitblackberryChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/blackberry/ChangeLog (160022 => 160023)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+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:
+
</ins><span class="cx"> 2013-11-15 Mark Hahnenberg <mhahnenberg@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove VTableSpectrum
</span></span></pre></div>
<a id="trunkSourceWebKitblackberryWebCoreSupportAboutDataEnableFeaturesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/AboutDataEnableFeatures.in (160022 => 160023)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -37,7 +37,6 @@
</span><span class="cx"> CSS_SHADERS
</span><span class="cx"> CSS_SHAPES
</span><span class="cx"> CSS_STICKY_POSITION
</span><del>-CSS_VARIABLES
</del><span class="cx"> CURSOR_VISIBILITY
</span><span class="cx"> CUSTOM_PROTOCOLS
</span><span class="cx"> CUSTOM_SCHEME_HANDLER
</span></span></pre>
</div>
</div>
</body>
</html>