Diff
Modified: releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/ChangeLog (232835 => 232836)
--- releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/ChangeLog 2018-06-14 10:24:40 UTC (rev 232835)
+++ releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/ChangeLog 2018-06-14 10:24:52 UTC (rev 232836)
@@ -1,3 +1,15 @@
+2018-06-13 Adrian Perez de Castro <[email protected]>
+
+ [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 <[email protected]>
[LLInt] use loadp consistently for get_from_scope/put_to_scope
Modified: releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/inspector/remote/glib/RemoteInspectorUtils.cpp (232835 => 232836)
--- releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/inspector/remote/glib/RemoteInspectorUtils.cpp 2018-06-14 10:24:40 UTC (rev 232835)
+++ releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/inspector/remote/glib/RemoteInspectorUtils.cpp 2018-06-14 10:24:52 UTC (rev 232836)
@@ -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 {
Modified: releases/WebKitGTK/webkit-2.20/Source/WebKit/ChangeLog (232835 => 232836)
--- releases/WebKitGTK/webkit-2.20/Source/WebKit/ChangeLog 2018-06-14 10:24:40 UTC (rev 232835)
+++ releases/WebKitGTK/webkit-2.20/Source/WebKit/ChangeLog 2018-06-14 10:24:52 UTC (rev 232836)
@@ -1,3 +1,26 @@
+2018-06-13 Adrian Perez de Castro <[email protected]>
+
+ [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-11 Carlos Garcia Campos <[email protected]>
Unreviewed. Update OptionsGTK.cmake and NEWS for 2.20.3 release.
Modified: releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/wpe/WebKit2InspectorGResourceBundle.xml (232835 => 232836)
--- releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/wpe/WebKit2InspectorGResourceBundle.xml 2018-06-14 10:24:40 UTC (rev 232835)
+++ releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/API/wpe/WebKit2InspectorGResourceBundle.xml 2018-06-14 10:24:52 UTC (rev 232836)
@@ -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>
Modified: releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/gtk/WebInspectorProxyGtk.cpp (232835 => 232836)
--- releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/gtk/WebInspectorProxyGtk.cpp 2018-06-14 10:24:40 UTC (rev 232835)
+++ releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/gtk/WebInspectorProxyGtk.cpp 2018-06-14 10:24:52 UTC (rev 232836)
@@ -338,17 +338,17 @@
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()
Modified: releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/wpe/WebInspectorProxyWPE.cpp (232835 => 232836)
--- releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/wpe/WebInspectorProxyWPE.cpp 2018-06-14 10:24:40 UTC (rev 232835)
+++ releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/wpe/WebInspectorProxyWPE.cpp 2018-06-14 10:24:52 UTC (rev 232836)
@@ -83,17 +83,17 @@
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()
Modified: releases/WebKitGTK/webkit-2.20/Source/WebKit/WebProcess/WebPage/gtk/WebInspectorUIGtk.cpp (232835 => 232836)
--- releases/WebKitGTK/webkit-2.20/Source/WebKit/WebProcess/WebPage/gtk/WebInspectorUIGtk.cpp 2018-06-14 10:24:40 UTC (rev 232835)
+++ releases/WebKitGTK/webkit-2.20/Source/WebKit/WebProcess/WebPage/gtk/WebInspectorUIGtk.cpp 2018-06-14 10:24:52 UTC (rev 232836)
@@ -41,12 +41,12 @@
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
Modified: releases/WebKitGTK/webkit-2.20/Tools/ChangeLog (232835 => 232836)
--- releases/WebKitGTK/webkit-2.20/Tools/ChangeLog 2018-06-14 10:24:40 UTC (rev 232835)
+++ releases/WebKitGTK/webkit-2.20/Tools/ChangeLog 2018-06-14 10:24:52 UTC (rev 232836)
@@ -1,3 +1,17 @@
+2018-06-13 Adrian Perez de Castro <[email protected]>
+
+ [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-05-20 Carlos Garcia Campos <[email protected]>
[GTK] MiniBrowser crashes when loading twice quickly
Modified: releases/WebKitGTK/webkit-2.20/Tools/WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp (232835 => 232836)
--- releases/WebKitGTK/webkit-2.20/Tools/WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp 2018-06-14 10:24:40 UTC (rev 232835)
+++ releases/WebKitGTK/webkit-2.20/Tools/WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp 2018-06-14 10:24:52 UTC (rev 232836)
@@ -69,7 +69,7 @@
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)
Modified: releases/WebKitGTK/webkit-2.20/Tools/glib/generate-inspector-gresource-manifest.py (232835 => 232836)
--- releases/WebKitGTK/webkit-2.20/Tools/glib/generate-inspector-gresource-manifest.py 2018-06-14 10:24:40 UTC (rev 232835)
+++ releases/WebKitGTK/webkit-2.20/Tools/glib/generate-inspector-gresource-manifest.py 2018-06-14 10:24:52 UTC (rev 232836)
@@ -67,7 +67,7 @@
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):
