<!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>[174236] 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/174236">174236</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-10-02 15:53:18 -0700 (Thu, 02 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use is<>() / downcast<>() for CSSBasicShape objects
https://bugs.webkit.org/show_bug.cgi?id=137331
Reviewed by Andreas Kling.
Use is<>() / downcast<>() for CSSBasicShape objects.
No new tests, no behavior change.
* css/BasicShapeFunctions.cpp:
(WebCore::basicShapeForValue):
* css/CSSBasicShapes.cpp:
(WebCore::CSSBasicShapeCircle::equals):
(WebCore::CSSBasicShapeEllipse::equals):
(WebCore::CSSBasicShapePolygon::equals):
(WebCore::CSSBasicShapeInset::equals):
* css/CSSBasicShapes.h:</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="#trunkSourceWebCorecssCSSBasicShapescpp">trunk/Source/WebCore/css/CSSBasicShapes.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSBasicShapesh">trunk/Source/WebCore/css/CSSBasicShapes.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (174235 => 174236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-02 22:49:06 UTC (rev 174235)
+++ trunk/Source/WebCore/ChangeLog 2014-10-02 22:53:18 UTC (rev 174236)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-10-02 Christophe Dumez <cdumez@apple.com>
+
+ Use is<>() / downcast<>() for CSSBasicShape objects
+ https://bugs.webkit.org/show_bug.cgi?id=137331
+
+ Reviewed by Andreas Kling.
+
+ Use is<>() / downcast<>() for CSSBasicShape objects.
+
+ No new tests, no behavior change.
+
+ * css/BasicShapeFunctions.cpp:
+ (WebCore::basicShapeForValue):
+ * css/CSSBasicShapes.cpp:
+ (WebCore::CSSBasicShapeCircle::equals):
+ (WebCore::CSSBasicShapeEllipse::equals):
+ (WebCore::CSSBasicShapePolygon::equals):
+ (WebCore::CSSBasicShapeInset::equals):
+ * css/CSSBasicShapes.h:
+
</ins><span class="cx"> 2014-10-02 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> XMLHttpRequestProgressEventThrottle shouldn't throttle / defer progress events if there are no listeners
</span></span></pre></div>
<a id="trunkSourceWebCorecssBasicShapeFunctionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/BasicShapeFunctions.cpp (174235 => 174236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/BasicShapeFunctions.cpp 2014-10-02 22:49:06 UTC (rev 174235)
+++ trunk/Source/WebCore/css/BasicShapeFunctions.cpp 2014-10-02 22:53:18 UTC (rev 174236)
</span><span class="lines">@@ -205,35 +205,35 @@
</span><span class="cx">
</span><span class="cx"> switch (basicShapeValue->type()) {
</span><span class="cx"> case CSSBasicShape::CSSBasicShapeCircleType: {
</span><del>- const CSSBasicShapeCircle* circleValue = toCSSBasicShapeCircle(basicShapeValue);
</del><ins>+ const CSSBasicShapeCircle& circleValue = downcast<CSSBasicShapeCircle>(*basicShapeValue);
</ins><span class="cx"> RefPtr<BasicShapeCircle> circle = BasicShapeCircle::create();
</span><span class="cx">
</span><del>- circle->setCenterX(convertToCenterCoordinate(conversionData, circleValue->centerX()));
- circle->setCenterY(convertToCenterCoordinate(conversionData, circleValue->centerY()));
- circle->setRadius(cssValueToBasicShapeRadius(conversionData, circleValue->radius()));
</del><ins>+ circle->setCenterX(convertToCenterCoordinate(conversionData, circleValue.centerX()));
+ circle->setCenterY(convertToCenterCoordinate(conversionData, circleValue.centerY()));
+ circle->setRadius(cssValueToBasicShapeRadius(conversionData, circleValue.radius()));
</ins><span class="cx">
</span><span class="cx"> basicShape = circle.release();
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case CSSBasicShape::CSSBasicShapeEllipseType: {
</span><del>- const CSSBasicShapeEllipse* ellipseValue = toCSSBasicShapeEllipse(basicShapeValue);
</del><ins>+ const CSSBasicShapeEllipse& ellipseValue = downcast<CSSBasicShapeEllipse>(*basicShapeValue);
</ins><span class="cx"> RefPtr<BasicShapeEllipse> ellipse = BasicShapeEllipse::create();
</span><span class="cx">
</span><del>- ellipse->setCenterX(convertToCenterCoordinate(conversionData, ellipseValue->centerX()));
- ellipse->setCenterY(convertToCenterCoordinate(conversionData, ellipseValue->centerY()));
</del><ins>+ ellipse->setCenterX(convertToCenterCoordinate(conversionData, ellipseValue.centerX()));
+ ellipse->setCenterY(convertToCenterCoordinate(conversionData, ellipseValue.centerY()));
</ins><span class="cx">
</span><del>- ellipse->setRadiusX(cssValueToBasicShapeRadius(conversionData, ellipseValue->radiusX()));
- ellipse->setRadiusY(cssValueToBasicShapeRadius(conversionData, ellipseValue->radiusY()));
</del><ins>+ ellipse->setRadiusX(cssValueToBasicShapeRadius(conversionData, ellipseValue.radiusX()));
+ ellipse->setRadiusY(cssValueToBasicShapeRadius(conversionData, ellipseValue.radiusY()));
</ins><span class="cx">
</span><span class="cx"> basicShape = ellipse.release();
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case CSSBasicShape::CSSBasicShapePolygonType: {
</span><del>- const CSSBasicShapePolygon* polygonValue = toCSSBasicShapePolygon(basicShapeValue);
</del><ins>+ const CSSBasicShapePolygon& polygonValue = downcast<CSSBasicShapePolygon>(*basicShapeValue);
</ins><span class="cx"> RefPtr<BasicShapePolygon> polygon = BasicShapePolygon::create();
</span><span class="cx">
</span><del>- polygon->setWindRule(polygonValue->windRule());
- const Vector<RefPtr<CSSPrimitiveValue>>& values = polygonValue->values();
</del><ins>+ polygon->setWindRule(polygonValue.windRule());
+ const Vector<RefPtr<CSSPrimitiveValue>>& values = polygonValue.values();
</ins><span class="cx"> for (unsigned i = 0; i < values.size(); i += 2)
</span><span class="cx"> polygon->appendPoint(convertToLength(conversionData, values.at(i).get()), convertToLength(conversionData, values.at(i + 1).get()));
</span><span class="cx">
</span><span class="lines">@@ -241,18 +241,18 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case CSSBasicShape::CSSBasicShapeInsetType: {
</span><del>- const CSSBasicShapeInset* rectValue = toCSSBasicShapeInset(basicShapeValue);
</del><ins>+ const CSSBasicShapeInset& rectValue = downcast<CSSBasicShapeInset>(*basicShapeValue);
</ins><span class="cx"> RefPtr<BasicShapeInset> rect = BasicShapeInset::create();
</span><span class="cx">
</span><del>- rect->setTop(convertToLength(conversionData, rectValue->top()));
- rect->setRight(convertToLength(conversionData, rectValue->right()));
- rect->setBottom(convertToLength(conversionData, rectValue->bottom()));
- rect->setLeft(convertToLength(conversionData, rectValue->left()));
</del><ins>+ rect->setTop(convertToLength(conversionData, rectValue.top()));
+ rect->setRight(convertToLength(conversionData, rectValue.right()));
+ rect->setBottom(convertToLength(conversionData, rectValue.bottom()));
+ rect->setLeft(convertToLength(conversionData, rectValue.left()));
</ins><span class="cx">
</span><del>- rect->setTopLeftRadius(convertToLengthSize(conversionData, rectValue->topLeftRadius()));
- rect->setTopRightRadius(convertToLengthSize(conversionData, rectValue->topRightRadius()));
- rect->setBottomRightRadius(convertToLengthSize(conversionData, rectValue->bottomRightRadius()));
- rect->setBottomLeftRadius(convertToLengthSize(conversionData, rectValue->bottomLeftRadius()));
</del><ins>+ rect->setTopLeftRadius(convertToLengthSize(conversionData, rectValue.topLeftRadius()));
+ rect->setTopRightRadius(convertToLengthSize(conversionData, rectValue.topRightRadius()));
+ rect->setBottomRightRadius(convertToLengthSize(conversionData, rectValue.bottomRightRadius()));
+ rect->setBottomLeftRadius(convertToLengthSize(conversionData, rectValue.bottomLeftRadius()));
</ins><span class="cx">
</span><span class="cx"> basicShape = rect.release();
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSBasicShapescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSBasicShapes.cpp (174235 => 174236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSBasicShapes.cpp 2014-10-02 22:49:06 UTC (rev 174235)
+++ trunk/Source/WebCore/css/CSSBasicShapes.cpp 2014-10-02 22:53:18 UTC (rev 174236)
</span><span class="lines">@@ -125,10 +125,10 @@
</span><span class="cx">
</span><span class="cx"> bool CSSBasicShapeCircle::equals(const CSSBasicShape& shape) const
</span><span class="cx"> {
</span><del>- if (shape.type() != CSSBasicShapeCircleType)
</del><ins>+ if (!is<CSSBasicShapeCircle>(shape))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- const CSSBasicShapeCircle& other = toCSSBasicShapeCircle(shape);
</del><ins>+ const CSSBasicShapeCircle& other = downcast<CSSBasicShapeCircle>(shape);
</ins><span class="cx"> return compareCSSValuePtr(m_centerX, other.m_centerX)
</span><span class="cx"> && compareCSSValuePtr(m_centerY, other.m_centerY)
</span><span class="cx"> && compareCSSValuePtr(m_radius, other.m_radius)
</span><span class="lines">@@ -198,10 +198,10 @@
</span><span class="cx">
</span><span class="cx"> bool CSSBasicShapeEllipse::equals(const CSSBasicShape& shape) const
</span><span class="cx"> {
</span><del>- if (shape.type() != CSSBasicShapeEllipseType)
</del><ins>+ if (!is<CSSBasicShapeEllipse>(shape))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- const CSSBasicShapeEllipse& other = toCSSBasicShapeEllipse(shape);
</del><ins>+ const CSSBasicShapeEllipse& other = downcast<CSSBasicShapeEllipse>(shape);
</ins><span class="cx"> return compareCSSValuePtr(m_centerX, other.m_centerX)
</span><span class="cx"> && compareCSSValuePtr(m_centerY, other.m_centerY)
</span><span class="cx"> && compareCSSValuePtr(m_radiusX, other.m_radiusX)
</span><span class="lines">@@ -269,10 +269,10 @@
</span><span class="cx">
</span><span class="cx"> bool CSSBasicShapePolygon::equals(const CSSBasicShape& shape) const
</span><span class="cx"> {
</span><del>- if (shape.type() != CSSBasicShapePolygonType)
</del><ins>+ if (!is<CSSBasicShapePolygon>(shape))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- const CSSBasicShapePolygon& rhs = toCSSBasicShapePolygon(shape);
</del><ins>+ const CSSBasicShapePolygon& rhs = downcast<CSSBasicShapePolygon>(shape);
</ins><span class="cx"> return compareCSSValuePtr(m_referenceBox, rhs.m_referenceBox)
</span><span class="cx"> && compareCSSValueVector<CSSPrimitiveValue>(m_values, rhs.m_values);
</span><span class="cx"> }
</span><span class="lines">@@ -404,10 +404,10 @@
</span><span class="cx">
</span><span class="cx"> bool CSSBasicShapeInset::equals(const CSSBasicShape& shape) const
</span><span class="cx"> {
</span><del>- if (shape.type() != CSSBasicShapeInsetType)
</del><ins>+ if (!is<CSSBasicShapeInset>(shape))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- const CSSBasicShapeInset& other = toCSSBasicShapeInset(shape);
</del><ins>+ const CSSBasicShapeInset& other = downcast<CSSBasicShapeInset>(shape);
</ins><span class="cx"> return compareCSSValuePtr(m_top, other.m_top)
</span><span class="cx"> && compareCSSValuePtr(m_right, other.m_right)
</span><span class="cx"> && compareCSSValuePtr(m_bottom, other.m_bottom)
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSBasicShapesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSBasicShapes.h (174235 => 174236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSBasicShapes.h 2014-10-02 22:49:06 UTC (rev 174235)
+++ trunk/Source/WebCore/css/CSSBasicShapes.h 2014-10-02 22:53:18 UTC (rev 174236)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include "CSSPrimitiveValue.h"
</span><span class="cx"> #include "WindRule.h"
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><ins>+#include <wtf/TypeCasts.h>
</ins><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -62,9 +63,6 @@
</span><span class="cx"> RefPtr<CSSPrimitiveValue> m_referenceBox;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#define CSS_BASIC_SHAPES_TYPE_CASTS(ToValueTypeName, predicate) \
- TYPE_CASTS_BASE(ToValueTypeName, CSSBasicShape, basicShape, basicShape->type() == predicate, basicShape.type() == predicate)
-
</del><span class="cx"> class CSSBasicShapeInset : public CSSBasicShape {
</span><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<CSSBasicShapeInset> create() { return adoptRef(new CSSBasicShapeInset); }
</span><span class="lines">@@ -130,8 +128,6 @@
</span><span class="cx"> RefPtr<CSSPrimitiveValue> m_bottomLeftRadius;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-CSS_BASIC_SHAPES_TYPE_CASTS(CSSBasicShapeInset, CSSBasicShape::CSSBasicShapeInsetType)
-
</del><span class="cx"> class CSSBasicShapeCircle : public CSSBasicShape {
</span><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<CSSBasicShapeCircle> create() { return adoptRef(new CSSBasicShapeCircle); }
</span><span class="lines">@@ -156,8 +152,6 @@
</span><span class="cx"> RefPtr<CSSPrimitiveValue> m_radius;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-CSS_BASIC_SHAPES_TYPE_CASTS(CSSBasicShapeCircle, CSSBasicShape::CSSBasicShapeCircleType)
-
</del><span class="cx"> class CSSBasicShapeEllipse : public CSSBasicShape {
</span><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<CSSBasicShapeEllipse> create() { return adoptRef(new CSSBasicShapeEllipse); }
</span><span class="lines">@@ -185,8 +179,6 @@
</span><span class="cx"> RefPtr<CSSPrimitiveValue> m_radiusY;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-CSS_BASIC_SHAPES_TYPE_CASTS(CSSBasicShapeEllipse, CSSBasicShape::CSSBasicShapeEllipseType)
-
</del><span class="cx"> class CSSBasicShapePolygon : public CSSBasicShape {
</span><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<CSSBasicShapePolygon> create() { return adoptRef(new CSSBasicShapePolygon); }
</span><span class="lines">@@ -218,8 +210,16 @@
</span><span class="cx"> WindRule m_windRule;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-CSS_BASIC_SHAPES_TYPE_CASTS(CSSBasicShapePolygon, CSSBasicShape::CSSBasicShapePolygonType)
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><ins>+#define SPECIALIZE_TYPE_TRAITS_CSS_BASIC_SHAPES(ToValueTypeName) \
+SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::ToValueTypeName) \
+ static bool isType(const WebCore::CSSBasicShape& basicShape) { return basicShape.type() == WebCore::CSSBasicShape::ToValueTypeName##Type; } \
+SPECIALIZE_TYPE_TRAITS_END()
+
+SPECIALIZE_TYPE_TRAITS_CSS_BASIC_SHAPES(CSSBasicShapeInset)
+SPECIALIZE_TYPE_TRAITS_CSS_BASIC_SHAPES(CSSBasicShapeCircle)
+SPECIALIZE_TYPE_TRAITS_CSS_BASIC_SHAPES(CSSBasicShapeEllipse)
+SPECIALIZE_TYPE_TRAITS_CSS_BASIC_SHAPES(CSSBasicShapePolygon)
+
</ins><span class="cx"> #endif // CSSBasicShapes_h
</span></span></pre>
</div>
</div>
</body>
</html>