[GLIB] Make remote inspector DBus protocol common to all glib based ports
authorcarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 6 Jun 2017 15:16:50 +0000 (15:16 +0000)
committercarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 6 Jun 2017 15:16:50 +0000 (15:16 +0000)
https://bugs.webkit.org/show_bug.cgi?id=172970

Reviewed by Žan Doberšek.

Source/JavaScriptCore:

We are currently using "webkitgtk" in the names of DBus interfaces and object paths inside an ifdef with the
idea that other ports could use their own names. However, the protocol is the same, so we could use the same
names and make all glib based ports compatible to each other. This way we could use the GTK+ MiniBrowser to
debug WPE, without having to implement the frontend part in WPE yet.

* inspector/remote/glib/RemoteInspectorGlib.cpp: Use webkit instead of webkitgtk and reomve platform idfeds.
* inspector/remote/glib/RemoteInspectorServer.cpp: Ditto.

Source/WebKit2:

Use webkit instead of webkitgtk and reomve platform idfeds.

* UIProcess/glib/RemoteInspectorClient.cpp:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@217831 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/inspector/remote/glib/RemoteInspectorGlib.cpp
Source/JavaScriptCore/inspector/remote/glib/RemoteInspectorServer.cpp
Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/glib/RemoteInspectorClient.cpp

index 499a7b6..3b1f2f8 100644 (file)
@@ -1,5 +1,20 @@
 2017-06-06  Carlos Garcia Campos  <cgarcia@igalia.com>
 
 2017-06-06  Carlos Garcia Campos  <cgarcia@igalia.com>
 
+        [GLIB] Make remote inspector DBus protocol common to all glib based ports
+        https://bugs.webkit.org/show_bug.cgi?id=172970
+
+        Reviewed by Žan Doberšek.
+
+        We are currently using "webkitgtk" in the names of DBus interfaces and object paths inside an ifdef with the
+        idea that other ports could use their own names. However, the protocol is the same, so we could use the same
+        names and make all glib based ports compatible to each other. This way we could use the GTK+ MiniBrowser to
+        debug WPE, without having to implement the frontend part in WPE yet.
+
+        * inspector/remote/glib/RemoteInspectorGlib.cpp: Use webkit instead of webkitgtk and reomve platform idfeds.
+        * inspector/remote/glib/RemoteInspectorServer.cpp: Ditto.
+
+2017-06-06  Carlos Garcia Campos  <cgarcia@igalia.com>
+
         [GTK] Web Process deadlock when closing the remote inspector frontend
         https://bugs.webkit.org/show_bug.cgi?id=172973
 
         [GTK] Web Process deadlock when closing the remote inspector frontend
         https://bugs.webkit.org/show_bug.cgi?id=172973
 
index 6294740..6684711 100644 (file)
 #include <wtf/RunLoop.h>
 #include <wtf/glib/GUniquePtr.h>
 
 #include <wtf/RunLoop.h>
 #include <wtf/glib/GUniquePtr.h>
 
-#if PLATFORM(GTK)
-#define REMOTE_INSPECTOR_DBUS_INTERFACE "org.webkitgtk.RemoteInspector"
-#define REMOTE_INSPECTOR_DBUS_OBJECT_PATH "/org/webkitgtk/RemoteInspector"
-#define INSPECTOR_DBUS_INTERFACE "org.webkitgtk.Inspector"
-#define INSPECTOR_DBUS_OBJECT_PATH "/org/webkitgtk/Inspector"
-#endif
+#define REMOTE_INSPECTOR_DBUS_INTERFACE "org.webkit.RemoteInspector"
+#define REMOTE_INSPECTOR_DBUS_OBJECT_PATH "/org/webkit/RemoteInspector"
+#define INSPECTOR_DBUS_INTERFACE "org.webkit.Inspector"
+#define INSPECTOR_DBUS_OBJECT_PATH "/org/webkit/Inspector"
 
 namespace Inspector {
 
 
 namespace Inspector {
 
index 520b554..413f112 100644 (file)
 #include <wtf/Vector.h>
 #include <wtf/glib/GUniquePtr.h>
 
 #include <wtf/Vector.h>
 #include <wtf/glib/GUniquePtr.h>
 
-#if PLATFORM(GTK)
-#define INSPECTOR_DBUS_INTERFACE "org.webkitgtk.Inspector"
-#define INSPECTOR_DBUS_OBJECT_PATH "/org/webkitgtk/Inspector"
-#define REMOTE_INSPECTOR_DBUS_INTERFACE "org.webkitgtk.RemoteInspector"
-#define REMOTE_INSPECTOR_DBUS_OBJECT_PATH "/org/webkitgtk/RemoteInspector"
-#define REMOTE_INSPECTOR_CLIENT_DBUS_INTERFACE "org.webkitgtk.RemoteInspectorClient"
-#define REMOTE_INSPECTOR_CLIENT_OBJECT_PATH "/org/webkitgtk/RemoteInspectorClient"
-#endif
+#define INSPECTOR_DBUS_INTERFACE "org.webkit.Inspector"
+#define INSPECTOR_DBUS_OBJECT_PATH "/org/webkit/Inspector"
+#define REMOTE_INSPECTOR_DBUS_INTERFACE "org.webkit.RemoteInspector"
+#define REMOTE_INSPECTOR_DBUS_OBJECT_PATH "/org/webkit/RemoteInspector"
+#define REMOTE_INSPECTOR_CLIENT_DBUS_INTERFACE "org.webkit.RemoteInspectorClient"
+#define REMOTE_INSPECTOR_CLIENT_OBJECT_PATH "/org/webkit/RemoteInspectorClient"
 
 namespace Inspector {
 
 
 namespace Inspector {
 
index 4968e34..00976bc 100644 (file)
@@ -1,3 +1,14 @@
+2017-06-06  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GLIB] Make remote inspector DBus protocol common to all glib based ports
+        https://bugs.webkit.org/show_bug.cgi?id=172970
+
+        Reviewed by Žan Doberšek.
+
+        Use webkit instead of webkitgtk and reomve platform idfeds.
+
+        * UIProcess/glib/RemoteInspectorClient.cpp:
+
 2017-06-06  Zan Dobersek  <zdobersek@igalia.com>
 
         [WPE] Don't disable Web security preference by default
 2017-06-06  Zan Dobersek  <zdobersek@igalia.com>
 
         [WPE] Don't disable Web security preference by default
index ddd4bd7..3d1d022 100644 (file)
 #include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/Base64.h>
 
 #include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/Base64.h>
 
-#if PLATFORM(GTK)
-#define REMOTE_INSPECTOR_CLIENT_DBUS_INTERFACE "org.webkitgtk.RemoteInspectorClient"
-#define REMOTE_INSPECTOR_CLIENT_OBJECT_PATH "/org/webkitgtk/RemoteInspectorClient"
-#define INSPECTOR_DBUS_INTERFACE "org.webkitgtk.Inspector"
-#define INSPECTOR_DBUS_OBJECT_PATH "/org/webkitgtk/Inspector"
-#endif
+#define REMOTE_INSPECTOR_CLIENT_DBUS_INTERFACE "org.webkit.RemoteInspectorClient"
+#define REMOTE_INSPECTOR_CLIENT_OBJECT_PATH "/org/webkit/RemoteInspectorClient"
+#define INSPECTOR_DBUS_INTERFACE "org.webkit.Inspector"
+#define INSPECTOR_DBUS_OBJECT_PATH "/org/webkit/Inspector"
 
 namespace WebKit {
 
 
 namespace WebKit {