Imported WebKit commit 20271caf2e2c016d5cef40184cddeefeac4f1876 (http://svn.webkit.org/repository/webkit/trunk@133733)

New snapshot that contains all previous fixes as well as build fix for latest QtMultimedia API changes.

1 files changed, 2 insertions, 3 deletions

diff --git a/Source/WebKit2/UIProcess/qt/QtWebIconDatabaseClient.h b/Source/WebKit2/UIProcess/qt/QtWebIconDatabaseClient.h
index 65e86e18c..97197d8d6 100644
--- a/Source/WebKit2/UIProcess/qt/QtWebIconDatabaseClient.h
+++ b/Source/WebKit2/UIProcess/qt/QtWebIconDatabaseClient.h
@@ -39,14 +39,14 @@ class String;
 
 namespace WebKit {
 
-class QtWebContext;
+class WebContext;
 class WebIconDatabase;
 
 class QtWebIconDatabaseClient : public QObject {
     Q_OBJECT
 
 public:
-    QtWebIconDatabaseClient(QtWebContext*);
+    QtWebIconDatabaseClient(WebContext*);
     ~QtWebIconDatabaseClient();
 
     WTF::String iconForPageURL(const WTF::String& pageURL);
@@ -60,7 +60,6 @@ public:
 
 private:
     static void didChangeIconForPageURL(WKIconDatabaseRef, WKURLRef pageURL, const void* clientInfo);
-    uint64_t m_contextId;
     RefPtr<WebKit::WebIconDatabase> m_iconDatabase;
     Mutex m_imageLock;
 };