diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp index c084247c6b9e..7fbe2fc997a8 100644 --- a/dom/base/nsDOMClassInfo.cpp +++ b/dom/base/nsDOMClassInfo.cpp @@ -74,13 +74,13 @@ #include "nsMemory.h" // includes needed for the prototype chain interfaces +#include "nsIDOMCSSKeyframeRule.h" +#include "nsIDOMCSSKeyframesRule.h" #include "nsIDOMCSSImportRule.h" #include "nsIDOMCSSMediaRule.h" #include "nsIDOMCSSFontFaceRule.h" #include "nsIDOMCSSMozDocumentRule.h" #include "nsIDOMCSSSupportsRule.h" -#include "nsIDOMMozCSSKeyframeRule.h" -#include "nsIDOMMozCSSKeyframesRule.h" #include "nsIDOMCSSCounterStyleRule.h" #include "nsIDOMCSSPageRule.h" #include "nsIDOMCSSStyleRule.h" @@ -248,9 +248,9 @@ static nsDOMClassInfoData sClassInfoData[] = { DOM_DEFAULT_SCRIPTABLE_FLAGS) - NS_DEFINE_CLASSINFO_DATA(MozCSSKeyframeRule, nsDOMGenericSH, + NS_DEFINE_CLASSINFO_DATA(CSSKeyframeRule, nsDOMGenericSH, DOM_DEFAULT_SCRIPTABLE_FLAGS) - NS_DEFINE_CLASSINFO_DATA(MozCSSKeyframesRule, nsDOMGenericSH, + NS_DEFINE_CLASSINFO_DATA(CSSKeyframesRule, nsDOMGenericSH, DOM_DEFAULT_SCRIPTABLE_FLAGS) NS_DEFINE_CLASSINFO_DATA(CSSCounterStyleRule, nsDOMGenericSH, @@ -602,12 +602,12 @@ nsDOMClassInfo::Init() DOM_CLASSINFO_MAP_ENTRY(nsIMessageSender) DOM_CLASSINFO_MAP_END - DOM_CLASSINFO_MAP_BEGIN(MozCSSKeyframeRule, nsIDOMMozCSSKeyframeRule) - DOM_CLASSINFO_MAP_ENTRY(nsIDOMMozCSSKeyframeRule) + DOM_CLASSINFO_MAP_BEGIN(CSSKeyframeRule, nsIDOMCSSKeyframeRule) + DOM_CLASSINFO_MAP_ENTRY(nsIDOMCSSKeyframeRule) DOM_CLASSINFO_MAP_END - DOM_CLASSINFO_MAP_BEGIN(MozCSSKeyframesRule, nsIDOMMozCSSKeyframesRule) - DOM_CLASSINFO_MAP_ENTRY(nsIDOMMozCSSKeyframesRule) + DOM_CLASSINFO_MAP_BEGIN(CSSKeyframesRule, nsIDOMCSSKeyframesRule) + DOM_CLASSINFO_MAP_ENTRY(nsIDOMCSSKeyframesRule) DOM_CLASSINFO_MAP_END DOM_CLASSINFO_MAP_BEGIN(CSSCounterStyleRule, nsIDOMCSSCounterStyleRule) diff --git a/dom/base/nsDOMClassInfoClasses.h b/dom/base/nsDOMClassInfoClasses.h index 0fcd0e4ebf90..53a065070e41 100644 --- a/dom/base/nsDOMClassInfoClasses.h +++ b/dom/base/nsDOMClassInfoClasses.h @@ -40,8 +40,8 @@ DOMCI_CLASS(ContentProcessMessageManager) DOMCI_CLASS(ChromeMessageBroadcaster) DOMCI_CLASS(ChromeMessageSender) -DOMCI_CLASS(MozCSSKeyframeRule) -DOMCI_CLASS(MozCSSKeyframesRule) +DOMCI_CLASS(CSSKeyframeRule) +DOMCI_CLASS(CSSKeyframesRule) // @counter-style in CSS DOMCI_CLASS(CSSCounterStyleRule) diff --git a/dom/interfaces/base/domstubs.idl b/dom/interfaces/base/domstubs.idl index 165c19d8da53..4422b791e769 100644 --- a/dom/interfaces/base/domstubs.idl +++ b/dom/interfaces/base/domstubs.idl @@ -61,7 +61,7 @@ interface nsIDOMCSSValue; interface nsIDOMCSSPrimitiveValue; interface nsIDOMCSSRule; interface nsIDOMCSSRuleList; -interface nsIDOMMozCSSKeyframeRule; +interface nsIDOMCSSKeyframeRule; interface nsIDOMCSSFontFeatureValuesRule; interface nsIDOMCSSStyleSheet; interface nsIDOMCSSStyleDeclaration; diff --git a/dom/interfaces/css/moz.build b/dom/interfaces/css/moz.build index 405f48a87768..afb84ce7ddce 100644 --- a/dom/interfaces/css/moz.build +++ b/dom/interfaces/css/moz.build @@ -12,6 +12,8 @@ XPIDL_SOURCES += [ 'nsIDOMCSSFontFeatureValuesRule.idl', 'nsIDOMCSSGroupingRule.idl', 'nsIDOMCSSImportRule.idl', + 'nsIDOMCSSKeyframeRule.idl', + 'nsIDOMCSSKeyframesRule.idl', 'nsIDOMCSSMediaRule.idl', 'nsIDOMCSSMozDocumentRule.idl', 'nsIDOMCSSPageRule.idl', @@ -26,8 +28,6 @@ XPIDL_SOURCES += [ 'nsIDOMCSSValue.idl', 'nsIDOMCSSValueList.idl', 'nsIDOMElementCSSInlineStyle.idl', - 'nsIDOMMozCSSKeyframeRule.idl', - 'nsIDOMMozCSSKeyframesRule.idl', 'nsIDOMRect.idl', ] diff --git a/dom/interfaces/css/nsIDOMMozCSSKeyframeRule.idl b/dom/interfaces/css/nsIDOMCSSKeyframeRule.idl similarity index 90% rename from dom/interfaces/css/nsIDOMMozCSSKeyframeRule.idl rename to dom/interfaces/css/nsIDOMCSSKeyframeRule.idl index 90927b4d5f66..46e7ffbb1004 100644 --- a/dom/interfaces/css/nsIDOMMozCSSKeyframeRule.idl +++ b/dom/interfaces/css/nsIDOMCSSKeyframeRule.idl @@ -6,7 +6,7 @@ #include "nsIDOMCSSRule.idl" [scriptable, uuid(a281a8b4-eaa2-49a8-8b97-acc2814a57c9)] -interface nsIDOMMozCSSKeyframeRule : nsIDOMCSSRule +interface nsIDOMCSSKeyframeRule : nsIDOMCSSRule { attribute DOMString keyText; readonly attribute nsIDOMCSSStyleDeclaration style; diff --git a/dom/interfaces/css/nsIDOMMozCSSKeyframesRule.idl b/dom/interfaces/css/nsIDOMCSSKeyframesRule.idl similarity index 84% rename from dom/interfaces/css/nsIDOMMozCSSKeyframesRule.idl rename to dom/interfaces/css/nsIDOMCSSKeyframesRule.idl index 46920633f165..acbb657e47d6 100644 --- a/dom/interfaces/css/nsIDOMMozCSSKeyframesRule.idl +++ b/dom/interfaces/css/nsIDOMCSSKeyframesRule.idl @@ -6,12 +6,12 @@ #include "nsIDOMCSSRule.idl" [scriptable, uuid(400f4b70-ad0a-4047-aba4-ee8019f6b907)] -interface nsIDOMMozCSSKeyframesRule : nsIDOMCSSRule +interface nsIDOMCSSKeyframesRule : nsIDOMCSSRule { attribute DOMString name; readonly attribute nsIDOMCSSRuleList cssRules; void appendRule(in DOMString rule); void deleteRule(in DOMString key); - nsIDOMMozCSSKeyframeRule findRule(in DOMString key); + nsIDOMCSSKeyframeRule findRule(in DOMString key); }; diff --git a/dom/tests/mochitest/general/test_interfaces.html b/dom/tests/mochitest/general/test_interfaces.html index 51c091a279e6..734c3bf6d21b 100644 --- a/dom/tests/mochitest/general/test_interfaces.html +++ b/dom/tests/mochitest/general/test_interfaces.html @@ -343,6 +343,10 @@ var interfaceNamesInGlobalScope = "CSSGroupingRule", // IMPORTANT: Do not change this list without review from a DOM peer! "CSSImportRule", +// IMPORTANT: Do not change this list without review from a DOM peer! + "CSSKeyframeRule", +// IMPORTANT: Do not change this list without review from a DOM peer! + "CSSKeyframesRule", // IMPORTANT: Do not change this list without review from a DOM peer! "CSSMediaRule", // IMPORTANT: Do not change this list without review from a DOM peer! @@ -801,10 +805,6 @@ var interfaceNamesInGlobalScope = {name: "mozContact", b2g: true, permission: "contacts-read"}, // IMPORTANT: Do not change this list without review from a DOM peer! {name: "MozContactChangeEvent", b2g: true, permission: "contacts-read"}, -// IMPORTANT: Do not change this list without review from a DOM peer! - "MozCSSKeyframeRule", -// IMPORTANT: Do not change this list without review from a DOM peer! - "MozCSSKeyframesRule", // IMPORTANT: Do not change this list without review from a DOM peer! {name: "MozEmergencyCbModeEvent", b2g: true}, // IMPORTANT: Do not change this list without review from a DOM peer! diff --git a/layout/style/nsCSSRules.cpp b/layout/style/nsCSSRules.cpp index ab6bbe5d9a35..a8322e9c94ad 100644 --- a/layout/style/nsCSSRules.cpp +++ b/layout/style/nsCSSRules.cpp @@ -2010,10 +2010,10 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END // QueryInterface implementation for nsCSSKeyframeRule NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsCSSKeyframeRule) - NS_INTERFACE_MAP_ENTRY(nsIDOMMozCSSKeyframeRule) + NS_INTERFACE_MAP_ENTRY(nsIDOMCSSKeyframeRule) NS_INTERFACE_MAP_ENTRY(nsIDOMCSSRule) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, mozilla::css::Rule) - NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(MozCSSKeyframeRule) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CSSKeyframeRule) NS_INTERFACE_MAP_END IMPL_STYLE_RULE_INHERIT_GET_DOM_RULE_WEAK(nsCSSKeyframeRule, Rule) @@ -2218,9 +2218,9 @@ NS_IMPL_RELEASE_INHERITED(nsCSSKeyframesRule, css::GroupRule) // QueryInterface implementation for nsCSSKeyframesRule NS_INTERFACE_MAP_BEGIN(nsCSSKeyframesRule) NS_INTERFACE_MAP_ENTRY(nsIDOMCSSRule) - NS_INTERFACE_MAP_ENTRY(nsIDOMMozCSSKeyframesRule) + NS_INTERFACE_MAP_ENTRY(nsIDOMCSSKeyframesRule) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, mozilla::css::Rule) - NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(MozCSSKeyframesRule) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CSSKeyframesRule) NS_INTERFACE_MAP_END_INHERITING(GroupRule) #ifdef DEBUG @@ -2411,7 +2411,7 @@ nsCSSKeyframesRule::DeleteRule(const nsAString& aKey) NS_IMETHODIMP nsCSSKeyframesRule::FindRule(const nsAString& aKey, - nsIDOMMozCSSKeyframeRule** aResult) + nsIDOMCSSKeyframeRule** aResult) { uint32_t index = FindRuleIndexForKey(aKey); if (index == RULE_NOT_FOUND) { diff --git a/layout/style/nsCSSRules.h b/layout/style/nsCSSRules.h index 1c0e2289407e..a5bd033b8c4f 100644 --- a/layout/style/nsCSSRules.h +++ b/layout/style/nsCSSRules.h @@ -31,8 +31,8 @@ #include "nsIDOMCSSMozDocumentRule.h" #include "nsIDOMCSSPageRule.h" #include "nsIDOMCSSSupportsRule.h" -#include "nsIDOMMozCSSKeyframeRule.h" -#include "nsIDOMMozCSSKeyframesRule.h" +#include "nsIDOMCSSKeyframeRule.h" +#include "nsIDOMCSSKeyframesRule.h" #include "nsTArray.h" class nsMediaList; @@ -375,7 +375,7 @@ protected: }; class nsCSSKeyframeRule final : public mozilla::css::Rule, - public nsIDOMMozCSSKeyframeRule + public nsIDOMCSSKeyframeRule { public: // Steals the contents of aKeys, and takes the reference in Declaration @@ -406,8 +406,8 @@ public: // nsIDOMCSSRule interface NS_DECL_NSIDOMCSSRULE - // nsIDOMMozCSSKeyframeRule interface - NS_DECL_NSIDOMMOZCSSKEYFRAMERULE + // nsIDOMCSSKeyframeRule interface + NS_DECL_NSIDOMCSSKEYFRAMERULE const nsTArray& GetKeys() const { return mKeys; } mozilla::css::Declaration* Declaration() { return mDeclaration; } @@ -426,7 +426,7 @@ private: }; class nsCSSKeyframesRule final : public mozilla::css::GroupRule, - public nsIDOMMozCSSKeyframesRule + public nsIDOMCSSKeyframesRule { public: nsCSSKeyframesRule(const nsSubstring& aName, @@ -459,8 +459,8 @@ public: // nsIDOMCSSRule interface NS_DECL_NSIDOMCSSRULE - // nsIDOMMozCSSKeyframesRule interface - NS_DECL_NSIDOMMOZCSSKEYFRAMESRULE + // nsIDOMCSSKeyframesRule interface + NS_DECL_NSIDOMCSSKEYFRAMESRULE // rest of GroupRule virtual bool UseForPresentation(nsPresContext* aPresContext,