Changeset 214322 in webkit

Timestamp:

Mar 23, 2017, 3:40:50 PM (8 years ago)

Author:

Chris Dumez

Message:

SVG animations are not paused when inserted into a hidden page
​https://bugs.webkit.org/show_bug.cgi?id=170026
<rdar://problem/31228704>

Reviewed by Andreas Kling.

Source/WebCore:

SVG animations were not paused when inserted into a hidden page. We would pause
animations in a page when the page becomes hidden. However, new animations
inserted in the page after this point would start, despite the page being
hidden.

Tests:

• svg/animations/animations-paused-when-inserted-in-hidden-document.html
• svg/animations/animations-paused-when-inserted-in-hidden-document2.html

• dom/Document.cpp:

(WebCore::Document::accessSVGExtensions):

• svg/SVGDocumentExtensions.cpp:

(WebCore::SVGDocumentExtensions::SVGDocumentExtensions):
(WebCore::SVGDocumentExtensions::addTimeContainer):
(WebCore::reportMessage):

• svg/SVGDocumentExtensions.h:
• testing/Internals.cpp:

(WebCore::Internals::areSVGAnimationsPaused):

• testing/Internals.h:
• testing/Internals.idl:

LayoutTests:

Add layout test coverage.

• svg/animations/animations-paused-when-inserted-in-hidden-document-expected.txt: Added.
• svg/animations/animations-paused-when-inserted-in-hidden-document.html: Added.
• svg/animations/animations-paused-when-inserted-in-hidden-document2-expected.txt: Added.
• svg/animations/animations-paused-when-inserted-in-hidden-document2.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/svg/animations/animations-paused-when-inserted-in-hidden-document-expected.txt (added)
• LayoutTests/svg/animations/animations-paused-when-inserted-in-hidden-document.html (added)
• LayoutTests/svg/animations/animations-paused-when-inserted-in-hidden-document2-expected.txt (added)
• LayoutTests/svg/animations/animations-paused-when-inserted-in-hidden-document2.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Document.cpp (modified) (1 diff)
• Source/WebCore/svg/SVGDocumentExtensions.cpp (modified) (4 diffs)
• Source/WebCore/svg/SVGDocumentExtensions.h (modified) (3 diffs)
• Source/WebCore/testing/Internals.cpp (modified) (1 diff)
• Source/WebCore/testing/Internals.h (modified) (1 diff)
• Source/WebCore/testing/Internals.idl (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-03-23  Chris Dumez  <cdumez@apple.com>
+
+        SVG animations are not paused when inserted into a hidden page
+        https://bugs.webkit.org/show_bug.cgi?id=170026
+        <rdar://problem/31228704>
+
+        Reviewed by Andreas Kling.
+
+        Add layout test coverage.
+
+        * svg/animations/animations-paused-when-inserted-in-hidden-document-expected.txt: Added.
+        * svg/animations/animations-paused-when-inserted-in-hidden-document.html: Added.
+        * svg/animations/animations-paused-when-inserted-in-hidden-document2-expected.txt: Added.
+        * svg/animations/animations-paused-when-inserted-in-hidden-document2.html: Added.
+
 == Rolled over to ChangeLog-2017-03-23 ==

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-03-23  Chris Dumez  <cdumez@apple.com>
+
+        SVG animations are not paused when inserted into a hidden page
+        https://bugs.webkit.org/show_bug.cgi?id=170026
+        <rdar://problem/31228704>
+
+        Reviewed by Andreas Kling.
+
+        SVG animations were not paused when inserted into a hidden page. We would pause
+        animations in a page when the page becomes hidden. However, new animations
+        inserted in the page after this point would start, despite the page being
+        hidden.
+
+        Tests:
+        - svg/animations/animations-paused-when-inserted-in-hidden-document.html
+        - svg/animations/animations-paused-when-inserted-in-hidden-document2.html
+
+        * dom/Document.cpp:
+        (WebCore::Document::accessSVGExtensions):
+        * svg/SVGDocumentExtensions.cpp:
+        (WebCore::SVGDocumentExtensions::SVGDocumentExtensions):
+        (WebCore::SVGDocumentExtensions::addTimeContainer):
+        (WebCore::reportMessage):
+        * svg/SVGDocumentExtensions.h:
+        * testing/Internals.cpp:
+        (WebCore::Internals::areSVGAnimationsPaused):
+        * testing/Internals.h:
+        * testing/Internals.idl:
+
 == Rolled over to ChangeLog-2017-03-23 ==

trunk/Source/WebCore/dom/Document.cpp

@@ -4874 +4874 @@
 {
     if (!m_svgExtensions)
-        m_svgExtensions = std::make_unique<SVGDocumentExtensions>(this);
+        m_svgExtensions = std::make_unique<SVGDocumentExtensions>(*this);
     return *m_svgExtensions;
 }

trunk/Source/WebCore/svg/SVGDocumentExtensions.cpp

@@ -28 +28 @@
 #include "Frame.h"
 #include "FrameLoader.h"
+#include "Page.h"
 #include "SMILTimeContainer.h"
 #include "SVGElement.h"
@@ -40 +41 @@
 namespace WebCore {
 
-SVGDocumentExtensions::SVGDocumentExtensions(Document* document)
+SVGDocumentExtensions::SVGDocumentExtensions(Document& document)
     : m_document(document)
     , m_resourcesCache(std::make_unique<SVGResourcesCache>())
+    , m_areAnimationsPaused(!document.page() || !document.page()->isVisible())
 {
 }
@@ -53 +55 @@
 {
     m_timeContainers.add(element);
+    if (m_areAnimationsPaused)
+        element->pauseAnimations();
 }
 
@@ -125 +129 @@
 }
 
-static void reportMessage(Document* document, MessageLevel level, const String& message)
-{
-    if (document->frame())
-        document->addConsoleMessage(MessageSource::Rendering, level, message);
+static void reportMessage(Document& document, MessageLevel level, const String& message)
+{
+    if (document.frame())
+        document.addConsoleMessage(MessageSource::Rendering, level, message);
 }
 

trunk/Source/WebCore/svg/SVGDocumentExtensions.h

@@ -41 +41 @@
 public:
     typedef HashSet<Element*> PendingElements;
-    explicit SVGDocumentExtensions(Document*);
+    explicit SVGDocumentExtensions(Document&);
     ~SVGDocumentExtensions();
     
@@ -78 +78 @@
 
 private:
-    Document* m_document; // weak reference
+    Document& m_document;
     HashSet<SVGSVGElement*> m_timeContainers; // For SVG 1.2 support this will need to be made more general.
 #if ENABLE(SVG_FONTS)
@@ -90 +90 @@
 
     Vector<SVGElement*> m_rebuildElements;
-    bool m_areAnimationsPaused { false }; // For testing.
+    bool m_areAnimationsPaused;
 
 public:

trunk/Source/WebCore/testing/Internals.cpp

@@ -518 +518 @@
 }
 
-bool Internals::areSVGAnimationsPaused() const
+ExceptionOr<bool> Internals::areSVGAnimationsPaused() const
 {
     auto* document = contextDocument();
     if (!document)
-        return false;
+        return Exception { INVALID_ACCESS_ERR, ASCIILiteral("No context document") };
 
     if (!document->svgExtensions())
-        return false;
+        return Exception { NOT_FOUND_ERR, ASCIILiteral("No SVG animations") };
 
     return document->accessSVGExtensions().areAnimationsPaused();

trunk/Source/WebCore/testing/Internals.h

@@ -267 +267 @@
     InternalSettings* settings() const;
     unsigned workerThreadCount() const;
-    bool areSVGAnimationsPaused() const;
+    ExceptionOr<bool> areSVGAnimationsPaused() const;
     ExceptionOr<double> svgAnimationsInterval(SVGSVGElement&) const;
 

trunk/Source/WebCore/testing/Internals.idl

@@ -250 +250 @@
     readonly attribute unsigned long workerThreadCount;
 
-    readonly attribute boolean areSVGAnimationsPaused;
+    [MayThrowException] readonly attribute boolean areSVGAnimationsPaused;
     [MayThrowException] double svgAnimationsInterval(SVGSVGElement element);