Changeset 148645 in webkit

Timestamp:

Apr 17, 2013 4:29:02 PM (11 years ago)

Author:

krit@webkit.org

Message:

BasicShapeFunctions should use RenderStyle instead of StyleResolver
​https://bugs.webkit.org/show_bug.cgi?id=114743

Reviewed by Antti Koivisto.

BasicShapeFunctions does include RenderStyle instead of StyleResolver now.
This is a simple refactoring patch, no new tests.

• css/BasicShapeFunctions.cpp:

(WebCore::convertToLength): Use style and rootElementStyle directly.
(WebCore::basicShapeForValue): Ditto.

• css/BasicShapeFunctions.h:

(WebCore):

• css/DeprecatedStyleBuilder.cpp:

(WebCore::ApplyPropertyClipPath::applyValue):
(WebCore::ApplyPropertyExclusionShape::applyValue):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/BasicShapeFunctions.cpp (modified) (6 diffs)
• css/BasicShapeFunctions.h (modified) (1 diff)
• css/DeprecatedStyleBuilder.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-17  Dirk Schulze  <krit@webkit.org>
+
+        BasicShapeFunctions should use RenderStyle instead of StyleResolver
+        https://bugs.webkit.org/show_bug.cgi?id=114743
+
+        Reviewed by Antti Koivisto.
+
+        BasicShapeFunctions does include RenderStyle instead of StyleResolver now.
+        This is a simple refactoring patch, no new tests.
+
+        * css/BasicShapeFunctions.cpp:
+        (WebCore::convertToLength): Use style and rootElementStyle directly.
+        (WebCore::basicShapeForValue): Ditto.
+        * css/BasicShapeFunctions.h:
+        (WebCore):
+        * css/DeprecatedStyleBuilder.cpp:
+        (WebCore::ApplyPropertyClipPath::applyValue):
+        (WebCore::ApplyPropertyExclusionShape::applyValue):
+
 2013-04-17  Beth Dakin  <bdakin@apple.com>
 

trunk/Source/WebCore/css/BasicShapeFunctions.cpp

@@ -35 +35 @@
 #include "CSSPrimitiveValueMappings.h"
 #include "CSSValuePool.h"
-#include "StyleResolver.h"
+#include "RenderStyle.h"
 
 namespace WebCore {
@@ -101 +101 @@
 }
 
-static Length convertToLength(const StyleResolver* styleResolver, CSSPrimitiveValue* value)
+static Length convertToLength(const RenderStyle* style, const RenderStyle* rootStyle, CSSPrimitiveValue* value)
 {
-    return value->convertToLength<FixedIntegerConversion | FixedFloatConversion | PercentConversion | ViewportPercentageConversion>(styleResolver->style(), styleResolver->rootElementStyle(), styleResolver->style()->effectiveZoom());
+    return value->convertToLength<FixedIntegerConversion | FixedFloatConversion | PercentConversion | ViewportPercentageConversion>(style, rootStyle, style->effectiveZoom());
 }
 
