Changeset 217924 in webkit
- Timestamp:
- Jun 7, 2017 11:46:21 PM (7 years ago)
- Location:
- trunk
- Files:
-
- 2 deleted
- 20 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r217894 r217924 1 2017-06-07 Carlos Garcia Campos <cgarcia@igalia.com> 2 3 Remove legacy INSPECTOR_SERVER implementation 4 https://bugs.webkit.org/show_bug.cgi?id=172966 5 6 Reviewed by Žan Doberšek. 7 8 * Source/PlatformWin.cmake: 9 1 10 2017-06-07 Loïc Yhuel <loic.yhuel@softathome.com> 2 11 -
trunk/Source/PlatformWin.cmake
r205418 r217924 7 7 COMMAND ${CMAKE_COMMAND} -E copy ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorBackendCommands.js ${WEB_INSPECTOR_DIR}/Protocol 8 8 COMMAND ${CMAKE_COMMAND} -E copy ${WEBINSPECTORUI_DIR}/Localizations/en.lproj/localizedStrings.js ${WEB_INSPECTOR_DIR} 9 COMMAND ${CMAKE_COMMAND} -E copy ${WEBKIT2_DIR}/UIProcess/InspectorServer/front-end/inspectorPageIndex.html ${WEB_INSPECTOR_DIR}10 9 DEPENDS JavaScriptCore WebCore 11 10 WORKING_DIRECTORY ${CMAKE_BINARY_DIR} -
trunk/Source/WebInspectorUI/ChangeLog
r217912 r217924 1 2017-06-07 Carlos Garcia Campos <cgarcia@igalia.com> 2 3 Remove legacy INSPECTOR_SERVER implementation 4 https://bugs.webkit.org/show_bug.cgi?id=172966 5 6 Reviewed by Žan Doberšek. 7 8 Remove InspectorFrontendHostStub and thr web sockets initialization. 9 10 * UserInterface/Base/InspectorFrontendHostStub.js: Removed. 11 * UserInterface/Base/Main.js: 12 (WebInspector.loaded): 13 * UserInterface/Main.html: 14 * UserInterface/Test.html: 15 * WebInspectorUI.vcxproj/WebInspectorUI.vcxproj: 16 * WebInspectorUI.vcxproj/WebInspectorUI.vcxproj.filters: 17 1 18 2017-06-07 Devin Rousso <drousso@apple.com> 2 19 -
trunk/Source/WebInspectorUI/UserInterface/Base/Main.js
r217460 r217924 56 56 WebInspector.loaded = function() 57 57 { 58 // Initialize WebSocket to communication.59 this._initializeWebSocketIfNeeded();60 61 58 this.debuggableType = InspectorFrontendHost.debuggableType() === "web" ? WebInspector.DebuggableType.Web : WebInspector.DebuggableType.JavaScript; 62 59 this.hasExtraDomains = false; … … 1654 1651 }; 1655 1652 1656 WebInspector._initializeWebSocketIfNeeded = function()1657 {1658 if (!InspectorFrontendHost.initializeWebSocket)1659 return;1660 1661 var queryParams = parseLocationQueryParameters();1662 1663 if ("ws" in queryParams)1664 var url = "ws://" + queryParams.ws;1665 else if ("page" in queryParams) {1666 var page = queryParams.page;1667 var host = "host" in queryParams ? queryParams.host : window.location.host;1668 var url = "ws://" + host + "/devtools/page/" + page;1669 }1670 1671 if (!url)1672 return;1673 1674 InspectorFrontendHost.initializeWebSocket(url);1675 };1676 1677 1653 WebInspector._updateSplitConsoleHeight = function(height) 1678 1654 { -
trunk/Source/WebInspectorUI/UserInterface/Main.html
r217744 r217924 242 242 243 243 <script src="Base/WebInspector.js"></script> 244 <script src="Base/InspectorFrontendHostStub.js"></script>245 244 <script src="Base/Platform.js"></script> 246 245 <script src="Base/LinkedList.js"></script> -
trunk/Source/WebInspectorUI/UserInterface/Test.html
r215170 r217924 37 37 38 38 <script src="Base/WebInspector.js"></script> 39 <script src="Base/InspectorFrontendHostStub.js"></script>40 39 <script src="Base/Platform.js"></script> 41 40 <script src="Base/LinkedList.js"></script> -
trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj
r196163 r217924 1 <?xml version="1.0" encoding="utf-8"?>1 <?xml version="1.0" encoding="utf-8"?> 2 2 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 3 3 <ItemGroup Label="ProjectConfigurations"> … … 661 661 <None Include="..\UserInterface\InspectorBackend.js" /> 662 662 <None Include="..\UserInterface\InspectorFrontendAPI.js" /> 663 <None Include="..\UserInterface\InspectorFrontendHostStub.js" />664 663 <None Include="..\UserInterface\InspectorObserver.js" /> 665 664 <None Include="..\UserInterface\InstrumentIcons.css" /> -
trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj.filters
r188993 r217924 589 589 <Filter>UserInterface</Filter> 590 590 </None> 591 <None Include="..\UserInterface\InspectorFrontendHostStub.js">592 <Filter>UserInterface</Filter>593 </None>594 591 <None Include="..\UserInterface\InspectorObserver.js"> 595 592 <Filter>UserInterface</Filter> -
trunk/Source/WebKit2/CMakeLists.txt
r217737 r217924 38 38 "${WEBKIT2_DIR}/UIProcess/Downloads" 39 39 "${WEBKIT2_DIR}/UIProcess/Gamepad" 40 "${WEBKIT2_DIR}/UIProcess/InspectorServer"41 40 "${WEBKIT2_DIR}/UIProcess/Launcher" 42 41 "${WEBKIT2_DIR}/UIProcess/Network" … … 415 414 UIProcess/Gamepad/UIGamepadProvider.cpp 416 415 417 UIProcess/InspectorServer/HTTPRequest.cpp418 UIProcess/InspectorServer/WebInspectorServer.cpp419 UIProcess/InspectorServer/WebSocketServer.cpp420 UIProcess/InspectorServer/WebSocketServerConnection.cpp421 422 416 UIProcess/Launcher/ProcessLauncher.cpp 423 417 -
trunk/Source/WebKit2/ChangeLog
r217923 r217924 1 2017-06-07 Carlos Garcia Campos <cgarcia@igalia.com> 2 3 Remove legacy INSPECTOR_SERVER implementation 4 https://bugs.webkit.org/show_bug.cgi?id=172966 5 6 Reviewed by Žan Doberšek. 7 8 * CMakeLists.txt: 9 * Platform/Logging.h: 10 * PlatformWPE.cmake: 11 * UIProcess/InspectorServer/HTTPRequest.cpp: Removed. 12 * UIProcess/InspectorServer/HTTPRequest.h: Removed. 13 * UIProcess/InspectorServer/WebInspectorServer.cpp: Removed. 14 * UIProcess/InspectorServer/WebInspectorServer.h: Removed. 15 * UIProcess/InspectorServer/WebSocketServer.cpp: Removed. 16 * UIProcess/InspectorServer/WebSocketServer.h: Removed. 17 * UIProcess/InspectorServer/WebSocketServerClient.h: Removed. 18 * UIProcess/InspectorServer/WebSocketServerConnection.cpp: Removed. 19 * UIProcess/InspectorServer/WebSocketServerConnection.h: Removed. 20 * UIProcess/InspectorServer/front-end/inspectorPageIndex.html: Removed. 21 * UIProcess/InspectorServer/soup/WebSocketServerSoup.cpp: Removed. 22 * UIProcess/WebInspectorProxy.cpp: 23 (WebKit::WebInspectorProxy::invalidate): 24 * UIProcess/WebInspectorProxy.h: 25 * UIProcess/WebInspectorProxy.messages.in: 26 * UIProcess/WebPageProxy.cpp: 27 (WebKit::WebPageProxy::initializeWebPage): 28 (WebKit::WebPageProxy::preferencesDidChange): 29 * UIProcess/wpe/WebProcessPoolWPE.cpp: 30 * WebProcess/WebPage/WebInspector.cpp: 31 (WebKit::WebInspector::sendMessageToFrontend): 32 * WebProcess/WebPage/WebInspector.h: 33 * WebProcess/WebPage/WebInspector.messages.in: 34 1 35 2017-06-07 Dan Bernstein <mitz@apple.com> 2 36 -
trunk/Source/WebKit2/Platform/Logging.h
r213167 r217924 48 48 M(IDB) \ 49 49 M(IndexedDB) \ 50 M(InspectorServer) \51 50 M(IPC) \ 52 51 M(KeyHandling) \ -
trunk/Source/WebKit2/PlatformWPE.cmake
r217779 r217924 111 111 UIProcess/API/wpe/WPEView.cpp 112 112 UIProcess/API/wpe/WPEViewClient.cpp 113 114 UIProcess/InspectorServer/soup/WebSocketServerSoup.cpp115 113 116 114 UIProcess/Launcher/wpe/ProcessLauncherWPE.cpp … … 321 319 ) 322 320 323 add_custom_command(324 OUTPUT ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/WebKit2InspectorGResourceBundle.c325 DEPENDS ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKit2InspectorGResourceBundle.xml326 ${WEBKIT2_DIR}/UIProcess/InspectorServer/front-end/inspectorPageIndex.html327 COMMAND glib-compile-resources --generate --sourcedir=${WEBKIT2_DIR}/UIProcess/InspectorServer/front-end --target=${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/WebKit2InspectorGResourceBundle.c ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKit2InspectorGResourceBundle.xml328 VERBATIM329 )330 331 321 list(APPEND WPEWebInspectorResources_DERIVED_SOURCES 332 322 ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/InspectorGResourceBundle.c 333 ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/WebKit2InspectorGResourceBundle.c334 323 ) 335 324 -
trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp
r213338 r217924 48 48 #include <wtf/NeverDestroyed.h> 49 49 50 #if ENABLE(INSPECTOR_SERVER)51 #include "WebInspectorServer.h"52 #endif53 54 50 using namespace WebCore; 55 51 … … 88 84 void WebInspectorProxy::invalidate() 89 85 { 90 #if ENABLE(INSPECTOR_SERVER)91 if (m_remoteInspectionPageId)92 WebInspectorServer::singleton().unregisterPage(m_remoteInspectionPageId);93 #endif94 95 86 m_inspectedPage->process().removeMessageReceiver(Messages::WebInspectorProxy::messageReceiverName(), m_inspectedPage->pageID()); 96 87 … … 391 382 *newMenuRef = menuItems; 392 383 } 393 394 #if ENABLE(INSPECTOR_SERVER)395 void WebInspectorProxy::enableRemoteInspection()396 {397 if (!m_remoteInspectionPageId)398 m_remoteInspectionPageId = WebInspectorServer::singleton().registerPage(this);399 }400 401 void WebInspectorProxy::remoteFrontendConnected()402 {403 m_inspectedPage->process().send(Messages::WebInspector::RemoteFrontendConnected(), m_inspectedPage->pageID());404 }405 406 void WebInspectorProxy::remoteFrontendDisconnected()407 {408 m_inspectedPage->process().send(Messages::WebInspector::RemoteFrontendDisconnected(), m_inspectedPage->pageID());409 }410 411 void WebInspectorProxy::dispatchMessageFromRemoteFrontend(const String& message)412 {413 m_inspectedPage->process().send(Messages::WebInspector::SendMessageToBackend(message), m_inspectedPage->pageID());414 }415 #endif416 384 417 385 void WebInspectorProxy::eagerlyCreateInspectorPage() … … 635 603 } 636 604 637 #if ENABLE(INSPECTOR_SERVER)638 void WebInspectorProxy::sendMessageToRemoteFrontend(const String& message)639 {640 ASSERT(m_remoteInspectionPageId);641 WebInspectorServer::singleton().sendMessageOverConnection(m_remoteInspectionPageId, message);642 }643 #endif644 645 605 // Unsupported configurations can use the stubs provided here. 646 606 -
trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h
r216497 r217924 149 149 static bool isMainOrTestInspectorPage(const WebCore::URL&); 150 150 151 #if ENABLE(INSPECTOR_SERVER)152 void enableRemoteInspection();153 void remoteFrontendConnected();154 void remoteFrontendDisconnected();155 void dispatchMessageFromRemoteFrontend(const String& message);156 int remoteInspectionPageID() const { return m_remoteInspectionPageId; }157 #endif158 159 151 static const unsigned minimumWindowWidth; 160 152 static const unsigned minimumWindowHeight; … … 210 202 void append(const String& filename, const String& content); 211 203 212 #if ENABLE(INSPECTOR_SERVER)213 void sendMessageToRemoteFrontend(const String& message);214 #endif215 216 204 bool canAttach() const { return m_canAttach; } 217 205 bool shouldOpenAttached(); … … 261 249 String m_inspectedURLString; 262 250 #endif 263 #if ENABLE(INSPECTOR_SERVER)264 int m_remoteInspectionPageId { 0 };265 #endif266 251 }; 267 252 -
trunk/Source/WebKit2/UIProcess/WebInspectorProxy.messages.in
r212597 r217924 45 45 46 46 StartWindowDrag() 47 48 #if ENABLE(INSPECTOR_SERVER)49 SendMessageToRemoteFrontend(String message)50 #endif51 47 } -
trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp
r217910 r217924 797 797 #endif 798 798 799 #if ENABLE(INSPECTOR_SERVER)800 if (m_preferences->developerExtrasEnabled())801 inspector()->enableRemoteInspection();802 #endif803 804 799 process().send(Messages::WebProcess::CreateWebPage(m_pageID, creationParameters()), 0); 805 800 … … 3072 3067 if (!isValid()) 3073 3068 return; 3074 3075 #if ENABLE(INSPECTOR_SERVER)3076 if (m_preferences->developerExtrasEnabled())3077 inspector()->enableRemoteInspection();3078 #endif3079 3069 3080 3070 updateThrottleState(); -
trunk/Source/WebKit2/UIProcess/wpe/WebProcessPoolWPE.cpp
r217832 r217924 33 33 #include "NetworkProcessMessages.h" 34 34 #include "WebCookieManagerProxy.h" 35 #include "WebInspectorServer.h"36 35 #include "WebProcessCreationParameters.h" 37 36 #include "WebProcessMessages.h" -
trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp
r211443 r217924 287 287 void WebInspector::sendMessageToFrontend(const String& message) 288 288 { 289 #if ENABLE(INSPECTOR_SERVER) 290 if (m_remoteFrontendConnected) 291 WebProcess::singleton().parentProcessConnection()->send(Messages::WebInspectorProxy::SendMessageToRemoteFrontend(message), m_page->pageID()); 292 else 293 #endif 294 m_frontendConnection->send(Messages::WebInspectorUI::SendMessageToFrontend(message), 0); 295 } 296 297 #if ENABLE(INSPECTOR_SERVER) 298 void WebInspector::remoteFrontendConnected() 299 { 300 if (m_page->corePage()) { 301 m_remoteFrontendConnected = true; 302 m_page->corePage()->inspectorController().connectFrontend(this); 303 } 304 } 305 306 void WebInspector::remoteFrontendDisconnected() 307 { 308 m_remoteFrontendConnected = false; 309 310 if (m_page->corePage()) 311 m_page->corePage()->inspectorController().disconnectFrontend(this); 312 } 313 #endif 289 m_frontendConnection->send(Messages::WebInspectorUI::SendMessageToFrontend(message), 0); 290 } 314 291 315 292 } // namespace WebKit -
trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.h
r207928 r217924 84 84 void sendMessageToBackend(const String&); 85 85 86 #if ENABLE(INSPECTOR_SERVER)87 void remoteFrontendConnected();88 void remoteFrontendDisconnected();89 #endif90 91 86 void disconnectFromPage() { close(); } 92 87 … … 111 106 bool m_attached { false }; 112 107 bool m_previousCanAttach { false }; 113 #if ENABLE(INSPECTOR_SERVER)114 bool m_remoteFrontendConnected { false };115 #endif116 108 }; 117 109 -
trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.messages.in
r201101 r217924 42 42 43 43 SendMessageToBackend(String message) 44 45 #if ENABLE(INSPECTOR_SERVER)46 RemoteFrontendConnected()47 RemoteFrontendDisconnected()48 #endif49 44 }
Note: See TracChangeset
for help on using the changeset viewer.