Back PaintRecord with PaintOpBuffer instead of SkPicture

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

 // 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.
 
 #include "platform/graphics/paint/PaintController.h"
 
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/graphics/paint/DrawingDisplayItem.h"
 #include "platform/instrumentation/tracing/TraceEvent.h"
 #include "third_party/skia/include/core/SkPictureAnalyzer.h"
 #include "wtf/AutoReset.h"
 #include "wtf/text/StringBuilder.h"
 
 #ifndef NDEBUG
 #include "platform/graphics/LoggingCanvas.h"
 #include <stdio.h>
 #endif
 
+static constexpr int maxNumberOfSlowPathsBeforeVeto = 5;
+
 namespace blink {
 
 void PaintController::setTracksRasterInvalidations(bool value) {
   if (value) {
     m_paintChunksRasterInvalidationTrackingMap =
         WTF::wrapUnique(new RasterInvalidationTrackingMap<const PaintChunk>);
   } else {
     m_paintChunksRasterInvalidationTrackingMap = nullptr;
   }
 }
@@ skipping 467 matching lines @@
   // These data structures are used during painting only.
   DCHECK(!isSkippingCache());
 #if DCHECK_IS_ON()
   m_newDisplayItemIndicesByClient.clear();
 #endif
 
   if (RuntimeEnabledFeatures::slimmingPaintV2Enabled() &&
       !m_newDisplayItemList.isEmpty())
     generateChunkRasterInvalidationRects(m_newPaintChunks.lastChunk());
 
-  SkPictureGpuAnalyzer gpuAnalyzer;
+  int numSlowPaths = 0;
 
   m_currentCacheGeneration =
       DisplayItemClient::CacheGenerationOrInvalidationReason::next();
   Vector<const DisplayItemClient*> skippedCacheClients;
   for (const auto& item : m_newDisplayItemList) {
     // No reason to continue the analysis once we have a veto.
-    if (gpuAnalyzer.suitableForGpuRasterization())
-      item.analyzeForGpuRasterization(gpuAnalyzer);
+    if (numSlowPaths <= maxNumberOfSlowPathsBeforeVeto)
+      numSlowPaths += item.numberOfSlowPaths();
 
     // TODO(wkorman): Only compute and append visual rect for drawings.
     m_newDisplayItemList.appendVisualRect(
         visualRectForDisplayItem(item, offsetFromLayoutObject));
 
     if (item.isCacheable()) {
       item.client().setDisplayItemsCached(m_currentCacheGeneration);
     } else {
       if (item.client().isJustCreated())
         item.client().clearIsJustCreated();
@@ skipping 17 matching lines @@
     }
   }
 
   for (auto* client : skippedCacheClients)
     client->setDisplayItemsUncached();
 
   // The new list will not be appended to again so we can release unused memory.
   m_newDisplayItemList.shrinkToFit();
   m_currentPaintArtifact = PaintArtifact(
       std::move(m_newDisplayItemList), m_newPaintChunks.releasePaintChunks(),
-      gpuAnalyzer.suitableForGpuRasterization());
+      numSlowPaths <= maxNumberOfSlowPathsBeforeVeto);
   resetCurrentListIndices();
   m_outOfOrderItemIndices.clear();
   m_outOfOrderChunkIndices.clear();
   m_itemsMovedIntoNewList.clear();
 
   if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
     for (const auto& chunk : m_currentPaintArtifact.paintChunks()) {
       if (chunk.id && chunk.id->client.isJustCreated())
         chunk.id->client.clearIsJustCreated();
     }
@@ skipping 300 matching lines @@
                        showPaintRecords
                            ? (DisplayItemList::JsonOptions::ShowPaintRecords |
                               DisplayItemList::JsonOptions::ShowClientDebugName)
                            : DisplayItemList::JsonOptions::ShowClientDebugName)
                    ->toPrettyJSONString()
                    .utf8()
                    .data());
 }
 
 }  // namespace blink