diff options
author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-04-01 10:27:13 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-08 14:00:06 +0200 |
commit | 84f31c11b77a62212451cb77adae63219e06de96 (patch) | |
tree | 97d252eee0ee8716d1a7165cd714b0d5b9552ebb /src/core/render_widget_host_view_qt.cpp | |
parent | 3cb5203cb7a4bee9a867e8616c23ce635d6a8506 (diff) |
Revert part of the RenderWidgetHostViewQtDelegate refactoring
This reverts parts of commit 9c198939be1ef064d1a2430a4b9991f2fe16f359.
This does keeps the popup fixes and removes support for
QWebEnginePage::setViewportSize and QWebEnginePage::render until
we can evaluate the needs vs the cost of such feature.
Change-Id: I1b55b751d463717b1462393ea8cd353422f8fdbb
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/core/render_widget_host_view_qt.cpp')
-rw-r--r-- | src/core/render_widget_host_view_qt.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp index f04a2089e..7430f6756 100644 --- a/src/core/render_widget_host_view_qt.cpp +++ b/src/core/render_widget_host_view_qt.cpp @@ -218,7 +218,9 @@ void RenderWidgetHostViewQt::InitAsChild(gfx::NativeView) void RenderWidgetHostViewQt::InitAsPopup(content::RenderWidgetHostView*, const gfx::Rect& rect) { - m_delegate->initAsPopup(toQt(rect)); + QRect screenRect = toQt(rect); + screenRect.moveTo(m_adapterClient->mapToGlobal(screenRect.topLeft())); + m_delegate->initAsPopup(screenRect); } void RenderWidgetHostViewQt::InitAsFullscreen(content::RenderWidgetHostView*) @@ -242,7 +244,7 @@ void RenderWidgetHostViewQt::SetBounds(const gfx::Rect& rect) { // This is called when webkit has sent us a Move message. if (IsPopup()) - m_delegate->move(QPoint(rect.x(), rect.y())); + m_delegate->move(m_adapterClient->mapToGlobal(toQt(rect.origin()))); SetSize(rect.size()); } |