Title: [91944] branches/chromium/835/Source/WebKit/chromium
- Revision
- 91944
- Author
- bre...@chromium.org
- Date
- 2011-07-28 12:45:36 -0700 (Thu, 28 Jul 2011)
Log 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=bre...@chromium.org
Review URL: http://codereview.chromium.org/7530003
Modified Paths
Diff
Modified: branches/chromium/835/Source/WebKit/chromium/ChangeLog (91943 => 91944)
--- branches/chromium/835/Source/WebKit/chromium/ChangeLog 2011-07-28 19:27:11 UTC (rev 91943)
+++ branches/chromium/835/Source/WebKit/chromium/ChangeLog 2011-07-28 19:45:36 UTC (rev 91944)
@@ -1,3 +1,17 @@
+2011-07-26 Brett Wilson <bre...@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 <sad...@chromium.org>
Pass on the suggested name for download file to the client.
Modified: branches/chromium/835/Source/WebKit/chromium/src/AssociatedURLLoader.cpp (91943 => 91944)
--- branches/chromium/835/Source/WebKit/chromium/src/AssociatedURLLoader.cpp 2011-07-28 19:27:11 UTC (rev 91943)
+++ branches/chromium/835/Source/WebKit/chromium/src/AssociatedURLLoader.cpp 2011-07-28 19:45:36 UTC (rev 91944)
@@ -215,8 +215,7 @@
AssociatedURLLoader::~AssociatedURLLoader()
{
- if (m_clientAdapter)
- m_clientAdapter->clearClient();
+ cancel();
}
#define COMPILE_ASSERT_MATCHING_ENUM(webkit_name, webcore_name) \
@@ -255,10 +254,10 @@
void AssociatedURLLoader::cancel()
{
- if (m_loader) {
+ if (m_clientAdapter)
m_clientAdapter->clearClient();
+ if (m_loader)
m_loader->cancel();
- }
}
void AssociatedURLLoader::setDefersLoading(bool defersLoading)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
