Changeset 73716 in webkit


Ignore:
Timestamp:
Dec 10, 2010 4:03:13 AM (13 years ago)
Author:
jocelyn.turcotte@nokia.com
Message:

2010-12-10 Jocelyn Turcotte <​jocelyn.turcotte@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Qt][WK2] Add the QWKContext API class to wrap the WebContext.
​https://bugs.webkit.org/show_bug.cgi?id=50750

  • UIProcess/API/qt/WKView.h:
  • UIProcess/API/qt/qgraphicswkview.cpp: (QGraphicsWKView::QGraphicsWKView): Change the WKPageNamespaceRef argument to QWKContext*
  • UIProcess/API/qt/qgraphicswkview.h:
  • UIProcess/API/qt/qwkcontext.cpp: Added.
  • UIProcess/API/qt/qwkcontext.h: Added.
  • UIProcess/API/qt/qwkcontext_p.h: Added.
  • UIProcess/API/qt/qwkpage.cpp: (QWKPagePrivate::QWKPagePrivate): (QWKPage::QWKPage): Change the WKPageNamespaceRef argument to QWKContext*
  • UIProcess/API/qt/qwkpage.h:
  • UIProcess/API/qt/qwkpage_p.h:
  • WebKit2.pro:

2010-12-10 Jocelyn Turcotte <​jocelyn.turcotte@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Qt][WK2] Add the QWKContext API class to wrap the WebContext.
​https://bugs.webkit.org/show_bug.cgi?id=50750

  • MiniBrowser/qt/BrowserView.cpp: (BrowserView::BrowserView):
  • MiniBrowser/qt/BrowserView.h:
  • WebKitTestRunner/qt/PlatformWebViewQt.cpp: (WTR::WebView::WebView):
Location:
trunk
Files:
1 added
12 edited
2 copied

Legend:

