Skip to content
This repository was archived by the owner on Jun 24, 2022. It is now read-only.

Commit ba534ba

Browse files
[PlayStation] Enable RemoteWebInspector
https://bugs.webkit.org/show_bug.cgi?id=212312 Reviewed by Don Olmstead. * API/JSRemoteInspectorServer.cpp: Fix compile error. * PlatformPlayStation.cmake: Add JSRemoteInspectorServer.h to the public header list. * inspector/remote/socket/posix/RemoteInspectorSocketPOSIX.cpp: Set PlayStation specific socket option. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@262166 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 8c78a22 commit ba534ba

File tree

4 files changed

+29
-1
lines changed

4 files changed

+29
-1
lines changed

Source/JavaScriptCore/API/JSRemoteInspectorServer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
uint16_t JSRemoteInspectorServerStart(const char* address, uint16_t port)
3232
{
33-
const auto& server = Inspector::RemoteInspectorServer::singleton();
33+
auto& server = Inspector::RemoteInspectorServer::singleton();
3434
if (!server.start(address, port))
3535
return 0;
3636

Source/JavaScriptCore/ChangeLog

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
2020-05-26 Yoshiaki JITSUKAWA <[email protected]>
2+
3+
[PlayStation] Enable RemoteWebInspector
4+
https://bugs.webkit.org/show_bug.cgi?id=212312
5+
6+
Reviewed by Don Olmstead.
7+
8+
* API/JSRemoteInspectorServer.cpp:
9+
Fix compile error.
10+
* PlatformPlayStation.cmake:
11+
Add JSRemoteInspectorServer.h to the public header list.
12+
* inspector/remote/socket/posix/RemoteInspectorSocketPOSIX.cpp:
13+
Set PlayStation specific socket option.
14+
115
2020-05-26 Alexey Shvayka <[email protected]>
216

317
IteratorClose should suppress GetMethod errors

Source/JavaScriptCore/PlatformPlayStation.cmake

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
list(APPEND JavaScriptCore_PUBLIC_FRAMEWORK_HEADERS
2+
API/JSRemoteInspectorServer.h
3+
)
4+
15
list(APPEND JavaScriptCore_PRIVATE_INCLUDE_DIRECTORIES
26
"${JAVASCRIPTCORE_DIR}/inspector/remote/socket"
37
)
@@ -18,6 +22,7 @@ list(APPEND JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS
1822

1923
list(APPEND JavaScriptCore_SOURCES
2024
API/JSRemoteInspector.cpp
25+
API/JSRemoteInspectorServer.cpp
2126

2227
inspector/remote/RemoteAutomationTarget.cpp
2328
inspector/remote/RemoteConnectionToTarget.cpp

Source/JavaScriptCore/inspector/remote/socket/posix/RemoteInspectorSocketPOSIX.cpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,22 @@ Optional<PlatformSocketType> listen(const char* addressStr, uint16_t port)
8585
::close(fdListen);
8686
return WTF::nullopt;
8787
}
88+
8889
error = setsockopt(fdListen, SOL_SOCKET, SO_REUSEPORT, &enabled, sizeof(enabled));
8990
if (error < 0) {
9091
LOG_ERROR("setsockopt() SO_REUSEPORT, errno = %d", errno);
9192
::close(fdListen);
9293
return WTF::nullopt;
9394
}
9495

96+
#if PLATFORM(PLAYSTATION)
97+
if (setsockopt(fdListen, SOL_SOCKET, SO_USE_DEVLAN, &enabled, sizeof(enabled)) < 0) {
98+
LOG_ERROR("setsocketopt() SO_USE_DEVLAN, errno = %d", errno);
99+
::close(fdListen);
100+
return WTF::nullopt;
101+
}
102+
#endif
103+
95104
// FIXME: Support AF_INET6 connections.
96105
address.sin_family = AF_INET;
97106
if (addressStr && *addressStr)

0 commit comments

Comments
 (0)