Changeset 219950 in webkit

Timestamp:

Jul 26, 2017, 10:15:31 AM (9 years ago)

Author:

Chris Dumez

Message:

Pressing the Escape key should not be a valid user gesture to enter fullscreen
​https://bugs.webkit.org/show_bug.cgi?id=174864
<rdar://problem/33009088>

Reviewed by Geoffrey Garen.

Source/WebCore:

Pressing the Escape key should not be a valid user gesture to enter fullscreen since this
is the gesture to exit fullscreen already.

Test: fullscreen/requestFullscreen-escape-key.html

• dom/Document.cpp:

(WebCore::Document::requestFullScreenForElement):

• dom/UserGestureIndicator.cpp:

(WebCore::UserGestureIndicator::UserGestureIndicator):

• dom/UserGestureIndicator.h:

(WebCore::UserGestureToken::create):
(WebCore::UserGestureToken::gestureType):
(WebCore::UserGestureToken::UserGestureToken):

• page/EventHandler.cpp:

(WebCore::EventHandler::internalKeyEvent):

Tools:

Add support for eventSender.keyDown('escape') in DRT to match the behavior of
WKTR.

• DumpRenderTree/mac/EventSendingController.mm:

(-[EventSendingController keyDown:withModifiers:withLocation:]):

LayoutTests:

Add layout test coverage.

• fullscreen/requestFullscreen-escape-key-expected.txt: Added.
• fullscreen/requestFullscreen-escape-key.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fullscreen/requestFullscreen-escape-key-expected.txt (added)
• LayoutTests/fullscreen/requestFullscreen-escape-key.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Document.cpp (modified) (1 diff)
• Source/WebCore/dom/UserGestureIndicator.cpp (modified) (2 diffs)
• Source/WebCore/dom/UserGestureIndicator.h (modified) (5 diffs)
• Source/WebCore/page/EventHandler.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/mac/EventSendingController.mm (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-07-26  Chris Dumez  <cdumez@apple.com>
+
+        Pressing the Escape key should not be a valid user gesture to enter fullscreen
+        https://bugs.webkit.org/show_bug.cgi?id=174864
+        <rdar://problem/33009088>
+
+        Reviewed by Geoffrey Garen.
+
+        Add layout test coverage.
+
+        * fullscreen/requestFullscreen-escape-key-expected.txt: Added.
+        * fullscreen/requestFullscreen-escape-key.html: Added.
+
 2017-07-26  Nan Wang  <n_wang@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-07-26  Chris Dumez  <cdumez@apple.com>
+
+        Pressing the Escape key should not be a valid user gesture to enter fullscreen
+        https://bugs.webkit.org/show_bug.cgi?id=174864
+        <rdar://problem/33009088>
+
+        Reviewed by Geoffrey Garen.
+
+        Pressing the Escape key should not be a valid user gesture to enter fullscreen since this
+        is the gesture to exit fullscreen already.
+
+        Test: fullscreen/requestFullscreen-escape-key.html
+
+        * dom/Document.cpp:
+        (WebCore::Document::requestFullScreenForElement):
+        * dom/UserGestureIndicator.cpp:
+        (WebCore::UserGestureIndicator::UserGestureIndicator):
+        * dom/UserGestureIndicator.h:
+        (WebCore::UserGestureToken::create):
+        (WebCore::UserGestureToken::gestureType):
+        (WebCore::UserGestureToken::UserGestureToken):
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::internalKeyEvent):
+
 2017-07-26  Nan Wang  <n_wang@apple.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -5786 +5786 @@
         //   - an activation behavior is currently being processed whose click event was trusted, or
         //   - the event listener for a trusted click event is being handled.
-        if (!ScriptController::processingUserGesture())
+        if (!UserGestureIndicator::processingUserGesture())
             break;
+
+        // We do not allow pressing the Escape key as a user gesture to enter fullscreen since this is the key
+        // to exit fullscreen.
+        if (UserGestureIndicator::currentUserGesture()->gestureType() == UserGestureType::EscapeKey) {
+            addConsoleMessage(MessageSource::Security, MessageLevel::Error, ASCIILiteral("The Escape key may not be used as a user gesture to enter fullscreen"));
+            break;
+        }
 
         // There is a previously-established user preference, security risk, or platform limitation.

trunk/Source/WebCore/dom/UserGestureIndicator.cpp

@@ -47 +47 @@
 }
 
