summaryrefslogtreecommitdiffstats
path: root/src/core/render_widget_host_view_qt.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/render_widget_host_view_qt.cpp')
-rw-r--r--src/core/render_widget_host_view_qt.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp
index 4fb9a1fed..39c95098e 100644
--- a/src/core/render_widget_host_view_qt.cpp
+++ b/src/core/render_widget_host_view_qt.cpp
@@ -217,8 +217,8 @@ void RenderWidgetHostViewQt::SetSize(const gfx::Size& size)
void RenderWidgetHostViewQt::SetBounds(const gfx::Rect& rect)
{
// This is called when webkit has sent us a Move message.
- // if (IsPopup())
- // m_delegate->setGeometry(rect.x(), rect.y(), rect.width(), rect.height());
+ if (IsPopup())
+ m_delegate->move(QPoint(rect.x(), rect.y()));
SetSize(rect.size());
}
@@ -260,7 +260,8 @@ gfx::NativeViewAccessible RenderWidgetHostViewQt::GetNativeViewAccessible()
void RenderWidgetHostViewQt::Focus()
{
m_host->SetInputMethodActive(true);
- m_delegate->setKeyboardFocus();
+ if (!IsPopup())
+ m_delegate->setKeyboardFocus();
m_host->Focus();
}