Title: [233801] trunk/Source/WebKit
- Revision
- 233801
- Author
- cdu...@apple.com
- Date
- 2018-07-13 10:14:22 -0700 (Fri, 13 Jul 2018)
Log Message
NetworkConnectionToWebProcess::m_networkResourceLoaders should use Ref<> for its values
https://bugs.webkit.org/show_bug.cgi?id=187629
Reviewed by Youenn Fablet.
NetworkConnectionToWebProcess::m_networkResourceLoaders should use Ref<> for its values
since they cannot be null.
* NetworkProcess/NetworkConnectionToWebProcess.cpp:
(WebKit::NetworkConnectionToWebProcess::didClose):
(WebKit::NetworkConnectionToWebProcess::scheduleResourceLoad):
(WebKit::NetworkConnectionToWebProcess::performSynchronousLoad):
* NetworkProcess/NetworkConnectionToWebProcess.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (233800 => 233801)
--- trunk/Source/WebKit/ChangeLog 2018-07-13 17:10:28 UTC (rev 233800)
+++ trunk/Source/WebKit/ChangeLog 2018-07-13 17:14:22 UTC (rev 233801)
@@ -1,3 +1,19 @@
+2018-07-13 Chris Dumez <cdu...@apple.com>
+
+ NetworkConnectionToWebProcess::m_networkResourceLoaders should use Ref<> for its values
+ https://bugs.webkit.org/show_bug.cgi?id=187629
+
+ Reviewed by Youenn Fablet.
+
+ NetworkConnectionToWebProcess::m_networkResourceLoaders should use Ref<> for its values
+ since they cannot be null.
+
+ * NetworkProcess/NetworkConnectionToWebProcess.cpp:
+ (WebKit::NetworkConnectionToWebProcess::didClose):
+ (WebKit::NetworkConnectionToWebProcess::scheduleResourceLoad):
+ (WebKit::NetworkConnectionToWebProcess::performSynchronousLoad):
+ * NetworkProcess/NetworkConnectionToWebProcess.h:
+
2018-07-12 Alex Christensen <achristen...@webkit.org>
Reduce size of WebCore::URL
Modified: trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp (233800 => 233801)
--- trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp 2018-07-13 17:10:28 UTC (rev 233800)
+++ trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp 2018-07-13 17:14:22 UTC (rev 233801)
@@ -178,9 +178,8 @@
// Protect ourself as we might be otherwise be deleted during this function.
Ref<NetworkConnectionToWebProcess> protector(*this);
- for (auto& loader : copyToVector(m_networkResourceLoaders.values()))
- loader->abort();
- ASSERT(m_networkResourceLoaders.isEmpty());
+ while (!m_networkResourceLoaders.isEmpty())
+ m_networkResourceLoaders.begin()->value->abort();
// All trackers of resources that were in the middle of being loaded were
// stopped with the abort() calls above, but we still need to sweep up the
@@ -245,7 +244,7 @@
ASSERT(!m_networkResourceLoaders.contains(identifier));
auto loader = NetworkResourceLoader::create(WTFMove(loadParameters), *this);
- m_networkResourceLoaders.add(identifier, loader.ptr());
+ m_networkResourceLoaders.add(identifier, loader.copyRef());
loader->start();
}
@@ -257,7 +256,7 @@
ASSERT(!m_networkResourceLoaders.contains(identifier));
auto loader = NetworkResourceLoader::create(WTFMove(loadParameters), *this, WTFMove(reply));
- m_networkResourceLoaders.add(identifier, loader.ptr());
+ m_networkResourceLoaders.add(identifier, loader.copyRef());
loader->start();
}
Modified: trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h (233800 => 233801)
--- trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h 2018-07-13 17:10:28 UTC (rev 233800)
+++ trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h 2018-07-13 17:14:22 UTC (rev 233801)
@@ -221,7 +221,7 @@
Ref<IPC::Connection> m_connection;
HashMap<uint64_t, RefPtr<NetworkSocketStream>> m_networkSocketStreams;
- HashMap<ResourceLoadIdentifier, RefPtr<NetworkResourceLoader>> m_networkResourceLoaders;
+ HashMap<ResourceLoadIdentifier, Ref<NetworkResourceLoader>> m_networkResourceLoaders;
HashMap<String, RefPtr<WebCore::BlobDataFileReference>> m_blobDataFileReferences;
Vector<ResourceNetworkActivityTracker> m_networkActivityTrackers;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
