Changeset 166900 in webkit

Timestamp:

Apr 7, 2014, 5:39:55 PM (11 years ago)

Author:

mitz@apple.com

Message:

Add bundle client function corresponding to startAssistingNode
​https://bugs.webkit.org/show_bug.cgi?id=131332

Reviewed by Anders Carlsson.

• UIProcess/PageClient.h: Added userData parameter to startAssistingNode.

• UIProcess/WebPageProxy.h: Added message decoder parameter to startAssistingNode.
• UIProcess/WebPageProxy.messages.in: Added message decoder parameter to StartAssistingNode.

• UIProcess/ios/PageClientImplIOS.h: Updated startAssistingNode override.
• UIProcess/ios/PageClientImplIOS.mm:

(WebKit::PageClientImpl::startAssistingNode): Decode the user data into an NSObject and pass
it on to the content view.

• UIProcess/ios/WKContentViewInteraction.h: Added userObject parameter to

-_startAssitingNode:.

• UIProcess/ios/WKContentViewInteraction.mm:

(-[WKContentView _startAssistingNode:userObject:]): Added userObject parameter. We will pass
it to a future delegate method.

• UIProcess/ios/WebPageProxyIOS.mm:

(WebKit::WebPageProxy::startAssistingNode): Decode the user data and pass it to the client.

• WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFormDelegatePrivate.h: Declared new

delegate method.

• WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm:

(-[WKWebProcessPlugInBrowserContextController _setFormDelegate:]): Added an implementation
of API::InjectedBundle::FormClient::willBeginInputSession which calls the new delegate
method, and encodes the user object into userData.

• WebProcess/InjectedBundle/APIInjectedBundleFormClient.h:

(API::InjectedBundle::FormClient::willBeginInputSession): Added willBeginInputSession.

• WebProcess/WebPage/ios/WebPageIOS.mm:

(WebKit::WebPage::elementDidFocus): Call willBeginInputSession and send the user data along
with the StartAssistingNode message to the UI process.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/PageClient.h (modified) (1 diff)
• UIProcess/WebPageProxy.h (modified) (1 diff)
• UIProcess/WebPageProxy.messages.in (modified) (1 diff)
• UIProcess/ios/PageClientImplIOS.h (modified) (1 diff)
• UIProcess/ios/PageClientImplIOS.mm (modified) (4 diffs)
• UIProcess/ios/WKContentViewInteraction.h (modified) (1 diff)
• UIProcess/ios/WKContentViewInteraction.mm (modified) (1 diff)
• UIProcess/ios/WebPageProxyIOS.mm (modified) (2 diffs)
• WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFormDelegatePrivate.h (modified) (1 diff)
• WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm (modified) (2 diffs)
• WebProcess/InjectedBundle/APIInjectedBundleFormClient.h (modified) (1 diff)
• WebProcess/WebPage/ios/WebPageIOS.mm (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-04-07  Dan Bernstein  <mitz@apple.com>
+
+        Add bundle client function corresponding to startAssistingNode
+        https://bugs.webkit.org/show_bug.cgi?id=131332
+
+        Reviewed by Anders Carlsson.
+
+        * UIProcess/PageClient.h: Added userData parameter to startAssistingNode.
+
+        * UIProcess/WebPageProxy.h: Added message decoder parameter to startAssistingNode.
+        * UIProcess/WebPageProxy.messages.in: Added message decoder parameter to StartAssistingNode.
+
+        * UIProcess/ios/PageClientImplIOS.h: Updated startAssistingNode override.
+        * UIProcess/ios/PageClientImplIOS.mm:
+        (WebKit::PageClientImpl::startAssistingNode): Decode the user data into an NSObject and pass
+        it on to the content view.
+
+        * UIProcess/ios/WKContentViewInteraction.h: Added userObject parameter to
+        -_startAssitingNode:.
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView _startAssistingNode:userObject:]): Added userObject parameter. We will pass
+        it to a future delegate method.
+
+        * UIProcess/ios/WebPageProxyIOS.mm:
+        (WebKit::WebPageProxy::startAssistingNode): Decode the user data and pass it to the client.
+
+        * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFormDelegatePrivate.h: Declared new
+        delegate method.
+        * WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm:
+        (-[WKWebProcessPlugInBrowserContextController _setFormDelegate:]): Added an implementation
+        of API::InjectedBundle::FormClient::willBeginInputSession which calls the new delegate
+        method, and encodes the user object into userData.
+
+        * WebProcess/InjectedBundle/APIInjectedBundleFormClient.h:
+        (API::InjectedBundle::FormClient::willBeginInputSession): Added willBeginInputSession.
+
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        (WebKit::WebPage::elementDidFocus): Call willBeginInputSession and send the user data along
+        with the StartAssistingNode message to the UI process.
+
 2014-04-07  Jinwoo Song  <jinwoo7.song@samsung.com>
 

trunk/Source/WebKit2/UIProcess/PageClient.h

@@ -241 +241 @@
     virtual void didCommitLayerTree(const RemoteLayerTreeTransaction&) = 0;
 
