Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 664924 - Remove MOZ_CSS_ANIMATIONS ifdefs. r=dbaron

Browse Source
This commit is contained in:
Matheus Kerschbaum ext:(%2C%20L.%20David%20Baron%20%3Cdbaron%40dbaron.org%3E) 2011-06-20 16:47:09 -07:00
parent cdd2b64d2f
commit 1b406143bc
39 changed files with 10 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/autoconf.mk.in
View File

@ -254,7 +254,6 @@ MOZ_TREE_CAIRO = @MOZ_TREE_CAIRO@
MOZ_TREE_PIXMAN = @MOZ_TREE_PIXMAN@
MOZ_UPDATE_XTERM = @MOZ_UPDATE_XTERM@
MOZ_CSS_ANIMATIONS = @MOZ_CSS_ANIMATIONS@
MOZ_PERMISSIONS = @MOZ_PERMISSIONS@
MOZ_XTF = @MOZ_XTF@
MOZ_SVG_DLISTS = @MOZ_SVG_DLISTS@

4
configure.in
View File

@ -4750,7 +4750,6 @@ MOZ_OFFICIAL_BRANDING=
MOZ_FEEDS=1
MOZ_INSTALLER=1
MOZ_JSDEBUGGER=1
MOZ_CSS_ANIMATIONS=1
MOZ_MORK=
MOZ_MORKREADER=1
MOZ_AUTH_EXTENSION=1
@ -6340,8 +6339,6 @@ for extension in $MOZ_EXTENSIONS; do
fi
done
AC_DEFINE(MOZ_CSS_ANIMATIONS)
dnl ========================================================
dnl SVG Display Lists
dnl ========================================================
@ -8799,7 +8796,6 @@ AC_SUBST(MOZ_UPDATE_XTERM)
AC_SUBST(MINIMO)
AC_SUBST(MOZ_PLATFORM_MAEMO)
AC_SUBST(MOZ_AUTH_EXTENSION)
AC_SUBST(MOZ_CSS_ANIMATIONS)
AC_SUBST(MOZ_PERMISSIONS)
AC_SUBST(MOZ_XTF)
AC_SUBST(MOZ_PREF_EXTENSIONS)

5
content/base/src/nsContentUtils.cpp
View File

@ -568,13 +568,10 @@ nsContentUtils::InitializeEventTable() {
{ nsGkAtoms::onMozTouchMove, NS_MOZTOUCH_MOVE, EventNameType_None, NS_MOZTOUCH_EVENT },
{ nsGkAtoms::onMozTouchUp, NS_MOZTOUCH_UP, EventNameType_None, NS_MOZTOUCH_EVENT },
{ nsGkAtoms::ontransitionend, NS_TRANSITION_END, EventNameType_None, NS_TRANSITION_EVENT }
#ifdef MOZ_CSS_ANIMATIONS
,
{ nsGkAtoms::ontransitionend, NS_TRANSITION_END, EventNameType_None, NS_TRANSITION_EVENT },
{ nsGkAtoms::onanimationstart, NS_ANIMATION_START, EventNameType_None, NS_ANIMATION_EVENT },
{ nsGkAtoms::onanimationend, NS_ANIMATION_END, EventNameType_None, NS_ANIMATION_EVENT },
{ nsGkAtoms::onanimationiteration, NS_ANIMATION_ITERATION, EventNameType_None, NS_ANIMATION_EVENT },
#endif
{ nsGkAtoms::onbeforeprint, NS_BEFOREPRINT, EventNameType_HTMLXUL, NS_EVENT },
{ nsGkAtoms::onafterprint, NS_AFTERPRINT, EventNameType_HTMLXUL, NS_EVENT }
};

2
content/base/src/nsGenericElement.cpp
View File

@ -3051,11 +3051,9 @@ nsGenericElement::UnbindFromTree(PRBool aDeep, PRBool aNullParent)
DeleteProperty(nsGkAtoms::transitionsOfBeforeProperty);
DeleteProperty(nsGkAtoms::transitionsOfAfterProperty);
DeleteProperty(nsGkAtoms::transitionsProperty);
#ifdef MOZ_CSS_ANIMATIONS
DeleteProperty(nsGkAtoms::animationsOfBeforeProperty);
DeleteProperty(nsGkAtoms::animationsOfAfterProperty);
DeleteProperty(nsGkAtoms::animationsProperty);
#endif
}
// Unset this since that's what the old code effectively did.

4
content/base/src/nsGkAtomList.h
View File

@ -634,11 +634,9 @@ GK_ATOM(omitXmlDeclaration, "omit-xml-declaration")
GK_ATOM(onabort, "onabort")
GK_ATOM(onafterprint, "onafterprint")
GK_ATOM(onafterscriptexecute, "onafterscriptexecute")
#ifdef MOZ_CSS_ANIMATIONS
GK_ATOM(onanimationend, "onanimationend")
GK_ATOM(onanimationiteration, "onanimationiteration")
GK_ATOM(onanimationstart, "onanimationstart")
#endif
GK_ATOM(onbeforecopy, "onbeforecopy")
GK_ATOM(onbeforecut, "onbeforecut")
GK_ATOM(onbeforepaste, "onbeforepaste")
@ -1837,11 +1835,9 @@ GK_ATOM(volumechange, "volumechange")
#endif
// Content property names
#ifdef MOZ_CSS_ANIMATIONS
GK_ATOM(animationsProperty, "AnimationsProperty") // FrameAnimations*
GK_ATOM(animationsOfBeforeProperty, "AnimationsOfBeforeProperty") // FrameAnimations*
GK_ATOM(animationsOfAfterProperty, "AnimationsOfAfterProperty") // FrameAnimations*
#endif
GK_ATOM(transitionsProperty, "TransitionsProperty") // FrameTransitions*
GK_ATOM(transitionsOfBeforeProperty, "TransitionsOfBeforeProperty") // FrameTransitions*
GK_ATOM(transitionsOfAfterProperty, "TransitionsOfAfterProperty") // FrameTransitions*

2
content/events/public/nsIPrivateDOMEvent.h
View File

@ -134,10 +134,8 @@ nsresult
NS_NewDOMScrollAreaEvent(nsIDOMEvent** aInstancePtrResult, nsPresContext* aPresContext, class nsScrollAreaEvent* aEvent);
nsresult
NS_NewDOMTransitionEvent(nsIDOMEvent** aInstancePtrResult, nsPresContext* aPresContext, class nsTransitionEvent* aEvent);
#ifdef MOZ_CSS_ANIMATIONS
nsresult
NS_NewDOMAnimationEvent(nsIDOMEvent** aInstancePtrResult, nsPresContext* aPresContext, class nsAnimationEvent* aEvent);
#endif
nsresult
NS_NewDOMCloseEvent(nsIDOMEvent** aInstancePtrResult, nsPresContext* aPresContext, class nsEvent* aEvent);
nsresult

5
content/events/src/Makefile.in
View File

