Merge ~santoshbit2007/oxide:santosh@html5pointerLock_branch into oxide:master

[Chris Coulson]

[Olivier Tilloy (osomon)]

Not a complete review by any means, but I had a very quick look at the diff and added a few inline comments.

[Chris Coulson (chrisccoulson)]

Thanks for working on this - I've left a few comments inline. As Olivier pointed out, please do use curly braces even around single-line conditional blocks (in general, we try to stick to the Chromium style but this is one of the exceptions).

As discussed online, we're missing the actual pointer lock implementation here. There is an API for doing this - http://doc.qt.io/qt-5/qquickitem.html#grabMouse

I've not had a look at the test yet.

review: Needs Fixing

f17ce0d... by Santosh Mahto <email address hidden> on 2016-06-21

HTML5 pointerLock implementation

[Olivier Tilloy (osomon)]

I’ve replied to one of your questions inline.

Unmerged commits

f17ce0d... by Santosh Mahto <email address hidden> on 2016-06-21

HTML5 pointerLock implementation

diff --git a/qt/core/browser/oxide_qt_contents_view.cc b/qt/core/browser/oxide_qt_contents_view.cc
index 4c93147..cfed182 100644
--- a/qt/core/browser/oxide_qt_contents_view.cc
+++ b/qt/core/browser/oxide_qt_contents_view.cc
@@ -626,5 +626,9 @@ QScreen* ContentsView::GetScreen() const {
   return screen;
 }
 
+void ContentsView::GrabMouse(bool grab) const {
+  client_->GrabMouse(grab);
+}
+
 } // namespace qt
 } // namespace oxide
diff --git a/qt/core/browser/oxide_qt_contents_view.h b/qt/core/browser/oxide_qt_contents_view.h
index 13f44e2..db60fc7 100644
--- a/qt/core/browser/oxide_qt_contents_view.h
+++ b/qt/core/browser/oxide_qt_contents_view.h
@@ -67,6 +67,8 @@ class ContentsView : public ContentsViewProxy,
 
   float GetLocationBarContentOffset() const;
 
+  void GrabMouse(bool grab) const;
+
  private:
   // ContentsViewProxy implementation
   QSharedPointer<CompositorFrameHandle> compositorFrameHandle() override;
diff --git a/qt/core/browser/oxide_qt_screen_client.cc b/qt/core/browser/oxide_qt_screen_client.cc
index 3d3e5e3..09abaad 100644
--- a/qt/core/browser/oxide_qt_screen_client.cc
+++ b/qt/core/browser/oxide_qt_screen_client.cc
@@ -86,6 +86,17 @@ gfx::Point ScreenClient::GetCursorScreenPoint() {
   return gfx::Point(point.x(), point.y());
 }
 
