[webkit-changes] [134937] trunk/Source/WebCore

Fri, 16 Nov 2012 05:35:42 -0800

Title: [134937] trunk/Source/WebCore
Revision
134937
Author
ale...@webkit.org
Date
2012-11-16 05:37:16 -0800 (Fri, 16 Nov 2012)

Log Message

Factorize the creation of primitive values with a pair into a function.
https://bugs.webkit.org/show_bug.cgi?id=102485

Reviewed by Antti Koivisto.

The pattern is already existing in various call sites inside CSSParser
and more will be added in the future (see bug 102104).

No new tests : It's a refactoring only, the tests should cover it.

* css/CSSParser.cpp:
(WebCore):
(WebCore::createPrimitiveValuePair):
(WebCore::CSSParser::parseValue):
(WebCore::CSSParser::parseFillSize):
(WebCore::CSSParser::parseBorderImageRepeat):
(WebCore::CSSParser::parseBorderRadius):
(WebCore::CSSParser::parseCounter):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (134936 => 134937)


--- trunk/Source/WebCore/ChangeLog	2012-11-16 13:35:47 UTC (rev 134936)
+++ trunk/Source/WebCore/ChangeLog	2012-11-16 13:37:16 UTC (rev 134937)
@@ -1,3 +1,24 @@
+2012-11-16  Alexis Menard  <ale...@webkit.org>
+
+        Factorize the creation of primitive values with a pair into a function.
+        https://bugs.webkit.org/show_bug.cgi?id=102485
+
+        Reviewed by Antti Koivisto.
+
+        The pattern is already existing in various call sites inside CSSParser
+        and more will be added in the future (see bug 102104).
+
+        No new tests : It's a refactoring only, the tests should cover it.
+
+        * css/CSSParser.cpp:
+        (WebCore):
+        (WebCore::createPrimitiveValuePair):
+        (WebCore::CSSParser::parseValue):
+        (WebCore::CSSParser::parseFillSize):
+        (WebCore::CSSParser::parseBorderImageRepeat):
+        (WebCore::CSSParser::parseBorderRadius):
+        (WebCore::CSSParser::parseCounter):
+
 2012-11-16  Mark Pilgrim  <pilg...@chromium.org>
 
         Expand PlatformCookieJar interface to allow for other ports

Modified: trunk/Source/WebCore/css/CSSParser.cpp (134936 => 134937)


--- trunk/Source/WebCore/css/CSSParser.cpp	2012-11-16 13:35:47 UTC (rev 134936)
+++ trunk/Source/WebCore/css/CSSParser.cpp	2012-11-16 13:37:16 UTC (rev 134937)
@@ -186,7 +186,12 @@
     }
     return false;
 }
-    
+
+static PassRefPtr<CSSPrimitiveValue> createPrimitiveValuePair(PassRefPtr<CSSPrimitiveValue> first, PassRefPtr<CSSPrimitiveValue> second)
+{
+    return cssValuePool().createValue(Pair::create(first, second));
+}
+
 const CSSParserContext& strictCSSParserContext()
 {
     DEFINE_STATIC_LOCAL(CSSParserContext, strictContext, (CSSStrictMode));
@@ -2227,9 +2232,7 @@
         } else
             parsedValue2 = parsedValue1;
 
-        RefPtr<Pair> pair = Pair::create(parsedValue1.release(), parsedValue2.release());
-        RefPtr<CSSPrimitiveValue> val = cssValuePool().createValue(pair.release());
-        addProperty(propId, val.release(), important);
+        addProperty(propId, createPrimitiveValuePair(parsedValue1.release(), parsedValue2.release()), important);
         return true;
     }
     case CSSPropertyTabSize:
@@ -3784,7 +3787,7 @@
 
     if (!parsedValue2)
         return parsedValue1;
-    return cssValuePool().createValue(Pair::create(parsedValue1.release(), parsedValue2.release()));
+    return createPrimitiveValuePair(parsedValue1.release(), parsedValue2.release());
 }
 
 bool CSSParser::parseFillProperty(CSSPropertyID propId, CSSPropertyID& propId1, CSSPropertyID& propId2,
@@ -6181,7 +6184,7 @@
     } else
         secondValue = firstValue;
 
-    result = cssValuePool().createValue(Pair::create(firstValue, secondValue));
+    result = createPrimitiveValuePair(firstValue, secondValue);
     return true;
 }
 
@@ -6476,10 +6479,10 @@
         completeBorderRadii(radii[1]);
 
     ImplicitScope implicitScope(this, PropertyImplicit);
-    addProperty(CSSPropertyBorderTopLeftRadius, cssValuePool().createValue(Pair::create(radii[0][0].release(), radii[1][0].release())), important);
-    addProperty(CSSPropertyBorderTopRightRadius, cssValuePool().createValue(Pair::create(radii[0][1].release(), radii[1][1].release())), important);
-    addProperty(CSSPropertyBorderBottomRightRadius, cssValuePool().createValue(Pair::create(radii[0][2].release(), radii[1][2].release())), important);
-    addProperty(CSSPropertyBorderBottomLeftRadius, cssValuePool().createValue(Pair::create(radii[0][3].release(), radii[1][3].release())), important);
+    addProperty(CSSPropertyBorderTopLeftRadius, createPrimitiveValuePair(radii[0][0].release(), radii[1][0].release()), important);
+    addProperty(CSSPropertyBorderTopRightRadius, createPrimitiveValuePair(radii[0][1].release(), radii[1][1].release()), important);
+    addProperty(CSSPropertyBorderBottomRightRadius, createPrimitiveValuePair(radii[0][2].release(), radii[1][2].release()), important);
+    addProperty(CSSPropertyBorderBottomLeftRadius, createPrimitiveValuePair(radii[0][3].release(), radii[1][3].release()), important);
     return true;
 }
 
@@ -6537,8 +6540,8 @@
                     m_valueList->next();
                 }
 
-                list->append(cssValuePool().createValue(Pair::create(counterName.release(),
-                    cssValuePool().createValue(i, CSSPrimitiveValue::CSS_NUMBER))));
+                list->append(createPrimitiveValuePair(counterName.release(),
+                    cssValuePool().createValue(i, CSSPrimitiveValue::CSS_NUMBER)));
                 state = ID;
                 continue;
             }

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to