@ -89,6 +89,7 @@ CPPSRCS = \
nsDOMEventTargetHelper.cpp \
nsDOMScrollAreaEvent.cpp \
nsDOMTransitionEvent.cpp \
nsDOMAnimationEvent.cpp \
nsDOMPopStateEvent.cpp \
nsDOMHashChangeEvent.cpp \
nsDOMCloseEvent.cpp \
@ -96,10 +97,6 @@ CPPSRCS = \
nsDOMCustomEvent.cpp \
$(NULL)
ifdef MOZ_CSS_ANIMATIONS
CPPSRCS += nsDOMAnimationEvent.cpp
endif
# we don't want the shared lib, but we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1

9
content/events/src/nsDOMEvent.cpp
View File

@ -106,13 +106,10 @@ static const char* const sEventNames[] = {
"MozTouchMove",
"MozTouchUp",
"MozScrolledAreaChanged",
"transitionend"
#ifdef MOZ_CSS_ANIMATIONS
,
"transitionend",
"animationstart",
"animationend",
"animationiteration"
#endif
};
static char *sPopupAllowedEvents;
@ -820,7 +817,6 @@ NS_METHOD nsDOMEvent::DuplicatePrivateData()
NS_ENSURE_TRUE(newEvent, NS_ERROR_OUT_OF_MEMORY);
break;
}
#ifdef MOZ_CSS_ANIMATIONS
case NS_ANIMATION_EVENT:
{
nsAnimationEvent* oldAnimationEvent =
@ -831,7 +827,6 @@ NS_METHOD nsDOMEvent::DuplicatePrivateData()
NS_ENSURE_TRUE(newEvent, NS_ERROR_OUT_OF_MEMORY);
break;
}
#endif
case NS_MOZTOUCH_EVENT:
{
newEvent = new nsMozTouchEvent(PR_FALSE, msg, nsnull,
@ -1363,14 +1358,12 @@ const char* nsDOMEvent::GetEventName(PRUint32 aEventType)
return sEventNames[eDOMEvents_MozScrolledAreaChanged];
case NS_TRANSITION_END:
return sEventNames[eDOMEvents_transitionend];
#ifdef MOZ_CSS_ANIMATIONS
case NS_ANIMATION_START:
return sEventNames[eDOMEvents_animationstart];
case NS_ANIMATION_END:
return sEventNames[eDOMEvents_animationend];
case NS_ANIMATION_ITERATION:
return sEventNames[eDOMEvents_animationiteration];
#endif
default:
break;
}

5
content/events/src/nsDOMEvent.h
View File

@ -189,13 +189,10 @@ public:
eDOMEvents_MozTouchMove,
eDOMEvents_MozTouchUp,
eDOMEvents_MozScrolledAreaChanged,
eDOMEvents_transitionend
#ifdef MOZ_CSS_ANIMATIONS
,
eDOMEvents_transitionend,
eDOMEvents_animationstart,
eDOMEvents_animationend,
eDOMEvents_animationiteration
#endif
};
nsDOMEvent(nsPresContext* aPresContext, nsEvent* aEvent);

4
content/events/src/nsEventDispatcher.cpp
View File

@ -802,11 +802,9 @@ nsEventDispatcher::CreateEvent(nsPresContext* aPresContext,
case NS_TRANSITION_EVENT:
return NS_NewDOMTransitionEvent(aDOMEvent, aPresContext,
static_cast<nsTransitionEvent*>(aEvent));
#ifdef MOZ_CSS_ANIMATIONS
case NS_ANIMATION_EVENT:
return NS_NewDOMAnimationEvent(aDOMEvent, aPresContext,
static_cast<nsAnimationEvent*>(aEvent));
#endif
}
// For all other types of events, create a vanilla event object.
@ -886,10 +884,8 @@ nsEventDispatcher::CreateEvent(nsPresContext* aPresContext,
// is probably wrong!
if (aEventType.LowerCaseEqualsLiteral("transitionevent"))
return NS_NewDOMTransitionEvent(aDOMEvent, aPresContext, nsnull);
#ifdef MOZ_CSS_ANIMATIONS
if (aEventType.LowerCaseEqualsLiteral("animationevent"))
return NS_NewDOMAnimationEvent(aDOMEvent, aPresContext, nsnull);
#endif
if (aEventType.LowerCaseEqualsLiteral("popstateevent"))
return NS_NewDOMPopStateEvent(aDOMEvent, aPresContext, nsnull);
if (aEventType.LowerCaseEqualsLiteral("mozaudioavailableevent"))

12
dom/base/nsDOMClassInfo.cpp
View File

@ -246,9 +246,7 @@
#include "nsIDOMNotifyAudioAvailableEvent.h"
#include "nsIDOMScrollAreaEvent.h"
#include "nsIDOMTransitionEvent.h"
#ifdef MOZ_CSS_ANIMATIONS
#include "nsIDOMAnimationEvent.h"
#endif
#include "nsIDOMDocumentXBL.h"
#include "nsIDOMElementCSSInlineStyle.h"
#include "nsIDOMLinkStyle.h"
@ -323,10 +321,8 @@
#include "nsIDOMCSSMediaRule.h"
#include "nsIDOMCSSFontFaceRule.h"
#include "nsIDOMCSSMozDocumentRule.h"
#ifdef MOZ_CSS_ANIMATIONS
#include "nsIDOMMozCSSKeyframeRule.h"
#include "nsIDOMMozCSSKeyframesRule.h"
#endif
#include "nsIDOMCSSPrimitiveValue.h"
#include "nsIDOMCSSStyleRule.h"
#include "nsIDOMCSSStyleSheet.h"
@ -1469,10 +1465,8 @@ static nsDOMClassInfoData sClassInfoData[] = {
DOM_DEFAULT_SCRIPTABLE_FLAGS)
NS_DEFINE_CLASSINFO_DATA(TransitionEvent, nsDOMGenericSH,
DOM_DEFAULT_SCRIPTABLE_FLAGS)
#ifdef MOZ_CSS_ANIMATIONS
NS_DEFINE_CLASSINFO_DATA(AnimationEvent, nsDOMGenericSH,
DOM_DEFAULT_SCRIPTABLE_FLAGS)
#endif
NS_DEFINE_CLASSINFO_DATA(ContentFrameMessageManager, nsDOMGenericSH,
DOM_DEFAULT_SCRIPTABLE_FLAGS)
@ -1525,12 +1519,10 @@ static nsDOMClassInfoData sClassInfoData[] = {
NS_DEFINE_CLASSINFO_DATA(TouchEvent, nsDOMGenericSH,
DOM_DEFAULT_SCRIPTABLE_FLAGS)
#ifdef MOZ_CSS_ANIMATIONS
NS_DEFINE_CLASSINFO_DATA(MozCSSKeyframeRule, nsDOMGenericSH,
DOM_DEFAULT_SCRIPTABLE_FLAGS)
NS_DEFINE_CLASSINFO_DATA(MozCSSKeyframesRule, nsDOMGenericSH,
DOM_DEFAULT_SCRIPTABLE_FLAGS)
#endif
NS_DEFINE_CLASSINFO_DATA(MediaQueryList, nsDOMGenericSH,
DOM_DEFAULT_SCRIPTABLE_FLAGS)
@ -4220,12 +4212,10 @@ nsDOMClassInfo::Init()
DOM_CLASSINFO_EVENT_MAP_ENTRIES
DOM_CLASSINFO_MAP_END
#ifdef MOZ_CSS_ANIMATIONS
DOM_CLASSINFO_MAP_BEGIN(AnimationEvent, nsIDOMAnimationEvent)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMAnimationEvent)
DOM_CLASSINFO_EVENT_MAP_ENTRIES
DOM_CLASSINFO_MAP_END
#endif
DOM_CLASSINFO_MAP_BEGIN_NO_CLASS_IF(ContentFrameMessageManager, nsIContentFrameMessageManager)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
@ -4339,7 +4329,6 @@ nsDOMClassInfo::Init()
DOM_CLASSINFO_UI_EVENT_MAP_ENTRIES
DOM_CLASSINFO_MAP_END
#ifdef MOZ_CSS_ANIMATIONS
DOM_CLASSINFO_MAP_BEGIN(MozCSSKeyframeRule, nsIDOMMozCSSKeyframeRule)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMMozCSSKeyframeRule)
DOM_CLASSINFO_MAP_END
@ -4347,7 +4336,6 @@ nsDOMClassInfo::Init()
DOM_CLASSINFO_MAP_BEGIN(MozCSSKeyframesRule, nsIDOMMozCSSKeyframesRule)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMMozCSSKeyframesRule)
DOM_CLASSINFO_MAP_END
#endif
DOM_CLASSINFO_MAP_BEGIN(MediaQueryList, nsIDOMMediaQueryList)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMMediaQueryList)

