mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Backed out changeset af0fd51dc41a (bug 1550757) for vrhost related mingw bustages CLOSED TREE

This commit is contained in:
Bogdan Tara 2019-05-15 08:28:00 +03:00
Родитель 67eb9799f5
Коммит 11cfa0462a
9 изменённых файлов: 20 добавлений и 114 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

7
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',

22
gfx/vr/vrhost/moz.build
Просмотреть файл

@ -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')

16
gfx/vr/vrhost/testhost/moz.build
Просмотреть файл

@ -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')

23
gfx/vr/vrhost/testhost/testhost.cpp
Просмотреть файл

@ -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 <windows.h>
#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;
}

13
gfx/vr/vrhost/vrhost.cpp
Просмотреть файл

@ -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 <stdio.h>
void SampleExport() { printf("vrhost.cpp hello world"); }

7
gfx/vr/vrhost/vrhost.def
Просмотреть файл

@ -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

14
gfx/vr/vrhost/vrhostex.h
Просмотреть файл

@ -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)();

19
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*> env,
return ExecuteKernel(cx, script, *env, NullValue(), frame, rval.address());
}
static bool DebuggerGenericEval(
JSContext* cx, const mozilla::Range<const char16_t> 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<const char16_t> 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));

13
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<const char16_t> chars, HandleObject bindings,
const EvalOptions& options, ResumeMode& resumeMode,
MutableHandleValue value, MutableHandleSavedFrame exnStack);
static MOZ_MUST_USE bool executeInGlobal(JSContext* cx,
HandleDebuggerObject object,
mozilla::Range<const char16_t> chars,
HandleObject bindings,
const EvalOptions& options,
ResumeMode& resumeMode,
MutableHandleValue value,
MutableHandleSavedFrame exnStack);
static MOZ_MUST_USE bool makeDebuggeeValue(JSContext* cx,
HandleDebuggerObject object,
HandleValue value,