Remove Image::PaintRecordForContainer

This interface has a single user and is overridden by a single subclass
(SVGImage), so it seems more pertinent to just implement this using
other existing building blocks.

Change-Id: I241c382c71052821e59280cd4cee10d2deef33dd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2372285
Commit-Queue: Fredrik Söderquist <fs@opera.com>
Reviewed-by: Stephen Chenney <schenney@chromium.org>
Cr-Commit-Position: refs/heads/master@{#801702}

third_party/blink/renderer/core/html/canvas/image_element_base.cc

@@ -144,6 +144,7 @@ ScriptPromise ImageElementBase::CreateImageBitmap(
           "specified.");
       return ScriptPromise();
     }
+    // The following function only works on SVGImages (as checked above).
     return ImageBitmap::CreateAsync(this, crop_rect, script_state, options);
   }
   return ImageBitmapSource::FulfillImageBitmap(

third_party/blink/renderer/core/imagebitmap/image_bitmap.cc

@@ -16,8 +16,10 @@
 #include "third_party/blink/renderer/core/dom/dom_exception.h"
 #include "third_party/blink/renderer/core/html/canvas/html_canvas_element.h"
 #include "third_party/blink/renderer/core/html/canvas/image_data.h"
+#include "third_party/blink/renderer/core/html/canvas/image_element_base.h"
 #include "third_party/blink/renderer/core/html/media/html_video_element.h"
 #include "third_party/blink/renderer/core/offscreencanvas/offscreen_canvas.h"
+#include "third_party/blink/renderer/core/svg/graphics/svg_image_for_container.h"
 #include "third_party/blink/renderer/platform/bindings/enumeration_base.h"
 #include "third_party/blink/renderer/platform/graphics/accelerated_static_bitmap_image.h"
 #include "third_party/blink/renderer/platform/graphics/canvas_color_params.h"
@@ -998,7 +1000,6 @@ ScriptPromise ImageBitmap::CreateAsync(ImageElementBase* image,
   auto* resolver = MakeGarbageCollected<ScriptPromiseResolver>(script_state);
   ScriptPromise promise = resolver->Promise();
 
-  scoped_refptr<Image> input = image->CachedImage()->GetImage();
   ParsedOptions parsed_options =
       ParseOptions(options, crop_rect, image->BitmapSourceSize());
   if (DstBufferSizeHasOverflow(parsed_options)) {
@@ -1008,13 +1009,14 @@ ScriptPromise ImageBitmap::CreateAsync(ImageElementBase* image,
     return promise;
   }
 
+  scoped_refptr<Image> input = image->CachedImage()->GetImage();
+  DCHECK(input->IsSVGImage());
   IntRect input_rect(IntPoint(), input->Size());
-  const IntRect src_rect = Intersection(input_rect, parsed_options.crop_rect);
 
   // In the case when |crop_rect| doesn't intersect the source image, we return
   // a transparent black image, respecting the color_params but ignoring
-  // poremultiply_alpha.
-  if (src_rect.IsEmpty()) {
+  // premultiply_alpha.
+  if (!parsed_options.crop_rect.Intersects(input_rect)) {
     ImageBitmap* bitmap =
         MakeGarbageCollected<ImageBitmap>(MakeBlankImage(parsed_options));
     if (bitmap->BitmapImage()) {
@@ -1031,9 +1033,21 @@ ScriptPromise ImageBitmap::CreateAsync(ImageElementBase* image,
   IntRect draw_src_rect(parsed_options.crop_rect);
   IntRect draw_dst_rect(0, 0, parsed_options.resize_width,
                         parsed_options.resize_height);
-  sk_sp<PaintRecord> paint_record =
-      input->PaintRecordForContainer(NullURL(), input->Size(), draw_src_rect,
-                                     draw_dst_rect, parsed_options.flip_y);
+  PaintRecorder recorder;
+  cc::PaintCanvas* canvas = recorder.beginRecording(draw_src_rect);
+  if (parsed_options.flip_y) {
+    canvas->translate(0, draw_dst_rect.Height());
+    canvas->scale(1, -1);
+  }
+  SVGImageForContainer::Create(To<SVGImage>(input.get()),
+                               FloatSize(input_rect.Size()), 1, NullURL())
+      ->Draw(canvas, cc::PaintFlags(), FloatRect(draw_dst_rect),
+             FloatRect(draw_src_rect),
+             // The following will all be ignored.
+             kRespectImageOrientation, Image::kDoNotClampImageToSourceRect,
+             Image::kSyncDecode);
+  sk_sp<PaintRecord> paint_record = recorder.finishRecordingAsPicture();
+
   std::unique_ptr<ParsedOptions> passed_parsed_options =
       std::make_unique<ParsedOptions>(parsed_options);
   worker_pool::PostTask(

third_party/blink/renderer/core/imagebitmap/image_bitmap.h

@@ -11,12 +11,12 @@
 #include "third_party/blink/renderer/bindings/core/v8/v8_image_bitmap_options.h"
 #include "third_party/blink/renderer/core/core_export.h"
 #include "third_party/blink/renderer/core/html/canvas/canvas_image_source.h"
-#include "third_party/blink/renderer/core/html/canvas/image_element_base.h"
 #include "third_party/blink/renderer/core/imagebitmap/image_bitmap_source.h"
 #include "third_party/blink/renderer/platform/bindings/script_wrappable.h"
 #include "third_party/blink/renderer/platform/geometry/int_rect.h"
 #include "third_party/blink/renderer/platform/graphics/image.h"
 #include "third_party/blink/renderer/platform/graphics/image_orientation.h"
+#include "third_party/blink/renderer/platform/graphics/paint/paint_record.h"
 #include "third_party/blink/renderer/platform/graphics/static_bitmap_image.h"
 #include "third_party/blink/renderer/platform/heap/handle.h"
 #include "third_party/blink/renderer/platform/wtf/functional.h"
@@ -26,6 +26,7 @@ namespace blink {
 class HTMLCanvasElement;
 class HTMLVideoElement;
 class ImageData;
+class ImageElementBase;
 class ImageDecoder;
 class OffscreenCanvas;
 
@@ -40,6 +41,7 @@ class CORE_EXPORT ImageBitmap final : public ScriptWrappable,
   DEFINE_WRAPPERTYPEINFO();
 
  public:
+  // Expects the ImageElementBase to return/have an SVGImage.
   static ScriptPromise CreateAsync(
       ImageElementBase*,
       base::Optional<IntRect>,

third_party/blink/renderer/core/svg/graphics/svg_image.cc

@@ -467,26 +467,6 @@ void SVGImage::DrawPatternForContainer(GraphicsContext& context,
   StartAnimation();
 }
 
-sk_sp<PaintRecord> SVGImage::PaintRecordForContainer(
-    const KURL& url,
-    const IntSize& container_size,
-    const IntRect& draw_src_rect,
-    const IntRect& draw_dst_rect,
-    bool flip_y) {
-  if (!page_)
-    return nullptr;
-
-  PaintRecorder recorder;
-  cc::PaintCanvas* canvas = recorder.beginRecording(draw_src_rect);
-  if (flip_y) {
-    canvas->translate(0, draw_dst_rect.Height());
-    canvas->scale(1, -1);
-  }
-  DrawForContainer(canvas, PaintFlags(), FloatSize(container_size), 1,
-                   FloatRect(draw_dst_rect), FloatRect(draw_src_rect), url);
-  return recorder.finishRecordingAsPicture();
-}
-
 void SVGImage::PopulatePaintRecordForCurrentFrameForContainer(
     PaintImageBuilder& builder,
     const IntSize& zoomed_container_size,

third_party/blink/renderer/core/svg/graphics/svg_image.h

@@ -118,12 +118,6 @@ class CORE_EXPORT SVGImage final : public Image {
   // object size is non-empty.)
   bool HasIntrinsicDimensions() const;
 
-  sk_sp<PaintRecord> PaintRecordForContainer(const KURL&,
-                                             const IntSize& container_size,
-                                             const IntRect& draw_src_rect,
-                                             const IntRect& draw_dst_rect,
-                                             bool flip_y) override;
-
   PaintImage PaintImageForCurrentFrame() override;
 
  protected:

third_party/blink/renderer/platform/graphics/image.h

@@ -38,7 +38,6 @@
 #include "third_party/blink/renderer/platform/graphics/image_observer.h"
 #include "third_party/blink/renderer/platform/graphics/image_orientation.h"
 #include "third_party/blink/renderer/platform/graphics/paint/paint_image.h"
-#include "third_party/blink/renderer/platform/graphics/paint/paint_record.h"
 #include "third_party/blink/renderer/platform/heap/persistent.h"
 #include "third_party/blink/renderer/platform/platform_export.h"
 #include "third_party/blink/renderer/platform/wtf/forward.h"
@@ -60,7 +59,6 @@ namespace blink {
 class FloatRect;
 class GraphicsContext;
 class Image;
-class KURL;
 class WebGraphicsContext3DProvider;
 class WebGraphicsContext3DProviderWrapper;
 
@@ -249,15 +247,6 @@ class PLATFORM_EXPORT Image : public ThreadSafeRefCounted<Image> {
     return nullptr;
   }
 
-  virtual sk_sp<PaintRecord> PaintRecordForContainer(
-      const KURL& url,
-      const IntSize& container_size,
-      const IntRect& draw_src_rect,
-      const IntRect& draw_dst_rect,
-      bool flip_y) {
-    return nullptr;
-  }
-
   PaintImage::Id paint_image_id() const { return stable_image_id_; }
 
   // Returns an SkBitmap that is a copy of the image's current frame.

third_party/blink/renderer/platform/graphics/placeholder_image.h

@@ -12,6 +12,7 @@
 #include "third_party/blink/renderer/platform/geometry/int_size.h"
 #include "third_party/blink/renderer/platform/graphics/image.h"
 #include "third_party/blink/renderer/platform/graphics/image_orientation.h"
+#include "third_party/blink/renderer/platform/graphics/paint/paint_record.h"
 #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
 #include "third_party/skia/include/core/SkImage.h"
 #include "third_party/skia/include/core/SkRefCnt.h"