diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2020-04-14 21:55:36 -0400 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2020-04-14 21:55:36 -0400 |
| commit | b356448d145cbd294d051624512bfbfaaf18d9b6 (patch) | |
| tree | de2e3219c8d659c3387f41bda57639f7aad171ce | |
| parent | bebec8fcb84dba6b684dfe1cc6c8a1e7741df374 (diff) | |
| download | UXP-b356448d145cbd294d051624512bfbfaaf18d9b6.tar UXP-b356448d145cbd294d051624512bfbfaaf18d9b6.tar.gz UXP-b356448d145cbd294d051624512bfbfaaf18d9b6.tar.lz UXP-b356448d145cbd294d051624512bfbfaaf18d9b6.tar.xz UXP-b356448d145cbd294d051624512bfbfaaf18d9b6.zip | |
Issue #1375 - Fix unified sources
| -rw-r--r-- | layout/style/StyleSheet.cpp | 4 | ||||
| -rw-r--r-- | layout/style/nsAnimationManager.cpp | 2 | ||||
| -rw-r--r-- | layout/style/nsStyleUtil.cpp | 1 | ||||
| -rw-r--r-- | layout/style/nsTransitionManager.cpp | 4 |
4 files changed, 7 insertions, 4 deletions
diff --git a/layout/style/StyleSheet.cpp b/layout/style/StyleSheet.cpp index f307f3918..fa4beeb36 100644 --- a/layout/style/StyleSheet.cpp +++ b/layout/style/StyleSheet.cpp @@ -12,6 +12,8 @@ #include "mozilla/StyleSheetInlines.h" #include "mozilla/CSSStyleSheet.h" +#include "mozAutoDocUpdate.h" +#include "nsIMediaList.h" #include "nsNullPrincipal.h" namespace mozilla { @@ -349,7 +351,7 @@ StyleSheet::AreRulesAvailable(nsIPrincipal& aSubjectPrincipal, JSObject* StyleSheet::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) { - return CSSStyleSheetBinding::Wrap(aCx, this, aGivenProto); + return dom::CSSStyleSheetBinding::Wrap(aCx, this, aGivenProto); } } // namespace mozilla diff --git a/layout/style/nsAnimationManager.cpp b/layout/style/nsAnimationManager.cpp index aa1b6fe78..04086a3ae 100644 --- a/layout/style/nsAnimationManager.cpp +++ b/layout/style/nsAnimationManager.cpp @@ -367,7 +367,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()) { - AnimationEffectReadOnly* oldEffect = aOld.GetEffect(); + dom::AnimationEffectReadOnly* oldEffect = aOld.GetEffect(); animationChanged = oldEffect->SpecifiedTiming() != aNewTiming; oldEffect->SetSpecifiedTiming(aNewTiming); diff --git a/layout/style/nsStyleUtil.cpp b/layout/style/nsStyleUtil.cpp index 840cd03c3..9c3c0f449 100644 --- a/layout/style/nsStyleUtil.cpp +++ b/layout/style/nsStyleUtil.cpp @@ -8,6 +8,7 @@ #include "nsIContent.h" #include "nsCSSProps.h" +#include "nsContentUtils.h" #include "nsRuleNode.h" #include "nsROCSSPrimitiveValue.h" #include "nsStyleStruct.h" diff --git a/layout/style/nsTransitionManager.cpp b/layout/style/nsTransitionManager.cpp index 118702e8f..ace215a9f 100644 --- a/layout/style/nsTransitionManager.cpp +++ b/layout/style/nsTransitionManager.cpp @@ -378,7 +378,7 @@ CSSTransition::HasLowerCompositeOrderThan(const CSSTransition& aOther) const } /* static */ Nullable<TimeDuration> -CSSTransition::GetCurrentTimeAt(const DocumentTimeline& aTimeline, +CSSTransition::GetCurrentTimeAt(const dom::DocumentTimeline& aTimeline, const TimeStamp& aBaseTime, const TimeDuration& aStartTime, double aPlaybackRate) @@ -395,7 +395,7 @@ CSSTransition::GetCurrentTimeAt(const DocumentTimeline& aTimeline, } void -CSSTransition::SetEffectFromStyle(AnimationEffectReadOnly* aEffect) +CSSTransition::SetEffectFromStyle(dom::AnimationEffectReadOnly* aEffect) { Animation::SetEffectNoUpdate(aEffect); |