Diff
Modified: trunk/LayoutTests/ChangeLog (122508 => 122509)
--- trunk/LayoutTests/ChangeLog 2012-07-12 21:38:33 UTC (rev 122508)
+++ trunk/LayoutTests/ChangeLog 2012-07-12 21:41:20 UTC (rev 122509)
@@ -1,3 +1,17 @@
+2012-07-12 Adam Barth <[email protected]>
+
+ 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 <[email protected]>
Implied minimum size of flex items is min-content
Added: trunk/LayoutTests/fast/viewport/viewport-legacy-xhtmlmp-remove-and-add-expected.txt (0 => 122509)
--- trunk/LayoutTests/fast/viewport/viewport-legacy-xhtmlmp-remove-and-add-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/viewport/viewport-legacy-xhtmlmp-remove-and-add-expected.txt 2012-07-12 21:41:20 UTC (rev 122509)
@@ -0,0 +1,4 @@
+ALERT: viewport size 320x480 scale 1 with limits [1, 5] and userScalable true
+ALERT: viewport size 320x480 scale 1 with limits [1, 5] and userScalable true
+ALERT: viewport size 320x480 scale 1 with limits [1, 5] and userScalable true
+
Added: trunk/LayoutTests/fast/viewport/viewport-legacy-xhtmlmp-remove-and-add.html (0 => 122509)
--- trunk/LayoutTests/fast/viewport/viewport-legacy-xhtmlmp-remove-and-add.html (rev 0)
+++ trunk/LayoutTests/fast/viewport/viewport-legacy-xhtmlmp-remove-and-add.html 2012-07-12 21:41:20 UTC (rev 122509)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//WAPFORUM//DTD XHTML Mobile 1.0//EN" "http://www.wapforum.org/DTD/xhtml-mobile10.dtd">
+<head>
+ <!--
+ Related spec: http://www.w3.org/TR/css-device-adapt/
+
+ XHTML-MP is used for mobile documents which are assumed to be designed for
+ handheld devices, hence using the viewport size as the initial containing
+ block size, so using XHTML-MP will give the same result as a viewport
+ meta tag with the following parameters:
+
+ width=device-width, height=device-height, initial-scale=1
+
+ -->
+ <title>Default viewport value changed by XHTML-MP</title>
+ <script>
+ function test() {
+ if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+
+ if (window.internals)
+ alert(internals.configurationForViewport(document, 1, 320, 480, 320, 352));
+
+ var originalDoctype = document.doctype;
+ document.removeChild(originalDoctype);
+
+ if (window.internals)
+ alert(internals.configurationForViewport(document, 1, 320, 480, 320, 352));
+
+ document.insertBefore(originalDoctype, document.firstChild);
+
+ if (window.internals)
+ alert(internals.configurationForViewport(document, 1, 320, 480, 320, 352));
+ }
+ </script>
+</head>
+<body _onload_="test();" />
Modified: trunk/LayoutTests/platform/chromium/TestExpectations (122508 => 122509)
--- trunk/LayoutTests/platform/chromium/TestExpectations 2012-07-12 21:38:33 UTC (rev 122508)
+++ trunk/LayoutTests/platform/chromium/TestExpectations 2012-07-12 21:41:20 UTC (rev 122509)
@@ -3744,8 +3744,5 @@
BUGWK90980 LINUX MAC DEBUG : fast/forms/textarea/textarea-state-restore.html = PASS TIMEOUT
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
Modified: trunk/Source/WebCore/ChangeLog (122508 => 122509)
--- trunk/Source/WebCore/ChangeLog 2012-07-12 21:38:33 UTC (rev 122508)
+++ trunk/Source/WebCore/ChangeLog 2012-07-12 21:41:20 UTC (rev 122509)
@@ -1,3 +1,18 @@
+2012-07-12 Adam Barth <[email protected]>
+
+ 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 <[email protected]>
Implied minimum size of flex items is min-content
Modified: trunk/Source/WebCore/dom/Document.cpp (122508 => 122509)
--- trunk/Source/WebCore/dom/Document.cpp 2012-07-12 21:38:33 UTC (rev 122508)
+++ trunk/Source/WebCore/dom/Document.cpp 2012-07-12 21:41:20 UTC (rev 122509)
@@ -815,7 +815,6 @@
if (m_docType) {
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);
#endif
