Optimize CompositingRecorder::endCompositing to not need an SkPictureBuilder

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

Index: third_party/WebKit/Source/platform/graphics/paint/PaintChunker.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/paint/PaintChunker.cpp b/third_party/WebKit/Source/platform/graphics/paint/PaintChunker.cpp
index a2d87d607d0cbd3326db11ce8649c0a7b82e6ed7..2a3e56c0ae77b53a42416110c7ce595efce64f6c 100644
--- a/third_party/WebKit/Source/platform/graphics/paint/PaintChunker.cpp
+++ b/third_party/WebKit/Source/platform/graphics/paint/PaintChunker.cpp
@@ -8,12 +8,6 @@
 
 namespace blink {
 
-#if DCHECK_IS_ON()
-static bool gNullPaintPropertyChecksDisabled = false;
-DisableNullPaintPropertyChecks::DisableNullPaintPropertyChecks()
-    : m_disabler(&gNullPaintPropertyChecksDisabled, true) {}
-#endif
-
 PaintChunker::PaintChunker() {}
 
 PaintChunker::~PaintChunker() {}
@@ -33,15 +27,13 @@ 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;