Changeset 85834 in webkit

Timestamp:

May 4, 2011 10:57:51 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-05-04 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r85788.
​http://trac.webkit.org/changeset/85788
​https://bugs.webkit.org/show_bug.cgi?id=60250

svg/text/text-block-child-crash.xhtml asserts (Requested by
Ossy on #webkit).

• svg/custom/display-table-caption-foreignObject-expected.txt: Removed.
• svg/custom/display-table-caption-foreignObject.svg: Removed.
• svg/custom/display-table-caption-inherit-foreignObject-expected.txt: Removed.
• svg/custom/display-table-caption-inherit-foreignObject.xhtml: Removed.
• svg/custom/display-table-caption-inherit-text-expected.txt: Removed.
• svg/custom/display-table-caption-inherit-text.xhtml: Removed.
• svg/custom/display-table-caption-text-expected.txt: Removed.
• svg/custom/display-table-caption-text.svg: Removed.

2011-05-04 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r85788.
​http://trac.webkit.org/changeset/85788
​https://bugs.webkit.org/show_bug.cgi?id=60250

svg/text/text-block-child-crash.xhtml asserts (Requested by
Ossy on #webkit).

• css/CSSStyleSelector.cpp: (WebCore::CSSStyleSelector::applyProperty):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/svg/custom/display-table-caption-foreignObject-expected.txt (deleted)
• LayoutTests/svg/custom/display-table-caption-foreignObject.svg (deleted)
• LayoutTests/svg/custom/display-table-caption-inherit-foreignObject-expected.txt (deleted)
• LayoutTests/svg/custom/display-table-caption-inherit-foreignObject.xhtml (deleted)
• LayoutTests/svg/custom/display-table-caption-inherit-text-expected.txt (deleted)
• LayoutTests/svg/custom/display-table-caption-inherit-text.xhtml (deleted)
• LayoutTests/svg/custom/display-table-caption-text-expected.txt (deleted)
• LayoutTests/svg/custom/display-table-caption-text.svg (deleted)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSStyleSelector.cpp (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-05-04  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r85788.
+        http://trac.webkit.org/changeset/85788
+        https://bugs.webkit.org/show_bug.cgi?id=60250
+
+        svg/text/text-block-child-crash.xhtml asserts (Requested by
+        Ossy on #webkit).
+
+        * svg/custom/display-table-caption-foreignObject-expected.txt: Removed.
+        * svg/custom/display-table-caption-foreignObject.svg: Removed.
+        * svg/custom/display-table-caption-inherit-foreignObject-expected.txt: Removed.
+        * svg/custom/display-table-caption-inherit-foreignObject.xhtml: Removed.
+        * svg/custom/display-table-caption-inherit-text-expected.txt: Removed.
+        * svg/custom/display-table-caption-inherit-text.xhtml: Removed.
+        * svg/custom/display-table-caption-text-expected.txt: Removed.
+        * svg/custom/display-table-caption-text.svg: Removed.
+
 2011-05-04  MORITA Hajime <morrita@google.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-04  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r85788.
+        http://trac.webkit.org/changeset/85788
+        https://bugs.webkit.org/show_bug.cgi?id=60250
+
+        svg/text/text-block-child-crash.xhtml asserts (Requested by
+        Ossy on #webkit).
+
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::applyProperty):
+
 2011-05-04  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/css/CSSStyleSelector.cpp

@@ -8 +8 @@
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
- * Copyright (C) 2011 Research In Motion Limited. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -3539 +3538 @@
 }
 
-class SVGDisplayPropertyGuard {
-    WTF_MAKE_NONCOPYABLE(SVGDisplayPropertyGuard);
-public:
-    SVGDisplayPropertyGuard(Element*, RenderStyle*);
-    ~SVGDisplayPropertyGuard();
-private:
-#if ENABLE(SVG)
-    RenderStyle* m_style;
-    EDisplay m_originalDisplayPropertyValue;
-#endif
-};
-
-#if !ENABLE(SVG)
-inline SVGDisplayPropertyGuard::SVGDisplayPropertyGuard(Element*, RenderStyle*)
-{
-}
-
-inline SVGDisplayPropertyGuard::~SVGDisplayPropertyGuard()
-{
-}
-#else
-static inline bool isAcceptableForSVGElement(EDisplay displayPropertyValue)
-{
-    return displayPropertyValue == INLINE || displayPropertyValue == BLOCK || displayPropertyValue == NONE;
-}
-
-inline SVGDisplayPropertyGuard::SVGDisplayPropertyGuard(Element* element, RenderStyle* style)
-{
-    if (!(element && element->isSVGElement())) {
-        m_originalDisplayPropertyValue = NONE;
-        m_style = 0;
-        return;
-    }
-    m_style = style;
-    m_originalDisplayPropertyValue = style->display();
-    ASSERT(isAcceptableForSVGElement(m_originalDisplayPropertyValue));
-}
-
-inline SVGDisplayPropertyGuard::~SVGDisplayPropertyGuard()
-{
-    if (!m_style)
-        return;
-    if (isAcceptableForSVGElement(m_style->display()))
-        return;
-    m_style->setDisplay(m_originalDisplayPropertyValue);
-}
-#endif
-
-
 // SVG handles zooming in a different way compared to CSS. The whole document is scaled instead
 // of each individual length value in the render style / tree. CSSPrimitiveValue::computeLength*()
@@ -3659 +3609 @@
         HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(clear, Clear)
         return;
-    case CSSPropertyDisplay: {
-        SVGDisplayPropertyGuard guard(m_element, m_style.get());
+    case CSSPropertyDisplay:
         HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(display, Display)
 #if ENABLE(WCSS)
@@ -3678 +3627 @@
 #endif
         return;
-    }
     case CSSPropertyEmptyCells:
         HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(emptyCells, EmptyCells)