WebKit Bugzilla
Attachment 360490 Details for
Bug 193974
: Change NetworkConnectionToWebProcess* to NetworkConnectionToWebProcess& where possible
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-193974-20190129130644.patch (text/plain), 16.36 KB, created by
Alex Christensen
on 2019-01-29 13:06:44 PST
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Alex Christensen
Created:
2019-01-29 13:06:44 PST
Size:
16.36 KB
patch
obsolete
>Index: Source/WebKit/ChangeLog >=================================================================== >--- Source/WebKit/ChangeLog (revision 240675) >+++ Source/WebKit/ChangeLog (working copy) >@@ -1,3 +1,32 @@ >+2019-01-29 Alex Christensen <achristensen@webkit.org> >+ >+ Change NetworkConnectionToWebProcess* to NetworkConnectionToWebProcess& where possible >+ https://bugs.webkit.org/show_bug.cgi?id=193974 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * NetworkProcess/FileAPI/NetworkBlobRegistry.cpp: >+ (WebKit::NetworkBlobRegistry::registerFileBlobURL): >+ (WebKit::NetworkBlobRegistry::registerBlobURL): >+ (WebKit::NetworkBlobRegistry::registerBlobURLOptionallyFileBacked): >+ (WebKit::NetworkBlobRegistry::registerBlobURLForSlice): >+ (WebKit::NetworkBlobRegistry::unregisterBlobURL): >+ (WebKit::NetworkBlobRegistry::blobSize): >+ (WebKit::NetworkBlobRegistry::connectionToWebProcessDidClose): >+ * NetworkProcess/FileAPI/NetworkBlobRegistry.h: >+ * NetworkProcess/NetworkConnectionToWebProcess.cpp: >+ (WebKit::NetworkConnectionToWebProcess::didClose): >+ (WebKit::NetworkConnectionToWebProcess::registerFileBlobURL): >+ (WebKit::NetworkConnectionToWebProcess::registerBlobURL): >+ (WebKit::NetworkConnectionToWebProcess::registerBlobURLFromURL): >+ (WebKit::NetworkConnectionToWebProcess::registerBlobURLOptionallyFileBacked): >+ (WebKit::NetworkConnectionToWebProcess::registerBlobURLForSlice): >+ (WebKit::NetworkConnectionToWebProcess::unregisterBlobURL): >+ (WebKit::NetworkConnectionToWebProcess::blobSize): >+ * NetworkProcess/NetworkProcess.cpp: >+ (WebKit::NetworkProcess::removeNetworkConnectionToWebProcess): >+ * NetworkProcess/NetworkProcess.h: >+ > 2019-01-29 Chris Dumez <cdumez@apple.com> > > Regression (r240046): [PSON] Spurious changes to [WKWebView url] and [WKWebView loading] after [WKWebView loadRequest] >Index: Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp >=================================================================== >--- Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp (revision 240589) >+++ Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp (working copy) >@@ -248,8 +248,8 @@ void NetworkConnectionToWebProcess::didC > // root activity trackers. > stopAllNetworkActivityTracking(); > >- NetworkBlobRegistry::singleton().connectionToWebProcessDidClose(this); >- m_networkProcess->removeNetworkConnectionToWebProcess(this); >+ NetworkBlobRegistry::singleton().connectionToWebProcessDidClose(*this); >+ m_networkProcess->removeNetworkConnectionToWebProcess(*this); > > #if USE(LIBWEBRTC) > if (m_rtcProvider) { >@@ -494,37 +494,37 @@ void NetworkConnectionToWebProcess::regi > { > RefPtr<SandboxExtension> extension = SandboxExtension::create(WTFMove(extensionHandle)); > >- NetworkBlobRegistry::singleton().registerFileBlobURL(this, url, path, WTFMove(extension), contentType); >+ NetworkBlobRegistry::singleton().registerFileBlobURL(*this, url, path, WTFMove(extension), contentType); > } > > void NetworkConnectionToWebProcess::registerBlobURL(const URL& url, Vector<BlobPart>&& blobParts, const String& contentType) > { >- NetworkBlobRegistry::singleton().registerBlobURL(this, url, WTFMove(blobParts), contentType); >+ NetworkBlobRegistry::singleton().registerBlobURL(*this, url, WTFMove(blobParts), contentType); > } > > void NetworkConnectionToWebProcess::registerBlobURLFromURL(const URL& url, const URL& srcURL, bool shouldBypassConnectionCheck) > { >- NetworkBlobRegistry::singleton().registerBlobURL(this, url, srcURL, shouldBypassConnectionCheck); >+ NetworkBlobRegistry::singleton().registerBlobURL(*this, url, srcURL, shouldBypassConnectionCheck); > } > > void NetworkConnectionToWebProcess::registerBlobURLOptionallyFileBacked(const URL& url, const URL& srcURL, const String& fileBackedPath, const String& contentType) > { >- NetworkBlobRegistry::singleton().registerBlobURLOptionallyFileBacked(this, url, srcURL, fileBackedPath, contentType); >+ NetworkBlobRegistry::singleton().registerBlobURLOptionallyFileBacked(*this, url, srcURL, fileBackedPath, contentType); > } > > void NetworkConnectionToWebProcess::registerBlobURLForSlice(const URL& url, const URL& srcURL, int64_t start, int64_t end) > { >- NetworkBlobRegistry::singleton().registerBlobURLForSlice(this, url, srcURL, start, end); >+ NetworkBlobRegistry::singleton().registerBlobURLForSlice(*this, url, srcURL, start, end); > } > > void NetworkConnectionToWebProcess::unregisterBlobURL(const URL& url) > { >- NetworkBlobRegistry::singleton().unregisterBlobURL(this, url); >+ NetworkBlobRegistry::singleton().unregisterBlobURL(*this, url); > } > > void NetworkConnectionToWebProcess::blobSize(const URL& url, uint64_t& resultSize) > { >- resultSize = NetworkBlobRegistry::singleton().blobSize(this, url); >+ resultSize = NetworkBlobRegistry::singleton().blobSize(*this, url); > } > > void NetworkConnectionToWebProcess::writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, CompletionHandler<void(Vector<String>&&)>&& completionHandler) >Index: Source/WebKit/NetworkProcess/NetworkProcess.cpp >=================================================================== >--- Source/WebKit/NetworkProcess/NetworkProcess.cpp (revision 240589) >+++ Source/WebKit/NetworkProcess/NetworkProcess.cpp (working copy) >@@ -184,9 +184,9 @@ NetworkProximityManager& NetworkProcess: > } > #endif > >-void NetworkProcess::removeNetworkConnectionToWebProcess(NetworkConnectionToWebProcess* connection) >+void NetworkProcess::removeNetworkConnectionToWebProcess(NetworkConnectionToWebProcess& connection) > { >- size_t vectorIndex = m_webProcessConnections.find(connection); >+ size_t vectorIndex = m_webProcessConnections.find(&connection); > ASSERT(vectorIndex != notFound); > > m_webProcessConnections.remove(vectorIndex); >Index: Source/WebKit/NetworkProcess/NetworkProcess.h >=================================================================== >--- Source/WebKit/NetworkProcess/NetworkProcess.h (revision 240589) >+++ Source/WebKit/NetworkProcess/NetworkProcess.h (working copy) >@@ -124,7 +124,7 @@ public: > m_supplements.add(T::supplementName(), std::make_unique<T>(*this)); > } > >- void removeNetworkConnectionToWebProcess(NetworkConnectionToWebProcess*); >+ void removeNetworkConnectionToWebProcess(NetworkConnectionToWebProcess&); > > AuthenticationManager& authenticationManager(); > DownloadManager& downloadManager(); >Index: Source/WebKit/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp >=================================================================== >--- Source/WebKit/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp (revision 240589) >+++ Source/WebKit/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp (working copy) >@@ -48,36 +48,36 @@ NetworkBlobRegistry::NetworkBlobRegistry > { > } > >-void NetworkBlobRegistry::registerFileBlobURL(NetworkConnectionToWebProcess* connection, const URL& url, const String& path, RefPtr<SandboxExtension>&& sandboxExtension, const String& contentType) >+void NetworkBlobRegistry::registerFileBlobURL(NetworkConnectionToWebProcess& connection, const URL& url, const String& path, RefPtr<SandboxExtension>&& sandboxExtension, const String& contentType) > { > blobRegistry().registerFileBlobURL(url, BlobDataFileReferenceWithSandboxExtension::create(path, WTFMove(sandboxExtension)), contentType); > >- ASSERT(!m_blobsForConnection.get(connection).contains(url)); >- BlobForConnectionMap::iterator mapIterator = m_blobsForConnection.find(connection); >+ ASSERT(!m_blobsForConnection.get(&connection).contains(url)); >+ BlobForConnectionMap::iterator mapIterator = m_blobsForConnection.find(&connection); > if (mapIterator == m_blobsForConnection.end()) >- mapIterator = m_blobsForConnection.add(connection, HashSet<URL>()).iterator; >+ mapIterator = m_blobsForConnection.add(&connection, HashSet<URL>()).iterator; > mapIterator->value.add(url); > } > >-void NetworkBlobRegistry::registerBlobURL(NetworkConnectionToWebProcess* connection, const URL& url, Vector<WebCore::BlobPart>&& blobParts, const String& contentType) >+void NetworkBlobRegistry::registerBlobURL(NetworkConnectionToWebProcess& connection, const URL& url, Vector<WebCore::BlobPart>&& blobParts, const String& contentType) > { > blobRegistry().registerBlobURL(url, WTFMove(blobParts), contentType); > >- ASSERT(!m_blobsForConnection.get(connection).contains(url)); >- BlobForConnectionMap::iterator mapIterator = m_blobsForConnection.find(connection); >+ ASSERT(!m_blobsForConnection.get(&connection).contains(url)); >+ BlobForConnectionMap::iterator mapIterator = m_blobsForConnection.find(&connection); > if (mapIterator == m_blobsForConnection.end()) >- mapIterator = m_blobsForConnection.add(connection, HashSet<URL>()).iterator; >+ mapIterator = m_blobsForConnection.add(&connection, HashSet<URL>()).iterator; > mapIterator->value.add(url); > } > >-void NetworkBlobRegistry::registerBlobURL(NetworkConnectionToWebProcess* connection, const URL& url, const URL& srcURL, bool shouldBypassConnectionCheck) >+void NetworkBlobRegistry::registerBlobURL(NetworkConnectionToWebProcess& connection, const URL& url, const URL& srcURL, bool shouldBypassConnectionCheck) > { > // The connection may not be registered if NetworkProcess prevously crashed for any reason. >- BlobForConnectionMap::iterator mapIterator = m_blobsForConnection.find(connection); >+ BlobForConnectionMap::iterator mapIterator = m_blobsForConnection.find(&connection); > if (mapIterator == m_blobsForConnection.end()) { > if (!shouldBypassConnectionCheck) > return; >- mapIterator = m_blobsForConnection.add(connection, HashSet<URL>()).iterator; >+ mapIterator = m_blobsForConnection.add(&connection, HashSet<URL>()).iterator; > } > > blobRegistry().registerBlobURL(url, srcURL); >@@ -86,21 +86,21 @@ void NetworkBlobRegistry::registerBlobUR > mapIterator->value.add(url); > } > >-void NetworkBlobRegistry::registerBlobURLOptionallyFileBacked(NetworkConnectionToWebProcess* connection, const URL& url, const URL& srcURL, const String& fileBackedPath, const String& contentType) >+void NetworkBlobRegistry::registerBlobURLOptionallyFileBacked(NetworkConnectionToWebProcess& connection, const URL& url, const URL& srcURL, const String& fileBackedPath, const String& contentType) > { > blobRegistry().registerBlobURLOptionallyFileBacked(url, srcURL, BlobDataFileReferenceWithSandboxExtension::create(fileBackedPath, nullptr), contentType); > >- ASSERT(!m_blobsForConnection.get(connection).contains(url)); >- BlobForConnectionMap::iterator mapIterator = m_blobsForConnection.find(connection); >+ ASSERT(!m_blobsForConnection.get(&connection).contains(url)); >+ BlobForConnectionMap::iterator mapIterator = m_blobsForConnection.find(&connection); > if (mapIterator == m_blobsForConnection.end()) >- mapIterator = m_blobsForConnection.add(connection, HashSet<URL>()).iterator; >+ mapIterator = m_blobsForConnection.add(&connection, HashSet<URL>()).iterator; > mapIterator->value.add(url); > } > >-void NetworkBlobRegistry::registerBlobURLForSlice(NetworkConnectionToWebProcess* connection, const URL& url, const URL& srcURL, int64_t start, int64_t end) >+void NetworkBlobRegistry::registerBlobURLForSlice(NetworkConnectionToWebProcess& connection, const URL& url, const URL& srcURL, int64_t start, int64_t end) > { > // The connection may not be registered if NetworkProcess prevously crashed for any reason. >- BlobForConnectionMap::iterator mapIterator = m_blobsForConnection.find(connection); >+ BlobForConnectionMap::iterator mapIterator = m_blobsForConnection.find(&connection); > if (mapIterator == m_blobsForConnection.end()) > return; > >@@ -110,10 +110,10 @@ void NetworkBlobRegistry::registerBlobUR > mapIterator->value.add(url); > } > >-void NetworkBlobRegistry::unregisterBlobURL(NetworkConnectionToWebProcess* connection, const URL& url) >+void NetworkBlobRegistry::unregisterBlobURL(NetworkConnectionToWebProcess& connection, const URL& url) > { > // The connection may not be registered if NetworkProcess prevously crashed for any reason. >- BlobForConnectionMap::iterator mapIterator = m_blobsForConnection.find(connection); >+ BlobForConnectionMap::iterator mapIterator = m_blobsForConnection.find(&connection); > if (mapIterator == m_blobsForConnection.end()) > return; > >@@ -122,9 +122,9 @@ void NetworkBlobRegistry::unregisterBlob > mapIterator->value.remove(url); > } > >-uint64_t NetworkBlobRegistry::blobSize(NetworkConnectionToWebProcess* connection, const URL& url) >+uint64_t NetworkBlobRegistry::blobSize(NetworkConnectionToWebProcess& connection, const URL& url) > { >- if (!m_blobsForConnection.contains(connection) || !m_blobsForConnection.find(connection)->value.contains(url)) >+ if (!m_blobsForConnection.contains(&connection) || !m_blobsForConnection.find(&connection)->value.contains(url)) > return 0; > > return blobRegistry().blobSize(url); >@@ -154,16 +154,16 @@ void NetworkBlobRegistry::writeBlobToFil > }); > } > >-void NetworkBlobRegistry::connectionToWebProcessDidClose(NetworkConnectionToWebProcess* connection) >+void NetworkBlobRegistry::connectionToWebProcessDidClose(NetworkConnectionToWebProcess& connection) > { >- if (!m_blobsForConnection.contains(connection)) >+ if (!m_blobsForConnection.contains(&connection)) > return; > >- HashSet<URL>& blobsForConnection = m_blobsForConnection.find(connection)->value; >+ HashSet<URL>& blobsForConnection = m_blobsForConnection.find(&connection)->value; > for (HashSet<URL>::iterator iter = blobsForConnection.begin(), end = blobsForConnection.end(); iter != end; ++iter) > blobRegistry().unregisterBlobURL(*iter); > >- m_blobsForConnection.remove(connection); >+ m_blobsForConnection.remove(&connection); > } > > Vector<RefPtr<BlobDataFileReference>> NetworkBlobRegistry::filesInBlob(NetworkConnectionToWebProcess& connection, const URL& url) >Index: Source/WebKit/NetworkProcess/FileAPI/NetworkBlobRegistry.h >=================================================================== >--- Source/WebKit/NetworkProcess/FileAPI/NetworkBlobRegistry.h (revision 240589) >+++ Source/WebKit/NetworkProcess/FileAPI/NetworkBlobRegistry.h (working copy) >@@ -46,17 +46,17 @@ public: > NetworkBlobRegistry(); > static NetworkBlobRegistry& singleton(); > >- void registerFileBlobURL(NetworkConnectionToWebProcess*, const URL&, const String& path, RefPtr<SandboxExtension>&&, const String& contentType); >- void registerBlobURL(NetworkConnectionToWebProcess*, const URL&, Vector<WebCore::BlobPart>&&, const String& contentType); >- void registerBlobURL(NetworkConnectionToWebProcess*, const URL&, const URL& srcURL, bool shouldBypassConnectionCheck); >- void registerBlobURLOptionallyFileBacked(NetworkConnectionToWebProcess*, const URL&, const URL& srcURL, const String& fileBackedPath, const String& contentType); >- void registerBlobURLForSlice(NetworkConnectionToWebProcess*, const URL&, const URL& srcURL, int64_t start, int64_t end); >- void unregisterBlobURL(NetworkConnectionToWebProcess*, const URL&); >- uint64_t blobSize(NetworkConnectionToWebProcess*, const URL&); >+ void registerFileBlobURL(NetworkConnectionToWebProcess&, const URL&, const String& path, RefPtr<SandboxExtension>&&, const String& contentType); >+ void registerBlobURL(NetworkConnectionToWebProcess&, const URL&, Vector<WebCore::BlobPart>&&, const String& contentType); >+ void registerBlobURL(NetworkConnectionToWebProcess&, const URL&, const URL& srcURL, bool shouldBypassConnectionCheck); >+ void registerBlobURLOptionallyFileBacked(NetworkConnectionToWebProcess&, const URL&, const URL& srcURL, const String& fileBackedPath, const String& contentType); >+ void registerBlobURLForSlice(NetworkConnectionToWebProcess&, const URL&, const URL& srcURL, int64_t start, int64_t end); >+ void unregisterBlobURL(NetworkConnectionToWebProcess&, const URL&); >+ uint64_t blobSize(NetworkConnectionToWebProcess&, const URL&); > void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, CompletionHandler<void(Vector<String>&&)>&&); > void writeBlobToFilePath(const URL& blobURL, const String& path, CompletionHandler<void(bool success)>&&); > >- void connectionToWebProcessDidClose(NetworkConnectionToWebProcess*); >+ void connectionToWebProcessDidClose(NetworkConnectionToWebProcess&); > > Vector<RefPtr<WebCore::BlobDataFileReference>> filesInBlob(NetworkConnectionToWebProcess&, const URL&); > Vector<RefPtr<WebCore::BlobDataFileReference>> filesInBlob(const URL&);
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
thorton
:
review+
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 193974
: 360490