Changeset 87281 in webkit

Timestamp:

May 25, 2011 2:35:43 AM (13 years ago)

Author:

apavlov@chromium.org

Message:

2011-05-16 Alexander Pavlov <​apavlov@chromium.org>

Reviewed by David Levin.

CSSParser: m_implicitShorthand should probably be RAII
​https://bugs.webkit.org/show_bug.cgi?id=51586

It was impossible to entirely eliminate the m_implicitShorthand manual changes
due to the parseFill*() method stateful call chains.

No new tests, as this is a refactoring.

• css/CSSParser.cpp: (ImplicitScope::ImplicitScope): (ImplicitScope::~ImplicitScope): (WebCore::CSSParser::parseShorthand): (WebCore::CSSParser::parse4Values): (WebCore::CSSParser::parseBorderRadius):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSParser.cpp (modified) (6 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-16  Alexander Pavlov  <apavlov@chromium.org>
+
+        Reviewed by David Levin.
+
+        CSSParser: m_implicitShorthand should probably be RAII
+        https://bugs.webkit.org/show_bug.cgi?id=51586
+
+        It was impossible to entirely eliminate the m_implicitShorthand manual changes
+        due to the parseFill*() method stateful call chains.
+
+        No new tests, as this is a refactoring.
+
+        * css/CSSParser.cpp:
+        (ImplicitScope::ImplicitScope):
+        (ImplicitScope::~ImplicitScope):
+        (WebCore::CSSParser::parseShorthand):
+        (WebCore::CSSParser::parse4Values):
+        (WebCore::CSSParser::parseBorderRadius):
+
 2011-05-24  Pavel Podivilov  <podivilov@chromium.org>
 

trunk/Source/WebCore/css/CSSParser.cpp

@@ -93 +93 @@
 using namespace WTF;
 
+namespace {
+
+enum PropertyType {
+    PropertyExplicit,
+    PropertyImplicit
+};
+
+class ImplicitScope {
+    WTF_MAKE_NONCOPYABLE(ImplicitScope);
+public:
+    ImplicitScope(WebCore::CSSParser* parser, PropertyType propertyType)
+        : m_parser(parser)
+    {
+        m_parser->m_implicitShorthand = propertyType == PropertyImplicit;
+    }
+
+    ~ImplicitScope()
+    {
+        m_parser->m_implicitShorthand = false;
+    }
+
+private:
+    WebCore::CSSParser* m_parser;
+};
+
+} // namespace
+
 namespace WebCore {
 
@@ -2383 +2410 @@
 
     // Fill in any remaining properties with the initial value.
-    m_implicitShorthand = true;
+    ImplicitScope implicitScope(this, PropertyImplicit);
     for (int i = 0; i < numProperties; ++i) {
         if (!fnd[i])
             addProperty(properties[i], CSSInitialValue::createImplicit(), important);
     }
-    m_implicitShorthand = false;
 
     return true;
@@ -2413 +2439 @@
                 return false;
             CSSValue *value = m_parsedProperties[m_numParsedProperties-1]->value();
-            m_implicitShorthand = true;
+            ImplicitScope implicitScope(this, PropertyImplicit);
             addProperty(properties[1], value, important);
             addProperty(properties[2], value, important);
             addProperty(properties[3], value, important);
-            m_implicitShorthand = false;
             break;
         }
@@ -2424 +2449 @@
                 return false;
             CSSValue *value = m_parsedProperties[m_numParsedProperties-2]->value();
-            m_implicitShorthand = true;
+            ImplicitScope implicitScope(this, PropertyImplicit);
             addProperty(properties[2], value, important);
             value = m_parsedProperties[m_numParsedProperties-2]->value();
             addProperty(properties[3], value, important);
-            m_implicitShorthand = false;
             break;
         }
@@ -2435 +2459 @@
                 return false;
             CSSValue *value = m_parsedProperties[m_numParsedProperties-2]->value();
-            m_implicitShorthand = true;
+            ImplicitScope implicitScope(this, PropertyImplicit);
             addProperty(properties[3], value, important);
-            m_implicitShorthand = false;
             break;
         }
@@ -4996 +5019 @@
         completeBorderRadii(radii[1]);
 
-    m_implicitShorthand = true;
+    ImplicitScope implicitScope(this, PropertyImplicit);
     addProperty(CSSPropertyBorderTopLeftRadius, primitiveValueCache()->createValue(Pair::create(radii[0][0].release(), radii[1][0].release())), important);
     addProperty(CSSPropertyBorderTopRightRadius, primitiveValueCache()->createValue(Pair::create(radii[0][1].release(), radii[1][1].release())), important);
     addProperty(CSSPropertyBorderBottomRightRadius, primitiveValueCache()->createValue(Pair::create(radii[0][2].release(), radii[1][2].release())), important);
     addProperty(CSSPropertyBorderBottomLeftRadius, primitiveValueCache()->createValue(Pair::create(radii[0][3].release(), radii[1][3].release())), important);
-    m_implicitShorthand = false;
     return true;
 }