mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1456394 - Rename AnimationEffectReadOnly to AnimationEffect; r=bz,hiro 

MozReview-Commit-ID: 8jzJiCWt5vs

--HG--
rename : dom/animation/AnimationEffectReadOnly.cpp => dom/animation/AnimationEffect.cpp
rename : dom/animation/AnimationEffectReadOnly.h => dom/animation/AnimationEffect.h
rename : dom/webidl/AnimationEffectReadOnly.webidl => dom/webidl/AnimationEffect.webidl
extra : rebase_source : 2bd6490fe9be47cfb760bda81a63c33ba0b0397d
This commit is contained in:
Brian Birtles 2018-05-07 11:15:16 +09:00
Родитель 3184f30162
Коммит f8c518344a
26 изменённых файлов: 75 добавлений и 81 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

10
dom/animation/Animation.cpp
Просмотреть файл

@ -88,7 +88,7 @@ namespace {
// ---------------------------------------------------------------------------
/* static */ already_AddRefed<Animation>
Animation::Constructor(const GlobalObject& aGlobal,
AnimationEffectReadOnly* aEffect,
AnimationEffect* aEffect,
const Optional<AnimationTimeline*>& aTimeline,
ErrorResult& aRv)
{
@ -125,7 +125,7 @@ Animation::SetId(const nsAString& aId)
}
void
Animation::SetEffect(AnimationEffectReadOnly* aEffect)
Animation::SetEffect(AnimationEffect* aEffect)
{
SetEffectNoUpdate(aEffect);
PostUpdate();
@ -133,7 +133,7 @@ Animation::SetEffect(AnimationEffectReadOnly* aEffect)
// https://drafts.csswg.org/web-animations/#setting-the-target-effect
void
Animation::SetEffectNoUpdate(AnimationEffectReadOnly* aEffect)
Animation::SetEffectNoUpdate(AnimationEffect* aEffect)
{
RefPtr<Animation> kungFuDeathGrip(this);
@ -159,7 +159,7 @@ Animation::SetEffectNoUpdate(AnimationEffectReadOnly* aEffect)
}
// Break links with the old effect and then drop it.
RefPtr<AnimationEffectReadOnly> oldEffect = mEffect;
RefPtr<AnimationEffect> oldEffect = mEffect;
mEffect = nullptr;
oldEffect->SetAnimation(nullptr);
@ -169,7 +169,7 @@ Animation::SetEffectNoUpdate(AnimationEffectReadOnly* aEffect)
if (aEffect) {
// Break links from the new effect to its previous animation, if any.
RefPtr<AnimationEffectReadOnly> newEffect = aEffect;
RefPtr<AnimationEffect> newEffect = aEffect;
Animation* prevAnim = aEffect->GetAnimation();
if (prevAnim) {
prevAnim->SetEffect(nullptr);

12
dom/animation/Animation.h
Просмотреть файл

@ -17,7 +17,7 @@
#include "mozilla/LinkedList.h"
#include "mozilla/TimeStamp.h" // for TimeStamp, TimeDuration
#include "mozilla/dom/AnimationBinding.h" // for AnimationPlayState
#include "mozilla/dom/AnimationEffectReadOnly.h"
#include "mozilla/dom/AnimationEffect.h"
#include "mozilla/dom/AnimationTimeline.h"
#include "mozilla/dom/Promise.h"
#include "nsCSSPropertyID.h"
@ -96,13 +96,13 @@ public:
// Animation interface methods
static already_AddRefed<Animation>
Constructor(const GlobalObject& aGlobal,
AnimationEffectReadOnly* aEffect,
AnimationEffect* aEffect,
const Optional<AnimationTimeline*>& aTimeline,
ErrorResult& aRv);
void GetId(nsAString& aResult) const { aResult = mId; }
void SetId(const nsAString& aId);
AnimationEffectReadOnly* GetEffect() const { return mEffect; }
void SetEffect(AnimationEffectReadOnly* aEffect);
AnimationEffect* GetEffect() const { return mEffect; }
void SetEffect(AnimationEffect* aEffect);
AnimationTimeline* GetTimeline() const { return mTimeline; }
void SetTimeline(AnimationTimeline* aTimeline);
Nullable<TimeDuration> GetStartTime() const { return mStartTime; }
@ -155,7 +155,7 @@ public:
virtual void CancelFromStyle() { CancelNoUpdate(); }
void SetTimelineNoUpdate(AnimationTimeline* aTimeline);
void SetEffectNoUpdate(AnimationEffectReadOnly* aEffect);
void SetEffectNoUpdate(AnimationEffect* aEffect);
virtual void Tick();
bool NeedsTicks() const
@ -488,7 +488,7 @@ protected:
nsIDocument* GetRenderedDocument() const;
RefPtr<AnimationTimeline> mTimeline;
RefPtr<AnimationEffectReadOnly> mEffect;
RefPtr<AnimationEffect> mEffect;
// The beginning of the delay period.
Nullable<TimeDuration> mStartTime; // Timeline timescale
Nullable<TimeDuration> mHoldTime; // Animation timescale

38
dom/animation/AnimationEffectReadOnly.cpp → dom/animation/AnimationEffect.cpp
Просмотреть файл

@ -4,8 +4,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "mozilla/dom/AnimationEffectReadOnly.h"
#include "mozilla/dom/AnimationEffectReadOnlyBinding.h"
#include "mozilla/dom/AnimationEffect.h"
#include "mozilla/dom/AnimationEffectBinding.h"
#include "mozilla/dom/Animation.h"
#include "mozilla/dom/KeyframeEffect.h"
@ -15,8 +15,8 @@
namespace mozilla {
namespace dom {
NS_IMPL_CYCLE_COLLECTION_CLASS(AnimationEffectReadOnly)
NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(AnimationEffectReadOnly)
NS_IMPL_CYCLE_COLLECTION_CLASS(AnimationEffect)
NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(AnimationEffect)
if (tmp->mTiming) {
tmp->mTiming->Unlink();
}
@ -24,21 +24,21 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(AnimationEffectReadOnly)
NS_IMPL_CYCLE_COLLECTION_UNLINK_PRESERVED_WRAPPER
NS_IMPL_CYCLE_COLLECTION_UNLINK_END
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(AnimationEffectReadOnly)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(AnimationEffect)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mDocument, mTiming, mAnimation)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
NS_IMPL_CYCLE_COLLECTION_TRACE_WRAPPERCACHE(AnimationEffectReadOnly)
NS_IMPL_CYCLE_COLLECTION_TRACE_WRAPPERCACHE(AnimationEffect)
NS_IMPL_CYCLE_COLLECTING_ADDREF(AnimationEffectReadOnly)
NS_IMPL_CYCLE_COLLECTING_RELEASE(AnimationEffectReadOnly)
NS_IMPL_CYCLE_COLLECTING_ADDREF(AnimationEffect)
NS_IMPL_CYCLE_COLLECTING_RELEASE(AnimationEffect)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(AnimationEffectReadOnly)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(AnimationEffect)
NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
NS_INTERFACE_MAP_ENTRY(nsISupports)
NS_INTERFACE_MAP_END
AnimationEffectReadOnly::AnimationEffectReadOnly(
AnimationEffect::AnimationEffect(
nsIDocument* aDocument, AnimationEffectTimingReadOnly* aTiming)
: mDocument(aDocument)
, mTiming(aTiming)
@ -48,7 +48,7 @@ AnimationEffectReadOnly::AnimationEffectReadOnly(
// https://drafts.csswg.org/web-animations/#current
bool
AnimationEffectReadOnly::IsCurrent() const
AnimationEffect::IsCurrent() const
{
if (!mAnimation || mAnimation->PlayState() == AnimationPlayState::Finished) {
return false;
@ -61,21 +61,21 @@ AnimationEffectReadOnly::IsCurrent() const
// https://drafts.csswg.org/web-animations/#in-effect
bool
AnimationEffectReadOnly::IsInEffect() const
AnimationEffect::IsInEffect() const
{
ComputedTiming computedTiming = GetComputedTiming();
return !computedTiming.mProgress.IsNull();
}
already_AddRefed<AnimationEffectTimingReadOnly>
AnimationEffectReadOnly::Timing()
AnimationEffect::Timing()
{
RefPtr<AnimationEffectTimingReadOnly> temp(mTiming);
return temp.forget();
}
void
AnimationEffectReadOnly::SetSpecifiedTiming(const TimingParams& aTiming)
AnimationEffect::SetSpecifiedTiming(const TimingParams& aTiming)
{
if (mTiming->AsTimingParams() == aTiming) {
return;
@ -93,7 +93,7 @@ AnimationEffectReadOnly::SetSpecifiedTiming(const TimingParams& aTiming)
}
ComputedTiming
AnimationEffectReadOnly::GetComputedTimingAt(
AnimationEffect::GetComputedTimingAt(
const Nullable<TimeDuration>& aLocalTime,
const TimingParams& aTiming,
double aPlaybackRate)
@ -265,7 +265,7 @@ AnimationEffectReadOnly::GetComputedTimingAt(
}
ComputedTiming
AnimationEffectReadOnly::GetComputedTiming(const TimingParams* aTiming) const
AnimationEffect::GetComputedTiming(const TimingParams* aTiming) const
{
double playbackRate = mAnimation ? mAnimation->PlaybackRate() : 1;
return GetComputedTimingAt(GetLocalTime(),
@ -311,7 +311,7 @@ GetComputedTimingDictionary(const ComputedTiming& aComputedTiming,
}
void
AnimationEffectReadOnly::GetComputedTimingAsDict(
AnimationEffect::GetComputedTimingAsDict(
ComputedTimingProperties& aRetVal) const
{
double playbackRate = mAnimation ? mAnimation->PlaybackRate() : 1;
@ -324,7 +324,7 @@ AnimationEffectReadOnly::GetComputedTimingAsDict(
aRetVal);
}
AnimationEffectReadOnly::~AnimationEffectReadOnly()
AnimationEffect::~AnimationEffect()
{
// mTiming is cycle collected, so we have to do null check first even though
// mTiming shouldn't be null during the lifetime of KeyframeEffect.
@ -334,7 +334,7 @@ AnimationEffectReadOnly::~AnimationEffectReadOnly()
}
Nullable<TimeDuration>
AnimationEffectReadOnly::GetLocalTime() const
AnimationEffect::GetLocalTime() const
{
// Since the *animation* start time is currently always zero, the local
// time is equal to the parent time.

18
dom/animation/AnimationEffectReadOnly.h → dom/animation/AnimationEffect.h
Просмотреть файл

@ -4,8 +4,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef mozilla_dom_AnimationEffectReadOnly_h
#define mozilla_dom_AnimationEffectReadOnly_h
#ifndef mozilla_dom_AnimationEffect_h
#define mozilla_dom_AnimationEffect_h
#include "mozilla/ComputedTiming.h"
#include "mozilla/dom/AnimationEffectTimingReadOnly.h"
@ -29,15 +29,15 @@ class AnimationEffectTimingReadOnly;
class KeyframeEffect;
struct ComputedTimingProperties;
class AnimationEffectReadOnly : public nsISupports,
public nsWrapperCache
class AnimationEffect : public nsISupports,
public nsWrapperCache
{
public:
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(AnimationEffectReadOnly)
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(AnimationEffect)
AnimationEffectReadOnly(nsIDocument* aDocument,
AnimationEffectTimingReadOnly* aTiming);
AnimationEffect(nsIDocument* aDocument,
AnimationEffectTimingReadOnly* aTiming);
virtual KeyframeEffect* AsKeyframeEffect() { return nullptr; }
@ -94,7 +94,7 @@ public:
virtual bool AffectsGeometry() const = 0;
protected:
virtual ~AnimationEffectReadOnly();
virtual ~AnimationEffect();
Nullable<TimeDuration> GetLocalTime() const;
@ -107,4 +107,4 @@ protected:
} // namespace dom
} // namespace mozilla
#endif // mozilla_dom_AnimationEffectReadOnly_h
#endif // mozilla_dom_AnimationEffect_h

2
dom/animation/ComputedTiming.h
Просмотреть файл

@ -11,7 +11,7 @@
#include "mozilla/StickyTimeDuration.h"
#include "mozilla/ComputedTimingFunction.h"
#include "mozilla/dom/AnimationEffectReadOnlyBinding.h" // FillMode
#include "mozilla/dom/AnimationEffectBinding.h" // FillMode
namespace mozilla {

12
dom/animation/KeyframeEffect.cpp
Просмотреть файл

@ -55,18 +55,18 @@ PropertyValuePair::operator==(const PropertyValuePair& aOther) const
namespace dom {
NS_IMPL_CYCLE_COLLECTION_INHERITED(KeyframeEffect,
AnimationEffectReadOnly,
AnimationEffect,
mTarget)
NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN_INHERITED(KeyframeEffect,
AnimationEffectReadOnly)
AnimationEffect)
NS_IMPL_CYCLE_COLLECTION_TRACE_END
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(KeyframeEffect)
NS_INTERFACE_MAP_END_INHERITING(AnimationEffectReadOnly)
NS_INTERFACE_MAP_END_INHERITING(AnimationEffect)
NS_IMPL_ADDREF_INHERITED(KeyframeEffect, AnimationEffectReadOnly)
NS_IMPL_RELEASE_INHERITED(KeyframeEffect, AnimationEffectReadOnly)
NS_IMPL_ADDREF_INHERITED(KeyframeEffect, AnimationEffect)
NS_IMPL_RELEASE_INHERITED(KeyframeEffect, AnimationEffect)
KeyframeEffect::KeyframeEffect(
nsIDocument* aDocument,
@ -84,7 +84,7 @@ KeyframeEffect::KeyframeEffect(
const Maybe<OwningAnimationTarget>& aTarget,
AnimationEffectTimingReadOnly* aTiming,
const KeyframeEffectParams& aOptions)
: AnimationEffectReadOnly(aDocument, aTiming)
: AnimationEffect(aDocument, aTiming)
, mTarget(aTarget)
, mEffectOptions(aOptions)
, mInEffectOnLastAnimationTimingUpdate(false)

6
dom/animation/KeyframeEffect.h
Просмотреть файл

@ -26,7 +26,7 @@
// RawServoDeclarationBlock and associated RefPtrTraits
#include "mozilla/ServoBindingTypes.h"
#include "mozilla/StyleAnimationValue.h"
#include "mozilla/dom/AnimationEffectReadOnly.h"
#include "mozilla/dom/AnimationEffect.h"
#include "mozilla/dom/BindingDeclarations.h"
#include "mozilla/dom/Element.h"
@ -112,7 +112,7 @@ namespace dom {
class Animation;
class KeyframeEffect : public AnimationEffectReadOnly
class KeyframeEffect : public AnimationEffect
{
public:
KeyframeEffect(nsIDocument* aDocument,
@ -122,7 +122,7 @@ public:
NS_DECL_ISUPPORTS_INHERITED
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_INHERITED(KeyframeEffect,
AnimationEffectReadOnly)
AnimationEffect)
virtual JSObject* WrapObject(JSContext* aCx,
JS::Handle<JSObject*> aGivenProto) override;

4
dom/animation/TimingParams.h
Просмотреть файл

@ -15,8 +15,8 @@
#include "mozilla/StickyTimeDuration.h"
#include "mozilla/TimeStamp.h" // for TimeDuration
#include "mozilla/dom/AnimationEffectReadOnlyBinding.h" // for FillMode
// and PlaybackDirection
#include "mozilla/dom/AnimationEffectBinding.h" // for FillMode
// and PlaybackDirection
class nsIDocument;

4
dom/animation/moz.build
Просмотреть файл

@ -12,7 +12,7 @@ MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
EXPORTS.mozilla.dom += [
'Animation.h',
'AnimationEffectReadOnly.h',
'AnimationEffect.h',
'AnimationEffectTiming.h',
'AnimationEffectTimingReadOnly.h',
'AnimationTimeline.h',
@ -42,7 +42,7 @@ EXPORTS.mozilla += [
UNIFIED_SOURCES += [
'Animation.cpp',
'AnimationEffectReadOnly.cpp',
'AnimationEffect.cpp',
'AnimationEffectTiming.cpp',
'AnimationEffectTimingReadOnly.cpp',
'AnimationEventDispatcher.cpp',

2
dom/base/nsDOMMutationObserver.cpp
Просмотреть файл

@ -380,7 +380,7 @@ void
nsAnimationReceiver::RecordAnimationMutation(Animation* aAnimation,
AnimationMutation aMutationType)
{
mozilla::dom::AnimationEffectReadOnly* effect = aAnimation->GetEffect();
mozilla::dom::AnimationEffect* effect = aAnimation->GetEffect();
if (!effect) {
return;
}

2
dom/base/nsNodeUtils.cpp
Просмотреть файл

@ -235,7 +235,7 @@ nsNodeUtils::ContentRemoved(nsINode* aContainer,
Maybe<NonOwningAnimationTarget>
nsNodeUtils::GetTargetForAnimation(const Animation* aAnimation)
{
AnimationEffectReadOnly* effect = aAnimation->GetEffect();
AnimationEffect* effect = aAnimation->GetEffect();
if (!effect || !effect->AsKeyframeEffect()) {
return Nothing();
}

2
dom/bindings/Bindings.conf
Просмотреть файл

@ -58,7 +58,7 @@ DOMInterfaces = {
'concrete': False
},
'AnimationEffectReadOnly': {
'AnimationEffect': {
'concrete': False
},

2
dom/tests/mochitest/general/test_interfaces.js
Просмотреть файл

@ -125,7 +125,7 @@ var interfaceNamesInGlobalScope =
// IMPORTANT: Do not change this list without review from a DOM peer!
{name: "Animation", insecureContext: true},
// IMPORTANT: Do not change this list without review from a DOM peer!
{name: "AnimationEffectReadOnly", insecureContext: true, release: false},
{name: "AnimationEffect", insecureContext: true, release: false},
// IMPORTANT: Do not change this list without review from a DOM peer!
{name: "AnimationEffectTiming", insecureContext: true, release: false},
// IMPORTANT: Do not change this list without review from a DOM peer!

4
dom/webidl/Animation.webidl
Просмотреть файл

@ -13,12 +13,12 @@
enum AnimationPlayState { "idle", "running", "paused", "finished" };
[Func="nsDocument::IsElementAnimateEnabled",
Constructor (optional AnimationEffectReadOnly? effect = null,
Constructor (optional AnimationEffect? effect = null,
optional AnimationTimeline? timeline)]
interface Animation : EventTarget {
attribute DOMString id;
[Func="nsDocument::IsWebAnimationsEnabled", Pure]
attribute AnimationEffectReadOnly? effect;
attribute AnimationEffect? effect;
[Func="nsDocument::IsWebAnimationsEnabled"]
attribute AnimationTimeline? timeline;
[BinaryName="startTimeAsDouble"]

2
dom/webidl/AnimationEffectReadOnly.webidl → dom/webidl/AnimationEffect.webidl
Просмотреть файл

@ -45,7 +45,7 @@ dictionary ComputedTimingProperties : AnimationEffectTimingProperties {
};
[Func="nsDocument::IsWebAnimationsEnabled"]
interface AnimationEffectReadOnly {
interface AnimationEffect {
[Cached, Constant]
readonly attribute AnimationEffectTimingReadOnly timing;
[BinaryName="getComputedTimingAsDict"]

2
dom/webidl/KeyframeEffect.webidl
Просмотреть файл

@ -28,7 +28,7 @@ dictionary KeyframeEffectOptions : AnimationEffectTimingProperties {
object? keyframes,
optional (unrestricted double or KeyframeEffectOptions) options),
Constructor (KeyframeEffect source)]
interface KeyframeEffect : AnimationEffectReadOnly {
interface KeyframeEffect : AnimationEffect {
attribute (Element or CSSPseudoElement)? target;
[NeedsCallerType]
attribute IterationCompositeOperation iterationComposite;

2
dom/webidl/moz.build
Просмотреть файл

@ -364,7 +364,7 @@ WEBIDL_FILES = [
'AnalyserNode.webidl',
'Animatable.webidl',
'Animation.webidl',
'AnimationEffectReadOnly.webidl',
'AnimationEffect.webidl',
'AnimationEffectTiming.webidl',
'AnimationEffectTimingReadOnly.webidl',
'AnimationEvent.webidl',

4
gfx/layers/AnimationHelper.cpp
Просмотреть файл

@ -6,7 +6,7 @@
#include "AnimationHelper.h"
#include "mozilla/ComputedTimingFunction.h" // for ComputedTimingFunction
#include "mozilla/dom/AnimationEffectReadOnlyBinding.h" // for dom::FillMode
#include "mozilla/dom/AnimationEffectBinding.h" // for dom::FillMode
#include "mozilla/dom/KeyframeEffectBinding.h" // for dom::IterationComposite
#include "mozilla/dom/KeyframeEffect.h" // for dom::KeyFrameEffectReadOnly
#include "mozilla/dom/Nullable.h" // for dom::Nullable
@ -233,7 +233,7 @@ AnimationHelper::SampleAnimationForEachNode(
.MultDouble(animation.playbackRate());
ComputedTiming computedTiming =
dom::AnimationEffectReadOnly::GetComputedTimingAt(
dom::AnimationEffect::GetComputedTimingAt(
dom::Nullable<TimeDuration>(elapsedDuration), animData.mTiming,
animation.playbackRate());

2
layout/style/ServoBindings.toml
Просмотреть файл

@ -55,7 +55,7 @@ headers = [
"nsThemeConstants.h",
"mozilla/css/Loader.h",
"mozilla/css/SheetLoadData.h",
"mozilla/dom/AnimationEffectReadOnlyBinding.h",
"mozilla/dom/AnimationEffectBinding.h",
"mozilla/dom/HTMLSlotElement.h",
"mozilla/dom/KeyframeEffectBinding.h",
"mozilla/dom/MediaList.h",

8
layout/style/nsAnimationManager.cpp
Просмотреть файл

@ -15,7 +15,7 @@
#include "mozilla/MemoryReporting.h"
#include "mozilla/ServoStyleSet.h"
#include "mozilla/StyleAnimationValue.h"
#include "mozilla/dom/AnimationEffectReadOnly.h"
#include "mozilla/dom/AnimationEffect.h"
#include "mozilla/dom/DocumentTimeline.h"
#include "mozilla/dom/KeyframeEffect.h"
@ -35,7 +35,7 @@
using namespace mozilla;
using namespace mozilla::css;
using mozilla::dom::Animation;
using mozilla::dom::AnimationEffectReadOnly;
using mozilla::dom::AnimationEffect;
using mozilla::dom::AnimationPlayState;
using mozilla::dom::KeyframeEffect;
using mozilla::dom::CSSAnimation;
@ -401,7 +401,7 @@ public:
// post the required restyles.
void NotifyNewOrRemovedAnimation(const Animation& aAnimation)
{
dom::AnimationEffectReadOnly* effect = aAnimation.GetEffect();
dom::AnimationEffect* effect = aAnimation.GetEffect();
if (!effect) {
return;
}
@ -432,7 +432,7 @@ UpdateOldAnimationPropertiesWithNew(
// Update the old from the new so we can keep the original object
// identity (and any expando properties attached to it).
if (aOld.GetEffect()) {
dom::AnimationEffectReadOnly* oldEffect = aOld.GetEffect();
dom::AnimationEffect* oldEffect = aOld.GetEffect();
animationChanged = oldEffect->SpecifiedTiming() != aNewTiming;
oldEffect->SetSpecifiedTiming(aNewTiming);

2
layout/style/nsCSSProps.cpp
Просмотреть файл

@ -20,7 +20,7 @@
#include "nsIWidget.h"
#include "nsThemeConstants.h" // For system widget appearance types
#include "mozilla/dom/AnimationEffectReadOnlyBinding.h" // for PlaybackDirection
#include "mozilla/dom/AnimationEffectBinding.h" // for PlaybackDirection
#include "mozilla/LookAndFeel.h" // for system colors
#include "nsString.h"

4
layout/style/nsStyleConsts.h
Просмотреть файл

@ -239,8 +239,8 @@ enum class StyleOrient : uint8_t {
#define NS_STYLE_WILL_CHANGE_FIXPOS_CB (1<<4)
#define NS_STYLE_WILL_CHANGE_ABSPOS_CB (1<<5)
// See AnimationEffectReadOnly.webidl
// and mozilla/dom/AnimationEffectReadOnlyBinding.h
// See AnimationEffect.webidl
// and mozilla/dom/AnimationEffectBinding.h
namespace dom {
enum class PlaybackDirection : uint8_t;
enum class FillMode : uint8_t;

2
layout/style/nsStyleStruct.cpp
Просмотреть файл

@ -31,7 +31,7 @@
#include "imgIContainer.h"
#include "CounterStyleManager.h"
#include "mozilla/dom/AnimationEffectReadOnlyBinding.h" // for PlaybackDirection
#include "mozilla/dom/AnimationEffectBinding.h" // for PlaybackDirection
#include "mozilla/dom/DocGroup.h"
#include "mozilla/dom/ImageTracker.h"
#include "mozilla/CORSMode.h"

2
layout/style/nsTransitionManager.cpp
Просмотреть файл

@ -393,7 +393,7 @@ CSSTransition::GetCurrentTimeAt(const dom::DocumentTimeline& aTimeline,
}
void
CSSTransition::SetEffectFromStyle(dom::AnimationEffectReadOnly* aEffect)
CSSTransition::SetEffectFromStyle(dom::AnimationEffect* aEffect)
{
Animation::SetEffectNoUpdate(aEffect);

2
layout/style/nsTransitionManager.h
Просмотреть файл

@ -170,7 +170,7 @@ public:
mOwningElement = OwningElementRef();
}
void SetEffectFromStyle(AnimationEffectReadOnly* aEffect);
void SetEffectFromStyle(AnimationEffect* aEffect);
void Tick() override;

6
testing/web-platform/meta/web-animations/interfaces/KeyframeEffect/idlharness.html.ini
Просмотреть файл

@ -1,6 +0,0 @@
[idlharness.html]
[KeyframeEffect interface: existence and properties of interface object]
expected: FAIL
[KeyframeEffect interface: existence and properties of interface prototype object]
expected: FAIL