From 43725c7264ca3f63de348d1d1596ce1fe9e64d2d Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 13 Jun 2020 08:21:48 -0400 Subject: Bug 1426494 - Share more code between nsIDocument and ShadowRoot Tag #1375 --- dom/xul/XULDocument.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'dom/xul/XULDocument.h') diff --git a/dom/xul/XULDocument.h b/dom/xul/XULDocument.h index 06abb797f..a5ed49704 100644 --- a/dom/xul/XULDocument.h +++ b/dom/xul/XULDocument.h @@ -148,6 +148,7 @@ public: using nsDocument::CreateElementNS; NS_FORWARD_NSIDOMDOCUMENT(XMLDocument::) // And explicitly import the things from nsDocument that we just shadowed + using mozilla::dom::DocumentOrShadowRoot::GetElementById; using nsDocument::GetImplementation; using nsDocument::GetTitle; using nsDocument::SetTitle; @@ -156,8 +157,8 @@ public: using nsDocument::GetMozFullScreenElement; using nsIDocument::GetLocation; - // nsDocument interface overrides - virtual Element* GetElementById(const nsAString & elementId) override; + // Helper for StyleScope::GetElementById. + Element* GetRefById(const nsAString & elementId); // nsIDOMXULDocument interface NS_DECL_NSIDOMXULDOCUMENT -- cgit v1.2.3 From c45b7ee3a985b2b4862fb182cdb34f644f737048 Mon Sep 17 00:00:00 2001 From: Moonchild Date: Tue, 30 Jun 2020 11:32:07 +0000 Subject: Issue #1603 - Part 1: Reorganize ScriptLoader/ScriptElement - Moves scripting parts of DOM into 'dom/script' - Renames nsScript{Loader/Element} to Script{Loader/Element} - Adjusts all callers --- dom/xul/XULDocument.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dom/xul/XULDocument.h') diff --git a/dom/xul/XULDocument.h b/dom/xul/XULDocument.h index a5ed49704..5c4dad42e 100644 --- a/dom/xul/XULDocument.h +++ b/dom/xul/XULDocument.h @@ -21,13 +21,13 @@ #include "nsCOMArray.h" #include "nsIURI.h" #include "nsIXULDocument.h" -#include "nsScriptLoader.h" #include "nsIStreamListener.h" #include "nsIStreamLoader.h" #include "nsICSSLoaderObserver.h" #include "nsIXULStore.h" #include "mozilla/Attributes.h" +#include "mozilla/dom/ScriptLoader.h" #include "js/TracingAPI.h" #include "js/TypeDecls.h" -- cgit v1.2.3