[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 38cfa49cf8f17beda86c0e8803ca931226467864
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Mar 6 15:13:59 2010 +0000

    2010-03-06  Darin Fisher  <darin at chromium.org>
    
            Reviewed by David Levin.
    
            [Chromium] spurious WebViewClient::didStopLoading if changing
            location.hash while a subframe is still loading
    
            https://bugs.webkit.org/show_bug.cgi?id=33884
    
            * src/FrameLoaderClientImpl.cpp:
            (WebKit::FrameLoaderClientImpl::dispatchDidChangeLocationWithinPage):
            Call isLoadingInAPISense, which checks subframes.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55625 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 27a8d79..e074e60 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,16 @@
+2010-03-06  Darin Fisher  <darin at chromium.org>
+
+        Reviewed by David Levin.
+
+        [Chromium] spurious WebViewClient::didStopLoading if changing
+        location.hash while a subframe is still loading
+
+        https://bugs.webkit.org/show_bug.cgi?id=33884
+
+        * src/FrameLoaderClientImpl.cpp:
+        (WebKit::FrameLoaderClientImpl::dispatchDidChangeLocationWithinPage):
+        Call isLoadingInAPISense, which checks subframes.
+
 2010-03-06  Hironori Bono  <hbono at chromium.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebKit/chromium/src/FrameLoaderClientImpl.cpp b/WebKit/chromium/src/FrameLoaderClientImpl.cpp
index c84f11a..03899a7 100644
--- a/WebKit/chromium/src/FrameLoaderClientImpl.cpp
+++ b/WebKit/chromium/src/FrameLoaderClientImpl.cpp
@@ -579,7 +579,7 @@ void FrameLoaderClientImpl::dispatchDidChangeLocationWithinPage()
     // them for fragment redirection that happens in window.onload handler.
     // See https://bugs.webkit.org/show_bug.cgi?id=31838
     bool loaderCompleted =
-        !m_webFrame->frame()->page()->mainFrame()->loader()->isLoading();
+        !webView->page()->mainFrame()->loader()->activeDocumentLoader()->isLoadingInAPISense();
 
     // Generate didStartLoading if loader is completed.
     if (webView->client() && loaderCompleted)

-- 
WebKit Debian packaging