Title: [209394] trunk/Source/WebCore
Revision
209394
Author
[email protected]
Date
2016-12-06 08:40:56 -0800 (Tue, 06 Dec 2016)

Log Message

[pointer-lock] Cursor should become visible when exiting pointer-lock via ESC key.
https://bugs.webkit.org/show_bug.cgi?id=165377

Reviewed by Darin Adler.

Introduce the concept of "force cursor to become visible" when requesting the pointer be
unlocked.  ESC events will cause the pointer to become visible, while normal key events
will not.

* page/EventHandler.cpp:
(WebCore::EventHandler::keyEvent):
* page/PointerLockController.cpp:
(WebCore::PointerLockController::requestPointerUnlock):
(WebCore::PointerLockController::requestPointerUnlockAndForceCursorVisible):
(WebCore::PointerLockController::documentDetached):
(WebCore::PointerLockController::didLosePointerLock):
* page/PointerLockController.h:

Drive-by fix: apply Darin's feedback to existing functions:

* dom/Document.cpp:
(WebCore::Document::prepareForDestruction):
* dom/Element.cpp:
(WebCore::Element::removedFrom):
* page/PointerLockController.cpp:
(WebCore::PointerLockController::elementRemoved):
(WebCore::PointerLockController::documentDetached):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (209393 => 209394)


--- trunk/Source/WebCore/ChangeLog	2016-12-06 15:55:07 UTC (rev 209393)
+++ trunk/Source/WebCore/ChangeLog	2016-12-06 16:40:56 UTC (rev 209394)
@@ -1,3 +1,34 @@
+2016-12-05  Jer Noble  <[email protected]>
+
+        [pointer-lock] Cursor should become visible when exiting pointer-lock via ESC key.
+        https://bugs.webkit.org/show_bug.cgi?id=165377
+
+        Reviewed by Darin Adler.
+
+        Introduce the concept of "force cursor to become visible" when requesting the pointer be
+        unlocked.  ESC events will cause the pointer to become visible, while normal key events
+        will not.
+
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::keyEvent):
+        * page/PointerLockController.cpp:
+        (WebCore::PointerLockController::requestPointerUnlock):
+        (WebCore::PointerLockController::requestPointerUnlockAndForceCursorVisible):
+        (WebCore::PointerLockController::documentDetached):
+        (WebCore::PointerLockController::didLosePointerLock):
+        * page/PointerLockController.h:
+
+        Drive-by fix: apply Darin's feedback to existing functions:
+
+        * dom/Document.cpp:
+        (WebCore::Document::prepareForDestruction):
+        * dom/Element.cpp:
+        (WebCore::Element::removedFrom):
+        * page/PointerLockController.cpp:
+        (WebCore::PointerLockController::elementRemoved):
+        (WebCore::PointerLockController::documentDetached):
+
+
 2016-12-06  Sam Weinig  <[email protected]>
 
         [WebIDL] Add support for converting dictionaries to JS

Modified: trunk/Source/WebCore/dom/Document.cpp (209393 => 209394)


--- trunk/Source/WebCore/dom/Document.cpp	2016-12-06 15:55:07 UTC (rev 209393)
+++ trunk/Source/WebCore/dom/Document.cpp	2016-12-06 16:40:56 UTC (rev 209394)
@@ -2284,7 +2284,7 @@
 
 #if ENABLE(POINTER_LOCK)
     if (page())
-        page()->pointerLockController().documentDetached(this);
+        page()->pointerLockController().documentDetached(*this);
 #endif
 
     InspectorInstrumentation::documentDetached(*this);

Modified: trunk/Source/WebCore/dom/Element.cpp (209393 => 209394)


--- trunk/Source/WebCore/dom/Element.cpp	2016-12-06 15:55:07 UTC (rev 209393)
+++ trunk/Source/WebCore/dom/Element.cpp	2016-12-06 16:40:56 UTC (rev 209394)
@@ -1670,7 +1670,7 @@
 #endif
 #if ENABLE(POINTER_LOCK)
     if (document().page())
-        document().page()->pointerLockController().elementRemoved(this);
+        document().page()->pointerLockController().elementRemoved(*this);
 #endif
 
     setSavedLayerScrollPosition(ScrollPosition());

