Changeset 122509 in webkit

Timestamp:

Jul 12, 2012 2:41:20 PM (12 years ago)

Author:

abarth@webkit.org

Message:

Regression (r122359) Layout Test html5lib/runner.html is failing
​https://bugs.webkit.org/show_bug.cgi?id=91047

Reviewed by Tony Chang.

Source/WebCore:

This ASSERT is bogus because doctypes can be removed from the DOM and
then re-added.

Test: fast/viewport/viewport-legacy-xhtmlmp-remove-and-add.html

• dom/Document.cpp:

(WebCore::Document::setDocType):

LayoutTests:

Add a test that shows what happens when a doctype gets added and
removed.

• fast/viewport/viewport-legacy-xhtmlmp-remove-and-add-expected.txt: Added.
• fast/viewport/viewport-legacy-xhtmlmp-remove-and-add.html: Added.
• platform/chromium/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/viewport/viewport-legacy-xhtmlmp-remove-and-add-expected.txt (added)
• LayoutTests/fast/viewport/viewport-legacy-xhtmlmp-remove-and-add.html (added)
• LayoutTests/platform/chromium/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Document.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-07-12  Adam Barth  <abarth@webkit.org>
+
+        Regression (r122359) Layout Test html5lib/runner.html is failing
+        https://bugs.webkit.org/show_bug.cgi?id=91047
+
+        Reviewed by Tony Chang.
+
+        Add a test that shows what happens when a doctype gets added and
+        removed.
+
+        * fast/viewport/viewport-legacy-xhtmlmp-remove-and-add-expected.txt: Added.
+        * fast/viewport/viewport-legacy-xhtmlmp-remove-and-add.html: Added.
+        * platform/chromium/TestExpectations:
+
 2012-07-12  Ojan Vafai  <ojan@chromium.org>
 

trunk/LayoutTests/platform/chromium/TestExpectations

@@ -3745 +3745 @@
 BUGWK90980 WIN : fast/forms/textarea/textarea-state-restore.html = PASS TIMEOUT
 
-// Started crashing after r122359
-BUGWK91047 DEBUG : html5lib/runner.html = CRASH
-
 // Started crashing after 122286
 BUGWK91133 WIN : storage/indexeddb/constants.html = PASS CRASH

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-12  Adam Barth  <abarth@webkit.org>
+
+        Regression (r122359) Layout Test html5lib/runner.html is failing
+        https://bugs.webkit.org/show_bug.cgi?id=91047
+
+        Reviewed by Tony Chang.
+
+        This ASSERT is bogus because doctypes can be removed from the DOM and
+        then re-added.
+
+        Test: fast/viewport/viewport-legacy-xhtmlmp-remove-and-add.html
+
+        * dom/Document.cpp:
+        (WebCore::Document::setDocType):
+
 2012-07-12  Ojan Vafai  <ojan@chromium.org>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -816 +816 @@
         this->adoptIfNeeded(m_docType.get());
 #if ENABLE(LEGACY_VIEWPORT_ADAPTION)
-        ASSERT(m_viewportArguments.type == ViewportArguments::Implicit);
         if (m_docType->publicId().startsWith("-//wapforum//dtd xhtml mobile 1.", /* caseSensitive */ false))
             processViewport("width=device-width, height=device-height", ViewportArguments::XHTMLMobileProfile);