1 files changed, 12 insertions, 10 deletions

diff --git a/chromium/third_party/blink/renderer/core/svg/graphics/svg_image.h b/chromium/third_party/blink/renderer/core/svg/graphics/svg_image.h
index 40ff71b5cfa..ad74de97b1a 100644
--- a/chromium/third_party/blink/renderer/core/svg/graphics/svg_image.h
+++ b/chromium/third_party/blink/renderer/core/svg/graphics/svg_image.h
@@ -73,6 +73,7 @@ class CORE_EXPORT SVGImage final : public Image {
 
   void StartAnimation() override;
   void ResetAnimation() override;
+  void RestoreAnimation();
 
   PaintImage::CompletionState completion_state() const {
     return load_state_ == LoadState::kLoadCompleted
@@ -151,15 +152,15 @@ class CORE_EXPORT SVGImage final : public Image {
   // FIXME: Implement this to be less conservative.
   bool CurrentFrameKnownToBeOpaque() override { return false; }
 
-  void Draw(PaintCanvas*,
-            const PaintFlags&,
+  void Draw(cc::PaintCanvas*,
+            const cc::PaintFlags&,
             const FloatRect& from_rect,
             const FloatRect& to_rect,
             RespectImageOrientationEnum,
             ImageClampingMode,
             ImageDecodingMode) override;
-  void DrawForContainer(PaintCanvas*,
-                        const PaintFlags&,
+  void DrawForContainer(cc::PaintCanvas*,
+                        const cc::PaintFlags&,
                         const FloatSize&,
                         float,
                         const FloatRect&,
@@ -185,10 +186,10 @@ class CORE_EXPORT SVGImage final : public Image {
   // Otherwise returns a pointer to the new PaintRecord.
   sk_sp<PaintRecord> PaintRecordForCurrentFrame(const IntRect& bounds,
                                                 const KURL&,
-                                                PaintCanvas* = nullptr);
+                                                cc::PaintCanvas* = nullptr);
 
-  void DrawInternal(PaintCanvas*,
-                    const PaintFlags&,
+  void DrawInternal(cc::PaintCanvas*,
+                    const cc::PaintFlags&,
                     const FloatRect& from_rect,
                     const FloatRect& to_rect,
                     RespectImageOrientationEnum,
@@ -198,13 +199,13 @@ class CORE_EXPORT SVGImage final : public Image {
   template <typename Func>
   void ForContainer(const FloatSize&, Func&&);
 
-  bool ApplyShader(PaintFlags&, const SkMatrix& local_matrix) override;
+  bool ApplyShader(cc::PaintFlags&, const SkMatrix& local_matrix) override;
   bool ApplyShaderForContainer(const FloatSize&,
                                float zoom,
                                const KURL&,
-                               PaintFlags&,
+                               cc::PaintFlags&,
                                const SkMatrix& local_matrix);
-  bool ApplyShaderInternal(PaintFlags&,
+  bool ApplyShaderInternal(cc::PaintFlags&,
                            const SkMatrix& local_matrix,
                            const KURL&);
 
@@ -242,6 +243,7 @@ class CORE_EXPORT SVGImage final : public Image {
   Persistent<SVGImageLocalFrameClient> frame_client_;
   FRIEND_TEST_ALL_PREFIXES(SVGImageTest, SupportsSubsequenceCaching);
   FRIEND_TEST_ALL_PREFIXES(SVGImageTest, JankTrackerDisabled);
+  FRIEND_TEST_ALL_PREFIXES(SVGImageTest, SetSizeOnVisualViewport);
 };
 
 DEFINE_IMAGE_TYPE_CASTS(SVGImage);