[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

Thu Feb 4 21:22:32 UTC 2010

The following commit has been merged in the webkit-1.1 branch:
commit 01e5f7b2c1ce8de7b2a9f1afd56965c91b770852
Author: beidson at apple.com <beidson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 21 02:23:05 2010 +0000

    WebCore: Assertion failure calling history.pushState within popstate event handler.
    https://bugs.webkit.org/show_bug.cgi?id=33830
    
    Reviewed by Sam Weinig.
    
    Test: fast/loader/stateobjects/pushstate-within-popstate-handler-assert.html
    
    * loader/FrameLoader.cpp:
    (WebCore::FrameLoader::navigateWithinDocument): Remove the ASSERT and invalid part of the comment.
    
    LayoutTests: Crash in Page::backForwardList when using History object from a detached window
    <rdar://problem/7556252> and https://bugs.webkit.org/show_bug.cgi?id=33828
    
    Reviewed by Sam Weinig.
    
    * fast/loader/stateobjects/state-api-on-detached-frame-crash-expected.txt: Added.
    * fast/loader/stateobjects/state-api-on-detached-frame-crash.html: Added.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53590 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 1e986a2..654c27c 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-01-20  Brady Eidson  <beidson at apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Crash in Page::backForwardList when using History object from a detached window
+        <rdar://problem/7556252> and https://bugs.webkit.org/show_bug.cgi?id=33828
+
+        * fast/loader/stateobjects/state-api-on-detached-frame-crash-expected.txt: Added.
+        * fast/loader/stateobjects/state-api-on-detached-frame-crash.html: Added.
+
 2010-01-20  Alexey Proskuryakov  <ap at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/LayoutTests/fast/loader/stateobjects/pushstate-within-popstate-handler-assert-expected.txt b/LayoutTests/fast/loader/stateobjects/pushstate-within-popstate-handler-assert-expected.txt
new file mode 100644
index 0000000..404f1f9
--- /dev/null
+++ b/LayoutTests/fast/loader/stateobjects/pushstate-within-popstate-handler-assert-expected.txt
@@ -0,0 +1 @@
+This test checks to make sure that calling pushState() from within a popstate event handler doesn't ASSERT or crash.
diff --git a/LayoutTests/fast/loader/stateobjects/pushstate-within-popstate-handler-assert.html b/LayoutTests/fast/loader/stateobjects/pushstate-within-popstate-handler-assert.html
new file mode 100644
index 0000000..250baf7
--- /dev/null
+++ b/LayoutTests/fast/loader/stateobjects/pushstate-within-popstate-handler-assert.html
@@ -0,0 +1,23 @@
+<script>
+
+if (window.layoutTestController) {
+  layoutTestController.clearBackForwardList();
+  layoutTestController.dumpAsText();
+  layoutTestController.waitUntilDone();
+}
+
+onpopstate = function() {
+    history.pushState(null, null);
+    if (window.layoutTestController)
+        layoutTestController.notifyDone();
+}
+
+onload = function() {
+    history.pushState(null, null);
+    history.back();
+}
+
+</script>
+<body>
+This test checks to make sure that calling pushState() from within a popstate event handler doesn't ASSERT or crash.
+</body>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b399a2e..cb55f49 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-01-20  Brady Eidson  <beidson at apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Assertion failure calling history.pushState within popstate event handler.
+        https://bugs.webkit.org/show_bug.cgi?id=33830
+
+        Test: fast/loader/stateobjects/pushstate-within-popstate-handler-assert.html
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::navigateWithinDocument): Remove the ASSERT and invalid part of the comment.
+
 2010-01-20  Nikolas Zimmermann  <nzimmermann at rim.com>
 
         Reviewed by Oliver Hunt.
diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp
index 8770f5c..a03a1b8 100644
--- a/WebCore/loader/FrameLoader.cpp
+++ b/WebCore/loader/FrameLoader.cpp
@@ -3700,9 +3700,6 @@ void FrameLoader::navigateWithinDocument(HistoryItem* item)
     loadInSameDocument(item->url(), item->stateObject(), false);
 
     // Restore user view state from the current history item here since we don't do a normal load.
-    // Even though we just manually set the current history item, this ASSERT verifies nothing 
-    // inside of loadInSameDocument() caused it to change.
-    ASSERT(history()->currentItem() == item);
     history()->restoreScrollPositionAndViewState();
 }
 

-- 
WebKit Debian packaging

