Changeset 85867 in webkit

Timestamp:

May 5, 2011 12:05:02 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-05-05 Chang Shu <​cshu@webkit.org>

Reviewed by Andreas Kling.

[Qt][WK2] Support PageGroup in QGraphicsWKView/QWKPage constructors
​https://bugs.webkit.org/show_bug.cgi?id=59638

Unskip passed tests.

• platform/qt-wk2/Skipped:

2011-05-05 Chang Shu <​cshu@webkit.org>

Reviewed by Andreas Kling.

[Qt][WK2] Support PageGroup in QGraphicsWKView/QWKPage constructors
​https://bugs.webkit.org/show_bug.cgi?id=59638

Added private constructors for class QGraphicsWKView and QWKPage to support
WKPageGroupRef.

• UIProcess/API/qt/qgraphicswkview.cpp: (QGraphicsWKView::QGraphicsWKView): (QGraphicsWKView::~QGraphicsWKView): (QGraphicsWKView::init):
• UIProcess/API/qt/qgraphicswkview.h:
• UIProcess/API/qt/qwkpage.cpp: (QWKPagePrivate::QWKPagePrivate): (QWKPage::QWKPage): (QWKPage::~QWKPage): (QWKPage::init):
• UIProcess/API/qt/qwkpage.h:
• UIProcess/API/qt/qwkpage_p.h:

2011-05-05 Chang Shu <​cshu@webkit.org>

Reviewed by Andreas Kling.

[Qt][WK2] Support PageGroup in QGraphicsWKView/QWKPage constructors
​https://bugs.webkit.org/show_bug.cgi?id=59638

1. Call QGraphicsWKView constructor with pageGroupRef.
2. Disable setFontFamily calls as it breaks Qt test fonts.

• WebKitTestRunner/TestController.cpp: (WTR::TestController::resetStateToConsistentValues):
• WebKitTestRunner/qt/PlatformWebViewQt.cpp: (WTR::WebView::WebView): (WTR::PlatformWebView::PlatformWebView):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt-wk2/Skipped (modified) (1 diff)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/UIProcess/API/qt/qgraphicswkview.cpp (modified) (2 diffs)
• Source/WebKit2/UIProcess/API/qt/qgraphicswkview.h (modified) (3 diffs)
• Source/WebKit2/UIProcess/API/qt/qwkpage.cpp (modified) (3 diffs)
• Source/WebKit2/UIProcess/API/qt/qwkpage.h (modified) (1 diff)
• Source/WebKit2/UIProcess/API/qt/qwkpage_p.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/WebKitTestRunner/TestController.cpp (modified) (2 diffs)
• Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-05-05  Chang Shu  <cshu@webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        [Qt][WK2] Support PageGroup in QGraphicsWKView/QWKPage constructors
+        https://bugs.webkit.org/show_bug.cgi?id=59638
+
+        Unskip passed tests.
+
+        * platform/qt-wk2/Skipped:
+
 2011-05-05  Andrey Kosyakov  <caseq@chromium.org>
 

trunk/LayoutTests/platform/qt-wk2/Skipped

@@ -3444 +3444 @@
 fast/dom/shadow/gc-shadow.html
 
-# [Qt][WK2] Support PageGroup in QGraphicsWKView/QWKPage constructors
-# https://bugs.webkit.org/show_bug.cgi?id=59638
-fast/dom/Document/early-document-access.html
-fast/dom/Window/closure-access-after-navigation-window.html
-fast/dom/Window/dom-access-from-closure-window.html
-fast/dom/Window/window-early-properties.html
-fast/frames/iframe-reparenting-new-page.html
-fast/frames/sandboxed-iframe-close-top-noclose.html
-fast/frames/sandboxed-iframe-close-top.html
-fast/history/history-subframe-with-name.html
-fast/loader/ping-error.html
-fast/loader/stateobjects/replacestate-in-iframe.html
-storage/domstorage/localstorage/window-open.html
-storage/domstorage/sessionstorage/window-open.html
-
 # [Qt][WK2] Incorrect line number dumping
 # https://bugs.webkit.org/show_bug.cgi?id=60074

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-05-05  Chang Shu  <cshu@webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        [Qt][WK2] Support PageGroup in QGraphicsWKView/QWKPage constructors
+        https://bugs.webkit.org/show_bug.cgi?id=59638
+
+        Added private constructors for class QGraphicsWKView and QWKPage to support
+        WKPageGroupRef.
+
+        * UIProcess/API/qt/qgraphicswkview.cpp:
+        (QGraphicsWKView::QGraphicsWKView):
+        (QGraphicsWKView::~QGraphicsWKView):
+        (QGraphicsWKView::init):
+        * UIProcess/API/qt/qgraphicswkview.h:
+        * UIProcess/API/qt/qwkpage.cpp:
+        (QWKPagePrivate::QWKPagePrivate):
+        (QWKPage::QWKPage):
+        (QWKPage::~QWKPage):
+        (QWKPage::init):
+        * UIProcess/API/qt/qwkpage.h:
+        * UIProcess/API/qt/qwkpage_p.h:
+
 2011-05-05  Brent Fulgham  <bfulgham@webkit.org>
 

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

