Changeset 255582 in webkit

Timestamp:

Feb 3, 2020 12:44:49 PM (4 years ago)

Author:

youenn@apple.com

Message:

[ macOS wk2 ] http/tests/media/media-stream/get-display-media-prompt.html is flaky failure
​https://bugs.webkit.org/show_bug.cgi?id=206958
<rdar://problem/59003765>

Reviewed by Eric Carlson.

We added a rule to only allow one getDisplayMedia call per gesture.
For that reason, we were storing a pointer to the gesture event and
resetting in case the current gesture event was equal to the stored pointer.
Instead, store a WeakPtr which ensures that if the previous event is destroyed,
the weak pointer will be null and so will not have the same value as the new gesture event.
Covered by existing tests no longer being flaky.

• Modules/mediastream/MediaDevices.cpp:

(WebCore::MediaDevices::computeUserGesturePriviledge):

• Modules/mediastream/MediaDevices.h:
• dom/UserGestureIndicator.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediastream/MediaDevices.cpp (modified) (1 diff)
• Modules/mediastream/MediaDevices.h (modified) (1 diff)
• dom/UserGestureIndicator.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-02-03  youenn fablet  <youenn@apple.com>
+
+        [ macOS wk2 ] http/tests/media/media-stream/get-display-media-prompt.html is flaky failure
+        https://bugs.webkit.org/show_bug.cgi?id=206958
+        <rdar://problem/59003765>
+
+        Reviewed by Eric Carlson.
+
+        We added a rule to only allow one getDisplayMedia call per gesture.
+        For that reason, we were storing a pointer to the gesture event and
+        resetting in case the current gesture event was equal to the stored pointer.
+        Instead, store a WeakPtr which ensures that if the previous event is destroyed,
+        the weak pointer will be null and so will not have the same value as the new gesture event.
+        Covered by existing tests no longer being flaky.
+
+        * Modules/mediastream/MediaDevices.cpp:
+        (WebCore::MediaDevices::computeUserGesturePriviledge):
+        * Modules/mediastream/MediaDevices.h:
+        * dom/UserGestureIndicator.h:
+
 2020-02-03  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/Modules/mediastream/MediaDevices.cpp

@@ -110 +110 @@
 {
     auto* currentGestureToken = UserGestureIndicator::currentUserGesture().get();
-    if (m_currentGestureToken != currentGestureToken) {
-        m_currentGestureToken = currentGestureToken;
+    if (m_currentGestureToken.get() != currentGestureToken) {
+        m_currentGestureToken = makeWeakPtr(currentGestureToken);
         m_requestTypesForCurrentGesture = { };
     }

trunk/Source/WebCore/Modules/mediastream/MediaDevices.h

@@ -126 +126 @@
 
     OptionSet<GestureAllowedRequest> m_requestTypesForCurrentGesture;
-    UserGestureToken* m_currentGestureToken { nullptr };
+    WeakPtr<UserGestureToken> m_currentGestureToken;
 };
 

trunk/Source/WebCore/dom/UserGestureIndicator.h

@@ -32 +32 @@
 #include <wtf/RefCounted.h>
 #include <wtf/Vector.h>
+#include <wtf/WeakPtr.h>
 
 namespace WebCore {
@@ -45 +46 @@
 enum class UserGestureType { EscapeKey, Other };
 
-class UserGestureToken : public RefCounted<UserGestureToken> {
+class UserGestureToken : public RefCounted<UserGestureToken>, public CanMakeWeakPtr<UserGestureToken> {
 public:
     static Ref<UserGestureToken> create(ProcessingUserGestureState state, UserGestureType gestureType)