Optimize CompositingRecorder::endCompositing to not need an SkPictureBuilder

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

 // Copyright 2015 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/PaintChunker.h"
 
 #include "platform/RuntimeEnabledFeatures.h"
 
 namespace blink {
 
-#if DCHECK_IS_ON()
-static bool gNullPaintPropertyChecksDisabled = false;
-DisableNullPaintPropertyChecks::DisableNullPaintPropertyChecks()
-    : m_disabler(&gNullPaintPropertyChecksDisabled, true) {}
-#endif
-
 PaintChunker::PaintChunker() {}
 
 PaintChunker::~PaintChunker() {}
 
 void PaintChunker::updateCurrentPaintChunkProperties(
     const PaintChunk::Id* chunkId,
     const PaintChunkProperties& properties) {
   DCHECK(RuntimeEnabledFeatures::slimmingPaintV2Enabled());
 
   m_currentChunkId = WTF::nullopt;
   if (chunkId)
     m_currentChunkId.emplace(*chunkId);
   m_currentProperties = properties;
 }
 
 bool PaintChunker::incrementDisplayItemIndex(const DisplayItem& item) {
   DCHECK(RuntimeEnabledFeatures::slimmingPaintV2Enabled());
 
 #if DCHECK_IS_ON()
-  if (!gNullPaintPropertyChecksDisabled) {
-    // Property nodes should never be null because they should either be set to
-    // properties created by a LayoutObject/FrameView, or be set to a non-null
-    // root node. If these DCHECKs are hit we are missing a call to update the
-    // properties. See: ScopedPaintChunkProperties.
-    DCHECK(m_currentProperties.propertyTreeState.transform());
-    DCHECK(m_currentProperties.propertyTreeState.clip());
-    DCHECK(m_currentProperties.propertyTreeState.effect());
-  }
+  // Property nodes should never be null because they should either be set to
+  // properties created by a LayoutObject/FrameView, or be set to a non-null
+  // root node. If these DCHECKs are hit we are missing a call to update the
+  // properties. See: ScopedPaintChunkProperties.
+  DCHECK(m_currentProperties.propertyTreeState.transform());
+  DCHECK(m_currentProperties.propertyTreeState.clip());
+  DCHECK(m_currentProperties.propertyTreeState.effect());
 #endif
 
   ItemBehavior behavior;
   Optional<PaintChunk::Id> newChunkId;
   if (DisplayItem::isForeignLayerType(item.getType())) {
     behavior = RequiresSeparateChunk;
     // Use null chunkId if we are skipping cache, so that the chunk will not
     // match any old chunk and will be treated as brand new.
     if (!item.skippedCache())
       newChunkId.emplace(item.getId());
@@ skipping 57 matching lines @@
 Vector<PaintChunk> PaintChunker::releasePaintChunks() {
   Vector<PaintChunk> chunks;
   chunks.swap(m_chunks);
   m_chunkBehavior.clear();
   m_currentChunkId = WTF::nullopt;
   m_currentProperties = PaintChunkProperties();
   return chunks;
 }
 
 }  // namespace blink