Attachment 165608 Details for Bug 97561 – Patch

[patch] Patch

bug-97561-20120925161131.patch (text/plain), 4.60 KB, created by Balazs Kelemen on 2012-09-25 07:12:13 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Balazs Kelemen

Created: 2012-09-25 07:12:13 PDT

Size: 4.60 KB

patch

obsolete

>Subversion Revision: 129492
>diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
>index 82c3d64a049ac460cf86c78e315aaf2fdad51334..2a3c89b8d5c6dcffec5deefb1e79680f2f9fd0cf 100644
>--- a/Source/WebKit2/ChangeLog
>+++ b/Source/WebKit2/ChangeLog
>@@ -1,3 +1,28 @@
>+2012-09-25  Balazs Kelemen  <kbalazs@webkit.org>
>+
>+        [Qt][WK2] REGRESSION(r128980): It broke all QRawWebView API test
>+        https://bugs.webkit.org/show_bug.cgi?id=97561
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Make sure we always send the very first RenderNextFrame message.
>+        Before r128980 it was working accidentally because in the common
>+        case the web process sent a DeleteCompositingLayer message at some
>+        point before the forced repaint would time out and we was sending
>+        the first RenderNextFrame when reacting to that.
>+
>+        * UIProcess/API/qt/raw/qrawwebview.cpp:
>+        (QRawWebView::setActive): Set the LayerTreeRenderer to active
>+        as well. In the QQuickWebView case it is handled by the QtWebPageSGNode.
>+        (QRawWebView::layerTreeRenderer): Added a convenience getter
>+        for the LayerTreeRenderer.
>+        (QRawWebView::paint):
>+        * UIProcess/API/qt/raw/qrawwebview_p.h:
>+        (WebKit):
>+        * UIProcess/API/qt/tests/qrawwebview/tst_qrawwebview.cpp:
>+        (tst_qrawwebview::tst_qrawwebview): Added a call to addQtWebProcessToPath
>+        to make my and the follower users of this test easier.
>+
> 2012-09-25  KwangYong Choi  <ky0.choi@samsung.com>
> 
>         [EFL][WK2] Added hideColorPicker test case
>diff --git a/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview.cpp b/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview.cpp
>index 0a7a684cfc6bfb5ee03327a6dc514d63ab046f85..531e57dbf48004378caefe3546e57e58e772b50b 100644
>--- a/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview.cpp
>+++ b/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview.cpp
>@@ -319,6 +319,7 @@ void QRawWebView::setActive(bool active)
> {
>     d->m_active = active;
>     d->m_webPageProxy->viewStateDidChange(WebKit::WebPageProxy::ViewWindowIsActive);
>+    layerTreeRenderer()->setActive(active);
> }
> 
> QSize QRawWebView::size() const
>@@ -352,17 +353,20 @@ WKPageRef QRawWebView::pageRef()
>     return toAPI(d->m_webPageProxy.get());
> }
> 
>-void QRawWebView::paint(const QMatrix4x4& transform, float opacity, unsigned paintFlags)
>+WebKit::LayerTreeRenderer* QRawWebView::layerTreeRenderer() const
> {
>     WebKit::DrawingAreaProxy* drawingArea = d->m_webPageProxy->drawingArea();
>     if (!drawingArea)
>-        return;
>-
>-    WebKit::LayerTreeCoordinatorProxy* coordinatorProxy = drawingArea->layerTreeCoordinatorProxy();
>-    if (!coordinatorProxy)
>-        return;
>+        return 0;
>+    WebKit::LayerTreeCoordinatorProxy* layerTreeCoordinatorProxy = drawingArea->layerTreeCoordinatorProxy();
>+    if (!layerTreeCoordinatorProxy)
>+        return 0;
>+    return layerTreeCoordinatorProxy->layerTreeRenderer();
>+}
> 
>-    WebKit::LayerTreeRenderer* renderer = coordinatorProxy->layerTreeRenderer();
>+void QRawWebView::paint(const QMatrix4x4& transform, float opacity, unsigned paintFlags)
>+{
>+    WebKit::LayerTreeRenderer* renderer = layerTreeRenderer();
>     if (!renderer)
>         return;
> 
>diff --git a/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview_p.h b/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview_p.h
>index f8f15b06d6a259b7e93d58dfd6b69378faf3ed77..015815ad8c70a9de05d81ba6a630210b722cf7f4 100644
>--- a/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview_p.h
>+++ b/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview_p.h
>@@ -47,6 +47,10 @@ QT_END_NAMESPACE
> 
> class QRawWebViewPrivate;
> 
>+namespace WebKit {
>+class LayerTreeRenderer;
>+}
>+
> class QRawWebViewClient {
> public:
>     virtual ~QRawWebViewClient() { }
>@@ -97,6 +101,8 @@ public:
>     void sendTouchEvent(QTouchEvent*);
> 
> private:
>+    WebKit::LayerTreeRenderer* layerTreeRenderer() const;
>+
>     QRawWebViewPrivate* d;
> };
> 
>diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qrawwebview/tst_qrawwebview.cpp b/Source/WebKit2/UIProcess/API/qt/tests/qrawwebview/tst_qrawwebview.cpp
>index 31102b876222e81e85cf92b4019bc5786c2b9ca8..27142e6cf5f7ea212df90aa2fa00a1c32e621a5c 100644
>--- a/Source/WebKit2/UIProcess/API/qt/tests/qrawwebview/tst_qrawwebview.cpp
>+++ b/Source/WebKit2/UIProcess/API/qt/tests/qrawwebview/tst_qrawwebview.cpp
>@@ -152,7 +152,9 @@ public:
>     tst_qrawwebview()
>         : m_resourceDir(QString::fromLatin1(TESTS_SOURCE_DIR "/html/resources"))
>         , m_baseUrl(QUrl::fromLocalFile(TESTS_SOURCE_DIR "/html").toString())
>-    { }
>+    {
>+        addQtWebProcessToPath();
>+    }
> 
> private Q_SLOTS:
>     void paint() { run(&tst_qrawwebview::doPaint, m_resourceDir + "/qwkview_paint.png"); }

Actions: View | Formatted Diff | Diff

Attachments on bug 97561: 165608