Ensure the scheduler always changes from UseCase LOADING to NONE.

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 95 matching lines @@
   TRACE_EVENT_MARK_WITH_TIMESTAMP1(
       "loading", "firstMeaningfulPaintCandidate",
       TraceEvent::toTraceTimestamp(m_provisionalFirstMeaningfulPaint), "frame",
       document()->frame());
   // Ignore the first meaningful paint candidate as this generally is the first
   // contentful paint itself.
   if (!m_seenFirstMeaningfulPaintCandidate) {
     m_seenFirstMeaningfulPaintCandidate = true;
     return;
   }
-  m_paintTiming->markFirstMeaningfulPaintCandidate();
+  m_paintTiming->setFirstMeaningfulPaintCandidate(
+      m_provisionalFirstMeaningfulPaint);
 }
 
 int FirstMeaningfulPaintDetector::activeConnections() {
   DCHECK(document());
   ResourceFetcher* fetcher = document()->fetcher();
   return fetcher->blockingRequestCount() + fetcher->nonblockingRequestCount();
 }
 
 // This function is called when the number of active connections is decreased.
 void FirstMeaningfulPaintDetector::checkNetworkStable() {
@@ skipping 36 matching lines @@
   reportHistograms();
 }
 
 void FirstMeaningfulPaintDetector::network2QuietTimerFired(TimerBase*) {
   if (!document() || m_network2QuietReached || activeConnections() > 2 ||
       !m_paintTiming->firstContentfulPaint())
     return;
   m_network2QuietReached = true;
 
   if (m_provisionalFirstMeaningfulPaint) {
+    // 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.
+    m_paintTiming->setFirstMeaningfulPaintCandidate(
+        m_provisionalFirstMeaningfulPaint);
     // Enforce FirstContentfulPaint <= FirstMeaningfulPaint.
     m_firstMeaningfulPaint2Quiet =
         std::max(m_provisionalFirstMeaningfulPaint,
                  m_paintTiming->firstContentfulPaint());
     // Report FirstMeaningfulPaint when the page reached network 2-quiet.
     m_paintTiming->setFirstMeaningfulPaint(m_firstMeaningfulPaint2Quiet);
   }
   reportHistograms();
 }
 
@@ skipping 37 matching lines @@
   } else if (m_firstMeaningfulPaint2Quiet) {
     hadNetworkQuietHistogram.count(HadNetwork2Quiet);
   }
 }
 
 DEFINE_TRACE(FirstMeaningfulPaintDetector) {
   visitor->trace(m_paintTiming);
 }
 
 }  // namespace blink