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

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 277 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));
 
   PaintRecordBuilder builder(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(builder, DisplayItem::kSVGImage);
-    PropertyTreeState state(TransformPaintPropertyNode::root(),
-                            ClipPaintPropertyNode::root(),
-                            EffectPaintPropertyNode::root());
-    m_paintController->updateCurrentPaintChunkProperties(&id, state);
-  }
 
   {
     DrawingRecorder recorder(builder.context(), builder,
                              DisplayItem::Type::kSVGImage, spacedTile);
     // When generating an expanded tile, make sure we don't draw into the
     // spacing area.
     if (tile != spacedTile)
       builder.context().clip(tile);
     PaintFlags flags;
     drawForContainer(builder.context().canvas(), flags, containerSize, zoom,
@@ skipping 45 matching lines @@
   return !flags.isSrcOver();
 }
 
 bool SVGImage::applyShaderInternal(PaintFlags& flags,
                                    const SkMatrix& localMatrix,
                                    const KURL& url) {
   const FloatSize size(containerSize());
   if (size.isEmpty())
     return false;
 
-  const FloatRect bounds(FloatPoint(), size);
+  FloatRect floatBounds(FloatPoint(), size);
+  const SkRect bounds(floatBounds);
+
   flags.setShader(SkShader::MakePictureShader(
-      paintRecordForCurrentFrame(bounds, bounds, url),
-      SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode, &localMatrix,
-      nullptr));
+      paintRecordForCurrentFrame(floatBounds, url), SkShader::kRepeat_TileMode,

[chrishtr, 2017/03/28 03:57:51]

In this call site, the previous code applied no transform because
the src and dest bounds were the same. Also, I believe that there is an
implicit clip to the bounds passed to MakePictureShader, so the clip
that used to be applied also is no longer relevant.

+      SkShader::kRepeat_TileMode, &localMatrix, &bounds));
 
   // Animation is normally refreshed in draw() impls, which we don't reach when
   // painting via shaders.
   startAnimation();
 
   return true;
 }
 
 bool SVGImage::applyShader(PaintFlags& flags, const SkMatrix& localMatrix) {
   return applyShaderInternal(flags, localMatrix, KURL());
@@ skipping 23 matching lines @@
                     const FloatRect& srcRect,
                     RespectImageOrientationEnum shouldRespectImageOrientation,
                     ImageClampingMode clampMode) {
   if (!m_page)
     return;
 
   drawInternal(canvas, flags, dstRect, srcRect, shouldRespectImageOrientation,
                clampMode, KURL());
 }
 
-sk_sp<PaintRecord> SVGImage::paintRecordForCurrentFrame(
-    const FloatRect& srcRect,
-    const FloatRect& dstRect,
-    const KURL& url) {
+sk_sp<PaintRecord> SVGImage::paintRecordForCurrentFrame(const FloatRect& bounds,
+                                                        const KURL& url) {
   DCHECK(m_page);
   FrameView* view = toLocalFrame(m_page->mainFrame())->view();
   view->resize(containerSize());
 
   // Always call processUrlFragment, even if the url is empty, because
   // there may have been a previous url/fragment that needs to be reset.
   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();
-  PaintRecordBuilder builder(dstRect, nullptr, nullptr,
+
+  IntRect intBounds(enclosingIntRect(bounds));
+  PaintRecordBuilder builder(intBounds, nullptr, nullptr,
                              m_paintController.get());
-  // SVG images paint into their own property tree set that is distinct
-  // from the embedding frame tree.
-  if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
-    PaintChunk::Id id(builder, DisplayItem::kSVGImage);
-    PropertyTreeState state(TransformPaintPropertyNode::root(),
-                            ClipPaintPropertyNode::root(),
-                            EffectPaintPropertyNode::root());
-    m_paintController->updateCurrentPaintChunkProperties(&id, state);
-  }
 
-  {
-    ClipRecorder clipRecorder(builder.context(), builder,
-                              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());
-    FloatSize topLeftOffset(srcRect.location().x() * scale.width(),
-                            srcRect.location().y() * scale.height());
-    FloatPoint destOffset = dstRect.location() - topLeftOffset;
-    AffineTransform transform =
-        AffineTransform::translation(destOffset.x(), destOffset.y());
-    transform.scale(scale.width(), scale.height());
-    TransformRecorder transformRecorder(builder.context(), builder, transform);
-
-    view->updateAllLifecyclePhasesExceptPaint();
-    view->paint(builder.context(), CullRect(enclosingIntRect(srcRect)));
-    DCHECK(!view->needsLayout());
-  }
+  view->updateAllLifecyclePhasesExceptPaint();
+  view->paint(builder.context(), CullRect(intBounds));
+  DCHECK(!view->needsLayout());
 
   return builder.endRecording();
 }
 
 void SVGImage::drawInternal(PaintCanvas* canvas,
                             const PaintFlags& flags,
                             const FloatRect& dstRect,
                             const FloatRect& srcRect,
                             RespectImageOrientationEnum,
                             ImageClampingMode,
                             const KURL& url) {
   {
     PaintCanvasAutoRestore ar(canvas, false);
     if (drawNeedsLayer(flags)) {
       SkRect layerRect = dstRect;
       canvas->saveLayer(&layerRect, &flags);
     }
-    canvas->drawPicture(paintRecordForCurrentFrame(srcRect, dstRect, url));
+    // 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());
+    FloatSize topLeftOffset(srcRect.location().x() * scale.width(),
+                            srcRect.location().y() * scale.height());
+    FloatPoint destOffset = dstRect.location() - topLeftOffset;
+    AffineTransform transform =
+        AffineTransform::translation(destOffset.x(), destOffset.y());
+    transform.scale(scale.width(), scale.height());
+
+    canvas->save();
+    canvas->clipRect(enclosingIntRect(dstRect));
+    canvas->concat(affineTransformToSkMatrix(transform));
+    canvas->PlaybackPaintRecord(paintRecordForCurrentFrame(srcRect, url));
+    canvas->restore();
   }
 
   // Start any (SMIL) animations if needed. This will restart or continue
   // animations if preceded by calls to resetAnimation or stopAnimation
   // respectively.
   startAnimation();
 }
 
 LayoutReplaced* SVGImage::embeddedReplacedContent() const {
   SVGSVGElement* rootElement = svgRootElement(m_page.get());
@@ skipping 204 matching lines @@
   }
 
   return m_page ? SizeAvailable : SizeUnavailable;
 }
 
 String SVGImage::filenameExtension() const {
   return "svg";
 }
 
 }  // namespace blink