Attachment 369185 Details for Bug 197627 – PATCH

[patch] PATCH

197627.diff (text/plain), 3.04 KB, created by Basuke Suzuki on 2019-05-06 15:41:09 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Basuke Suzuki

Created: 2019-05-06 15:41:09 PDT

Size: 3.04 KB

patch

obsolete

>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index f416d56b7fd..7a6b2a7facf 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-05-06  Basuke Suzuki  <Basuke.Suzuki@sony.com>
>+
>+        [PlayStation] Fix build break since r244919
>+        https://bugs.webkit.org/show_bug.cgi?id=197627
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Bugfix for POSIX socket implementation and suppress warnings.
>+
>+        * inspector/remote/socket/RemoteInspectorConnectionClient.h:
>+        (Inspector::RemoteInspectorConnectionClient::didAccept):
>+        * inspector/remote/socket/posix/RemoteInspectorSocketPOSIX.cpp:
>+        (Inspector::Socket::getPort):
>+
> 2019-05-03  Basuke Suzuki  <Basuke.Suzuki@sony.com>
> 
>         [WinCairo] Implement and enable RemoteInspector Server.
>diff --git a/Source/JavaScriptCore/inspector/remote/socket/RemoteInspectorConnectionClient.cpp b/Source/JavaScriptCore/inspector/remote/socket/RemoteInspectorConnectionClient.cpp
>index 0e90f18e72f..56f46cde5a4 100644
>--- a/Source/JavaScriptCore/inspector/remote/socket/RemoteInspectorConnectionClient.cpp
>+++ b/Source/JavaScriptCore/inspector/remote/socket/RemoteInspectorConnectionClient.cpp
>@@ -80,6 +80,10 @@ void RemoteInspectorConnectionClient::didReceiveWebInspectorEvent(ConnectionID c
>     });
> }
> 
>+void RemoteInspectorConnectionClient::didAccept(ConnectionID, ConnectionID, Socket::Domain)
>+{
>+}
>+
> } // namespace Inspector
> 
> #endif // ENABLE(REMOTE_INSPECTOR)
>diff --git a/Source/JavaScriptCore/inspector/remote/socket/RemoteInspectorConnectionClient.h b/Source/JavaScriptCore/inspector/remote/socket/RemoteInspectorConnectionClient.h
>index 9b1142f4f35..873a051356e 100644
>--- a/Source/JavaScriptCore/inspector/remote/socket/RemoteInspectorConnectionClient.h
>+++ b/Source/JavaScriptCore/inspector/remote/socket/RemoteInspectorConnectionClient.h
>@@ -37,7 +37,7 @@ namespace Inspector {
> class RemoteInspectorConnectionClient : public CanMakeWeakPtr<RemoteInspectorConnectionClient> {
> public:
>     void didReceiveWebInspectorEvent(ConnectionID, Vector<uint8_t>&&);
>-    virtual void didAccept(ConnectionID acceptedID, ConnectionID listenerID, Socket::Domain) { };
>+    virtual void didAccept(ConnectionID acceptedID, ConnectionID listenerID, Socket::Domain);
>     virtual void didClose(ConnectionID) = 0;
> 
>     struct Event {
>diff --git a/Source/JavaScriptCore/inspector/remote/socket/posix/RemoteInspectorSocketPOSIX.cpp b/Source/JavaScriptCore/inspector/remote/socket/posix/RemoteInspectorSocketPOSIX.cpp
>index a85aaa46b95..9a25a684ed1 100644
>--- a/Source/JavaScriptCore/inspector/remote/socket/posix/RemoteInspectorSocketPOSIX.cpp
>+++ b/Source/JavaScriptCore/inspector/remote/socket/posix/RemoteInspectorSocketPOSIX.cpp
>@@ -167,7 +167,7 @@ uint16_t getPort(PlatformSocketType socket)
>     ASSERT(isValid(socket));
> 
>     struct sockaddr_in address = { };
>-    int len = sizeof(address);
>+    socklen_t len = sizeof(address);
>     getsockname(socket, reinterpret_cast<struct sockaddr*>(&address), &len);
>     return address.sin_port;
> }

Actions: View | Formatted Diff | Diff

Attachments on bug 197627: 369185