Fold SVGImage::completion_state()

Since SVGImage::PopulatePaintRecordForCurrentFrameForContainer() is
downstream of both of the PaintImageForCurrentFrame() implementations,
just let it set the completion state and don't expose this state
publicly on SVGImage.

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

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

@@ -421,8 +421,7 @@ void SVGImage::DrawForContainer(cc::PaintCanvas* canvas,
 }
 
 PaintImage SVGImage::PaintImageForCurrentFrame() {
-  auto builder =
-      CreatePaintImageBuilder().set_completion_state(completion_state());
+  auto builder = CreatePaintImageBuilder();
   PopulatePaintRecordForCurrentFrameForContainer(builder, Size(), 1, NullURL());
   return builder.TakePaintImage();
 }
@@ -485,6 +484,10 @@ void SVGImage::PopulatePaintRecordForCurrentFrameForContainer(
     const IntSize& zoomed_container_size,
     float zoom,
     const KURL& url) {
+  builder.set_completion_state(
+      load_state_ == LoadState::kLoadCompleted
+          ? PaintImage::CompletionState::DONE
+          : PaintImage::CompletionState::PARTIALLY_DONE);
   if (!page_)
     return;
 

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

@@ -77,12 +77,6 @@ class CORE_EXPORT SVGImage final : public Image {
   void ResetAnimation() override;
   void RestoreAnimation();
 
-  PaintImage::CompletionState completion_state() const {
-    return load_state_ == LoadState::kLoadCompleted
-               ? PaintImage::CompletionState::DONE
-               : PaintImage::CompletionState::PARTIALLY_DONE;
-  }
-
   // Does the SVG image/document contain any animations?
   bool MaybeAnimated() override;
 

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

@@ -70,8 +70,7 @@ bool SVGImageForContainer::ApplyShader(cc::PaintFlags& flags,
 }
 
 PaintImage SVGImageForContainer::PaintImageForCurrentFrame() {
-  auto builder = CreatePaintImageBuilder().set_completion_state(
-      image_->completion_state());
+  auto builder = CreatePaintImageBuilder();
   image_->PopulatePaintRecordForCurrentFrameForContainer(builder, Size(), zoom_,
                                                          url_);
   return builder.TakePaintImage();