Changeset 145516 in webkit

Timestamp:

Mar 12, 2013 4:14:42 AM (11 years ago)

Author:

jocelyn.turcotte@digia.com

Message:

[Qt] Properly layer QtWebContext on top of the C API
​https://bugs.webkit.org/show_bug.cgi?id=108475

Reviewed by Simon Hausmann.
Signed off for WebKit2 by Benjamin Poulain.

• UIProcess/API/qt/qquickwebview.cpp:

(QQuickWebViewPrivate::initialize):

• UIProcess/qt/QtWebContext.cpp:

(WebKit::initializeContextInjectedBundleClient):
(WebKit::QtWebContext::QtWebContext):
(WebKit::QtWebContext::create):
(WebKit::QtWebContext::defaultContext):

• UIProcess/qt/QtWebContext.h:

(WebKit):
(QtWebContext):
(WebKit::QtWebContext::context):

Location:

trunk/Source/WebKit2

Files:

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

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-02-14  Jocelyn Turcotte  <jocelyn.turcotte@digia.com>
+
+        [Qt] Properly layer QtWebContext on top of the C API
+        https://bugs.webkit.org/show_bug.cgi?id=108475
+
+        Reviewed by Simon Hausmann.
+        Signed off for WebKit2 by Benjamin Poulain.
+
+        * UIProcess/API/qt/qquickwebview.cpp:
+        (QQuickWebViewPrivate::initialize):
+        * UIProcess/qt/QtWebContext.cpp:
+        (WebKit::initializeContextInjectedBundleClient):
+        (WebKit::QtWebContext::QtWebContext):
+        (WebKit::QtWebContext::create):
+        (WebKit::QtWebContext::defaultContext):
+        * UIProcess/qt/QtWebContext.h:
+        (WebKit):
+        (QtWebContext):
+        (WebKit::QtWebContext::context):
+
 2013-02-14  Jocelyn Turcotte  <jocelyn.turcotte@digia.com>
 

trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp

@@ -35 +35 @@
 #include "QtWebPagePolicyClient.h"
 #include "WebBackForwardList.h"
+#include "WebContext.h"
 #include "WebFindOptions.h"
 #if ENABLE(INSPECTOR_SERVER)
@@ -322 +323 @@
         pageGroup = adoptWK(WKPageGroupCreateWithIdentifier(0));
 
-    context = contextRef ? QtWebContext::create(toImpl(contextRef)) : QtWebContext::defaultContext();
-    webPageProxy = context->createWebPage(&pageClient, toImpl(pageGroup.get()));
+    context = contextRef ? QtWebContext::create(contextRef) : QtWebContext::defaultContext();
+    webPageProxy = toImpl(context->context())->createWebPage(&pageClient, toImpl(pageGroup.get()));
     webPage = toAPI(webPageProxy.get());
     pageToView()->insert(webPage.get(), this);

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

@@ -24 +24 @@
 #include "QtDownloadManager.h"
 #include "QtWebIconDatabaseClient.h"
-#include "WKAPICast.h"
-#include "WebContext.h"
 #include "WebInspectorServer.h"
 #include "qquickwebview_p_p.h"
+#include <WKAPICast.h>
 #include <WKArray.h>
 #include <WKPage.h>
@@ -103 +102 @@
 }
 
-static void initializeContextInjectedBundleClient(WebContext* context)
+static void initializeContextInjectedBundleClient(WKContextRef context)
 {
     WKContextInjectedBundleClient injectedBundleClient;
@@ -109 +108 @@
     injectedBundleClient.version = kWKContextInjectedBundleClientCurrentVersion;
     injectedBundleClient.didReceiveMessageFromInjectedBundle = didReceiveMessageFromInjectedBundle;
-    WKContextSetInjectedBundleClient(toAPI(context), &injectedBundleClient);
+    WKContextSetInjectedBundleClient(context, &injectedBundleClient);
 }
 
-QtWebContext::QtWebContext(PassRefPtr<WebContext> context)
+QtWebContext::QtWebContext(WKContextRef context)
     : m_context(context)
-    , m_downloadManager(new QtDownloadManager(m_context.get()))
-    , m_iconDatabase(new QtWebIconDatabaseClient(m_context.get()))
+    , m_downloadManager(new QtDownloadManager(toImpl(context)))
+    , m_iconDatabase(new QtWebIconDatabaseClient(toImpl(context)))
 {
 }
@@ -124 +123 @@
 
 // Used directly only by WebKitTestRunner.
-QtWebContext* QtWebContext::create(PassRefPtr<WebContext> context)
+QtWebContext* QtWebContext::create(WKContextRef context)
 {
     globalInitialization();
@@ -133 +132 @@
 {
     if (!s_defaultQtWebContext) {
-        RefPtr<WebContext> webContext = WebContext::create(String());
+        WKRetainPtr<WKContextRef> wkContext = adoptWK(WKContextCreate());
         // Make sure for WebKitTestRunner that the injected bundle client isn't initialized
         // and that the page cache isn't enabled (defaultContext() isn't used there).
-        initializeContextInjectedBundleClient(webContext.get());
+        initializeContextInjectedBundleClient(wkContext.get());
         // A good all-around default.
-        webContext->setCacheModel(CacheModelDocumentBrowser);
+        WKContextSetCacheModel(wkContext.get(), kWKCacheModelDocumentBrowser);
 
-        s_defaultQtWebContext = QtWebContext::create(webContext.release());
+        s_defaultQtWebContext = QtWebContext::create(wkContext.get());
     }
 
@@ -146 +145 @@
 }
 
-PassRefPtr<WebPageProxy> QtWebContext::createWebPage(PageClient* client, WebPageGroup* pageGroup)
-{
-    return m_context->createWebPage(client, pageGroup);
-}
-
 } // namespace WebKit
 

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

@@ -25 +25 @@
 #include <QtGlobal>
 #include <WKContext.h>
-#include <wtf/OwnPtr.h>
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefCounted.h>
-#include <wtf/RefPtr.h>
+#include <WKRetainPtr.h>
 
 namespace WebKit {
 
-class PageClient;
 class QtDownloadManager;
 class QtWebIconDatabaseClient;
-class WebContext;
-class WebPageGroup;
-class WebPageProxy;
 
 class QtWebContext {
@@ -43 +36 @@
     ~QtWebContext();
 
-    static QtWebContext* create(PassRefPtr<WebContext>);
+    static QtWebContext* create(WKContextRef);
     static QtWebContext* defaultContext();
 
-    PassRefPtr<WebPageProxy> createWebPage(PageClient*, WebPageGroup*);
-
-    WebContext* context() { return m_context.get(); }
+    WKContextRef context() { return m_context.get(); }
 
     QtDownloadManager* downloadManager() { return m_downloadManager.data(); }
@@ -54 +45 @@
 
 private:
-    explicit QtWebContext(PassRefPtr<WebContext>);
+    explicit QtWebContext(WKContextRef);
 
-    RefPtr<WebContext> m_context;
+    WKRetainPtr<WKContextRef> m_context;
     QScopedPointer<QtDownloadManager> m_downloadManager;
     QScopedPointer<QtWebIconDatabaseClient> m_iconDatabase;