Changeset 244032 in webkit

Timestamp:

Apr 8, 2019, 11:50:41 AM (7 years ago)

Author:

graouts@webkit.org

Message:

[ Mac WK2 iOS Debug ] REGRESSION(r233667) Layout Test imported/w3c/web-platform-tests/web-animations/interfaces/DocumentTimeline/constructor.html is a flaky failure
​https://bugs.webkit.org/show_bug.cgi?id=195233
<rdar://problem/48527231>

Reviewed by Dean Jackson.

We need to create the "main" document timeline (document.timeline) if it doesn't already exist and use its current time as a basis for any other DocumentTimeline instance.

• animation/DocumentTimeline.cpp:

(WebCore::DocumentTimeline::currentTime):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• animation/DocumentTimeline.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-04-08  Antoine Quint  <graouts@apple.com>
+
+        [ Mac WK2 iOS Debug ] REGRESSION(r233667) Layout Test imported/w3c/web-platform-tests/web-animations/interfaces/DocumentTimeline/constructor.html is a flaky failure
+        https://bugs.webkit.org/show_bug.cgi?id=195233
+        <rdar://problem/48527231>
+
+        Reviewed by Dean Jackson.
+
+        We need to create the "main" document timeline (document.timeline) if it doesn't already exist and use its current time as a basis for any other DocumentTimeline instance.
+
+        * animation/DocumentTimeline.cpp:
+        (WebCore::DocumentTimeline::currentTime):
+
 2019-04-08  Antoine Quint  <graouts@apple.com>
 

trunk/Source/WebCore/animation/DocumentTimeline.cpp

@@ -267 +267 @@
         return AnimationTimeline::currentTime();
 
-    if (auto* mainDocumentTimeline = m_document->existingTimeline()) {
-        if (mainDocumentTimeline != this) {
-            if (auto mainDocumentTimelineCurrentTime = mainDocumentTimeline->currentTime())
-                return mainDocumentTimelineCurrentTime.value() - m_originTime;
-            return WTF::nullopt;
-        }
+    auto& mainDocumentTimeline = m_document->timeline();
+    if (&mainDocumentTimeline != this) {
+        if (auto mainDocumentTimelineCurrentTime = mainDocumentTimeline.currentTime())
+            return *mainDocumentTimelineCurrentTime - m_originTime;
+        return WTF::nullopt;
     }