Changeset 196454 in webkit

Timestamp:

Feb 11, 2016 4:02:29 PM (8 years ago)

Author:

BJ Burg

Message:

Web Inspector: RemoteInspector's listings should include whether an AutomationTarget is paired
​https://bugs.webkit.org/show_bug.cgi?id=154077
<rdar://problem/24589133>

Reviewed by Joseph Pecoraro.

Instead of not generating a listing for the target when it is occupied,
generate the listing with a 'paired' flag. The old flag was redundant
because a _WKAutomationDelegate will not create a session if it doesn't
support automation or it already has an active session.

• inspector/remote/RemoteAutomationTarget.cpp:

(Inspector::RemoteAutomationTarget::setIsPaired):
(Inspector::RemoteAutomationTarget::setAutomationAllowed): Deleted.

• inspector/remote/RemoteAutomationTarget.h:

Return false for remoteControlAllowed() if the target is already paired.
This function is used by RemoteInspector to deny incoming connections.

• inspector/remote/RemoteInspector.mm:

(Inspector::RemoteInspector::listingForAutomationTarget):

• inspector/remote/RemoteInspectorConstants.h:

Location:

trunk/Source/JavaScriptCore

Files:

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

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-02-11  Brian Burg  <bburg@apple.com>
+
+        Web Inspector: RemoteInspector's listings should include whether an AutomationTarget is paired
+        https://bugs.webkit.org/show_bug.cgi?id=154077
+        <rdar://problem/24589133>
+
+        Reviewed by Joseph Pecoraro.
+
+        Instead of not generating a listing for the target when it is occupied,
+        generate the listing with a 'paired' flag. The old flag was redundant
+        because a _WKAutomationDelegate will not create a session if it doesn't
+        support automation or it already has an active session.
+
+        * inspector/remote/RemoteAutomationTarget.cpp:
+        (Inspector::RemoteAutomationTarget::setIsPaired):
+        (Inspector::RemoteAutomationTarget::setAutomationAllowed): Deleted.
+        * inspector/remote/RemoteAutomationTarget.h:
+        Return false for remoteControlAllowed() if the target is already paired.
+        This function is used by RemoteInspector to deny incoming connections.
+
+        * inspector/remote/RemoteInspector.mm:
+        (Inspector::RemoteInspector::listingForAutomationTarget):
+        * inspector/remote/RemoteInspectorConstants.h:
+
 2016-02-11  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/inspector/remote/RemoteAutomationTarget.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2015, 2016 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33 +33 @@
 namespace Inspector {
 
-void RemoteAutomationTarget::setAutomationAllowed(bool allowed)
+void RemoteAutomationTarget::setIsPaired(bool paired)
 {
-    if (m_allowed == allowed)
+    if (m_paired == paired)
         return;
 
-    m_allowed = allowed;
+    m_paired = paired;
 
     update();

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

@@ -1 +1 @@
 /*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2015, 2016 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -40 +40 @@
     virtual ~RemoteAutomationTarget() { }
 
-    bool automationAllowed() const { return m_allowed; }
-    void setAutomationAllowed(bool);
+    bool isPaired() const { return m_paired; }
+    void setIsPaired(bool);
 
     virtual String name() const = 0;
     virtual RemoteControllableTarget::Type type() const override { return RemoteControllableTarget::Type::Automation; }
-    virtual bool remoteControlAllowed() const override { return automationAllowed(); };
+    virtual bool remoteControlAllowed() const override { return !m_paired; };
 
 private:
-    bool m_allowed { false };
+    bool m_paired { false };
 };
 

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

@@ -526 +526 @@
     ASSERT(isMainThread());
 
-    if (!target.automationAllowed())
-        return nil;
-
     RetainPtr<NSMutableDictionary> listing = adoptNS([[NSMutableDictionary alloc] init]);
     [listing setObject:@(target.identifier()) forKey:WIRPageIdentifierKey];
     [listing setObject:target.name() forKey:WIRTitleKey];
     [listing setObject:WIRTypeAutomation forKey:WIRTypeKey];
+    [listing setObject:@(target.isPaired()) forKey:WIRAutomationTargetIsPairedKey];
 
     if (auto connection = m_connectionMap.get(target.identifier()))

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

@@ -83 +83 @@
 #define WIRAutomaticInspectionCandidateMessage     @"WIRAutomaticInspectionCandidateMessage"
 
+#define WIRAutomationTargetIsPairedKey             @"WIRAutomationTargetIsPairedKey"
+
 // These definitions are shared with a Simulator webinspectord and
 // OS X process communicating with it.