diff options
author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-02-03 08:34:08 +0100 |
---|---|---|
committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-02-03 08:34:08 +0100 |
commit | 9a8a050294414a7d248a4ec872744b43e1b9bfb1 (patch) | |
tree | 15da5ed8e56d99d3061cba56b9c253895af1849b /js/xpconnect/src | |
parent | fa311a4cae5ea526e848adc4f49c6aa0b700702c (diff) | |
parent | e4a3b28c805e9419a076e1cdbe54056cfdcd3b41 (diff) | |
download | UXP-9a8a050294414a7d248a4ec872744b43e1b9bfb1.tar UXP-9a8a050294414a7d248a4ec872744b43e1b9bfb1.tar.gz UXP-9a8a050294414a7d248a4ec872744b43e1b9bfb1.tar.lz UXP-9a8a050294414a7d248a4ec872744b43e1b9bfb1.tar.xz UXP-9a8a050294414a7d248a4ec872744b43e1b9bfb1.zip |
Merge branch 'cycle_collector-work'
Diffstat (limited to 'js/xpconnect/src')
-rw-r--r-- | js/xpconnect/src/Sandbox.cpp | 1 | ||||
-rw-r--r-- | js/xpconnect/src/nsScriptErrorWithStack.cpp | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/js/xpconnect/src/Sandbox.cpp b/js/xpconnect/src/Sandbox.cpp index 120772ed2..a516cf73f 100644 --- a/js/xpconnect/src/Sandbox.cpp +++ b/js/xpconnect/src/Sandbox.cpp @@ -66,7 +66,6 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(SandboxPrivate) NS_IMPL_CYCLE_COLLECTION_UNLINK_END NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(SandboxPrivate) - NS_IMPL_CYCLE_COLLECTION_TRAVERSE_SCRIPT_OBJECTS tmp->TraverseHostObjectURIs(cb); NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END diff --git a/js/xpconnect/src/nsScriptErrorWithStack.cpp b/js/xpconnect/src/nsScriptErrorWithStack.cpp index edc12fa76..50407da23 100644 --- a/js/xpconnect/src/nsScriptErrorWithStack.cpp +++ b/js/xpconnect/src/nsScriptErrorWithStack.cpp @@ -45,7 +45,6 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsScriptErrorWithStack) NS_IMPL_CYCLE_COLLECTION_UNLINK_END NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsScriptErrorWithStack) - NS_IMPL_CYCLE_COLLECTION_TRAVERSE_SCRIPT_OBJECTS NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN(nsScriptErrorWithStack) |