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

[weinig at apple.com]

The following commit has been merged in the debian/experimental branch:
commit c52050f8a3fc3c7155174f783b1926ff4e3c02c3
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 13 00:14:06 2010 +0000

    Fix failing API test. It turns out that a pop-state event
    is sent before every fragment navigation, so we have to test
    for it in addition in PageLoadDidChangeLocationWithinPageForFrame.
    
    Reviewed by Anders Carlsson.
    
    * TestWebKitAPI/Tests/WebKit2/PageLoadDidChangeLocationWithinPageForFrame.cpp:
    (TestWebKitAPI::didSameDocumentNavigationForFrame):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73880 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 99b3581..20df9be 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2010-12-12  Sam Weinig  <sam at webkit.org>
+
+        Reviewed by Anders Carlsson.
+
+        Fix failing API test. It turns out that a pop-state event
+        is sent before every fragment navigation, so we have to test
+        for it in addition in PageLoadDidChangeLocationWithinPageForFrame.
+
+        * TestWebKitAPI/Tests/WebKit2/PageLoadDidChangeLocationWithinPageForFrame.cpp:
+        (TestWebKitAPI::didSameDocumentNavigationForFrame):
+
 2010-12-12  Alejandro G. Castro  <alex at igalia.com>
 
         Reviewed by Eric Seidel.
diff --git a/WebKitTools/TestWebKitAPI/Tests/WebKit2/PageLoadDidChangeLocationWithinPageForFrame.cpp b/WebKitTools/TestWebKitAPI/Tests/WebKit2/PageLoadDidChangeLocationWithinPageForFrame.cpp
index 6313fb0..bb66950 100644
--- a/WebKitTools/TestWebKitAPI/Tests/WebKit2/PageLoadDidChangeLocationWithinPageForFrame.cpp
+++ b/WebKitTools/TestWebKitAPI/Tests/WebKit2/PageLoadDidChangeLocationWithinPageForFrame.cpp
@@ -42,9 +42,17 @@ static void didFinishLoadForFrame(WKPageRef, WKFrameRef, WKTypeRef, const void*)
     didFinishLoad = true;
 }
 
+static bool didPopStateWithinPage;
 static bool didChangeLocationWithinPage;
 static void didSameDocumentNavigationForFrame(WKPageRef, WKFrameRef, WKSameDocumentNavigationType type, WKTypeRef, const void*)
 {
+    if (!didPopStateWithinPage) {
+        TEST_ASSERT(type == kWKSameDocumentNavigationSessionStatePop);
+        TEST_ASSERT(!didChangeLocationWithinPage);
+        didPopStateWithinPage = true;
+        return;
+    }
+
     TEST_ASSERT(type == kWKSameDocumentNavigationAnchorNavigation);
     didChangeLocationWithinPage = true;
 }

-- 
WebKit Debian packaging