Remove navigator.vibrate without user gesture.

third_party/WebKit/Source/modules/vibration/NavigatorVibration.cpp

 /*
  *  Copyright (C) 2012 Samsung Electronics
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
  *  License as published by the Free Software Foundation; either
  *  version 2 of the License, or (at your option) any later version.
  *
  *  This library is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *  Library General Public License for more details.
  *
  *  You should have received a copy of the GNU Library General Public License
  *  along with this library; see the file COPYING.LIB.  If not, write to
  *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  *  Boston, MA 02110-1301, USA.
  */
 
 #include "modules/vibration/NavigatorVibration.h"
 
 #include "core/dom/Document.h"
+#include "core/frame/FrameConsole.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Navigator.h"
 #include "core/frame/UseCounter.h"
+#include "core/inspector/ConsoleMessage.h"
 #include "core/page/Page.h"
 #include "modules/vibration/VibrationController.h"
 #include "platform/Histogram.h"
 #include "platform/UserGestureIndicator.h"
 #include "public/platform/site_engagement.mojom-blink.h"
 
 namespace blink {
 
 NavigatorVibration::NavigatorVibration(Navigator& navigator)
     : ContextLifecycleObserver(navigator.frame()->document()) {}
@@ skipping 34 matching lines @@
   if (!frame)
     return false;
   collectHistogramMetrics(*frame);
 
   DCHECK(frame->document());
   DCHECK(frame->page());
 
   if (!frame->page()->isPageVisible())
     return false;
 
+  if (!frame->hasReceivedUserGesture()) {
+    if (frame->isCrossOriginSubframe()) {
+      frame->domWindow()->printErrorMessage(
+          "Blocked call to navigator.vibrate inside a cross-origin iframe "
+          "because the frame has never been activated by the user: "
+          "https://www.chromestatus.com/feature/5682658461876224.");
+      return false;
+    }
+    // For other frames (except x-origin iframe) including top-level page.
+    if (!RuntimeEnabledFeatures::vibrateRequiresUserGestureEnabled()) {
+      // Just print a warning.
+      frame->domWindow()->frameConsole()->addMessage(ConsoleMessage::create(
+          JSMessageSource, WarningMessageLevel,
+          "A call to navigator.vibrate will soon require user tap on "
+          "the frame or any embedded frame: "
+          "https://www.chromestatus.com/feature/5644273861001216."));
+    } else {
+      frame->domWindow()->printErrorMessage(
+          "Blocked call to navigator.vibrate because user hasn't tapped on "
+          "the frame or any embedded frame yet: "
+          "https://www.chromestatus.com/feature/5644273861001216.");
+      return false;
+    }
+  }
+
   // TODO(lunalu): When FeaturePolicy is ready, take out the check for the
-  // runtime flag. Please pay attention to the user gesture code below.
+  // runtime flag. Please pay attention to the user gesture code above.
   if (RuntimeEnabledFeatures::featurePolicyEnabled() &&
       !frame->isFeatureEnabled(blink::WebFeaturePolicyFeature::Vibrate)) {
     frame->domWindow()->printErrorMessage(
         "Navigator.vibrate() is not enabled in feature policy for this "
         "frame.");
     return false;
   }
 
-  if (!RuntimeEnabledFeatures::featurePolicyEnabled() &&
-      frame->isCrossOriginSubframe() && !frame->hasReceivedUserGesture()) {
-    frame->domWindow()->printErrorMessage(
-        "Blocked call to navigator.vibrate inside a cross-origin iframe "
-        "because the frame has never been activated by the user: "
-        "https://www.chromestatus.com/feature/5682658461876224.");
-    return false;
-  }
-
   return NavigatorVibration::from(navigator).controller(*frame)->vibrate(
       pattern);
 }
 
 // static
 void NavigatorVibration::collectHistogramMetrics(const LocalFrame& frame) {
   NavigatorVibrationType type;
-  bool userGesture = UserGestureIndicator::processingUserGesture();
+  bool userGesture = frame.hasReceivedUserGesture();
   UseCounter::count(&frame, UseCounter::NavigatorVibrate);
   if (!frame.isMainFrame()) {
     UseCounter::count(&frame, UseCounter::NavigatorVibrateSubFrame);
     if (frame.isCrossOriginSubframe()) {
       if (userGesture)
         type = NavigatorVibrationType::CrossOriginSubFrameWithUserGesture;
       else
         type = NavigatorVibrationType::CrossOriginSubFrameNoUserGesture;
     } else {
       if (userGesture)
@@ skipping 47 matching lines @@
   }
 }
 
 DEFINE_TRACE(NavigatorVibration) {
   visitor->trace(m_controller);
   Supplement<Navigator>::trace(visitor);
   ContextLifecycleObserver::trace(visitor);
 }
 
 }  // namespace blink