Changeset 196667 in webkit

Timestamp:

Feb 16, 2016 3:45:27 PM (8 years ago)

Author:

BJ Burg

Message:

RemoteInspector should forward new automation session requests to its client
​https://bugs.webkit.org/show_bug.cgi?id=154260
<rdar://problem/24663313>

Reviewed by Timothy Hatcher.

• inspector/remote/RemoteInspector.h:
• inspector/remote/RemoteInspector.mm:

(Inspector::RemoteInspector::xpcConnectionReceivedMessage):
(Inspector::RemoteInspector::listingForAutomationTarget):
Use the correct key for the session identifier in the listing. The name()
override for RemoteAutomationTarget is actually the session identifier.

(Inspector::RemoteInspector::receivedAutomationSessionRequestMessage):

• inspector/remote/RemoteInspectorConstants.h: Add new constants.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/remote/RemoteInspector.h (modified) (1 diff)
• inspector/remote/RemoteInspector.mm (modified) (3 diffs)
• inspector/remote/RemoteInspectorConstants.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-02-16  Brian Burg  <bburg@apple.com>
+
+        RemoteInspector should forward new automation session requests to its client
+        https://bugs.webkit.org/show_bug.cgi?id=154260
+        <rdar://problem/24663313>
+
+        Reviewed by Timothy Hatcher.
+
+        * inspector/remote/RemoteInspector.h:
+        * inspector/remote/RemoteInspector.mm:
+        (Inspector::RemoteInspector::xpcConnectionReceivedMessage):
+        (Inspector::RemoteInspector::listingForAutomationTarget):
+        Use the correct key for the session identifier in the listing. The name()
+        override for RemoteAutomationTarget is actually the session identifier.
+
+        (Inspector::RemoteInspector::receivedAutomationSessionRequestMessage):
+        * inspector/remote/RemoteInspectorConstants.h: Add new constants.
+
 2016-02-16  Saam barati  <sbarati@apple.com>
 

trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.h

@@ -118 +118 @@
     void receivedAutomaticInspectionConfigurationMessage(NSDictionary *userInfo);
     void receivedAutomaticInspectionRejectMessage(NSDictionary *userInfo);
+    void receivedAutomationSessionRequestMessage(NSDictionary *userInfo);
 
     static bool startEnabled;

trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.mm

@@ -441 +441 @@
     else if ([messageName isEqualToString:WIRAutomaticInspectionRejectMessage])
         receivedAutomaticInspectionRejectMessage(userInfo);
+    else if ([messageName isEqualToString:WIRAutomationSessionRequestMessage])
+        receivedAutomationSessionRequestMessage(userInfo);
     else
         NSLog(@"Unrecognized RemoteInspector XPC Message: %@", messageName);
@@ -528 +530 @@
     RetainPtr<NSMutableDictionary> listing = adoptNS([[NSMutableDictionary alloc] init]);
     [listing setObject:@(target.targetIdentifier()) forKey:WIRTargetIdentifierKey];
-    [listing setObject:target.name() forKey:WIRTitleKey];
+    [listing setObject:target.name() forKey:WIRSessionIdentifierKey];
     [listing setObject:WIRTypeAutomation forKey:WIRTypeKey];
     [listing setObject:@(target.isPaired()) forKey:WIRAutomationTargetIsPairedKey];
@@ -777 +779 @@
 }
 
+void RemoteInspector::receivedAutomationSessionRequestMessage(NSDictionary *userInfo)
+{
+    if (!m_client)
+        return;
+
+    if (!m_client->remoteAutomationAllowed())
+        return;
+
+    NSString *suggestedSessionIdentifier = [userInfo objectForKey:WIRSessionIdentifierKey];
+    if (!suggestedSessionIdentifier)
+        return;
+
+    m_client->requestAutomationSession(suggestedSessionIdentifier);
+}
+
 } // namespace Inspector
 

trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorConstants.h

@@ -85 +85 @@
 
 #define WIRAutomationTargetIsPairedKey             @"WIRAutomationTargetIsPairedKey"
+#define WIRSessionIdentifierKey                    @"WIRSessionIdentifierKey"
+#define WIRAutomationSessionRequestMessage         @"WIRAutomationSessionRequestMessage"
 
 // These definitions are shared with a Simulator webinspectord and