Attachment 372503 Details for Bug 199035 – PATCH

[patch] PATCH

199035.diff (text/plain), 7.80 KB, created by Basuke Suzuki on 2019-06-19 17:35:33 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Basuke Suzuki

Created: 2019-06-19 17:35:33 PDT

Size: 7.80 KB

patch

obsolete

>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index 706050d1f84..b9fe0fba9af 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2019-06-19  Basuke Suzuki  <Basuke.Suzuki@sony.com>
>+
>+        [RemoteInspector] Reduce interface differences between DBus and socket implementation.
>+        https://bugs.webkit.org/show_bug.cgi?id=199035
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * inspector/remote/socket/RemoteInspectorServer.cpp:
>+        (Inspector::RemoteInspectorServer::start):
>+        * inspector/remote/socket/RemoteInspectorServer.h:
>+        * inspector/remote/socket/posix/RemoteInspectorSocketPOSIX.cpp:
>+        (Inspector::Socket::listen):
>+        * inspector/remote/socket/win/RemoteInspectorSocketWin.cpp:
>+        (Inspector::Socket::listen):
>+
> 2019-06-19  Adrian Perez de Castro  <aperez@igalia.com>
> 
>         [WPE][GTK] Fix build with unified sources disabled
>diff --git a/Source/JavaScriptCore/inspector/remote/socket/RemoteInspectorServer.cpp b/Source/JavaScriptCore/inspector/remote/socket/RemoteInspectorServer.cpp
>index d2a5c3a5065..40ae5b8b200 100644
>--- a/Source/JavaScriptCore/inspector/remote/socket/RemoteInspectorServer.cpp
>+++ b/Source/JavaScriptCore/inspector/remote/socket/RemoteInspectorServer.cpp
>@@ -132,11 +132,11 @@ RemoteInspectorServer& RemoteInspectorServer::singleton()
>     return server;
> }
> 
>-bool RemoteInspectorServer::start(uint16_t port)
>+bool RemoteInspectorServer::start(const char* address, uint16_t port)
> {
>     m_server = RemoteInspectorSocketEndpoint::create(this, "RemoteInspectorServer");
> 
>-    if (!m_server->listenInet(nullptr, port)) {
>+    if (!m_server->listenInet(address, port)) {
>         m_server = nullptr;
>         return false;
>     }
>diff --git a/Source/JavaScriptCore/inspector/remote/socket/RemoteInspectorServer.h b/Source/JavaScriptCore/inspector/remote/socket/RemoteInspectorServer.h
>index 4138ab53349..74076e1d59e 100644
>--- a/Source/JavaScriptCore/inspector/remote/socket/RemoteInspectorServer.h
>+++ b/Source/JavaScriptCore/inspector/remote/socket/RemoteInspectorServer.h
>@@ -40,7 +40,7 @@ class RemoteInspectorServer : public RemoteInspectorConnectionClient {
> public:
>     JS_EXPORT_PRIVATE static RemoteInspectorServer& singleton();
> 
>-    JS_EXPORT_PRIVATE bool start(uint16_t);
>+    JS_EXPORT_PRIVATE bool start(const char* address, uint16_t port);
>     bool isRunning() const { return !!m_server; }
> 
>     JS_EXPORT_PRIVATE Optional<uint16_t> listenForTargets();
>diff --git a/Source/JavaScriptCore/inspector/remote/socket/posix/RemoteInspectorSocketPOSIX.cpp b/Source/JavaScriptCore/inspector/remote/socket/posix/RemoteInspectorSocketPOSIX.cpp
>index 7037c4af6b6..7317c925f0a 100644
>--- a/Source/JavaScriptCore/inspector/remote/socket/posix/RemoteInspectorSocketPOSIX.cpp
>+++ b/Source/JavaScriptCore/inspector/remote/socket/posix/RemoteInspectorSocketPOSIX.cpp
>@@ -92,7 +92,7 @@ Optional<PlatformSocketType> listen(const char* addressStr, uint16_t port)
> 
>     // FIXME: Support AF_INET6 connections.
>     address.sin_family = AF_INET;
>-    if (addressStr)
>+    if (addressStr && *addressStr)
>         inet_aton(addressStr, &address.sin_addr);
>     else
>         address.sin_addr.s_addr = htonl(INADDR_ANY);
>diff --git a/Source/JavaScriptCore/inspector/remote/socket/win/RemoteInspectorSocketWin.cpp b/Source/JavaScriptCore/inspector/remote/socket/win/RemoteInspectorSocketWin.cpp
>index dc32cd611c0..5e0a5c360fb 100644
>--- a/Source/JavaScriptCore/inspector/remote/socket/win/RemoteInspectorSocketWin.cpp
>+++ b/Source/JavaScriptCore/inspector/remote/socket/win/RemoteInspectorSocketWin.cpp
>@@ -178,7 +178,7 @@ Optional<PlatformSocketType> listen(const char* addressStr, uint16_t port)
>     // FIXME: Support AF_INET6 connections.
>     struct sockaddr_in address = { };
>     address.sin_family = AF_INET;
>-    if (addressStr)
>+    if (addressStr && *addressStr)
>         ::inet_pton(AF_INET, addressStr, &address.sin_addr);
>     else
>         address.sin_addr.s_addr = htonl(INADDR_ANY);
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 817e93b47fe..e0736c0ff0c 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-06-19  Basuke Suzuki  <Basuke.Suzuki@sony.com>
>+
>+        [RemoteInspector] Reduce interface differences between DBus and socket implementation.
>+        https://bugs.webkit.org/show_bug.cgi?id=199035
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UIProcess/socket/RemoteInspectorClient.cpp:
>+        (WebKit::RemoteInspectorClient::setTargetList):
>+        * UIProcess/socket/RemoteInspectorClient.h:
>+        * UIProcess/socket/RemoteInspectorProtocolHandler.cpp:
>+        (WebKit::RemoteInspectorProtocolHandler::platformStartTask):
>+
> 2019-06-19  Sihui Liu  <sihui_liu@apple.com>
> 
>         Crash at com.apple.WebKit: WebKit::WebsiteDataStore::processPools const
>diff --git a/Source/WebKit/UIProcess/socket/RemoteInspectorClient.cpp b/Source/WebKit/UIProcess/socket/RemoteInspectorClient.cpp
>index ed0d5ffe958..2db7fc04674 100644
>--- a/Source/WebKit/UIProcess/socket/RemoteInspectorClient.cpp
>+++ b/Source/WebKit/UIProcess/socket/RemoteInspectorClient.cpp
>@@ -201,12 +201,20 @@ void RemoteInspectorClient::setTargetList(const Event& event)
>             continue;
> 
>         Target target;
>+        String name;
>+        String url;
>+        String type;
>         if (!itemObject->getInteger("targetID"_s, target.id)
>-            || !itemObject->getString("name"_s, target.name)
>-            || !itemObject->getString("url"_s, target.url)
>-            || !itemObject->getString("type"_s, target.type))
>+            || !itemObject->getString("url"_s, url)
>+            || !itemObject->getString("name"_s, name)
>+            || !itemObject->getString("type"_s, type))
>             continue;
> 
>+
>+        target.type = type.utf8();
>+        target.name = name.utf8();
>+        target.url = url.utf8();
>+
>         targetList.append(WTFMove(target));
>     }
> 
>diff --git a/Source/WebKit/UIProcess/socket/RemoteInspectorClient.h b/Source/WebKit/UIProcess/socket/RemoteInspectorClient.h
>index d6f87434c0b..07df069742a 100644
>--- a/Source/WebKit/UIProcess/socket/RemoteInspectorClient.h
>+++ b/Source/WebKit/UIProcess/socket/RemoteInspectorClient.h
>@@ -57,9 +57,9 @@ public:
> 
>     struct Target {
>         TargetID id;
>-        String type;
>-        String name;
>-        String url;
>+        CString type;
>+        CString name;
>+        CString url;
>     };
> 
>     const HashMap<ConnectionID, Vector<Target>>& targets() const { return m_targets; }
>diff --git a/Source/WebKit/UIProcess/socket/RemoteInspectorProtocolHandler.cpp b/Source/WebKit/UIProcess/socket/RemoteInspectorProtocolHandler.cpp
>index 1b6d9cc54fc..5fbd752b530 100644
>--- a/Source/WebKit/UIProcess/socket/RemoteInspectorProtocolHandler.cpp
>+++ b/Source/WebKit/UIProcess/socket/RemoteInspectorProtocolHandler.cpp
>@@ -120,8 +120,8 @@ void RemoteInspectorProtocolHandler::platformStartTask(WebPageProxy& pageProxy,
>             for (auto& target : client->targets().get(connectionID)) {
>                 htmlBuilder.append(makeString(
>                     "<tbody><tr>"
>-                    "<td class=\"data\"><div class=\"targetname\">", target.name, "</div><div class=\"targeturl\">", target.url, "</div></td>"
>-                    "<td class=\"input\"><input type=\"button\" value=\"Inspect\" onclick=\"window.webkit.messageHandlers.inspector.postMessage('", connectionID, ":", target.id, ":", target.type, "');\"></td>"
>+                    "<td class=\"data\"><div class=\"targetname\">", target.name.data(), "</div><div class=\"targeturl\">", target.url.data(), "</div></td>"
>+                    "<td class=\"input\"><input type=\"button\" value=\"Inspect\" onclick=\"window.webkit.messageHandlers.inspector.postMessage('", connectionID, ":", target.id, ":", target.type.data(), "');\"></td>"
>                     "</tr></tbody>"
>                 ));
>             }

Actions: View | Formatted Diff | Diff

Attachments on bug 199035: 372503 | 372840