summaryrefslogtreecommitdiffstats
path: root/dom
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2020-02-08 23:23:20 -0500
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-04-14 12:41:31 +0200
commitfe6730c2192a27c73f80c9696a0ceeba6b9dd809 (patch)
treed1c91be64ce6b9e4f4f6b1b1dc7001b0f852b6bf /dom
parent2e44ddb15ec960fb92e9458195041cbddc74f6ef (diff)
downloadUXP-fe6730c2192a27c73f80c9696a0ceeba6b9dd809.tar
UXP-fe6730c2192a27c73f80c9696a0ceeba6b9dd809.tar.gz
UXP-fe6730c2192a27c73f80c9696a0ceeba6b9dd809.tar.lz
UXP-fe6730c2192a27c73f80c9696a0ceeba6b9dd809.tar.xz
UXP-fe6730c2192a27c73f80c9696a0ceeba6b9dd809.zip
Issue #80 - Stop building non-generated dom/binding files as UNIFIED_SOURCES
Also fix deprot
Diffstat (limited to 'dom')
-rw-r--r--dom/bindings/WebIDLGlobalNameHash.cpp4
-rw-r--r--dom/bindings/WebIDLGlobalNameHash.h1
-rw-r--r--dom/bindings/moz.build2
-rw-r--r--dom/bindings/nsScriptError.h5
-rw-r--r--dom/bindings/nsScriptErrorWithStack.cpp4
5 files changed, 13 insertions, 3 deletions
diff --git a/dom/bindings/WebIDLGlobalNameHash.cpp b/dom/bindings/WebIDLGlobalNameHash.cpp
index 7477b52e7..981a1a395 100644
--- a/dom/bindings/WebIDLGlobalNameHash.cpp
+++ b/dom/bindings/WebIDLGlobalNameHash.cpp
@@ -4,8 +4,12 @@
* 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/. */
+#include "jswrapper.h"
#include "WebIDLGlobalNameHash.h"
#include "js/GCAPI.h"
+#include "XrayWrapper.h"
+#include "XPCWrapper.h"
+#include "mozilla/dom/Selection.h"
#include "mozilla/HashFunctions.h"
#include "mozilla/Maybe.h"
#include "mozilla/dom/DOMJSProxyHandler.h"
diff --git a/dom/bindings/WebIDLGlobalNameHash.h b/dom/bindings/WebIDLGlobalNameHash.h
index bbe015395..cd7be2c69 100644
--- a/dom/bindings/WebIDLGlobalNameHash.h
+++ b/dom/bindings/WebIDLGlobalNameHash.h
@@ -8,6 +8,7 @@
#define mozilla_dom_WebIDLGlobalNameHash_h__
#include "js/RootingAPI.h"
+#include "nsString.h"
#include "nsTArray.h"
namespace mozilla {
diff --git a/dom/bindings/moz.build b/dom/bindings/moz.build
index ed8a4d37e..ca82b48a8 100644
--- a/dom/bindings/moz.build
+++ b/dom/bindings/moz.build
@@ -89,7 +89,7 @@ LOCAL_INCLUDES += [
'/media/webrtc/signaling/src/peerconnection',
]
-UNIFIED_SOURCES += [
+SOURCES += [
'BindingUtils.cpp',
'CallbackInterface.cpp',
'CallbackObject.cpp',
diff --git a/dom/bindings/nsScriptError.h b/dom/bindings/nsScriptError.h
index b8049d0a0..ac8099c1c 100644
--- a/dom/bindings/nsScriptError.h
+++ b/dom/bindings/nsScriptError.h
@@ -14,8 +14,13 @@
#include "jsapi.h"
#include "js/RootingAPI.h"
+#include "jswrapper.h"
+#include "nsCOMArray.h"
+#include "nsContentUtils.h"
+#include "nsCycleCollectionParticipant.h"
#include "nsIScriptError.h"
#include "nsString.h"
+#include "nsStringFwd.h"
class nsScriptErrorNote final : public nsIScriptErrorNote {
public:
diff --git a/dom/bindings/nsScriptErrorWithStack.cpp b/dom/bindings/nsScriptErrorWithStack.cpp
index 74c00999f..0a8df38b3 100644
--- a/dom/bindings/nsScriptErrorWithStack.cpp
+++ b/dom/bindings/nsScriptErrorWithStack.cpp
@@ -22,7 +22,7 @@ using namespace mozilla::dom;
namespace {
static nsCString
-FormatStackString(JSContext* cx, HandleObject aStack) {
+FormatStackString(JSContext* cx, JS::HandleObject aStack) {
JS::RootedString formattedStack(cx);
if (!JS::BuildStackString(cx, aStack, &formattedStack)) {
@@ -111,7 +111,7 @@ nsScriptErrorWithStack::ToString(nsACString& /*UTF8*/ aResult)
}
JSContext* cx = jsapi.cx();
- RootedObject stack(cx, mStack);
+ JS::RootedObject stack(cx, mStack);
nsCString stackString = FormatStackString(cx, stack);
nsCString combined = message + NS_LITERAL_CSTRING("\n") + stackString;
aResult.Assign(combined);