diff options
Diffstat (limited to 'Source/WebKit2')
23 files changed, 80 insertions, 123 deletions
diff --git a/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.cpp b/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.cpp index 0f6855246..295e0cb48 100644 --- a/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.cpp +++ b/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.cpp @@ -50,7 +50,7 @@ DatabaseToWebProcessConnection::DatabaseToWebProcessConnection(IPC::Connection:: DatabaseToWebProcessConnection::~DatabaseToWebProcessConnection() { - + m_connection->invalidate(); } void DatabaseToWebProcessConnection::didReceiveMessage(IPC::Connection& connection, IPC::MessageDecoder& decoder) diff --git a/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.h b/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.h index a106d4161..421d65e62 100644 --- a/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.h +++ b/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.h @@ -37,7 +37,7 @@ namespace WebKit { class WebIDBConnectionToClient; -class DatabaseToWebProcessConnection : public RefCounted<DatabaseToWebProcessConnection>, public IPC::Connection::Client, public IPC::MessageSender { +class DatabaseToWebProcessConnection : public RefCounted<DatabaseToWebProcessConnection>, private IPC::Connection::Client, private IPC::MessageSender { public: static Ref<DatabaseToWebProcessConnection> create(IPC::Connection::Identifier); ~DatabaseToWebProcessConnection(); diff --git a/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp b/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp index 812919890..f73f6932a 100644 --- a/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp +++ b/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp @@ -60,6 +60,7 @@ NetworkConnectionToWebProcess::NetworkConnectionToWebProcess(IPC::Connection::Id NetworkConnectionToWebProcess::~NetworkConnectionToWebProcess() { + m_connection->invalidate(); } void NetworkConnectionToWebProcess::didCleanupResourceLoader(NetworkResourceLoader& loader) diff --git a/Source/WebKit2/PlatformQt.cmake b/Source/WebKit2/PlatformQt.cmake index 5243ef2d8..5883096eb 100644 --- a/Source/WebKit2/PlatformQt.cmake +++ b/Source/WebKit2/PlatformQt.cmake @@ -1,7 +1,7 @@ set(WebKit2_WebProcess_OUTPUT_NAME QtWebProcess) set(WebKit2_NetworkProcess_OUTPUT_NAME QtWebNetworkProcess) set(WebKit2_PluginProcess_OUTPUT_NAME QtWebPluginProcess) -set(WebKit2_DatabaseProcess_OUTPUT_NAME QtWebDatabaseProcess) +set(WebKit2_DatabaseProcess_OUTPUT_NAME QtWebStorageProcess) file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT2_DIR}) @@ -17,6 +17,8 @@ if (${JavaScriptCore_LIBRARY_TYPE} MATCHES STATIC) add_definitions(-DSTATICALLY_LINKED_WITH_WTF -DSTATICALLY_LINKED_WITH_JavaScriptCore) endif () +QTWEBKIT_SKIP_AUTOMOC(WebKit2) + #set(WebKit2_USE_PREFIX_HEADER ON) list(APPEND WebKit2_INCLUDE_DIRECTORIES @@ -257,6 +259,7 @@ if (ENABLE_NETSCAPE_PLUGIN_API) endif () list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES + ${GLIB_INCLUDE_DIRS} ${GSTREAMER_INCLUDE_DIRS} ${Qt5Quick_INCLUDE_DIRS} ${Qt5Quick_PRIVATE_INCLUDE_DIRS} @@ -280,25 +283,27 @@ list(APPEND WebProcess_SOURCES qt/MainQt.cpp ) +if (NOT SHARED_CORE) + set(WebProcess_LIBRARIES + WebKit + ) + set(NetworkProcess_LIBRARIES + WebKit + ) + set(DatabaseProcess_LIBRARIES + WebKit + ) + set(PluginProcess_LIBRARIES + WebKit + ) +endif () + # FIXME: Allow building without widgets -set(WebProcess_LIBRARIES - WebKit +list(APPEND WebProcess_LIBRARIES Qt5::Widgets WebKitWidgets ) -set(NetworkProcess_LIBRARIES - WebKit -) - -set(DatabaseProcess_LIBRARIES - WebKit -) - -set(PluginProcess_LIBRARIES - WebKit -) - list(APPEND NetworkProcess_SOURCES NetworkProcess/EntryPoint/qt/NetworkProcessMain.cpp ) @@ -324,3 +329,12 @@ WEBKIT_CREATE_FORWARDING_HEADERS(QtWebKit/private DIRECTORIES UIProcess/API/qt) if (ENABLE_API_TESTS) add_subdirectory(UIProcess/API/qt/tests) endif () + +file(GLOB WebKit2_PRIVATE_HEADERS UIProcess/API/qt/*_p.h) +install( + FILES + ${WebKit2_PRIVATE_HEADERS} + DESTINATION + ${KDE_INSTALL_INCLUDEDIR}/QtWebKit/${PROJECT_VERSION}/QtWebKit/private + COMPONENT Data +) diff --git a/Source/WebKit2/Shared/qt/ProcessExecutablePathQt.cpp b/Source/WebKit2/Shared/qt/ProcessExecutablePathQt.cpp index c5f809d34..ae14ef13e 100644 --- a/Source/WebKit2/Shared/qt/ProcessExecutablePathQt.cpp +++ b/Source/WebKit2/Shared/qt/ProcessExecutablePathQt.cpp @@ -65,4 +65,11 @@ String executablePathOfNetworkProcess() return executablePath(QStringLiteral("QtWebNetworkProcess")); } +#if ENABLE(DATABASE_PROCESS) +String executablePathOfDatabaseProcess() +{ + return executablePath(QStringLiteral("QtWebStorageProcess")); +} +#endif + } // namespace WebKit diff --git a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp index 3b84c6dba..b894d7338 100644 --- a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp +++ b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp @@ -407,6 +407,7 @@ void QQuickWebViewPrivate::initialize(WKPageConfigurationRef configurationRef) preferences.setMediaSourceEnabled(false); preferences.setWebGLEnabled(true); preferences.setForceCompositingMode(true); + preferences.setAllowFileAccessFromFileURLs(true); webPageProxy->setURLSchemeHandlerForScheme(QrcSchemeHandler::create(), ASCIILiteral("qrc")); diff --git a/Source/WebKit2/UIProcess/API/qt/qwebchannelwebkittransport.cpp b/Source/WebKit2/UIProcess/API/qt/qwebchannelwebkittransport.cpp index c6f96f094..14c4db5a3 100644 --- a/Source/WebKit2/UIProcess/API/qt/qwebchannelwebkittransport.cpp +++ b/Source/WebKit2/UIProcess/API/qt/qwebchannelwebkittransport.cpp @@ -40,10 +40,11 @@ ****************************************************************************/ #include "config.h" -#include "qwebchannelwebkittransport_p.h" #if ENABLE(QT_WEBCHANNEL) +#include "qwebchannelwebkittransport_p.h" + #include "qquickwebview_p.h" #include <QJsonDocument> diff --git a/Source/WebKit2/UIProcess/API/qt/qwebpreferences.cpp b/Source/WebKit2/UIProcess/API/qt/qwebpreferences.cpp index a056173e8..c781a97ca 100644 --- a/Source/WebKit2/UIProcess/API/qt/qwebpreferences.cpp +++ b/Source/WebKit2/UIProcess/API/qt/qwebpreferences.cpp @@ -66,10 +66,6 @@ bool QWebPreferencesPrivate::testAttribute(QWebPreferencesPrivate::WebAttribute #if ENABLE(WEBGL) case WebGLEnabled: return WKPreferencesGetWebGLEnabled(preferencesRef); -#if ENABLE(CSS_SHADERS) - case CSSCustomFilterEnabled: - return WKPreferencesGetCSSCustomFilterEnabled(preferencesRef); -#endif #endif #if ENABLE(WEB_AUDIO) case WebAudioEnabled: @@ -135,11 +131,6 @@ void QWebPreferencesPrivate::setAttribute(QWebPreferencesPrivate::WebAttribute a case WebGLEnabled: WKPreferencesSetWebGLEnabled(preferencesRef, enable); break; -#if ENABLE(CSS_SHADERS) - case CSSCustomFilterEnabled: - WKPreferencesSetCSSCustomFilterEnabled(preferencesRef, enable); - break; -#endif #endif #if ENABLE(WEB_AUDIO) case WebAudioEnabled: diff --git a/Source/WebKit2/UIProcess/API/qt/qwebpreferences_p_p.h b/Source/WebKit2/UIProcess/API/qt/qwebpreferences_p_p.h index f978a5bd2..2b4c804ff 100644 --- a/Source/WebKit2/UIProcess/API/qt/qwebpreferences_p_p.h +++ b/Source/WebKit2/UIProcess/API/qt/qwebpreferences_p_p.h @@ -38,7 +38,6 @@ public: DnsPrefetchEnabled, DeveloperExtrasEnabled, WebGLEnabled, - CSSCustomFilterEnabled, WebAudioEnabled, CaretBrowsingEnabled, NotificationsEnabled, diff --git a/Source/WebKit2/UIProcess/API/qt/tests/CMakeLists.txt b/Source/WebKit2/UIProcess/API/qt/tests/CMakeLists.txt index 899a9e038..210342ef5 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/CMakeLists.txt +++ b/Source/WebKit2/UIProcess/API/qt/tests/CMakeLists.txt @@ -84,6 +84,12 @@ set(qmltests_LIBRARIES ${Qt5Test_LIBRARIES} ) +if (SHARED_CORE) + list(APPEND qmltests_LIBRARIES + WebKit2 + ) +endif () + add_executable(tst_qmltests_WebView ${qmltests_SOURCES}) target_compile_definitions(tst_qmltests_WebView PRIVATE ${tst_qmltests_WebView_DEFINITIONS}) target_link_libraries(tst_qmltests_WebView ${qmltests_LIBRARIES}) diff --git a/Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp b/Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp index 53913fa56..51a3ffbba 100644 --- a/Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp +++ b/Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp @@ -123,6 +123,12 @@ void ProcessLauncher::launchProcess() QByteArray pluginProcessPrefix = qgetenv("QT_WEBKIT2_PP_CMD_PREFIX"); commandLine = commandLine.arg(QLatin1String(pluginProcessPrefix.constData())).arg(QString(executablePathOfPluginProcess())); #endif +#if ENABLE(DATABASE_PROCESS) + } else if (m_launchOptions.processType == ProcessType::Database) { + commandLine = QLatin1String("%1 \"%2\" %3 %4"); + QByteArray processPrefix = qgetenv("QT_WEBKIT2_DP_CMD_PREFIX"); + commandLine = commandLine.arg(QLatin1String(processPrefix.constData())).arg(QString(executablePathOfDatabaseProcess())); +#endif } else { qDebug() << "Unsupported process type" << (int)m_launchOptions.processType; ASSERT_NOT_REACHED(); diff --git a/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp b/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp index 41df0e27f..b07738bbd 100644 --- a/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp +++ b/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp @@ -76,6 +76,9 @@ PluginProcessProxy::PluginProcessProxy(PluginProcessManager* PluginProcessManage PluginProcessProxy::~PluginProcessProxy() { + if (m_connection) + m_connection->invalidate(); + ASSERT(m_pendingFetchWebsiteDataRequests.isEmpty()); ASSERT(m_pendingFetchWebsiteDataCallbacks.isEmpty()); ASSERT(m_pendingDeleteWebsiteDataRequests.isEmpty()); diff --git a/Source/WebKit2/UIProcess/qt/QtPageClient.cpp b/Source/WebKit2/UIProcess/qt/QtPageClient.cpp index 5f62dc600..53faa7647 100644 --- a/Source/WebKit2/UIProcess/qt/QtPageClient.cpp +++ b/Source/WebKit2/UIProcess/qt/QtPageClient.cpp @@ -288,12 +288,21 @@ bool QtPageClient::isFullScreen() void QtPageClient::enterFullScreen() { - notImplemented(); + if (!m_webView) + return; + + WebFullScreenManagerProxy* manager = m_eventHandler->webPageProxy()->fullScreenManager(); + manager->willEnterFullScreen(); + emit m_webView->experimental()->enterFullScreenRequested(); + manager->didEnterFullScreen(); } void QtPageClient::exitFullScreen() { - notImplemented(); + WebFullScreenManagerProxy* manager = m_eventHandler->webPageProxy()->fullScreenManager(); + manager->willExitFullScreen(); + emit m_webView->experimental()->exitFullScreenRequested(); + manager->didExitFullScreen(); } void QtPageClient::beganEnterFullScreen(const IntRect& initialFrame, const IntRect& finalFrame) diff --git a/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.h b/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.h index 2fe82e8e0..32c7f3f0d 100644 --- a/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.h +++ b/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.h @@ -93,6 +93,7 @@ public: void resetGestureRecognizers(); PageViewportControllerClientQt* viewportController() { return m_viewportController; } + WebPageProxy* webPageProxy() { return m_webPageProxy; } void startDrag(const WebCore::DragData&, PassRefPtr<ShareableBitmap> dragImage); diff --git a/Source/WebKit2/UIProcess/qt/WebFullScreenManagerProxyQt.cpp b/Source/WebKit2/UIProcess/qt/WebFullScreenManagerProxyQt.cpp deleted file mode 100644 index 2b97dc722..000000000 --- a/Source/WebKit2/UIProcess/qt/WebFullScreenManagerProxyQt.cpp +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public License - * along with this library; see the file COPYING.LIB. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ - -#include "config.h" -#include "WebFullScreenManagerProxy.h" - -#if ENABLE(FULLSCREEN_API) - -#include "WebContext.h" -#include "WebFullScreenManagerMessages.h" -#include "WebFullScreenManagerProxyMessages.h" -#include <WebCore/NotImplemented.h> - -#if HAVE(QTQUICK) -#include "qquickwebview_p.h" -#endif - -using namespace WebCore; - -namespace WebKit { - -void WebFullScreenManagerProxy::invalidate() -{ -#if HAVE(QTQUICK) - m_webView = 0; -#endif -} - -void WebFullScreenManagerProxy::close() -{ - notImplemented(); -} - -bool WebFullScreenManagerProxy::isFullScreen() -{ - notImplemented(); - return false; -} - -void WebFullScreenManagerProxy::enterFullScreen() -{ - willEnterFullScreen(); -#if HAVE(QTQUICK) - emit m_webView->experimental()->enterFullScreenRequested(); -#endif - didEnterFullScreen(); -} - -void WebFullScreenManagerProxy::exitFullScreen() -{ - willExitFullScreen(); -#if HAVE(QTQUICK) - emit m_webView->experimental()->exitFullScreenRequested(); -#endif - didExitFullScreen(); -} - -void WebFullScreenManagerProxy::beganEnterFullScreen(const IntRect& initialFrame, const IntRect& finalFrame) -{ - notImplemented(); -} - -void WebFullScreenManagerProxy::beganExitFullScreen(const IntRect& initialFrame, const IntRect& finalFrame) -{ - notImplemented(); -} - -} // namespace WebKit - -#endif // ENABLE(FULLSCREEN_API) diff --git a/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h b/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h index 35d4e8096..11dc20e17 100644 --- a/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h +++ b/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h @@ -33,7 +33,7 @@ namespace WebKit { -class WebIDBConnectionToServer final : public WebCore::IDBClient::IDBConnectionToServerDelegate, public IPC::MessageSender, public RefCounted<WebIDBConnectionToServer> { +class WebIDBConnectionToServer final : private WebCore::IDBClient::IDBConnectionToServerDelegate, private IPC::MessageSender, public RefCounted<WebIDBConnectionToServer> { public: static Ref<WebIDBConnectionToServer> create(); @@ -95,7 +95,7 @@ private: virtual IPC::Connection* messageSenderConnection() override final; - uint64_t m_identifier; + uint64_t m_identifier { 0 }; bool m_isOpenInServer { false }; RefPtr<WebCore::IDBClient::IDBConnectionToServer> m_connectionToServer; }; diff --git a/Source/WebKit2/WebProcess/Databases/WebToDatabaseProcessConnection.cpp b/Source/WebKit2/WebProcess/Databases/WebToDatabaseProcessConnection.cpp index fd51fdcde..7d132b9c9 100644 --- a/Source/WebKit2/WebProcess/Databases/WebToDatabaseProcessConnection.cpp +++ b/Source/WebKit2/WebProcess/Databases/WebToDatabaseProcessConnection.cpp @@ -46,6 +46,7 @@ WebToDatabaseProcessConnection::WebToDatabaseProcessConnection(IPC::Connection:: WebToDatabaseProcessConnection::~WebToDatabaseProcessConnection() { + m_connection->invalidate(); } void WebToDatabaseProcessConnection::didReceiveMessage(IPC::Connection& connection, IPC::MessageDecoder& decoder) diff --git a/Source/WebKit2/WebProcess/Databases/WebToDatabaseProcessConnection.h b/Source/WebKit2/WebProcess/Databases/WebToDatabaseProcessConnection.h index 9edf49842..ac7b418cf 100644 --- a/Source/WebKit2/WebProcess/Databases/WebToDatabaseProcessConnection.h +++ b/Source/WebKit2/WebProcess/Databases/WebToDatabaseProcessConnection.h @@ -41,7 +41,7 @@ class SessionID; namespace WebKit { -class WebToDatabaseProcessConnection : public RefCounted<WebToDatabaseProcessConnection>, public IPC::Connection::Client, public IPC::MessageSender { +class WebToDatabaseProcessConnection : public RefCounted<WebToDatabaseProcessConnection>, private IPC::Connection::Client, private IPC::MessageSender { public: static Ref<WebToDatabaseProcessConnection> create(IPC::Connection::Identifier connectionIdentifier) { diff --git a/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp b/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp index 5564f6a0b..9eb88e150 100644 --- a/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp +++ b/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp @@ -49,6 +49,7 @@ NetworkProcessConnection::NetworkProcessConnection(IPC::Connection::Identifier c NetworkProcessConnection::~NetworkProcessConnection() { + m_connection->invalidate(); } void NetworkProcessConnection::didReceiveMessage(IPC::Connection& connection, IPC::MessageDecoder& decoder) diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h b/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h index 1d8562b15..734ab3408 100644 --- a/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h +++ b/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h @@ -344,8 +344,8 @@ private: TimerMap m_timers; unsigned m_nextTimerID; - bool m_privateBrowsingState; - bool m_storageBlockingState; + bool m_privateBrowsingState { false }; + bool m_storageBlockingState { false }; #if PLUGIN_ARCHITECTURE(MAC) NPDrawingModel m_drawingModel; diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp index c612f0a30..e5e9a8dcf 100644 --- a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp +++ b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp @@ -213,6 +213,7 @@ NetscapePluginX11::NetscapePluginX11(NetscapePlugin& plugin, Display* display) Visual* visual = visualInfo.get()[0].visual; ASSERT(visual); + m_setWindowCallbackStruct.type = NP_SETWINDOW; m_setWindowCallbackStruct.visual = visual; m_setWindowCallbackStruct.colormap = XCreateColormap(hostDisplay, rootWindowID(), visual, AllocNone); } @@ -242,6 +243,7 @@ NetscapePluginX11::NetscapePluginX11(NetscapePlugin& plugin, Display* display, u Display* hostDisplay = x11HostDisplay(); m_npWindowID = gtk_socket_get_id(GTK_SOCKET(socket)); GdkWindow* window = gtk_widget_get_window(socket); + m_setWindowCallbackStruct.type = NP_SETWINDOW; m_setWindowCallbackStruct.display = GDK_WINDOW_XDISPLAY(window); m_setWindowCallbackStruct.visual = GDK_VISUAL_XVISUAL(gdk_window_get_visual(window)); m_setWindowCallbackStruct.depth = gdk_visual_get_depth(gdk_window_get_visual(window)); diff --git a/Source/WebKit2/WebProcess/WebPage/WebInspector.h b/Source/WebKit2/WebProcess/WebPage/WebInspector.h index 8dbf66104..f1541f640 100644 --- a/Source/WebKit2/WebProcess/WebPage/WebInspector.h +++ b/Source/WebKit2/WebProcess/WebPage/WebInspector.h @@ -37,7 +37,7 @@ namespace WebKit { class WebPage; -class WebInspector : public API::ObjectImpl<API::Object::Type::BundleInspector>, public IPC::Connection::Client, public Inspector::FrontendChannel { +class WebInspector : public API::ObjectImpl<API::Object::Type::BundleInspector>, private IPC::Connection::Client, public Inspector::FrontendChannel { public: static Ref<WebInspector> create(WebPage*); diff --git a/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.h b/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.h index d6fad8318..61d4434f4 100644 --- a/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.h +++ b/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.h @@ -39,7 +39,7 @@ namespace WebKit { class WebPage; -class WebInspectorUI : public RefCounted<WebInspectorUI>, public IPC::Connection::Client, public WebCore::InspectorFrontendClient { +class WebInspectorUI : public RefCounted<WebInspectorUI>, private IPC::Connection::Client, public WebCore::InspectorFrontendClient { public: static Ref<WebInspectorUI> create(WebPage&); |