diff --git a/gfx/vr/moz.build b/gfx/vr/moz.build index fbed022afd76..8c9ee8aa20f3 100644 --- a/gfx/vr/moz.build +++ b/gfx/vr/moz.build @@ -69,13 +69,6 @@ else: 'service', ] -# Only target x64 for vrhost -if CONFIG['OS_ARCH'] == 'WINNT': - if CONFIG['HAVE_64BIT_BUILD']: - DIRS += [ - 'vrhost' - ] - IPDL_SOURCES = [ 'ipc/PVR.ipdl', 'ipc/PVRGPU.ipdl', diff --git a/gfx/vr/vrhost/moz.build b/gfx/vr/vrhost/moz.build deleted file mode 100644 index f9fc455e7c65..000000000000 --- a/gfx/vr/vrhost/moz.build +++ /dev/null @@ -1,22 +0,0 @@ -# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- -# vim: set filetype=python: -# 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/. - -SOURCES += [ - 'vrhost.cpp' -] - -EXPORTS.vrhost = [ - 'vrhostex.h' -] - -DEFFILE = 'vrhost.def' - -DIRS += [ - 'testhost' -] - -# Use SharedLibrary to generate the dll -SharedLibrary('vrhost') \ No newline at end of file diff --git a/gfx/vr/vrhost/testhost/moz.build b/gfx/vr/vrhost/testhost/moz.build deleted file mode 100644 index 7cb497c7d067..000000000000 --- a/gfx/vr/vrhost/testhost/moz.build +++ /dev/null @@ -1,16 +0,0 @@ -# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- -# vim: set filetype=python: -# 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/. - -SOURCES += [ - 'testhost.cpp' -] - -USE_LIBS += [ - 'vrhost' -] - -# Use Progam to generate the executable -Program('vrtesthost') \ No newline at end of file diff --git a/gfx/vr/vrhost/testhost/testhost.cpp b/gfx/vr/vrhost/testhost/testhost.cpp deleted file mode 100644 index dc44f03eb5f6..000000000000 --- a/gfx/vr/vrhost/testhost/testhost.cpp +++ /dev/null @@ -1,23 +0,0 @@ -/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* vim: set ts=8 sts=2 et sw=2 tw=80: */ -/* 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/. */ - -#include -#include "vrhost/vrhostex.h" - -int main() { - HINSTANCE hVR = ::LoadLibrary("vrhost.dll"); - if (hVR != nullptr) { - PFN_SAMPLE lpfnSample = (PFN_SAMPLE)GetProcAddress(hVR, "SampleExport"); - if (lpfnSample != nullptr) { - lpfnSample(); - } - - ::FreeLibrary(hVR); - hVR = nullptr; - } - - return 0; -} \ No newline at end of file diff --git a/gfx/vr/vrhost/vrhost.cpp b/gfx/vr/vrhost/vrhost.cpp deleted file mode 100644 index dcfade37a4ee..000000000000 --- a/gfx/vr/vrhost/vrhost.cpp +++ /dev/null @@ -1,13 +0,0 @@ -/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* vim: set ts=8 sts=2 et sw=2 tw=80: */ -/* 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/. */ - -// vrhost.cpp -// Definition of functions that are exported from this dll - -#include "vrhostex.h" -#include - -void SampleExport() { printf("vrhost.cpp hello world"); } \ No newline at end of file diff --git a/gfx/vr/vrhost/vrhost.def b/gfx/vr/vrhost/vrhost.def deleted file mode 100644 index 55aaf2203e27..000000000000 --- a/gfx/vr/vrhost/vrhost.def +++ /dev/null @@ -1,7 +0,0 @@ -;+# 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/. - -LIBRARY vrhost.dll - -EXPORTS SampleExport PRIVATE diff --git a/gfx/vr/vrhost/vrhostex.h b/gfx/vr/vrhost/vrhostex.h deleted file mode 100644 index 2235272eb63d..000000000000 --- a/gfx/vr/vrhost/vrhostex.h +++ /dev/null @@ -1,14 +0,0 @@ -/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* vim: set ts=8 sts=2 et sw=2 tw=80: */ -/* 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/. */ - -// vrhostex.h -// This file declares the functions and their typedefs for functions exported -// by vrhost.dll - -#pragma once - -// void SampleExport(); -typedef void (*PFN_SAMPLE)(); \ No newline at end of file diff --git a/js/src/vm/Debugger.cpp b/js/src/vm/Debugger.cpp index 954f07ce846b..30bf956a3281 100644 --- a/js/src/vm/Debugger.cpp +++ b/js/src/vm/Debugger.cpp @@ -3624,9 +3624,10 @@ bool Debugger::findSweepGroupEdges(JSRuntime* rt) { continue; } + if (!debuggerZone->addSweepGroupEdgeTo(debuggeeZone) || !debuggeeZone->addSweepGroupEdgeTo(debuggerZone)) { - return false; + return false; } } } @@ -8919,7 +8920,8 @@ void ScriptedOnPopHandler::trace(JSTracer* tracer) { } bool ScriptedOnPopHandler::onPop(JSContext* cx, HandleDebuggerFrame frame, - ResumeMode& resumeMode, MutableHandleValue vp, + ResumeMode& resumeMode, + MutableHandleValue vp, HandleSavedFrame exnStack) { Debugger* dbg = frame->owner(); @@ -9390,11 +9392,14 @@ static bool EvaluateInEnv(JSContext* cx, Handle env, return ExecuteKernel(cx, script, *env, NullValue(), frame, rval.address()); } -static bool DebuggerGenericEval( - JSContext* cx, const mozilla::Range chars, - HandleObject bindings, const EvalOptions& options, ResumeMode& resumeMode, - MutableHandleValue value, MutableHandleSavedFrame exnStack, Debugger* dbg, - HandleObject envArg, FrameIter* iter) { +static bool DebuggerGenericEval(JSContext* cx, + const mozilla::Range chars, + HandleObject bindings, + const EvalOptions& options, + ResumeMode& resumeMode, + MutableHandleValue value, + MutableHandleSavedFrame exnStack, Debugger* dbg, + HandleObject envArg, FrameIter* iter) { // Either we're specifying the frame, or a global. MOZ_ASSERT_IF(iter, !envArg); MOZ_ASSERT_IF(!iter, envArg && IsGlobalLexicalEnvironment(envArg)); diff --git a/js/src/vm/Debugger.h b/js/src/vm/Debugger.h index ab6ec36d5181..605e70187b55 100644 --- a/js/src/vm/Debugger.h +++ b/js/src/vm/Debugger.h @@ -1664,11 +1664,14 @@ class DebuggerObject : public NativeObject { MutableHandleValue result); static MOZ_MUST_USE bool forceLexicalInitializationByName( JSContext* cx, HandleDebuggerObject object, HandleId id, bool& result); - static MOZ_MUST_USE bool executeInGlobal( - JSContext* cx, HandleDebuggerObject object, - mozilla::Range chars, HandleObject bindings, - const EvalOptions& options, ResumeMode& resumeMode, - MutableHandleValue value, MutableHandleSavedFrame exnStack); + static MOZ_MUST_USE bool executeInGlobal(JSContext* cx, + HandleDebuggerObject object, + mozilla::Range chars, + HandleObject bindings, + const EvalOptions& options, + ResumeMode& resumeMode, + MutableHandleValue value, + MutableHandleSavedFrame exnStack); static MOZ_MUST_USE bool makeDebuggeeValue(JSContext* cx, HandleDebuggerObject object, HandleValue value,