Diff
Modified: trunk/LayoutTests/ChangeLog (237473 => 237474)
--- trunk/LayoutTests/ChangeLog 2018-10-26 18:51:28 UTC (rev 237473)
+++ trunk/LayoutTests/ChangeLog 2018-10-26 18:53:32 UTC (rev 237474)
@@ -1,3 +1,15 @@
+2018-10-26 Antoine Quint <[email protected]>
+
+ [Web Animations] Remove useless internals methods
+ https://bugs.webkit.org/show_bug.cgi?id=190968
+
+ Reviewed by Dean Jackson.
+
+ Remove a test that is no longer useful.
+
+ * webanimations/animation-creation-addition-expected.txt: Removed.
+ * webanimations/animation-creation-addition.html: Removed.
+
2018-10-26 Per Arne Vollan <[email protected]>
[High Sierra/Sierra Release] Layout Test media/track/track-cue-css.html is a flaky image failure
Deleted: trunk/LayoutTests/webanimations/animation-creation-addition-expected.txt (237473 => 237474)
--- trunk/LayoutTests/webanimations/animation-creation-addition-expected.txt 2018-10-26 18:51:28 UTC (rev 237473)
+++ trunk/LayoutTests/webanimations/animation-creation-addition-expected.txt 2018-10-26 18:53:32 UTC (rev 237474)
@@ -1,13 +0,0 @@
-Constructing an Animation with a timeline should add the animation to the timeline.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-DocumentTimeline with 2 animations:
- 1. Animation
- 2. Animation
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
Deleted: trunk/LayoutTests/webanimations/animation-creation-addition.html (237473 => 237474)
--- trunk/LayoutTests/webanimations/animation-creation-addition.html 2018-10-26 18:51:28 UTC (rev 237473)
+++ trunk/LayoutTests/webanimations/animation-creation-addition.html 2018-10-26 18:53:32 UTC (rev 237474)
@@ -1,11 +0,0 @@
-<script src=""
-<script>
-
-description("Constructing an Animation with a timeline should add the animation to the timeline.");
-
-new Animation(null, document.timeline);
-new Animation(null, document.timeline);
-debug(internals.timelineDescription(document.timeline));
-
-</script>
-<script src=""
\ No newline at end of file
Modified: trunk/Source/WebCore/ChangeLog (237473 => 237474)
--- trunk/Source/WebCore/ChangeLog 2018-10-26 18:51:28 UTC (rev 237473)
+++ trunk/Source/WebCore/ChangeLog 2018-10-26 18:53:32 UTC (rev 237474)
@@ -1,5 +1,32 @@
2018-10-26 Antoine Quint <[email protected]>
+ [Web Animations] Remove useless internals methods
+ https://bugs.webkit.org/show_bug.cgi?id=190968
+
+ Reviewed by Dean Jackson.
+
+ We had a few internals methods added early on in the Web Animations implementation that are no longer
+ relevant now that the full API is implemented. We can safely remove them now.
+
+ * animation/AnimationTimeline.cpp:
+ (WebCore::AnimationTimeline::setCurrentTime): Deleted.
+ (WebCore::AnimationTimeline::description): Deleted.
+ * animation/AnimationTimeline.h:
+ (WebCore::AnimationTimeline::currentTime):
+ (WebCore::AnimationTimeline::pause): Deleted.
+ * animation/DocumentTimeline.cpp:
+ (WebCore::DocumentTimeline::currentTime):
+ (WebCore::DocumentTimeline::pause): Deleted.
+ * animation/DocumentTimeline.h:
+ * testing/Internals.cpp:
+ (WebCore::Internals::timelineDescription): Deleted.
+ (WebCore::Internals::pauseTimeline): Deleted.
+ (WebCore::Internals::setTimelineCurrentTime): Deleted.
+ * testing/Internals.h:
+ * testing/Internals.idl:
+
+2018-10-26 Antoine Quint <[email protected]>
+
Web Inspector: Crash in http/tests/inspector/network/resource-response-source-memory-cache-revalidate-expired-only.html
https://bugs.webkit.org/show_bug.cgi?id=190955
Modified: trunk/Source/WebCore/animation/AnimationTimeline.cpp (237473 => 237474)
--- trunk/Source/WebCore/animation/AnimationTimeline.cpp 2018-10-26 18:51:28 UTC (rev 237473)
+++ trunk/Source/WebCore/animation/AnimationTimeline.cpp 2018-10-26 18:53:32 UTC (rev 237474)
@@ -77,12 +77,6 @@
return secondsToWebAnimationsAPITime(*time);
}
-void AnimationTimeline::setCurrentTime(Seconds currentTime)
-{
- m_currentTime = currentTime;
- timingModelDidChange();
-}
-
HashMap<Element*, ListHashSet<RefPtr<WebAnimation>>>& AnimationTimeline::relevantMapForAnimation(WebAnimation& animation)
{
if (animation.isCSSAnimation())
@@ -478,19 +472,4 @@
removeAnimation(animation.releaseNonNull());
}
-String AnimationTimeline::description()
-{
- TextStream stream;
- int count = 1;
- stream << (m_classType == DocumentTimelineClass ? "DocumentTimeline" : "AnimationTimeline") << " with " << m_animations.size() << " animations:";
- stream << "\n";
- for (const auto& animation : m_animations) {
- writeIndent(stream, 1);
- stream << count << ". " << animation->description();
- stream << "\n";
- count++;
- }
- return stream.release();
-}
-
} // namespace WebCore
Modified: trunk/Source/WebCore/animation/AnimationTimeline.h (237473 => 237474)
--- trunk/Source/WebCore/animation/AnimationTimeline.h 2018-10-26 18:51:28 UTC (rev 237473)
+++ trunk/Source/WebCore/animation/AnimationTimeline.h 2018-10-26 18:53:32 UTC (rev 237474)
@@ -51,9 +51,6 @@
void removeAnimation(Ref<WebAnimation>&&);
std::optional<double> bindingsCurrentTime();
virtual std::optional<Seconds> currentTime() { return m_currentTime; }
- WEBCORE_EXPORT void setCurrentTime(Seconds);
- WEBCORE_EXPORT String description();
- virtual void pause() { };
virtual void timingModelDidChange() { };
Modified: trunk/Source/WebCore/animation/DocumentTimeline.cpp (237473 => 237474)
--- trunk/Source/WebCore/animation/DocumentTimeline.cpp 2018-10-26 18:51:28 UTC (rev 237473)
+++ trunk/Source/WebCore/animation/DocumentTimeline.cpp 2018-10-26 18:53:32 UTC (rev 237474)
@@ -144,7 +144,7 @@
std::optional<Seconds> DocumentTimeline::currentTime()
{
- if (m_paused || !m_document || !m_document->domWindow())
+ if (!m_document || !m_document->domWindow())
return AnimationTimeline::currentTime();
if (auto* mainDocumentTimeline = m_document->existingTimeline()) {
@@ -189,11 +189,6 @@
return m_cachedCurrentTime.value() - m_originTime;
}
-void DocumentTimeline::pause()
-{
- m_paused = true;
-}
-
void DocumentTimeline::timingModelDidChange()
{
if (m_needsUpdateAnimationSchedule || m_isSuspended)
Modified: trunk/Source/WebCore/animation/DocumentTimeline.h (237473 => 237474)
--- trunk/Source/WebCore/animation/DocumentTimeline.h 2018-10-26 18:51:28 UTC (rev 237473)
+++ trunk/Source/WebCore/animation/DocumentTimeline.h 2018-10-26 18:53:32 UTC (rev 237474)
@@ -46,7 +46,6 @@
Document* document() const { return m_document.get(); }
std::optional<Seconds> currentTime() override;
- void pause() override;
void timingModelDidChange() override;
@@ -96,7 +95,6 @@
RefPtr<Document> m_document;
Seconds m_originTime;
- bool m_paused { false };
bool m_isSuspended { false };
bool m_waitingOnVMIdle { false };
std::optional<Seconds> m_cachedCurrentTime;
Modified: trunk/Source/WebCore/testing/Internals.cpp (237473 => 237474)
--- trunk/Source/WebCore/testing/Internals.cpp 2018-10-26 18:51:28 UTC (rev 237473)
+++ trunk/Source/WebCore/testing/Internals.cpp 2018-10-26 18:53:32 UTC (rev 237474)
@@ -4624,21 +4624,6 @@
}
#endif
-String Internals::timelineDescription(AnimationTimeline& timeline)
-{
- return timeline.description();
-}
-
-void Internals::pauseTimeline(AnimationTimeline& timeline)
-{
- timeline.pause();
-}
-
-void Internals::setTimelineCurrentTime(AnimationTimeline& timeline, double currentTime)
-{
- timeline.setCurrentTime(Seconds::fromMilliseconds(currentTime));
-}
-
#if ENABLE(APPLE_PAY)
MockPaymentCoordinator& Internals::mockPaymentCoordinator() const
{
Modified: trunk/Source/WebCore/testing/Internals.h (237473 => 237474)
--- trunk/Source/WebCore/testing/Internals.h 2018-10-26 18:51:28 UTC (rev 237473)
+++ trunk/Source/WebCore/testing/Internals.h 2018-10-26 18:53:32 UTC (rev 237474)
@@ -701,10 +701,6 @@
MockPaymentCoordinator& mockPaymentCoordinator() const;
#endif
- String timelineDescription(AnimationTimeline&);
- void pauseTimeline(AnimationTimeline&);
- void setTimelineCurrentTime(AnimationTimeline&, double);
-
bool isSystemPreviewLink(Element&) const;
bool isSystemPreviewImage(Element&) const;
Modified: trunk/Source/WebCore/testing/Internals.idl (237473 => 237474)
--- trunk/Source/WebCore/testing/Internals.idl 2018-10-26 18:51:28 UTC (rev 237473)
+++ trunk/Source/WebCore/testing/Internals.idl 2018-10-26 18:53:32 UTC (rev 237474)
@@ -682,9 +682,6 @@
[Conditional=SERVICE_WORKER] void terminateServiceWorker(ServiceWorker worker);
[Conditional=SERVICE_WORKER] boolean hasServiceWorkerConnection();
- [EnabledAtRuntime=WebAnimations] DOMString timelineDescription(AnimationTimeline timeline);
- [EnabledAtRuntime=WebAnimations] void pauseTimeline(AnimationTimeline timeline);
- [EnabledAtRuntime=WebAnimations] void setTimelineCurrentTime(AnimationTimeline timeline, double currentTime);
[Conditional=APPLE_PAY] readonly attribute MockPaymentCoordinator mockPaymentCoordinator;
boolean isSystemPreviewLink(Element element);
