From 0633844f46858135ee62d396829c6292492ca117 Mon Sep 17 00:00:00 2001
From: Moonchild <moonchild@palemoon.org>
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/script/moz.build | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 dom/script/moz.build

(limited to 'dom/script/moz.build')

diff --git a/dom/script/moz.build b/dom/script/moz.build
new file mode 100644
index 000000000..063d15426
--- /dev/null
+++ b/dom/script/moz.build
@@ -0,0 +1,33 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+XPIDL_SOURCES += [
+    'nsIScriptLoaderObserver.idl',
+]
+
+XPIDL_MODULE = 'dom'
+
+EXPORTS += ['nsIScriptElement.h']
+
+EXPORTS.mozilla.dom += [
+    'ScriptElement.h',
+    'ScriptLoader.h',
+    'ScriptSettings.h',
+]
+
+SOURCES += [
+    'ScriptElement.cpp',
+    'ScriptLoader.cpp',
+    'ScriptSettings.cpp',
+]
+
+LOCAL_INCLUDES += [
+    '/dom/base',
+    '/dom/workers',
+]
+
+include('/ipc/chromium/chromium-config.mozbuild')
+
+FINAL_LIBRARY = 'xul'
-- 
cgit v1.2.3


From 5ffe27bb03d8ac7b979007721c2699e891c77268 Mon Sep 17 00:00:00 2001
From: Moonchild <moonchild@palemoon.org>
Date: Wed, 1 Jul 2020 10:15:24 +0000
Subject: Issue #1603 - Part 2: Split some classes out of ScriptLoader.cpp

This splits ScriptLoader up the same way Mozilla did with the exception of
ScriptRequest due to the fact that ScriptLoader and ScriptRequest are
interdependent and would create a circular dependency if split apart when not
using unified building.
---
 dom/script/moz.build | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'dom/script/moz.build')

diff --git a/dom/script/moz.build b/dom/script/moz.build
index 063d15426..280850ed4 100644
--- a/dom/script/moz.build
+++ b/dom/script/moz.build
@@ -18,8 +18,11 @@ EXPORTS.mozilla.dom += [
 ]
 
 SOURCES += [
+    'ModuleLoadRequest.cpp',
+    'ModuleScript.cpp',
     'ScriptElement.cpp',
     'ScriptLoader.cpp',
+    'ScriptLoadHandler.cpp',
     'ScriptSettings.cpp',
 ]
 
-- 
cgit v1.2.3