Changeset 127155 in webkit for trunk/Source/WebCore/css/CSSPrimitiveValue.h

Timestamp:

Aug 30, 2012, 10:08:00 AM (13 years ago)

Author:

[email protected]

Message:

Refactor WrapShape classes to BasicShape
​https://bugs.webkit.org/show_bug.cgi?id=95461

Reviewed by Rob Buis.

This is a follow up patch of bug 95411. While the previous patch
just renamed the files, this patch renames the classes, enumerations
and functions.

Just refactoring of internal names. No new tests.

• css/BasicShapeFunctions.cpp:

(WebCore::valueForBasicShape):
(WebCore::basicShapeForValue):

• css/BasicShapeFunctions.h:

(WebCore):

• css/CSSBasicShapes.cpp:

(WebCore::CSSBasicShapeRectangle::cssText):
(WebCore::CSSBasicShapeCircle::cssText):
(WebCore::CSSBasicShapeEllipse::cssText):
(WebCore::CSSBasicShapePolygon::cssText):

• css/CSSBasicShapes.h:

(WebCore::CSSBasicShape::~CSSBasicShape):
(WebCore::CSSBasicShape::CSSBasicShape):
(WebCore::CSSBasicShapeRectangle::create):
(WebCore::CSSBasicShapeRectangle::type):
(WebCore::CSSBasicShapeRectangle::CSSBasicShapeRectangle):
(WebCore::CSSBasicShapeCircle::create):
(WebCore::CSSBasicShapeCircle::type):
(WebCore::CSSBasicShapeCircle::CSSBasicShapeCircle):
(WebCore::CSSBasicShapeEllipse::create):
(WebCore::CSSBasicShapeEllipse::type):
(WebCore::CSSBasicShapeEllipse::CSSBasicShapeEllipse):
(WebCore::CSSBasicShapePolygon::create):
(WebCore::CSSBasicShapePolygon::type):
(WebCore::CSSBasicShapePolygon::CSSBasicShapePolygon):

• css/CSSComputedStyleDeclaration.cpp:

(WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):

• css/CSSParser.cpp:

(WebCore::CSSParser::parseValue):
(WebCore::CSSParser::parseBasicShapeRectangle):
(WebCore::CSSParser::parseBasicShapeCircle):
(WebCore::CSSParser::parseBasicShapeEllipse):
(WebCore::CSSParser::parseBasicShapePolygon):
(WebCore::CSSParser::parseBasicShape):

• css/CSSParser.h:

(WebCore):

• css/CSSPrimitiveValue.cpp:

(WebCore::CSSPrimitiveValue::init):

• css/CSSPrimitiveValue.h:

(WebCore):
(WebCore::CSSPrimitiveValue::getShapeValue):
(CSSPrimitiveValue):

• css/StyleBuilder.cpp:

(WebCore):
(WebCore::ApplyPropertyWrapShape::setValue):
(WebCore::ApplyPropertyWrapShape::applyValue):
(WebCore::ApplyPropertyWrapShape::createHandler):

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::updateWrapShapeInfoAfterStyleChange):

• rendering/RenderBlock.h:

(RenderBlock):

• rendering/WrapShapeInfo.cpp:

(WebCore::WrapShapeInfo::isWrapShapeInfoEnabledForRenderBlock):
(WebCore::WrapShapeInfo::computeShapeSize):

• rendering/style/BasicShapes.cpp:

(WebCore::BasicShape::destroy):

• rendering/style/BasicShapes.h:

(WebCore::BasicShape::BasicShape):
(WebCore::BasicShapeRectangle::create):
(WebCore::BasicShapeRectangle::BasicShapeRectangle):
(WebCore::BasicShapeCircle::create):
(WebCore::BasicShapeCircle::BasicShapeCircle):
(WebCore::BasicShapeEllipse::create):
(WebCore::BasicShapeEllipse::BasicShapeEllipse):
(WebCore::BasicShapePolygon::create):
(WebCore::BasicShapePolygon::BasicShapePolygon):

• rendering/style/RenderStyle.h:
• rendering/style/StyleRareNonInheritedData.h:

(StyleRareNonInheritedData):

File:

• trunk/Source/WebCore/css/CSSPrimitiveValue.h (modified) (4 diffs)

trunk/Source/WebCore/css/CSSPrimitiveValue.h

@@ -39 +39 @@
 class Rect;
 class RenderStyle;
-class CSSWrapShape;
+class CSSBasicShape;
 
 struct Length;
@@ -285 +285 @@
     DashboardRegion* getDashboardRegionValue() const { return m_primitiveUnitType != CSS_DASHBOARD_REGION ? 0 : m_value.region; }
 
-    CSSWrapShape* getShapeValue() const { return m_primitiveUnitType != CSS_SHAPE ? 0 : m_value.shape; }
+    CSSBasicShape* getShapeValue() const { return m_primitiveUnitType != CSS_SHAPE ? 0 : m_value.shape; }
     
     CSSCalcValue* cssCalcValue() const { return m_primitiveUnitType != CSS_CALC ? 0 : m_value.calc; }
@@ -341 +341 @@
     void init(PassRefPtr<Quad>);
     void init(PassRefPtr<DashboardRegion>); // FIXME: Dashboard region should not be a primitive value.
-    void init(PassRefPtr<CSSWrapShape>);
+    void init(PassRefPtr<CSSBasicShape>);
     void init(PassRefPtr<CSSCalcValue>);
     bool getDoubleValueInternal(UnitTypes targetUnitType, double* result) const;
@@ -357 +357 @@
         Pair* pair;
         DashboardRegion* region;
-        CSSWrapShape* shape;
+        CSSBasicShape* shape;
         CSSCalcValue* calc;
     } m_value;