Changeset 169998 in webkit

Timestamp:

Jun 15, 2014 8:23:55 PM (10 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/17291697> [Cocoa] Can’t tell at policy decision time whether WebKit can handle the request
​https://bugs.webkit.org/show_bug.cgi?id=133930

Reviewed by Sam Weinig.

• Shared/NavigationActionData.cpp:

(WebKit::NavigationActionData::NavigationActionData): Initialize new member canHandleRequest
to false.
(WebKit::NavigationActionData::encode): Encode canHandleRequest.
(WebKit::NavigationActionData::decode): Decode it.

• Shared/NavigationActionData.h: Declared new boolean member canHandleRequest.

• UIProcess/API/Cocoa/WKNavigationAction.mm:

(-[WKNavigationAction _initWithNavigationActionData:]): Set new ivar _canHandleRequest from
the action data.
(-[WKNavigationAction _canHandleRequest]): Added this getter.

• UIProcess/API/Cocoa/WKNavigationActionPrivate.h: Declared new property _canHandleRequest.

• WebProcess/WebCoreSupport/WebChromeClient.cpp:

(WebKit::WebChromeClient::createWindow): Set canHandleRequest in the NavigationActionData.

• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:

(WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNewWindowAction): Ditto.
(WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction): Ditto.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/NavigationActionData.cpp (modified) (3 diffs)
• Shared/NavigationActionData.h (modified) (1 diff)
• UIProcess/API/Cocoa/WKNavigationAction.mm (modified) (4 diffs)
• UIProcess/API/Cocoa/WKNavigationActionPrivate.h (modified) (1 diff)
• WebProcess/WebCoreSupport/WebChromeClient.cpp (modified) (1 diff)
• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-06-15  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/17291697> [Cocoa] Can’t tell at policy decision time whether WebKit can handle the request
+        https://bugs.webkit.org/show_bug.cgi?id=133930
+
+        Reviewed by Sam Weinig.
+
+        * Shared/NavigationActionData.cpp:
+        (WebKit::NavigationActionData::NavigationActionData): Initialize new member canHandleRequest
+        to false.
+        (WebKit::NavigationActionData::encode): Encode canHandleRequest.
+        (WebKit::NavigationActionData::decode): Decode it.
+        * Shared/NavigationActionData.h: Declared new boolean member canHandleRequest.
+
+        * UIProcess/API/Cocoa/WKNavigationAction.mm:
+        (-[WKNavigationAction _initWithNavigationActionData:]): Set new ivar _canHandleRequest from
+        the action data.
+        (-[WKNavigationAction _canHandleRequest]): Added this getter.
+        * UIProcess/API/Cocoa/WKNavigationActionPrivate.h: Declared new property _canHandleRequest.
+
+        * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+        (WebKit::WebChromeClient::createWindow): Set canHandleRequest in the NavigationActionData.
+
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNewWindowAction): Ditto.
+        (WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction): Ditto.
+
 2014-06-15  Ryuan Choi  <ryuan.choi@samsung.com>
 

trunk/Source/WebKit2/Shared/NavigationActionData.cpp

@@ -39 +39 @@
     , mouseButton(WebMouseEvent::NoButton)
     , isProcessingUserGesture(false)
+    , canHandleRequest(false)
 {
 }
@@ -48 +49 @@
     encoder.encodeEnum(mouseButton);
     encoder << isProcessingUserGesture;
+    encoder << canHandleRequest;
 }
 
@@ -60 +62 @@
     if (!decoder.decode(result.isProcessingUserGesture))
         return false;
+    if (!decoder.decode(result.canHandleRequest))
+        return false;
 
     return true;

trunk/Source/WebKit2/Shared/NavigationActionData.h

@@ -47 +47 @@
     WebMouseEvent::Button mouseButton;
     bool isProcessingUserGesture;
+    bool canHandleRequest;
 };
 

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

@@ -38 +38 @@
     RetainPtr<NSURL> _originalURL;
     BOOL _userInitiated;
+    BOOL _canHandleRequest;
 }
 
@@ -116 +117 @@
 
     _userInitiated = navigationActionData.isProcessingUserGesture;
+    _canHandleRequest = navigationActionData.canHandleRequest;
 
     return self;
@@ -166 +168 @@
 }
 
+@end
+
+@implementation WKNavigationAction (WKPrivate)
+
 - (BOOL)_isUserInitiated
 {
@@ -171 +177 @@
 }
 
+- (BOOL)_canHandleRequest
+{
+    return _canHandleRequest;
+}
+
 @end
 

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

@@ -32 +32 @@
 @property (nonatomic, readonly) NSURL *_originalURL;
 @property (nonatomic, readonly, getter=_isUserInitiated) BOOL _userInitiated;
+@property (nonatomic, readonly) BOOL _canHandleRequest;
 
 @end

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp

@@ -211 +211 @@
     navigationActionData.mouseButton = InjectedBundleNavigationAction::mouseButtonForNavigationAction(navigationAction);
     navigationActionData.isProcessingUserGesture = navigationAction.processingUserGesture();
+    navigationActionData.canHandleRequest = m_page->canHandleRequest(request.resourceRequest());
 
     uint64_t newPageID = 0;

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

@@ -700 +700 @@
     navigationActionData.mouseButton = action->mouseButton();
     navigationActionData.isProcessingUserGesture = navigationAction.processingUserGesture();
+    navigationActionData.canHandleRequest = webPage->canHandleRequest(request);
 
     webPage->send(Messages::WebPageProxy::DecidePolicyForNewWindowAction(m_frame->frameID(), navigationActionData, request, frameName, listenerID, InjectedBundleUserMessageEncoder(userData.get())));
@@ -759 +760 @@
     navigationActionData.mouseButton = action->mouseButton();
     navigationActionData.isProcessingUserGesture = navigationAction.processingUserGesture();
+    navigationActionData.canHandleRequest = webPage->canHandleRequest(request);
 
     // Notify the UIProcess.