Changeset 154613 in webkit

Timestamp:

Aug 26, 2013 10:45:59 AM (11 years ago)

Author:

Antti Koivisto

Message:

REGRESSION (r154581): Some plugin tests failing in debug bots
​https://bugs.webkit.org/show_bug.cgi?id=120315

Reviewed by Darin Adler.

We are hitting the new no-event-dispatch-while-iterating assertion.

Detaching deletes a plugin which modifies DOM while it dies.

• dom/Document.cpp:

(WebCore::Document::createRenderTree):
(WebCore::Document::detach):

Don't iterate at all. Document never has more than one Element child anyway.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-08-26  Antti Koivisto  <antti@apple.com>
+
+        REGRESSION (r154581): Some plugin tests failing in debug bots
+        https://bugs.webkit.org/show_bug.cgi?id=120315
+
+        Reviewed by Darin Adler.
+        
+        We are hitting the new no-event-dispatch-while-iterating assertion.
+
+        Detaching deletes a plugin which modifies DOM while it dies.
+
+        * dom/Document.cpp:
+        (WebCore::Document::createRenderTree):
+        (WebCore::Document::detach):
+        
+            Don't iterate at all. Document never has more than one Element child anyway.
+
 2013-08-26  David Kilzer  <ddkilzer@apple.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -1980 +1980 @@
     recalcStyle(Style::Force);
 
-    for (auto child = elementDescendants(this).begin(), end = elementDescendants(this).end(); child != end; ++child)
-        Style::attachRenderTree(&*child);
+    if (m_documentElement)
+        Style::attachRenderTree(m_documentElement.get());
 
     setAttached(true);
@@ -2080 +2080 @@
     TemporaryChange<bool> change(m_renderTreeBeingDestroyed, true);
 
-    for (auto child = elementDescendants(this).begin(), end = elementDescendants(this).end(); child != end; ++child)
-        Style::detachRenderTree(&*child);
+    if (m_documentElement)
+        Style::detachRenderTree(m_documentElement.get());
 
     clearChildNeedsStyleRecalc();