-    virtual void startAssistingNode(const AssistedNodeInformation&) = 0;
+    virtual void startAssistingNode(const AssistedNodeInformation&, API::Object* userData) = 0;
     virtual void stopAssistingNode() = 0;
     virtual void selectionDidChange() = 0;

trunk/Source/WebKit2/UIProcess/WebPageProxy.h

@@ -1336 +1336 @@
     void didGetTapHighlightGeometries(uint64_t requestID, const WebCore::Color& color, const Vector<WebCore::FloatQuad>& geometries, const WebCore::IntSize& topLeftRadius, const WebCore::IntSize& topRightRadius, const WebCore::IntSize& bottomLeftRadius, const WebCore::IntSize& bottomRightRadius);
 
-    void startAssistingNode(const AssistedNodeInformation&);
+    void startAssistingNode(const AssistedNodeInformation&, IPC::MessageDecoder&);
     void stopAssistingNode();
 

trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in

@@ -319 +319 @@
     DidGetTapHighlightGeometries(uint64_t requestID, WebCore::Color color, Vector<WebCore::FloatQuad> geometries, WebCore::IntSize topLeftRadius, WebCore::IntSize topRightRadius, WebCore::IntSize bottomLeftRadius, WebCore::IntSize bottomRightRadius)
 
-    StartAssistingNode(WebKit::AssistedNodeInformation information)
+    StartAssistingNode(WebKit::AssistedNodeInformation information, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
     StopAssistingNode()
     NotifyRevealedSelection()

trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h

@@ -108 +108 @@
     virtual void didCommitLayerTree(const RemoteLayerTreeTransaction&) override;
 
-    virtual void startAssistingNode(const AssistedNodeInformation&) override;
+    virtual void startAssistingNode(const AssistedNodeInformation&, API::Object* userData) override;
     virtual void stopAssistingNode() override;
     virtual void selectionDidChange() override;

trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm

@@ -29 +29 @@
 #if PLATFORM(IOS)
 
-#import "_WKDownloadInternal.h"
+#import "APIData.h"
 #import "DataReference.h"
 #import "DownloadProxy.h"
@@ -40 +40 @@
 #import "WebContextMenuProxy.h"
 #import "WebEditCommandProxy.h"
+#import "WebProcessProxy.h"
+#import "_WKDownloadInternal.h"
 #import <UIKit/UIImagePickerController_Private.h>
 #import <UIKit/UIWebTouchEventsGestureRecognizer.h>
@@ -46 +48 @@
 #import <WebCore/SharedBuffer.h>
 
+#define MESSAGE_CHECK(assertion) MESSAGE_CHECK_BASE(assertion, m_webView->_page->process().connection())
+
 @interface UIView (IPI)
 - (UIScrollView *)_scroller;
@@ -359 +363 @@
 }
 
-void PageClientImpl::startAssistingNode(const AssistedNodeInformation& nodeInformation)
-{
-    [m_contentView _startAssistingNode:nodeInformation];
+void PageClientImpl::startAssistingNode(const AssistedNodeInformation& nodeInformation, API::Object* userData)
+{
+    MESSAGE_CHECK(!userData || userData->type() == API::Object::Type::Data);
+
+    NSObject <NSSecureCoding> *userObject = nil;
+    if (API::Data* data = static_cast<API::Data*>(userData)) {
+        auto nsData = adoptNS([[NSData alloc] initWithBytesNoCopy:const_cast<void*>(static_cast<const void*>(data->bytes())) length:data->size() freeWhenDone:NO]);
+        auto unarchiver = adoptNS([[NSKeyedUnarchiver alloc] initForReadingWithData:nsData.get()]);
+        [unarchiver setRequiresSecureCoding:YES];
+        @try {
+            userObject = [unarchiver decodeObjectOfClass:[NSObject class] forKey:@"userObject"];
+        } @catch (NSException *exception) {
+            LOG_ERROR("Failed to decode user data: %@", exception);
+        }
+    }
+
+    [m_contentView _startAssistingNode:nodeInformation userObject:userObject];
 }
 

trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h

@@ -130 +130 @@
 - (void)_didGetTapHighlightForRequest:(uint64_t)requestID color:(const WebCore::Color&)color quads:(const Vector<WebCore::FloatQuad>&)highlightedQuads topLeftRadius:(const WebCore::IntSize&)topLeftRadius topRightRadius:(const WebCore::IntSize&)topRightRadius bottomLeftRadius:(const WebCore::IntSize&)bottomLeftRadius bottomRightRadius:(const WebCore::IntSize&)bottomRightRadius;
 
-- (void)_startAssistingNode:(const WebKit::AssistedNodeInformation&)information;
+- (void)_startAssistingNode:(const WebKit::AssistedNodeInformation&)information userObject:(NSObject <NSSecureCoding> *)userObject;
 - (void)_stopAssistingNode;
 - (void)_selectionChanged;

trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm

@@ -1875 +1875 @@
 }
 
