[SPv2] Flatten property trees in PaintRecordBuilder into a single display list.

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

Index: third_party/WebKit/Source/platform/graphics/paint/PaintRecordBuilder.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/paint/PaintRecordBuilder.cpp b/third_party/WebKit/Source/platform/graphics/paint/PaintRecordBuilder.cpp
index 0e71266e2f7be0777916939fcc4c0fb8ef29b146..a31a977a03579a9f49c6d1f408b5b6a52da1659b 100644
--- a/third_party/WebKit/Source/platform/graphics/paint/PaintRecordBuilder.cpp
+++ b/third_party/WebKit/Source/platform/graphics/paint/PaintRecordBuilder.cpp
@@ -25,17 +25,13 @@ PaintRecordBuilder::PaintRecordBuilder(const FloatRect& bounds,
   } else {
     m_paintControllerPtr = PaintController::create();
     m_paintController = m_paintControllerPtr.get();
+  }
 
-    // Content painted with a new paint controller in SPv2 will have an
-    // independent property tree set.
-    if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
-      PaintChunk::Id id(*this, DisplayItem::kSVGImage);
-      PropertyTreeState state(TransformPaintPropertyNode::root(),
-                              ClipPaintPropertyNode::root(),
-                              EffectPaintPropertyNode::root());
-      m_paintController->updateCurrentPaintChunkProperties(&id, state);
-    }
+  if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
+    m_paintController->updateCurrentPaintChunkProperties(

[pdr., 2017/03/28 21:01:30]

Some of the comments in PaintRecordBuilder.h seem a little stale now. Can you do
a quick pass to make sure they are correct?

[chrishtr, 2017/03/28 21:43:23]

Done.

+        nullptr, PropertyTreeState::root());
   }
+
 #if DCHECK_IS_ON()
   m_paintController->setUsage(PaintController::ForPaintRecordBuilder);
 #endif
@@ -58,7 +54,8 @@ PaintRecordBuilder::~PaintRecordBuilder() {
 sk_sp<PaintRecord> PaintRecordBuilder::endRecording() {
   m_context->beginRecording(m_bounds);
   m_paintController->commitNewDisplayItems();
-  m_paintController->paintArtifact().replay(*m_context);
+  m_paintController->paintArtifact().replay(m_bounds, *m_context,
+                                            PropertyTreeState::root());
   return m_context->endRecording();
 }