diff options
Diffstat (limited to 'Source/WebKit2/UIProcess/InspectorServer')
3 files changed, 10 insertions, 10 deletions
diff --git a/Source/WebKit2/UIProcess/InspectorServer/WebSocketServer.h b/Source/WebKit2/UIProcess/InspectorServer/WebSocketServer.h index 8472eefb5..206cc6a81 100644 --- a/Source/WebKit2/UIProcess/InspectorServer/WebSocketServer.h +++ b/Source/WebKit2/UIProcess/InspectorServer/WebSocketServer.h @@ -82,7 +82,7 @@ private: String m_bindAddress; unsigned short m_port; #if PLATFORM(QT) - OwnPtr<QtTcpServerHandler> m_tcpServerHandler; + std::unique_ptr<QtTcpServerHandler> m_tcpServerHandler; #elif USE(SOUP) GRefPtr<GSocketService> m_socketService; #endif diff --git a/Source/WebKit2/UIProcess/InspectorServer/qt/WebInspectorServerQt.cpp b/Source/WebKit2/UIProcess/InspectorServer/qt/WebInspectorServerQt.cpp index 2d060d068..317508b76 100644 --- a/Source/WebKit2/UIProcess/InspectorServer/qt/WebInspectorServerQt.cpp +++ b/Source/WebKit2/UIProcess/InspectorServer/qt/WebInspectorServerQt.cpp @@ -28,6 +28,7 @@ #include "WebPageProxy.h" #include <QFile> #include <WebCore/MIMETypeRegistry.h> +#include <wtf/NeverDestroyed.h> #include <wtf/text/CString.h> #include <wtf/text/StringBuilder.h> @@ -35,7 +36,7 @@ namespace WebKit { static String remoteInspectorPagePath() { - DEFINE_STATIC_LOCAL(String, pagePath, (ASCIILiteral("/webkit/inspector/inspector.html?page="))); + static NeverDestroyed<WTF::String> pagePath(ASCIILiteral("/webkit/inspector/inspector.html?page=")); return pagePath; } @@ -84,15 +85,15 @@ void WebInspectorServer::buildPageList(Vector<char>& data, String& contentType) builder.appendLiteral("[ "); ClientMap::iterator end = m_clientMap.end(); for (ClientMap::iterator it = m_clientMap.begin(); it != end; ++it) { - WebPageProxy* webPage = it->value->page(); + WebPageProxy* webPage = it->value->inspectedPage(); if (it != m_clientMap.begin()) builder.appendLiteral(", "); builder.appendLiteral("{ \"id\": "); builder.appendNumber(it->key); builder.appendLiteral(", \"title\": \""); - builder.append(webPage->pageTitle()); + builder.append(webPage->pageLoadState().title()); builder.appendLiteral("\", \"url\": \""); - builder.append(webPage->activeURL()); + builder.append(webPage->pageLoadState().activeURL()); builder.appendLiteral("\", \"inspectorUrl\": \""); builder.append(remoteInspectorPagePath()); builder.appendNumber(it->key); diff --git a/Source/WebKit2/UIProcess/InspectorServer/qt/WebSocketServerQt.cpp b/Source/WebKit2/UIProcess/InspectorServer/qt/WebSocketServerQt.cpp index 4503104a3..fd7ad123b 100644 --- a/Source/WebKit2/UIProcess/InspectorServer/qt/WebSocketServerQt.cpp +++ b/Source/WebKit2/UIProcess/InspectorServer/qt/WebSocketServerQt.cpp @@ -25,7 +25,6 @@ #include "WebSocketServer.h" #include "WebSocketServerConnection.h" #include <WebCore/SocketStreamHandle.h> -#include <wtf/PassOwnPtr.h> using namespace WebCore; @@ -33,7 +32,7 @@ namespace WebKit { void WebSocketServer::platformInitialize() { - m_tcpServerHandler = adoptPtr(new QtTcpServerHandler(this)); + m_tcpServerHandler.reset(new QtTcpServerHandler(this)); } bool WebSocketServer::platformListen(const String& bindAddress, unsigned short port) @@ -56,9 +55,9 @@ void QtTcpServerHandler::handleNewConnection() { QTcpSocket* socket = m_serverSocket.nextPendingConnection(); ASSERT(socket); - OwnPtr<WebSocketServerConnection> conection = adoptPtr(new WebSocketServerConnection(m_webSocketServer->client(), m_webSocketServer)); - conection->setSocketHandle(SocketStreamHandle::create(socket, conection.get())); - m_webSocketServer->didAcceptConnection(conection.release()); + auto connection = std::make_unique<WebSocketServerConnection>(m_webSocketServer->client(), m_webSocketServer); + connection->setSocketHandle(SocketStreamHandle::create(socket, connection.get())); + m_webSocketServer->didAcceptConnection(WTFMove(connection)); } bool QtTcpServerHandler::listen(const String& bindAddress, unsigned short port) |