Delay SVGImage animations reset while being updated.

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 45 matching lines @@
 #include "platform/graphics/paint/CullRect.h"
 #include "platform/graphics/paint/DrawingRecorder.h"
 #include "platform/graphics/paint/SkPictureBuilder.h"
 #include "third_party/skia/include/core/SkPicture.h"
 #include "wtf/PassRefPtr.h"
 
 namespace blink {
 
 SVGImage::SVGImage(ImageObserver* observer)
     : Image(observer)
+    , m_updatingAnimations(false)
+    , m_resetAnimationAfterUpdate(false)
 {
 }
 
 SVGImage::~SVGImage()
 {
     if (m_page) {
         // Store m_page in a local variable, clearing m_page, so that SVGImageChromeClient knows we're destructed.
         Page* currentPage = m_page.release();
         // Break both the loader and view references to the frame
         currentPage->willBeDestroyed();
@@ skipping 333 matching lines @@
 void SVGImage::stopAnimation()
 {
     SVGSVGElement* rootElement = svgRootElement(m_page.get());
     if (!rootElement)
         return;
     rootElement->pauseAnimations();
 }
 
 void SVGImage::resetAnimation()
 {
+    if (m_updatingAnimations) {
+        m_resetAnimationAfterUpdate = true;
+        return;
+    }
+
     SVGSVGElement* rootElement = svgRootElement(m_page.get());
     if (!rootElement)
         return;
     rootElement->pauseAnimations();
     rootElement->setCurrentTime(0);
 }
 
 bool SVGImage::hasAnimations() const
 {
     SVGSVGElement* rootElement = svgRootElement(m_page.get());
@@ skipping 105 matching lines @@
     }
 
     return m_page;
 }
 
 String SVGImage::filenameExtension() const
 {
     return "svg";
 }
 
+void SVGImage::leaveNoResetAnimationScope()
+{
+    if (!m_updatingAnimations) {
+        DCHECK(!m_resetAnimationAfterUpdate);
+        return;
+    }
+    m_updatingAnimations = false;
+    if (m_resetAnimationAfterUpdate) {
+        m_resetAnimationAfterUpdate = false;
+        resetAnimation();
+    }
+}
+
+SVGImage::UpdateAnimationScope::UpdateAnimationScope(SVGImage* image)
+    : m_image(image)
+    , m_imageObserver(m_image->getImageObserver())
+{
+    m_image->enterNoResetAnimationsScope();
+}
+
+SVGImage::UpdateAnimationScope::~UpdateAnimationScope()
+{
+    m_image->leaveNoResetAnimationScope();
+}
+
 } // namespace blink