Bug 1515707 - Use NS_INTERFACE_MAP_END_INHERITING in some CSSStyleDeclaration implementations. r=Ehsan

This has no behavior change, since it just expands to
NS_IMPL_QUERY_TAIL_INHERITING, but it's clearer, and clang-format understands
it.

Also, these are the only uses of this macro, so I don't think we should make
clang-format understand it.

Differential Revision: https://phabricator.services.mozilla.com/D15125

--HG--
extra : moz-landing-system : lando

layout/style/CSSPageRule.cpp

@@ -31,8 +31,8 @@ NS_INTERFACE_MAP_BEGIN(CSSPageRuleDeclaration)
   if (aIID.Equals(NS_GET_IID(nsCycleCollectionISupports)) ||
       aIID.Equals(NS_GET_IID(nsXPCOMCycleCollectionParticipant))) {
     return Rule()->QueryInterface(aIID, aInstancePtr);
-  } else
-    NS_IMPL_QUERY_TAIL_INHERITING(nsDOMCSSDeclaration)
+  }
+NS_INTERFACE_MAP_END_INHERITING(nsDOMCSSDeclaration)
 
   NS_IMPL_ADDREF_USING_AGGREGATOR(CSSPageRuleDeclaration, Rule())
   NS_IMPL_RELEASE_USING_AGGREGATOR(CSSPageRuleDeclaration, Rule())

layout/style/CSSStyleRule.cpp

@@ -35,8 +35,8 @@ NS_INTERFACE_MAP_BEGIN(CSSStyleRuleDeclaration)
   if (aIID.Equals(NS_GET_IID(nsCycleCollectionISupports)) ||
       aIID.Equals(NS_GET_IID(nsXPCOMCycleCollectionParticipant))) {
     return Rule()->QueryInterface(aIID, aInstancePtr);
-  } else
-    NS_IMPL_QUERY_TAIL_INHERITING(nsDOMCSSDeclaration)
+  }
+NS_INTERFACE_MAP_END_INHERITING(nsDOMCSSDeclaration)
 
   NS_IMPL_ADDREF_USING_AGGREGATOR(CSSStyleRuleDeclaration, Rule())
   NS_IMPL_RELEASE_USING_AGGREGATOR(CSSStyleRuleDeclaration, Rule())

layout/style/nsDOMCSSAttrDeclaration.cpp

@@ -58,7 +58,7 @@ NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_THIS_END
 
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDOMCSSAttributeDeclaration)
   NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
-  NS_IMPL_QUERY_TAIL_INHERITING(nsDOMCSSDeclaration)
+NS_INTERFACE_MAP_END_INHERITING(nsDOMCSSDeclaration)
 
   NS_IMPL_CYCLE_COLLECTING_ADDREF(nsDOMCSSAttributeDeclaration)
   NS_IMPL_CYCLE_COLLECTING_RELEASE(nsDOMCSSAttributeDeclaration)