Fix first paint tracking for SPv2

third_party/WebKit/Source/platform/graphics/paint/PaintController.h

 // Copyright 2014 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.
 
 #ifndef PaintController_h
 #define PaintController_h
 
 #include "platform/PlatformExport.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/geometry/IntRect.h"
@@ skipping 142 matching lines @@
   void setDisplayItemConstructionIsDisabled(const bool disable) {
     m_constructionDisabled = disable;
   }
   bool subsequenceCachingIsDisabled() const {
     return m_subsequenceCachingDisabled;
   }
   void setSubsequenceCachingIsDisabled(bool disable) {
     m_subsequenceCachingDisabled = disable;
   }
 
+  bool firstPainted() const { return m_firstPainted; }
+  void setFirstPainted() { m_firstPainted = true; }
   bool textPainted() const { return m_textPainted; }
   void setTextPainted() { m_textPainted = true; }
   bool imagePainted() const { return m_imagePainted; }
   void setImagePainted() { m_imagePainted = true; }
 
-  bool nonDefaultBackgroundColorPainted() const {
-    return m_nonDefaultBackgroundColorPainted;
-  }
-  void setNonDefaultBackgroundColorPainted() {
-    m_nonDefaultBackgroundColorPainted = true;
-  }
-
   // Returns displayItemList added using createAndAppend() since beginning or
   // the last commitNewDisplayItems(). Use with care.
   DisplayItemList& newDisplayItemList() { return m_newDisplayItemList; }
 
   void appendDebugDrawingAfterCommit(const DisplayItemClient&,
                                      sk_sp<SkPicture>,
                                      const LayoutSize& offsetFromLayoutObject);
 
   void showDebugData() const { showDebugDataInternal(false); }
 #ifndef NDEBUG
@@ skipping 12 matching lines @@
   RasterInvalidationTrackingMap<const PaintChunk>*
   paintChunksRasterInvalidationTrackingMap() {
     return m_paintChunksRasterInvalidationTrackingMap.get();
   }
 
  protected:
   PaintController()
       : m_newDisplayItemList(0),
         m_constructionDisabled(false),
         m_subsequenceCachingDisabled(false),
+        m_firstPainted(false),
         m_textPainted(false),
         m_imagePainted(false),
-        m_nonDefaultBackgroundColorPainted(false),
         m_skippingCacheCount(0),
         m_numCachedNewItems(0),
         m_currentCachedSubsequenceBeginIndexInNewList(kNotFound)
 #ifndef NDEBUG
         ,
         m_numSequentialMatches(0),
         m_numOutOfOrderMatches(0),
         m_numIndexedItems(0)
 #endif
   {
@@ skipping 79 matching lines @@
   Vector<size_t> m_itemsMovedIntoNewList;
 
   // Allows display item construction to be disabled to isolate the costs of
   // construction in performance metrics.
   bool m_constructionDisabled;
 
   // Allows subsequence caching to be disabled to test the cost of display item
   // caching.
   bool m_subsequenceCachingDisabled;
 
-  // Indicates this PaintController has ever had text. It is never reset to
-  // false.
+  // The following fields indicate that this PaintController has ever had
+  // first-paint, text or image painted. They are never reset to false.
+  // First-paint is defined in https://github.com/WICG/paint-timing. It excludes
+  // default background paint.
+  bool m_firstPainted;
   bool m_textPainted;
   bool m_imagePainted;
-  bool m_nonDefaultBackgroundColorPainted;
 
   int m_skippingCacheCount;
 
   int m_numCachedNewItems;
 
   // Stores indices to valid cacheable display items in
   // m_currentPaintArtifact.displayItemList() that have not been matched by
   // requests of cached display items (using useCachedDrawingIfPossible() and
   // useCachedSubsequenceIfPossible()) during sequential matching. The indexed
   // items will be matched by later out-of-order requests of cached display
@@ skipping 55 matching lines @@
 
 #if CHECK_DISPLAY_ITEM_CLIENT_ALIVENESS
   // A stack recording subsequence clients that are currently painting.
   Vector<const DisplayItemClient*> m_currentSubsequenceClients;
 #endif
 };
 
 }  // namespace blink
 
 #endif  // PaintController_h