Changeset 173175 in webkit

Timestamp:

Sep 2, 2014 9:06:23 AM (10 years ago)

Author:

gyuyoung.kim@samsung.com

Message:

Introduce CSS_BASIC_TYPE_CASTS, and use it
​https://bugs.webkit.org/show_bug.cgi?id=136403

Reviewed by Darin Adler.

toCSSBasicFoo() will help to detect wrong type casting. So this patch generates it, and use it
instead of static_cast<const CSSBasicFoo*>().

No new tests no behavior changes.

• css/BasicShapeFunctions.cpp:

(WebCore::basicShapeForValue):

• css/CSSBasicShapes.cpp:

(WebCore::CSSBasicShapeCircle::equals):
(WebCore::CSSBasicShapeEllipse::equals):
(WebCore::CSSBasicShapePolygon::equals):
(WebCore::CSSBasicShapeInset::equals):

• css/CSSBasicShapes.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/BasicShapeFunctions.cpp (modified) (4 diffs)
• css/CSSBasicShapes.cpp (modified) (4 diffs)
• css/CSSBasicShapes.h (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-09-02  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        Introduce CSS_BASIC_TYPE_CASTS, and use it
+        https://bugs.webkit.org/show_bug.cgi?id=136403
+
+        Reviewed by Darin Adler.
+
+        toCSSBasicFoo() will help to detect wrong type casting. So this patch generates it, and use it
+        instead of static_cast<const CSSBasicFoo*>().
+
+        No new tests no behavior changes.
+
+        * css/BasicShapeFunctions.cpp:
+        (WebCore::basicShapeForValue):
+        * css/CSSBasicShapes.cpp:
+        (WebCore::CSSBasicShapeCircle::equals):
+        (WebCore::CSSBasicShapeEllipse::equals):
+        (WebCore::CSSBasicShapePolygon::equals):
+        (WebCore::CSSBasicShapeInset::equals):
+        * css/CSSBasicShapes.h:
+
 2014-09-02  Youenn Fablet  <youenn.fablet@crf.canon.fr>
 

trunk/Source/WebCore/css/BasicShapeFunctions.cpp

@@ -206 +206 @@
     switch (basicShapeValue->type()) {
     case CSSBasicShape::CSSBasicShapeCircleType: {
-        const CSSBasicShapeCircle* circleValue = static_cast<const CSSBasicShapeCircle *>(basicShapeValue);
+        const CSSBasicShapeCircle* circleValue = toCSSBasicShapeCircle(basicShapeValue);
         RefPtr<BasicShapeCircle> circle = BasicShapeCircle::create();
 
@@ -217 +217 @@
     }
     case CSSBasicShape::CSSBasicShapeEllipseType: {
-        const CSSBasicShapeEllipse* ellipseValue = static_cast<const CSSBasicShapeEllipse *>(basicShapeValue);
+        const CSSBasicShapeEllipse* ellipseValue = toCSSBasicShapeEllipse(basicShapeValue);
         RefPtr<BasicShapeEllipse> ellipse = BasicShapeEllipse::create();
 
@@ -230 +230 @@
     }
     case CSSBasicShape::CSSBasicShapePolygonType: {
-        const CSSBasicShapePolygon* polygonValue = static_cast<const CSSBasicShapePolygon *>(basicShapeValue);
+        const CSSBasicShapePolygon* polygonValue = toCSSBasicShapePolygon(basicShapeValue);
         RefPtr<BasicShapePolygon> polygon = BasicShapePolygon::create();
 
@@ -242 +242 @@
     }
     case CSSBasicShape::CSSBasicShapeInsetType: {
-        const CSSBasicShapeInset* rectValue = static_cast<const CSSBasicShapeInset* >(basicShapeValue);
+        const CSSBasicShapeInset* rectValue = toCSSBasicShapeInset(basicShapeValue);
         RefPtr<BasicShapeInset> rect = BasicShapeInset::create();
 

trunk/Source/WebCore/css/CSSBasicShapes.cpp

@@ -129 +129 @@
         return false;
 
-    const CSSBasicShapeCircle& other = static_cast<const CSSBasicShapeCircle&>(shape);
+    const CSSBasicShapeCircle& other = toCSSBasicShapeCircle(shape);
     return compareCSSValuePtr(m_centerX, other.m_centerX)
         && compareCSSValuePtr(m_centerY, other.m_centerY)
@@ -202 +202 @@
         return false;
 
-    const CSSBasicShapeEllipse& other = static_cast<const CSSBasicShapeEllipse&>(shape);
+    const CSSBasicShapeEllipse& other = toCSSBasicShapeEllipse(shape);
     return compareCSSValuePtr(m_centerX, other.m_centerX)
         && compareCSSValuePtr(m_centerY, other.m_centerY)
@@ -273 +273 @@
         return false;
 
-    const CSSBasicShapePolygon& rhs = static_cast<const CSSBasicShapePolygon&>(shape);
+    const CSSBasicShapePolygon& rhs = toCSSBasicShapePolygon(shape);
     return compareCSSValuePtr(m_referenceBox, rhs.m_referenceBox)
         && compareCSSValueVector<CSSPrimitiveValue>(m_values, rhs.m_values);
@@ -408 +408 @@
         return false;
 
-    const CSSBasicShapeInset& other = static_cast<const CSSBasicShapeInset&>(shape);
+    const CSSBasicShapeInset& other = toCSSBasicShapeInset(shape);
     return compareCSSValuePtr(m_top, other.m_top)
         && compareCSSValuePtr(m_right, other.m_right)

trunk/Source/WebCore/css/CSSBasicShapes.h

@@ -63 +63 @@
 };
 
+#define CSS_BASIC_TYPE_CASTS(ToValueTypeName, predicate) \
+    TYPE_CASTS_BASE(ToValueTypeName, CSSBasicShape, basicShape, basicShape->type() == predicate, basicShape.type() == predicate) 
+
 class CSSBasicShapeInset : public CSSBasicShape {
 public:
@@ -128 +131 @@
 };
 
+CSS_BASIC_TYPE_CASTS(CSSBasicShapeInset, CSSBasicShapeInsetType)
+
 class CSSBasicShapeCircle : public CSSBasicShape {
 public:
@@ -151 +156 @@
     RefPtr<CSSPrimitiveValue> m_radius;
 };
+
+CSS_BASIC_TYPE_CASTS(CSSBasicShapeCircle, CSSBasicShapeCircleType)
 
 class CSSBasicShapeEllipse : public CSSBasicShape {
@@ -179 +186 @@
 };
 
+CSS_BASIC_TYPE_CASTS(CSSBasicShapeEllipse, CSSBasicShapeEllipseType)
+
 class CSSBasicShapePolygon : public CSSBasicShape {
 public:
@@ -210 +219 @@
 };
 
+CSS_BASIC_TYPE_CASTS(CSSBasicShapePolygon, CSSBasicShapePolygonType)
+
 } // namespace WebCore