Add |id| field to intervention reports.

Every intervention report should have a human-readable id, as specified
in the Reporting spec.

https://w3c.github.io/reporting/#dom-interventionreportbody-id

Bug: 564071
Change-Id: I82d1237fe9b45f28691e0772abd6d9995833e1ee
Reviewed-on: https://chromium-review.googlesource.com/1129469Reviewed-by: Nate Chapin <japhet@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Commit-Queue: Paul Meyer <paulmeyer@chromium.org>
Cr-Commit-Position: refs/heads/master@{#574183}

third_party/WebKit/LayoutTests/reporting-observer/intervention.html

@@ -17,6 +17,7 @@ async_test(function(test) {
       assert_equals(reports[0].type, "intervention");
       assert_true(reports[0].url.endsWith(
           "reporting-observer/intervention.html"));
+      assert_equals(typeof reports[0].body.id, "string");
       assert_true(reports[0].body.sourceFile.endsWith(
           "reporting-observer/resources/intervention.js"));
       assert_equals(typeof reports[0].body.lineNumber, "number");

third_party/blink/renderer/core/dom/document.cc

@@ -3470,21 +3470,21 @@ bool Document::DispatchBeforeUnloadEvent(ChromeClient& chrome_client,
 
   if (!GetFrame()->HasBeenActivated()) {
     beforeunload_dialog_histogram.Count(kNoDialogNoUserGesture);
-    AddConsoleMessage(ConsoleMessage::Create(
-        kInterventionMessageSource, kErrorMessageLevel,
+    String message =
         "Blocked attempt to show a 'beforeunload' confirmation panel for a "
         "frame that never had a user gesture since its load. "
-        "https://www.chromestatus.com/feature/5082396709879808"));
+        "https://www.chromestatus.com/feature/5082396709879808";
+    Intervention::GenerateReport(frame_, "BeforeUnloadNoGesture", message);
     return true;
   }
 
   if (did_allow_navigation) {
     beforeunload_dialog_histogram.Count(
         kNoDialogMultipleConfirmationForNavigation);
-    AddConsoleMessage(ConsoleMessage::Create(
-        kInterventionMessageSource, kErrorMessageLevel,
+    String message =
         "Blocked attempt to show multiple 'beforeunload' confirmation panels "
-        "for a single navigation."));
+        "for a single navigation.";
+    Intervention::GenerateReport(frame_, "BeforeUnloadMultiple", message);
     return true;
   }
   String text = before_unload_event->returnValue();
@@ -6504,10 +6504,7 @@ void Document::AddConsoleMessage(ConsoleMessage* console_message) {
     console_message->SetNodes(frame_, std::move(nodes));
   }
 
-  if (console_message->Source() == kInterventionMessageSource)
-    Intervention::GenerateReport(frame_, console_message->Message());
-  else
-    frame_->Console().AddMessage(console_message);
+  frame_->Console().AddMessage(console_message);
 }
 
 void Document::TasksWerePaused() {

third_party/blink/renderer/core/events/touch_event.cc

@@ -264,11 +264,13 @@ void TouchEvent::preventDefault() {
   // A common developer error is to wait too long before attempting to stop
   // scrolling by consuming a touchmove event. Generate an error if this
   // event is uncancelable.
+  String id;
   String message;
   switch (HandlingPassive()) {
     case PassiveMode::kNotPassive:
     case PassiveMode::kNotPassiveDefault:
       if (!cancelable()) {
+        id = "IgnoredEventCancel";
         message = "Ignored attempt to cancel a " + type() +
                   " event with cancelable=false, for example "
                   "because scrolling is in progress and "
@@ -280,6 +282,7 @@ void TouchEvent::preventDefault() {
       // an author may use touch action but call preventDefault for interop with
       // browsers that don't support touch-action.
       if (current_touch_action_ == TouchAction::kTouchActionAuto) {
+        id = "PreventDefaultPassive";
         message =
             "Unable to preventDefault inside passive event listener due to "
             "target being treated as passive. See "
@@ -292,7 +295,8 @@ void TouchEvent::preventDefault() {
 
   if (!message.IsEmpty() && view() && view()->IsLocalDOMWindow() &&
       view()->GetFrame()) {
-    Intervention::GenerateReport(ToLocalDOMWindow(view())->GetFrame(), message);
+    Intervention::GenerateReport(ToLocalDOMWindow(view())->GetFrame(), id,
+                                 message);
   }
 
   if ((type() == EventTypeNames::touchstart ||

third_party/blink/renderer/core/frame/intervention.cc

@@ -19,22 +19,22 @@ namespace blink {
 
 // static
 void Intervention::GenerateReport(const LocalFrame* frame,
+                                  const String& id,
                                   const String& message) {
   if (!frame)
     return;
 
   // Send the message to the console.
-  frame->Console().AddMessage(ConsoleMessage::Create(
+  Document* document = frame->GetDocument();
+  document->AddConsoleMessage(ConsoleMessage::Create(
       kInterventionMessageSource, kErrorMessageLevel, message));
 
   if (!frame->Client())
     return;
 
-  Document* document = frame->GetDocument();
-
   // Construct the intervention report.
   InterventionReportBody* body =
-      new InterventionReportBody(message, SourceLocation::Capture());
+      new InterventionReportBody(id, message, SourceLocation::Capture());
   Report* report =
       new Report("intervention", document->Url().GetString(), body);
 

third_party/blink/renderer/core/frame/intervention.h

@@ -23,7 +23,9 @@ class CORE_EXPORT Intervention {
 
   // Generates a intervention report, to be routed to the Reporting API and any
   // ReportingObservers. Also sends the intervention message to the console.
-  static void GenerateReport(const LocalFrame*, const String& message);
+  static void GenerateReport(const LocalFrame*,
+                             const String& id,
+                             const String& message);
 
   DISALLOW_COPY_AND_ASSIGN(Intervention);
 };

third_party/blink/renderer/core/frame/intervention_report_body.h

@@ -14,11 +14,17 @@ class CORE_EXPORT InterventionReportBody : public MessageReportBody {
   DEFINE_WRAPPERTYPEINFO();
 
  public:
-  InterventionReportBody(const String& message,
+  InterventionReportBody(const String& id,
+                         const String& message,
                          std::unique_ptr<SourceLocation> location)
-      : MessageReportBody(message, std::move(location)) {}
+      : MessageReportBody(message, std::move(location)), id_(id) {}
 
   ~InterventionReportBody() override = default;
+
+  String id() const { return id_; }
+
+ private:
+  const String id_;
 };
 
 }  // namespace blink

third_party/blink/renderer/core/frame/intervention_report_body.idl

@@ -8,7 +8,7 @@
     NoInterfaceObject,
     RuntimeEnabled=InterventionReporting
 ] interface InterventionReportBody : ReportBody {
-  // TODO(paulmeyer): Add additional data, such as id.
+  readonly attribute DOMString id;
   readonly attribute DOMString message;
   readonly attribute DOMString? sourceFile;
   readonly attribute long? lineNumber;

third_party/blink/renderer/modules/vibration/navigator_vibration.cc

@@ -94,7 +94,7 @@ bool NavigatorVibration::vibrate(Navigator& navigator,
           "https://www.chromestatus.com/feature/5644273861001216.";
     }
 
-    Intervention::GenerateReport(frame, message);
+    Intervention::GenerateReport(frame, "NavigatorVibrate", message);
     return false;
   }