4
dom/base/nsDOMClassInfoClasses.h
View File

@ -484,9 +484,7 @@ DOMCI_CLASS(HashChangeEvent)
DOMCI_CLASS(EventListenerInfo)
DOMCI_CLASS(TransitionEvent)
#ifdef MOZ_CSS_ANIMATIONS
DOMCI_CLASS(AnimationEvent)
#endif
DOMCI_CLASS(ContentFrameMessageManager)
@ -518,10 +516,8 @@ DOMCI_CLASS(Touch)
DOMCI_CLASS(TouchList)
DOMCI_CLASS(TouchEvent)
#ifdef MOZ_CSS_ANIMATIONS
DOMCI_CLASS(MozCSSKeyframeRule)
DOMCI_CLASS(MozCSSKeyframesRule)
#endif
DOMCI_CLASS(MediaQueryList)
DOMCI_CLASS(CustomEvent)

9
dom/interfaces/css/Makefile.in
View File

@ -64,6 +64,8 @@ XPIDLSRCS = \
nsIDOMCSSImportRule.idl \
nsIDOMCSSMediaRule.idl \
nsIDOMCSSMozDocumentRule.idl \
nsIDOMMozCSSKeyframeRule.idl \
nsIDOMMozCSSKeyframesRule.idl \
nsIDOMCSSPageRule.idl \
nsIDOMCSSStyleRule.idl \
nsIDOMCSSUnknownRule.idl \
@ -73,11 +75,4 @@ XPIDLSRCS = \
nsIDOMNSRGBAColor.idl \
$(NULL)
ifdef MOZ_CSS_ANIMATIONS
XPIDLSRCS += \
nsIDOMMozCSSKeyframeRule.idl \
nsIDOMMozCSSKeyframesRule.idl \
$(NULL)
endif
include $(topsrcdir)/config/rules.mk

7
dom/interfaces/events/Makefile.in
View File

@ -84,6 +84,7 @@ XPIDLSRCS = \
nsIDOMDeviceMotionEvent.idl \
nsIDOMScrollAreaEvent.idl \
nsIDOMTransitionEvent.idl \
nsIDOMAnimationEvent.idl \
nsIDOMPopStateEvent.idl \
nsIDOMCloseEvent.idl \
nsIDOMEventException.idl \
@ -92,10 +93,4 @@ XPIDLSRCS = \
nsIDOMCustomEvent.idl \
$(NULL)
ifdef MOZ_CSS_ANIMATIONS
XPIDLSRCS += \
nsIDOMAnimationEvent.idl \
$(NULL)
endif
include $(topsrcdir)/config/rules.mk

8
layout/base/nsPresContext.cpp
View File

@ -94,9 +94,7 @@
#include "nsIDOMEventTarget.h"
#include "nsObjectFrame.h"
#include "nsTransitionManager.h"
#ifdef MOZ_CSS_ANIMATIONS
#include "nsAnimationManager.h"
#endif
#include "mozilla/dom/Element.h"
#include "nsIFrameMessageManager.h"
#include "FrameLayerBuilder.h"
@ -923,11 +921,9 @@ nsPresContext::Init(nsDeviceContext* aDeviceContext)
if (!mTransitionManager)
return NS_ERROR_OUT_OF_MEMORY;
#ifdef MOZ_CSS_ANIMATIONS
mAnimationManager = new nsAnimationManager(this);
if (!mAnimationManager)
return NS_ERROR_OUT_OF_MEMORY;
#endif
if (mDocument->GetDisplayDocument()) {
NS_ASSERTION(mDocument->GetDisplayDocument()->GetShell() &&
@ -1093,12 +1089,10 @@ nsPresContext::SetShell(nsIPresShell* aShell)
mTransitionManager->Disconnect();
mTransitionManager = nsnull;
}
#ifdef MOZ_CSS_ANIMATIONS
if (mAnimationManager) {
mAnimationManager->Disconnect();
mAnimationManager = nsnull;
}
#endif
}
}
@ -1656,9 +1650,7 @@ nsPresContext::RebuildAllStyleData(nsChangeHint aExtraHint)
}
RebuildUserFontSet();
#ifdef MOZ_CSS_ANIMATIONS
AnimationManager()->KeyframesListIsDirty();
#endif
mShell->FrameConstructor()->RebuildAllStyleData(aExtraHint);
}

6
layout/base/nsPresContext.h
View File

@ -103,9 +103,7 @@ class nsUserFontSet;
struct nsFontFaceRuleContainer;
class nsObjectFrame;
class nsTransitionManager;
#ifdef MOZ_CSS_ANIMATIONS
class nsAnimationManager;
#endif
class nsRefreshDriver;
class imgIContainer;
class nsIDOMMediaQueryList;
@ -243,9 +241,7 @@ public:
{ return GetPresShell()->FrameManager(); }
nsTransitionManager* TransitionManager() { return mTransitionManager; }
#ifdef MOZ_CSS_ANIMATIONS
nsAnimationManager* AnimationManager() { return mAnimationManager; }
#endif
nsRefreshDriver* RefreshDriver() { return mRefreshDriver; }
#endif
@ -1082,9 +1078,7 @@ protected:
nsILookAndFeel* mLookAndFeel; // [STRONG]
nsRefPtr<nsRefreshDriver> mRefreshDriver;
nsRefPtr<nsTransitionManager> mTransitionManager;
#ifdef MOZ_CSS_ANIMATIONS
nsRefPtr<nsAnimationManager> mAnimationManager;
#endif
nsIAtom* mMedium; // initialized by subclass ctors;
// weak pointer to static atom

