[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

Wed Dec 22 11:44:18 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit 19f86479a6fb59242d83e25118d0750d527c882b
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 5 13:19:53 2010 +0000

    2010-08-05  Charles Wei  <charles.wei at torchmobile.com.cn>
    
            Reviewed by George Staikos.
    
            https://bugs.webkit.org/show_bug.cgi?id=43469
            <noscript> is working wrong in some cases when xhtmlmp is enabled.
    
            * fast/xhtmlmp/noscript-basic-expected.txt: Added.
            * fast/xhtmlmp/noscript-basic.xhtml: Added.
    2010-08-05  Charles Wei  <charles.wei at torchmobile.com.cn>
    
            Reviewed by George Staikos.
    
            <noscript> is working the other way around in some cases with xhtmlmp enabled
            https://bugs.webkit.org/show_bug.cgi?id=43469
    
            Test: fast/xhtmlmp/noscript-basic.xhtml
    
            * dom/Document.cpp:
            (WebCore::Document::Document):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64740 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index a4e2778..6f425be 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-05  Charles Wei  <charles.wei at torchmobile.com.cn>
+
+        Reviewed by George Staikos.
+
+        https://bugs.webkit.org/show_bug.cgi?id=43469
+        <noscript> is working wrong in some cases when xhtmlmp is enabled.
+
+        * fast/xhtmlmp/noscript-basic-expected.txt: Added.
+        * fast/xhtmlmp/noscript-basic.xhtml: Added.
+
 2010-08-05  Pavel Feldman  <pfeldman at chromium.org>
 
         Not reviewed. More chromium test rebaselines.
diff --git a/LayoutTests/fast/xhtmlmp/noscript-basic-expected.txt b/LayoutTests/fast/xhtmlmp/noscript-basic-expected.txt
new file mode 100644
index 0000000..df562f1
--- /dev/null
+++ b/LayoutTests/fast/xhtmlmp/noscript-basic-expected.txt
@@ -0,0 +1,3 @@
+If you see this line only when javascript enabled, it succeeds; one line follows if Javascript is disabled
+
+
diff --git a/LayoutTests/fast/xhtmlmp/noscript-basic.xhtml b/LayoutTests/fast/xhtmlmp/noscript-basic.xhtml
new file mode 100644
index 0000000..bd33f5c
--- /dev/null
+++ b/LayoutTests/fast/xhtmlmp/noscript-basic.xhtml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//WAPFORUM//DTD XHTML Mobile 1.1//EN" "http://www.wapforum.org/DTD/xhtml-mobile11.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<body>
+<script>
+if (window.layoutTestController)
+    layoutTestController.dumpAsText();
+</script>
+
+<p> If you see this line only when javascript enabled, it succeeds; one line follows if Javascript is disabled</p>
+<noscript><h1 id="noscript">inside noscript</h1></noscript>
+</body>
+</html>
+
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0c9979b..e11f1b1 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-05  Charles Wei  <charles.wei at torchmobile.com.cn>
+
+        Reviewed by George Staikos.
+
+        <noscript> is working the other way around in some cases with xhtmlmp enabled
+        https://bugs.webkit.org/show_bug.cgi?id=43469
+
+        Test: fast/xhtmlmp/noscript-basic.xhtml
+
+        * dom/Document.cpp:
+        (WebCore::Document::Document):
+
 2010-08-05  Yury Semikhatsky  <yurys at chromium.org>
 
         Unreviewed. Fix Win compilation.
diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp
index 91efe9e..97d60ad 100644
--- a/WebCore/dom/Document.cpp
+++ b/WebCore/dom/Document.cpp
@@ -465,7 +465,7 @@ Document::Document(Frame* frame, const KURL& url, bool isXHTML, bool isHTML)
     static int docID = 0;
     m_docID = docID++;
 #if ENABLE(XHTMLMP)
-    m_shouldProcessNoScriptElement = m_frame && m_frame->script()->canExecuteScripts(NotAboutToExecuteScript);
+    m_shouldProcessNoScriptElement = !(m_frame && m_frame->script()->canExecuteScripts(NotAboutToExecuteScript));
 #endif
 }
 

-- 
WebKit Debian packaging

