Move the user interaction policy for FirstMeaningfulPaint UMA into renderer

third_party/WebKit/Source/core/paint/FirstMeaningfulPaintDetectorTest.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/paint/PaintTiming.h"
 #include "core/testing/DummyPageHolder.h"
 #include "platform/testing/TestingPlatformSupport.h"
 #include "platform/wtf/text/StringBuilder.h"
@@ skipping 38 matching lines @@
   void SimulateNetwork0Quiet() {
     GetDocument().SetParsingState(Document::kFinishedParsing);
     Detector().Network0QuietTimerFired(nullptr);
   }
 
   void SimulateNetwork2Quiet() {
     GetDocument().SetParsingState(Document::kFinishedParsing);
     Detector().Network2QuietTimerFired(nullptr);
   }
 
+  void SimulateUserInput() { Detector().NotifyInputEvent(); }
+
   void SetActiveConnections(int connections) {
     Detector().SetNetworkQuietTimers(connections);
   }
 
   bool IsNetwork0QuietTimerActive() {
     return Detector().network0_quiet_timer_.IsActive();
   }
 
   bool IsNetwork2QuietTimerActive() {
     return Detector().network2_quiet_timer_.IsActive();
@@ skipping 173 matching lines @@
   SetActiveConnections(2);  // This should reset the 2-quiet timer.
   platform_->RunForPeriodSeconds(kNetwork2QuietWindowSeconds - 0.1);
   EXPECT_TRUE(IsNetwork2QuietTimerActive());
   EXPECT_FALSE(HadNetwork2Quiet());
 
   SetActiveConnections(1);  // This should not reset the 2-quiet timer.
   platform_->RunForPeriodSeconds(0.1001);
   EXPECT_TRUE(HadNetwork2Quiet());
 }
 
+TEST_F(FirstMeaningfulPaintDetectorTest,
+       FirstMeaningfulPaintAfterUserInteraction) {
+  GetPaintTiming().MarkFirstContentfulPaint();
+  SimulateUserInput();
+  SimulateLayoutAndPaint(10);
+  SimulateNetworkStable();
+  EXPECT_EQ(GetPaintTiming().FirstMeaningfulPaint(), 0.0);
+}

[tdresser, 2017/06/07 12:32:54]

Should we have a test showing that we ignore input before FP?

[Kunihiko Sakamoto, 2017/06/08 07:54:49]

Done.

+
 }  // namespace blink