Changeset 55626 in webkit

Timestamp:

Mar 6, 2010 7:30:40 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-03-06 Darin Fisher <​darin@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):

Location:

trunk/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• src/WebFrameImpl.cpp (modified) (4 diffs)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-03-06  Darin Fisher  <darin@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):
+
 2010-03-06  Darin Fisher  <darin@chromium.org>
 

trunk/WebKit/chromium/src/WebFrameImpl.cpp

@@ -717 +717 @@
 {
     m_frame->loader()->history()->saveDocumentAndScrollState();
-
-    stopLoading();  // Make sure existing activity stops.
-
     m_frame->loader()->reload(ignoreCache);
 }
@@ -733 +730 @@
     }
 
-    stopLoading();  // Make sure existing activity stops.
     m_frame->loader()->load(resourceRequest, false);
 }
@@ -741 +737 @@
     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
@@ -779 +773 @@
         request = m_frame->loader()->originalRequest();
     request.setURL(baseURL);
-
-    stopLoading();  // Make sure existing activity stops.
 
     m_frame->loader()->load(request, substData, false);