Changeset 166909 in webkit

Timestamp:

Apr 7, 2014 9:47:05 PM (10 years ago)

Author:

zoltan@webkit.org

Message:

[CSS Shapes] Simplify the parsing of width arguments for Inset shapes
​https://bugs.webkit.org/show_bug.cgi?id=131305

Reviewed by Andreas Kling.

This code introduces some helper functions for setting the size arguments of inset shapes. This change
also modifies the code to be the same as in Blink, so it helps us to keep the shapes code similar.

No new tests, no behavior change.

• css/CSSBasicShapes.h:

(WebCore::CSSBasicShapeInset::updateShapeSize4Values):
(WebCore::CSSBasicShapeInset::updateShapeSize1Value):
(WebCore::CSSBasicShapeInset::updateShapeSize2Values):
(WebCore::CSSBasicShapeInset::updateShapeSize3Values):

• css/CSSParser.cpp:

(WebCore::CSSParser::parseBasicShapeInset):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSBasicShapes.h (modified) (1 diff)
• css/CSSParser.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-07  Zoltan Horvath  <zoltan@webkit.org>
+
+        [CSS Shapes] Simplify the parsing of width arguments for Inset shapes
+        https://bugs.webkit.org/show_bug.cgi?id=131305
+
+        Reviewed by Andreas Kling.
+
+        This code introduces some helper functions for setting the size arguments of inset shapes. This change
+        also modifies the code to be the same as in Blink, so it helps us to keep the shapes code similar.
+
+        No new tests, no behavior change.
+
+        * css/CSSBasicShapes.h:
+        (WebCore::CSSBasicShapeInset::updateShapeSize4Values):
+        (WebCore::CSSBasicShapeInset::updateShapeSize1Value):
+        (WebCore::CSSBasicShapeInset::updateShapeSize2Values):
+        (WebCore::CSSBasicShapeInset::updateShapeSize3Values):
+        * css/CSSParser.cpp:
+        (WebCore::CSSParser::parseBasicShapeInset):
+
 2014-04-07  Martin Robinson  <mrobinson@igalia.com>
 

trunk/Source/WebCore/css/CSSBasicShapes.h

@@ -82 +82 @@
     void setLeft(PassRefPtr<CSSPrimitiveValue> left) { m_left = left; }
 
+    void updateShapeSize4Values(CSSPrimitiveValue* top, CSSPrimitiveValue* right, CSSPrimitiveValue* bottom, CSSPrimitiveValue* left)
+    {
+        setTop(top);
+        setRight(right);
+        setBottom(bottom);
+        setLeft(left);
+    }
+
+    void updateShapeSize1Value(CSSPrimitiveValue* value1)
+    {
+        updateShapeSize4Values(value1, value1, value1, value1);
+    }
+
+    void updateShapeSize2Values(CSSPrimitiveValue* value1,  CSSPrimitiveValue* value2)
+    {
+        updateShapeSize4Values(value1, value2, value1, value2);
+    }
+
+    void updateShapeSize3Values(CSSPrimitiveValue* value1, CSSPrimitiveValue* value2,  CSSPrimitiveValue* value3)
+    {
+        updateShapeSize4Values(value1, value2, value3, value2);
+    }
+
     void setTopLeftRadius(PassRefPtr<CSSPrimitiveValue> radius) { m_topLeftRadius = radius; }
     void setTopRightRadius(PassRefPtr<CSSPrimitiveValue> radius) { m_topRightRadius = radius; }

trunk/Source/WebCore/css/CSSParser.cpp

@@ -5429 +5429 @@
     switch (widthArguments.size()) {
     case 1: {
-        shape->setTop(widthArguments[0]);
-        shape->setRight(widthArguments[0]);
-        shape->setBottom(widthArguments[0]);
-        shape->setLeft(widthArguments[0]);
+        shape->updateShapeSize1Value(widthArguments[0].get());
         break;
     }
     case 2: {
-        shape->setTop(widthArguments[0]);
-        shape->setRight(widthArguments[1]);
-        shape->setBottom(widthArguments[0]);
-        shape->setLeft(widthArguments[1]);
+        shape->updateShapeSize2Values(widthArguments[0].get(), widthArguments[1].get());
         break;
         }
     case 3: {
-        shape->setTop(widthArguments[0]);
-        shape->setRight(widthArguments[1]);
-        shape->setBottom(widthArguments[2]);
-        shape->setLeft(widthArguments[1]);
+        shape->updateShapeSize3Values(widthArguments[0].get(), widthArguments[1].get(), widthArguments[2].get());
         break;
     }
     case 4: {
-        shape->setTop(widthArguments[0]);
-        shape->setRight(widthArguments[1]);
-        shape->setBottom(widthArguments[2]);
-        shape->setLeft(widthArguments[3]);
+        shape->updateShapeSize4Values(widthArguments[0].get(), widthArguments[1].get(), widthArguments[2].get(), widthArguments[3].get());
         break;
     }