Title: [217831] trunk/Source
Revision
217831
Author
[email protected]
Date
2017-06-06 08:16:50 -0700 (Tue, 06 Jun 2017)

Log Message

[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.

Source/_javascript_Core:

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:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (217830 => 217831)


--- trunk/Source/_javascript_Core/ChangeLog	2017-06-06 15:15:10 UTC (rev 217830)
+++ trunk/Source/_javascript_Core/ChangeLog	2017-06-06 15:16:50 UTC (rev 217831)
@@ -1,5 +1,20 @@
 2017-06-06  Carlos Garcia Campos  <[email protected]>
 
+        [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  <[email protected]>
+
         [GTK] Web Process deadlock when closing the remote inspector frontend
         https://bugs.webkit.org/show_bug.cgi?id=172973
 

Modified: trunk/Source/_javascript_Core/inspector/remote/glib/RemoteInspectorGlib.cpp (217830 => 217831)


--- trunk/Source/_javascript_Core/inspector/remote/glib/RemoteInspectorGlib.cpp	2017-06-06 15:15:10 UTC (rev 217830)
+++ trunk/Source/_javascript_Core/inspector/remote/glib/RemoteInspectorGlib.cpp	2017-06-06 15:16:50 UTC (rev 217831)
@@ -36,12 +36,10 @@
 #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 {
 

Modified: trunk/Source/_javascript_Core/inspector/remote/glib/RemoteInspectorServer.cpp (217830 => 217831)


--- trunk/Source/_javascript_Core/inspector/remote/glib/RemoteInspectorServer.cpp	2017-06-06 15:15:10 UTC (rev 217830)
+++ trunk/Source/_javascript_Core/inspector/remote/glib/RemoteInspectorServer.cpp	2017-06-06 15:16:50 UTC (rev 217831)
@@ -34,14 +34,12 @@
 #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 {
 

Modified: trunk/Source/WebKit2/ChangeLog (217830 => 217831)


--- trunk/Source/WebKit2/ChangeLog	2017-06-06 15:15:10 UTC (rev 217830)
+++ trunk/Source/WebKit2/ChangeLog	2017-06-06 15:16:50 UTC (rev 217831)
@@ -1,3 +1,14 @@
+2017-06-06  Carlos Garcia Campos  <[email protected]>
+
+        [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  <[email protected]>
 
         [WPE] Don't disable Web security preference by default

Modified: trunk/Source/WebKit2/UIProcess/glib/RemoteInspectorClient.cpp (217830 => 217831)


--- trunk/Source/WebKit2/UIProcess/glib/RemoteInspectorClient.cpp	2017-06-06 15:15:10 UTC (rev 217830)
+++ trunk/Source/WebKit2/UIProcess/glib/RemoteInspectorClient.cpp	2017-06-06 15:16:50 UTC (rev 217831)
@@ -34,12 +34,10 @@
 #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 {
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to