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

Wed Dec 22 15:50:35 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit 8841e518076cfa217fb5895caa5de14ff23f616c
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Nov 14 18:43:26 2010 +0000

    2010-11-14  Andreas Kling  <kling at webkit.org>
    
            Reviewed by Antonio Gomes.
    
            REGRESSION(r71895): API test javaScriptWindowObjectCleared fails
            https://bugs.webkit.org/show_bug.cgi?id=49466
    
            As of r71895 empty inline scripts are no longer executed and so
            the javaScriptWindowObjectCleared() signal is no longer triggered
            by <script></script>.
    
            * tests/qwebframe/tst_qwebframe.cpp:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71983 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 91991b2..b284620 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,16 @@
+2010-11-14  Andreas Kling  <kling at webkit.org>
+
+        Reviewed by Antonio Gomes.
+
+        REGRESSION(r71895): API test javaScriptWindowObjectCleared fails
+        https://bugs.webkit.org/show_bug.cgi?id=49466
+
+        As of r71895 empty inline scripts are no longer executed and so
+        the javaScriptWindowObjectCleared() signal is no longer triggered
+        by <script></script>.
+
+        * tests/qwebframe/tst_qwebframe.cpp:
+
 2010-11-12  Jacob Dinu  <dinu.jacob at nokia.com>
 
         Reviewed by Andreas Kling.
diff --git a/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp b/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp
index d74b631..75cbd29 100644
--- a/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp
+++ b/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp
@@ -2389,7 +2389,9 @@ void tst_QWebFrame::javaScriptWindowObjectCleared_data()
 {
     QTest::addColumn<QString>("html");
     QTest::addColumn<int>("signalCount");
-    QTest::newRow("with <script>") << "<html><body><script></script><p>hello world</p></body></html>" << 1;
+    QTest::newRow("with <script>") << "<html><body><script>i=0</script><p>hello world</p></body></html>" << 1;
+    // NOTE: Empty scripts no longer cause this signal to be emitted.
+    QTest::newRow("with empty <script>") << "<html><body><script></script><p>hello world</p></body></html>" << 0;
     QTest::newRow("without <script>") << "<html><body><p>hello world</p></body></html>" << 0;
 }
 

-- 
WebKit Debian packaging

