Changeset 228466 in webkit

Timestamp:

Feb 14, 2018 10:07:17 AM (6 years ago)

Author:

Brent Fulgham

Message:

Confirm proper thread in UserGestureIndicator constructor
​https://bugs.webkit.org/show_bug.cgi?id=175980

Reviewed by Daniel Bates.

Document is a main-thread object. If we enter the UserGestureIndicator constructor
on a non-main thread, we should ASSERT, not return silently.

• dom/UserGestureIndicator.cpp:

(WebCore::UserGestureIndicator::UserGestureIndicator):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/UserGestureIndicator.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-02-14  Brent Fulgham  <bfulgham@apple.com>
+
+        Confirm proper thread in UserGestureIndicator constructor
+        https://bugs.webkit.org/show_bug.cgi?id=175980
+
+        Reviewed by Daniel Bates.
+
+        Document is a main-thread object. If we enter the UserGestureIndicator constructor
+        on a non-main thread, we should ASSERT, not return silently.
+
+        * dom/UserGestureIndicator.cpp:
+        (WebCore::UserGestureIndicator::UserGestureIndicator):
+
 2018-02-14  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/dom/UserGestureIndicator.cpp

@@ -48 +48 @@
 
 UserGestureIndicator::UserGestureIndicator(std::optional<ProcessingUserGestureState> state, Document* document, UserGestureType gestureType, ProcessInteractionStyle processInteractionStyle)
+    : m_previousToken { currentToken() }
 {
-    // Silently ignore UserGestureIndicators on non main threads.
-    if (!isMainThread())
-        return;
-
-    // It is only safe to use currentToken() on the main thread.
-    m_previousToken = currentToken();
+    ASSERT(isMainThread());
 
     if (state)
@@ -69 +65 @@
 UserGestureIndicator::UserGestureIndicator(RefPtr<UserGestureToken> token)
 {
+    // Silently ignore UserGestureIndicators on non main threads.
     if (!isMainThread())
         return;