Imported WebKit commit 3db4eb1820ac8fb03065d7ea73a4d9db1e8fea1a (http://svn.webkit.org/repository/webkit/trunk@110422)

This includes build fixes for the latest qtbase/qtdeclarative as well as the final QML2 API.

1 files changed, 6 insertions, 10 deletions

diff --git a/Source/WebKit2/UIProcess/qt/QtWebContext.cpp b/Source/WebKit2/UIProcess/qt/QtWebContext.cpp
index df27961b5..a800fef15 100644
--- a/Source/WebKit2/UIProcess/qt/QtWebContext.cpp
+++ b/Source/WebKit2/UIProcess/qt/QtWebContext.cpp
@@ -45,9 +45,11 @@ static HashMap<uint64_t, QtWebContext*> contextMap;
 QtWebContext* QtWebContext::s_defaultContext = 0;
 
 QtWebContext::QtWebContext(WebContext* context)
-    : m_context(context)
+    : m_contextID(generateContextID())
+    , m_context(context)
+    , m_downloadManager(adoptPtr(new QtDownloadManager(context)))
+    , m_iconDatabase(adoptPtr(new QtWebIconDatabaseClient(this)))
 {
-    m_contextID = generateContextID();
     contextMap.set(m_contextID, this);
 }
 
@@ -72,7 +74,8 @@ PassRefPtr<QtWebContext> QtWebContext::defaultContext()
     RefPtr<WebContext> context = WebContext::sharedProcessContext();
     RefPtr<QtWebContext> defaultContext = QtWebContext::create(context.get());
     s_defaultContext = defaultContext.get();
-    defaultContext->initialize();
+    // Make sure that this doesn't get called in WebKitTestRunner (defaultContext isn't used there).
+    defaultContext->initializeContextInjectedBundleClient();
 
     return defaultContext.release();
 }
@@ -107,13 +110,6 @@ QtWebContext* QtWebContext::contextByID(uint64_t id)
     return contextMap.get(id);
 }
 
-void QtWebContext::initialize()
-{
-    m_downloadManager = adoptPtr(new QtDownloadManager(m_context.get()));
-    m_iconDatabase = adoptPtr(new QtWebIconDatabaseClient(this));
-    initializeContextInjectedBundleClient();
-}
-
 void QtWebContext::initializeContextInjectedBundleClient()
 {
     WKContextInjectedBundleClient injectedBundleClient;