Import Qt5x2 branch of QtWebkit for Qt 5.2

Importing a new snapshot of webkit.

Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>

1 files changed, 17 insertions, 48 deletions

diff --git a/Source/WebKit2/UIProcess/qt/WebContextQt.cpp b/Source/WebKit2/UIProcess/qt/WebContextQt.cpp
index 726e62408..7661559fe 100644
--- a/Source/WebKit2/UIProcess/qt/WebContextQt.cpp
+++ b/Source/WebKit2/UIProcess/qt/WebContextQt.cpp
@@ -28,42 +28,23 @@
 #include "WebContext.h"
 
 #include "ApplicationCacheStorage.h"
-#include "FileSystem.h"
-#include "QtDefaultDataLocation.h"
-#include "QtWebContext.h"
 #include "WKSharedAPICast.h"
+#include "WebProcessCreationParameters.h"
+#include <QProcess>
+
 #if ENABLE(GEOLOCATION)
+#include "WebGeolocationManagerProxy.h"
 #include "WebGeolocationProviderQt.h"
 #endif
-#include "WebProcessCreationParameters.h"
-#include <QCoreApplication>
-#include <QDir>
-#include <QProcess>
 
 namespace WebKit {
 
-static QString s_defaultDatabaseDirectory;
-static QString s_defaultLocalStorageDirectory;
-static QString s_defaultCookieStorageDirectory;
-
-String WebContext::platformDefaultDiskCacheDirectory() const
-{
-    static String s_defaultDiskCacheDirectory;
-
-    if (!s_defaultDiskCacheDirectory.isEmpty())
-        return s_defaultDiskCacheDirectory;
-
-    s_defaultDiskCacheDirectory = WebCore::pathByAppendingComponent(defaultDataLocation(), "cache/");
-    WebCore::makeAllDirectories(s_defaultDiskCacheDirectory);
-    return s_defaultDiskCacheDirectory;
-}
-
-String WebContext::applicationCacheDirectory()
+String WebContext::platformDefaultApplicationCacheDirectory() const
 {
     const String cacheDirectory = WebCore::cacheStorage().cacheDirectory();
 
     if (cacheDirectory.isEmpty())
-        return platformDefaultDiskCacheDirectory();
+        return diskCacheDirectory();
 
     return cacheDirectory;
 }
@@ -71,51 +52,39 @@ String WebContext::applicationCacheDirectory()
 void WebContext::platformInitializeWebProcess(WebProcessCreationParameters& parameters)
 {
     qRegisterMetaType<QProcess::ExitStatus>("QProcess::ExitStatus");
-#if ENABLE(GEOLOCATION)
-    static WebGeolocationProviderQt* location = WebGeolocationProviderQt::create(toAPI(geolocationManagerProxy()));
-    WKGeolocationManagerSetProvider(toAPI(geolocationManagerProxy()), WebGeolocationProviderQt::provider(location));
+#if ENABLE(GEOLOCATION) && HAVE(QTLOCATION)
+    static WebGeolocationProviderQt* location = WebGeolocationProviderQt::create(toAPI(supplement<WebGeolocationManagerProxy>()));
+    WKGeolocationManagerSetProvider(toAPI(supplement<WebGeolocationManagerProxy>()), WebGeolocationProviderQt::provider(location));
 #endif
 }
 
 void WebContext::platformInvalidateContext()
 {
-#if HAVE(QTQUICK)
-    QtWebContext::invalidateContext(this);
-#endif
 }
 
 String WebContext::platformDefaultDatabaseDirectory() const
 {
-    if (!s_defaultDatabaseDirectory.isEmpty())
-        return s_defaultDatabaseDirectory;
-
-    s_defaultDatabaseDirectory = defaultDataLocation() + QLatin1String("Databases");
-    QDir().mkpath(s_defaultDatabaseDirectory);
-    return s_defaultDatabaseDirectory;
+    return String();
 }
 
 String WebContext::platformDefaultIconDatabasePath() const
 {
-    return defaultDataLocation() + QLatin1String("WebpageIcons.db");
+    return String();
 }
 
 String WebContext::platformDefaultLocalStorageDirectory() const
 {
-    if (!s_defaultLocalStorageDirectory.isEmpty())
-        return s_defaultLocalStorageDirectory;
+    return String();
+}
 
-    s_defaultLocalStorageDirectory = defaultDataLocation() + QLatin1String("LocalStorage");
-    QDir().mkpath(s_defaultLocalStorageDirectory);
-    return s_defaultLocalStorageDirectory;
+String WebContext::platformDefaultDiskCacheDirectory() const
+{
+    return String();
 }
 
 String WebContext::platformDefaultCookieStorageDirectory() const
 {
-    if (!s_defaultCookieStorageDirectory.isEmpty())
-        return s_defaultCookieStorageDirectory;
-
-    s_defaultCookieStorageDirectory = defaultDataLocation();
-    return s_defaultCookieStorageDirectory;
+    return String();
 }
 
 } // namespace WebKit