Changeset 204936 in webkit

Timestamp:

Aug 24, 2016 2:58:33 PM (8 years ago)

Author:

Chris Dumez

Message:

Assertion hit: ASSERT(!m_parserScheduler) in ~HTMLDocumentParser()
​https://bugs.webkit.org/show_bug.cgi?id=161083
<rdar://problem/27986937>

Reviewed by Darin Adler.

Source/WebCore:

Call cancelParsing() right before re-creating the new parser in
Document::implicitOpen(). We would previously call removeChildren()
in between which is was an issue because it can cause JS to be
executed and therefore the parser to be re-created after we have
cancelled parsing.

No new tests, unskipped html/browsers/browsing-the-web/unloading-documents/004.html
which was consistently crashing.

• dom/Document.cpp:

(WebCore::Document::implicitOpen):

LayoutTests:

Unskip html/browsers/browsing-the-web/unloading-documents/004.html as
it is no longer crashing.

• TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Document.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-08-24  Chris Dumez  <cdumez@apple.com>
+
+        Assertion hit: ASSERT(!m_parserScheduler) in ~HTMLDocumentParser()
+        https://bugs.webkit.org/show_bug.cgi?id=161083
+        <rdar://problem/27986937>
+
+        Reviewed by Darin Adler.
+
+        Unskip html/browsers/browsing-the-web/unloading-documents/004.html as
+        it is no longer crashing.
+
+        * TestExpectations:
+
 2016-08-24  Eric Carlson  <eric.carlson@apple.com>
 

trunk/LayoutTests/TestExpectations

@@ -237 +237 @@
 # Promises/A+ 2.3.3 has many tests and it sometimes exceeds the time limit. 
 webkit.org/b/136878 js/promises-tests/promises-tests-2-3-3.html [ Slow ]
-
-webkit.org/b/161083 [ Debug ] imported/w3c/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/004.html [ Crash ]
 
 # Resource files not in resources folder

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-08-24  Chris Dumez  <cdumez@apple.com>
+
+        Assertion hit: ASSERT(!m_parserScheduler) in ~HTMLDocumentParser()
+        https://bugs.webkit.org/show_bug.cgi?id=161083
+        <rdar://problem/27986937>
+
+        Reviewed by Darin Adler.
+
+        Call cancelParsing() right before re-creating the new parser in
+        Document::implicitOpen(). We would previously call removeChildren()
+        in between which is was an issue because it can cause JS to be
+        executed and therefore the parser to be re-created after we have
+        cancelled parsing.
+
+        No new tests, unskipped html/browsers/browsing-the-web/unloading-documents/004.html
+        which was consistently crashing.
+
+        * dom/Document.cpp:
+        (WebCore::Document::implicitOpen):
+
 2016-08-24  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -2614 +2614 @@
 void Document::implicitOpen()
 {
+    removeChildren();
+
+    setCompatibilityMode(DocumentCompatibilityMode::NoQuirksMode);
+
     cancelParsing();
-
-    removeChildren();
-
-    setCompatibilityMode(DocumentCompatibilityMode::NoQuirksMode);
-
     m_parser = createParser();
     setParsing(true);