Changeset 242306 in webkit
- Timestamp:
- Mar 1, 2019 7:27:56 PM (5 years ago)
- Location:
- trunk/Source
- Files:
-
- 14 added
- 6 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/ChangeLog
r242301 r242306 1 2019-03-01 Christopher Reid <chris.reid@sony.com> 2 3 [PlayStation] Upstream playstation's remote inspector server 4 https://bugs.webkit.org/show_bug.cgi?id=193806 5 6 Reviewed by Joseph Pecoraro. 7 8 Upstreaming PlayStation's Remote Inspector implementation. 9 It is using a JSON RPC protocol over TCP sockets. 10 This inspector implementation is planned to also support running on a WinCairo Client and Server. 11 12 * PlatformPlayStation.cmake: 13 * SourcesGTK.txt: 14 * SourcesWPE.txt: 15 * inspector/remote/RemoteConnectionToTarget.cpp: Renamed from Source/JavaScriptCore/inspector/remote/glib/RemoteConnectionToTargetGlib.cpp. 16 * inspector/remote/RemoteInspector.h: 17 * inspector/remote/playstation/RemoteInspectorConnectionClient.h: Added. 18 * inspector/remote/playstation/RemoteInspectorConnectionClientPlayStation.cpp: Added. 19 * inspector/remote/playstation/RemoteInspectorMessageParser.h: Added. 20 * inspector/remote/playstation/RemoteInspectorMessageParserPlayStation.cpp: Added. 21 * inspector/remote/playstation/RemoteInspectorPlayStation.cpp: Added. 22 * inspector/remote/playstation/RemoteInspectorServer.h: Added. 23 * inspector/remote/playstation/RemoteInspectorServerPlayStation.cpp: Added. 24 * inspector/remote/playstation/RemoteInspectorSocket.h: Added. 25 * inspector/remote/playstation/RemoteInspectorSocketClient.h: Added. 26 * inspector/remote/playstation/RemoteInspectorSocketClientPlayStation.cpp: Added. 27 * inspector/remote/playstation/RemoteInspectorSocketPlayStation.cpp: Added. 28 * inspector/remote/playstation/RemoteInspectorSocketServer.h: Added. 29 * inspector/remote/playstation/RemoteInspectorSocketServerPlayStation.cpp: Added. 30 1 31 2019-03-01 Saam Barati <sbarati@apple.com> 2 32 -
trunk/Source/JavaScriptCore/PlatformPlayStation.cmake
r237621 r242306 1 list(APPEND JavaScriptCore_PRIVATE_INCLUDE_DIRECTORIES 2 "${JAVASCRIPTCORE_DIR}/inspector/remote/playstation" 3 ) 4 5 list(APPEND JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS 6 inspector/remote/RemoteAutomationTarget.h 7 inspector/remote/RemoteConnectionToTarget.h 8 inspector/remote/RemoteControllableTarget.h 9 inspector/remote/RemoteInspectionTarget.h 10 inspector/remote/RemoteInspector.h 11 12 inspector/remote/playstation/RemoteInspectorConnectionClient.h 13 inspector/remote/playstation/RemoteInspectorMessageParser.h 14 inspector/remote/playstation/RemoteInspectorServer.h 15 inspector/remote/playstation/RemoteInspectorSocket.h 16 inspector/remote/playstation/RemoteInspectorSocketClient.h 17 inspector/remote/playstation/RemoteInspectorSocketServer.h 18 ) 19 20 list(APPEND JavaScriptCore_SOURCES 21 API/JSRemoteInspector.cpp 22 23 inspector/remote/RemoteAutomationTarget.cpp 24 inspector/remote/RemoteConnectionToTarget.cpp 25 inspector/remote/RemoteControllableTarget.cpp 26 inspector/remote/RemoteInspectionTarget.cpp 27 inspector/remote/RemoteInspector.cpp 28 29 inspector/remote/playstation/RemoteInspectorConnectionClientPlayStation.cpp 30 inspector/remote/playstation/RemoteInspectorMessageParserPlayStation.cpp 31 inspector/remote/playstation/RemoteInspectorPlayStation.cpp 32 inspector/remote/playstation/RemoteInspectorServerPlayStation.cpp 33 inspector/remote/playstation/RemoteInspectorSocketClientPlayStation.cpp 34 inspector/remote/playstation/RemoteInspectorSocketPlayStation.cpp 35 inspector/remote/playstation/RemoteInspectorSocketServerPlayStation.cpp 36 ) 37 1 38 if (${WTF_LIBRARY_TYPE} STREQUAL "STATIC") 2 39 add_definitions(-DSTATICALLY_LINKED_WITH_WTF) -
trunk/Source/JavaScriptCore/SourcesGTK.txt
r223621 r242306 25 25 26 26 inspector/remote/RemoteAutomationTarget.cpp 27 inspector/remote/RemoteConnectionToTarget.cpp 27 28 inspector/remote/RemoteControllableTarget.cpp 28 29 inspector/remote/RemoteInspectionTarget.cpp 29 30 inspector/remote/RemoteInspector.cpp 30 31 31 inspector/remote/glib/RemoteConnectionToTargetGlib.cpp32 32 inspector/remote/glib/RemoteInspectorGlib.cpp 33 33 inspector/remote/glib/RemoteInspectorServer.cpp -
trunk/Source/JavaScriptCore/SourcesWPE.txt
r236873 r242306 25 25 26 26 inspector/remote/RemoteAutomationTarget.cpp 27 inspector/remote/RemoteConnectionToTarget.cpp 27 28 inspector/remote/RemoteControllableTarget.cpp 28 29 inspector/remote/RemoteInspectionTarget.cpp 29 30 inspector/remote/RemoteInspector.cpp 30 31 31 inspector/remote/glib/RemoteConnectionToTargetGlib.cpp32 32 inspector/remote/glib/RemoteInspectorGlib.cpp 33 33 inspector/remote/glib/RemoteInspectorServer.cpp -
trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.h
r239427 r242306 52 52 #endif 53 53 54 #if PLATFORM(PLAYSTATION) 55 #include "RemoteConnectionToTarget.h" 56 #include "RemoteInspectorConnectionClient.h" 57 #include "RemoteInspectorSocketClient.h" 58 #include <wtf/JSONValues.h> 59 #include <wtf/RefCounted.h> 60 #include <wtf/RefPtr.h> 61 62 namespace Inspector { 63 using TargetListing = RefPtr<JSON::Object>; 64 } 65 #endif 66 54 67 namespace Inspector { 55 68 … … 63 76 #if PLATFORM(COCOA) 64 77 : public RemoteInspectorXPCConnection::Client 78 #elif PLATFORM(PLAYSTATION) 79 : public RemoteInspectorConnectionClient 65 80 #endif 66 81 { … … 129 144 #if USE(GLIB) 130 145 void requestAutomationSession(const char* sessionID, const Client::SessionCapabilities&); 146 #endif 147 #if USE(GLIB) || PLATFORM(PLAYSTATION) 131 148 void setup(unsigned targetIdentifier); 132 149 void sendMessageToTarget(unsigned targetIdentifier, const char* message); 150 #endif 151 #if PLATFORM(PLAYSTATION) 152 static void setConnectionIdentifier(PlatformSocketType); 133 153 #endif 134 154 … … 185 205 void receivedAutomationSessionRequestMessage(NSDictionary *userInfo); 186 206 #endif 187 207 #if PLATFORM(PLAYSTATION) 208 HashMap<String, CallHandler>& dispatchMap() override; 209 void didClose(ClientID) override; 210 211 void sendWebInspectorEvent(const String&); 212 213 void receivedGetTargetListMessage(const struct Event&); 214 void receivedSetupMessage(const struct Event&); 215 void receivedDataMessage(const struct Event&); 216 void receivedCloseMessage(const struct Event&); 217 #endif 188 218 static bool startEnabled; 189 219 … … 206 236 #endif 207 237 238 #if PLATFORM(PLAYSTATION) 239 std::unique_ptr<RemoteInspectorSocketClient> m_socketConnection; 240 static PlatformSocketType s_connectionIdentifier; 241 Optional<ClientID> m_clientID; 242 #endif 243 208 244 RemoteInspector::Client* m_client { nullptr }; 209 245 Optional<RemoteInspector::Client::Capabilities> m_clientCapabilities; -
trunk/Source/cmake/OptionsPlayStation.cmake
r242205 r242306 9 9 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT PRIVATE OFF) 10 10 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DFG_JIT PRIVATE OFF) 11 12 # Disable Remote Inspector until implementation lands13 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_REMOTE_INSPECTOR PRIVATE OFF)14 11 15 12 # Enabled features
Note: See TracChangeset
for help on using the changeset viewer.