Changeset 196142 in webkit

Timestamp:

Feb 4, 2016 1:02:26 PM (8 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: Give nested inspectors their own process pool
​https://bugs.webkit.org/show_bug.cgi?id=153880
<rdar://problem/24508310>

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2016-02-04
Reviewed by Timothy Hatcher.

When inspecting the inspector both inspectors were using the same
Inspector process and sharing the same VM. This meant that profiling
information was confusing (memory and JavaScript sampling) because
it was showing data about both inspectors sharing the same process.

• UIProcess/WebInspectorProxy.cpp:

(WebKit::WebInspectorProxy::inspectorProcessPool):
(WebKit::WebInspectorProxy::isInspectorProcessPool):
Have two process pools. The main inspector process pool (1st level inspectors)
and a nested inspector process pool (inspecting the inspector, only expected
by WebKit developers).

• UIProcess/WebInspectorProxy.h:
• UIProcess/efl/WebInspectorProxyEfl.cpp:

(WebKit::WebInspectorProxy::platformCreateInspectorPage):

• UIProcess/gtk/WebInspectorProxyGtk.cpp:

(WebKit::WebInspectorProxy::platformCreateInspectorPage):

• UIProcess/mac/WebInspectorProxyMac.mm:

(WebKit::WebInspectorProxy::platformCreateInspectorPage):
Pass the inspectionLevel to determine the appropriate pool to use.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebInspectorProxy.cpp (modified) (1 diff)
• UIProcess/WebInspectorProxy.h (modified) (1 diff)
• UIProcess/efl/WebInspectorProxyEfl.cpp (modified) (1 diff)
• UIProcess/gtk/WebInspectorProxyGtk.cpp (modified) (1 diff)
• UIProcess/mac/WebInspectorProxyMac.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-02-04  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: Give nested inspectors their own process pool
+        https://bugs.webkit.org/show_bug.cgi?id=153880
+        <rdar://problem/24508310>
+
+        Reviewed by Timothy Hatcher.
+
+        When inspecting the inspector both inspectors were using the same
+        Inspector process and sharing the same VM. This meant that profiling
+        information was confusing (memory and JavaScript sampling) because
+        it was showing data about both inspectors sharing the same process.
+
+        * UIProcess/WebInspectorProxy.cpp:
+        (WebKit::WebInspectorProxy::inspectorProcessPool):
+        (WebKit::WebInspectorProxy::isInspectorProcessPool):
+        Have two process pools. The main inspector process pool (1st level inspectors)
+        and a nested inspector process pool (inspecting the inspector, only expected
+        by WebKit developers).
+
+        * UIProcess/WebInspectorProxy.h:
+        * UIProcess/efl/WebInspectorProxyEfl.cpp:
+        (WebKit::WebInspectorProxy::platformCreateInspectorPage):
+        * UIProcess/gtk/WebInspectorProxyGtk.cpp:
+        (WebKit::WebInspectorProxy::platformCreateInspectorPage):
+        * UIProcess/mac/WebInspectorProxyMac.mm:
+        (WebKit::WebInspectorProxy::platformCreateInspectorPage):
+        Pass the inspectionLevel to determine the appropriate pool to use.
+
 2016-02-04  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp

@@ -305 +305 @@
 }
 
-static WebProcessPool* s_processPool;
-
-WebProcessPool& WebInspectorProxy::inspectorProcessPool()
+static WebProcessPool* s_mainInspectorProcessPool;
+static WebProcessPool* s_nestedInspectorProcessPool;
+
+WebProcessPool& WebInspectorProxy::inspectorProcessPool(unsigned inspectionLevel)
 {
     // Having our own process pool removes us from the main process pool and
     // guarantees no process sharing for our user interface.
-    if (!s_processPool) {
+    WebProcessPool*& pool = inspectionLevel == 1 ? s_mainInspectorProcessPool : s_nestedInspectorProcessPool;
+    if (!pool) {
         auto configuration = API::ProcessPoolConfiguration::createWithLegacyOptions();
-        s_processPool = &WebProcessPool::create(configuration.get()).leakRef();
-    };
-
-    return *s_processPool;
+        pool = &WebProcessPool::create(configuration.get()).leakRef();
+    }
+    return *pool;
 }
 
 bool WebInspectorProxy::isInspectorProcessPool(WebProcessPool& processPool)
 {
-    if (!s_processPool)
-        return false;
-
-    return s_processPool == &processPool;
+    return (s_mainInspectorProcessPool && s_mainInspectorProcessPool == &processPool)
+        || (s_nestedInspectorProcessPool && s_nestedInspectorProcessPool == &processPool);
 }
 

trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h

@@ -154 +154 @@
     explicit WebInspectorProxy(WebPageProxy*);
 
-    static WebProcessPool& inspectorProcessPool();
+    static WebProcessPool& inspectorProcessPool(unsigned inspectionLevel);
 
     void eagerlyCreateInspectorPage();

trunk/Source/WebKit2/UIProcess/efl/WebInspectorProxyEfl.cpp

@@ -107 +107 @@
         return 0;
 
-    WKContextRef wkContext = toAPI(&inspectorProcessPool());
+    WKContextRef wkContext = toAPI(&inspectorProcessPool(inspectionLevel()));
     WKRetainPtr<WKStringRef> wkGroupIdentifier = adoptWK(WKStringCreateWithUTF8CString(inspectorPageGroupIdentifier().utf8().data()));
     WKPageGroupRef wkPageGroup = WKPageGroupCreateWithIdentifier(wkGroupIdentifier.get());

trunk/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp

@@ -81 +81 @@
 
     auto pageConfiguration = API::PageConfiguration::create();
-    pageConfiguration->setProcessPool(&inspectorProcessPool());
+    pageConfiguration->setProcessPool(&inspectorProcessPool(inspectionLevel()));
     pageConfiguration->setPreferences(preferences.get());
     pageConfiguration->setPageGroup(pageGroup.get());

trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm

@@ -376 +376 @@
     }
 
-    [configuration setProcessPool: ::WebKit::wrapper(inspectorProcessPool())];
+    [configuration setProcessPool: ::WebKit::wrapper(inspectorProcessPool(inspectionLevel()))];
     [configuration _setGroupIdentifier:inspectorPageGroupIdentifier()];