Diff
Modified: trunk/Source/WebKit/ChangeLog (240686 => 240687)
--- trunk/Source/WebKit/ChangeLog 2019-01-29 23:10:46 UTC (rev 240686)
+++ trunk/Source/WebKit/ChangeLog 2019-01-30 00:02:46 UTC (rev 240687)
@@ -1,3 +1,27 @@
+2019-01-29 Alex Christensen <[email protected]>
+
+ Remove unused NetworkProcessProxy::writeBlobToFilePath
+ https://bugs.webkit.org/show_bug.cgi?id=193990
+
+ Reviewed by Wenson Hsieh.
+
+ This code was only used in code that was introduced in r235202
+ but that has since been refactored to not use blobs. Its tests still pass.
+ This removes the only UIProcess-controlled code that uses NetworkBlobRegistry::singleton.
+
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::writeBlobToFilePath): Deleted.
+ * NetworkProcess/NetworkProcess.h:
+ * NetworkProcess/NetworkProcess.messages.in:
+ * UIProcess/Cocoa/WebViewImpl.mm:
+ (WebKit::WebViewImpl::writeToURLForFilePromiseProvider):
+ * UIProcess/Network/NetworkProcessProxy.cpp:
+ (WebKit::NetworkProcessProxy::writeBlobToFilePath): Deleted.
+ * UIProcess/Network/NetworkProcessProxy.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::writeBlobToFilePath): Deleted.
+ * UIProcess/WebPageProxy.h:
+
2019-01-29 Devin Rousso <[email protected]>
Web Inspector: expose a way of determining if a detached frontend is for a remote target
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp (240686 => 240687)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2019-01-29 23:10:46 UTC (rev 240686)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2019-01-30 00:02:46 UTC (rev 240687)
@@ -559,21 +559,6 @@
#endif
}
-void NetworkProcess::writeBlobToFilePath(const URL& url, const String& path, SandboxExtension::Handle&& handleForWriting, CompletionHandler<void(bool)>&& completionHandler)
-{
- auto extension = SandboxExtension::create(WTFMove(handleForWriting));
- if (!extension) {
- completionHandler(false);
- return;
- }
-
- extension->consume();
- NetworkBlobRegistry::singleton().writeBlobToFilePath(url, path, [extension = WTFMove(extension), completionHandler = WTFMove(completionHandler)] (bool success) mutable {
- extension->revoke();
- completionHandler(success);
- });
-}
-
#if ENABLE(RESOURCE_LOAD_STATISTICS)
void NetworkProcess::dumpResourceLoadStatistics(PAL::SessionID sessionID, CompletionHandler<void(String)>&& completionHandler)
{
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.h (240686 => 240687)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2019-01-29 23:10:46 UTC (rev 240686)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2019-01-30 00:02:46 UTC (rev 240687)
@@ -365,8 +365,6 @@
void syncAllCookies();
void didSyncAllCookies();
- void writeBlobToFilePath(const URL&, const String& path, SandboxExtension::Handle&&, CompletionHandler<void(bool)>&&);
-
#if USE(SOUP)
void setIgnoreTLSErrors(bool);
void userPreferredLanguagesChanged(const Vector<String>&);
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.messages.in (240686 => 240687)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.messages.in 2019-01-29 23:10:46 UTC (rev 240686)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.messages.in 2019-01-30 00:02:46 UTC (rev 240687)
@@ -80,8 +80,6 @@
CancelPrepareToSuspend()
ProcessDidResume()
- WriteBlobToFilePath(URL blobURL, String path, WebKit::SandboxExtension::Handle handle) -> (bool success) Async
-
PreconnectTo(URL url, enum:bool WebCore::StoredCredentialsPolicy storedCredentialsPolicy);
#if ENABLE(RESOURCE_LOAD_STATISTICS)
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm (240686 => 240687)
--- trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm 2019-01-29 23:10:46 UTC (rev 240686)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm 2019-01-30 00:02:46 UTC (rev 240687)
@@ -4093,9 +4093,7 @@
return;
}
- m_page->writeBlobToFilePath(blobURL, fileURL.path, [protectedCompletionHandler = makeBlockPtr(completionHandler)] (bool success) {
- protectedCompletionHandler(success ? nil : webKitUnknownError());
- });
+ completionHandler(webKitUnknownError());
}
NSDragOperation WebViewImpl::dragSourceOperationMask(NSDraggingSession *, NSDraggingContext context)
Modified: trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp (240686 => 240687)
--- trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp 2019-01-29 23:10:46 UTC (rev 240686)
+++ trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp 2019-01-30 00:02:46 UTC (rev 240687)
@@ -947,18 +947,6 @@
send(Messages::NetworkProcess::ProcessDidResume(), 0);
}
-void NetworkProcessProxy::writeBlobToFilePath(const URL& url, const String& path, CompletionHandler<void(bool)>&& completionHandler)
-{
- if (!canSendMessage()) {
- completionHandler(false);
- return;
- }
-
- SandboxExtension::Handle handleForWriting;
- SandboxExtension::createHandle(path, SandboxExtension::Type::ReadWrite, handleForWriting);
- sendWithAsyncReply(Messages::NetworkProcess::WriteBlobToFilePath(url, path, handleForWriting), WTFMove(completionHandler));
-}
-
void NetworkProcessProxy::processReadyToSuspend()
{
m_throttler.processReadyToSuspend();
Modified: trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h (240686 => 240687)
--- trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h 2019-01-29 23:10:46 UTC (rev 240686)
+++ trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h 2019-01-30 00:02:46 UTC (rev 240687)
@@ -130,8 +130,6 @@
void resetCacheMaxAgeCapForPrevalentResources(PAL::SessionID, CompletionHandler<void()>&&);
#endif
- void writeBlobToFilePath(const URL&, const String& path, CompletionHandler<void(bool)>&&);
-
void processReadyToSuspend();
void sendProcessDidTransitionToForeground();
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (240686 => 240687)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2019-01-29 23:10:46 UTC (rev 240686)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2019-01-30 00:02:46 UTC (rev 240687)
@@ -8456,16 +8456,6 @@
#endif // ENABLE(ATTACHMENT_ELEMENT)
-void WebPageProxy::writeBlobToFilePath(const URL& url, const String& path, Function<void(bool success)>&& callback)
-{
- if (!isValid()) {
- callback(false);
- return;
- }
-
- m_process->processPool().ensureNetworkProcess().writeBlobToFilePath(url, path, WTFMove(callback));
-}
-
#if ENABLE(APPLICATION_MANIFEST)
void WebPageProxy::getApplicationManifest(Function<void(const Optional<WebCore::ApplicationManifest>&, CallbackBase::Error)>&& callbackFunction)
{
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.h (240686 => 240687)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.h 2019-01-29 23:10:46 UTC (rev 240686)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.h 2019-01-30 00:02:46 UTC (rev 240687)
@@ -1403,8 +1403,6 @@
void getApplicationManifest(Function<void(const Optional<WebCore::ApplicationManifest>&, CallbackBase::Error)>&&);
#endif
- void writeBlobToFilePath(const URL& blobURL, const String& path, Function<void(bool success)>&&);
-
WebPreferencesStore preferencesStore() const;
void setDefersLoadingForTesting(bool);
Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (240686 => 240687)
--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2019-01-29 23:10:46 UTC (rev 240686)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2019-01-30 00:02:46 UTC (rev 240687)
@@ -5786,14 +5786,6 @@
callback(destinationURL, nil);
else
callback(nil, fileWrapperError);
- } else if (!info.blobURL.isEmpty()) {
- RELEASE_LOG(DragAndDrop, "Drag session: %p delivering promised blob at path: %@", session.get(), destinationURL.path);
- strongSelf->_page->writeBlobToFilePath(info.blobURL, destinationURL.path, [protectedURL = retainPtr(destinationURL), protectedCallback = makeBlockPtr(callback)] (bool success) {
- if (success)
- protectedCallback(protectedURL.get(), nil);
- else
- protectedCallback(nil, [NSError errorWithDomain:WKErrorDomain code:WKErrorUnknown userInfo:nil]);
- });
} else
callback(nil, [NSError errorWithDomain:WKErrorDomain code:WKErrorWebViewInvalidated userInfo:nil]);
