[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
eric at webkit.org
eric at webkit.org
Thu Apr 8 00:51:21 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit c225c7f2c3514987149d0538679a580a141e4292
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Dec 29 06:41:26 2009 +0000
2009-12-28 Charles Wei <charles.wei at torchmobile.com.cn>
Reviewed by Maciej Stachowiak.
Remove the macro ENABLE(XHTMLMP) for noscriptAreateErrorCheck in HTMLParser,
since with XHTMLMP enabled, it's not checking create Errors, and then contents inside
<noscript> are always parsed and rendered.
https://bugs.webkit.org/show_bug.cgi?id=32706
Tests: fast/parser/noscript-with-javascript-disabled.html
fast/parser/noscript-with-javascript-enabled.html
* html/HTMLParser.cpp:
(WebCore::HTMLParser::getNode):
2009-12-28 Charles Wei <charles.wei at torchmobile.com.cn>
Reviewed by Maciej Stachowiak.
Add test cases for <noscript> with both Javascript enabled and disabled
https://bugs.webkit.org/show_bug.cgi?id=32706
* fast/parser/noscript-with-javascript-disabled-expected.txt: Added.
* fast/parser/noscript-with-javascript-disabled.html: Added.
* fast/parser/noscript-with-javascript-enabled-expected.txt: Added.
* fast/parser/noscript-with-javascript-enabled.html: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52609 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index d44977c..b014f95 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2009-12-28 Charles Wei <charles.wei at torchmobile.com.cn>
+
+ Reviewed by Maciej Stachowiak.
+
+ Add test cases for <noscript> with both Javascript enabled and disabled
+ https://bugs.webkit.org/show_bug.cgi?id=32706
+
+
+ * fast/parser/noscript-with-javascript-disabled-expected.txt: Added.
+ * fast/parser/noscript-with-javascript-disabled.html: Added.
+ * fast/parser/noscript-with-javascript-enabled-expected.txt: Added.
+ * fast/parser/noscript-with-javascript-enabled.html: Added.
+
2009-12-28 Kinuko Yasuda <kinuko at chromium.org>
Reviewed by Maciej Stachowiak.
diff --git a/LayoutTests/fast/parser/noscript-with-javascript-disabled-expected.txt b/LayoutTests/fast/parser/noscript-with-javascript-disabled-expected.txt
new file mode 100644
index 0000000..24dfd72
--- /dev/null
+++ b/LayoutTests/fast/parser/noscript-with-javascript-disabled-expected.txt
@@ -0,0 +1,2 @@
+This test case verifies that contents inside <noscript> are rendered when Javascript is disabled.
+Succeeded!
diff --git a/LayoutTests/fast/parser/noscript-with-javascript-disabled.html b/LayoutTests/fast/parser/noscript-with-javascript-disabled.html
new file mode 100644
index 0000000..acd3f1c
--- /dev/null
+++ b/LayoutTests/fast/parser/noscript-with-javascript-disabled.html
@@ -0,0 +1,17 @@
+<html>
+
+<script>
+if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+ layoutTestController.overridePreference("WebKitJavaScriptEnabled", false);
+</script>
+
+<noscript>
+<body>
+ This test case verifies that contents inside <noscript> are rendered when Javascript is disabled.
+
+ <p>Succeeded!</p>
+</noscript>
+
+</body>
+</html>
diff --git a/LayoutTests/fast/parser/noscript-with-javascript-enabled-expected.txt b/LayoutTests/fast/parser/noscript-with-javascript-enabled-expected.txt
new file mode 100644
index 0000000..424533f
--- /dev/null
+++ b/LayoutTests/fast/parser/noscript-with-javascript-enabled-expected.txt
@@ -0,0 +1,2 @@
+This test case verifies that contents inside <noscript> are ignored when Javascript is enabled.
+Succeeded!
diff --git a/LayoutTests/fast/parser/noscript-with-javascript-enabled.html b/LayoutTests/fast/parser/noscript-with-javascript-enabled.html
new file mode 100644
index 0000000..0acdffa
--- /dev/null
+++ b/LayoutTests/fast/parser/noscript-with-javascript-enabled.html
@@ -0,0 +1,24 @@
+<html>
+<head>
+<script>
+if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+ layoutTestController.overridePreference("WebKitJavaScriptEnabled", true);
+</script>
+
+<noscript>
+<script type="text/javascript">
+ var element = document.getElementById("console");
+ element.innerHTML="<p>Failed!</p>";
+</script>
+</noscript>
+
+</head>
+
+<body>
+ This test case verifies that contents inside <noscript> are ignored when Javascript is enabled.
+ <div id="console">
+ Succeeded!
+ </div>
+</body>
+</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d8212a2..0acd039 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2009-12-28 Charles Wei <charles.wei at torchmobile.com.cn>
+
+ Reviewed by Maciej Stachowiak.
+
+ Remove the macro ENABLE(XHTMLMP) for noscriptAreateErrorCheck in HTMLParser,
+ since with XHTMLMP enabled, it's not checking create Errors, and then contents inside
+ <noscript> are always parsed and rendered.
+ https://bugs.webkit.org/show_bug.cgi?id=32706
+
+ Tests: fast/parser/noscript-with-javascript-disabled.html
+ fast/parser/noscript-with-javascript-enabled.html
+
+ * html/HTMLParser.cpp:
+ (WebCore::HTMLParser::getNode):
+
2009-12-28 Kinuko Yasuda <kinuko at chromium.org>
Reviewed by Maciej Stachowiak.
diff --git a/WebCore/html/HTMLParser.cpp b/WebCore/html/HTMLParser.cpp
index 02cf4ad..4b4833f 100644
--- a/WebCore/html/HTMLParser.cpp
+++ b/WebCore/html/HTMLParser.cpp
@@ -942,9 +942,7 @@ PassRefPtr<Node> HTMLParser::getNode(Token* t)
gFunctionMap.set(nobrTag.localName().impl(), &HTMLParser::nestedCreateErrorCheck);
gFunctionMap.set(noembedTag.localName().impl(), &HTMLParser::noembedCreateErrorCheck);
gFunctionMap.set(noframesTag.localName().impl(), &HTMLParser::noframesCreateErrorCheck);
-#if !ENABLE(XHTMLMP)
gFunctionMap.set(noscriptTag.localName().impl(), &HTMLParser::noscriptCreateErrorCheck);
-#endif
gFunctionMap.set(olTag.localName().impl(), &HTMLParser::pCloserCreateErrorCheck);
gFunctionMap.set(pTag.localName().impl(), &HTMLParser::pCloserCreateErrorCheck);
gFunctionMap.set(plaintextTag.localName().impl(), &HTMLParser::pCloserCreateErrorCheck);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list