Attachment 342706 Details for Bug 186588 – Patch

[patch] Patch

bug-186588-20180614012359.patch (text/plain), 9.19 KB, created by Adrian Perez on 2018-06-13 16:24:00 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Adrian Perez

Created: 2018-06-13 16:24:00 PDT

Size: 9.19 KB

patch

obsolete

>Subversion Revision: 232816
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index 99f3f80f90ced4a73845eedb1ce4ac752284eb6b..d132c9b8440b08ecdc11d1fec7b9633e1064575a 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,15 @@
>+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 NOBODY (OOPS!).
>+
>+        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>
> 
>         [LLInt] use loadp consistently for get_from_scope/put_to_scope
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 3b5789bfa22bd78c5b447e02d1f98ce5fe6c8e02..530f07e21f58071dd9e135d225dc52c97582be15 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,26 @@
>+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 NOBODY (OOPS!).
>+
>+        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  Youenn Fablet  <youenn@apple.com>
> 
>         Supported plugin check should be based on plugin identifier
>diff --git a/Source/JavaScriptCore/inspector/remote/glib/RemoteInspectorUtils.cpp b/Source/JavaScriptCore/inspector/remote/glib/RemoteInspectorUtils.cpp
>index c6c0fcad2c80d086541b049f15d25d16696a28ea..12f1d13d8a6b6d650ea3278a18432f1b8f41e81b 100644
>--- a/Source/JavaScriptCore/inspector/remote/glib/RemoteInspectorUtils.cpp
>+++ b/Source/JavaScriptCore/inspector/remote/glib/RemoteInspectorUtils.cpp
>@@ -32,11 +32,7 @@
> #include <mutex>
> #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 {
> 
>diff --git a/Source/WebKit/UIProcess/API/wpe/WebKit2InspectorGResourceBundle.xml b/Source/WebKit/UIProcess/API/wpe/WebKit2InspectorGResourceBundle.xml
>index 582092bbfea1e8705ebaf2983a7ec41b30748f97..154c7eea85ec90aae296d44fcccd02867412ebb0 100644
>--- a/Source/WebKit/UIProcess/API/wpe/WebKit2InspectorGResourceBundle.xml
>+++ b/Source/WebKit/UIProcess/API/wpe/WebKit2InspectorGResourceBundle.xml
>@@ -1,6 +1,6 @@
> <?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>
> </gresources>
>diff --git a/Source/WebKit/UIProcess/gtk/WebInspectorProxyGtk.cpp b/Source/WebKit/UIProcess/gtk/WebInspectorProxyGtk.cpp
>index 49aecbe58293e12d072dd3df6c75c98d8a50334a..25db483acfb2adeedc7abcc353439c53dfba29e8 100644
>--- a/Source/WebKit/UIProcess/gtk/WebInspectorProxyGtk.cpp
>+++ b/Source/WebKit/UIProcess/gtk/WebInspectorProxyGtk.cpp
>@@ -338,17 +338,17 @@ void WebInspectorProxy::platformInspectedURLChanged(const String& url)
> 
> 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/");
> }
> 
> unsigned WebInspectorProxy::platformInspectedWindowHeight()
>diff --git a/Source/WebKit/UIProcess/wpe/WebInspectorProxyWPE.cpp b/Source/WebKit/UIProcess/wpe/WebInspectorProxyWPE.cpp
>index f6b276a6bc4217b77a4dba6b454e6fe62a7399cd..fb8d7a1d201660fa0197a91dd16b0549661dce5f 100644
>--- a/Source/WebKit/UIProcess/wpe/WebInspectorProxyWPE.cpp
>+++ b/Source/WebKit/UIProcess/wpe/WebInspectorProxyWPE.cpp
>@@ -83,17 +83,17 @@ void WebInspectorProxy::platformInspectedURLChanged(const String&)
> 
> 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/");
> }
> 
> unsigned WebInspectorProxy::platformInspectedWindowHeight()
>diff --git a/Source/WebKit/WebProcess/WebPage/gtk/WebInspectorUIGtk.cpp b/Source/WebKit/WebProcess/WebPage/gtk/WebInspectorUIGtk.cpp
>index a0f1d48528de7bc236d3d41d9b347a708ff10023..89c3ba1aa8939cfa51f6fb221a73b38d780327a3 100644
>--- a/Source/WebKit/WebProcess/WebPage/gtk/WebInspectorUIGtk.cpp
>+++ b/Source/WebKit/WebProcess/WebPage/gtk/WebInspectorUIGtk.cpp
>@@ -41,12 +41,12 @@ bool WebInspectorUI::canSave()
> 
> 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");
> }
> 
> } // namespace WebKit
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 2e9bbeb280baebbbb458ee13c52ab1ced65e431e..6e601ccbe935afad2f9d2b181e3ddb6f5d8ee72d 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,17 @@
>+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 NOBODY (OOPS!).
>+
>+        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-13  David Fenton  <david_fenton@apple.com>
> 
>         Unreviewed, add myself as a WebKit committer.
>diff --git a/Tools/WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp b/Tools/WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp
>index d8ac85b648956b8559361f90483290757c9f608d..62dd844004e03e250418364614c616dd15e08c84 100644
>--- a/Tools/WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp
>+++ b/Tools/WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp
>@@ -69,7 +69,7 @@ JSRetainPtr<JSStringRef> TestRunner::pathToLocalResource(JSStringRef url)
> 
> JSRetainPtr<JSStringRef> TestRunner::inspectorTestStubURL()
> {
>-    return JSStringCreateWithUTF8CString("resource:///org/webkitgtk/inspector/UserInterface/TestStub.html");
>+    return JSStringCreateWithUTF8CString("resource:///org/webkit/inspector/UserInterface/TestStub.html");
> }
> 
> void TestRunner::installFakeHelvetica(JSStringRef configuration)
>diff --git a/Tools/glib/generate-inspector-gresource-manifest.py b/Tools/glib/generate-inspector-gresource-manifest.py
>index 1126281e34fd7f2677e903d2f7995f7188bd6368..63b53dd59db10e0c457c8ab3ee2b0c53557bba6f 100755
>--- a/Tools/glib/generate-inspector-gresource-manifest.py
>+++ b/Tools/glib/generate-inspector-gresource-manifest.py
>@@ -67,7 +67,7 @@ if __name__ == "__main__":
>     args.output.write(\
>     """<?xml version=1.0 encoding=UTF-8?>
>     <gresources>
>-        <gresource prefix="/org/webkitgtk/inspector">
>+        <gresource prefix="/org/webkit/inspector">
> """)
> 
>     for filename in get_filenames(args.input):

Actions: View | Formatted Diff | Diff

Attachments on bug 186588: 342706