[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 4b5cd4e153138992d18174c29ced33a6fb4caaaa
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Mar 6 15:30:40 2010 +0000

    2010-03-06  Darin Fisher  <darin at chromium.org>
    
            Reviewed by David Levin.
    
            [Chromium] Embedder initiated loads should not always stop existing loads
            https://bugs.webkit.org/show_bug.cgi?id=33862
    
            * src/WebFrameImpl.cpp:
            (WebKit::WebFrameImpl::reload):
            (WebKit::WebFrameImpl::loadRequest):
            (WebKit::WebFrameImpl::loadHistoryItem):
            (WebKit::WebFrameImpl::loadData):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55626 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index e074e60..9df1b5e 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -2,6 +2,19 @@
 
         Reviewed by David Levin.
 
+        [Chromium] Embedder initiated loads should not always stop existing loads
+        https://bugs.webkit.org/show_bug.cgi?id=33862
+
+        * src/WebFrameImpl.cpp:
+        (WebKit::WebFrameImpl::reload):
+        (WebKit::WebFrameImpl::loadRequest):
+        (WebKit::WebFrameImpl::loadHistoryItem):
+        (WebKit::WebFrameImpl::loadData):
+
+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
 
diff --git a/WebKit/chromium/src/WebFrameImpl.cpp b/WebKit/chromium/src/WebFrameImpl.cpp
index 75d1ce8..37f9691 100644
--- a/WebKit/chromium/src/WebFrameImpl.cpp
+++ b/WebKit/chromium/src/WebFrameImpl.cpp
@@ -716,9 +716,6 @@ bool WebFrameImpl::insertStyleText(
 void WebFrameImpl::reload(bool ignoreCache)
 {
     m_frame->loader()->history()->saveDocumentAndScrollState();
-
-    stopLoading();  // Make sure existing activity stops.
-
     m_frame->loader()->reload(ignoreCache);
 }
 
@@ -732,7 +729,6 @@ void WebFrameImpl::loadRequest(const WebURLRequest& request)
         return;
     }
 
-    stopLoading();  // Make sure existing activity stops.
     m_frame->loader()->load(resourceRequest, false);
 }
 
@@ -741,8 +737,6 @@ void WebFrameImpl::loadHistoryItem(const WebHistoryItem& item)
     RefPtr<HistoryItem> historyItem = PassRefPtr<HistoryItem>(item);
     ASSERT(historyItem.get());
 
-    stopLoading();  // Make sure existing activity stops.
-
     // If there is no currentItem, which happens when we are navigating in
     // session history after a crash, we need to manufacture one otherwise WebKit
     // hoarks. This is probably the wrong thing to do, but it seems to work.
@@ -779,8 +773,6 @@ void WebFrameImpl::loadData(const WebData& data,
         request = m_frame->loader()->originalRequest();
     request.setURL(baseURL);
 
-    stopLoading();  // Make sure existing activity stops.
-
     m_frame->loader()->load(request, substData, false);
     if (replace) {
         // Do this to force WebKit to treat the load as replacing the currently

-- 
WebKit Debian packaging