We use cookies to ensure you get the best experience on our website
Главная Обзор Помощь
Регистрация Вход
0ct0pu5
/
ladybird
1
0
Ответвить 0
Файлы Задачи 0 Запросы на слияние 0 Вики
Просмотр исходного кода

LibWeb: Ensure all DocumentTimeline objects have the same time value

The DocumentTimeline constructor used the current millisecond time to
initialize its currentTime, but that means that a newly created timeline
would always have a different time value than other timelines that have
been through the update_animations_and_send_events function.
Matthew Olsson 1 год назад
Родитель
4e9480b719
Сommit
37322baf54
5 измененных файлов с 32 добавлено и 3 удалено
Единый вид Показать статистику Diff
  1. 3 0
      Tests/LibWeb/Text/expected/WebAnimations/misc/DocumentTimeline.txt
  2. 18 0
      Tests/LibWeb/Text/input/WebAnimations/misc/DocumentTimeline.html
  3. 8 3
      Userland/Libraries/LibWeb/Animations/DocumentTimeline.cpp
  4. 1 0
      Userland/Libraries/LibWeb/DOM/Document.cpp
  5. 2 0
      Userland/Libraries/LibWeb/DOM/Document.h

+ 3 - 0
Tests/LibWeb/Text/expected/WebAnimations/misc/DocumentTimeline.txt
Просмотреть файл 

@@ -0,0 +1,3 @@
 
+new timeline time equals document timeline time: true
 
+new timeline originTime defaults to 0: true
 
+new timeline originTime offsets from document timeline: true

+ 18 - 0
Tests/LibWeb/Text/input/WebAnimations/misc/DocumentTimeline.html
Просмотреть файл 

@@ -0,0 +1,18 @@
 
+<!DOCTYPE html>
 
+<script src="../../include.js"></script>
 
+<script>
 
+    test(() => {
 
+        function timesAreClose(a, b) {
 
+            return Math.abs(a - b) <= 1;
 
+        }
 
+        let timeline = new DocumentTimeline();
 
+        println(`new timeline time equals document timeline time: ${timesAreClose(timeline.currentTime, document.timeline.currentTime)}`);
 
+
 
+        timeline = new DocumentTimeline({ originTime: 0 });
 
+        println(`new timeline originTime defaults to 0: ${timesAreClose(timeline.currentTime, document.timeline.currentTime)}`);
 
+
 
+        timeline = new DocumentTimeline({ originTime: 1000 });
 
+        let passed = timesAreClose(timeline.currentTime + 1000, document.timeline.currentTime);
 
+        println(`new timeline originTime offsets from document timeline: ${passed}`)
 
+    });
 
+</script>

+ 8 - 3
Userland/Libraries/LibWeb/Animations/DocumentTimeline.cpp
Просмотреть файл 

@@ -20,9 +20,14 @@ JS_DEFINE_ALLOCATOR(DocumentTimeline);
 
 JS::NonnullGCPtr<DocumentTimeline> DocumentTimeline::create(JS::Realm& realm, DOM::Document& document, HighResolutionTime::DOMHighResTimeStamp origin_time)
 
 JS::NonnullGCPtr<DocumentTimeline> DocumentTimeline::create(JS::Realm& realm, DOM::Document& document, HighResolutionTime::DOMHighResTimeStamp origin_time)
 
 {
 
 {
 
     auto timeline = realm.heap().allocate<DocumentTimeline>(realm, realm, document, origin_time);
 
     auto timeline = realm.heap().allocate<DocumentTimeline>(realm, realm, document, origin_time);
 
-    auto* window_or_worker = dynamic_cast<HTML::WindowOrWorkerGlobalScopeMixin*>(&realm.global_object());
 
-    VERIFY(window_or_worker);
 
-    timeline->set_current_time(window_or_worker->performance()->now());
 
+    auto current_time = document.last_animation_frame_timestamp();
 
+    if (!current_time.has_value()) {
 
+        // The document hasn't processed an animation frame yet, so just use the exact current time
 
+        auto* window_or_worker = dynamic_cast<HTML::WindowOrWorkerGlobalScopeMixin*>(&realm.global_object());
 
+        VERIFY(window_or_worker);
 
+        current_time = window_or_worker->performance()->now();
 
+    }
 
+    timeline->set_current_time(current_time);
 
     return timeline;
 
     return timeline;
 
 }
 
 }

+ 1 - 0
Userland/Libraries/LibWeb/DOM/Document.cpp
Просмотреть файл 

@@ -4233,6 +4233,7 @@ void Document::update_animations_and_send_events(Optional<double> const& timesta
 
     // - Running the update an animation’s finished state procedure for any animations whose current time has been
 
     // - Running the update an animation’s finished state procedure for any animations whose current time has been
 
     //   updated.
 
     //   updated.
 
     // - Queueing animation events for any such animations.
 
     // - Queueing animation events for any such animations.
 
+    m_last_animation_frame_timestamp = timestamp;
 
     for (auto const& timeline : m_associated_animation_timelines)
 
     for (auto const& timeline : m_associated_animation_timelines)
 
         timeline->set_current_time(timestamp);
 
         timeline->set_current_time(timestamp);

+ 2 - 0
Userland/Libraries/LibWeb/DOM/Document.h
Просмотреть файл 

@@ -596,6 +596,7 @@ public:
 
     void restore_the_history_object_state(JS::NonnullGCPtr<HTML::SessionHistoryEntry> entry);
 
     void restore_the_history_object_state(JS::NonnullGCPtr<HTML::SessionHistoryEntry> entry);
 
 
 
     JS::NonnullGCPtr<Animations::DocumentTimeline> timeline();
 
     JS::NonnullGCPtr<Animations::DocumentTimeline> timeline();
 
+    auto const& last_animation_frame_timestamp() const { return m_last_animation_frame_timestamp; }
 
 
 
     void associate_with_timeline(JS::NonnullGCPtr<Animations::AnimationTimeline>);
 
     void associate_with_timeline(JS::NonnullGCPtr<Animations::AnimationTimeline>);
 
     void disassociate_with_timeline(JS::NonnullGCPtr<Animations::AnimationTimeline>);
 
     void disassociate_with_timeline(JS::NonnullGCPtr<Animations::AnimationTimeline>);
 
@@ -889,6 +890,7 @@ private:
 
 
 
     // https://www.w3.org/TR/web-animations-1/#document-default-document-timeline
 
     // https://www.w3.org/TR/web-animations-1/#document-default-document-timeline
 
     JS::GCPtr<Animations::DocumentTimeline> m_default_timeline;
 
     JS::GCPtr<Animations::DocumentTimeline> m_default_timeline;
 
+    Optional<double> m_last_animation_frame_timestamp;
 
 
 
     // https://www.w3.org/TR/web-animations-1/#pending-animation-event-queue
 
     // https://www.w3.org/TR/web-animations-1/#pending-animation-event-queue
 
     Vector<PendingAnimationEvent> m_pending_animation_event_queue;
 
     Vector<PendingAnimationEvent> m_pending_animation_event_queue;

Contact | Legal | Takedown | Status
Self-hosted public services - About
NibbleSpot by 0ct0pu5