[FirstMeaningfulPaint] Do not stop observing layouts before FirstContentfulPaint

third_party/WebKit/Source/core/paint/FirstMeaningfulPaintDetectorTest.cpp

Index: third_party/WebKit/Source/core/paint/FirstMeaningfulPaintDetectorTest.cpp
diff --git a/third_party/WebKit/Source/core/paint/FirstMeaningfulPaintDetectorTest.cpp b/third_party/WebKit/Source/core/paint/FirstMeaningfulPaintDetectorTest.cpp
index 780c293978d1bb6da6d43c48d90512f127dea408..b28b460f85ef86d715936af54fdb218d3b279eff 100644
--- a/third_party/WebKit/Source/core/paint/FirstMeaningfulPaintDetectorTest.cpp
+++ b/third_party/WebKit/Source/core/paint/FirstMeaningfulPaintDetectorTest.cpp
@@ -59,7 +59,7 @@ TEST_F(FirstMeaningfulPaintDetectorTest, NoFirstPaint) {
 }
 
 TEST_F(FirstMeaningfulPaintDetectorTest, OneLayout) {
-  paintTiming().markFirstPaint();
+  paintTiming().markFirstContentfulPaint();
   simulateLayoutAndPaint(1);
   double afterPaint = monotonicallyIncreasingTime();
   EXPECT_EQ(paintTiming().firstMeaningfulPaint(), 0.0);
@@ -69,7 +69,7 @@ TEST_F(FirstMeaningfulPaintDetectorTest, OneLayout) {
 }
 
 TEST_F(FirstMeaningfulPaintDetectorTest, TwoLayoutsSignificantSecond) {
-  paintTiming().markFirstPaint();
+  paintTiming().markFirstContentfulPaint();
   simulateLayoutAndPaint(1);
   double afterLayout1 = monotonicallyIncreasingTime();
   simulateLayoutAndPaint(10);
@@ -80,7 +80,7 @@ TEST_F(FirstMeaningfulPaintDetectorTest, TwoLayoutsSignificantSecond) {
 }
 
 TEST_F(FirstMeaningfulPaintDetectorTest, TwoLayoutsSignificantFirst) {
-  paintTiming().markFirstPaint();
+  paintTiming().markFirstContentfulPaint();
   simulateLayoutAndPaint(10);
   double afterLayout1 = monotonicallyIncreasingTime();
   simulateLayoutAndPaint(1);
@@ -90,7 +90,7 @@ TEST_F(FirstMeaningfulPaintDetectorTest, TwoLayoutsSignificantFirst) {
 }
 
 TEST_F(FirstMeaningfulPaintDetectorTest, FirstMeaningfulPaintCandidate) {
-  paintTiming().markFirstPaint();
+  paintTiming().markFirstContentfulPaint();
   EXPECT_EQ(paintTiming().firstMeaningfulPaintCandidate(), 0.0);
   simulateLayoutAndPaint(1);
   double afterPaint = monotonicallyIncreasingTime();
@@ -105,4 +105,15 @@ TEST_F(FirstMeaningfulPaintDetectorTest, FirstMeaningfulPaintCandidate) {
   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