Unmodified
Added
Removed

  • trunk/WebKit2/ChangeLog

    r73709 r73716  
     12010-12-10  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
     2
     3        Reviewed by Kenneth Rohde Christiansen.
     4
     5        [Qt][WK2] Add the QWKContext API class to wrap the WebContext.
     6        https://bugs.webkit.org/show_bug.cgi?id=50750
     7
     8        * UIProcess/API/qt/WKView.h:
     9        * UIProcess/API/qt/qgraphicswkview.cpp:
     10        (QGraphicsWKView::QGraphicsWKView):
     11        Change the WKPageNamespaceRef argument to QWKContext*
     12        * UIProcess/API/qt/qgraphicswkview.h:
     13        * UIProcess/API/qt/qwkcontext.cpp: Added.
     14        * UIProcess/API/qt/qwkcontext.h: Added.
     15        * UIProcess/API/qt/qwkcontext_p.h: Added.
     16        * UIProcess/API/qt/qwkpage.cpp:
     17        (QWKPagePrivate::QWKPagePrivate):
     18        (QWKPage::QWKPage):
     19        Change the WKPageNamespaceRef argument to QWKContext*
     20        * UIProcess/API/qt/qwkpage.h:
     21        * UIProcess/API/qt/qwkpage_p.h:
     22        * WebKit2.pro:
     23
    1242010-12-10  Kimmo Kinnunen  <kimmo.t.kinnunen@nokia.com>
    225

  • trunk/WebKit2/UIProcess/API/qt/WKView.h

    r72039 r73716  
    2222
    2323#include <WebKit2/qgraphicswkview.h>
     24#include <WebKit2/qwkcontext.h>
    2425#include <WebKit2/qwkpage.h>
    2526#include <WebKit2/qwkpreferences.h>

  • trunk/WebKit2/UIProcess/API/qt/qgraphicswkview.cpp

    r73036 r73716  
    5858};
    5959
    60 QGraphicsWKView::QGraphicsWKView(WKPageNamespaceRef pageNamespaceRef, BackingStoreType backingStoreType, QGraphicsItem* parent)
     60QGraphicsWKView::QGraphicsWKView(QWKContext* context, BackingStoreType backingStoreType, QGraphicsItem* parent)
    6161    : QGraphicsWidget(parent)
    6262    , d(new QGraphicsWKViewPrivate(this))
    … …  
    8080    }
    8181
    82     d->page = new QWKPage(pageNamespaceRef);
     82    d->page = new QWKPage(context);
    8383    d->page->d->init(size().toSize(), drawingAreaProxy);
    8484    connect(d->page, SIGNAL(titleChanged(QString)), this, SIGNAL(titleChanged(QString)));

  • trunk/WebKit2/UIProcess/API/qt/qgraphicswkview.h

    r72202 r73716  
    1212QT_END_NAMESPACE
    1313
     14class QWKContext;
    1415class QGraphicsWKViewPrivate;
    1516
    … …  
    2425public:
    2526    enum BackingStoreType { Simple, Tiled };
    26     QGraphicsWKView(WKPageNamespaceRef namespaceRef, BackingStoreType backingStoreType = Simple, QGraphicsItem* parent = 0);
     27    QGraphicsWKView(QWKContext* context, BackingStoreType backingStoreType = Simple, QGraphicsItem* parent = 0);
    2728
    2829    virtual ~QGraphicsWKView();

  • trunk/WebKit2/UIProcess/API/qt/qwkcontext.h

    r73715 r73716  
    1818*/
    1919
    20 #ifndef WKView_h
    21 #define WKView_h
     20#ifndef qwkcontext_h
     21#define qwkcontext_h
    2222
    23 #include <WebKit2/qgraphicswkview.h>
    24 #include <WebKit2/qwkpage.h>
    25 #include <WebKit2/qwkpreferences.h>
     23#include "qwebkitglobal.h"
     24#include <QObject>
     25#include <WebKit2/WKPageNamespace.h>
    2626
    27 #endif /* WKView_h */
     27class QWKContextPrivate;
     28
     29class QWEBKIT_EXPORT QWKContext : public QObject {
     30    Q_OBJECT
     31public:
     32    QWKContext(QObject* parent = 0);
     33    virtual ~QWKContext();
     34
     35    // Bridge from the C API
     36    QWKContext(WKPageNamespaceRef pageNamespaceRef, QObject* parent = 0);
     37
     38private:
     39    QWKContextPrivate* d;
     40
     41    friend class QWKPagePrivate;
     42};
     43
     44#endif /* qwkcontext_h */

  • trunk/WebKit2/UIProcess/API/qt/qwkcontext_p.h

    r73715 r73716  
    1818*/
    1919
    20 #ifndef WKView_h
    21 #define WKView_h
    2220
    23 #include <WebKit2/qgraphicswkview.h>
    24 #include <WebKit2/qwkpage.h>
    25 #include <WebKit2/qwkpreferences.h>
     21#ifndef qwkcontext_p_h
     22#define qwkcontext_p_h
    2623
    27 #endif /* WKView_h */
     24#include "WebContext.h"
     25#include "WebPageNamespace.h"
     26#include <wtf/RefPtr.h>
     27
     28class QWKContextPrivate {
     29public:
     30    QWKContextPrivate(QWKContext*);
     31    ~QWKContextPrivate();
     32
     33    QWKContext* q;
     34
     35    RefPtr<WebKit::WebContext> context;
     36    RefPtr<WebKit::WebPageNamespace> pageNamespace;
     37};
     38
     39#endif /* qkcontext_p_h */

  • trunk/WebKit2/UIProcess/API/qt/qwkpage.cpp

    r73625 r73716  
    2525
    2626#include "ClientImpl.h"
     27#include "qwkcontext.h"
     28#include "qwkcontext_p.h"
    2729#include "qwkhistory.h"
    2830#include "qwkhistory_p.h"
    … …  
    3335#include "WebContextMenuProxyQt.h"
    3436#include "WebEventFactoryQt.h"
    35 #include "WebPlatformStrategies.h"
    3637#include "WebPopupMenuProxyQt.h"
    3738#include "WKStringQt.h"
    … …  
    5354using namespace WebCore;
    5455
    55 static inline void initializePlatformStrategiesIfNeeded()
    56 {
    57     static bool initialized = false;
    58     if (initialized)
    59         return;
    60 
    61     WebPlatformStrategies::initialize();
    62     initialized = true;
    63 }
    64 
    65 QWKPagePrivate::QWKPagePrivate(QWKPage* qq, WKPageNamespaceRef namespaceRef)
     56QWKPagePrivate::QWKPagePrivate(QWKPage* qq, QWKContext* c)
    6657    : q(qq)
     58    , context(c)
    6759    , preferences(0)
    6860    , createNewPageFn(0)
    6961{
    70     initializePlatformStrategiesIfNeeded();
    7162    memset(actions, 0, sizeof(actions));
    72     page = toImpl(namespaceRef)->createWebPage(0); // Page gets a ref to namespace.
     63    page = context->d->pageNamespace->createWebPage(0);
    7364    page->setPageClient(this);
    7465    history = QWKHistoryPrivate::createHistory(page->backForwardList());
    … …  
    313304}
    314305
    315 QWKPage::QWKPage(WKPageNamespaceRef namespaceRef)
    316     : d(new QWKPagePrivate(this, namespaceRef))
     306QWKPage::QWKPage(QWKContext* context)
     307    : d(new QWKPagePrivate(this, context))
    317308{
    318309    WKPageLoaderClient loadClient = {

  • trunk/WebKit2/UIProcess/API/qt/qwkpage.h

    r72220 r73716  
    1111#include <WebKit2/WKBase.h>
    1212#include <WebKit2/WKPage.h>
    13 #include <WebKit2/WKPageNamespace.h>
    1413
    1514class QCursor;
     15class QWKContext;
    1616class QWKGraphicsWidget;
    1717class QWKPreferences;
    … …  
    6767    };
    6868
    69     QWKPage(WKPageNamespaceRef);
     69    QWKPage(QWKContext*);
    7070    virtual ~QWKPage();
    7171
    … …  
    103103
    104104    QWKHistory* history() const;
     105    QWKContext* context() const;
    105106
    106107    void findZoomableAreaForPoint(const QPoint&);

  • trunk/WebKit2/UIProcess/API/qt/qwkpage_p.h

    r73625 r73716  
    3737class QWKPagePrivate : WebKit::PageClient {
    3838public:
    39     QWKPagePrivate(QWKPage*, WKPageNamespaceRef);
     39    QWKPagePrivate(QWKPage*, QWKContext*);
    4040    ~QWKPagePrivate();
    4141
    … …  
    9393    QWKPage* q;
    9494
     95    QWKContext* context;
    9596    QWKHistory* history;
    9697

  • trunk/WebKit2/WebKit2.pro

    r73643 r73716  
    148148    WebProcess/WebCoreSupport/qt \
    149149    WebProcess/WebPage \
     150    WebProcess/qt \
    150151    $$INCLUDEPATH
    151152
    … …  
    297298    UIProcess/API/qt/ClientImpl.h \
    298299    UIProcess/API/qt/qgraphicswkview.h \
     300    UIProcess/API/qt/qwkcontext.h \
     301    UIProcess/API/qt/qwkcontext_p.h \
    299302    UIProcess/API/qt/qwkhistory.h \
    300303    UIProcess/API/qt/qwkhistory_p.h \
    … …  
    487490    UIProcess/API/qt/ClientImpl.cpp \
    488491    UIProcess/API/qt/qgraphicswkview.cpp \
     492    UIProcess/API/qt/qwkcontext.cpp \
    489493    UIProcess/API/qt/qwkhistory.cpp \
    490494    UIProcess/API/qt/qwkpage.cpp \

  • trunk/WebKitTools/ChangeLog

    r73714 r73716  
     12010-12-10  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
     2
     3        Reviewed by Kenneth Rohde Christiansen.
     4
     5        [Qt][WK2] Add the QWKContext API class to wrap the WebContext.
     6        https://bugs.webkit.org/show_bug.cgi?id=50750
     7
     8        * MiniBrowser/qt/BrowserView.cpp:
     9        (BrowserView::BrowserView):
     10        * MiniBrowser/qt/BrowserView.h:
     11        * WebKitTestRunner/qt/PlatformWebViewQt.cpp:
     12        (WTR::WebView::WebView):
     13
    1142010-12-10  Joone Hur  <joone@kldp.org>
    215

  • trunk/WebKitTools/MiniBrowser/qt/BrowserView.cpp

    r72089 r73716  
    3030
    3131#include <QGraphicsScene>
    32 #include "WKContext.h"
    3332
    3433static QWKPage* createNewPage(QWKPage* page)
    … …  
    4039    : QGraphicsView(parent)
    4140    , m_item(0)
    42     , m_context(WKContextGetSharedProcessContext())
     41    , m_context(new QWKContext(this))
    4342{
    44     WKRetainPtr<WKPageNamespaceRef> pageNamespace(AdoptWK, WKPageNamespaceCreate(m_context.get()));
    45 
    46     m_item = new QGraphicsWKView(pageNamespace.get(), backingStoreType, 0);
     43    m_item = new QGraphicsWKView(m_context, backingStoreType, 0);
    4744    setScene(new QGraphicsScene(this));
    4845    scene()->addItem(m_item);

  • trunk/WebKitTools/MiniBrowser/qt/BrowserView.h

    r72089 r73716  
    3232#include <QGraphicsView>
    3333#include "qgraphicswkview.h"
    34 #include "WKRetainPtr.h"
     34#include "qwkcontext.h"
    3535
    3636class BrowserView : public QGraphicsView {
    … …  
    4949private:
    5050    QGraphicsWKView* m_item;
    51     WKRetainPtr<WKContextRef> m_context;
     51    QWKContext* m_context;
    5252};
    5353

  • trunk/WebKitTools/WebKitTestRunner/qt/PlatformWebViewQt.cpp

    r73220 r73716  
    2727#include "PlatformWebView.h"
    2828#include "qgraphicswkview.h"
     29#include "qwkcontext.h"
    2930#include <QtGui>
    3031
    … …  
    4546WebView::WebView(WKPageNamespaceRef namespaceRef)
    4647    : QGraphicsView()
    47     , m_item(new QGraphicsWKView(namespaceRef))
     48    , m_item(new QGraphicsWKView(new QWKContext(namespaceRef, this)))
    4849{
    4950    setScene(new QGraphicsScene(this));
Note: See TracChangeset for help on using the changeset viewer.