Changeset 161994 in webkit for trunk/Source/JavaScriptCore

Timestamp:

Jan 14, 2014, 12:23:41 PM (11 years ago)

Author:

[email protected]

Message:

Web Inspector: For Remote Inspection link WebProcess's to their parent UIProcess
​https://bugs.webkit.org/show_bug.cgi?id=126995

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2014-01-14
Reviewed by Timothy Hatcher.

Source/JavaScriptCore:

• inspector/remote/RemoteInspector.mm:

(Inspector::RemoteInspector::listingForDebuggable):
For each WebView, list the parent process. Listing the parent per WebView
is already supported back when we supported processes that could host WebViews
for multiple applications.

• inspector/remote/RemoteInspectorConstants.h:

Add a separate key for the bundle identifier, separate from application identifier.

• inspector/remote/RemoteInspectorDebuggable.cpp:

(Inspector::RemoteInspectorDebuggable::info):

• inspector/remote/RemoteInspectorDebuggable.h:

(Inspector::RemoteInspectorDebuggableInfo::RemoteInspectorDebuggableInfo):
(Inspector::RemoteInspectorDebuggableInfo::hasParentProcess):
If a RemoteInspectorDebuggable has a non-zero parent process identifier
it is a proxy for the parent process.

Source/WebCore:

• inspector/InspectorClient.h:

(WebCore::InspectorClient::parentProcessIdentifier):
Client method intended for WebKit2 so a WebProcess can link to its UIProcess.

• page/PageDebuggable.h:
• page/PageDebuggable.cpp:

(WebCore::PageDebuggable::parentProcessIdentifier):
Provide parent process identifier if there is one.

Source/WebKit2:

• WebProcess/WebCoreSupport/WebInspectorClient.h:
• WebProcess/WebCoreSupport/WebInspectorClient.cpp:

(WebKit::WebInspectorClient::parentProcessIdentifier):
WebProcesses are proxies for a parent UIProcess.

Location:

trunk/Source/JavaScriptCore

Files:

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

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2014-01-14  Joseph Pecoraro  <[email protected]>
+
+        Web Inspector: For Remote Inspection link WebProcess's to their parent UIProcess
+        https://bugs.webkit.org/show_bug.cgi?id=126995
+
+        Reviewed by Timothy Hatcher.
+
+        * inspector/remote/RemoteInspector.mm:
+        (Inspector::RemoteInspector::listingForDebuggable):
+        For each WebView, list the parent process. Listing the parent per WebView
+        is already supported back when we supported processes that could host WebViews
+        for multiple applications.
+
+        * inspector/remote/RemoteInspectorConstants.h:
+        Add a separate key for the bundle identifier, separate from application identifier.
+
+        * inspector/remote/RemoteInspectorDebuggable.cpp:
+        (Inspector::RemoteInspectorDebuggable::info):
+        * inspector/remote/RemoteInspectorDebuggable.h:
+        (Inspector::RemoteInspectorDebuggableInfo::RemoteInspectorDebuggableInfo):
+        (Inspector::RemoteInspectorDebuggableInfo::hasParentProcess):
+        If a RemoteInspectorDebuggable has a non-zero parent process identifier
+        it is a proxy for the parent process.
+
 2014-01-14  Brian J. Burg  <[email protected]>
 

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

@@ -298 +298 @@
         [debuggableDetails setObject:@YES forKey:WIRHasLocalDebuggerKey];
 
+    if (debuggableInfo.hasParentProcess()) {
+        NSString *parentApplicationIdentifier = [NSString stringWithFormat:@"PID:%lu", (unsigned long)debuggableInfo.parentProcessIdentifier];
+        [debuggableDetails setObject:parentApplicationIdentifier forKey:WIRHostApplicationIdentifierKey];
+    }
+
     return debuggableDetails;
 }

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

@@ -41 +41 @@
 
 #define WIRApplicationIdentifierKey             @"WIRApplicationIdentifierKey"
+#define WIRApplicationBundleIdentifierKey       @"WIRApplicationBundleIdentifierKey"
 #define WIRApplicationNameKey                   @"WIRApplicationNameKey"
 #define WIRIsApplicationProxyKey                @"WIRIsApplicationProxyKey"

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

@@ -74 +74 @@
     info.hasLocalDebugger = hasLocalDebugger();
     info.remoteDebuggingAllowed = remoteDebuggingAllowed();
+    info.parentProcessIdentifier = parentProcessIdentifier();
     return info;
 }

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

@@ -57 +57 @@
     virtual String url() const { return String(); } // Web
     virtual bool hasLocalDebugger() const = 0;
+    virtual pid_t parentProcessIdentifier() const { return 0; }
 
     virtual void connect(InspectorFrontendChannel*) = 0;
@@ -74 +75 @@
         , hasLocalDebugger(false)
         , remoteDebuggingAllowed(false)
+        , parentProcessIdentifier(0)
     {
     }
+
+    bool hasParentProcess() const { return !!parentProcessIdentifier; }
 
     unsigned identifier;
@@ -83 +87 @@
     bool hasLocalDebugger;
     bool remoteDebuggingAllowed;
+    pid_t parentProcessIdentifier;
 };