From 798134400a22f878b6cfd186b3792ecedb4d9123 Mon Sep 17 00:00:00 2001 From: Jocelyn Turcotte Date: Tue, 1 Apr 2014 14:46:37 +0200 Subject: Get rid of the BackingStore rendering path Now that the widgets view is also using the delegated renderer, there are no supported configuration that use the BackingStore rendering path, itself on the way of deprecation in Chromium. Change-Id: I4ab889f6a7c65e8447c259faf2c7a98b88c1acf5 Reviewed-by: Simon Hausmann --- .../render_widget_host_view_qt_delegate_quick.cpp | 31 +--------------------- 1 file changed, 1 insertion(+), 30 deletions(-) (limited to 'src/webengine/render_widget_host_view_qt_delegate_quick.cpp') diff --git a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp index e2804ef9b..c755619e8 100644 --- a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp +++ b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp @@ -47,16 +47,11 @@ RenderWidgetHostViewQtDelegateQuick::RenderWidgetHostViewQtDelegateQuick(RenderW setFlag(ItemHasContents); } -void RenderWidgetHostViewQtDelegateQuick::update(const QRect&) +void RenderWidgetHostViewQtDelegateQuick::update() { QQuickItem::update(); } -bool RenderWidgetHostViewQtDelegateQuick::supportsHardwareAcceleration() const -{ - return true; -} - void RenderWidgetHostViewQtDelegateQuick::itemChange(ItemChange change, const ItemChangeData &value) { QQuickItem::itemChange(change, value); @@ -68,27 +63,3 @@ QSGNode *RenderWidgetHostViewQtDelegateQuick::updatePaintNode(QSGNode *oldNode, { return m_client->updatePaintNode(oldNode, QQuickWindowPrivate::get(QQuickItem::window())->context); } - -RenderWidgetHostViewQtDelegateQuickPainted::RenderWidgetHostViewQtDelegateQuickPainted(RenderWidgetHostViewQtDelegateClient *client, bool isPopup) - : RenderWidgetHostViewQtDelegateQuickBase(client, isPopup) -{ -} - -void RenderWidgetHostViewQtDelegateQuickPainted::update(const QRect& rect) -{ - polish(); - QQuickPaintedItem::update(rect); -} - -void RenderWidgetHostViewQtDelegateQuickPainted::paint(QPainter *painter) -{ - m_client->paint(painter, boundingRect()); -} - -void RenderWidgetHostViewQtDelegateQuickPainted::updatePolish() -{ - // paint will be called from the scene graph thread and this doesn't play well - // with chromium's use of TLS while getting the backing store. - // updatePolish() should be called from the GUI thread right before the rendering thread starts. - m_client->fetchBackingStore(); -} -- cgit v1.2.3