Move persistent gesture state to Document, add DocumentUserGestureToken

third_party/WebKit/Source/modules/notifications/Notification.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 17 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "modules/notifications/Notification.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "bindings/core/v8/SerializedScriptValueFactory.h"
 #include "bindings/modules/v8/V8NotificationAction.h"
 #include "core/dom/Document.h"
+#include "core/dom/DocumentUserGestureToken.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/dom/ExecutionContextTask.h"
 #include "core/dom/ScopedWindowFocusAllowedIndicator.h"
 #include "core/events/Event.h"
 #include "core/frame/UseCounter.h"
 #include "modules/notifications/NotificationAction.h"
 #include "modules/notifications/NotificationData.h"
 #include "modules/notifications/NotificationManager.h"
 #include "modules/notifications/NotificationOptions.h"
 #include "modules/notifications/NotificationResourcesLoader.h"
@@ skipping 164 matching lines @@
   DCHECK(m_notificationId.isEmpty());
   m_notificationId = notificationId;
 
   dispatchEvent(Event::create(EventTypeNames::show));
 
   if (m_requestedClose)
     close();
 }
 
 void Notification::didClickNotification() {
-  UserGestureIndicator gestureIndicator(
-      UserGestureToken::create(UserGestureToken::NewGesture));
-
+  ExecutionContext* context = getExecutionContext();
+  UserGestureIndicator gestureIndicator(DocumentUserGestureToken::create(
+      context->isDocument() ? toDocument(context) : nullptr,

[Peter Beverloo, 2016/10/19 16:36:48]

Prefer DCHECK(context->isDocument()) for this code.

We don't use this function in non-document contexts, so best to be explicit
about it.

[Nate Chapin, 2016/10/21 18:11:04]

Done.

[Nate Chapin, 2016/10/21 20:43:28]

...actually, the layout tests disagree. Switched back to checking isDocument().

+      UserGestureToken::NewGesture));
   ScopedWindowFocusAllowedIndicator windowFocusAllowed(getExecutionContext());
   dispatchEvent(Event::create(EventTypeNames::click));
 }
 
 void Notification::didCloseNotification() {
   // The notification will be showing when the user initiated the close, or it
   // will be closing if the developer initiated the close.
   if (m_state != State::Showing && m_state != State::Closing)
     return;
 
@@ skipping 170 matching lines @@
 }
 
 DEFINE_TRACE(Notification) {
   visitor->trace(m_prepareShowMethodRunner);
   visitor->trace(m_loader);
   EventTargetWithInlineData::trace(visitor);
   ActiveDOMObject::trace(visitor);
 }
 
 }  // namespace blink