From 9daf1655d7e4eaaa6ed5f44055a4b4fd399fd25c Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Wed, 28 Sep 2016 16:39:37 +0300 Subject: Imported WebKit commit eb954cdcf58f9b915b2fcb6f8e4cb3a60650a4f3 Change-Id: I8dda875c38075d43b76fe3a21acb0ffa102bb82d Reviewed-by: Konstantin Tokarev --- Source/WebKit2/UIProcess/qt/WebProcessPoolQt.cpp | 76 ++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 Source/WebKit2/UIProcess/qt/WebProcessPoolQt.cpp (limited to 'Source/WebKit2/UIProcess/qt/WebProcessPoolQt.cpp') diff --git a/Source/WebKit2/UIProcess/qt/WebProcessPoolQt.cpp b/Source/WebKit2/UIProcess/qt/WebProcessPoolQt.cpp new file mode 100644 index 000000000..11ef5e380 --- /dev/null +++ b/Source/WebKit2/UIProcess/qt/WebProcessPoolQt.cpp @@ -0,0 +1,76 @@ +/* + * Copyright (C) 2010 Apple Inc. All rights reserved. + * Copyright (C) 2010 University of Szeged + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. 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. + * + * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS 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 APPLE INC. OR ITS 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. + */ + +#include "config.h" +#include "WebProcessPool.h" + +#include "WKSharedAPICast.h" +#include "WebProcessCreationParameters.h" +#include +#include + +#if ENABLE(GEOLOCATION) +#include "WebGeolocationManagerProxy.h" +#include "WebGeolocationProviderQt.h" +#endif + +namespace WebKit { + +String WebProcessPool::legacyPlatformDefaultApplicationCacheDirectory() +{ + const String cacheDirectory = WebCore::cacheStorage().cacheDirectory(); + + if (cacheDirectory.isEmpty()) + return diskCacheDirectory(); + + return cacheDirectory; +} + +void WebProcessPool::platformInitializeWebProcess(WebProcessCreationParameters& parameters) +{ + qRegisterMetaType("QProcess::ExitStatus"); +#if ENABLE(GEOLOCATION) && HAVE(QTPOSITIONING) + static WebGeolocationProviderQt* location = WebGeolocationProviderQt::create(toAPI(supplement())); + WKGeolocationManagerSetProvider(toAPI(supplement()), WebGeolocationProviderQt::provider(location)); +#endif +} + +void WebProcessPool::platformInvalidateContext() +{ +} + + +String WebProcessPool::platformDefaultIconDatabasePath() const +{ + return String(); +} + +String WebProcessPool::platformDefaultLocalStorageDirectory() const +{ + return String(); +} + +} // namespace WebKit -- cgit v1.2.1 From 4bd713d56aa9bb86bc96ea9cb0c64cbf94bf43d4 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Mon, 24 Apr 2017 22:40:03 +0300 Subject: Import WebKit commit 3040e0455efecd271f1aeef53cf287e75486a70d Change-Id: I7df106cef8ce93ce33e49ad6fb0d202cd066d87c Reviewed-by: Konstantin Tokarev --- Source/WebKit2/UIProcess/qt/WebProcessPoolQt.cpp | 46 ++++++++++++++++++++---- 1 file changed, 39 insertions(+), 7 deletions(-) (limited to 'Source/WebKit2/UIProcess/qt/WebProcessPoolQt.cpp') diff --git a/Source/WebKit2/UIProcess/qt/WebProcessPoolQt.cpp b/Source/WebKit2/UIProcess/qt/WebProcessPoolQt.cpp index 11ef5e380..e2662a7d7 100644 --- a/Source/WebKit2/UIProcess/qt/WebProcessPoolQt.cpp +++ b/Source/WebKit2/UIProcess/qt/WebProcessPoolQt.cpp @@ -27,10 +27,14 @@ #include "config.h" #include "WebProcessPool.h" +#include "NetworkProcessCreationParameters.h" +#include "QtWebContext.h" #include "WKSharedAPICast.h" +#include "WebCookieManagerProxy.h" #include "WebProcessCreationParameters.h" #include #include +#include #if ENABLE(GEOLOCATION) #include "WebGeolocationManagerProxy.h" @@ -41,12 +45,14 @@ namespace WebKit { String WebProcessPool::legacyPlatformDefaultApplicationCacheDirectory() { - const String cacheDirectory = WebCore::cacheStorage().cacheDirectory(); +// QTFIXME +// const String cacheDirectory = WebCore::cacheStorage().cacheDirectory(); - if (cacheDirectory.isEmpty()) - return diskCacheDirectory(); +// if (cacheDirectory.isEmpty()) +// return diskCacheDirectory(); - return cacheDirectory; +// return cacheDirectory; + return API::WebsiteDataStore::defaultApplicationCacheDirectory(); } void WebProcessPool::platformInitializeWebProcess(WebProcessCreationParameters& parameters) @@ -62,15 +68,41 @@ void WebProcessPool::platformInvalidateContext() { } +void WebProcessPool::platformInitializeNetworkProcess(NetworkProcessCreationParameters& parameters) +{ + // QTFIXME + parameters.cookiePersistentStoragePath = QtWebContext::preparedStoragePath(QtWebContext::CookieStorage); + parameters.languages = WebCore::userPreferredLanguages(); +} String WebProcessPool::platformDefaultIconDatabasePath() const { - return String(); + return WebKit::QtWebContext::preparedStoragePath(WebKit::QtWebContext::IconDatabaseStorage); +} + +String WebProcessPool::legacyPlatformDefaultLocalStorageDirectory() +{ + return WebKit::QtWebContext::preparedStoragePath(WebKit::QtWebContext::LocalStorage); +} + +String WebProcessPool::legacyPlatformDefaultIndexedDBDatabaseDirectory() +{ + return WebKit::QtWebContext::preparedStoragePath(WebKit::QtWebContext::DatabaseStorage); +} + +String WebProcessPool::legacyPlatformDefaultWebSQLDatabaseDirectory() +{ + return WebKit::QtWebContext::preparedStoragePath(WebKit::QtWebContext::DatabaseStorage); +} + +String WebProcessPool::legacyPlatformDefaultMediaKeysStorageDirectory() +{ + return String(); // QTFIXME: Add MediaKeys path } -String WebProcessPool::platformDefaultLocalStorageDirectory() const +String WebProcessPool::legacyPlatformDefaultNetworkCacheDirectory() { - return String(); + return WebKit::QtWebContext::preparedStoragePath(WebKit::QtWebContext::DiskCacheStorage); } } // namespace WebKit -- cgit v1.2.1