Move the user interaction policy for FirstMeaningfulPaint UMA into renderer

third_party/WebKit/Source/core/paint/FirstMeaningfulPaintDetector.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 "core/paint/FirstMeaningfulPaintDetector.h"
 
 #include "core/css/FontFaceSet.h"
 #include "core/dom/TaskRunnerHelper.h"
 #include "core/paint/PaintTiming.h"
 #include "platform/Histogram.h"
@@ skipping 75 matching lines @@
 
 void FirstMeaningfulPaintDetector::NotifyPaint() {
   if (!next_paint_is_meaningful_)
     return;
 
   // Skip document background-only paints.
   if (paint_timing_->FirstPaint() == 0.0)
     return;
 
   provisional_first_meaningful_paint_ = MonotonicallyIncreasingTime();
+  had_user_input_before_provisional_first_meaningful_paint_ = had_user_input_;
   next_paint_is_meaningful_ = false;
 
   if (network2_quiet_reached_)
     return;
 
   TRACE_EVENT_MARK_WITH_TIMESTAMP1(
       "loading,devtools.timeline", "firstMeaningfulPaintCandidate",
       TraceEvent::ToTraceTimestamp(provisional_first_meaningful_paint_),
       "frame", GetDocument()->GetFrame());
   // Ignore the first meaningful paint candidate as this generally is the first
   // contentful paint itself.
   if (!seen_first_meaningful_paint_candidate_) {
     seen_first_meaningful_paint_candidate_ = true;
     return;
   }
   paint_timing_->SetFirstMeaningfulPaintCandidate(
       provisional_first_meaningful_paint_);
 }
 
+// This is called only on FirstMeaningfulPaintDetector for main frame.
+void FirstMeaningfulPaintDetector::NotifyInputEvent() {
+  // Ignore user inputs before first paint.
+  if (paint_timing_->FirstPaint() == 0.0)
+    return;
+  had_user_input_ = kHadUserInput;
+}
+
 int FirstMeaningfulPaintDetector::ActiveConnections() {
   DCHECK(GetDocument());
   ResourceFetcher* fetcher = GetDocument()->Fetcher();
   return fetcher->BlockingRequestCount() + fetcher->NonblockingRequestCount();
 }
 
 // This function is called when the number of active connections is decreased.
 void FirstMeaningfulPaintDetector::CheckNetworkStable() {
   DCHECK(GetDocument());
   if (!GetDocument()->HasFinishedParsing())
@@ skipping 44 matching lines @@
     // If there's only been one contentful paint, then there won't have been
     // a meaningful paint signalled to the Scheduler, so mark one now.
     // This is a no-op if a FMPC has already been marked.
     paint_timing_->SetFirstMeaningfulPaintCandidate(
         provisional_first_meaningful_paint_);
     // Enforce FirstContentfulPaint <= FirstMeaningfulPaint.
     first_meaningful_paint2_quiet_ =
         std::max(provisional_first_meaningful_paint_,
                  paint_timing_->FirstContentfulPaint());
     // Report FirstMeaningfulPaint when the page reached network 2-quiet.
-    paint_timing_->SetFirstMeaningfulPaint(first_meaningful_paint2_quiet_);
+    paint_timing_->SetFirstMeaningfulPaint(
+        first_meaningful_paint2_quiet_,
+        had_user_input_before_provisional_first_meaningful_paint_);
   }
   ReportHistograms();
 }
 
 void FirstMeaningfulPaintDetector::ReportHistograms() {
   // This enum backs an UMA histogram, and should be treated as append-only.
   enum HadNetworkQuiet {
     kHadNetwork0Quiet,
     kHadNetwork2Quiet,
     kHadNetworkQuietEnumMax
@@ skipping 32 matching lines @@
   } else if (first_meaningful_paint2_quiet_) {
     had_network_quiet_histogram.Count(kHadNetwork2Quiet);
   }
 }
 
 DEFINE_TRACE(FirstMeaningfulPaintDetector) {
   visitor->Trace(paint_timing_);
 }
 
 }  // namespace blink