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, 8 insertions, 18 deletions

diff --git a/Source/WebKit2/UIProcess/qt/QtWebIconDatabaseClient.h b/Source/WebKit2/UIProcess/qt/QtWebIconDatabaseClient.h
index 97197d8d6..69b7965ed 100644
--- a/Source/WebKit2/UIProcess/qt/QtWebIconDatabaseClient.h
+++ b/Source/WebKit2/UIProcess/qt/QtWebIconDatabaseClient.h
@@ -21,47 +21,37 @@
 #ifndef QtWebIconDatabaseClient_h
 #define QtWebIconDatabaseClient_h
 
-#include "WKIconDatabase.h"
 #include "qwebkitglobal.h"
 #include <QtCore/QObject>
-#include <QtCore/QSize>
-#include <wtf/RefPtr.h>
-#include <wtf/Threading.h>
+#include <WKIconDatabase.h>
 
 QT_BEGIN_NAMESPACE
 class QImage;
 class QUrl;
 QT_END_NAMESPACE
 
-namespace WTF {
-class String;
-}
-
 namespace WebKit {
 
-class WebContext;
-class WebIconDatabase;
-
 class QtWebIconDatabaseClient : public QObject {
     Q_OBJECT
 
 public:
-    QtWebIconDatabaseClient(WebContext*);
+    QtWebIconDatabaseClient(WKContextRef);
     ~QtWebIconDatabaseClient();
 
-    WTF::String iconForPageURL(const WTF::String& pageURL);
-    QImage iconImageForPageURL(const WTF::String& pageURL, const QSize& iconSize = QSize(32, 32));
+    QImage iconImageForPageURL(const QString&);
+
+    void retainIconForPageURL(const QString&);
+    void releaseIconForPageURL(const QString&);
 
-    void retainIconForPageURL(const WTF::String&);
-    void releaseIconForPageURL(const WTF::String&);
+    static unsigned updateID();
 
 public:
     Q_SIGNAL void iconChangedForPageURL(const QString& pageURL);
 
 private:
     static void didChangeIconForPageURL(WKIconDatabaseRef, WKURLRef pageURL, const void* clientInfo);
-    RefPtr<WebKit::WebIconDatabase> m_iconDatabase;
-    Mutex m_imageLock;
+    WKIconDatabaseRef m_iconDatabase;
 };
 
 } // namespace WebKit