-UserGestureIndicator::UserGestureIndicator(std::optional<ProcessingUserGestureState> state, Document* document)
+UserGestureIndicator::UserGestureIndicator(std::optional<ProcessingUserGestureState> state, Document* document, UserGestureType gestureType)
     : m_previousToken(currentToken())
 {
@@ -55 +55 @@
 
     if (state)
-        currentToken() = UserGestureToken::create(state.value());
+        currentToken() = UserGestureToken::create(state.value(), gestureType);
 
     if (document && currentToken()->processingUserGesture()) {

trunk/Source/WebCore/dom/UserGestureIndicator.h

@@ -43 +43 @@
 };
 
+enum class UserGestureType { EscapeKey, Other };
+
 class UserGestureToken : public RefCounted<UserGestureToken> {
 public:
-    static RefPtr<UserGestureToken> create(ProcessingUserGestureState state)
+    static RefPtr<UserGestureToken> create(ProcessingUserGestureState state, UserGestureType gestureType)
     {
-        return adoptRef(new UserGestureToken(state));
+        return adoptRef(new UserGestureToken(state, gestureType));
     }
 
@@ -55 +57 @@
     bool processingUserGesture() const { return m_state == ProcessingUserGesture; }
     bool processingUserGestureForMedia() const { return m_state == ProcessingUserGesture || m_state == ProcessingPotentialUserGesture; }
+    UserGestureType gestureType() const { return m_gestureType; }
 
     void addDestructionObserver(WTF::Function<void (UserGestureToken&)>&& observer)
@@ -62 +65 @@
 
 private:
-    UserGestureToken(ProcessingUserGestureState state)
+    UserGestureToken(ProcessingUserGestureState state, UserGestureType gestureType)
         : m_state(state)
+        , m_gestureType(gestureType)
     {
     }
@@ -69 +73 @@
     ProcessingUserGestureState m_state = NotProcessingUserGesture;
     Vector<WTF::Function<void (UserGestureToken&)>> m_destructionObservers;
+    UserGestureType m_gestureType;
 };
 
@@ -80 +85 @@
 
     // If a document is provided, its last known user gesture timestamp is updated.
-    WEBCORE_EXPORT explicit UserGestureIndicator(std::optional<ProcessingUserGestureState>, Document* = nullptr);
+    WEBCORE_EXPORT explicit UserGestureIndicator(std::optional<ProcessingUserGestureState>, Document* = nullptr, UserGestureType = UserGestureType::Other);
     WEBCORE_EXPORT explicit UserGestureIndicator(RefPtr<UserGestureToken>);
     WEBCORE_EXPORT ~UserGestureIndicator();

trunk/Source/WebCore/page/EventHandler.cpp

@@ -3171 +3171 @@
         return false;
 
-    UserGestureIndicator gestureIndicator(ProcessingUserGesture, m_frame.document());
+    UserGestureType gestureType = UserGestureType::Other;
+    if (initialKeyEvent.windowsVirtualKeyCode() == VK_ESCAPE)
+        gestureType = UserGestureType::EscapeKey;
+
+    UserGestureIndicator gestureIndicator(ProcessingUserGesture, m_frame.document(), gestureType);
     UserTypingGestureIndicator typingGestureIndicator(m_frame);
 

trunk/Tools/ChangeLog

@@ +1 @@
+2017-07-26  Chris Dumez  <cdumez@apple.com>
+
+        Pressing the Escape key should not be a valid user gesture to enter fullscreen
+        https://bugs.webkit.org/show_bug.cgi?id=174864
+        <rdar://problem/33009088>
+
+        Reviewed by Geoffrey Garen.
+
+        Add support for eventSender.keyDown('escape') in DRT to match the behavior of
+        WKTR.
+
+        * DumpRenderTree/mac/EventSendingController.mm:
+        (-[EventSendingController keyDown:withModifiers:withLocation:]):
+
 2017-07-26  Romain Bellessort  <romain.bellessort@crf.canon.fr>
 

trunk/Tools/DumpRenderTree/mac/EventSendingController.mm

@@ -935 +935 @@
         eventCharacter = [NSString stringWithCharacters:&ch length:1];
         keyCode = 0x75;
+    } else if ([character isEqualToString:@"escape"]) {
+        const unichar ch = 0x1B;
+        eventCharacter = [NSString stringWithCharacters:&ch length:1];
+        keyCode = 0x35;
     } else if ([character isEqualToString:@"printScreen"]) {
         const unichar ch = NSPrintScreenFunctionKey;