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

Wed Dec 22 14:51:50 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit e0dac70225dd7ad9789e225ead7c8829c10e11dd
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 22 17:15:30 2010 +0000

    2010-10-22  Jedrzej Nowacki  <jedrzej.nowacki at nokia.com>
    
            Reviewed by Antonio Gomes.
    
            Add new LayoutTest checking web history on document.location change.
    
            The new test enforce the current behavior; If redirection is caused by
            document.location change, immediately after a page load and without using
            setTimeout, a web history item shouldn't be created.
    
            History item and document.location change.
            https://bugs.webkit.org/show_bug.cgi?id=48117
    
            * http/tests/navigation/document-location-script-expected.txt: Added.
            * http/tests/navigation/document-location-script.html: Added.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70315 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index e6ec99b..7217019 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,19 @@
+2010-10-22  Jedrzej Nowacki  <jedrzej.nowacki at nokia.com>
+
+        Reviewed by Antonio Gomes.
+
+        Add new LayoutTest checking web history on document.location change.
+
+        The new test enforce the current behavior; If redirection is caused by
+        document.location change, immediately after a page load and without using
+        setTimeout, a web history item shouldn't be created.
+
+        History item and document.location change.
+        https://bugs.webkit.org/show_bug.cgi?id=48117
+
+        * http/tests/navigation/document-location-script-expected.txt: Added.
+        * http/tests/navigation/document-location-script.html: Added.
+
 2010-10-22  Andreas Kling  <kling at webkit.org>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/LayoutTests/http/tests/navigation/document-location-script-expected.txt b/LayoutTests/http/tests/navigation/document-location-script-expected.txt
new file mode 100644
index 0000000..4278b7e
--- /dev/null
+++ b/LayoutTests/http/tests/navigation/document-location-script-expected.txt
@@ -0,0 +1,5 @@
+This tests that assigning to document.location from a script tag doesn't add a back/forward item.
+
+============== Back Forward List ==============
+curr->  http://127.0.0.1:8000/navigation/document-location-script.html?1  **nav target**
+===============================================
diff --git a/LayoutTests/http/tests/navigation/document-location-script.html b/LayoutTests/http/tests/navigation/document-location-script.html
new file mode 100644
index 0000000..3dcd17a
--- /dev/null
+++ b/LayoutTests/http/tests/navigation/document-location-script.html
@@ -0,0 +1,21 @@
+<html>
+<head>
+<script>
+    var n = document.location.search.substring(1);
+    if (!n) {
+      // page just opened
+      layoutTestController.dumpBackForwardList();
+      layoutTestController.dumpAsText();
+      layoutTestController.waitUntilDone();
+
+      document.location = "?1"
+    } else {
+      // loaded the ?1 navigation
+      layoutTestController.notifyDone();
+  }
+</script>
+</head>
+<body>
+This tests that assigning to document.location from a script tag doesn't add a back/forward item.
+</body>
+</html>

-- 
WebKit Debian packaging

