Changeset 91944 in webkit

Timestamp:

Jul 28, 2011, 12:45:36 PM (14 years ago)

Author:

brettw@chromium.org

Message:

Merge 91789 - Cancel the load when an associated URL loader goes out of scope.
Previously, the load would continue even when the WebURLLoader object
was deleted, and the data would just get queued up.

​https://bugs.webkit.org/show_bug.cgi?id=65204

Reviewed by Darin Fisher.

• src/AssociatedURLLoader.cpp:

(WebKit::AssociatedURLLoader::~AssociatedURLLoader):
(WebKit::AssociatedURLLoader::cancel):

TBR=​brettw@chromium.org
Review URL: ​http://codereview.chromium.org/7530003

Location:

branches/chromium/835/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• src/AssociatedURLLoader.cpp (modified) (2 diffs)

branches/chromium/835/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-07-26  Brett Wilson  <brettw@chromium.org>
+
+        Cancel the load when an associated URL loader goes out of scope.
+        Previously, the load would continue even when the WebURLLoader object
+        was deleted, and the data would just get queued up.
+
+        https://bugs.webkit.org/show_bug.cgi?id=65204
+
+        Reviewed by Darin Fisher.
+
+        * src/AssociatedURLLoader.cpp:
+        (WebKit::AssociatedURLLoader::~AssociatedURLLoader):
+        (WebKit::AssociatedURLLoader::cancel):
+
 2011-07-27  Sadrul Habib Chowdhury  <sadrul@chromium.org>
 

branches/chromium/835/Source/WebKit/chromium/src/AssociatedURLLoader.cpp

@@ -216 +216 @@
 AssociatedURLLoader::~AssociatedURLLoader()
 {
-    if (m_clientAdapter)
-        m_clientAdapter->clearClient();
+    cancel();
 }
 
@@ -256 +255 @@
 void AssociatedURLLoader::cancel()
 {
-    if (m_loader) {
+    if (m_clientAdapter)
         m_clientAdapter->clearClient();
+    if (m_loader)
         m_loader->cancel();
-    }
 }