From d441d6f39bb846989d95bcf5caf387b42414718d Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 13 Sep 2013 12:51:20 +0200 Subject: Import Qt5x2 branch of QtWebkit for Qt 5.2 Importing a new snapshot of webkit. Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c Reviewed-by: Allan Sandfeld Jensen --- .../WebKit2/WebProcess/NetworkInfo/WebNetworkInfoManager.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Source/WebKit2/WebProcess/NetworkInfo/WebNetworkInfoManager.h') diff --git a/Source/WebKit2/WebProcess/NetworkInfo/WebNetworkInfoManager.h b/Source/WebKit2/WebProcess/NetworkInfo/WebNetworkInfoManager.h index ee3282f4f..2768153c8 100644 --- a/Source/WebKit2/WebProcess/NetworkInfo/WebNetworkInfoManager.h +++ b/Source/WebKit2/WebProcess/NetworkInfo/WebNetworkInfoManager.h @@ -31,21 +31,24 @@ #include "MessageReceiver.h" #include "WebCoreArgumentCoders.h" #include "WebNetworkInfo.h" +#include "WebProcessSupplement.h" #include #include #include namespace WebKit { -class WebProcess; class WebPage; +class WebProcess; -class WebNetworkInfoManager : private CoreIPC::MessageReceiver { +class WebNetworkInfoManager : public WebProcessSupplement, private CoreIPC::MessageReceiver { WTF_MAKE_NONCOPYABLE(WebNetworkInfoManager); public: explicit WebNetworkInfoManager(WebProcess*); ~WebNetworkInfoManager(); + static const char* supplementName(); + void registerWebPage(WebPage*); void unregisterWebPage(WebPage*); @@ -53,10 +56,7 @@ public: bool metered(WebPage*) const; private: // CoreIPC::MessageReceiver - void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) OVERRIDE; - - // Implemented in generated WebNetworkInfoManagerMessageReceiver.cpp - void didReceiveWebNetworkInfoManagerMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&); + void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE; void didChangeNetworkInformation(const AtomicString& eventType, const WebNetworkInfo::Data&); -- cgit v1.2.1