diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-24 17:03:20 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-24 17:03:20 +0200 |
| commit | 08d4a74d56ca431877819fc4566e27eafe150342 (patch) | |
| tree | ebd8530838ab390c015c6b7e659a22852c1663ae /Source/WebKit2/UIProcess/WebContext.cpp | |
| parent | 1de6cd4794bbd5a52189384189a2b8df1848b39b (diff) | |
| download | qtwebkit-08d4a74d56ca431877819fc4566e27eafe150342.tar.gz | |
Imported WebKit commit 0fbd41c4e13f5a190faf160bf993eee614e6e18e (http://svn.webkit.org/repository/webkit/trunk@123477)
New snapshot that adapts to latest Qt API changes
Diffstat (limited to 'Source/WebKit2/UIProcess/WebContext.cpp')
| -rw-r--r-- | Source/WebKit2/UIProcess/WebContext.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Source/WebKit2/UIProcess/WebContext.cpp b/Source/WebKit2/UIProcess/WebContext.cpp index c9c0b94df..22e4e2006 100644 --- a/Source/WebKit2/UIProcess/WebContext.cpp +++ b/Source/WebKit2/UIProcess/WebContext.cpp @@ -146,7 +146,9 @@ WebContext::WebContext(ProcessModel processModel, const String& injectedBundlePa , m_batteryManagerProxy(WebBatteryManagerProxy::create(this)) #endif , m_cookieManagerProxy(WebCookieManagerProxy::create(this)) +#if ENABLE(SQL_DATABASE) , m_databaseManagerProxy(WebDatabaseManagerProxy::create(this)) +#endif , m_geolocationManagerProxy(WebGeolocationManagerProxy::create(this)) , m_iconDatabase(WebIconDatabase::create(this)) , m_keyValueStorageManagerProxy(WebKeyValueStorageManagerProxy::create(this)) @@ -210,8 +212,10 @@ WebContext::~WebContext() m_cookieManagerProxy->invalidate(); m_cookieManagerProxy->clearContext(); +#if ENABLE(SQL_DATABASE) m_databaseManagerProxy->invalidate(); m_databaseManagerProxy->clearContext(); +#endif m_geolocationManagerProxy->invalidate(); m_geolocationManagerProxy->clearContext(); @@ -381,8 +385,10 @@ bool WebContext::shouldTerminate(WebProcessProxy* process) return false; if (!m_cookieManagerProxy->shouldTerminate(process)) return false; +#if ENABLE(SQL_DATABASE) if (!m_databaseManagerProxy->shouldTerminate(process)) return false; +#endif if (!m_keyValueStorageManagerProxy->shouldTerminate(process)) return false; if (!m_mediaCacheManagerProxy->shouldTerminate(process)) @@ -438,7 +444,9 @@ void WebContext::disconnectProcess(WebProcessProxy* process) m_batteryManagerProxy->invalidate(); #endif m_cookieManagerProxy->invalidate(); +#if ENABLE(SQL_DATABASE) m_databaseManagerProxy->invalidate(); +#endif m_geolocationManagerProxy->invalidate(); m_keyValueStorageManagerProxy->invalidate(); m_mediaCacheManagerProxy->invalidate(); @@ -788,10 +796,12 @@ void WebContext::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::Mes return; } +#if ENABLE(SQL_DATABASE) if (messageID.is<CoreIPC::MessageClassWebDatabaseManagerProxy>()) { m_databaseManagerProxy->didReceiveWebDatabaseManagerProxyMessage(connection, messageID, arguments); return; } +#endif if (messageID.is<CoreIPC::MessageClassWebGeolocationManagerProxy>()) { m_geolocationManagerProxy->didReceiveMessage(connection, messageID, arguments); |