-PassRefPtr<BasicShape> basicShapeForValue(const StyleResolver* styleResolver, const CSSBasicShape* basicShapeValue)
+PassRefPtr<BasicShape> basicShapeForValue(const RenderStyle* style, const RenderStyle* rootStyle, const CSSBasicShape* basicShapeValue)
 {
     RefPtr<BasicShape> basicShape;
@@ -115 +115 @@
         RefPtr<BasicShapeRectangle> rect = BasicShapeRectangle::create();
 
-        rect->setX(convertToLength(styleResolver, rectValue->x()));
-        rect->setY(convertToLength(styleResolver, rectValue->y()));
-        rect->setWidth(convertToLength(styleResolver, rectValue->width()));
-        rect->setHeight(convertToLength(styleResolver, rectValue->height()));
+        rect->setX(convertToLength(style, rootStyle, rectValue->x()));
+        rect->setY(convertToLength(style, rootStyle, rectValue->y()));
+        rect->setWidth(convertToLength(style, rootStyle, rectValue->width()));
+        rect->setHeight(convertToLength(style, rootStyle, rectValue->height()));
         if (rectValue->radiusX()) {
-            rect->setCornerRadiusX(convertToLength(styleResolver, rectValue->radiusX()));
+            rect->setCornerRadiusX(convertToLength(style, rootStyle, rectValue->radiusX()));
             if (rectValue->radiusY())
-                rect->setCornerRadiusY(convertToLength(styleResolver, rectValue->radiusY()));
+                rect->setCornerRadiusY(convertToLength(style, rootStyle, rectValue->radiusY()));
         }
         basicShape = rect.release();
@@ -131 +131 @@
         RefPtr<BasicShapeCircle> circle = BasicShapeCircle::create();
 
-        circle->setCenterX(convertToLength(styleResolver, circleValue->centerX()));
-        circle->setCenterY(convertToLength(styleResolver, circleValue->centerY()));
-        circle->setRadius(convertToLength(styleResolver, circleValue->radius()));
+        circle->setCenterX(convertToLength(style, rootStyle, circleValue->centerX()));
+        circle->setCenterY(convertToLength(style, rootStyle, circleValue->centerY()));
+        circle->setRadius(convertToLength(style, rootStyle, circleValue->radius()));
 
         basicShape = circle.release();
@@ -142 +142 @@
         RefPtr<BasicShapeEllipse> ellipse = BasicShapeEllipse::create();
 
-        ellipse->setCenterX(convertToLength(styleResolver, ellipseValue->centerX()));
-        ellipse->setCenterY(convertToLength(styleResolver, ellipseValue->centerY()));
-        ellipse->setRadiusX(convertToLength(styleResolver, ellipseValue->radiusX()));
-        ellipse->setRadiusY(convertToLength(styleResolver, ellipseValue->radiusY()));
+        ellipse->setCenterX(convertToLength(style, rootStyle, ellipseValue->centerX()));
+        ellipse->setCenterY(convertToLength(style, rootStyle, ellipseValue->centerY()));
+        ellipse->setRadiusX(convertToLength(style, rootStyle, ellipseValue->radiusX()));
+        ellipse->setRadiusY(convertToLength(style, rootStyle, ellipseValue->radiusY()));
 
         basicShape = ellipse.release();
@@ -157 +157 @@
         const Vector<RefPtr<CSSPrimitiveValue> >& values = polygonValue->values();
         for (unsigned i = 0; i < values.size(); i += 2)
-            polygon->appendPoint(convertToLength(styleResolver, values.at(i).get()), convertToLength(styleResolver, values.at(i + 1).get()));
+            polygon->appendPoint(convertToLength(style, rootStyle, values.at(i).get()), convertToLength(style, rootStyle, values.at(i + 1).get()));
 
         basicShape = polygon.release();

trunk/Source/WebCore/css/BasicShapeFunctions.h

@@ -38 +38 @@
 class CSSBasicShape;
 class CSSValue;
-class StyleResolver;
+class RenderStyle;
 
 PassRefPtr<CSSValue> valueForBasicShape(const BasicShape*);
-PassRefPtr<BasicShape> basicShapeForValue(const StyleResolver*, const CSSBasicShape*);
+PassRefPtr<BasicShape> basicShapeForValue(const RenderStyle*, const RenderStyle* rootStyle, const CSSBasicShape*);
 
 }

trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp

@@ -1927 +1927 @@
                 setValue(styleResolver->style(), 0);
             else if (primitiveValue->isShape()) {
-                setValue(styleResolver->style(), ShapeClipPathOperation::create(basicShapeForValue(styleResolver, primitiveValue->getShapeValue())));
+                setValue(styleResolver->style(), ShapeClipPathOperation::create(basicShapeForValue(styleResolver->style(), styleResolver->rootElementStyle(), primitiveValue->getShapeValue())));
             }
 #if ENABLE(SVG)
@@ -1961 +1961 @@
                 setValue(styleResolver->style(), ExclusionShapeValue::createOutsideValue());
             else if (primitiveValue->isShape()) {
-                RefPtr<ExclusionShapeValue> shape = ExclusionShapeValue::createShapeValue(basicShapeForValue(styleResolver, primitiveValue->getShapeValue()));
+                RefPtr<ExclusionShapeValue> shape = ExclusionShapeValue::createShapeValue(basicShapeForValue(styleResolver->style(), styleResolver->rootElementStyle(), primitiveValue->getShapeValue()));
                 setValue(styleResolver->style(), shape.release());
             }