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 <simon.hausmann@digia.com>

1 files changed, 2 insertions, 25 deletions

diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp
index 7df9ee46a..7d470e5cf 100644
--- a/src/core/render_widget_host_view_qt.cpp
+++ b/src/core/render_widget_host_view_qt.cpp
@@ -41,7 +41,6 @@
 
 #include "render_widget_host_view_qt.h"
 
-#include "backing_store_qt.h"
 #include "chromium_overrides.h"
 #include "delegated_frame_node.h"
 #include "render_widget_host_view_qt_delegate.h"
@@ -163,7 +162,6 @@ static bool shouldSendPinchGesture()
 RenderWidgetHostViewQt::RenderWidgetHostViewQt(content::RenderWidgetHost* widget)
     : m_host(content::RenderWidgetHostImpl::From(widget))
     , m_gestureRecognizer(ui::GestureRecognizer::Create())
-    , m_backingStore(0)
     , m_frameNodeData(new DelegatedFrameNodeData)
     , m_needsDelegatedFrameAck(false)
     , m_adapterClient(0)
@@ -194,16 +192,9 @@ void RenderWidgetHostViewQt::setAdapterClient(WebContentsAdapterClient *adapterC
         InitAsChild(0);
 }
 
-BackingStoreQt* RenderWidgetHostViewQt::GetBackingStore()
-{
-    bool force_create = !m_host->empty();
-    return static_cast<BackingStoreQt*>(m_host->GetBackingStore(force_create));
-}
-
 content::BackingStore *RenderWidgetHostViewQt::AllocBackingStore(const gfx::Size &size)
 {
-    Q_ASSERT(m_delegate);
-    return new BackingStoreQt(m_host, size, m_delegate->window());
+    Q_UNREACHABLE();
 }
 
 void RenderWidgetHostViewQt::InitAsChild(gfx::NativeView)
@@ -628,8 +619,6 @@ gfx::Rect RenderWidgetHostViewQt::GetBoundsInRootWindow()
 
 gfx::GLSurfaceHandle RenderWidgetHostViewQt::GetCompositingSurface()
 {
-    if (!m_delegate->supportsHardwareAcceleration())
-        return gfx::GLSurfaceHandle();
     return gfx::GLSurfaceHandle(gfx::kNullPluginWindow, gfx::TEXTURE_TRANSPORT);
 }
 
@@ -679,12 +668,6 @@ void RenderWidgetHostViewQt::DispatchCancelTouchEvent(ui::TouchEvent *event)
     m_host->ForwardTouchEventWithLatencyInfo(cancelEvent, *event->latency());
 }
 
-void RenderWidgetHostViewQt::paint(QPainter *painter, const QRectF& boundingRect)
-{
-    if (m_backingStore)
-        m_backingStore->paintToTarget(painter, boundingRect);
-}
-
 QSGNode *RenderWidgetHostViewQt::updatePaintNode(QSGNode *oldNode, QSGRenderContext *sgRenderContext)
 {
     DelegatedFrameNode *frameNode = static_cast<DelegatedFrameNode *>(oldNode);
@@ -704,11 +687,6 @@ QSGNode *RenderWidgetHostViewQt::updatePaintNode(QSGNode *oldNode, QSGRenderCont
     return frameNode;
 }
 
-void RenderWidgetHostViewQt::fetchBackingStore()
-{
-    m_backingStore = GetBackingStore();
-}
-
 void RenderWidgetHostViewQt::notifyResize()
 {
     GetRenderWidgetHost()->WasResized();
@@ -812,8 +790,7 @@ void RenderWidgetHostViewQt::sendDelegatedFrameAck()
 
 void RenderWidgetHostViewQt::Paint(const gfx::Rect& damage_rect)
 {
-    QRect r(damage_rect.x(), damage_rect.y(), damage_rect.width(), damage_rect.height());
-    m_delegate->update(r);
+    Q_UNREACHABLE();
 }
 
 void RenderWidgetHostViewQt::ForwardGestureEventToRenderer(ui::GestureEvent* gesture)