Modified: trunk/Source/WebCore/page/EventHandler.cpp (209393 => 209394)


--- trunk/Source/WebCore/page/EventHandler.cpp	2016-12-06 15:55:07 UTC (rev 209393)
+++ trunk/Source/WebCore/page/EventHandler.cpp	2016-12-06 16:40:56 UTC (rev 209394)
@@ -3064,7 +3064,7 @@
 
 #if ENABLE(POINTER_LOCK)
     if (initialKeyEvent.type() == PlatformEvent::KeyDown && initialKeyEvent.windowsVirtualKeyCode() == VK_ESCAPE && m_frame.page()->pointerLockController().element()) {
-        m_frame.page()->pointerLockController().requestPointerUnlock();
+        m_frame.page()->pointerLockController().requestPointerUnlockAndForceCursorVisible();
         return true;
     }
 #endif

Modified: trunk/Source/WebCore/page/PointerLockController.cpp (209393 => 209394)


--- trunk/Source/WebCore/page/PointerLockController.cpp	2016-12-06 15:55:07 UTC (rev 209393)
+++ trunk/Source/WebCore/page/PointerLockController.cpp	2016-12-06 16:40:56 UTC (rev 209394)
@@ -99,9 +99,18 @@
     m_page.chrome().client().requestPointerUnlock();
 }
 
-void PointerLockController::elementRemoved(Element* element)
+void PointerLockController::requestPointerUnlockAndForceCursorVisible()
 {
-    if (m_element == element) {
+    if (!m_element || !RuntimeEnabledFeatures::sharedFeatures().pointerLockEnabled())
+        return;
+
+    m_page.chrome().client().requestPointerUnlock();
+    m_forceCursorVisibleUponUnlock = true;
+}
+
+void PointerLockController::elementRemoved(Element& element)
+{
+    if (m_element == &element) {
         m_documentOfRemovedElementWhileWaitingForUnlock = &m_element->document();
         // Set element null immediately to block any future interaction with it
         // including mouse events received before the unlock completes.
@@ -110,11 +119,11 @@
     }
 }
 
-void PointerLockController::documentDetached(Document* document)
+void PointerLockController::documentDetached(Document& document)
 {
-    if (m_element && &m_element->document() == document) {
+    if (m_element && &m_element->document() == &document) {
         clearElement();
-        requestPointerUnlock();
+        requestPointerUnlockAndForceCursorVisible();
     }
 }
 
@@ -145,6 +154,8 @@
     enqueueEvent(eventNames().pointerlockchangeEvent, m_element ? &m_element->document() : m_documentOfRemovedElementWhileWaitingForUnlock.get());
     clearElement();
     m_documentOfRemovedElementWhileWaitingForUnlock = nullptr;
+    if (m_forceCursorVisibleUponUnlock)
+        m_page.chrome().client().setCursorHiddenUntilMouseMoves(false);
 }
 
 void PointerLockController::dispatchLockedMouseEvent(const PlatformMouseEvent& event, const AtomicString& eventType)

Modified: trunk/Source/WebCore/page/PointerLockController.h (209393 => 209394)


--- trunk/Source/WebCore/page/PointerLockController.h	2016-12-06 15:55:07 UTC (rev 209393)
+++ trunk/Source/WebCore/page/PointerLockController.h	2016-12-06 16:40:56 UTC (rev 209394)
@@ -43,9 +43,11 @@
 public:
     explicit PointerLockController(Page&);
     void requestPointerLock(Element* target);
+
     void requestPointerUnlock();
-    void elementRemoved(Element*);
-    void documentDetached(Document*);
+    void requestPointerUnlockAndForceCursorVisible();
+    void elementRemoved(Element&);
+    void documentDetached(Document&);
     bool lockPending() const;
     Element* element() const;
 
@@ -60,6 +62,7 @@
     void enqueueEvent(const AtomicString& type, Document*);
     Page& m_page;
     bool m_lockPending;
+    bool m_forceCursorVisibleUponUnlock { false };
     RefPtr<Element> m_element;
     RefPtr<Document> m_documentOfRemovedElementWhileWaitingForUnlock;
 };
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to