Changeset 227882 in webkit

Timestamp:

Jan 31, 2018, 1:09:17 AM (9 years ago)

Author:

jmarcell@apple.com

Message:

Cherry-pick r227841. rdar://problem/37059544

Location:

branches/safari-605-branch

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/svg/animated-svgImage-scroll-expected.txt (added)
• LayoutTests/svg/animated-svgImage-scroll.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderElement.cpp (modified) (2 diffs)
• Source/WebCore/svg/graphics/SVGImage.cpp (modified) (3 diffs)
• Source/WebCore/svg/graphics/SVGImage.h (modified) (3 diffs)

branches/safari-605-branch/LayoutTests/ChangeLog

@@ +1 @@
+2018-01-31  Jason Marcell  <jmarcell@apple.com>
+
+        Cherry-pick r227841. rdar://problem/37059544
+
+    2018-01-30  Dean Jackson  <dino@apple.com>
+
+            CrashTracer: com.apple.WebKit.WebContent at WebCore: WebCore::Document::updateStyleIfNeeded
+            https://bugs.webkit.org/show_bug.cgi?id=182299
+            <rdar://problem/36853088>
+
+            Reviewed by Simon Fraser.
+
+            * svg/animated-svgImage-scroll-expected.txt: Added.
+            * svg/animated-svgImage-scroll.html: Added.
+
 2018-01-30  Jason Marcell  <jmarcell@apple.com>
 

branches/safari-605-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2018-01-31  Jason Marcell  <jmarcell@apple.com>
+
+        Cherry-pick r227841. rdar://problem/37059544
+
+    2018-01-30  Dean Jackson  <dino@apple.com>
+
+            CrashTracer: com.apple.WebKit.WebContent at WebCore: WebCore::Document::updateStyleIfNeeded
+            https://bugs.webkit.org/show_bug.cgi?id=182299
+            <rdar://problem/36853088>
+
+            Reviewed by Simon Fraser.
+
+            Mostly speculative fix for the case where a scrollTo moves an
+            animated SVG image into view, causing its animation to restart during
+            a paint operation. This was causing a release ASSERT, so we now defer
+            the resumption of the animation into a timer.
+
+            Test: svg/animated-svgImage-scroll.html
+
+            * rendering/RenderElement.cpp:
+            (WebCore::RenderElement::repaintForPausedImageAnimationsIfNeeded): Enqueue the
+            animation if it is an SVGImage.
+            * svg/graphics/SVGImage.cpp: Add a timer to enqueue animation starts.
+            (WebCore::SVGImage::SVGImage):
+            (WebCore::SVGImage::startAnimationTimerFired):
+            (WebCore::SVGImage::enqueueStartAnimation):
+            (WebCore::SVGImage::stopAnimation):
+            * svg/graphics/SVGImage.h:
+
 2018-01-30  Jason Marcell  <jmarcell@apple.com>
 

branches/safari-605-branch/Source/WebCore/rendering/RenderElement.cpp

@@ -68 +68 @@
 #include "RenderTheme.h"
 #include "RenderView.h"
+#include "SVGImage.h"
 #include "SVGRenderSupport.h"
 #include "Settings.h"
@@ -1514 +1515 @@
     repaint();
 
-    if (auto* image = cachedImage.image())
-        image->startAnimation();
+    if (auto* image = cachedImage.image()) {
+        // SVGImages might cause a layout when starting an animation, so
+        // schedule them rather than start immediately.
+        if (is<SVGImage>(image))
+            downcast<SVGImage>(image)->scheduleStartAnimation();
+        else
+            image->startAnimation();
+    }
 
     // For directly-composited animated GIFs it does not suffice to call repaint() to resume animation. We need to mark the image as changed.

branches/safari-605-branch/Source/WebCore/svg/graphics/SVGImage.cpp

@@ -70 +70 @@
 SVGImage::SVGImage(ImageObserver& observer)
     : Image(&observer)
+    , m_startAnimationTimer(*this, &SVGImage::startAnimationTimerFired)
 {
 }
@@ -378 +379 @@
 }
 
+void SVGImage::startAnimationTimerFired()
+{
+    startAnimation();
+}
+
+void SVGImage::scheduleStartAnimation()
+{
+    auto rootElement = this->rootElement();
+    if (!rootElement || !rootElement->animationsPaused())
+        return;
+    m_startAnimationTimer.startOneShot(0_s);
+}
+
 void SVGImage::startAnimation()
 {
@@ -389 +403 @@
 void SVGImage::stopAnimation()
 {
+    m_startAnimationTimer.stop();
     auto rootElement = this->rootElement();
     if (!rootElement)

branches/safari-605-branch/Source/WebCore/svg/graphics/SVGImage.h

@@ -61 +61 @@
     bool isAnimating() const final;
 
+    void scheduleStartAnimation();
+
 #if USE(CAIRO)
     NativeImagePtr nativeImageForCurrentFrame(const GraphicsContext* = nullptr) final;
@@ -90 +92 @@
     bool currentFrameKnownToBeOpaque() const final { return false; }
 
+    void startAnimationTimerFired();
+
     explicit SVGImage(ImageObserver&);
     ImageDrawResult draw(GraphicsContext&, const FloatRect& fromRect, const FloatRect& toRect, CompositeOperator, BlendMode, DecodingMode, ImageOrientationDescription) final;
@@ -101 +105 @@
     std::unique_ptr<Page> m_page;
     FloatSize m_intrinsicSize;
+
+    Timer m_startAnimationTimer;
 };