Diff
Modified: trunk/Source/WebKit2/ChangeLog (203195 => 203196)
--- trunk/Source/WebKit2/ChangeLog 2016-07-13 22:40:49 UTC (rev 203195)
+++ trunk/Source/WebKit2/ChangeLog 2016-07-13 22:42:46 UTC (rev 203196)
@@ -1,3 +1,73 @@
+2016-07-13 Chris Dumez <[email protected]>
+
+ [WK2] Use more references for connections
+ https://bugs.webkit.org/show_bug.cgi?id=159739
+
+ Reviewed by Alex Christensen.
+
+ Use more references for connections to make it more obvious they cannot
+ be null.
+
+ * DatabaseProcess/DatabaseToWebProcessConnection.cpp:
+ (WebKit::DatabaseToWebProcessConnection::DatabaseToWebProcessConnection):
+ * DatabaseProcess/DatabaseToWebProcessConnection.h:
+ (WebKit::DatabaseToWebProcessConnection::connection):
+ * DatabaseProcess/IndexedDB/WebIDBConnectionToClient.cpp:
+ (WebKit::WebIDBConnectionToClient::messageSenderConnection):
+ * NetworkProcess/NetworkConnectionToWebProcess.cpp:
+ (WebKit::NetworkConnectionToWebProcess::NetworkConnectionToWebProcess):
+ (WebKit::NetworkConnectionToWebProcess::writeBlobsToTemporaryFiles):
+ * NetworkProcess/NetworkConnectionToWebProcess.h:
+ (WebKit::NetworkConnectionToWebProcess::connection):
+ * NetworkProcess/NetworkResourceLoader.cpp:
+ (WebKit::NetworkResourceLoader::messageSenderConnection):
+ * Shared/mac/CookieStorageShim.mm:
+ (WebKit::webKitCookieStorageCopyRequestHeaderFieldsForURL):
+ * WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp:
+ (WebKit::WebIDBConnectionToServer::messageSenderConnection):
+ (WebKit::preregisterSandboxExtensionsIfNecessary):
+ * WebProcess/Databases/WebToDatabaseProcessConnection.cpp:
+ (WebKit::WebToDatabaseProcessConnection::WebToDatabaseProcessConnection):
+ * WebProcess/Databases/WebToDatabaseProcessConnection.h:
+ (WebKit::WebToDatabaseProcessConnection::connection):
+ * WebProcess/FileAPI/BlobRegistryProxy.cpp:
+ (WebKit::BlobRegistryProxy::registerFileBlobURL):
+ (WebKit::BlobRegistryProxy::registerBlobURL):
+ (WebKit::BlobRegistryProxy::registerBlobURLOptionallyFileBacked):
+ (WebKit::BlobRegistryProxy::unregisterBlobURL):
+ (WebKit::BlobRegistryProxy::registerBlobURLForSlice):
+ (WebKit::BlobRegistryProxy::blobSize):
+ (WebKit::BlobRegistryProxy::writeBlobsToTemporaryFiles):
+ * WebProcess/Network/NetworkProcessConnection.cpp:
+ (WebKit::NetworkProcessConnection::NetworkProcessConnection):
+ (WebKit::NetworkProcessConnection::writeBlobsToTemporaryFiles):
+ * WebProcess/Network/NetworkProcessConnection.h:
+ (WebKit::NetworkProcessConnection::connection):
+ * WebProcess/Network/WebLoaderStrategy.cpp:
+ (WebKit::WebLoaderStrategy::scheduleLoad):
+ (WebKit::WebLoaderStrategy::remove):
+ (WebKit::WebLoaderStrategy::setDefersLoading):
+ (WebKit::WebLoaderStrategy::loadResourceSynchronously):
+ (WebKit::WebLoaderStrategy::createPingHandle):
+ * WebProcess/Network/WebResourceLoader.cpp:
+ (WebKit::WebResourceLoader::messageSenderConnection):
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
+ (WebKit::WebPlatformStrategies::cookiesForDOM):
+ (WebKit::WebPlatformStrategies::setCookiesFromDOM):
+ (WebKit::WebPlatformStrategies::cookiesEnabled):
+ (WebKit::WebPlatformStrategies::cookieRequestHeaderFieldValue):
+ (WebKit::WebPlatformStrategies::getRawCookies):
+ (WebKit::WebPlatformStrategies::deleteCookie):
+ (WebKit::WebPlatformStrategies::addCookie):
+ * WebProcess/WebPage/WebFrame.cpp:
+ (WebKit::WebFrame::startDownload):
+ (WebKit::WebFrame::convertMainResourceLoadToDownload):
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::ensureLegacyPrivateBrowsingSessionInNetworkProcess):
+ (WebKit::WebProcess::networkConnection):
+ (WebKit::WebProcess::prefetchDNS):
+ * WebProcess/WebProcess.h:
+
2016-07-13 Anders Carlsson <[email protected]>
Move WKPreferencesRef functions to the correct file
Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.cpp (203195 => 203196)
--- trunk/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.cpp 2016-07-13 22:40:49 UTC (rev 203195)
+++ trunk/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.cpp 2016-07-13 22:42:46 UTC (rev 203196)
@@ -42,8 +42,8 @@
}
DatabaseToWebProcessConnection::DatabaseToWebProcessConnection(IPC::Connection::Identifier connectionIdentifier)
+ : m_connection(IPC::Connection::createServerConnection(connectionIdentifier, *this))
{
- m_connection = IPC::Connection::createServerConnection(connectionIdentifier, *this);
m_connection->setOnlySendMessagesAsDispatchWhenWaitingForSyncReplyWhenProcessingSuchAMessage(true);
m_connection->open();
}
Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.h (203195 => 203196)
--- trunk/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.h 2016-07-13 22:40:49 UTC (rev 203195)
+++ trunk/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.h 2016-07-13 22:42:46 UTC (rev 203196)
@@ -42,7 +42,7 @@
static Ref<DatabaseToWebProcessConnection> create(IPC::Connection::Identifier);
~DatabaseToWebProcessConnection();
- IPC::Connection* connection() const { return m_connection.get(); }
+ IPC::Connection& connection() { return m_connection.get(); }
private:
DatabaseToWebProcessConnection(IPC::Connection::Identifier);
@@ -58,7 +58,7 @@
void didReceiveSyncDatabaseToWebProcessConnectionMessage(IPC::Connection&, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&);
// IPC::MessageSender
- IPC::Connection* messageSenderConnection() override { return m_connection.get(); }
+ IPC::Connection* messageSenderConnection() override { return m_connection.ptr(); }
uint64_t messageSenderDestinationID() override { return 0; }
#if ENABLE(INDEXED_DATABASE)
@@ -69,7 +69,7 @@
HashMap<uint64_t, RefPtr<WebIDBConnectionToClient>> m_webIDBConnections;
#endif // ENABLE(INDEXED_DATABASE)
- RefPtr<IPC::Connection> m_connection;
+ Ref<IPC::Connection> m_connection;
};
} // namespace WebKit
Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.cpp (203195 => 203196)
--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.cpp 2016-07-13 22:40:49 UTC (rev 203195)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.cpp 2016-07-13 22:42:46 UTC (rev 203196)
@@ -68,7 +68,7 @@
IPC::Connection* WebIDBConnectionToClient::messageSenderConnection()
{
- return m_connection->connection();
+ return &m_connection->connection();
}
WebCore::IDBServer::IDBConnectionToClient& WebIDBConnectionToClient::connectionToClient()
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp (203195 => 203196)
--- trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp 2016-07-13 22:40:49 UTC (rev 203195)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp 2016-07-13 22:42:46 UTC (rev 203196)
@@ -60,8 +60,8 @@
}
NetworkConnectionToWebProcess::NetworkConnectionToWebProcess(IPC::Connection::Identifier connectionIdentifier)
+ : m_connection(IPC::Connection::createServerConnection(connectionIdentifier, *this))
{
- m_connection = IPC::Connection::createServerConnection(connectionIdentifier, *this);
m_connection->open();
}
@@ -320,7 +320,7 @@
file->revokeFileAccess();
NetworkProcess::singleton().grantSandboxExtensionsToDatabaseProcessForBlobs(fileNames, [this, protectedThis = WTFMove(protectedThis), requestIdentifier, fileNames]() {
- if (!m_connection || !m_connection->isValid())
+ if (!m_connection->isValid())
return;
m_connection->send(Messages::NetworkProcessConnection::DidWriteBlobsToTemporaryFiles(requestIdentifier, fileNames), 0);
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h (203195 => 203196)
--- trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h 2016-07-13 22:40:49 UTC (rev 203195)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h 2016-07-13 22:42:46 UTC (rev 203196)
@@ -50,7 +50,7 @@
static Ref<NetworkConnectionToWebProcess> create(IPC::Connection::Identifier);
virtual ~NetworkConnectionToWebProcess();
- IPC::Connection* connection() const { return m_connection.get(); }
+ IPC::Connection& connection() { return m_connection.get(); }
void didCleanupResourceLoader(NetworkResourceLoader&);
@@ -102,7 +102,7 @@
void ensureLegacyPrivateBrowsingSession();
- RefPtr<IPC::Connection> m_connection;
+ Ref<IPC::Connection> m_connection;
HashMap<ResourceLoadIdentifier, RefPtr<NetworkResourceLoader>> m_networkResourceLoaders;
HashMap<String, RefPtr<WebCore::BlobDataFileReference>> m_blobDataFileReferences;
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (203195 => 203196)
--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2016-07-13 22:40:49 UTC (rev 203195)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2016-07-13 22:42:46 UTC (rev 203196)
@@ -599,7 +599,7 @@
IPC::Connection* NetworkResourceLoader::messageSenderConnection()
{
- return connectionToWebProcess().connection();
+ return &connectionToWebProcess().connection();
}
void NetworkResourceLoader::consumeSandboxExtensions()
Modified: trunk/Source/WebKit2/Shared/mac/CookieStorageShim.mm (203195 => 203196)
--- trunk/Source/WebKit2/Shared/mac/CookieStorageShim.mm 2016-07-13 22:40:49 UTC (rev 203195)
+++ trunk/Source/WebKit2/Shared/mac/CookieStorageShim.mm 2016-07-13 22:42:46 UTC (rev 203196)
@@ -60,7 +60,7 @@
{
String cookies;
URL firstPartyForCookiesURL;
- if (!WebProcess::singleton().networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::CookieRequestHeaderFieldValue(SessionID::defaultSessionID(), firstPartyForCookiesURL, inRequestURL), Messages::NetworkConnectionToWebProcess::CookiesForDOM::Reply(cookies), 0))
+ if (!WebProcess::singleton().networkConnection().connection().sendSync(Messages::NetworkConnectionToWebProcess::CookieRequestHeaderFieldValue(SessionID::defaultSessionID(), firstPartyForCookiesURL, inRequestURL), Messages::NetworkConnectionToWebProcess::CookiesForDOM::Reply(cookies), 0))
return 0;
if (cookies.isNull())
Modified: trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp (203195 => 203196)
--- trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp 2016-07-13 22:40:49 UTC (rev 203195)
+++ trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp 2016-07-13 22:42:46 UTC (rev 203196)
@@ -75,7 +75,7 @@
IPC::Connection* WebIDBConnectionToServer::messageSenderConnection()
{
- return WebProcess::singleton().webToDatabaseProcessConnection()->connection();
+ return &WebProcess::singleton().webToDatabaseProcessConnection()->connection();
}
IDBClient::IDBConnectionToServer& WebIDBConnectionToServer::coreConnectionToServer()
@@ -261,7 +261,7 @@
ASSERT(filePaths.size() == result.handles().size());
if (!filePaths.isEmpty())
- WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::PreregisterSandboxExtensionsForOptionallyFileBackedBlob(filePaths, result.handles()), 0);
+ WebProcess::singleton().networkConnection().connection().send(Messages::NetworkConnectionToWebProcess::PreregisterSandboxExtensionsForOptionallyFileBackedBlob(filePaths, result.handles()), 0);
}
void WebIDBConnectionToServer::didGetRecord(const WebIDBResult& result)
Modified: trunk/Source/WebKit2/WebProcess/Databases/WebToDatabaseProcessConnection.cpp (203195 => 203196)
--- trunk/Source/WebKit2/WebProcess/Databases/WebToDatabaseProcessConnection.cpp 2016-07-13 22:40:49 UTC (rev 203195)
+++ trunk/Source/WebKit2/WebProcess/Databases/WebToDatabaseProcessConnection.cpp 2016-07-13 22:42:46 UTC (rev 203196)
@@ -39,8 +39,8 @@
namespace WebKit {
WebToDatabaseProcessConnection::WebToDatabaseProcessConnection(IPC::Connection::Identifier connectionIdentifier)
+ : m_connection(IPC::Connection::createClientConnection(connectionIdentifier, *this))
{
- m_connection = IPC::Connection::createClientConnection(connectionIdentifier, *this);
m_connection->open();
}
Modified: trunk/Source/WebKit2/WebProcess/Databases/WebToDatabaseProcessConnection.h (203195 => 203196)
--- trunk/Source/WebKit2/WebProcess/Databases/WebToDatabaseProcessConnection.h 2016-07-13 22:40:49 UTC (rev 203195)
+++ trunk/Source/WebKit2/WebProcess/Databases/WebToDatabaseProcessConnection.h 2016-07-13 22:42:46 UTC (rev 203196)
@@ -49,7 +49,7 @@
}
~WebToDatabaseProcessConnection();
- IPC::Connection* connection() const { return m_connection.get(); }
+ IPC::Connection& connection() { return m_connection.get(); }
#if ENABLE(INDEXED_DATABASE)
WebIDBConnectionToServer& idbConnectionToServerForSession(const WebCore::SessionID&);
@@ -66,10 +66,10 @@
IPC::ProcessType remoteProcessType() override { return IPC::ProcessType::Database; }
// IPC::MessageSender
- IPC::Connection* messageSenderConnection() override { return m_connection.get(); }
+ IPC::Connection* messageSenderConnection() override { return m_connection.ptr(); }
uint64_t messageSenderDestinationID() override { return 0; }
- RefPtr<IPC::Connection> m_connection;
+ Ref<IPC::Connection> m_connection;
#if ENABLE(INDEXED_DATABASE)
HashMap<WebCore::SessionID, RefPtr<WebIDBConnectionToServer>> m_webIDBConnectionsBySession;
Modified: trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.cpp (203195 => 203196)
--- trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.cpp 2016-07-13 22:40:49 UTC (rev 203195)
+++ trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.cpp 2016-07-13 22:42:46 UTC (rev 203196)
@@ -44,39 +44,39 @@
if (!file->path().isEmpty())
SandboxExtension::createHandle(file->path(), SandboxExtension::ReadOnly, extensionHandle);
- WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::RegisterFileBlobURL(url, file->path(), extensionHandle, contentType), 0);
+ WebProcess::singleton().networkConnection().connection().send(Messages::NetworkConnectionToWebProcess::RegisterFileBlobURL(url, file->path(), extensionHandle, contentType), 0);
}
void BlobRegistryProxy::registerBlobURL(const URL& url, Vector<BlobPart> blobParts, const String& contentType)
{
- WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::RegisterBlobURL(url, blobParts, contentType), 0);
+ WebProcess::singleton().networkConnection().connection().send(Messages::NetworkConnectionToWebProcess::RegisterBlobURL(url, blobParts, contentType), 0);
}
void BlobRegistryProxy::registerBlobURL(const URL& url, const URL& srcURL)
{
- WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::RegisterBlobURLFromURL(url, srcURL), 0);
+ WebProcess::singleton().networkConnection().connection().send(Messages::NetworkConnectionToWebProcess::RegisterBlobURLFromURL(url, srcURL), 0);
}
void BlobRegistryProxy::registerBlobURLOptionallyFileBacked(const URL& url, const URL& srcURL, RefPtr<WebCore::BlobDataFileReference>&& file, const String& contentType)
{
ASSERT(file);
- WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::RegisterBlobURLOptionallyFileBacked(url, srcURL, file->path(), contentType), 0);
+ WebProcess::singleton().networkConnection().connection().send(Messages::NetworkConnectionToWebProcess::RegisterBlobURLOptionallyFileBacked(url, srcURL, file->path(), contentType), 0);
}
void BlobRegistryProxy::unregisterBlobURL(const URL& url)
{
- WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::UnregisterBlobURL(url), 0);
+ WebProcess::singleton().networkConnection().connection().send(Messages::NetworkConnectionToWebProcess::UnregisterBlobURL(url), 0);
}
void BlobRegistryProxy::registerBlobURLForSlice(const URL& url, const URL& srcURL, long long start, long long end)
{
- WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::RegisterBlobURLForSlice(url, srcURL, start, end), 0);
+ WebProcess::singleton().networkConnection().connection().send(Messages::NetworkConnectionToWebProcess::RegisterBlobURLForSlice(url, srcURL, start, end), 0);
}
unsigned long long BlobRegistryProxy::blobSize(const URL& url)
{
uint64_t resultSize;
- if (!WebProcess::singleton().networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::BlobSize(url), Messages::NetworkConnectionToWebProcess::BlobSize::Reply(resultSize), 0))
+ if (!WebProcess::singleton().networkConnection().connection().sendSync(Messages::NetworkConnectionToWebProcess::BlobSize(url), Messages::NetworkConnectionToWebProcess::BlobSize::Reply(resultSize), 0))
return 0;
return resultSize;
}
@@ -83,7 +83,7 @@
void BlobRegistryProxy::writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, Function<void (const Vector<String>& filePaths)>&& completionHandler)
{
- WebProcess::singleton().networkConnection()->writeBlobsToTemporaryFiles(blobURLs, WTFMove(completionHandler));
+ WebProcess::singleton().networkConnection().writeBlobsToTemporaryFiles(blobURLs, WTFMove(completionHandler));
}
}
Modified: trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp (203195 => 203196)
--- trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp 2016-07-13 22:40:49 UTC (rev 203195)
+++ trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp 2016-07-13 22:42:46 UTC (rev 203196)
@@ -42,8 +42,8 @@
namespace WebKit {
NetworkProcessConnection::NetworkProcessConnection(IPC::Connection::Identifier connectionIdentifier)
+ : m_connection(IPC::Connection::createClientConnection(connectionIdentifier, *this))
{
- m_connection = IPC::Connection::createClientConnection(connectionIdentifier, *this);
m_connection->open();
}
@@ -92,7 +92,7 @@
m_writeBlobToFileCompletionHandlers.set(requestIdentifier, WTFMove(completionHandler));
- WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::WriteBlobsToTemporaryFiles(blobURLs, requestIdentifier), 0);
+ WebProcess::singleton().networkConnection().connection().send(Messages::NetworkConnectionToWebProcess::WriteBlobsToTemporaryFiles(blobURLs, requestIdentifier), 0);
}
void NetworkProcessConnection::didWriteBlobsToTemporaryFiles(uint64_t requestIdentifier, const Vector<String>& filenames)
Modified: trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.h (203195 => 203196)
--- trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.h 2016-07-13 22:40:49 UTC (rev 203195)
+++ trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.h 2016-07-13 22:42:46 UTC (rev 203196)
@@ -54,7 +54,7 @@
}
~NetworkProcessConnection();
- IPC::Connection* connection() const { return m_connection.get(); }
+ IPC::Connection& connection() { return m_connection.get(); }
void didReceiveNetworkProcessConnectionMessage(IPC::Connection&, IPC::MessageDecoder&);
@@ -79,7 +79,7 @@
#endif
// The connection from the web process to the network process.
- RefPtr<IPC::Connection> m_connection;
+ Ref<IPC::Connection> m_connection;
HashMap<uint64_t, Function<void (const Vector<String>&)>> m_writeBlobToFileCompletionHandlers;
};
Modified: trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp (203195 => 203196)
--- trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp 2016-07-13 22:40:49 UTC (rev 203195)
+++ trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp 2016-07-13 22:42:46 UTC (rev 203196)
@@ -202,7 +202,7 @@
ASSERT((loadParameters.webPageID && loadParameters.webFrameID) || loadParameters.clientCredentialPolicy == DoNotAskClientForAnyCredentials);
- if (!WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::ScheduleResourceLoad(loadParameters), 0)) {
+ if (!WebProcess::singleton().networkConnection().connection().send(Messages::NetworkConnectionToWebProcess::ScheduleResourceLoad(loadParameters), 0)) {
WEBLOADERSTRATEGY_LOG_ALWAYS_ERROR("WebLoaderStrategy::scheduleLoad: Unable to schedule resource with the NetworkProcess with priority = %d, pageID = %llu, frameID = %llu", static_cast<int>(resourceLoader.request().priority()), static_cast<unsigned long long>(loadParameters.webPageID), static_cast<unsigned long long>(loadParameters.webFrameID));
// We probably failed to schedule this load with the NetworkProcess because it had crashed.
// This load will never succeed so we will schedule it to fail asynchronously.
@@ -257,7 +257,7 @@
if (!loader)
return;
- WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::RemoveLoadIdentifier(identifier), 0);
+ WebProcess::singleton().networkConnection().connection().send(Messages::NetworkConnectionToWebProcess::RemoveLoadIdentifier(identifier), 0);
// It's possible that this WebResourceLoader might be just about to message back to the NetworkProcess (e.g. ContinueWillSendRequest)
// but there's no point in doing so anymore.
@@ -267,7 +267,7 @@
void WebLoaderStrategy::setDefersLoading(ResourceLoader* resourceLoader, bool defers)
{
ResourceLoadIdentifier identifier = resourceLoader->identifier();
- WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::SetDefersLoading(identifier, defers), 0);
+ WebProcess::singleton().networkConnection().connection().send(Messages::NetworkConnectionToWebProcess::SetDefersLoading(identifier, defers), 0);
}
void WebLoaderStrategy::crossOriginRedirectReceived(ResourceLoader*, const URL&)
@@ -325,7 +325,7 @@
HangDetectionDisabler hangDetectionDisabler;
- if (!WebProcess::singleton().networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad(loadParameters), Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad::Reply(error, response, data), 0)) {
+ if (!WebProcess::singleton().networkConnection().connection().sendSync(Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad(loadParameters), Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad::Reply(error, response, data), 0)) {
response = ResourceResponse();
error = internalError(request.url());
}
@@ -349,7 +349,7 @@
loadParameters.allowStoredCredentials = shouldUseCredentialStorage ? AllowStoredCredentials : DoNotAllowStoredCredentials;
loadParameters.shouldClearReferrerOnHTTPSToHTTPRedirect = networkingContext->shouldClearReferrerOnHTTPSToHTTPRedirect();
- WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::LoadPing(loadParameters), 0);
+ WebProcess::singleton().networkConnection().connection().send(Messages::NetworkConnectionToWebProcess::LoadPing(loadParameters), 0);
}
Modified: trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp (203195 => 203196)
--- trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp 2016-07-13 22:40:49 UTC (rev 203195)
+++ trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp 2016-07-13 22:42:46 UTC (rev 203196)
@@ -62,7 +62,7 @@
IPC::Connection* WebResourceLoader::messageSenderConnection()
{
- return WebProcess::singleton().networkConnection()->connection();
+ return &WebProcess::singleton().networkConnection().connection();
}
uint64_t WebResourceLoader::messageSenderDestinationID()
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp (203195 => 203196)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2016-07-13 22:40:49 UTC (rev 203195)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2016-07-13 22:42:46 UTC (rev 203196)
@@ -117,7 +117,7 @@
String WebPlatformStrategies::cookiesForDOM(const NetworkStorageSession& session, const URL& firstParty, const URL& url)
{
String result;
- if (!WebProcess::singleton().networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::CookiesForDOM(SessionTracker::sessionID(session), firstParty, url), Messages::NetworkConnectionToWebProcess::CookiesForDOM::Reply(result), 0))
+ if (!WebProcess::singleton().networkConnection().connection().sendSync(Messages::NetworkConnectionToWebProcess::CookiesForDOM(SessionTracker::sessionID(session), firstParty, url), Messages::NetworkConnectionToWebProcess::CookiesForDOM::Reply(result), 0))
return String();
return result;
}
@@ -124,13 +124,13 @@
void WebPlatformStrategies::setCookiesFromDOM(const NetworkStorageSession& session, const URL& firstParty, const URL& url, const String& cookieString)
{
- WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::SetCookiesFromDOM(SessionTracker::sessionID(session), firstParty, url, cookieString), 0);
+ WebProcess::singleton().networkConnection().connection().send(Messages::NetworkConnectionToWebProcess::SetCookiesFromDOM(SessionTracker::sessionID(session), firstParty, url, cookieString), 0);
}
bool WebPlatformStrategies::cookiesEnabled(const NetworkStorageSession& session, const URL& firstParty, const URL& url)
{
bool result;
- if (!WebProcess::singleton().networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::CookiesEnabled(SessionTracker::sessionID(session), firstParty, url), Messages::NetworkConnectionToWebProcess::CookiesEnabled::Reply(result), 0))
+ if (!WebProcess::singleton().networkConnection().connection().sendSync(Messages::NetworkConnectionToWebProcess::CookiesEnabled(SessionTracker::sessionID(session), firstParty, url), Messages::NetworkConnectionToWebProcess::CookiesEnabled::Reply(result), 0))
return false;
return result;
}
@@ -143,7 +143,7 @@
String WebPlatformStrategies::cookieRequestHeaderFieldValue(SessionID sessionID, const URL& firstParty, const URL& url)
{
String result;
- if (!WebProcess::singleton().networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::CookieRequestHeaderFieldValue(sessionID, firstParty, url), Messages::NetworkConnectionToWebProcess::CookieRequestHeaderFieldValue::Reply(result), 0))
+ if (!WebProcess::singleton().networkConnection().connection().sendSync(Messages::NetworkConnectionToWebProcess::CookieRequestHeaderFieldValue(sessionID, firstParty, url), Messages::NetworkConnectionToWebProcess::CookieRequestHeaderFieldValue::Reply(result), 0))
return String();
return result;
}
@@ -150,7 +150,7 @@
bool WebPlatformStrategies::getRawCookies(const NetworkStorageSession& session, const URL& firstParty, const URL& url, Vector<Cookie>& rawCookies)
{
- if (!WebProcess::singleton().networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::GetRawCookies(SessionTracker::sessionID(session), firstParty, url), Messages::NetworkConnectionToWebProcess::GetRawCookies::Reply(rawCookies), 0))
+ if (!WebProcess::singleton().networkConnection().connection().sendSync(Messages::NetworkConnectionToWebProcess::GetRawCookies(SessionTracker::sessionID(session), firstParty, url), Messages::NetworkConnectionToWebProcess::GetRawCookies::Reply(rawCookies), 0))
return false;
return true;
}
@@ -157,12 +157,12 @@
void WebPlatformStrategies::deleteCookie(const NetworkStorageSession& session, const URL& url, const String& cookieName)
{
- WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::DeleteCookie(SessionTracker::sessionID(session), url, cookieName), 0);
+ WebProcess::singleton().networkConnection().connection().send(Messages::NetworkConnectionToWebProcess::DeleteCookie(SessionTracker::sessionID(session), url, cookieName), 0);
}
void WebPlatformStrategies::addCookie(const NetworkStorageSession& session, const URL& url, const Cookie& cookie)
{
- WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::AddCookie(SessionTracker::sessionID(session), url, cookie), 0);
+ WebProcess::singleton().networkConnection().connection().send(Messages::NetworkConnectionToWebProcess::AddCookie(SessionTracker::sessionID(session), url, cookie), 0);
}
// PluginStrategy
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp (203195 => 203196)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp 2016-07-13 22:40:49 UTC (rev 203195)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp 2016-07-13 22:42:46 UTC (rev 203196)
@@ -256,7 +256,7 @@
auto& webProcess = WebProcess::singleton();
SessionID sessionID = page() ? page()->sessionID() : SessionID::defaultSessionID();
- webProcess.networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::StartDownload(sessionID, policyDownloadID, request, suggestedName), 0);
+ webProcess.networkConnection().connection().send(Messages::NetworkConnectionToWebProcess::StartDownload(sessionID, policyDownloadID, request, suggestedName), 0);
}
void WebFrame::convertMainResourceLoadToDownload(DocumentLoader* documentLoader, SessionID sessionID, const ResourceRequest& request, const ResourceResponse& response)
@@ -278,7 +278,7 @@
else
mainResourceLoadIdentifier = 0;
- webProcess.networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::ConvertMainResourceLoadToDownload(sessionID, mainResourceLoadIdentifier, policyDownloadID, request, response), 0);
+ webProcess.networkConnection().connection().send(Messages::NetworkConnectionToWebProcess::ConvertMainResourceLoadToDownload(sessionID, mainResourceLoadIdentifier, policyDownloadID, request, response), 0);
}
String WebFrame::source() const
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (203195 => 203196)
--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2016-07-13 22:40:49 UTC (rev 203195)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2016-07-13 22:42:46 UTC (rev 203196)
@@ -512,7 +512,7 @@
void WebProcess::ensureLegacyPrivateBrowsingSessionInNetworkProcess()
{
- networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::EnsureLegacyPrivateBrowsingSession(), 0);
+ networkConnection().connection().send(Messages::NetworkConnectionToWebProcess::EnsureLegacyPrivateBrowsingSession(), 0);
}
#if ENABLE(NETSCAPE_PLUGIN_API)
@@ -1014,7 +1014,7 @@
injectedBundle->setBundleParameters(value);
}
-NetworkProcessConnection* WebProcess::networkConnection()
+NetworkProcessConnection& WebProcess::networkConnection()
{
// If we've lost our connection to the network process (e.g. it crashed) try to re-establish it.
if (!m_networkProcessConnection)
@@ -1024,7 +1024,7 @@
if (!m_networkProcessConnection)
CRASH();
- return m_networkProcessConnection.get();
+ return *m_networkProcessConnection;
}
void WebProcess::networkProcessConnectionClosed(NetworkProcessConnection* connection)
@@ -1474,7 +1474,7 @@
return;
if (m_dnsPrefetchedHosts.add(hostname).isNewEntry)
- networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::PrefetchDNS(hostname), 0);
+ networkConnection().connection().send(Messages::NetworkConnectionToWebProcess::PrefetchDNS(hostname), 0);
// The DNS prefetched hosts cache is only to avoid asking for the same hosts too many times
// in a very short period of time, producing a lot of IPC traffic. So we clear this cache after
// some time of no DNS requests.
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (203195 => 203196)
--- trunk/Source/WebKit2/WebProcess/WebProcess.h 2016-07-13 22:40:49 UTC (rev 203195)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h 2016-07-13 22:42:46 UTC (rev 203196)
@@ -154,7 +154,7 @@
EventDispatcher& eventDispatcher() { return *m_eventDispatcher; }
- NetworkProcessConnection* networkConnection();
+ NetworkProcessConnection& networkConnection();
void networkProcessConnectionClosed(NetworkProcessConnection*);
WebLoaderStrategy& webLoaderStrategy();
