diff options
| author | athenian200 <athenian200@outlook.com> | 2020-01-27 22:59:08 -0600 |
|---|---|---|
| committer | athenian200 <athenian200@outlook.com> | 2020-01-27 22:59:08 -0600 |
| commit | 3c4f414db74b84f7d2a6fb13fd888a47a153699b (patch) | |
| tree | ea81fca559849967a79d598a6f460830762ec9ea /dom/xul/nsXULElement.h | |
| parent | 1f8d508258ac5d7d57fc4eb35cac90f28bc8ca03 (diff) | |
| parent | c4b0715baaffc541670fd1158557aa7e61e521d3 (diff) | |
| download | UXP-3c4f414db74b84f7d2a6fb13fd888a47a153699b.tar UXP-3c4f414db74b84f7d2a6fb13fd888a47a153699b.tar.gz UXP-3c4f414db74b84f7d2a6fb13fd888a47a153699b.tar.lz UXP-3c4f414db74b84f7d2a6fb13fd888a47a153699b.tar.xz UXP-3c4f414db74b84f7d2a6fb13fd888a47a153699b.zip | |
Merge branch 'master' of https://github.com/MoonchildProductions/UXP into form-disabled-issue
Diffstat (limited to 'dom/xul/nsXULElement.h')
| -rw-r--r-- | dom/xul/nsXULElement.h | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/dom/xul/nsXULElement.h b/dom/xul/nsXULElement.h index 164afacd3..80424412f 100644 --- a/dom/xul/nsXULElement.h +++ b/dom/xul/nsXULElement.h @@ -609,19 +609,6 @@ protected: nsresult AddPopupListener(nsIAtom* aName); - class nsXULSlots : public mozilla::dom::Element::nsDOMSlots - { - public: - nsXULSlots(); - virtual ~nsXULSlots(); - - void Traverse(nsCycleCollectionTraversalCallback &cb); - - nsCOMPtr<nsISupports> mFrameLoaderOrOpener; - }; - - virtual nsINode::nsSlots* CreateSlots() override; - nsresult LoadSrc(); /** @@ -677,8 +664,8 @@ protected: // Internal accessor. This shadows the 'Slots', and returns // appropriate value. nsIControllers *Controllers() { - nsDOMSlots* slots = GetExistingDOMSlots(); - return slots ? slots->mControllers : nullptr; + nsExtendedDOMSlots* slots = GetExistingExtendedDOMSlots(); + return slots ? slots->mControllers.get() : nullptr; } void UnregisterAccessKey(const nsAString& aOldValue); |