Changeset 232832 in webkit

Timestamp:

Jun 13, 2018 11:39:15 PM (6 years ago)

Author:

Adrian Perez de Castro

Message:

[WPE] Trying to access the remote inspector hits an assertion in the UIProcess
​https://bugs.webkit.org/show_bug.cgi?id=186588

Reviewed by Carlos Garcia Campos.

Make both the WPE and GTK+ ports use /org/webkit/inspector as base prefix
for resource paths, which avoids needing a switcheroo depending on the port.

Source/JavaScriptCore:

• inspector/remote/glib/RemoteInspectorUtils.cpp:

Source/WebKit:

• UIProcess/API/wpe/WebKit2InspectorGResourceBundle.xml:
• UIProcess/gtk/WebInspectorProxyGtk.cpp:

(WebKit::WebInspectorProxy::inspectorPageURL):
(WebKit::WebInspectorProxy::inspectorTestPageURL):
(WebKit::WebInspectorProxy::inspectorBaseURL):

• UIProcess/wpe/WebInspectorProxyWPE.cpp:

(WebKit::WebInspectorProxy::inspectorPageURL):
(WebKit::WebInspectorProxy::inspectorTestPageURL):
(WebKit::WebInspectorProxy::inspectorBaseURL):

• WebProcess/WebPage/gtk/WebInspectorUIGtk.cpp:

(WebKit::WebInspectorUI::localizedStringsURL):
(WebKit::RemoteWebInspectorUI::localizedStringsURL):

Tools:

• WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp:

(WTR::TestRunner::inspectorTestStubURL):

• glib/generate-inspector-gresource-manifest.py:

Location:

trunk

Files:

• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/inspector/remote/glib/RemoteInspectorUtils.cpp (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/API/wpe/WebKit2InspectorGResourceBundle.xml (modified) (1 diff)
• Source/WebKit/UIProcess/gtk/WebInspectorProxyGtk.cpp (modified) (1 diff)
• Source/WebKit/UIProcess/wpe/WebInspectorProxyWPE.cpp (modified) (1 diff)
• Source/WebKit/WebProcess/WebPage/gtk/WebInspectorUIGtk.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp (modified) (1 diff)
• Tools/glib/generate-inspector-gresource-manifest.py (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2018-06-13  Adrian Perez de Castro  <aperez@igalia.com>
+
+        [WPE] Trying to access the remote inspector hits an assertion in the UIProcess
+        https://bugs.webkit.org/show_bug.cgi?id=186588
+
+        Reviewed by Carlos Garcia Campos.
+
+        Make both the WPE and GTK+ ports use /org/webkit/inspector as base prefix
+        for resource paths, which avoids needing a switcheroo depending on the port.
+
+        * inspector/remote/glib/RemoteInspectorUtils.cpp:
+
 2018-06-13  Caitlin Potter  <caitp@igalia.com>
 

trunk/Source/JavaScriptCore/inspector/remote/glib/RemoteInspectorUtils.cpp

@@ -33 +33 @@
 #include <wtf/SHA1.h>
 
-#if PLATFORM(GTK)
-#define INSPECTOR_BACKEND_COMMANDS_PATH "/org/webkitgtk/inspector/UserInterface/Protocol/InspectorBackendCommands.js"
-#elif PLATFORM(WPE)
-#define INSPECTOR_BACKEND_COMMANDS_PATH "/org/wpe/inspector/UserInterface/Protocol/InspectorBackendCommands.js"
-#endif
+#define INSPECTOR_BACKEND_COMMANDS_PATH "/org/webkit/inspector/UserInterface/Protocol/InspectorBackendCommands.js"
 
 namespace Inspector {

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-06-13  Adrian Perez de Castro  <aperez@igalia.com>
+
+        [WPE] Trying to access the remote inspector hits an assertion in the UIProcess
+        https://bugs.webkit.org/show_bug.cgi?id=186588
+
+        Reviewed by Carlos Garcia Campos.
+
+        Make both the WPE and GTK+ ports use /org/webkit/inspector as base prefix
+        for resource paths, which avoids needing a switcheroo depending on the port.
+
+        * UIProcess/API/wpe/WebKit2InspectorGResourceBundle.xml:
+        * UIProcess/gtk/WebInspectorProxyGtk.cpp:
+        (WebKit::WebInspectorProxy::inspectorPageURL):
+        (WebKit::WebInspectorProxy::inspectorTestPageURL):
+        (WebKit::WebInspectorProxy::inspectorBaseURL):
+        * UIProcess/wpe/WebInspectorProxyWPE.cpp:
+        (WebKit::WebInspectorProxy::inspectorPageURL):
+        (WebKit::WebInspectorProxy::inspectorTestPageURL):
+        (WebKit::WebInspectorProxy::inspectorBaseURL):
+        * WebProcess/WebPage/gtk/WebInspectorUIGtk.cpp:
+        (WebKit::WebInspectorUI::localizedStringsURL):
+        (WebKit::RemoteWebInspectorUI::localizedStringsURL):
+
 2018-06-13  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/UIProcess/API/wpe/WebKit2InspectorGResourceBundle.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/org/wpe/inspector/UserInterface">
+  <gresource prefix="/org/webkit/inspector/UserInterface">
     <file>inspectorPageIndex.html</file>
   </gresource>

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

@@ -339 +339 @@
 String WebInspectorProxy::inspectorPageURL()
 {
-    return String("resource:///org/webkitgtk/inspector/UserInterface/Main.html");
+    return String("resource:///org/webkit/inspector/UserInterface/Main.html");
 }
 
 String WebInspectorProxy::inspectorTestPageURL()
 {
-    return String("resource:///org/webkitgtk/inspector/UserInterface/Test.html");
+    return String("resource:///org/webkit/inspector/UserInterface/Test.html");
 }
 
 String WebInspectorProxy::inspectorBaseURL()
 {
-    return String("resource:///org/webkitgtk/inspector/UserInterface/");
+    return String("resource:///org/webkit/inspector/UserInterface/");
 }
 

trunk/Source/WebKit/UIProcess/wpe/WebInspectorProxyWPE.cpp

@@ -84 +84 @@
 String WebInspectorProxy::inspectorPageURL()
 {
-    return String("resource:///org/wpe/inspector/UserInterface/Main.html");
+    return String("resource:///org/webkit/inspector/UserInterface/Main.html");
 }
 
 String WebInspectorProxy::inspectorTestPageURL()
 {
-    return String("resource:///org/wpe/inspector/UserInterface/Test.html");
+    return String("resource:///org/webkit/inspector/UserInterface/Test.html");
 }
 
 String WebInspectorProxy::inspectorBaseURL()
 {
-    return String("resource:///org/wpe/inspector/UserInterface/");
+    return String("resource:///org/webkit/inspector/UserInterface/");
 }
 

trunk/Source/WebKit/WebProcess/WebPage/gtk/WebInspectorUIGtk.cpp

@@ -42 +42 @@
 String WebInspectorUI::localizedStringsURL()
 {
-    return String("resource:///org/webkitgtk/inspector/Localizations/en.lproj/localizedStrings.js");
+    return String("resource:///org/webkit/inspector/Localizations/en.lproj/localizedStrings.js");
 }
 
 String RemoteWebInspectorUI::localizedStringsURL()
 {
-    return String("resource:///org/webkitgtk/inspector/Localizations/en.lproj/localizedStrings.js");
+    return String("resource:///org/webkit/inspector/Localizations/en.lproj/localizedStrings.js");
 }
 

trunk/Tools/ChangeLog

@@ +1 @@
+2018-06-13  Adrian Perez de Castro  <aperez@igalia.com>
+
+        [WPE] Trying to access the remote inspector hits an assertion in the UIProcess
+        https://bugs.webkit.org/show_bug.cgi?id=186588
+
+        Reviewed by Carlos Garcia Campos.
+
+        Make both the WPE and GTK+ ports use /org/webkit/inspector as base prefix
+        for resource paths, which avoids needing a switcheroo depending on the port.
+
+        * WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp:
+        (WTR::TestRunner::inspectorTestStubURL):
+        * glib/generate-inspector-gresource-manifest.py:
+
 2018-06-11  Carlos Alberto Lopez Perez  <clopez@igalia.com>
 

trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp

@@ -70 +70 @@
 JSRetainPtr<JSStringRef> TestRunner::inspectorTestStubURL()
 {
-    return JSStringCreateWithUTF8CString("resource:///org/webkitgtk/inspector/UserInterface/TestStub.html");
+    return JSStringCreateWithUTF8CString("resource:///org/webkit/inspector/UserInterface/TestStub.html");
 }
 

trunk/Tools/glib/generate-inspector-gresource-manifest.py

@@ -68 +68 @@
     """<?xml version=1.0 encoding=UTF-8?>
     <gresources>
-        <gresource prefix="/org/webkitgtk/inspector">
+        <gresource prefix="/org/webkit/inspector">
 """)