Changeset 229327 in webkit

Timestamp:

Mar 6, 2018 10:34:22 AM (6 years ago)

Author:

graouts@webkit.org

Message:

[Web Animations] Add a new CSSAnimation subclass of WebAnimation
​https://bugs.webkit.org/show_bug.cgi?id=183371
<rdar://problem/38181724>

Reviewed by Dean Jackson.

Adding a new CSSAnimation subclass which we will create in a later patch while resolving styles
upon identifying that a new CSS Animation has been added to an element.

• CMakeLists.txt:
• DerivedSources.make:
• Sources.txt:
• WebCore.xcodeproj/project.pbxproj:
• animation/CSSAnimation.cpp: Added.

(WebCore::CSSAnimation::create):
(WebCore::CSSAnimation::CSSAnimation):

• animation/CSSAnimation.h: Added.
• animation/CSSAnimation.idl: Added.
• animation/KeyframeEffectReadOnly.cpp
• animation/WebAnimation.h:

(WebCore::WebAnimation::isCSSAnimation const):

• animation/WebAnimation.idl:
• bindings/js/JSWebAnimationCustom.cpp:

(WebCore::toJSNewlyCreated):
(WebCore::toJS):

• bindings/js/WebCoreBuiltinNames.h:

Location:

trunk/Source/WebCore

Files:

• CMakeLists.txt (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• DerivedSources.make (modified) (1 diff)
• Sources.txt (modified) (2 diffs)
• WebCore.xcodeproj/project.pbxproj (modified) (6 diffs)
• animation/CSSAnimation.cpp (copied) (copied from trunk/Source/WebCore/animation/WebAnimation.idl) (2 diffs)
• animation/CSSAnimation.h (copied) (copied from trunk/Source/WebCore/animation/WebAnimation.idl) (2 diffs)
• animation/CSSAnimation.idl (copied) (copied from trunk/Source/WebCore/animation/WebAnimation.idl) (2 diffs)
• animation/KeyframeEffectReadOnly.cpp (modified) (2 diffs)
• animation/WebAnimation.h (modified) (4 diffs)
• animation/WebAnimation.idl (modified) (1 diff)
• bindings/js/JSWebAnimationCustom.cpp (modified) (2 diffs)
• bindings/js/WebCoreBuiltinNames.h (modified) (1 diff)

trunk/Source/WebCore/CMakeLists.txt

@@ -450 +450 @@
     animation/AnimationPlaybackEventInit.idl
     animation/AnimationTimeline.idl
+    animation/CSSAnimation.idl
     animation/CompositeOperation.idl
     animation/ComputedTimingProperties.idl

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-03-06  Antoine Quint  <graouts@apple.com>
+
+        [Web Animations] Add a new CSSAnimation subclass of WebAnimation
+        https://bugs.webkit.org/show_bug.cgi?id=183371
+        <rdar://problem/38181724>
+
+        Reviewed by Dean Jackson.
+
+        Adding a new CSSAnimation subclass which we will create in a later patch while resolving styles
+        upon identifying that a new CSS Animation has been added to an element.
+
+        * CMakeLists.txt:
+        * DerivedSources.make:
+        * Sources.txt:
+        * WebCore.xcodeproj/project.pbxproj:
+        * animation/CSSAnimation.cpp: Added.
+        (WebCore::CSSAnimation::create):
+        (WebCore::CSSAnimation::CSSAnimation):
+        * animation/CSSAnimation.h: Added.
+        * animation/CSSAnimation.idl: Added.
+        * animation/KeyframeEffectReadOnly.cpp
+        * animation/WebAnimation.h:
+        (WebCore::WebAnimation::isCSSAnimation const):
+        * animation/WebAnimation.idl:
+        * bindings/js/JSWebAnimationCustom.cpp:
+        (WebCore::toJSNewlyCreated):
+        (WebCore::toJS):
+        * bindings/js/WebCoreBuiltinNames.h:
+
 2018-03-06  Ms2ger  <Ms2ger@igalia.com>
 

trunk/Source/WebCore/DerivedSources.make

@@ -372 +372 @@
     $(WebCore)/animation/CompositeOperation.idl \
     $(WebCore)/animation/ComputedTimingProperties.idl \
+    $(WebCore)/animation/CSSAnimation.idl \
     $(WebCore)/animation/DocumentTimeline.idl \
     $(WebCore)/animation/FillMode.idl \

trunk/Source/WebCore/Sources.txt

@@ -337 +337 @@
 animation/AnimationPlaybackEvent.cpp
 animation/AnimationTimeline.cpp
+animation/CSSAnimation.cpp
 animation/DocumentTimeline.cpp
 animation/KeyframeEffect.cpp
@@ -2437 +2438 @@
 JSCryptoRsaHashedKeyAlgorithm.cpp
 JSCryptoRsaKeyAlgorithm.cpp
+JSCSSAnimation.cpp
 JSCustomElementRegistry.cpp
 JSCustomEvent.cpp

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -1988 +1988 @@
                 71A1B6081DEE5AD70073BCFB /* modern-media-controls-localized-strings.js in Resources */ = {isa = PBXBuildFile; fileRef = 71A1B6061DEE5A820073BCFB /* modern-media-controls-localized-strings.js */; };
                 71A57DF2154BE25C0009D120 /* SVGPathUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 71A57DF0154BE25C0009D120 /* SVGPathUtilities.h */; };
