Changeset 170222 in webkit

Timestamp:

Jun 20, 2014 4:37:38 PM (10 years ago)

Author:

mitz@apple.com

Message:

[Cocoa] No way to get the main frame’s main resource’s data
​https://bugs.webkit.org/show_bug.cgi?id=134113

Reviewed by Sam Weinig.

• UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView _getMainResourceDataWithCompletionHandler:]): Added. Calls
WebPageProxy::getMainResourceDataOfFrame and invokes the completion handler form the
callback.

• UIProcess/API/Cocoa/WKWebViewPrivate.h: Declared new method.

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::getMainResourceDataOfFrame): Made it safe to pass a NULL frame into
this function.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebView.mm (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebViewPrivate.h (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-06-20  Dan Bernstein  <mitz@apple.com>
+
+        [Cocoa] No way to get the main frame’s main resource’s data
+        https://bugs.webkit.org/show_bug.cgi?id=134113
+
+        Reviewed by Sam Weinig.
+
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView _getMainResourceDataWithCompletionHandler:]): Added. Calls
+        WebPageProxy::getMainResourceDataOfFrame and invokes the completion handler form the
+        callback.
+        * UIProcess/API/Cocoa/WKWebViewPrivate.h: Declared new method.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::getMainResourceDataOfFrame): Made it safe to pass a NULL frame into
+        this function.
+
 2014-06-20  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm

@@ -1520 +1520 @@
 }
 
+- (void)_getMainResourceDataWithCompletionHandler:(void (^)(NSData *, NSError *))completionHandler
+{
+    auto handler = adoptNS([completionHandler copy]);
+
+    _page->getMainResourceDataOfFrame(_page->mainFrame(), [handler](API::Data* data, WebKit::CallbackBase::Error error) {
+        void (^completionHandlerBlock)(NSData *, NSError *) = (void (^)(NSData *, NSError *))handler.get();
+        if (error != WebKit::CallbackBase::Error::None) {
+            // FIXME: Pipe a proper error in from the WebPageProxy.
+            RetainPtr<NSError> error = adoptNS([[NSError alloc] init]);
+            completionHandlerBlock(nil, error.get());
+        } else
+            completionHandlerBlock(wrapper(*data), nil);
+    });
+}
+
 - (void)_getWebArchiveDataWithCompletionHandler:(void (^)(NSData *, NSError *))completionHandler
 {

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h

@@ -152 +152 @@
 #endif
 
+- (void)_getMainResourceDataWithCompletionHandler:(void (^)(NSData *, NSError *))completionHandler;
 - (void)_getWebArchiveDataWithCompletionHandler:(void (^)(NSData *, NSError *))completionHandler;
 

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -2298 +2298 @@
 {
     RefPtr<DataCallback> callback = DataCallback::create(std::move(callbackFunction));
-    if (!isValid()) {
+    if (!isValid() || !frame) {
         callback->invalidate();
         return;