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, 3 insertions, 15 deletions

diff --git a/Source/WebKit2/UIProcess/qt/QtWebContext.h b/Source/WebKit2/UIProcess/qt/QtWebContext.h
index a1e12ff0f..2fa39f8c0 100644
--- a/Source/WebKit2/UIProcess/qt/QtWebContext.h
+++ b/Source/WebKit2/UIProcess/qt/QtWebContext.h
@@ -51,30 +51,18 @@ public:
     PassRefPtr<WebPageProxy> createWebPage(PageClient*, WebPageGroup*);
 
     WebContext* context() { return m_context.get(); }
-    QtDownloadManager* downloadManager() { return m_downloadManager.get(); }
-    QtWebIconDatabaseClient* iconDatabase() { return m_iconDatabase.get(); }
 
     void setNavigatorQtObjectEnabled(WebPageProxy*, bool);
     void postMessageToNavigatorQtObject(WebPageProxy*, const QString&);
 
-    uint64_t contextID() const { return m_contextID; }
-
-    static QtWebContext* contextByID(uint64_t id);
+    static QtDownloadManager* downloadManager();
+    static QtWebIconDatabaseClient* iconDatabase();
+    static void invalidateContext(WebContext*);
 
 private:
     explicit QtWebContext(WebContext*);
 
-    void initializeContextInjectedBundleClient();
-
-    static void didReceiveMessageFromInjectedBundle(WKContextRef, WKStringRef messageName, WKTypeRef messageBody, const void*);
-    void didReceiveMessageFromInjectedBundle(WKStringRef messageName, WKTypeRef messageBody);
-
-    static QtWebContext* s_defaultContext;
-
-    uint64_t m_contextID;
     RefPtr<WebContext> m_context;
-    OwnPtr<QtDownloadManager> m_downloadManager;
-    OwnPtr<QtWebIconDatabaseClient> m_iconDatabase;
 };
 
 } // namespace WebKit