Changeset 110452 in webkit

Timestamp:

Mar 12, 2012 12:00:41 PM (12 years ago)

Author:

cevans@google.com

Message:

Merge 108084
BUG=112411
Review URL: ​https://chromiumcodereview.appspot.com/9694004

Location:

branches/chromium/1025

Files:

• LayoutTests/platform/chromium/test_expectations.txt (modified) (1 diff)
• LayoutTests/svg/custom/use-referencing-style-crash-expected.txt (copied) (copied from trunk/LayoutTests/svg/custom/use-referencing-style-crash-expected.txt)
• LayoutTests/svg/custom/use-referencing-style-crash.svg (copied) (copied from trunk/LayoutTests/svg/custom/use-referencing-style-crash.svg)
• Source/WebCore/svg/SVGUseElement.cpp (modified) (2 diffs)

branches/chromium/1025/LayoutTests/platform/chromium/test_expectations.txt

@@ -903 +903 @@
 BUGCR23463 LINUX WIN : svg/W3C-SVG-1.1/struct-symbol-01-b.svg = IMAGE+TEXT
 BUGCR23463 LINUX WIN : svg/W3C-SVG-1.1/struct-use-01-t.svg = PASS IMAGE+TEXT IMAGE
+
+// Crashes due to debug assert until we fix issues with style elements in SVG
+BUGWK77764 DEBUG : svg/custom/use-referencing-style-crash.svg = CRASH
 
 // Merge 39744:39829 - regression

branches/chromium/1025/Source/WebCore/svg/SVGUseElement.cpp

@@ -346 +346 @@
             shadowRoot->setNeedsStyleRecalc();
     }
+    // Do not do style calculation during shadow tree construction because it may cause nodes to
+    // be attached before they should be. Style recalc will happen when the tree is constructed
+    // and explicitly attached.
+    if (m_updatesBlocked)
+        return false;
     return true;
 }
@@ -352 +357 @@
 {
     // Assure that the shadow tree has not been marked for recreation, while we're building it.
-    if (m_updatesBlocked)
-        ASSERT(!m_needsShadowTreeRecreation);
+    if (m_updatesBlocked && m_needsShadowTreeRecreation) {
+        // We are about to recreate the tree while in the middle of recreating the tree.
+        return;
+    }
 
     RenderSVGShadowTreeRootContainer* shadowRoot = static_cast<RenderSVGShadowTreeRootContainer*>(renderer());