6
layout/base/nsPresShell.cpp
View File

@ -66,9 +66,7 @@
#include "nsStyleSet.h"
#include "nsCSSStyleSheet.h" // XXX for UA sheet loading hack, can this go away please?
#include "nsIDOMCSSStyleSheet.h" // for Pref-related rule management (bugs 22963,20760,31816)
#ifdef MOZ_CSS_ANIMATIONS
#include "nsAnimationManager.h"
#endif
#include "nsINameSpaceManager.h" // for Pref-related rule management (bugs 22963,20760,31816)
#include "nsIServiceManager.h"
#include "nsFrame.h"
@ -4812,13 +4810,11 @@ PresShell::FlushPendingNotifications(mozFlushType aType)
mFrameConstructor->ProcessPendingRestyles();
}
#ifdef MOZ_CSS_ANIMATIONS
// Dispatch any 'animationstart' events those (or earlier) restyles
// queued up.
if (!mIsDestroying) {
mPresContext->AnimationManager()->DispatchEvents();
}
#endif
// Process whatever XBL constructors those restyles queued up. This
// ensures that onload doesn't fire too early and that we won't do extra
@ -5137,9 +5133,7 @@ nsIPresShell::ReconstructStyleDataInternal()
if (mPresContext) {
mPresContext->RebuildUserFontSet();
#ifdef MOZ_CSS_ANIMATIONS
mPresContext->AnimationManager()->KeyframesListIsDirty();
#endif
}
Element* root = mDocument->GetRootElement();

2
layout/base/nsStyleConsts.h
View File

@ -247,7 +247,6 @@ static inline mozilla::css::Side operator++(mozilla::css::Side& side, int) {
#define NS_COLOR_MOZ_VISITEDHYPERLINKTEXT -5
#define NS_COLOR_MOZ_ACTIVEHYPERLINKTEXT -6
#ifdef MOZ_CSS_ANIMATIONS
// See nsStyleDisplay
#define NS_STYLE_ANIMATION_DIRECTION_NORMAL 0
#define NS_STYLE_ANIMATION_DIRECTION_ALTERNATE 1
@ -264,7 +263,6 @@ static inline mozilla::css::Side operator++(mozilla::css::Side& side, int) {
// See nsStyleDisplay
#define NS_STYLE_ANIMATION_PLAY_STATE_RUNNING 0
#define NS_STYLE_ANIMATION_PLAY_STATE_PAUSED 1
#endif
// See nsStyleBackground
#define NS_STYLE_BG_ATTACHMENT_SCROLL 0

2
layout/style/Declaration.cpp
View File

@ -708,7 +708,6 @@ Declaration::GetValue(nsCSSProperty aProperty, nsAString& aValue) const
}
break;
}
#ifdef MOZ_CSS_ANIMATIONS
case eCSSProperty_animation: {
const nsCSSProperty* subprops =
nsCSSProps::SubpropertyEntryFor(eCSSProperty_animation);
@ -759,7 +758,6 @@ Declaration::GetValue(nsCSSProperty aProperty, nsAString& aValue) const
}
break;
}
#endif
case eCSSProperty_marker: {
const nsCSSValue &endValue =
*data->ValueFor(eCSSProperty_marker_end);

7
layout/style/Makefile.in
View File

@ -113,6 +113,7 @@ CPPSRCS = \
Declaration.cpp \
nsCSSKeywords.cpp \
Loader.cpp \
nsAnimationManager.cpp \
nsCSSParser.cpp \
nsCSSProps.cpp \
nsCSSPseudoClasses.cpp \
@ -149,12 +150,6 @@ CPPSRCS = \
StyleRule.cpp \
$(NULL)
ifdef MOZ_CSS_ANIMATIONS
CPPSRCS += \
nsAnimationManager.cpp \
$(NULL)
endif
FORCE_STATIC_LIB = 1
include $(topsrcdir)/config/rules.mk

2
layout/style/Rule.h
View File

@ -98,10 +98,8 @@ public:
MEDIA_RULE,
FONT_FACE_RULE,
PAGE_RULE,
#ifdef MOZ_CSS_ANIMATIONS
KEYFRAME_RULE,
KEYFRAMES_RULE,
#endif
DOCUMENT_RULE
};

18
layout/style/nsCSSParser.cpp
View File