+                71B28427203CEC4C0036AA5D /* JSCSSAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 71B28426203CEC0D0036AA5D /* JSCSSAnimation.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                71C29E32203CE781008F36D2 /* CSSAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 71C29E30203CE76B008F36D2 /* CSSAnimation.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 71C916081D1483A300ACA47D /* UserInterfaceLayoutDirection.h in Headers */ = {isa = PBXBuildFile; fileRef = 71C916071D1483A300ACA47D /* UserInterfaceLayoutDirection.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 71DCB7021568197600862271 /* JSSVGZoomAndPan.h in Headers */ = {isa = PBXBuildFile; fileRef = 71DCB7001568197600862271 /* JSSVGZoomAndPan.h */; };
@@ -8979 +8981 @@
                 71A57DF0154BE25C0009D120 /* SVGPathUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGPathUtilities.h; sourceTree = "<group>"; };
                 71B0460A1DD3C2EE00EE19CF /* status-support.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "status-support.js"; sourceTree = "<group>"; };
+                71B28424203CEC0B0036AA5D /* JSCSSAnimation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCSSAnimation.cpp; sourceTree = "<group>"; };
+                71B28426203CEC0D0036AA5D /* JSCSSAnimation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCSSAnimation.h; sourceTree = "<group>"; };
+                71C29E2E203CE76B008F36D2 /* CSSAnimation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSAnimation.cpp; sourceTree = "<group>"; };
+                71C29E30203CE76B008F36D2 /* CSSAnimation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSAnimation.h; sourceTree = "<group>"; };
+                71C29E31203CE76C008F36D2 /* CSSAnimation.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CSSAnimation.idl; sourceTree = "<group>"; };
                 71C5BB1B1FB611EA0007A2AE /* Animatable.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Animatable.idl; sourceTree = "<group>"; };
                 71C916071D1483A300ACA47D /* UserInterfaceLayoutDirection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserInterfaceLayoutDirection.h; sourceTree = "<group>"; };
@@ -15527 +15534 @@
                                 7116E2CD1FED765200C06FDE /* JSComputedTimingProperties.cpp */,
                                 7116E2CE1FED765200C06FDE /* JSComputedTimingProperties.h */,
+                                71B28424203CEC0B0036AA5D /* JSCSSAnimation.cpp */,
+                                71B28426203CEC0D0036AA5D /* JSCSSAnimation.h */,
                                 71025EDB1F99F1A8004A250C /* JSDocumentTimeline.cpp */,
                                 71025EDC1F99F1A8004A250C /* JSDocumentTimeline.h */,
@@ -19197 +19206 @@
                                 7116E2CB1FED75D100C06FDE /* ComputedTimingProperties.h */,
                                 7116E2C91FED75D000C06FDE /* ComputedTimingProperties.idl */,
+                                71C29E2E203CE76B008F36D2 /* CSSAnimation.cpp */,
+                                71C29E30203CE76B008F36D2 /* CSSAnimation.h */,
+                                71C29E31203CE76C008F36D2 /* CSSAnimation.idl */,
                                 713171321FBE78C500F758DE /* CSSPropertyBlendingClient.h */,
                                 71025EC41F99F096004A250C /* DocumentTimeline.cpp */,
@@ -27108 +27120 @@
                                 7C9ACAA81F3CCEB400F3AA09 /* CryptoRsaHashedKeyAlgorithm.h in Headers */,
                                 7C9ACAA41F3CCE6900F3AA09 /* CryptoRsaKeyAlgorithm.h in Headers */,
+                                71C29E32203CE781008F36D2 /* CSSAnimation.h in Headers */,
                                 316FE1140E6E1DA700BF6088 /* CSSAnimationController.h in Headers */,
                                 0F15DA8A0F3AAEE70000CE47 /* CSSAnimationControllerPrivate.h in Headers */,
@@ -28067 +28080 @@
                                 7C9ACAC01F3CF1AF00F3AA09 /* JSCryptoRsaHashedKeyAlgorithm.h in Headers */,
                                 7C9ACAC21F3CF1AF00F3AA09 /* JSCryptoRsaKeyAlgorithm.h in Headers */,
+                                71B28427203CEC4C0036AA5D /* JSCSSAnimation.h in Headers */,
                                 BC46C1FD0C0DDC8F0020CFC3 /* JSCSSFontFaceRule.h in Headers */,
                                 BC46C1FF0C0DDC8F0020CFC3 /* JSCSSImportRule.h in Headers */,

trunk/Source/WebCore/animation/CSSAnimation.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2018 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -24 +24 @@
  */
 
-enum AnimationPlayState {
-    "idle",
-    "running",
-    "paused",
-    "finished"
-};
+#include "config.h"
+#include "CSSAnimation.h"
 
-[
-    ActiveDOMObject,
-    EnabledAtRuntime=WebAnimations,
-    InterfaceName=Animation,
-    CustomConstructor()
-] interface WebAnimation : EventTarget {
-    attribute DOMString id;
-    attribute AnimationEffectReadOnly? effect;
-    attribute AnimationTimeline? timeline;
-    [ImplementedAs=bindingsStartTime] attribute double? startTime;
-    [MayThrowException, ImplementedAs=bindingsCurrentTime] attribute double? currentTime;
-    attribute double playbackRate;
-    readonly attribute AnimationPlayState playState;
-    readonly attribute boolean pending;
-    attribute EventHandler onfinish;
-    attribute EventHandler oncancel;
-    readonly attribute Promise<WebAnimation> ready;
-    readonly attribute Promise<WebAnimation> finished;
-    void cancel();
-    [MayThrowException] void finish();
-    [MayThrowException] void play();
-    [MayThrowException] void pause();
-    [MayThrowException] void reverse();
-};
+#include "Animation.h"
+#include "Element.h"
+
+namespace WebCore {
+
+Ref<CSSAnimation> CSSAnimation::create(Element& target, const Animation&)
+{
+    auto& document = target.document();
+
+    auto result = adoptRef(*new CSSAnimation(document));
+
+    return result;
+}
+
+CSSAnimation::CSSAnimation(Document& document)
+    : WebAnimation(document)
+{
+}
+
+
+} // namespace WebCore

trunk/Source/WebCore/animation/CSSAnimation.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2018 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -24 +24 @@
  */
 
-enum AnimationPlayState {
-    "idle",
-    "running",
-    "paused",
-    "finished"
+#pragma once
+
+#include "WebAnimation.h"
+#include <wtf/Ref.h>
+
+namespace WebCore {
+
+class Animation;
+class Element;
+
+class CSSAnimation final : public WebAnimation {
+public:
+    static Ref<CSSAnimation> create(Element&, const Animation&);
+    ~CSSAnimation() = default;
+
+    bool isCSSAnimation() const override { return true; }
+    const String& animationName() const { return m_animationName; }
+
+private:
+    CSSAnimation(Document&);
+
+    String m_animationName;
+
 };
 
-[
-    ActiveDOMObject,
-    EnabledAtRuntime=WebAnimations,
-    InterfaceName=Animation,
-    CustomConstructor()
-] interface WebAnimation : EventTarget {
-    attribute DOMString id;
-    attribute AnimationEffectReadOnly? effect;
-    attribute AnimationTimeline? timeline;
-    [ImplementedAs=bindingsStartTime] attribute double? startTime;
-    [MayThrowException, ImplementedAs=bindingsCurrentTime] attribute double? currentTime;
-    attribute double playbackRate;
-    readonly attribute AnimationPlayState playState;
-    readonly attribute boolean pending;
-    attribute EventHandler onfinish;
-    attribute EventHandler oncancel;
-    readonly attribute Promise<WebAnimation> ready;
-    readonly attribute Promise<WebAnimation> finished;
-    void cancel();
-    [MayThrowException] void finish();
-    [MayThrowException] void play();
-    [MayThrowException] void pause();
-    [MayThrowException] void reverse();
-};
+} // namespace WebCore
+
+SPECIALIZE_TYPE_TRAITS_WEB_ANIMATION(CSSAnimation, isCSSAnimation())

trunk/Source/WebCore/animation/CSSAnimation.idl

@@ -1 +1 @@
 /*
- * Copyright (C) 2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2018 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -24 +24 @@
  */
 
-enum AnimationPlayState {
-    "idle",
-    "running",
-    "paused",
-    "finished"
-};
+typedef USVString CSSOMString;
 
 [
-    ActiveDOMObject,
     EnabledAtRuntime=WebAnimations,
-    InterfaceName=Animation,
-    CustomConstructor()
-] interface WebAnimation : EventTarget {
-    attribute DOMString id;
-    attribute AnimationEffectReadOnly? effect;
-    attribute AnimationTimeline? timeline;
-    [ImplementedAs=bindingsStartTime] attribute double? startTime;
-    [MayThrowException, ImplementedAs=bindingsCurrentTime] attribute double? currentTime;
-    attribute double playbackRate;
-    readonly attribute AnimationPlayState playState;
-    readonly attribute boolean pending;
-    attribute EventHandler onfinish;
-    attribute EventHandler oncancel;
-    readonly attribute Promise<WebAnimation> ready;
-    readonly attribute Promise<WebAnimation> finished;
-    void cancel();
-    [MayThrowException] void finish();
-    [MayThrowException] void play();
-    [MayThrowException] void pause();
-    [MayThrowException] void reverse();
+    Exposed=Window
+] interface CSSAnimation : WebAnimation {
+    readonly attribute CSSOMString animationName;
 };

trunk/Source/WebCore/animation/KeyframeEffectReadOnly.cpp

@@ -28 +28 @@
 
 #include "Animation.h"
+#include "AnimationEffectTimingReadOnly.h"
 #include "CSSComputedStyleDeclaration.h"
 #include "CSSPropertyAnimation.h"
@@ -34 +35 @@
 #include "CSSTimingFunctionValue.h"
 #include "Element.h"
+#include "FontCascade.h"
 #include "JSCompositeOperation.h"
 #include "JSKeyframeEffectReadOnly.h"
+#include "RenderBoxModelObject.h"
+#include "RenderElement.h"
 #include "RenderStyle.h"
 #include "StyleResolver.h"

trunk/Source/WebCore/animation/WebAnimation.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2017-2018 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47 +47 @@
 class RenderStyle;
 
-class WebAnimation final : public RefCounted<WebAnimation>, public EventTargetWithInlineData, public ActiveDOMObject {
+class WebAnimation : public RefCounted<WebAnimation>, public EventTargetWithInlineData, public ActiveDOMObject {
 public:
     static Ref<WebAnimation> create(Document&, AnimationEffectReadOnly*);
     static Ref<WebAnimation> create(Document&, AnimationEffectReadOnly*, AnimationTimeline*);
     ~WebAnimation();
+
+    virtual bool isCSSAnimation() const { return false; }
 
     const String& id() const { return m_id; }
@@ -109 +111 @@
     using RefCounted::deref;
 
-private:
+protected:
     explicit WebAnimation(Document&);
 
+private:
     enum class RespectHoldTime { Yes, No };
     enum class AutoRewind { Yes, No };
@@ -164 +167 @@
 
 } // namespace WebCore
+
+#define SPECIALIZE_TYPE_TRAITS_WEB_ANIMATION(ToValueTypeName, predicate) \
+SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::ToValueTypeName) \
+static bool isType(const WebCore::WebAnimation& value) { return value.predicate; } \
+SPECIALIZE_TYPE_TRAITS_END()

trunk/Source/WebCore/animation/WebAnimation.idl

@@ -35 +35 @@
     EnabledAtRuntime=WebAnimations,
     InterfaceName=Animation,
-    CustomConstructor()
+    CustomConstructor(),
+    CustomToJSObject
 ] interface WebAnimation : EventTarget {
     attribute DOMString id;

trunk/Source/WebCore/bindings/js/JSWebAnimationCustom.cpp

@@ -29 +29 @@
 #include "JSAnimationEffectReadOnly.h"
 #include "JSAnimationTimeline.h"
+#include "JSCSSAnimation.h"
 #include "JSDOMConstructor.h"
 
@@ -34 +35 @@
 
 using namespace JSC;
+
+JSValue toJSNewlyCreated(ExecState*, JSDOMGlobalObject* globalObject, Ref<WebAnimation>&& value)
+{
+    if (value->isCSSAnimation())
+        return createWrapper<CSSAnimation>(globalObject, WTFMove(value));
+    return createWrapper<WebAnimation>(globalObject, WTFMove(value));
+}
+
+JSValue toJS(ExecState* state, JSDOMGlobalObject* globalObject, WebAnimation& value)
+{
+    return wrap(state, globalObject, value);
+}
 
 EncodedJSValue JSC_HOST_CALL constructJSWebAnimation(ExecState& state)

trunk/Source/WebCore/bindings/js/WebCoreBuiltinNames.h

@@ -50 +50 @@
     macro(Credential) \
     macro(CredentialsContainer) \
+    macro(CSSAnimation) \
     macro(CustomElementRegistry) \
     macro(DataTransferItem) \