Title: [91789] trunk/Source/WebKit/chromium
- Revision
- 91789
- Author
- [email protected]
- Date
- 2011-07-26 14:52:50 -0700 (Tue, 26 Jul 2011)
Log Message
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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (91788 => 91789)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-07-26 21:51:17 UTC (rev 91788)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-07-26 21:52:50 UTC (rev 91789)
@@ -1,3 +1,17 @@
+2011-07-26 Brett Wilson <[email protected]>
+
+ 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-25 Al Patrick <[email protected]>
Removed support for the GL_latch_CHROMIUM extension which Chromium no longer supports.
Modified: trunk/Source/WebKit/chromium/src/AssociatedURLLoader.cpp (91788 => 91789)
--- trunk/Source/WebKit/chromium/src/AssociatedURLLoader.cpp 2011-07-26 21:51:17 UTC (rev 91788)
+++ trunk/Source/WebKit/chromium/src/AssociatedURLLoader.cpp 2011-07-26 21:52:50 UTC (rev 91789)
@@ -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
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
