[FirstMeaningfulPaint] Do not stop observing layouts before FirstContentfulPaint

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 "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 41 matching lines @@
 
 double FirstMeaningfulPaintDetectorTest::s_timeElapsed;
 
 TEST_F(FirstMeaningfulPaintDetectorTest, NoFirstPaint) {
   simulateLayoutAndPaint(1);
   simulateNetworkStable();
   EXPECT_EQ(paintTiming().firstMeaningfulPaint(), 0.0);
 }
 
 TEST_F(FirstMeaningfulPaintDetectorTest, OneLayout) {
-  paintTiming().markFirstPaint();
+  paintTiming().markFirstContentfulPaint();
   simulateLayoutAndPaint(1);
   double afterPaint = monotonicallyIncreasingTime();
   EXPECT_EQ(paintTiming().firstMeaningfulPaint(), 0.0);
   simulateNetworkStable();
   EXPECT_GT(paintTiming().firstMeaningfulPaint(), paintTiming().firstPaint());
   EXPECT_LT(paintTiming().firstMeaningfulPaint(), afterPaint);
 }
 
 TEST_F(FirstMeaningfulPaintDetectorTest, TwoLayoutsSignificantSecond) {
-  paintTiming().markFirstPaint();
+  paintTiming().markFirstContentfulPaint();
   simulateLayoutAndPaint(1);
   double afterLayout1 = monotonicallyIncreasingTime();
   simulateLayoutAndPaint(10);
   double afterLayout2 = monotonicallyIncreasingTime();
   simulateNetworkStable();
   EXPECT_GT(paintTiming().firstMeaningfulPaint(), afterLayout1);
   EXPECT_LT(paintTiming().firstMeaningfulPaint(), afterLayout2);
 }
 
 TEST_F(FirstMeaningfulPaintDetectorTest, TwoLayoutsSignificantFirst) {
-  paintTiming().markFirstPaint();
+  paintTiming().markFirstContentfulPaint();
   simulateLayoutAndPaint(10);
   double afterLayout1 = monotonicallyIncreasingTime();
   simulateLayoutAndPaint(1);
   simulateNetworkStable();
   EXPECT_GT(paintTiming().firstMeaningfulPaint(), paintTiming().firstPaint());
   EXPECT_LT(paintTiming().firstMeaningfulPaint(), afterLayout1);
 }
 
 TEST_F(FirstMeaningfulPaintDetectorTest, FirstMeaningfulPaintCandidate) {
-  paintTiming().markFirstPaint();
+  paintTiming().markFirstContentfulPaint();
   EXPECT_EQ(paintTiming().firstMeaningfulPaintCandidate(), 0.0);
   simulateLayoutAndPaint(1);
   double afterPaint = monotonicallyIncreasingTime();
   // The first candidate gets ignored.
   EXPECT_EQ(paintTiming().firstMeaningfulPaintCandidate(), 0.0);
   simulateLayoutAndPaint(10);
   // The second candidate gets reported.
   EXPECT_GT(paintTiming().firstMeaningfulPaintCandidate(), afterPaint);
   double candidate = paintTiming().firstMeaningfulPaintCandidate();
   // The third candidate gets ignored since we already saw the first candidate.
   simulateLayoutAndPaint(10);
   EXPECT_EQ(paintTiming().firstMeaningfulPaintCandidate(), candidate);
 }
 
+TEST_F(FirstMeaningfulPaintDetectorTest,
+       NetworkStableBeforeFirstContentfulPaint) {
+  paintTiming().markFirstPaint();
+  simulateLayoutAndPaint(1);
+  simulateNetworkStable();
+  EXPECT_EQ(paintTiming().firstMeaningfulPaint(), 0.0);
+  paintTiming().markFirstContentfulPaint();
+  simulateNetworkStable();
+  EXPECT_NE(paintTiming().firstMeaningfulPaint(), 0.0);
+}
+
 }  // namespace blink