@@ -66 +66 @@
     , d(new QGraphicsWKViewPrivate(this))
 {
+    d->page = new QWKPage(context);
+    init(backingStoreType);
+}
+
+QGraphicsWKView::QGraphicsWKView(QWKContext* context, WKPageGroupRef pageGroupRef, BackingStoreType backingStoreType, QGraphicsItem* parent)
+    : QGraphicsWidget(parent)
+    , d(new QGraphicsWKViewPrivate(this))
+{
+    d->page = new QWKPage(context, pageGroupRef);
+    init(backingStoreType);
+}
+
+void QGraphicsWKView::init(BackingStoreType backingStoreType)
+{
     setFocusPolicy(Qt::StrongFocus);
     setAcceptHoverEvents(true);
 
-
 #if ENABLE(TILED_BACKING_STORE)
     if (backingStoreType == Tiled)
@@ -75 +88 @@
 #endif
 
-    d->page = new QWKPage(context);
     d->page->d->init(this, backingStoreType);
     connect(d->page, SIGNAL(titleChanged(QString)), this, SIGNAL(titleChanged(QString)));

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

@@ -14 +14 @@
 class QWKContext;
 class QGraphicsWKViewPrivate;
+namespace WTR {
+class WebView;
+};
 
 WKStringRef WKStringCreateWithQString(const QString& qString);
@@ -91 +94 @@
 
 private:
+    QGraphicsWKView(QWKContext*, WKPageGroupRef, BackingStoreType = Simple, QGraphicsItem* parent = 0);
+    void init(BackingStoreType);
+
     Q_PRIVATE_SLOT(d, void onScaleChanged())
     Q_PRIVATE_SLOT(d, void onToolTipChanged(const QString&))
@@ -97 +103 @@
     friend class QGraphicsWKViewPrivate;
     friend class TiledDrawingAreaProxy;
+    friend class WTR::WebView;
 };
 

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

@@ -90 +90 @@
 }
 
-QWKPagePrivate::QWKPagePrivate(QWKPage* qq, QWKContext* c)
+QWKPagePrivate::QWKPagePrivate(QWKPage* qq, QWKContext* c, WKPageGroupRef pageGroupRef)
     : q(qq)
     , view(0)
@@ -100 +100 @@
 {
     memset(actions, 0, sizeof(actions));
-    page = context->d->context->createWebPage(this, 0);
+    page = context->d->context->createWebPage(this, toImpl(pageGroupRef));
     history = QWKHistoryPrivate::createHistory(page->backForwardList());
 }
@@ -428 +428 @@
 }
 
+QWKPage::QWKPage(QWKContext* context, WKPageGroupRef pageGroupRef)
+    : d(new QWKPagePrivate(this, context, pageGroupRef))
+{
+    init();
+}
+
 QWKPage::QWKPage(QWKContext* context)
     : d(new QWKPagePrivate(this, context))
+{
+    init();
+}
+
+void QWKPage::init()
 {
     WKPageLoaderClient loadClient = {

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

@@ -144 +144 @@
 
 private:
+    QWKPage(QWKContext*, WKPageGroupRef);
+    void init();
 #ifndef QT_NO_ACTION
     Q_PRIVATE_SLOT(d, void _q_webActionTriggered(bool checked));

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

@@ -41 +41 @@
 class QWKPagePrivate : WebKit::PageClient {
 public:
-    QWKPagePrivate(QWKPage*, QWKContext*);
+    QWKPagePrivate(QWKPage*, QWKContext*, WKPageGroupRef = 0);
     ~QWKPagePrivate();
 

trunk/Tools/ChangeLog

@@ +1 @@
+2011-05-05  Chang Shu  <cshu@webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        [Qt][WK2] Support PageGroup in QGraphicsWKView/QWKPage constructors
+        https://bugs.webkit.org/show_bug.cgi?id=59638
+
+        1. Call QGraphicsWKView constructor with pageGroupRef.
+        2. Disable setFontFamily calls as it breaks Qt test fonts.
+
+        * WebKitTestRunner/TestController.cpp:
+        (WTR::TestController::resetStateToConsistentValues):
+        * WebKitTestRunner/qt/PlatformWebViewQt.cpp:
+        (WTR::WebView::WebView):
+        (WTR::PlatformWebView::PlatformWebView):
+
 2011-05-05  Joseph Pecoraro  <joepeck@webkit.org>
 

trunk/Tools/WebKitTestRunner/TestController.cpp

@@ -386 +386 @@
 #endif
 
+#if !PLATFORM(QT)
     static WKStringRef standardFontFamily = WKStringCreateWithUTF8CString("Times");
     static WKStringRef cursiveFontFamily = WKStringCreateWithUTF8CString("Apple Chancery");
@@ -399 +400 @@
     WKPreferencesSetSansSerifFontFamily(preferences, sansSerifFontFamily);
     WKPreferencesSetSerifFontFamily(preferences, serifFontFamily);
+#endif
 
     m_mainWebView->focus();

trunk/Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp

@@ -36 +36 @@
 class WebView : public QGraphicsView {
 public:
-    WebView(WKContextRef);
+    WebView(WKContextRef, WKPageGroupRef);
 
     QGraphicsWKView* wkView() const { return m_item; }
@@ -46 +46 @@
 };
 
-WebView::WebView(WKContextRef contextRef)
+WebView::WebView(WKContextRef contextRef, WKPageGroupRef pageGroupRef)
     : QGraphicsView()
-    , m_item(new QGraphicsWKView(new QWKContext(contextRef, this)))
+    , m_item(new QGraphicsWKView(new QWKContext(contextRef, this), pageGroupRef))
 {
     setScene(new QGraphicsScene(this));
@@ -54 +54 @@
 }
 
-PlatformWebView::PlatformWebView(WKContextRef contextRef, WKPageGroupRef)
-    : m_view(new WebView(contextRef))
+PlatformWebView::PlatformWebView(WKContextRef contextRef, WKPageGroupRef pageGroupRef)
+    : m_view(new WebView(contextRef, pageGroupRef))
     , m_window(new QMainWindow())
 {