<!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>[166830] trunk/Source/WebCore</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/166830">166830</a></dd>
<dt>Author</dt> <dd>zoltan@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-05 01:22:35 -0700 (Sat, 05 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Shapes] Remove CSSBoxType member from BasicShape and CSSBasicShape
https://bugs.webkit.org/show_bug.cgi?id=129706
Reviewed by Andreas Kling.
The CSSBoxType has been moved up to ShapeValue and is no longer needed in the BasicShape classes.
No new tests, no behavior change.
* css/BasicShapeFunctions.cpp:
(WebCore::valueForBasicShape):
(WebCore::basicShapeForValue):
* rendering/style/BasicShapes.cpp:
(WebCore::BasicShape::canBlend):
* rendering/style/BasicShapes.h:
(WebCore::BasicShape::referenceBox): Deleted.
(WebCore::BasicShape::setReferenceBox): Deleted.
(WebCore::BasicShape::BasicShape): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssBasicShapeFunctionscpp">trunk/Source/WebCore/css/BasicShapeFunctions.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleBasicShapescpp">trunk/Source/WebCore/rendering/style/BasicShapes.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleBasicShapesh">trunk/Source/WebCore/rendering/style/BasicShapes.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166829 => 166830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-05 08:19:51 UTC (rev 166829)
+++ trunk/Source/WebCore/ChangeLog 2014-04-05 08:22:35 UTC (rev 166830)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-04-05 Zoltan Horvath <zoltan@webkit.org>
+
+ [CSS Shapes] Remove CSSBoxType member from BasicShape and CSSBasicShape
+ https://bugs.webkit.org/show_bug.cgi?id=129706
+
+ Reviewed by Andreas Kling.
+
+ The CSSBoxType has been moved up to ShapeValue and is no longer needed in the BasicShape classes.
+
+ No new tests, no behavior change.
+
+ * css/BasicShapeFunctions.cpp:
+ (WebCore::valueForBasicShape):
+ (WebCore::basicShapeForValue):
+ * rendering/style/BasicShapes.cpp:
+ (WebCore::BasicShape::canBlend):
+ * rendering/style/BasicShapes.h:
+ (WebCore::BasicShape::referenceBox): Deleted.
+ (WebCore::BasicShape::setReferenceBox): Deleted.
+ (WebCore::BasicShape::BasicShape): Deleted.
+
</ins><span class="cx"> 2014-04-05 Mark Rowe <mrowe@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix the 32-bit build after r166818.
</span></span></pre></div>
<a id="trunkSourceWebCorecssBasicShapeFunctionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/BasicShapeFunctions.cpp (166829 => 166830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/BasicShapeFunctions.cpp 2014-04-05 08:19:51 UTC (rev 166829)
+++ trunk/Source/WebCore/css/BasicShapeFunctions.cpp 2014-04-05 08:22:35 UTC (rev 166830)
</span><span class="lines">@@ -124,9 +124,6 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (basicShape->referenceBox() != BoxMissing)
- basicShapeValue->setReferenceBox(pool.createValue(basicShape->referenceBox()));
-
</del><span class="cx"> return pool.createValue(basicShapeValue.release());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -264,9 +261,6 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (basicShapeValue->referenceBox())
- basicShape->setReferenceBox(CSSBoxType(*basicShapeValue->referenceBox()));
-
</del><span class="cx"> return basicShape.release();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleBasicShapescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/BasicShapes.cpp (166829 => 166830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/BasicShapes.cpp 2014-04-05 08:19:51 UTC (rev 166829)
+++ trunk/Source/WebCore/rendering/style/BasicShapes.cpp 2014-04-05 08:22:35 UTC (rev 166830)
</span><span class="lines">@@ -64,10 +64,6 @@
</span><span class="cx"> if (type() != other->type())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- // Both shapes must use the same reference box.
- if (referenceBox() != other->referenceBox())
- return false;
-
</del><span class="cx"> // Just polygons with same number of vertices can be animated.
</span><span class="cx"> if (type() == BasicShape::BasicShapePolygonType
</span><span class="cx"> && (static_cast<const BasicShapePolygon*>(this)->values().size() != static_cast<const BasicShapePolygon*>(other)->values().size()
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleBasicShapesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/BasicShapes.h (166829 => 166830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/BasicShapes.h 2014-04-05 08:19:51 UTC (rev 166829)
+++ trunk/Source/WebCore/rendering/style/BasicShapes.h 2014-04-05 08:22:35 UTC (rev 166830)
</span><span class="lines">@@ -62,18 +62,6 @@
</span><span class="cx"> virtual PassRefPtr<BasicShape> blend(const BasicShape*, double) const = 0;
</span><span class="cx">
</span><span class="cx"> virtual Type type() const = 0;
</span><del>-
- CSSBoxType referenceBox() const { return m_referenceBox; }
- void setReferenceBox(CSSBoxType referenceBox) { m_referenceBox = referenceBox; }
-
-protected:
- BasicShape()
- : m_referenceBox(BoxMissing)
- {
- }
-
-private:
- CSSBoxType m_referenceBox;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class BasicShapeCenterCoordinate {
</span></span></pre>
</div>
</div>
</body>
</html>