+void ScreenClient::HideMousePointer() {
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+  QCursor cursor(Qt::BlankCursor);
+  QGuiApplication::setOverrideCursor(cursor);
+}
+
+void ScreenClient::ShowMousePointer() {
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+  QGuiApplication::restoreOverrideCursor();
+}
+
 ScreenClient::ScreenClient() {
   QScreen* primary_screen = QGuiApplication::primaryScreen();
   primary_screen->setOrientationUpdateMask(Qt::LandscapeOrientation |
diff --git a/qt/core/browser/oxide_qt_screen_client.h b/qt/core/browser/oxide_qt_screen_client.h
index f7a492d..df82427 100644
--- a/qt/core/browser/oxide_qt_screen_client.h
+++ b/qt/core/browser/oxide_qt_screen_client.h
@@ -38,6 +38,11 @@ class ScreenClient : public QObject,
  public:
   ScreenClient();
   ~ScreenClient() override;
+  // TODO(santosh.mahto) Right now this hide the mouse pointer
+  // from the current application not from screen which should
+  // be actual behaviour
+  void HideMousePointer() override;
+  void ShowMousePointer() override;
 
  private Q_SLOTS:
   void OnScreenGeometryChanged(const QRect& geometry);
diff --git a/qt/core/browser/oxide_qt_web_view.cc b/qt/core/browser/oxide_qt_web_view.cc
index 6670657..b4dc88d 100644
--- a/qt/core/browser/oxide_qt_web_view.cc
+++ b/qt/core/browser/oxide_qt_web_view.cc
@@ -666,6 +666,16 @@ void WebView::RequestMediaAccessPermission(
   client_->RequestMediaAccessPermission(req.release());
 }
 
+
+void WebView::RequestMouseLockPermission(
+    std::unique_ptr<oxide::PermissionRequest> request) {
+  std::unique_ptr<OxideQPermissionRequest> req(
+      OxideQPermissionRequestPrivate::Create(std::move(request)));
+
+  // The embedder takes ownership of this
+  client_->RequestMouseLockPermission(std::move(req));
+}
+
 void WebView::FrameCreated(oxide::WebFrame* frame) {
   DCHECK(!frame_tree_torn_down_);
   DCHECK(!WebFrame::FromSharedWebFrame(frame));
diff --git a/qt/core/browser/oxide_qt_web_view.h b/qt/core/browser/oxide_qt_web_view.h
index 053bafa..4914274 100644
--- a/qt/core/browser/oxide_qt_web_view.h
+++ b/qt/core/browser/oxide_qt_web_view.h
@@ -171,6 +171,8 @@ class WebView : public oxide::WebViewClient,
   void RequestMediaAccessPermission(
       std::unique_ptr<oxide::MediaAccessPermissionRequest> request) override;
 
+  void RequestMouseLockPermission(
+      std::unique_ptr<oxide::PermissionRequest> request) override;
   // oxide::WebFrameTreeObserver implementation
   void FrameCreated(oxide::WebFrame* frame) override;
   void FrameDeleted(oxide::WebFrame* frame) override;
diff --git a/qt/core/glue/oxide_qt_contents_view_proxy_client.h b/qt/core/glue/oxide_qt_contents_view_proxy_client.h
index c5cf713..72f3666 100644
--- a/qt/core/glue/oxide_qt_contents_view_proxy_client.h
+++ b/qt/core/glue/oxide_qt_contents_view_proxy_client.h
@@ -62,6 +62,7 @@ class ContentsViewProxyClient {
   virtual void EvictCurrentFrame() = 0;
 
   virtual void UpdateCursor(const QCursor& cursor) = 0;
+  virtual void GrabMouse(bool grab) const = 0;
 
   virtual void SetInputMethodEnabled(bool enabled) = 0;
 
diff --git a/qt/core/glue/oxide_qt_web_view_proxy_client.h b/qt/core/glue/oxide_qt_web_view_proxy_client.h
index 436e550..23cb3cd 100644
--- a/qt/core/glue/oxide_qt_web_view_proxy_client.h
+++ b/qt/core/glue/oxide_qt_web_view_proxy_client.h
@@ -105,6 +105,8 @@ class WebViewProxyClient {
       OxideQGeolocationPermissionRequest* request) = 0;
   virtual void RequestMediaAccessPermission(
       OxideQMediaAccessPermissionRequest* request) = 0;
+  virtual void RequestMouseLockPermission(
+      std::unique_ptr<OxideQPermissionRequest> request) = 0;
   virtual void RequestNotificationPermission(
       OxideQPermissionRequest* request) = 0;
 
diff --git a/qt/qmlplugin/oxide_qml_plugin.cc b/qt/qmlplugin/oxide_qml_plugin.cc
index 6895600..a3e59ee 100644
--- a/qt/qmlplugin/oxide_qml_plugin.cc
+++ b/qt/qmlplugin/oxide_qml_plugin.cc
@@ -206,6 +206,7 @@ class OxideQmlPlugin : public QQmlExtensionPlugin {
         "TouchSelectionController is accessed via "
         "WebView.touchSelectionController");
     qmlRegisterType<OxideQQuickWebView, 8>(uri, 1, 15, "WebView");
+    qmlRegisterType<OxideQQuickWebView, 9>(uri, 1, 16, "WebView");
   }
 };
 
diff --git a/qt/quick/api/oxideqquickwebview.cc b/qt/quick/api/oxideqquickwebview.cc
index a804d4e..b559094 100644
--- a/qt/quick/api/oxideqquickwebview.cc
+++ b/qt/quick/api/oxideqquickwebview.cc
@@ -374,6 +374,32 @@ void OxideQQuickWebViewPrivate::RequestMediaAccessPermission(
 
 }
 
+void OxideQQuickWebViewPrivate::RequestMouseLockPermission(
+    std::unique_ptr<OxideQPermissionRequest> request) {
+  Q_Q(OxideQQuickWebView);
+
+  // See the comment in RequestGeolocationPermission
+
+  QQmlEngine* engine = qmlEngine(q);
+  if (!engine) {
+    return;
+  }
+
+  {
+    OxideQPermissionRequest* req = request.release();
+    QJSValue val = engine->newQObject(req);
+    if (!val.isQObject()) {
+      delete req;
+      return;
+    }
+
+    emit q->mouseLockPermissionRequested(val);
+  }
+
+  engine->collectGarbage();
+
+}
+
 void OxideQQuickWebViewPrivate::RequestNotificationPermission(
     OxideQPermissionRequest* request) {
   Q_Q(OxideQQuickWebView);
diff --git a/qt/quick/api/oxideqquickwebview.h b/qt/quick/api/oxideqquickwebview.h
index 9279bf6..b0a4e4f 100644
--- a/qt/quick/api/oxideqquickwebview.h
+++ b/qt/quick/api/oxideqquickwebview.h
@@ -361,6 +361,7 @@ class OXIDE_QTQUICK_EXPORT OxideQQuickWebView : public QQuickItem {
   void newViewRequested(OxideQNewViewRequest* request);
   void geolocationPermissionRequested(const QJSValue& request);
   Q_REVISION(4) void mediaAccessPermissionRequested(const QJSValue& request);
+  Q_REVISION(9) void mouseLockPermissionRequested(const QJSValue& request);
   Q_REVISION(6) void notificationPermissionRequested(const QJSValue& request);
   void javaScriptConsoleMessage(LogMessageSeverityLevel level,
                                 const QString& message,
diff --git a/qt/quick/api/oxideqquickwebview_p.h b/qt/quick/api/oxideqquickwebview_p.h
index cddc57d..5c39dba 100644
--- a/qt/quick/api/oxideqquickwebview_p.h
+++ b/qt/quick/api/oxideqquickwebview_p.h
@@ -119,6 +119,8 @@ class OxideQQuickWebViewPrivate : public oxide::qt::WebViewProxyClient {
       OxideQGeolocationPermissionRequest* request) override;
   void RequestMediaAccessPermission(
       OxideQMediaAccessPermissionRequest* request) override;
+  void RequestMouseLockPermission(
+      std::unique_ptr<OxideQPermissionRequest> request) override;
   void RequestNotificationPermission(
       OxideQPermissionRequest* request) override;
   void FrameMetadataUpdated(
diff --git a/qt/quick/oxide_qquick_before_unload_dialog.cc b/qt/quick/oxide_qquick_before_unload_dialog.cc
index 05cc6c3..91d2af6 100644
--- a/qt/quick/oxide_qquick_before_unload_dialog.cc
+++ b/qt/quick/oxide_qquick_before_unload_dialog.cc
@@ -54,6 +54,7 @@ QString BeforeUnloadDialogContext::message() const {
       "BeforeUnloadDialogContext::message is deprecated and the message text "
       "provided by the web page is ignored. This API returns a message for "
       "compatibility purposes, but applications should stop using it";
+
   return QString(
       dgettext(OXIDE_GETTEXT_DOMAIN, "Changes you made may not be saved."));
 }
diff --git a/qt/quick/oxide_qquick_contents_view.cc b/qt/quick/oxide_qquick_contents_view.cc
index 0df4f95..d6c0027 100644
--- a/qt/quick/oxide_qquick_contents_view.cc
+++ b/qt/quick/oxide_qquick_contents_view.cc
@@ -519,5 +519,9 @@ void ContentsView::hideTouchSelectionController() const {
   proxy()->hideTouchSelectionController();
 }
 
+void ContentsView::GrabMouse(bool grab) const {
+  grab ? item_->grabMouse() : item_->ungrabMouse();
+}
+
 } // namespace qquick
 } // namespace oxide
diff --git a/qt/quick/oxide_qquick_contents_view.h b/qt/quick/oxide_qquick_contents_view.h
index 1797eb2..5e040be 100644
--- a/qt/quick/oxide_qquick_contents_view.h
+++ b/qt/quick/oxide_qquick_contents_view.h
@@ -101,6 +101,7 @@ class ContentsView : public QObject,
   }
 
   void hideTouchSelectionController() const;
+  void GrabMouse(bool grab) const;
 
  private Q_SLOTS:
   void windowChanged(QQuickWindow* window);
diff --git a/qt/tests/qmltests/api/tst_MouseLockPermissionRequest.html b/qt/tests/qmltests/api/tst_MouseLockPermissionRequest.html
new file mode 100644
index 0000000..a83c233
--- /dev/null
+++ b/qt/tests/qmltests/api/tst_MouseLockPermissionRequest.html
@@ -0,0 +1,43 @@
+<html>
+<body>
+<button id="button" onclick="requestMouseLock()">Click Here</button>
+<canvas height=100 width=100> </canvas>
+</body>
+<script>
+var canvas = document.querySelector('canvas');
+var ctx = canvas.getContext('2d');
+ctx.fillStyle = "#FF0000";
+ctx.fillRect(0,0,100,100);
+
+canvas.requestPointerLock = canvas.requestPointerLock ||
+           canvas.mozRequestPointerLock;
+
+document.addEventListener('pointerlockchange', lockChanged, false);
+document.addEventListener('pointerlockerror', lockChangeError, false);
+document.addEventListener('keydown', exitLock, false);
+
+document.exitPointerLock = document.exitPointerLock || document.mozExitPointerLock;
+
+function exitLock(event) {
+  if (event.keyCode = 27 /* ESC */)
+    document.exitPointerLock();
+}
+
+function requestMouseLock() {
+  canvas.requestPointerLock();
+}
+
+function lockChanged(event) {
+  console.log("lockchanged");
+  var e = new CustomEvent("oxidemouselockresult", { bubbles: true, detail: { status: 1 } });
+  document.documentElement.dispatchEvent(e);
+}
+
+function lockChangeError() {
+  console.log("lockerror");
+  var e = new CustomEvent("oxidemouselockresult", { bubbles: true, detail: { status: 0 } });
+  document.documentElement.dispatchEvent(e);
+}
+
+</script>
+</html>
diff --git a/qt/tests/qmltests/api/tst_MouseLockPermissionRequest.qml b/qt/tests/qmltests/api/tst_MouseLockPermissionRequest.qml
new file mode 100644
index 0000000..23303de
--- /dev/null
+++ b/qt/tests/qmltests/api/tst_MouseLockPermissionRequest.qml
@@ -0,0 +1,103 @@
+import QtQuick 2.0
+import QtTest 1.0
+import com.canonical.Oxide 1.15
+import Oxide.testsupport 1.0
+
+TestWebView {
+  id: webView
+  width: 400
+  height: 400
+
+  property var lastMouseLockRequest: null
+
+  SignalSpy {
+    id: spy
+    target: webView
+    signalName: "mouseLockPermissionRequested"
+  }
+
+  SignalSpy {
+    id: cancelSpy
+    signalName: "cancelled"
+  }
+
+  onMouseLockPermissionRequested: {
+    lastMouseLockRequest = request;
+  }
+
+  property var lastMouseLockStatus: -1
+
+  messageHandlers: [
+    ScriptMessageHandler {
+      msgId: "MOUSELOCK-RESPONSE"
+      contexts: [ "oxide://testutils/" ]
+      callback: function(msg) {
+        webView.lastMouseLockStatus = msg.payload;
+      }
+    }
+  ]
+
+  TestCase {
+    id: test
+    name: "MouseLockPermissionRequest"
+    when: windowShown
+
+    function init() {
+      spy.clear();
+      cancelSpy.clear();
+      webView.lastMouseLockRequest = null;
+      webView.lastMouseLockStatus = -1;
+    }
+
+    function _test_allow() {
+      webView.lastMouseLockRequest.allow();
+    }
+
+    function _test_accept() {
+      webView.lastMouseLockRequest.accept();
+    }
+
+    function _test_deny() {
+      webView.lastMouseLockRequest.deny();
+    }
+
+    function _test_destroy() {
+      webView.lastMouseLockRequest.destroy();
+    }
+
+    function test_MouseLockPermissionRequest1_main_frame_data() {
+      return [
+        { function: _test_allow, expected: 1 },
+        { function: _test_deny, expected: 0 },
+      ];
+    }
+
+    function test_MouseLockPermissionRequest1_main_frame(data) {
+      webView.url = "https://testsuite/tst_MouseLockPermissionRequest.html";
+      verify(webView.waitForLoadSucceeded(),
+             "Timed out waiting for successful load");
+
+      webView.getTestApi().evaluateCode(
+"document.addEventListener(\"oxidemouselockresult\", function(event) {
+  oxide.sendMessage(\"MOUSELOCK-RESPONSE\", event.detail.status);
+});", true);
+
+      var r = webView.getTestApi().getBoundingClientRectForSelector("#button");
+      mouseClick(webView, r.x + r.width / 2, r.y + r.height / 2, Qt.LeftButton, Qt.NoModifier);
+
+      if (!webView.lastMouseLockRequest) {
+        spy.wait();
+      }
+
+      compare(webView.lastMouseLockRequest.origin, "https://testsuite/");
+      compare(webView.lastMouseLockRequest.embedder, "https://testsuite/");
+      compare(webView.lastMouseLockRequest.isCancelled, false);
+
+      data.function();
+
+      verify(TestUtils.waitFor(function() { return webView.lastMouseLockStatus != -1; }),
+             "Timed out waiting for mouseLock response");
+      compare(webView.lastMouseLockStatus, data.expected);
+    }
+}
+}
diff --git a/shared/browser/oxide_render_widget_host_view.cc b/shared/browser/oxide_render_widget_host_view.cc
index efef1ca..8c9b5d0 100644
--- a/shared/browser/oxide_render_widget_host_view.cc
+++ b/shared/browser/oxide_render_widget_host_view.cc
@@ -57,6 +57,7 @@
 #include "oxide_browser_platform_integration.h"
 #include "oxide_browser_process_main.h"
 #include "oxide_event_utils.h"
+#include "oxide_screen_client.h"
 #include "oxide_render_widget_host_view_container.h"
 
 namespace oxide {
@@ -500,11 +501,32 @@ gfx::Rect RenderWidgetHostView::GetViewBounds() const {
   return bounds;
 }
 
+
+bool RenderWidgetHostView::IsMouseLocked() {
+  return mouse_locked_;
+}
+
 bool RenderWidgetHostView::LockMouse() {
-  return false;
+  ScreenClient* screen_client = BrowserPlatformIntegration::GetInstance()->
+                                GetScreenClient();
+  if(screen_client) {
+    screen_client->HideMousePointer();
+  }
+  container_->GrabMouse(true);
+  mouse_locked_ = true;
+  return true;
 }
 
-void RenderWidgetHostView::UnlockMouse() {}
+void RenderWidgetHostView::UnlockMouse() {
+  ScreenClient* screen_client = BrowserPlatformIntegration::GetInstance()->
+                                GetScreenClient();
+  if(screen_client) {
+    screen_client->ShowMousePointer();
+  }
+  container_->GrabMouse(false);
+  host_->LostMouseLock();
+  mouse_locked_= false;
+}
 
 void RenderWidgetHostView::CompositorDidCommit() {
   committed_frame_metadata_ = last_submitted_frame_metadata_;
@@ -806,6 +828,7 @@ RenderWidgetHostView::RenderWidgetHostView(
       top_controls_shrink_blink_size_(false),
       gesture_provider_(GestureProvider::Create(this)),
       handle_drag_in_progress_(false),
+      mouse_locked_(false),
       weak_ptr_factory_(this) {
   CHECK(host_) << "Implementation didn't supply a RenderWidgetHost";
 
diff --git a/shared/browser/oxide_render_widget_host_view.h b/shared/browser/oxide_render_widget_host_view.h
index 7607dde..2f9a0ee 100644
--- a/shared/browser/oxide_render_widget_host_view.h
+++ b/shared/browser/oxide_render_widget_host_view.h
@@ -174,6 +174,7 @@ class RenderWidgetHostView
   bool IsSurfaceAvailableForCopy() const override;
   bool IsShowing() override;
   gfx::Rect GetViewBounds() const override;
+  bool IsMouseLocked() override;
   bool LockMouse() override;
   void UnlockMouse() override;
 
@@ -250,6 +251,8 @@ class RenderWidgetHostView
   std::unique_ptr<ui::TouchSelectionController> selection_controller_;
   bool handle_drag_in_progress_;
 
+  bool mouse_locked_;
+
   base::WeakPtrFactory<RenderWidgetHostView> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostView);
diff --git a/shared/browser/oxide_render_widget_host_view_container.h b/shared/browser/oxide_render_widget_host_view_container.h
index 9c15472..6ef83eb 100644
--- a/shared/browser/oxide_render_widget_host_view_container.h
+++ b/shared/browser/oxide_render_widget_host_view_container.h
@@ -75,6 +75,8 @@ class RenderWidgetHostViewContainer {
                                      bool insertion_handle_tapped) const = 0;
 
   virtual void EditingCapabilitiesChanged(RenderWidgetHostView* view) = 0;
+
+  virtual void GrabMouse(bool grab) const = 0;
 };
 
 } // namespace oxide
diff --git a/shared/browser/oxide_screen_client.h b/shared/browser/oxide_screen_client.h
index 91133ed..e270c9b 100644
--- a/shared/browser/oxide_screen_client.h
+++ b/shared/browser/oxide_screen_client.h
@@ -30,6 +30,9 @@ class ScreenClient {
   virtual display::Display GetPrimaryDisplay() = 0;
 
   virtual gfx::Point GetCursorScreenPoint() = 0;
+
+  virtual void HideMousePointer() = 0;
+  virtual void ShowMousePointer() = 0;
 };
 
 } // namespace oxide
diff --git a/shared/browser/oxide_web_contents_view.cc b/shared/browser/oxide_web_contents_view.cc
index 2544bf3..c7a7c5c 100644
--- a/shared/browser/oxide_web_contents_view.cc
+++ b/shared/browser/oxide_web_contents_view.cc
@@ -1052,4 +1052,8 @@ void WebContentsView::HideTouchSelectionController() {
   }
 }
 
+void WebContentsView::GrabMouse(bool grab) const {
+  client_->GrabMouse(grab);
+}
+
 } // namespace oxide
diff --git a/shared/browser/oxide_web_contents_view.h b/shared/browser/oxide_web_contents_view.h
index 8de5702..6554118 100644
--- a/shared/browser/oxide_web_contents_view.h
+++ b/shared/browser/oxide_web_contents_view.h
@@ -245,6 +245,8 @@ class OXIDE_SHARED_EXPORT WebContentsView
                              bool insertion_handle_tapped) const override;
   void EditingCapabilitiesChanged(RenderWidgetHostView* view) override;
 
