wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-22 15:17:29 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue #2490 - Part 20: Remove the stuff that was added temporarily to deal with a mix of WebIDL and non-WebIDL rules.

Browse source
This commit is contained in:
Moonchild 2024-04-04 20:07:33 +02:00 • committed by roytam1
commit 641b556c53
4 changed files with 0 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

26
dom/base/nsDOMClassInfo.cpp
View file

@ -67,7 +67,6 @@
#include "nsIDOMEventTarget.h" #include "nsIDOMEventTarget.h"
// CSS related includes // CSS related includes
#include "nsCSSRules.h"
#include "nsIDOMCSSRule.h" #include "nsIDOMCSSRule.h"
#include "nsMemory.h" #include "nsMemory.h"
@ -1890,31 +1889,6 @@ nsEventTargetSH::PreserveWrapper(nsISupports *aNative)
target->PreserveWrapper(aNative); target->PreserveWrapper(aNative);
} }
// CSS rule helper
NS_IMETHODIMP
nsCSSRuleSH::PreCreate(nsISupports *nativeObj, JSContext *cx,
JSObject *aGlobalObj, JSObject **parentObj)
{
JS::Rooted<JSObject*> globalObj(cx, aGlobalObj);
nsCOMPtr<nsIDOMCSSRule> rule = do_QueryInterface(nativeObj);
if (!rule) {
return NS_ERROR_UNEXPECTED;
}
css::Rule* cssRule = rule->GetCSSRule();
nsIDocument* doc = cssRule->GetDocument();
if (!doc) {
*parentObj = globalObj;
return NS_OK;
}
nsIGlobalObject* global = doc->GetScopeObject();
if (!global) {
return NS_ERROR_UNEXPECTED;
}
*parentObj = global->GetGlobalJSObject();
return *parentObj ? NS_OK : NS_ERROR_FAILURE;
}
// nsIDOMEventListener::HandleEvent() 'this' converter helper // nsIDOMEventListener::HandleEvent() 'this' converter helper
NS_INTERFACE_MAP_BEGIN(nsEventListenerThisTranslator) NS_INTERFACE_MAP_BEGIN(nsEventListenerThisTranslator)

23
dom/base/nsDOMClassInfo.h
View file

@ -172,29 +172,6 @@ public:
} }
}; };
// Makes sure that we always create our wrapper in the right global, so we won't
// cache one from the wrong global.
class nsCSSRuleSH : public nsDOMGenericSH
{
protected:
explicit nsCSSRuleSH(nsDOMClassInfoData* aData) : nsDOMGenericSH(aData)
{
}
virtual ~nsCSSRuleSH()
{
}
public:
NS_IMETHOD PreCreate(nsISupports *nativeObj, JSContext *cx,
JSObject *globalObj, JSObject **parentObj) override;
static nsIClassInfo *doCreate(nsDOMClassInfoData* aData)
{
return new nsCSSRuleSH(aData);
}
};
// A place to hang some static methods that we should really consider // A place to hang some static methods that we should really consider
// moving to be nsGlobalWindow member methods. See bug 1062418. // moving to be nsGlobalWindow member methods. See bug 1062418.
class nsWindowSH class nsWindowSH

1
dom/bindings/Bindings.conf
View file

@ -265,7 +265,6 @@ DOMInterfaces = {
}, },
'CSSRule': { 'CSSRule': {
'hasXPConnectImpls': True,
'concrete': False, 'concrete': False,
'nativeType': 'mozilla::css::Rule' 'nativeType': 'mozilla::css::Rule'
}, },

9
layout/style/Rule.h
View file

@ -19,11 +19,6 @@ struct nsRuleData;
template<class T> struct already_AddRefed; template<class T> struct already_AddRefed;
class nsHTMLCSSStyleSheet; class nsHTMLCSSStyleSheet;
// Temporary IID for the nsIDOMCSSRule interface {ebb427f1-a935-480b-bd9b-bb0e3bd387a9}
#define NS_IDOM_CSSRULE_IID \
{ 0xebb427f1, 0xa935, 0x480b, \
{ 0xbd, 0x9b, 0xbb, 0x0e, 0x3b, 0xd3, 0x87, 0xa9 } }
namespace mozilla { namespace mozilla {
namespace css { namespace css {
class GroupRule; class GroupRule;
@ -51,8 +46,6 @@ protected:
virtual ~Rule() {} virtual ~Rule() {}
public: public:
NS_DECLARE_STATIC_IID_ACCESSOR(NS_IDOM_CSSRULE_IID)
NS_DECL_CYCLE_COLLECTING_ISUPPORTS NS_DECL_CYCLE_COLLECTING_ISUPPORTS
NS_DECL_CYCLE_COLLECTION_SKIPPABLE_SCRIPT_HOLDER_CLASS(Rule) NS_DECL_CYCLE_COLLECTION_SKIPPABLE_SCRIPT_HOLDER_CLASS(Rule)
// Return true if this rule is known to be a cycle collection leaf, in the // Return true if this rule is known to be a cycle collection leaf, in the
@ -145,8 +138,6 @@ protected:
uint32_t mColumnNumber; uint32_t mColumnNumber;
}; };
NS_DEFINE_STATIC_IID_ACCESSOR(Rule, NS_IDOM_CSSRULE_IID)
} // namespace css } // namespace css
} // namespace mozilla } // namespace mozilla