Changeset 109121 in webkit

Timestamp:

Feb 28, 2012 10:29:12 AM (12 years ago)

Author:

jocelyn.turcotte@nokia.com

Message:

[Qt] Initialize QtWebContext as much as we can in its constructor.
​https://bugs.webkit.org/show_bug.cgi?id=79809

Reviewed by Tor Arne Vestbø.

The icon database wouldn't be initialized on the QtWebContext while in WebKitTestRunner
since it doesn't call the initialize method on it after creating it.
Remove the initialize method, move the download manager and icon database initialization
in the constructor and call initializeContextInjectedBundleClient directly in
defaultContext to prevent overriding WKTR's injected bundle client.

• UIProcess/qt/QtWebContext.cpp:

(WebKit::QtWebContext::QtWebContext):
(WebKit::QtWebContext::defaultContext):

• UIProcess/qt/QtWebContext.h:

(QtWebContext):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/qt/QtWebContext.cpp (modified) (3 diffs)
• UIProcess/qt/QtWebContext.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-02-28  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
+
+        [Qt] Initialize QtWebContext as much as we can in its constructor.
+        https://bugs.webkit.org/show_bug.cgi?id=79809
+
+        Reviewed by Tor Arne Vestbø.
+
+        The icon database wouldn't be initialized on the QtWebContext while in WebKitTestRunner
+        since it doesn't call the initialize method on it after creating it.
+        Remove the initialize method, move the download manager and icon database initialization
+        in the constructor and call initializeContextInjectedBundleClient directly in
+        defaultContext to prevent overriding WKTR's injected bundle client.
+
+        * UIProcess/qt/QtWebContext.cpp:
+        (WebKit::QtWebContext::QtWebContext):
+        (WebKit::QtWebContext::defaultContext):
+        * UIProcess/qt/QtWebContext.h:
+        (QtWebContext):
+
 2012-02-28  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit2/UIProcess/qt/QtWebContext.cpp

@@ -46 +46 @@
 
 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);
 }
@@ -73 +75 @@
     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();
@@ -106 +109 @@
 {
     return contextMap.get(id);
-}
-
-void QtWebContext::initialize()
-{
-    m_downloadManager = adoptPtr(new QtDownloadManager(m_context.get()));
-    m_iconDatabase = adoptPtr(new QtWebIconDatabaseClient(this));
-    initializeContextInjectedBundleClient();
 }
 

trunk/Source/WebKit2/UIProcess/qt/QtWebContext.h

@@ -64 +64 @@
     explicit QtWebContext(WebContext*);
 
-    void initialize();
     void initializeContextInjectedBundleClient();