+  void GrabMouse(bool grab) const override;
+
   WebContentsViewClient* client_;
   base::Closure editing_capabilities_changed_callback_;
 
diff --git a/shared/browser/oxide_web_contents_view_client.cc b/shared/browser/oxide_web_contents_view_client.cc
index 8334d18..a1b16ff 100644
--- a/shared/browser/oxide_web_contents_view_client.cc
+++ b/shared/browser/oxide_web_contents_view_client.cc
@@ -70,4 +70,7 @@ InputMethodContext* WebContentsViewClient::GetInputMethodContext() const {
 void WebContentsViewClient::UnhandledKeyboardEvent(
     const content::NativeWebKeyboardEvent& event) {}
 
+void WebContentsViewClient::GrabMouse(bool grab) const {
+}
+
 } // namespace oxide
diff --git a/shared/browser/oxide_web_contents_view_client.h b/shared/browser/oxide_web_contents_view_client.h
index c2ccaa7..34e6a1d 100644
--- a/shared/browser/oxide_web_contents_view_client.h
+++ b/shared/browser/oxide_web_contents_view_client.h
@@ -91,6 +91,7 @@ class OXIDE_SHARED_EXPORT WebContentsViewClient {
 
   virtual void UnhandledKeyboardEvent(
       const content::NativeWebKeyboardEvent& event);
+  virtual void GrabMouse(bool grab) const;
 
  protected:
   WebContentsViewClient();
diff --git a/shared/browser/oxide_web_view.cc b/shared/browser/oxide_web_view.cc
index 625c1e0..1999c7d 100644
--- a/shared/browser/oxide_web_view.cc
+++ b/shared/browser/oxide_web_view.cc
@@ -801,6 +801,27 @@ bool WebView::CheckMediaAccessPermission(content::WebContents* source,
   return status == TEMPORARY_SAVED_PERMISSION_STATUS_ALLOWED;
 }
 
+void WebView::RespondToLockMouse(content::WebContents* web_contents,
+                                 PermissionRequestResponse response) {
+  DCHECK(web_contents_.get() == web_contents);
+  if (response == PERMISSION_REQUEST_RESPONSE_ALLOW) {
+    web_contents_->GotResponseToLockMouseRequest(true);
+  } else {
+    web_contents_->GotResponseToLockMouseRequest(false);
+  }
+}
+
+void WebView::RequestToLockMouse(content::WebContents* web_contents,
+                                 bool user_gesture, bool last_unlocked_by_target) {
+  content::RenderFrameHost* rfh = web_contents->GetMainFrame();
+  PermissionRequestDispatcher::FromWebContents(web_contents)->
+    RequestMouseLockPermission(rfh, rfh->GetLastCommittedURL().GetOrigin(),
+                               user_gesture, last_unlocked_by_target,
+                               base::Bind(&WebView::RespondToLockMouse,
+                                          weak_factory_.GetWeakPtr(),
+                                          web_contents));
+}
+
 void WebView::RenderFrameForInterstitialPageCreated(
     content::RenderFrameHost* render_frame_host) {
   if (render_frame_host->GetParent()) {
diff --git a/shared/browser/oxide_web_view.h b/shared/browser/oxide_web_view.h
index 951670b..f0a99ca 100644
--- a/shared/browser/oxide_web_view.h
+++ b/shared/browser/oxide_web_view.h
@@ -46,6 +46,7 @@
 #include "shared/browser/oxide_render_object_id.h"
 #include "shared/browser/oxide_script_message_target.h"
 #include "shared/browser/oxide_web_preferences_observer.h"
+#include "shared/browser/permissions/oxide_permission_request_response.h"
 #include "shared/common/oxide_message_enums.h"
 #include "shared/common/oxide_shared_export.h"
 
@@ -283,6 +284,10 @@ class OXIDE_SHARED_EXPORT WebView : public ScriptMessageTarget,
 
   void EditingCapabilitiesChanged();
 
+  // callback for pointer lock permission request
+  void RespondToLockMouse(content::WebContents* web_contents,
+                          PermissionRequestResponse response);
+
   // ScriptMessageTarget implementation
   virtual size_t GetScriptMessageHandlerCount() const override;
   virtual const ScriptMessageHandler* GetScriptMessageHandlerAt(
@@ -369,6 +374,13 @@ class OXIDE_SHARED_EXPORT WebView : public ScriptMessageTarget,
                                   const GURL& security_origin,
                                   content::MediaStreamType type) override;
 
+  void RequestToLockMouse(content::WebContents* web_contents,
+                          bool user_gesture,
+                          bool last_unlocked_by_target) final;
+
+  // Notification that the page has lost the mouse lock.
+  //void LostMouseLock() final;
+
   // content::WebContentsObserver implementation
   void RenderFrameForInterstitialPageCreated(
       content::RenderFrameHost* render_frame_host) override;
diff --git a/shared/browser/permissions/oxide_permission_request_dispatcher.cc b/shared/browser/permissions/oxide_permission_request_dispatcher.cc
index 0e605ad..353e698 100644
--- a/shared/browser/permissions/oxide_permission_request_dispatcher.cc
+++ b/shared/browser/permissions/oxide_permission_request_dispatcher.cc
@@ -230,6 +230,32 @@ void PermissionRequestDispatcher::CancelPermissionRequest(int request_id) {
   }
 }
 
+int PermissionRequestDispatcher::RequestMouseLockPermission(
+    content::RenderFrameHost* render_frame_host,
+    const GURL& requesting_origin,
+    bool, bool,
+    const PermissionRequestCallback& callback) {
+
+  if (!CanDispatchRequest()) {
+    callback.Run(PERMISSION_REQUEST_RESPONSE_CANCEL);
+    return -1;
+  }
+
+  int request_id = next_request_id_++;
+
+  std::unique_ptr<PermissionRequest> request(
+      new PermissionRequest(
+        request_id,
+        RenderFrameHostID(),
+        requesting_origin,
+        web_contents()->GetLastCommittedURL().GetOrigin(),
+        callback));
+  AddPendingRequest(request.get());
+
+  client_->RequestMouseLockPermission(std::move(request));
+  return request_id;
+}
+
 int PermissionRequestDispatcher::RequestMediaAccessPermission(
     content::RenderFrameHost* render_frame_host,
     const GURL& requesting_origin,
diff --git a/shared/browser/permissions/oxide_permission_request_dispatcher.h b/shared/browser/permissions/oxide_permission_request_dispatcher.h
index d3be2ce..804aed5 100644
--- a/shared/browser/permissions/oxide_permission_request_dispatcher.h
+++ b/shared/browser/permissions/oxide_permission_request_dispatcher.h
@@ -80,6 +80,13 @@ class OXIDE_SHARED_EXPORT PermissionRequestDispatcher
                                    bool video,
                                    const PermissionRequestCallback& callback);
 
+  // Request permission to lock mouse pointer
+  int RequestMouseLockPermission(content::RenderFrameHost* render_frame_host,
+                                 const GURL& requesting_origin,
+                                 bool user_gesture,
+                                 bool last_unlocked_by_target,
+                                 const PermissionRequestCallback& callback);
+
  private:
   friend class content::WebContentsUserData<PermissionRequestDispatcher>;
   friend class PermissionRequest;
diff --git a/shared/browser/permissions/oxide_permission_request_dispatcher_client.h b/shared/browser/permissions/oxide_permission_request_dispatcher_client.h
index c2d58f7..498f134 100644
--- a/shared/browser/permissions/oxide_permission_request_dispatcher_client.h
+++ b/shared/browser/permissions/oxide_permission_request_dispatcher_client.h
@@ -39,6 +39,9 @@ class PermissionRequestDispatcherClient {
   virtual void RequestMediaAccessPermission(
       std::unique_ptr<MediaAccessPermissionRequest> request) {}
 
+  virtual void RequestMouseLockPermission(
+      std::unique_ptr<PermissionRequest> request) {}
+
   virtual void RequestNotificationPermission(
       std::unique_ptr<PermissionRequest> request) {}
 };