-- (void)_startAssistingNode:(const AssistedNodeInformation&)information
+- (void)_startAssistingNode:(const AssistedNodeInformation&)information userObject:(NSObject <NSSecureCoding> *)userObject
 {
     _isEditable = YES;

trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm

@@ -36 +36 @@
 #import "ViewUpdateDispatcherMessages.h"
 #import "WKBrowsingContextControllerInternal.h"
+#import "WebContextUserMessageCoders.h"
 #import "WebKitSystemInterfaceIOS.h"
 #import "WebPageMessages.h"
@@ -463 +464 @@
 }
 
-void WebPageProxy::startAssistingNode(const AssistedNodeInformation& information)
-{
-    m_pageClient.startAssistingNode(information);
+void WebPageProxy::startAssistingNode(const AssistedNodeInformation& information, IPC::MessageDecoder& decoder)
+{
+    RefPtr<API::Object> userData;
+    WebContextUserMessageDecoder messageDecoder(userData, process());
+    if (!decoder.decode(messageDecoder))
+        return;
+
+    m_pageClient.startAssistingNode(information, userData.get());
 }
 

trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFormDelegatePrivate.h

@@ -38 +38 @@
 - (void)_webProcessPlugInBrowserContextController:(WKWebProcessPlugInBrowserContextController *)controller didFocusTextField:(WKWebProcessPlugInNodeHandle *)textField inFrame:(WKWebProcessPlugInFrame *)frame;
 - (void)_webProcessPlugInBrowserContextController:(WKWebProcessPlugInBrowserContextController *)controller willSubmitForm:(WKWebProcessPlugInNodeHandle *)form toFrame:(WKWebProcessPlugInFrame *)frame fromFrame:(WKWebProcessPlugInFrame *)sourceFrame withValues:(NSDictionary *)values;
+- (NSObject <NSSecureCoding> *)_webProcessPlugInBrowserContextController:(WKWebProcessPlugInBrowserContextController *)controller willBeginInputSessionForElement:(WKWebProcessPlugInNodeHandle *)node inFrame:(WKWebProcessPlugInFrame *)frame;
 
 @end

trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm

@@ -29 +29 @@
 #if WK_API_ENABLED
 
+#import "APIData.h"
 #import "RemoteObjectRegistry.h"
 #import "RemoteObjectRegistryMessages.h"
@@ -406 +407 @@
         }
 
+        static void releaseNSData(unsigned char*, const void* untypedData)
+        {
+            [(NSData *)untypedData release];
+        }
+
+        virtual void willBeginInputSession(WebPage*, Element* element, WebFrame* frame, RefPtr<API::Object>& userData) override
+        {
+            auto formDelegate = m_controller->_formDelegate.get();
+
+            if (![formDelegate respondsToSelector:@selector(_webProcessPlugInBrowserContextController:willBeginInputSessionForElement:inFrame:)])
+                return;
+
+            NSObject <NSSecureCoding> *userObject = [formDelegate _webProcessPlugInBrowserContextController:m_controller willBeginInputSessionForElement:wrapper(*WebKit::InjectedBundleNodeHandle::getOrCreate(element)) inFrame:wrapper(*frame)];
+            if (!userObject)
+                return;
+
+            auto data = adoptNS([[NSMutableData alloc] init]);
+            auto archiver = adoptNS([[NSKeyedArchiver alloc] initForWritingWithMutableData:data.get()]);
+            [archiver setRequiresSecureCoding:YES];
+            @try {
+                [archiver encodeObject:userObject forKey:@"userObject"];
+            } @catch (NSException *exception) {
+                LOG_ERROR("Failed to encode user object: %@", exception);
+                return;
+            }
+            [archiver finishEncoding];
+
+            userData = API::Data::createWithoutCopying((const unsigned char*)[data bytes], [data length], releaseNSData, data.leakRef()).leakRef();
+        }
+
     private:
         WKWebProcessPlugInBrowserContextController *m_controller;

trunk/Source/WebKit2/WebProcess/InjectedBundle/APIInjectedBundleFormClient.h

@@ -73 +73 @@
     virtual void didAssociateFormControls(WebKit::WebPage*, const Vector<RefPtr<WebCore::Element>>&) { }
     virtual bool shouldNotifyOnFormChanges(WebKit::WebPage*) { return false; }
+    virtual void willBeginInputSession(WebKit::WebPage*, WebCore::Element*, WebKit::WebFrame*, RefPtr<API::Object>& userData) { UNUSED_PARAM(userData); }
 };
 

trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm

@@ -34 +34 @@
 #import "EditorState.h"
 #import "GestureTypes.h"
+#import "InjectedBundleUserMessageCoders.h"
 #import "InteractionInformationAtPosition.h"
 #import "LayerTreeHost.h"
@@ -1686 +1687 @@
         AssistedNodeInformation information;
         getAssistedNodeInformation(information);
-        send(Messages::WebPageProxy::StartAssistingNode(information));
+        RefPtr<API::Object> userData;
+        m_formClient->willBeginInputSession(this, toElement(node), WebFrame::fromCoreFrame(*node->document().frame()), userData);
+        send(Messages::WebPageProxy::StartAssistingNode(information, InjectedBundleUserMessageEncoder(userData.get())));
     }
 }