1 files changed, 25 insertions, 9 deletions

diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp
index c221e94e3..a94ae6995 100644
--- a/src/core/render_widget_host_view_qt.cpp
+++ b/src/core/render_widget_host_view_qt.cpp
@@ -189,7 +189,7 @@ RenderWidgetHostViewQt::RenderWidgetHostViewQt(content::RenderWidgetHost* widget
     : m_host(content::RenderWidgetHostImpl::From(widget))
     , m_gestureProvider(QtGestureProviderConfig(), this)
     , m_sendMotionActionDown(false)
-    , m_frameNodeData(new DelegatedFrameNodeData)
+    , m_chromiumCompositorData(new ChromiumCompositorData)
     , m_needsDelegatedFrameAck(false)
     , m_didFirstVisuallyNonEmptyLayout(false)
     , m_adapterClient(0)
@@ -352,12 +352,19 @@ gfx::Rect RenderWidgetHostViewQt::GetViewBounds() const
 // Return value indicates whether the mouse is locked successfully or not.
 bool RenderWidgetHostViewQt::LockMouse()
 {
-    QT_NOT_USED
-    return false;
+    mouse_locked_ = true;
+    m_lockedMousePosition = QCursor::pos();
+    m_delegate->lockMouse();
+    qApp->setOverrideCursor(Qt::BlankCursor);
+    return true;
 }
+
 void RenderWidgetHostViewQt::UnlockMouse()
 {
-    QT_NOT_USED
+    mouse_locked_ = false;
+    m_delegate->unlockMouse();
+    qApp->restoreOverrideCursor();
+    m_host->LostMouseLock();
 }
 
 void RenderWidgetHostViewQt::WasShown()
@@ -594,14 +601,14 @@ void RenderWidgetHostViewQt::OnSwapCompositorFrame(uint32 output_surface_id, sco
     m_needsDelegatedFrameAck = true;
     m_pendingOutputSurfaceId = output_surface_id;
     Q_ASSERT(frame->delegated_frame_data);
-    Q_ASSERT(!m_frameNodeData->frameData || m_frameNodeData->frameData->resource_list.empty());
-    m_frameNodeData->frameData = frame->delegated_frame_data.Pass();
-    m_frameNodeData->frameDevicePixelRatio = frame->metadata.device_scale_factor;
+    Q_ASSERT(!m_chromiumCompositorData->frameData || m_chromiumCompositorData->frameData->resource_list.empty());
+    m_chromiumCompositorData->frameData = frame->delegated_frame_data.Pass();
+    m_chromiumCompositorData->frameDevicePixelRatio = frame->metadata.device_scale_factor;
 
     // Support experimental.viewport.devicePixelRatio, see GetScreenInfo implementation below.
     float dpiScale = this->dpiScale();
     if (dpiScale != 0 && dpiScale != 1)
-        m_frameNodeData->frameDevicePixelRatio /= dpiScale;
+        m_chromiumCompositorData->frameDevicePixelRatio /= dpiScale;
 
     m_delegate->update();
 
@@ -661,7 +668,7 @@ QSGNode *RenderWidgetHostViewQt::updatePaintNode(QSGNode *oldNode)
     if (!frameNode)
         frameNode = new DelegatedFrameNode;
 
-    frameNode->commit(m_frameNodeData.data(), &m_resourcesToRelease);
+    frameNode->commit(m_chromiumCompositorData.data(), &m_resourcesToRelease, m_delegate.get());
 
     // This is possibly called from the Qt render thread, post the ack back to the UI
     // to tell the child compositors to release resources and trigger a new frame.
@@ -833,11 +840,20 @@ void RenderWidgetHostViewQt::handleMouseEvent(QMouseEvent* event)
         m_clickHelper.lastPressPosition = QPointF(event->pos()).toPoint();
     }
 
+    if (IsMouseLocked()) {
+        webEvent.movementX = -(m_lockedMousePosition.x() - event->globalX());
+        webEvent.movementY = -(m_lockedMousePosition.y() - event->globalY());
+        QCursor::setPos(m_lockedMousePosition);
+    }
+
     m_host->ForwardMouseEvent(webEvent);
 }
 
 void RenderWidgetHostViewQt::handleKeyEvent(QKeyEvent *ev)
 {
+    if (IsMouseLocked() && ev->key() == Qt::Key_Escape && ev->type() == QEvent::KeyRelease)
+        UnlockMouse();
+
     content::NativeWebKeyboardEvent webEvent = WebEventFactory::toWebKeyboardEvent(ev);
     m_host->ForwardKeyboardEvent(webEvent);
     if (webEvent.type == blink::WebInputEvent::RawKeyDown && !ev->text().isEmpty()) {