@ -251,7 +251,6 @@ public:
PRUint32 aLineNumber, // for error reporting
nsCSSSelectorList **aSelectorList);
#ifdef MOZ_CSS_ANIMATIONS
already_AddRefed<nsCSSKeyframeRule>
ParseKeyframeRule(const nsSubstring& aBuffer,
nsIURI* aURL,
@ -261,7 +260,6 @@ public:
nsIURI* aURL, // for error reporting
PRUint32 aLineNumber, // for error reporting
nsTArray<float>& aSelectorList);
#endif
protected:
class nsAutoParseCompoundProperty;
@ -361,11 +359,9 @@ protected:
nsCSSValue& aValue);
PRBool ParsePageRule(RuleAppendFunc aAppendFunc, void* aProcessData);
#ifdef MOZ_CSS_ANIMATIONS
PRBool ParseKeyframesRule(RuleAppendFunc aAppendFunc, void* aProcessData);
already_AddRefed<nsCSSKeyframeRule> ParseKeyframeRule();
PRBool ParseKeyframeSelectorList(nsTArray<float>& aSelectorList);
#endif
enum nsSelectorParsingStatus {
// we have parsed a selector and we saw a token that cannot be
@ -536,9 +532,7 @@ protected:
nsCSSValue* aValues,
size_t aNumProperties);
PRBool ParseTransition();
#ifdef MOZ_CSS_ANIMATIONS
PRBool ParseAnimation();
#endif
PRBool ParsePaint(nsCSSProperty aPropID);
PRBool ParseDasharray();
@ -1285,7 +1279,6 @@ CSSParserImpl::ParseSelectorString(const nsSubstring& aSelectorString,
}
#ifdef MOZ_CSS_ANIMATIONS
already_AddRefed<nsCSSKeyframeRule>
CSSParserImpl::ParseKeyframeRule(const nsSubstring& aBuffer,
nsIURI* aURI,
@ -1334,7 +1327,6 @@ CSSParserImpl::ParseKeyframeSelectorString(const nsSubstring& aSelectorString,
return success;
}
#endif
//----------------------------------------------------------------------
@ -1566,11 +1558,9 @@ CSSParserImpl::ParseAtRule(RuleAppendFunc aAppendFunc,
parseFunc = &CSSParserImpl::ParsePageRule;
newSection = eCSSSection_General;
#ifdef MOZ_CSS_ANIMATIONS
} else if (mToken.mIdent.LowerCaseEqualsLiteral("-moz-keyframes")) {
parseFunc = &CSSParserImpl::ParseKeyframesRule;
newSection = eCSSSection_General;
#endif
} else {
if (!NonMozillaVendorIdentifier(mToken.mIdent)) {
@ -2302,7 +2292,6 @@ CSSParserImpl::ParsePageRule(RuleAppendFunc aAppendFunc, void* aData)
return PR_FALSE;
}
#ifdef MOZ_CSS_ANIMATIONS
PRBool
CSSParserImpl::ParseKeyframesRule(RuleAppendFunc aAppendFunc, void* aData)
{
@ -2397,7 +2386,6 @@ CSSParserImpl::ParseKeyframeSelectorList(nsTArray<float>& aSelectorList)
}
}
}
#endif
void
CSSParserImpl::SkipUntil(PRUnichar aStopSymbol)
@ -5557,10 +5545,8 @@ CSSParserImpl::ParsePropertyByFunction(nsCSSProperty aPropID)
return ParseMozTransformOrigin();
case eCSSProperty_transition:
return ParseTransition();
#ifdef MOZ_CSS_ANIMATIONS
case eCSSProperty_animation:
return ParseAnimation();
#endif
case eCSSProperty_transition_property:
return ParseTransitionProperty();
case eCSSProperty_fill:
@ -8363,7 +8349,6 @@ CSSParserImpl::ParseTransition()
return PR_TRUE;
}
#ifdef MOZ_CSS_ANIMATIONS
PRBool
CSSParserImpl::ParseAnimation()
{
@ -8414,7 +8399,6 @@ CSSParserImpl::ParseAnimation()
}
return PR_TRUE;
}
#endif
PRBool
CSSParserImpl::ParseShadowItem(nsCSSValue& aValue, PRBool aIsBoxShadow)
@ -8806,7 +8790,6 @@ nsCSSParser::ParseSelectorString(const nsSubstring& aSelectorString,
ParseSelectorString(aSelectorString, aURI, aLineNumber, aSelectorList);
}
#ifdef MOZ_CSS_ANIMATIONS
already_AddRefed<nsCSSKeyframeRule>
nsCSSParser::ParseKeyframeRule(const nsSubstring& aBuffer,
nsIURI* aURI,
@ -8826,4 +8809,3 @@ nsCSSParser::ParseKeyframeSelectorString(const nsSubstring& aSelectorString,
ParseKeyframeSelectorString(aSelectorString, aURI, aLineNumber,
aSelectorList);
}
#endif

4
layout/style/nsCSSParser.h
View File

@ -51,9 +51,7 @@ class nsIPrincipal;
class nsIURI;
struct nsCSSSelectorList;
class nsMediaList;
#ifdef MOZ_CSS_ANIMATIONS
class nsCSSKeyframeRule;
#endif
namespace mozilla {
namespace css {
@ -190,7 +188,6 @@ public:
PRUint32 aLineNumber,
nsCSSSelectorList** aSelectorList);
#ifdef MOZ_CSS_ANIMATIONS
/*
* Parse a keyframe rule (which goes inside an @keyframes rule).
* Return it if the parse was successful.
@ -208,7 +205,6 @@ public:
nsIURI* aURL,
PRUint32 aLineNumber,
nsTArray<float>& aSelectorList);
#endif
protected:
// This is a CSSParserImpl*, but if we expose that type name in this

2
layout/style/nsCSSPropList.h
View File

@ -368,7 +368,6 @@ CSS_PROP_FONT(
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
#endif
#ifdef MOZ_CSS_ANIMATIONS
CSS_PROP_SHORTHAND(
-moz-animation,
animation,
@ -459,7 +458,6 @@ CSS_PROP_DISPLAY(
kTransitionTimingFunctionKTable,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
#endif
CSS_PROP_SHORTHAND(
background,
background,

4
layout/style/nsCSSProps.cpp
View File

@ -445,7 +445,6 @@ nsCSSProps::OtherNameFor(nsCSSProperty aProperty)
/***************************************************************************/
#ifdef MOZ_CSS_ANIMATIONS
const PRInt32 nsCSSProps::kAnimationDirectionKTable[] = {
eCSSKeyword_normal, NS_STYLE_ANIMATION_DIRECTION_NORMAL,
eCSSKeyword_alternate, NS_STYLE_ANIMATION_DIRECTION_ALTERNATE,
@ -470,7 +469,6 @@ const PRInt32 nsCSSProps::kAnimationPlayStateKTable[] = {
eCSSKeyword_paused, NS_STYLE_ANIMATION_PLAY_STATE_PAUSED,
eCSSKeyword_UNKNOWN,-1
};
#endif
const PRInt32 nsCSSProps::kAppearanceKTable[] = {
eCSSKeyword_none, NS_THEME_NONE,
@ -1577,7 +1575,6 @@ const PRUint32 nsCSSProps::kFlagsTable[eCSSProperty_COUNT] = {
#undef CSS_PROP_SHORTHAND
};
#ifdef MOZ_CSS_ANIMATIONS
static const nsCSSProperty gAnimationSubpropTable[] = {
eCSSProperty_animation_duration,
eCSSProperty_animation_timing_function,
@ -1591,7 +1588,6 @@ static const nsCSSProperty gAnimationSubpropTable[] = {
eCSSProperty_animation_name,
eCSSProperty_UNKNOWN
};
#endif
static const nsCSSProperty gBorderRadiusSubpropTable[] = {
// Code relies on these being in topleft-topright-bottomright-bottomleft

2
layout/style/nsCSSProps.h
View File

@ -326,13 +326,11 @@ public:
*iter_ != eCSSProperty_UNKNOWN; ++iter_)
// Keyword/Enum value tables
#ifdef MOZ_CSS_ANIMATIONS
static const PRInt32 kAnimationDirectionKTable[];
static const PRInt32 kAnimationFillModeKTable[];
static const PRInt32 kAnimationIterationCountKTable[];
static const PRInt32 kAnimationPlayStateKTable[];
static const PRInt32 kAnimationTimingFunctionKTable[];
#endif
static const PRInt32 kAppearanceKTable[];
static const PRInt32 kAzimuthKTable[];
static const PRInt32 kBackgroundAttachmentKTable[];

14
layout/style/nsCSSRuleProcessor.cpp
View File

@ -844,9 +844,7 @@ struct RuleCascadeData {
#endif
nsTArray<nsFontFaceRuleContainer> mFontFaceRules;
#ifdef MOZ_CSS_ANIMATIONS
nsTArray<nsCSSKeyframesRule*> mKeyframesRules;
#endif
// Looks up or creates the appropriate list in |mAttributeSelectors|.
// Returns null only on allocation failure.
@ -2473,7 +2471,6 @@ nsCSSRuleProcessor::AppendFontFaceRules(
return PR_TRUE;
}
#ifdef MOZ_CSS_ANIMATIONS
// Append all the currently-active keyframes rules to aArray. Return
// true for success and false for failure.
PRBool
@ -2490,7 +2487,6 @@ nsCSSRuleProcessor::AppendKeyframesRules(
return PR_TRUE;
}
#endif
nsresult
nsCSSRuleProcessor::ClearRuleCascades()
@ -2768,17 +2764,13 @@ static PLDHashTableOps gRulesByWeightOps = {
struct CascadeEnumData {
CascadeEnumData(nsPresContext* aPresContext,
nsTArray<nsFontFaceRuleContainer>& aFontFaceRules,
#ifdef MOZ_CSS_ANIMATIONS
nsTArray<nsCSSKeyframesRule*>& aKeyframesRules,
#endif
nsMediaQueryResultCacheKey& aKey,
PLArenaPool& aArena,
PRUint8 aSheetType)
: mPresContext(aPresContext),
mFontFaceRules(aFontFaceRules),
#ifdef MOZ_CSS_ANIMATIONS
mKeyframesRules(aKeyframesRules),
#endif
mCacheKey(aKey),
mArena(aArena),
mSheetType(aSheetType)
@ -2796,9 +2788,7 @@ struct CascadeEnumData {
nsPresContext* mPresContext;
nsTArray<nsFontFaceRuleContainer>& mFontFaceRules;
#ifdef MOZ_CSS_ANIMATIONS
nsTArray<nsCSSKeyframesRule*>& mKeyframesRules;
#endif
nsMediaQueryResultCacheKey& mCacheKey;
PLArenaPool& mArena;
// Hooray, a manual PLDHashTable since nsClassHashtable doesn't
@ -2854,7 +2844,6 @@ CascadeRuleEnumFunc(css::Rule* aRule, void* aData)
ptr->mRule = fontFaceRule;
ptr->mSheetType = data->mSheetType;
}
#ifdef MOZ_CSS_ANIMATIONS
else if (css::Rule::KEYFRAMES_RULE == type) {
nsCSSKeyframesRule *keyframesRule =
static_cast<nsCSSKeyframesRule*>(aRule);
@ -2862,7 +2851,6 @@ CascadeRuleEnumFunc(css::Rule* aRule, void* aData)
return PR_FALSE;
}
}
#endif
return PR_TRUE;
}
@ -2963,9 +2951,7 @@ nsCSSRuleProcessor::RefreshRuleCascade(nsPresContext* aPresContext)
eCompatibility_NavQuirks == aPresContext->CompatibilityMode()));
if (newCascade) {
CascadeEnumData data(aPresContext, newCascade->mFontFaceRules,
#ifdef MOZ_CSS_ANIMATIONS
newCascade->mKeyframesRules,
#endif
newCascade->mCacheKey,
newCascade->mRuleHash.Arena(),
mSheetType);

4
layout/style/nsCSSRuleProcessor.h
View File

@ -56,9 +56,7 @@ struct RuleCascadeData;
struct nsCSSSelectorList;
struct CascadeEnumData;
struct TreeMatchContext;
#ifdef MOZ_CSS_ANIMATIONS
class nsCSSKeyframesRule;
#endif
/**
* The CSS style rule processor provides a mechanism for sibling style
@ -143,10 +141,8 @@ public:
PRBool AppendFontFaceRules(nsPresContext* aPresContext,
nsTArray<nsFontFaceRuleContainer>& aArray);
#ifdef MOZ_CSS_ANIMATIONS
PRBool AppendKeyframesRules(nsPresContext* aPresContext,
nsTArray<nsCSSKeyframesRule*>& aArray);
#endif
#ifdef DEBUG
void AssertQuirksChangeOK() {

2
layout/style/nsCSSRules.cpp
View File

@ -1664,7 +1664,6 @@ nsCSSFontFaceRule::GetDesc(nsCSSFontDesc aDescID, nsCSSValue & aValue)
aValue = mDecl.*nsCSSFontFaceStyleDecl::Fields[aDescID];
}
#ifdef MOZ_CSS_ANIMATIONS
// -------------------------------------------
// nsCSSKeyframeStyleDeclaration
//
@ -2087,4 +2086,3 @@ nsCSSKeyframesRule::UseForPresentation(nsPresContext* aPresContext,
return PR_FALSE;
}
#endif

4
layout/style/nsCSSRules.h
View File

@ -47,10 +47,8 @@
#include "nsIDOMCSSMediaRule.h"
#include "nsIDOMCSSMozDocumentRule.h"
#include "nsIDOMCSSFontFaceRule.h"
#ifdef MOZ_CSS_ANIMATIONS
#include "nsIDOMMozCSSKeyframeRule.h"
#include "nsIDOMMozCSSKeyframesRule.h"
#endif
#include "nsIDOMCSSStyleDeclaration.h"
#include "nsICSSRuleList.h"
#include "nsAutoPtr.h"
@ -313,7 +311,6 @@ private:
} // namespace css
} // namespace mozilla
#ifdef MOZ_CSS_ANIMATIONS
class nsCSSKeyframeRule;
class NS_FINAL_CLASS nsCSSKeyframeStyleDeclaration
@ -436,6 +433,5 @@ private:
nsString mName;
};
#endif
#endif /* !defined(nsCSSRules_h_) */

4
layout/style/nsComputedDOMStyle.cpp
View File

@ -4001,7 +4001,6 @@ nsComputedDOMStyle::DoGetTransitionTimingFunction()
return valueList;
}
#ifdef MOZ_CSS_ANIMATIONS
nsIDOMCSSValue*
nsComputedDOMStyle::DoGetAnimationName()
{
@ -4188,7 +4187,6 @@ nsComputedDOMStyle::DoGetAnimationPlayState()
return valueList;
}
#endif
#define COMPUTED_STYLE_MAP_ENTRY(_prop, _method) \
{ eCSSProperty_##_prop, &nsComputedDOMStyle::DoGet##_method, PR_FALSE }
@ -4333,7 +4331,6 @@ nsComputedDOMStyle::GetQueryablePropertyMap(PRUint32* aLength)
* Implementations of -moz- styles *
\* ******************************* */
#ifdef MOZ_CSS_ANIMATIONS
COMPUTED_STYLE_MAP_ENTRY(animation_delay, AnimationDelay),
COMPUTED_STYLE_MAP_ENTRY(animation_direction, AnimationDirection),
COMPUTED_STYLE_MAP_ENTRY(animation_duration, AnimationDuration),
@ -4342,7 +4339,6 @@ nsComputedDOMStyle::GetQueryablePropertyMap(PRUint32* aLength)
COMPUTED_STYLE_MAP_ENTRY(animation_name, AnimationName),
COMPUTED_STYLE_MAP_ENTRY(animation_play_state, AnimationPlayState),
COMPUTED_STYLE_MAP_ENTRY(animation_timing_function, AnimationTimingFunction),
#endif
COMPUTED_STYLE_MAP_ENTRY(appearance, Appearance),
COMPUTED_STYLE_MAP_ENTRY(_moz_background_inline_policy, BackgroundInlinePolicy),
COMPUTED_STYLE_MAP_ENTRY(binding, Binding),

2
layout/style/nsComputedDOMStyle.h
View File

@ -371,7 +371,6 @@ private:
nsIDOMCSSValue* DoGetTransitionDelay();
nsIDOMCSSValue* DoGetTransitionTimingFunction();
#ifdef MOZ_CSS_ANIMATIONS
/* CSS Animations */
nsIDOMCSSValue* DoGetAnimationName();
nsIDOMCSSValue* DoGetAnimationDuration();
@ -381,7 +380,6 @@ private:
nsIDOMCSSValue* DoGetAnimationFillMode();
nsIDOMCSSValue* DoGetAnimationIterationCount();
nsIDOMCSSValue* DoGetAnimationPlayState();
#endif
/* SVG properties */
nsIDOMCSSValue* DoGetFill();

4
layout/style/nsRuleNode.cpp
View File

@ -3610,7 +3610,6 @@ static const TransitionPropInfo transitionPropInfo[4] = {
&nsStyleDisplay::mTransitionTimingFunctionCount },
};
#ifdef MOZ_CSS_ANIMATIONS
// Each property's index in this array must match its index in the
// mutable array |animationPropData| below.
static const TransitionPropInfo animationPropInfo[8] = {
@ -3631,7 +3630,6 @@ static const TransitionPropInfo animationPropInfo[8] = {
{ eCSSProperty_animation_iteration_count,
&nsStyleDisplay::mAnimationIterationCountCount },
};
#endif
// Information about each transition or animation property that changes
// during ComputeDisplayData.
@ -3927,7 +3925,6 @@ nsRuleNode::ComputeDisplayData(void* aStartStruct,
}
}
#ifdef MOZ_CSS_ANIMATIONS
// Each property's index in this array must match its index in the
// const array |animationPropInfo| above.
TransitionPropData animationPropData[8];
@ -4171,7 +4168,6 @@ nsRuleNode::ComputeDisplayData(void* aStartStruct,
}
}
}
#endif
// opacity: factor, inherit, initial
SetFactor(*aRuleData->ValueForOpacity(), display->mOpacity, canStoreInRuleTree,

14
layout/style/nsStyleSet.cpp
View File

@ -59,9 +59,7 @@
#include "nsContentUtils.h"
#include "nsRuleProcessorData.h"
#include "nsTransitionManager.h"
#ifdef MOZ_CSS_ANIMATIONS
#include "nsAnimationManager.h"
#endif
#include "nsEventStates.h"
#include "mozilla/dom/Element.h"
@ -120,9 +118,7 @@ nsStyleSet::Init(nsPresContext *aPresContext)
return NS_ERROR_OUT_OF_MEMORY;
}
#ifdef MOZ_CSS_ANIMATIONS
GatherRuleProcessors(eAnimationSheet);
#endif
GatherRuleProcessors(eTransitionSheet);
return NS_OK;
@ -203,7 +199,6 @@ nsStyleSet::GatherRuleProcessors(sheetType aType)
//don't regather if this level is disabled
return NS_OK;
}
#ifdef MOZ_CSS_ANIMATIONS
if (aType == eAnimationSheet) {
// We have no sheet for the animations level; just a rule
// processor. (XXX: We should probably do this for the other
@ -211,7 +206,6 @@ nsStyleSet::GatherRuleProcessors(sheetType aType)
mRuleProcessors[aType] = PresContext()->AnimationManager();
return NS_OK;
}
#endif
if (aType == eTransitionSheet) {
// We have no sheet for the transitions level; just a rule
// processor. (XXX: We should probably do this for the other
@ -588,7 +582,6 @@ nsStyleSet::GetContext(nsStyleContext* aParentContext,
NS_ASSERTION(result->GetPseudo() == aPseudoTag, "Unexpected pseudo");
}
#ifdef MOZ_CSS_ANIMATIONS
if (aDoAnimations) {
// Normally the animation manager has already added the correct
// style rule. However, if the animation-name just changed, it
@ -616,7 +609,6 @@ nsStyleSet::GetContext(nsStyleContext* aParentContext,
aPseudoTag, aPseudoType, PR_FALSE, nsnull);
}
}
#endif
if (aElementForAnimation && aElementForAnimation->IsHTML(nsGkAtoms::body) &&
aPseudoType == nsCSSPseudoElements::ePseudo_NotPseudoElement &&
@ -782,11 +774,9 @@ nsStyleSet::FileRules(nsIStyleRuleProcessor::EnumFunc aCollectorFunc,
}
#endif
#ifdef MOZ_CSS_ANIMATIONS
// This needs to match IsMoreSpecificThanAnimation() above.
aRuleWalker->SetLevel(eAnimationSheet, PR_FALSE, PR_FALSE);
(*aCollectorFunc)(mRuleProcessors[eAnimationSheet], aData);
#endif
#ifdef DEBUG
AssertNoCSSRules(lastPresHintRN, lastUserRN);
@ -860,9 +850,7 @@ nsStyleSet::WalkRuleProcessors(nsIStyleRuleProcessor::EnumFunc aFunc,
(*aFunc)(mRuleProcessors[eStyleAttrSheet], aData);
if (mRuleProcessors[eOverrideSheet])
(*aFunc)(mRuleProcessors[eOverrideSheet], aData);
#ifdef MOZ_CSS_ANIMATIONS
(*aFunc)(mRuleProcessors[eAnimationSheet], aData);
#endif
(*aFunc)(mRuleProcessors[eTransitionSheet], aData);
}
@ -1219,7 +1207,6 @@ nsStyleSet::AppendFontFaceRules(nsPresContext* aPresContext,
return PR_TRUE;
}
#ifdef MOZ_CSS_ANIMATIONS
PRBool
nsStyleSet::AppendKeyframesRules(nsPresContext* aPresContext,
nsTArray<nsCSSKeyframesRule*>& aArray)
@ -1234,7 +1221,6 @@ nsStyleSet::AppendKeyframesRules(nsPresContext* aPresContext,
}
return PR_TRUE;
}
#endif
void
nsStyleSet::BeginShutdown(nsPresContext* aPresContext)

6
layout/style/nsStyleSet.h
View File

@ -60,9 +60,7 @@
class nsIURI;
class nsCSSFontFaceRule;
#ifdef MOZ_CSS_ANIMATIONS
class nsCSSKeyframesRule;
#endif
class nsRuleWalker;
struct RuleProcessorData;
struct TreeMatchContext;
@ -174,12 +172,10 @@ class nsStyleSet
PRBool AppendFontFaceRules(nsPresContext* aPresContext,
nsTArray<nsFontFaceRuleContainer>& aArray);
#ifdef MOZ_CSS_ANIMATIONS
// Append all the currently-active keyframes rules to aArray. Return
// true for success and false for failure.
PRBool AppendKeyframesRules(nsPresContext* aPresContext,
nsTArray<nsCSSKeyframesRule*>& aArray);
#endif
// Begin ignoring style context destruction, to avoid lots of unnecessary
// work on document teardown.
@ -243,9 +239,7 @@ class nsStyleSet
eDocSheet, // CSS
eStyleAttrSheet,
eOverrideSheet, // CSS
#ifdef MOZ_CSS_ANIMATIONS
eAnimationSheet,
#endif
eTransitionSheet,
eSheetTypeCount
// be sure to keep the number of bits in |mDirty| below and in

6
layout/style/nsStyleStruct.cpp
View File

@ -1979,7 +1979,6 @@ void nsTransition::SetUnknownProperty(const nsAString& aUnknownProperty)
mUnknownProperty = do_GetAtom(aUnknownProperty);
}
#ifdef MOZ_CSS_ANIMATIONS
nsAnimation::nsAnimation(const nsAnimation& aCopy)
: mTimingFunction(aCopy.mTimingFunction)
, mDuration(aCopy.mDuration)
@ -2004,7 +2003,6 @@ nsAnimation::SetInitialValues()
mPlayState = NS_STYLE_ANIMATION_PLAY_STATE_RUNNING;
mIterationCount = 1.0f;
}
#endif
nsStyleDisplay::nsStyleDisplay()
{
@ -2037,7 +2035,6 @@ nsStyleDisplay::nsStyleDisplay()
mTransitionDelayCount = 1;
mTransitionPropertyCount = 1;
#ifdef MOZ_CSS_ANIMATIONS
mAnimations.AppendElement();
NS_ABORT_IF_FALSE(mAnimations.Length() == 1,
"appending within auto buffer should never fail");
@ -2050,7 +2047,6 @@ nsStyleDisplay::nsStyleDisplay()
mAnimationFillModeCount = 1;
mAnimationPlayStateCount = 1;
mAnimationIterationCountCount = 1;
#endif
}
nsStyleDisplay::nsStyleDisplay(const nsStyleDisplay& aSource)
@ -2059,7 +2055,6 @@ nsStyleDisplay::nsStyleDisplay(const nsStyleDisplay& aSource)
, mTransitionDurationCount(aSource.mTransitionDurationCount)
, mTransitionDelayCount(aSource.mTransitionDelayCount)
, mTransitionPropertyCount(aSource.mTransitionPropertyCount)
#ifdef MOZ_CSS_ANIMATIONS
, mAnimations(aSource.mAnimations)
, mAnimationTimingFunctionCount(aSource.mAnimationTimingFunctionCount)
, mAnimationDurationCount(aSource.mAnimationDurationCount)
@ -2069,7 +2064,6 @@ nsStyleDisplay::nsStyleDisplay(const nsStyleDisplay& aSource)
, mAnimationFillModeCount(aSource.mAnimationFillModeCount)
, mAnimationPlayStateCount(aSource.mAnimationPlayStateCount)
, mAnimationIterationCountCount(aSource.mAnimationIterationCountCount)
#endif
{
MOZ_COUNT_CTOR(nsStyleDisplay);
mAppearance = aSource.mAppearance;

4
layout/style/nsStyleStruct.h
View File

@ -1411,7 +1411,6 @@ private:
// eCSSProperty_UNKNOWN
};
#ifdef MOZ_CSS_ANIMATIONS
struct nsAnimation {
nsAnimation() { /* leaves uninitialized; see also SetInitialValues */ }
explicit nsAnimation(const nsAnimation& aCopy);
@ -1452,7 +1451,6 @@ private:
PRUint8 mPlayState;
float mIterationCount; // NS_IEEEPositiveInfinity() means infinite
};
#endif
struct nsStyleDisplay {
nsStyleDisplay();
@ -1510,7 +1508,6 @@ struct nsStyleDisplay {
mTransitionDelayCount,
mTransitionPropertyCount;
#ifdef MOZ_CSS_ANIMATIONS
nsAutoTArray<nsAnimation, 1> mAnimations; // [reset]
// The number of elements in mAnimations that are not from repeating
// a list due to another property being longer.
@ -1522,7 +1519,6 @@ struct nsStyleDisplay {
mAnimationFillModeCount,
mAnimationPlayStateCount,
mAnimationIterationCountCount;
#endif
PRBool IsBlockInside() const {
return NS_STYLE_DISPLAY_BLOCK == mDisplay ||

9
layout/style/test/Makefile.in
View File

@ -82,6 +82,7 @@ GARBAGE += css_properties.js
_TEST_FILES = test_acid3_test46.html \
test_animations.html \
test_any_dynamic.html \
test_at_rule_parse_serialize.html \
test_bug73586.html \
@ -142,6 +143,7 @@ _TEST_FILES = test_acid3_test46.html \
test_inherit_storage.html \
test_initial_computation.html \
test_initial_storage.html \
test_keyframes_rules.html \
test_media_queries.html \
test_media_queries_dynamic.html \
test_media_queries_dynamic_xbl.html \
@ -219,13 +221,6 @@ _TEST_FILES = test_acid3_test46.html \
visited_image_loading_frame_empty.html \
$(NULL)
ifdef MOZ_CSS_ANIMATIONS
_TEST_FILES += \
test_animations.html \
test_keyframes_rules.html \
$(NULL)
endif
_VISITED_REFTEST_FILES = \
$(shell find $(topsrcdir)/layout/reftests/css-visited/ -name '*.html' -o -name '*.xhtml') \
$(topsrcdir)/layout/reftests/svg/pseudo-classes-02.svg \

6
widget/public/nsGUIEvent.h
View File

@ -103,9 +103,7 @@ class nsHashKey;
#define NS_COMMAND_EVENT 24
#define NS_SCROLLAREA_EVENT 25
#define NS_TRANSITION_EVENT 26
#ifdef MOZ_CSS_ANIMATIONS
#define NS_ANIMATION_EVENT 27
#endif
#define NS_UI_EVENT 28
#define NS_SVG_EVENT 30
@ -501,12 +499,10 @@ class nsHashKey;
#define NS_TRANSITION_EVENT_START 4200
#define NS_TRANSITION_END (NS_TRANSITION_EVENT_START)
#ifdef MOZ_CSS_ANIMATIONS
#define NS_ANIMATION_EVENT_START 4250
#define NS_ANIMATION_START (NS_ANIMATION_EVENT_START)
#define NS_ANIMATION_END (NS_ANIMATION_EVENT_START + 1)
#define NS_ANIMATION_ITERATION (NS_ANIMATION_EVENT_START + 2)
#endif
#ifdef MOZ_SMIL
#define NS_SMIL_TIME_EVENT_START 4300
@ -1536,7 +1532,6 @@ public:
float elapsedTime;
};
#ifdef MOZ_CSS_ANIMATIONS
class nsAnimationEvent : public nsEvent
{
public:
@ -1550,7 +1545,6 @@ public:
nsString animationName;
float elapsedTime;
};
#endif
class nsUIStateChangeEvent : public nsGUIEvent
{