Diff
Modified: trunk/ChangeLog (217923 => 217924)
--- trunk/ChangeLog 2017-06-08 05:02:48 UTC (rev 217923)
+++ trunk/ChangeLog 2017-06-08 06:46:21 UTC (rev 217924)
@@ -1,3 +1,12 @@
+2017-06-07 Carlos Garcia Campos <[email protected]>
+
+ Remove legacy INSPECTOR_SERVER implementation
+ https://bugs.webkit.org/show_bug.cgi?id=172966
+
+ Reviewed by Žan Doberšek.
+
+ * Source/PlatformWin.cmake:
+
2017-06-07 Loïc Yhuel <[email protected]>
[CMake] Only force response files for Ninja with CMake < 3.2 on Linux
Modified: trunk/Source/PlatformWin.cmake (217923 => 217924)
--- trunk/Source/PlatformWin.cmake 2017-06-08 05:02:48 UTC (rev 217923)
+++ trunk/Source/PlatformWin.cmake 2017-06-08 06:46:21 UTC (rev 217924)
@@ -6,7 +6,6 @@
COMMAND ${CMAKE_COMMAND} -E copy_directory ${WEBINSPECTORUI_DIR}/UserInterface ${WEB_INSPECTOR_DIR}
COMMAND ${CMAKE_COMMAND} -E copy ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorBackendCommands.js ${WEB_INSPECTOR_DIR}/Protocol
COMMAND ${CMAKE_COMMAND} -E copy ${WEBINSPECTORUI_DIR}/Localizations/en.lproj/localizedStrings.js ${WEB_INSPECTOR_DIR}
- COMMAND ${CMAKE_COMMAND} -E copy ${WEBKIT2_DIR}/UIProcess/InspectorServer/front-end/inspectorPageIndex.html ${WEB_INSPECTOR_DIR}
DEPENDS _javascript_Core WebCore
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
)
Modified: trunk/Source/WebInspectorUI/ChangeLog (217923 => 217924)
--- trunk/Source/WebInspectorUI/ChangeLog 2017-06-08 05:02:48 UTC (rev 217923)
+++ trunk/Source/WebInspectorUI/ChangeLog 2017-06-08 06:46:21 UTC (rev 217924)
@@ -1,3 +1,20 @@
+2017-06-07 Carlos Garcia Campos <[email protected]>
+
+ Remove legacy INSPECTOR_SERVER implementation
+ https://bugs.webkit.org/show_bug.cgi?id=172966
+
+ Reviewed by Žan Doberšek.
+
+ Remove InspectorFrontendHostStub and thr web sockets initialization.
+
+ * UserInterface/Base/InspectorFrontendHostStub.js: Removed.
+ * UserInterface/Base/Main.js:
+ (WebInspector.loaded):
+ * UserInterface/Main.html:
+ * UserInterface/Test.html:
+ * WebInspectorUI.vcxproj/WebInspectorUI.vcxproj:
+ * WebInspectorUI.vcxproj/WebInspectorUI.vcxproj.filters:
+
2017-06-07 Devin Rousso <[email protected]>
Web Inspector: Add ContextMenu item to log WebSocket object to console
Deleted: trunk/Source/WebInspectorUI/UserInterface/Base/InspectorFrontendHostStub.js (217923 => 217924)
--- trunk/Source/WebInspectorUI/UserInterface/Base/InspectorFrontendHostStub.js 2017-06-08 05:02:48 UTC (rev 217923)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/InspectorFrontendHostStub.js 2017-06-08 06:46:21 UTC (rev 217924)
@@ -1,207 +0,0 @@
-/*
- * Copyright (C) 2009 Google Inc. All rights reserved.
- * Copyright (C) 2013 Seokju Kwon ([email protected])
- * Copyright (C) 2013 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-if (!window.InspectorFrontendHost) {
- WebInspector.InspectorFrontendHostStub = function()
- {
- };
-
- WebInspector.InspectorFrontendHostStub.prototype = {
- // Public
-
- initializeWebSocket: function(url)
- {
- var socket = new WebSocket(url);
- socket.addEventListener("open", socketReady.bind(this));
-
- function socketReady()
- {
- this._socket = socket;
-
- this._socket.addEventListener("message", function(message) { InspectorBackend.dispatch(message.data); });
- this._socket.addEventListener("error", function(error) { console.error(error); });
-
- this._sendPendingMessagesToBackendIfNeeded();
- }
- },
-
- bringToFront: function()
- {
- this._windowVisible = true;
- },
-
- closeWindow: function()
- {
- this._windowVisible = false;
- },
-
- userInterfaceLayoutDirection: function()
- {
- return "ltr";
- },
-
- requestSetDockSide: function(side)
- {
- InspectorFrontendAPI.setDockSide(side);
- },
-
- setAttachedWindowHeight: function(height)
- {
- },
-
- setAttachedWindowWidth: function(width)
- {
- },
-
- startWindowDrag: function()
- {
- },
-
- moveWindowBy: function(x, y)
- {
- },
-
- loaded: function()
- {
- },
-
- localizedStringsURL: function()
- {
- return undefined;
- },
-
- backendCommandsURL: function()
- {
- return undefined;
- },
-
- debuggableType: function()
- {
- return "web";
- },
-
- inspectionLevel: function()
- {
- return 1;
- },
-
- inspectedURLChanged: function(title)
- {
- document.title = title;
- },
-
- copyText: function(text)
- {
- let textarea = document.createElement("textarea");
- textarea.textContent = text;
- document.body.appendChild(textarea);
- textarea.select();
-
- if (!document.execCommand("copy"))
- console.error("Could not copy to clipboard.");
-
- document.body.removeChild(textarea);
- },
-
- killText: function(text, shouldStartNewSequence)
- {
- },
-
- openInNewTab: function(url)
- {
- window.open(url, "_blank");
- },
-
- save: function(url, content, base64Encoded, forceSaveAs)
- {
- },
-
- sendMessageToBackend: function(message)
- {
- if (!this._socket) {
- if (!this._pendingMessages)
- this._pendingMessages = [];
- this._pendingMessages.push(message);
- return;
- }
-
- this._sendPendingMessagesToBackendIfNeeded();
-
- this._socket.send(message);
- },
-
- platform: function()
- {
- return (navigator.platform.match(/mac|win|linux/i) || ["other"])[0].toLowerCase();
- },
-
- beep: function()
- {
- },
-
- showContextMenu: function(event, menuObject)
- {
- new WebInspector.SoftContextMenu(menuObject).show(event);
- },
-
- unbufferedLog: function()
- {
- console.log.apply(console, arguments);
- },
-
- setZoomFactor: function(zoom)
- {
- },
-
- zoomFactor: function()
- {
- return 1;
- },
-
- // Private
-
- _sendPendingMessagesToBackendIfNeeded: function()
- {
- if (!this._pendingMessages)
- return;
-
- for (var i = 0; i < this._pendingMessages.length; ++i)
- this._socket.send(this._pendingMessages[i]);
-
- delete this._pendingMessages;
- }
- };
-
- InspectorFrontendHost = new WebInspector.InspectorFrontendHostStub;
-
- WebInspector.dontLocalizeUserInterface = true;
-}
Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Main.js (217923 => 217924)
--- trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2017-06-08 05:02:48 UTC (rev 217923)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2017-06-08 06:46:21 UTC (rev 217924)
@@ -55,9 +55,6 @@
WebInspector.loaded = function()
{
- // Initialize WebSocket to communication.
- this._initializeWebSocketIfNeeded();
-
this.debuggableType = InspectorFrontendHost.debuggableType() === "web" ? WebInspector.DebuggableType.Web : WebInspector.DebuggableType._javascript_;
this.hasExtraDomains = false;
@@ -1653,27 +1650,6 @@
this.quickConsole.consoleLogVisibilityChanged(this.isShowingConsoleTab());
};
-WebInspector._initializeWebSocketIfNeeded = function()
-{
- if (!InspectorFrontendHost.initializeWebSocket)
- return;
-
- var queryParams = parseLocationQueryParameters();
-
- if ("ws" in queryParams)
- var url = "" + queryParams.ws;
- else if ("page" in queryParams) {
- var page = queryParams.page;
- var host = "host" in queryParams ? queryParams.host : window.location.host;
- var url = "" + host + "/devtools/page/" + page;
- }
-
- if (!url)
- return;
-
- InspectorFrontendHost.initializeWebSocket(url);
-};
-
WebInspector._updateSplitConsoleHeight = function(height)
{
const minimumHeight = 64;
Modified: trunk/Source/WebInspectorUI/UserInterface/Main.html (217923 => 217924)
--- trunk/Source/WebInspectorUI/UserInterface/Main.html 2017-06-08 05:02:48 UTC (rev 217923)
+++ trunk/Source/WebInspectorUI/UserInterface/Main.html 2017-06-08 06:46:21 UTC (rev 217924)
@@ -241,7 +241,6 @@
<script src=""
<script src=""
- <script src=""
<script src=""
<script src=""
<script src=""
Modified: trunk/Source/WebInspectorUI/UserInterface/Test.html (217923 => 217924)
--- trunk/Source/WebInspectorUI/UserInterface/Test.html 2017-06-08 05:02:48 UTC (rev 217923)
+++ trunk/Source/WebInspectorUI/UserInterface/Test.html 2017-06-08 06:46:21 UTC (rev 217924)
@@ -36,7 +36,6 @@
<script src=""
<script src=""
- <script src=""
<script src=""
<script src=""
<script src=""
Modified: trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj (217923 => 217924)
--- trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj 2017-06-08 05:02:48 UTC (rev 217923)
+++ trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj 2017-06-08 06:46:21 UTC (rev 217924)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="DebugSuffix|Win32">
@@ -660,7 +660,6 @@
<None Include="..\UserInterface\IndeterminateProgressSpinner.js" />
<None Include="..\UserInterface\InspectorBackend.js" />
<None Include="..\UserInterface\InspectorFrontendAPI.js" />
- <None Include="..\UserInterface\InspectorFrontendHostStub.js" />
<None Include="..\UserInterface\InspectorObserver.js" />
<None Include="..\UserInterface\InstrumentIcons.css" />
<None Include="..\UserInterface\InstrumentSidebarPanel.css" />
Modified: trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj.filters (217923 => 217924)
--- trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj.filters 2017-06-08 05:02:48 UTC (rev 217923)
+++ trunk/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj.filters 2017-06-08 06:46:21 UTC (rev 217924)
@@ -588,9 +588,6 @@
<None Include="..\UserInterface\InspectorFrontendAPI.js">
<Filter>UserInterface</Filter>
</None>
- <None Include="..\UserInterface\InspectorFrontendHostStub.js">
- <Filter>UserInterface</Filter>
- </None>
<None Include="..\UserInterface\InspectorObserver.js">
<Filter>UserInterface</Filter>
</None>
Modified: trunk/Source/WebKit2/CMakeLists.txt (217923 => 217924)
--- trunk/Source/WebKit2/CMakeLists.txt 2017-06-08 05:02:48 UTC (rev 217923)
+++ trunk/Source/WebKit2/CMakeLists.txt 2017-06-08 06:46:21 UTC (rev 217924)
@@ -37,7 +37,6 @@
"${WEBKIT2_DIR}/UIProcess/Databases"
"${WEBKIT2_DIR}/UIProcess/Downloads"
"${WEBKIT2_DIR}/UIProcess/Gamepad"
- "${WEBKIT2_DIR}/UIProcess/InspectorServer"
"${WEBKIT2_DIR}/UIProcess/Launcher"
"${WEBKIT2_DIR}/UIProcess/Network"
"${WEBKIT2_DIR}/UIProcess/Network/CustomProtocols"
@@ -414,11 +413,6 @@
UIProcess/Gamepad/UIGamepad.cpp
UIProcess/Gamepad/UIGamepadProvider.cpp
- UIProcess/InspectorServer/HTTPRequest.cpp
- UIProcess/InspectorServer/WebInspectorServer.cpp
- UIProcess/InspectorServer/WebSocketServer.cpp
- UIProcess/InspectorServer/WebSocketServerConnection.cpp
-
UIProcess/Launcher/ProcessLauncher.cpp
UIProcess/Network/CustomProtocols/LegacyCustomProtocolManagerProxy.cpp
Modified: trunk/Source/WebKit2/ChangeLog (217923 => 217924)
--- trunk/Source/WebKit2/ChangeLog 2017-06-08 05:02:48 UTC (rev 217923)
+++ trunk/Source/WebKit2/ChangeLog 2017-06-08 06:46:21 UTC (rev 217924)
@@ -1,3 +1,37 @@
+2017-06-07 Carlos Garcia Campos <[email protected]>
+
+ Remove legacy INSPECTOR_SERVER implementation
+ https://bugs.webkit.org/show_bug.cgi?id=172966
+
+ Reviewed by Žan Doberšek.
+
+ * CMakeLists.txt:
+ * Platform/Logging.h:
+ * PlatformWPE.cmake:
+ * UIProcess/InspectorServer/HTTPRequest.cpp: Removed.
+ * UIProcess/InspectorServer/HTTPRequest.h: Removed.
+ * UIProcess/InspectorServer/WebInspectorServer.cpp: Removed.
+ * UIProcess/InspectorServer/WebInspectorServer.h: Removed.
+ * UIProcess/InspectorServer/WebSocketServer.cpp: Removed.
+ * UIProcess/InspectorServer/WebSocketServer.h: Removed.
+ * UIProcess/InspectorServer/WebSocketServerClient.h: Removed.
+ * UIProcess/InspectorServer/WebSocketServerConnection.cpp: Removed.
+ * UIProcess/InspectorServer/WebSocketServerConnection.h: Removed.
+ * UIProcess/InspectorServer/front-end/inspectorPageIndex.html: Removed.
+ * UIProcess/InspectorServer/soup/WebSocketServerSoup.cpp: Removed.
+ * UIProcess/WebInspectorProxy.cpp:
+ (WebKit::WebInspectorProxy::invalidate):
+ * UIProcess/WebInspectorProxy.h:
+ * UIProcess/WebInspectorProxy.messages.in:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::initializeWebPage):
+ (WebKit::WebPageProxy::preferencesDidChange):
+ * UIProcess/wpe/WebProcessPoolWPE.cpp:
+ * WebProcess/WebPage/WebInspector.cpp:
+ (WebKit::WebInspector::sendMessageToFrontend):
+ * WebProcess/WebPage/WebInspector.h:
+ * WebProcess/WebPage/WebInspector.messages.in:
+
2017-06-07 Dan Bernstein <[email protected]>
[Cocoa] additionalReadAccessAllowedURLs doesn’t preserve non-Latin-1 paths
Modified: trunk/Source/WebKit2/Platform/Logging.h (217923 => 217924)
--- trunk/Source/WebKit2/Platform/Logging.h 2017-06-08 05:02:48 UTC (rev 217923)
+++ trunk/Source/WebKit2/Platform/Logging.h 2017-06-08 06:46:21 UTC (rev 217924)
@@ -47,7 +47,6 @@
M(IconDatabase) \
M(IDB) \
M(IndexedDB) \
- M(InspectorServer) \
M(IPC) \
M(KeyHandling) \
M(Layers) \
Modified: trunk/Source/WebKit2/PlatformWPE.cmake (217923 => 217924)
--- trunk/Source/WebKit2/PlatformWPE.cmake 2017-06-08 05:02:48 UTC (rev 217923)
+++ trunk/Source/WebKit2/PlatformWPE.cmake 2017-06-08 06:46:21 UTC (rev 217924)
@@ -111,8 +111,6 @@
UIProcess/API/wpe/WPEView.cpp
UIProcess/API/wpe/WPEViewClient.cpp
- UIProcess/InspectorServer/soup/WebSocketServerSoup.cpp
-
UIProcess/Launcher/wpe/ProcessLauncherWPE.cpp
UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp
@@ -320,17 +318,8 @@
VERBATIM
)
-add_custom_command(
- OUTPUT ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/WebKit2InspectorGResourceBundle.c
- DEPENDS ${WEBKIT2_DIR}/UIProcess/API/wpe/WebKit2InspectorGResourceBundle.xml
- ${WEBKIT2_DIR}/UIProcess/InspectorServer/front-end/inspectorPageIndex.html
- 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.xml
- VERBATIM
-)
-
list(APPEND WPEWebInspectorResources_DERIVED_SOURCES
${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/InspectorGResourceBundle.c
- ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/WebKit2InspectorGResourceBundle.c
)
list(APPEND WPEWebInspectorResources_LIBRARIES
Modified: trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp (217923 => 217924)
--- trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2017-06-08 05:02:48 UTC (rev 217923)
+++ trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2017-06-08 06:46:21 UTC (rev 217924)
@@ -47,10 +47,6 @@
#include <WebCore/NotImplemented.h>
#include <wtf/NeverDestroyed.h>
-#if ENABLE(INSPECTOR_SERVER)
-#include "WebInspectorServer.h"
-#endif
-
using namespace WebCore;
namespace WebKit {
@@ -87,11 +83,6 @@
void WebInspectorProxy::invalidate()
{
-#if ENABLE(INSPECTOR_SERVER)
- if (m_remoteInspectionPageId)
- WebInspectorServer::singleton().unregisterPage(m_remoteInspectionPageId);
-#endif
-
m_inspectedPage->process().removeMessageReceiver(Messages::WebInspectorProxy::messageReceiverName(), m_inspectedPage->pageID());
didClose();
@@ -391,29 +382,6 @@
*newMenuRef = menuItems;
}
-#if ENABLE(INSPECTOR_SERVER)
-void WebInspectorProxy::enableRemoteInspection()
-{
- if (!m_remoteInspectionPageId)
- m_remoteInspectionPageId = WebInspectorServer::singleton().registerPage(this);
-}
-
-void WebInspectorProxy::remoteFrontendConnected()
-{
- m_inspectedPage->process().send(Messages::WebInspector::RemoteFrontendConnected(), m_inspectedPage->pageID());
-}
-
-void WebInspectorProxy::remoteFrontendDisconnected()
-{
- m_inspectedPage->process().send(Messages::WebInspector::RemoteFrontendDisconnected(), m_inspectedPage->pageID());
-}
-
-void WebInspectorProxy::dispatchMessageFromRemoteFrontend(const String& message)
-{
- m_inspectedPage->process().send(Messages::WebInspector::SendMessageToBackend(message), m_inspectedPage->pageID());
-}
-#endif
-
void WebInspectorProxy::eagerlyCreateInspectorPage()
{
if (m_inspectorPage)
@@ -634,14 +602,6 @@
return inspectorPagePreferences().inspectorStartsAttached() && canAttach();
}
-#if ENABLE(INSPECTOR_SERVER)
-void WebInspectorProxy::sendMessageToRemoteFrontend(const String& message)
-{
- ASSERT(m_remoteInspectionPageId);
- WebInspectorServer::singleton().sendMessageOverConnection(m_remoteInspectionPageId, message);
-}
-#endif
-
// Unsupported configurations can use the stubs provided here.
#if PLATFORM(IOS) || (PLATFORM(MAC) && !WK_API_ENABLED)
Modified: trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h (217923 => 217924)
--- trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h 2017-06-08 05:02:48 UTC (rev 217923)
+++ trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h 2017-06-08 06:46:21 UTC (rev 217924)
@@ -148,14 +148,6 @@
static String inspectorBaseURL();
static bool isMainOrTestInspectorPage(const WebCore::URL&);
-#if ENABLE(INSPECTOR_SERVER)
- void enableRemoteInspection();
- void remoteFrontendConnected();
- void remoteFrontendDisconnected();
- void dispatchMessageFromRemoteFrontend(const String& message);
- int remoteInspectionPageID() const { return m_remoteInspectionPageId; }
-#endif
-
static const unsigned minimumWindowWidth;
static const unsigned minimumWindowHeight;
@@ -209,10 +201,6 @@
void save(const String& filename, const String& content, bool base64Encoded, bool forceSaveAs);
void append(const String& filename, const String& content);
-#if ENABLE(INSPECTOR_SERVER)
- void sendMessageToRemoteFrontend(const String& message);
-#endif
-
bool canAttach() const { return m_canAttach; }
bool shouldOpenAttached();
@@ -260,9 +248,6 @@
GtkWidget* m_headerBar { nullptr };
String m_inspectedURLString;
#endif
-#if ENABLE(INSPECTOR_SERVER)
- int m_remoteInspectionPageId { 0 };
-#endif
};
} // namespace WebKit
Modified: trunk/Source/WebKit2/UIProcess/WebInspectorProxy.messages.in (217923 => 217924)
--- trunk/Source/WebKit2/UIProcess/WebInspectorProxy.messages.in 2017-06-08 05:02:48 UTC (rev 217923)
+++ trunk/Source/WebKit2/UIProcess/WebInspectorProxy.messages.in 2017-06-08 06:46:21 UTC (rev 217924)
@@ -44,8 +44,4 @@
SetAttachedWindowWidth(unsigned width)
StartWindowDrag()
-
-#if ENABLE(INSPECTOR_SERVER)
- SendMessageToRemoteFrontend(String message)
-#endif
}
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (217923 => 217924)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2017-06-08 05:02:48 UTC (rev 217923)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2017-06-08 06:46:21 UTC (rev 217924)
@@ -796,11 +796,6 @@
}
#endif
-#if ENABLE(INSPECTOR_SERVER)
- if (m_preferences->developerExtrasEnabled())
- inspector()->enableRemoteInspection();
-#endif
-
process().send(Messages::WebProcess::CreateWebPage(m_pageID, creationParameters()), 0);
m_needsToFinishInitializingWebPageAfterProcessLaunch = true;
@@ -3072,11 +3067,6 @@
if (!isValid())
return;
-#if ENABLE(INSPECTOR_SERVER)
- if (m_preferences->developerExtrasEnabled())
- inspector()->enableRemoteInspection();
-#endif
-
updateThrottleState();
updateHiddenPageThrottlingAutoIncreases();
Modified: trunk/Source/WebKit2/UIProcess/wpe/WebProcessPoolWPE.cpp (217923 => 217924)
--- trunk/Source/WebKit2/UIProcess/wpe/WebProcessPoolWPE.cpp 2017-06-08 05:02:48 UTC (rev 217923)
+++ trunk/Source/WebKit2/UIProcess/wpe/WebProcessPoolWPE.cpp 2017-06-08 06:46:21 UTC (rev 217924)
@@ -32,7 +32,6 @@
#include "Logging.h"
#include "NetworkProcessMessages.h"
#include "WebCookieManagerProxy.h"
-#include "WebInspectorServer.h"
#include "WebProcessCreationParameters.h"
#include "WebProcessMessages.h"
#include <_javascript_Core/RemoteInspectorServer.h>
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp (217923 => 217924)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp 2017-06-08 05:02:48 UTC (rev 217923)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp 2017-06-08 06:46:21 UTC (rev 217924)
@@ -286,30 +286,7 @@
void WebInspector::sendMessageToFrontend(const String& message)
{
-#if ENABLE(INSPECTOR_SERVER)
- if (m_remoteFrontendConnected)
- WebProcess::singleton().parentProcessConnection()->send(Messages::WebInspectorProxy::SendMessageToRemoteFrontend(message), m_page->pageID());
- else
-#endif
- m_frontendConnection->send(Messages::WebInspectorUI::SendMessageToFrontend(message), 0);
+ m_frontendConnection->send(Messages::WebInspectorUI::SendMessageToFrontend(message), 0);
}
-#if ENABLE(INSPECTOR_SERVER)
-void WebInspector::remoteFrontendConnected()
-{
- if (m_page->corePage()) {
- m_remoteFrontendConnected = true;
- m_page->corePage()->inspectorController().connectFrontend(this);
- }
-}
-
-void WebInspector::remoteFrontendDisconnected()
-{
- m_remoteFrontendConnected = false;
-
- if (m_page->corePage())
- m_page->corePage()->inspectorController().disconnectFrontend(this);
-}
-#endif
-
} // namespace WebKit
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.h (217923 => 217924)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.h 2017-06-08 05:02:48 UTC (rev 217923)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.h 2017-06-08 06:46:21 UTC (rev 217924)
@@ -83,11 +83,6 @@
void sendMessageToBackend(const String&);
-#if ENABLE(INSPECTOR_SERVER)
- void remoteFrontendConnected();
- void remoteFrontendDisconnected();
-#endif
-
void disconnectFromPage() { close(); }
private:
@@ -110,9 +105,6 @@
bool m_attached { false };
bool m_previousCanAttach { false };
-#if ENABLE(INSPECTOR_SERVER)
- bool m_remoteFrontendConnected { false };
-#endif
};
} // namespace WebKit
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.messages.in (217923 => 217924)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.messages.in 2017-06-08 05:02:48 UTC (rev 217923)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.messages.in 2017-06-08 06:46:21 UTC (rev 217924)
@@ -41,9 +41,4 @@
StopElementSelection()
SendMessageToBackend(String message)
-
-#if ENABLE(INSPECTOR_SERVER)
- RemoteFrontendConnected()
- RemoteFrontendDisconnected()
-#endif
}
