From 9daf1655d7e4eaaa6ed5f44055a4b4fd399fd25c Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Wed, 28 Sep 2016 16:39:37 +0300 Subject: Imported WebKit commit eb954cdcf58f9b915b2fcb6f8e4cb3a60650a4f3 Change-Id: I8dda875c38075d43b76fe3a21acb0ffa102bb82d Reviewed-by: Konstantin Tokarev --- Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp') diff --git a/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp b/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp index e8e646a7f..a991bcfdd 100644 --- a/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp +++ b/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp @@ -21,6 +21,7 @@ #include "config.h" #include "qquickwebpage_p.h" +#include "CoordinatedGraphicsScene.h" #include "QtWebPageEventHandler.h" #include "QtWebPageSGNode.h" #include "TransformationMatrix.h" @@ -30,7 +31,6 @@ #include "qwebkittest_p.h" #include #include -#include using namespace WebKit; @@ -61,7 +61,7 @@ QQuickWebPagePrivate::QQuickWebPagePrivate(QQuickWebPage* q, QQuickWebView* view void QQuickWebPagePrivate::paint(QPainter* painter) { - if (WebCore::CoordinatedGraphicsScene* scene = QQuickWebViewPrivate::get(viewportItem)->coordinatedGraphicsScene()) + if (CoordinatedGraphicsScene* scene = QQuickWebViewPrivate::get(viewportItem)->coordinatedGraphicsScene()) scene->paintToGraphicsContext(painter); } @@ -70,7 +70,7 @@ QSGNode* QQuickWebPage::updatePaintNode(QSGNode* oldNode, UpdatePaintNodeData*) { QQuickWebViewPrivate* webViewPrivate = QQuickWebViewPrivate::get(d->viewportItem); - WebCore::CoordinatedGraphicsScene* scene = webViewPrivate->coordinatedGraphicsScene(); + CoordinatedGraphicsScene* scene = webViewPrivate->coordinatedGraphicsScene(); if (!scene) return oldNode; -- cgit v1.2.1 From 4bd713d56aa9bb86bc96ea9cb0c64cbf94bf43d4 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Mon, 24 Apr 2017 22:40:03 +0300 Subject: Import WebKit commit 3040e0455efecd271f1aeef53cf287e75486a70d Change-Id: I7df106cef8ce93ce33e49ad6fb0d202cd066d87c Reviewed-by: Konstantin Tokarev --- Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp') diff --git a/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp b/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp index a991bcfdd..f6717a405 100644 --- a/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp +++ b/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp @@ -59,10 +59,10 @@ QQuickWebPagePrivate::QQuickWebPagePrivate(QQuickWebPage* q, QQuickWebView* view { } -void QQuickWebPagePrivate::paint(QPainter* painter) +void QQuickWebPagePrivate::paint(QPainter* painter, const WebCore::Color& backgroundColor, bool drawsBackground) { if (CoordinatedGraphicsScene* scene = QQuickWebViewPrivate::get(viewportItem)->coordinatedGraphicsScene()) - scene->paintToGraphicsContext(painter); + scene->paintToGraphicsContext(painter, backgroundColor, drawsBackground); } @@ -88,7 +88,7 @@ QSGNode* QQuickWebPage::updatePaintNode(QSGNode* oldNode, UpdatePaintNodeData*) } if (!node) - node = new QtWebPageSGNode; + node = new QtWebPageSGNode(*webViewPrivate->webPageProxy); node->setCoordinatedGraphicsScene(scene); -- cgit v1.2.1