Changeset 240687 in webkit

Timestamp:

Jan 29, 2019, 4:02:46 PM (6 years ago)

Author:

achristensen@apple.com

Message:

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:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkProcess.cpp (modified) (1 diff)
• NetworkProcess/NetworkProcess.h (modified) (1 diff)
• NetworkProcess/NetworkProcess.messages.in (modified) (1 diff)
• UIProcess/Cocoa/WebViewImpl.mm (modified) (1 diff)
• UIProcess/Network/NetworkProcessProxy.cpp (modified) (1 diff)
• UIProcess/Network/NetworkProcessProxy.h (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (1 diff)
• UIProcess/WebPageProxy.h (modified) (1 diff)
• UIProcess/ios/WKContentViewInteraction.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog ¶

@@ +1 @@
+2019-01-29  Alex Christensen  <achristensen@webkit.org>
+
+        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  <drousso@apple.com>
 

trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp ¶

@@ -560 +560 @@
 }
 
-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)

trunk/Source/WebKit/NetworkProcess/NetworkProcess.h ¶

@@ -366 +366 @@
     void didSyncAllCookies();
 
-    void writeBlobToFilePath(const URL&, const String& path, SandboxExtension::Handle&&, CompletionHandler<void(bool)>&&);
-
 #if USE(SOUP)
     void setIgnoreTLSErrors(bool);

trunk/Source/WebKit/NetworkProcess/NetworkProcess.messages.in ¶

@@ -80 +80 @@
     CancelPrepareToSuspend()
     ProcessDidResume()
-
-    WriteBlobToFilePath(URL blobURL, String path, WebKit::SandboxExtension::Handle handle) -> (bool success) Async
 
     PreconnectTo(URL url, enum:bool WebCore::StoredCredentialsPolicy storedCredentialsPolicy);

trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm ¶

@@ -4094 +4094 @@
     }
 
-    m_page->writeBlobToFilePath(blobURL, fileURL.path, [protectedCompletionHandler = makeBlockPtr(completionHandler)] (bool success) {
-        protectedCompletionHandler(success ? nil : webKitUnknownError());
-    });
+    completionHandler(webKitUnknownError());
 }
 

trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp ¶

@@ -948 +948 @@
 }
 
-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()
 {

trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h ¶

@@ -131 +131 @@
 #endif
 
-    void writeBlobToFilePath(const URL&, const String& path, CompletionHandler<void(bool)>&&);
-
     void processReadyToSuspend();
     

trunk/Source/WebKit/UIProcess/WebPageProxy.cpp ¶

@@ -8457 +8457 @@
 #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)

trunk/Source/WebKit/UIProcess/WebPageProxy.h ¶

@@ -1404 +1404 @@
 #endif
 
-    void writeBlobToFilePath(const URL& blobURL, const String& path, Function<void(bool success)>&&);
-
     WebPreferencesStore preferencesStore() const;
 

trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm ¶

@@ -5787 +5787 @@
             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]);