SPv2: Paint SVG images and self-contained recorded pictures with their own trees.

third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp

 /*
  * Copyright (C) 2006 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 270 matching lines @@
                                        const KURL& url) {
   // Tile adjusted for scaling/stretch.
   FloatRect tile(srcRect);
   tile.scale(tileScale.width(), tileScale.height());
 
   // Expand the tile to account for repeat spacing.
   FloatRect spacedTile(tile);
   spacedTile.expand(FloatSize(repeatSpacing));
 
   SkPictureBuilder patternPicture(spacedTile, nullptr, &context);
+  // SVG images paint into their own property tree set that is distinct
+  // from the embedding frame tree.
+  if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
+    PaintChunk::Id id(patternPicture, DisplayItem::kSVGImage);
+    PropertyTreeState state(
+        TransformPaintPropertyNode::root(), ClipPaintPropertyNode::root(),
+        EffectPaintPropertyNode::root(), ScrollPaintPropertyNode::root());
+    m_paintController->updateCurrentPaintChunkProperties(&id, state);
+  }
+
   {
     DrawingRecorder patternPictureRecorder(
         patternPicture.context(), patternPicture, DisplayItem::Type::kSVGImage,
         spacedTile);
     // When generating an expanded tile, make sure we don't draw into the
     // spacing area.
     if (tile != spacedTile)
       patternPicture.context().clip(tile);
     SkPaint paint;
     drawForContainer(patternPicture.context().canvas(), paint, containerSize,
@@ skipping 71 matching lines @@
   view->processUrlFragment(url);
 
   // If the image was reset, we need to rewind the timeline back to 0. This
   // needs to be done before painting, or else we wouldn't get the correct
   // reset semantics (we'd paint the "last" frame rather than the one at
   // time=0.) The reason we do this here and not in resetAnimation() is to
   // avoid setting timers from the latter.
   flushPendingTimelineRewind();
   SkPictureBuilder imagePicture(dstRect, nullptr, nullptr,
                                 m_paintController.get());
+  // SVG images paint into their own property tree set that is distinct

[pdr., 2017/01/17 21:48:00]

Could you move this into SkPictureBuilder?

+  // from the embedding frame tree.
+  if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
+    PaintChunk::Id id(imagePicture, DisplayItem::kSVGImage);
+    PropertyTreeState state(
+        TransformPaintPropertyNode::root(), ClipPaintPropertyNode::root(),
+        EffectPaintPropertyNode::root(), ScrollPaintPropertyNode::root());
+    m_paintController->updateCurrentPaintChunkProperties(&id, state);
+  }
+
   {
     ClipRecorder clipRecorder(imagePicture.context(), imagePicture,
                               DisplayItem::kClipNodeImage,
                               enclosingIntRect(dstRect));
 
     // We can only draw the entire frame, clipped to the rect we want. So
     // compute where the top left of the image would be if we were drawing
     // without clipping, and translate accordingly.
     FloatSize scale(dstRect.width() / srcRect.width(),
                     dstRect.height() / srcRect.height());
@@ skipping 236 matching lines @@
   }
 
   return m_page ? SizeAvailable : SizeUnavailable;
 }
 
 String SVGImage::filenameExtension() const {
   return "svg";
 }
 
 }  // namespace blink