Changeset 105031 in webkit

Timestamp:

Jan 15, 2012 11:42:47 AM (12 years ago)

Author:

kling@webkit.org

Message:

CSSParser: Fix failing assertion below BorderImageQuadParseContext.
<​http://webkit.org/b/76343> and <rdar://problem/10584969>

Reviewed by Antti Koivisto.

No longer asserts: fast/borders/inline-mask-overlay-image-outset-vertical-rl.html

• css/CSSParser.cpp:

(WebCore::BorderImageSliceParseContext::commitBorderImageSlice):
(WebCore::BorderImageQuadParseContext::commitBorderImageQuad):

Clone CSSValues by copying the RefPtrs instead of going through
the CSSValuePool's create-from-double factory. This prevents an
assertion when the incoming value is CSSValueAuto.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-01-15  Andreas Kling  <awesomekling@apple.com>
+
+        CSSParser: Fix failing assertion below BorderImageQuadParseContext.
+        <http://webkit.org/b/76343> and <rdar://problem/10584969>
+
+        Reviewed by Antti Koivisto.
+
+        No longer asserts: fast/borders/inline-mask-overlay-image-outset-vertical-rl.html
+
+        * css/CSSParser.cpp:
+        (WebCore::BorderImageSliceParseContext::commitBorderImageSlice):
+        (WebCore::BorderImageQuadParseContext::commitBorderImageQuad):
+
+            Clone CSSValues by copying the RefPtrs instead of going through
+            the CSSValuePool's create-from-double factory. This prevents an
+            assertion when the incoming value is CSSValueAuto.
+
 2011-08-30  Robert Hogan  <robert@webkit.org>
 

trunk/Source/WebCore/css/CSSParser.cpp

@@ -5550 +5550 @@
         ASSERT(m_top);
         if (!m_right) {
-            m_right = m_cssValuePool->createValue(m_top->getDoubleValue(), static_cast<CSSPrimitiveValue::UnitTypes>(m_top->primitiveType()));
-            m_bottom = m_cssValuePool->createValue(m_top->getDoubleValue(), static_cast<CSSPrimitiveValue::UnitTypes>(m_top->primitiveType()));
-            m_left = m_cssValuePool->createValue(m_top->getDoubleValue(), static_cast<CSSPrimitiveValue::UnitTypes>(m_top->primitiveType()));
+            m_right = m_top;
+            m_bottom = m_top;
+            m_left = m_top;
         }
         if (!m_bottom) {
-            m_bottom = m_cssValuePool->createValue(m_top->getDoubleValue(), static_cast<CSSPrimitiveValue::UnitTypes>(m_top->primitiveType()));
-            m_left = m_cssValuePool->createValue(m_right->getDoubleValue(), static_cast<CSSPrimitiveValue::UnitTypes>(m_right->primitiveType()));
+            m_bottom = m_top;
+            m_left = m_right;
         }
         if (!m_left)
-            m_left = m_cssValuePool->createValue(m_right->getDoubleValue(), static_cast<CSSPrimitiveValue::UnitTypes>(m_right->primitiveType()));
+            m_left = m_right;
 
         // Now build a rect value to hold all four of our primitive values.
@@ -5666 +5666 @@
         ASSERT(m_top);
         if (!m_right) {
-            m_right = m_cssValuePool->createValue(m_top->getDoubleValue(), static_cast<CSSPrimitiveValue::UnitTypes>(m_top->primitiveType()));
-            m_bottom = m_cssValuePool->createValue(m_top->getDoubleValue(), static_cast<CSSPrimitiveValue::UnitTypes>(m_top->primitiveType()));
-            m_left = m_cssValuePool->createValue(m_top->getDoubleValue(), static_cast<CSSPrimitiveValue::UnitTypes>(m_top->primitiveType()));
+            m_right = m_top;
+            m_bottom = m_top;
+            m_left = m_top;
         }
         if (!m_bottom) {
-            m_bottom = m_cssValuePool->createValue(m_top->getDoubleValue(), static_cast<CSSPrimitiveValue::UnitTypes>(m_top->primitiveType()));
-            m_left = m_cssValuePool->createValue(m_right->getDoubleValue(), static_cast<CSSPrimitiveValue::UnitTypes>(m_right->primitiveType()));
+            m_bottom = m_top;
+            m_left = m_right;
         }
         if (!m_left)
-            m_left = m_cssValuePool->createValue(m_right->getDoubleValue(), static_cast<CSSPrimitiveValue::UnitTypes>(m_right->primitiveType()));
+            m_left = m_right;
 
         // Now build a quad value to hold all four of our primitive values.