Changeset 265160 in webkit

Timestamp:

Jul 31, 2020 3:14:04 PM (4 years ago)

Author:

beidson@apple.com

Message:

Log a warning to the dev console when gamepads are accessed from an insecure context.
​https://bugs.webkit.org/show_bug.cgi?id=214995

Reviewed by Tim Horton.

Source/WebCore:

Test: http/tests/misc/gamepads-insecure.html

• Modules/gamepad/NavigatorGamepad.cpp:

(WebCore::NavigatorGamepad::getGamepads): Insecure contexts should log that getGamepads() will

be going away in a future release. Just do it once, because getGamepads() is called frequently.

LayoutTests:

• http/tests/misc/gamepads-insecure-expected.txt: Added.
• http/tests/misc/gamepads-insecure.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/misc/gamepads-insecure-expected.txt (added)
• LayoutTests/http/tests/misc/gamepads-insecure.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/gamepad/NavigatorGamepad.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-07-31  Brady Eidson  <beidson@apple.com>
+
+        Log a warning to the dev console when gamepads are accessed from an insecure context.
+        https://bugs.webkit.org/show_bug.cgi?id=214995
+
+        Reviewed by Tim Horton.
+
+        * http/tests/misc/gamepads-insecure-expected.txt: Added.
+        * http/tests/misc/gamepads-insecure.html: Added.
+
 2020-07-31  Aditya Keerthi  <akeerthi@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-07-31  Brady Eidson  <beidson@apple.com>
+
+        Log a warning to the dev console when gamepads are accessed from an insecure context.
+        https://bugs.webkit.org/show_bug.cgi?id=214995
+
+        Reviewed by Tim Horton.
+
+        Test: http/tests/misc/gamepads-insecure.html
+
+        * Modules/gamepad/NavigatorGamepad.cpp:
+        (WebCore::NavigatorGamepad::getGamepads): Insecure contexts should log that getGamepads() will
+          be going away in a future release. Just do it once, because getGamepads() is called frequently.
+
 2020-07-31  Aditya Keerthi  <akeerthi@apple.com>
 

trunk/Source/WebCore/Modules/gamepad/NavigatorGamepad.cpp

@@ -29 +29 @@
 #if ENABLE(GAMEPAD)
 
+#include "DOMWindow.h"
 #include "Gamepad.h"
 #include "GamepadManager.h"
@@ -74 +75 @@
 const Vector<RefPtr<Gamepad>>& NavigatorGamepad::getGamepads(Navigator& navigator)
 {
+    auto* domWindow = navigator.window();
+    Document* document = domWindow ? domWindow->document() : nullptr;
+    if (!document) {
+        static NeverDestroyed<Vector<RefPtr<Gamepad>>> emptyGamepads;
+        return emptyGamepads;
+    }
+
+    if (!document->isSecureContext()) {
+        static std::once_flag onceFlag;
+        std::call_once(onceFlag, [document] {
+            document->addConsoleMessage(MessageSource::Security, MessageLevel::Warning, "Navigator.getGamepads() will be removed from insecure contexts in a future release"_s);
+        });
+
+    }
+
     return NavigatorGamepad::from(&navigator)->gamepads();
 }