Remove gesture token from vrdisplayactivate

third_party/WebKit/Source/modules/vr/VRDisplay.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/vr/VRDisplay.h"
 
 #include "core/css/StylePropertySet.h"
 #include "core/dom/DOMException.h"
-#include "core/dom/DocumentUserGestureToken.h"
 #include "core/dom/FrameRequestCallback.h"
 #include "core/dom/Fullscreen.h"
 #include "core/dom/ScriptedAnimationController.h"
 #include "core/dom/TaskRunnerHelper.h"
 #include "core/frame/UseCounter.h"
 #include "core/inspector/ConsoleMessage.h"
 #include "core/loader/DocumentLoader.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "modules/EventTargetModules.h"
 #include "modules/vr/NavigatorVR.h"
@@ skipping 204 matching lines @@
     ReportPresentationResult(PresentationResult::VRDisplayCannotPresent);
     return promise;
   }
 
   bool firstPresent = !m_isPresenting;
 
   // Initiating VR presentation is only allowed in response to a user gesture.
   // If the VRDisplay is already presenting, however, repeated calls are
   // allowed outside a user gesture so that the presented content may be
   // updated.
-  if (firstPresent && !UserGestureIndicator::utilizeUserGesture()) {
+  if (firstPresent && !UserGestureIndicator::utilizeUserGesture() &&
+      !m_inDisplayActivate) {
     DOMException* exception = DOMException::create(
         InvalidStateError, "API can only be initiated by a user gesture.");
     resolver->reject(exception);
     ReportPresentationResult(PresentationResult::NotInitiatedByUserGesture);
     return promise;
   }
 
   // TODO(mthiesse): Remove fullscreen requirement for presentation. See
   // crbug.com/687369
   Document* doc = this->document();
@@ skipping 128 matching lines @@
 
   resolver->resolve();
 
   stopPresenting();
 
   return promise;
 }
 
 void VRDisplay::beginPresent() {
   Document* doc = this->document();
-  std::unique_ptr<UserGestureIndicator> gestureIndicator;
   if (m_capabilities->hasExternalDisplay()) {
     forceExitPresent();
     DOMException* exception = DOMException::create(
         InvalidStateError,
         "VR Presentation not implemented for this VRDisplay.");
     while (!m_pendingPresentResolvers.isEmpty()) {
       ScriptPromiseResolver* resolver = m_pendingPresentResolvers.takeFirst();
       resolver->reject(exception);
     }
     ReportPresentationResult(
@@ skipping 265 matching lines @@
     OnPresentChange();
   }
 
   m_renderingContext = nullptr;
   m_contextGL = nullptr;
 }
 
 void VRDisplay::OnActivate(device::mojom::blink::VRDisplayEventReason reason) {
   if (!m_navigatorVR->isFocused() || m_displayBlurred)
     return;
-  m_navigatorVR->dispatchVRGestureEvent(VRDisplayEvent::create(
+  AutoReset<bool> activating(&m_inDisplayActivate, true);
+  m_navigatorVR->dispatchVREvent(VRDisplayEvent::create(
       EventTypeNames::vrdisplayactivate, true, false, this, reason));
 }
 
 void VRDisplay::OnDeactivate(
     device::mojom::blink::VRDisplayEventReason reason) {
   m_navigatorVR->enqueueVREvent(VRDisplayEvent::create(
       EventTypeNames::vrdisplaydeactivate, true, false, this, reason));
 }
 
 void VRDisplay::OnVSync(device::mojom::blink::VRPosePtr pose,
@@ skipping 127 matching lines @@
   visitor->trace(m_stageParameters);
   visitor->trace(m_eyeParametersLeft);
   visitor->trace(m_eyeParametersRight);
   visitor->trace(m_layer);
   visitor->trace(m_renderingContext);
   visitor->trace(m_scriptedAnimationController);
   visitor->trace(m_pendingPresentResolvers);
 }
 
 }  // namespace blink