Changeset 123476 in webkit

Timestamp:

Jul 24, 2012, 7:47:33 AM (13 years ago)

Author:

Csaba Osztrogonác

Message:

[Qt] Fix compilation after QtQuick API changes
​https://bugs.webkit.org/show_bug.cgi?id=91822

Patch by Simon Hausmann <​simon.hausmann@nokia.com> on 2012-07-24
Reviewed by Kenneth Rohde Christiansen.

QQuickCanvas is now QQuickWindow, QQuickItem::canvas() is window() and rootItem()
is contentItem(). Also QQuickWindow::grabFrameBuffer() is now grabWindow().

• UIProcess/API/qt/qquickwebpage.cpp:
• UIProcess/API/qt/qquickwebview.cpp:

(QQuickWebViewPrivate::updateIcon):

• UIProcess/API/qt/tests/qquickwebview/tst_qquickwebview.cpp:

(tst_QQuickWebView::multipleWebViews):
(tst_QQuickWebView::basicRenderingSanity):
(tst_QQuickWebView::transparentWebViews):

• UIProcess/API/qt/tests/testwindow.h:

(TestWindow::TestWindow):

• UIProcess/qt/QtPageClient.cpp:

(WebKit::QtPageClient::isViewVisible):

• UIProcess/qt/QtWebPageEventHandler.cpp:

(WebKit::QtWebPageEventHandler::startDrag):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/qt/qquickwebpage.cpp (modified) (1 diff)
• UIProcess/API/qt/qquickwebview.cpp (modified) (1 diff)
• UIProcess/API/qt/tests/qquickwebview/tst_qquickwebview.cpp (modified) (3 diffs)
• UIProcess/API/qt/tests/testwindow.h (modified) (1 diff)
• UIProcess/qt/QtPageClient.cpp (modified) (2 diffs)
• UIProcess/qt/QtWebPageEventHandler.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-07-24  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        [Qt] Fix compilation after QtQuick API changes
+        https://bugs.webkit.org/show_bug.cgi?id=91822
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        QQuickCanvas is now QQuickWindow, QQuickItem::canvas() is window() and rootItem()
+        is contentItem(). Also QQuickWindow::grabFrameBuffer() is now grabWindow().
+
+        * UIProcess/API/qt/qquickwebpage.cpp:
+        * UIProcess/API/qt/qquickwebview.cpp:
+        (QQuickWebViewPrivate::updateIcon):
+        * UIProcess/API/qt/tests/qquickwebview/tst_qquickwebview.cpp:
+        (tst_QQuickWebView::multipleWebViews):
+        (tst_QQuickWebView::basicRenderingSanity):
+        (tst_QQuickWebView::transparentWebViews):
+        * UIProcess/API/qt/tests/testwindow.h:
+        (TestWindow::TestWindow):
+        * UIProcess/qt/QtPageClient.cpp:
+        (WebKit::QtPageClient::isViewVisible):
+        * UIProcess/qt/QtWebPageEventHandler.cpp:
+        (WebKit::QtWebPageEventHandler::startDrag):
+
 2012-07-24  Balazs Kelemen  <kbalazs@webkit.org>
 

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

@@ -31 +31 @@
 #include "qquickwebview_p.h"
 #include "qwebkittest_p.h"
-#include <QtQuick/QQuickCanvas>
 
 using namespace WebKit;

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

@@ -492 +492 @@
     Q_Q(QQuickWebView);
 
-    QQuickView* view = qobject_cast<QQuickView*>(q->canvas());
+    QQuickView* view = qobject_cast<QQuickView*>(q->window());
     if (!view)
         return;

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

@@ -315 +315 @@
     // This should not crash.
     QScopedPointer<QQuickWebView> webView1(newWebView());
-    webView1->setParentItem(m_window->rootItem());
+    webView1->setParentItem(m_window->contentItem());
     QScopedPointer<QQuickWebView> webView2(newWebView());
-    webView2->setParentItem(m_window->rootItem());
+    webView2->setParentItem(m_window->contentItem());
 
     webView1->setSize(QSizeF(300, 400));
@@ -345 +345 @@
     webView()->setVisible(true);
     QTest::qWait(200);
-    QImage grabbedWindow = m_window->grabFrameBuffer();
+    QImage grabbedWindow = m_window->grabWindow();
     QRgb testColor = qRgba(0, 0xff, 0, 0xff);
     QVERIFY(grabbedWindow.pixel(10, 10) == testColor);
@@ -377 +377 @@
     // This should not crash.
     QScopedPointer<QQuickWebView> webView1(newWebView());
-    webView1->setParentItem(m_window->rootItem());
+    webView1->setParentItem(m_window->contentItem());
     QScopedPointer<QQuickWebView> webView2(newWebView());
-    webView2->setParentItem(m_window->rootItem());
+    webView2->setParentItem(m_window->contentItem());
     QVERIFY(!webView1->experimental()->transparentBackground());
     webView2->experimental()->setTransparentBackground(true);

trunk/Source/WebKit2/UIProcess/API/qt/tests/testwindow.h

@@ -44 +44 @@
 {
     Q_ASSERT(webView);
-    webView->setParentItem(rootItem());
+    webView->setParentItem(contentItem());
 }
 

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

@@ -36 +36 @@
 #include "qquickwebview_p_p.h"
 #include <QGuiApplication>
-#include <QQuickCanvas>
+#include <QQuickWindow>
 #include <WebCore/Cursor.h>
 #include <WebCore/DragData.h>
@@ -288 +288 @@
 
     // FIXME: this is a workaround while QWindow::isExposed() is not ready.
-    if (m_webView->canvas() && m_webView->canvas()->windowState() == Qt::WindowMinimized)
+    if (m_webView->window() && m_webView->window()->windowState() == Qt::WindowMinimized)
         return false;
 

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

@@ -34 +34 @@
 #include <QInputMethod>
 #include <QMimeData>
-#include <QtQuick/QQuickCanvas>
+#include <QQuickWindow>
 #include <QStyleHints>
 #include <QTextFormat>
@@ -563 +563 @@
     Qt::DropAction actualDropAction = Qt::IgnoreAction;
 
-    if (QWindow* window = m_webPage->canvas()) {
+    if (QWindow* window = m_webPage->window()) {
         QDrag* drag = new QDrag(window);
         drag->setPixmap(QPixmap::fromImage(dragQImage));