Title: [186873] branches/safari-600.8-branch/Source/WebKit2
- Revision
- 186873
- Author
- [email protected]
- Date
- 2015-07-15 16:57:46 -0700 (Wed, 15 Jul 2015)
Log Message
Merge r186838. rdar://problem/21716363
Modified Paths
Diff
Modified: branches/safari-600.8-branch/Source/WebKit2/ChangeLog (186872 => 186873)
--- branches/safari-600.8-branch/Source/WebKit2/ChangeLog 2015-07-15 23:57:43 UTC (rev 186872)
+++ branches/safari-600.8-branch/Source/WebKit2/ChangeLog 2015-07-15 23:57:46 UTC (rev 186873)
@@ -1,5 +1,17 @@
2015-07-15 Matthew Hanson <[email protected]>
+ Merge r186838. rdar://problem/21716363
+
+ 2015-07-15 David Kilzer <[email protected]>
+
+ REGRESSION (r186559): Follow-up fix to merge r183861 for <rdar://problem/21716677>
+
+ * NetworkProcess/NetworkResourceLoader.cpp:
+ (WebKit::NetworkResourceLoader::cleanup): Restore call to
+ deref() so we don't leak the NetworkResourceLoader.
+
+2015-07-15 Matthew Hanson <[email protected]>
+
Merge r186559. rdar://problem/21716363
2015-07-08 Matthew Hanson <[email protected]>
Modified: branches/safari-600.8-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (186872 => 186873)
--- branches/safari-600.8-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2015-07-15 23:57:43 UTC (rev 186872)
+++ branches/safari-600.8-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2015-07-15 23:57:46 UTC (rev 186873)
@@ -162,8 +162,11 @@
// Tell the scheduler about this finished loader soon so it can start more network requests.
NetworkProcess::shared().networkResourceLoadScheduler().scheduleRemoveLoader(this);
if (m_handle) {
+ // Explicit deref() balanced by a ref() in NetworkResourceLoader::start()
+ // This might cause the NetworkResourceLoader to be destroyed and therefore we do it last.
m_handle->setClient(nullptr);
m_handle = nullptr;
+ deref();
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
