mirror of
https://github.com/roytam1/UXP.git
synced 2026-05-26 13:58:49 +00:00
Issue #1375 - Fix unified sources
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
|
||||
#include "nsIContent.h"
|
||||
#include "nsCSSProps.h"
|
||||
#include "nsContentUtils.h"
|
||||
#include "nsRuleNode.h"
|
||||
#include "nsROCSSPrimitiveValue.h"
|
||||
#include "nsStyleStruct.h"
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user