Fix RenderWidgetHostViewQt::GetViewBounds

GetViewBounds should return the bounds of the view, not the screen rect.
The view bounds are for example used to calculate the screen position of
accessible objects (which gets fixed with this patch).

Change-Id: I5b342113af737847c1756a13183cd2b8b8db648a
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Reviewed-by: Michael Bruning <michael.bruning@digia.com>

2 files changed, 7 insertions, 0 deletions

diff --git a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
index 24c243d20..98c6265aa 100644
--- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
+++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
@@ -97,6 +97,12 @@ QRectF RenderWidgetHostViewQtDelegateWidget::screenRect() const
     return QRectF(x(), y(), width(), height());
 }
 
+QRectF RenderWidgetHostViewQtDelegateWidget::contentsRect() const
+{
+    QPointF pos = mapToGlobal(QPoint(0, 0));
+    return QRectF(pos.x(), pos.y(), width(), height());
+}
+
 void RenderWidgetHostViewQtDelegateWidget::setKeyboardFocus()
 {
     setFocus();
diff --git a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h
index f7b83e5f5..f05ca2005 100644
--- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h
+++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h
@@ -63,6 +63,7 @@ public:
     virtual void initAsChild(WebContentsAdapterClient* container) Q_DECL_OVERRIDE;
     virtual void initAsPopup(const QRect&) Q_DECL_OVERRIDE;
     virtual QRectF screenRect() const Q_DECL_OVERRIDE;
+    virtual QRectF contentsRect() const Q_DECL_OVERRIDE;
     virtual void setKeyboardFocus() Q_DECL_OVERRIDE;
     virtual bool hasKeyboardFocus() Q_DECL_OVERRIDE;
     virtual void show() Q_DECL_OVERRIDE;