Changeset 173177 in webkit
- Timestamp:
- Sep 2, 2014 9:47:11 AM (10 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r173176 r173177 1 2014-09-02 Commit Queue <commit-queue@webkit.org> 2 3 Unreviewed, rolling out r173175. 4 https://bugs.webkit.org/show_bug.cgi?id=136454 5 6 it broke debug builds (Requested by jessieberlin on #webkit). 7 8 Reverted changeset: 9 10 "Introduce CSS_BASIC_TYPE_CASTS, and use it" 11 https://bugs.webkit.org/show_bug.cgi?id=136403 12 http://trac.webkit.org/changeset/173175 13 1 14 2014-09-02 Alex Christensen <achristensen@webkit.org> 2 15 -
trunk/Source/WebCore/css/BasicShapeFunctions.cpp
r173175 r173177 206 206 switch (basicShapeValue->type()) { 207 207 case CSSBasicShape::CSSBasicShapeCircleType: { 208 const CSSBasicShapeCircle* circleValue = toCSSBasicShapeCircle(basicShapeValue);208 const CSSBasicShapeCircle* circleValue = static_cast<const CSSBasicShapeCircle *>(basicShapeValue); 209 209 RefPtr<BasicShapeCircle> circle = BasicShapeCircle::create(); 210 210 … … 217 217 } 218 218 case CSSBasicShape::CSSBasicShapeEllipseType: { 219 const CSSBasicShapeEllipse* ellipseValue = toCSSBasicShapeEllipse(basicShapeValue);219 const CSSBasicShapeEllipse* ellipseValue = static_cast<const CSSBasicShapeEllipse *>(basicShapeValue); 220 220 RefPtr<BasicShapeEllipse> ellipse = BasicShapeEllipse::create(); 221 221 … … 230 230 } 231 231 case CSSBasicShape::CSSBasicShapePolygonType: { 232 const CSSBasicShapePolygon* polygonValue = toCSSBasicShapePolygon(basicShapeValue);232 const CSSBasicShapePolygon* polygonValue = static_cast<const CSSBasicShapePolygon *>(basicShapeValue); 233 233 RefPtr<BasicShapePolygon> polygon = BasicShapePolygon::create(); 234 234 … … 242 242 } 243 243 case CSSBasicShape::CSSBasicShapeInsetType: { 244 const CSSBasicShapeInset* rectValue = toCSSBasicShapeInset(basicShapeValue);244 const CSSBasicShapeInset* rectValue = static_cast<const CSSBasicShapeInset* >(basicShapeValue); 245 245 RefPtr<BasicShapeInset> rect = BasicShapeInset::create(); 246 246 -
trunk/Source/WebCore/css/CSSBasicShapes.cpp
r173175 r173177 129 129 return false; 130 130 131 const CSSBasicShapeCircle& other = toCSSBasicShapeCircle(shape);131 const CSSBasicShapeCircle& other = static_cast<const CSSBasicShapeCircle&>(shape); 132 132 return compareCSSValuePtr(m_centerX, other.m_centerX) 133 133 && compareCSSValuePtr(m_centerY, other.m_centerY) … … 202 202 return false; 203 203 204 const CSSBasicShapeEllipse& other = toCSSBasicShapeEllipse(shape);204 const CSSBasicShapeEllipse& other = static_cast<const CSSBasicShapeEllipse&>(shape); 205 205 return compareCSSValuePtr(m_centerX, other.m_centerX) 206 206 && compareCSSValuePtr(m_centerY, other.m_centerY) … … 273 273 return false; 274 274 275 const CSSBasicShapePolygon& rhs = toCSSBasicShapePolygon(shape);275 const CSSBasicShapePolygon& rhs = static_cast<const CSSBasicShapePolygon&>(shape); 276 276 return compareCSSValuePtr(m_referenceBox, rhs.m_referenceBox) 277 277 && compareCSSValueVector<CSSPrimitiveValue>(m_values, rhs.m_values); … … 408 408 return false; 409 409 410 const CSSBasicShapeInset& other = toCSSBasicShapeInset(shape);410 const CSSBasicShapeInset& other = static_cast<const CSSBasicShapeInset&>(shape); 411 411 return compareCSSValuePtr(m_top, other.m_top) 412 412 && compareCSSValuePtr(m_right, other.m_right) -
trunk/Source/WebCore/css/CSSBasicShapes.h
r173175 r173177 63 63 }; 64 64 65 #define CSS_BASIC_TYPE_CASTS(ToValueTypeName, predicate) \66 TYPE_CASTS_BASE(ToValueTypeName, CSSBasicShape, basicShape, basicShape->type() == predicate, basicShape.type() == predicate)67 68 65 class CSSBasicShapeInset : public CSSBasicShape { 69 66 public: … … 131 128 }; 132 129 133 CSS_BASIC_TYPE_CASTS(CSSBasicShapeInset, CSSBasicShapeInsetType)134 135 130 class CSSBasicShapeCircle : public CSSBasicShape { 136 131 public: … … 156 151 RefPtr<CSSPrimitiveValue> m_radius; 157 152 }; 158 159 CSS_BASIC_TYPE_CASTS(CSSBasicShapeCircle, CSSBasicShapeCircleType)160 153 161 154 class CSSBasicShapeEllipse : public CSSBasicShape { … … 186 179 }; 187 180 188 CSS_BASIC_TYPE_CASTS(CSSBasicShapeEllipse, CSSBasicShapeEllipseType)189 190 181 class CSSBasicShapePolygon : public CSSBasicShape { 191 182 public: … … 219 210 }; 220 211 221 CSS_BASIC_TYPE_CASTS(CSSBasicShapePolygon, CSSBasicShapePolygonType)222 223 212 } // namespace WebCore 224 213
Note: See TracChangeset
for help on using the changeset viewer.