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

Backed out changeset 8006ad2d0c06 (tests for bug 542263), since its test 'test_GCrace.html' failed on OSX in its first cycle.

This commit is contained in:
Daniel Holbert 2010-02-02 18:57:15 -08:00
Родитель 13bfdf8175
Коммит 0e37edb472
5 изменённых файлов: 4 добавлений и 161 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

5
build/automation.py.in
Просмотреть файл

@ -468,7 +468,10 @@ user_pref("camino.use_system_proxy_settings", false); // Camino-only, harmless t
return env
if IS_WIN32:
import ctypes, ctypes.wintypes, time, msvcrt
ctypes = __import__('ctypes')
wintypes = __import__('ctypes.wintypes')
time = __import__('time')
msvcrt = __import__('msvcrt')
PeekNamedPipe = ctypes.windll.kernel32.PeekNamedPipe
GetLastError = ctypes.windll.kernel32.GetLastError

1
modules/plugin/test/mochitest/Makefile.in
Просмотреть файл

@ -72,7 +72,6 @@ _MOCHITEST_FILES = \
test_cookies.html \
test_npn_timers.html \
test_npn_asynccall.html \
test_GCrace.html \
$(NULL)
# test_npruntime_npnsetexception.html \ Disabled for e10s

59
modules/plugin/test/mochitest/test_GCrace.html
Просмотреть файл

@ -1,59 +0,0 @@
<head>
<title>GC race with actors on the parent</title>
<script type="text/javascript"
src="/MochiKit/packed.js"></script>
<script type="text/javascript"
src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css"
href="/tests/SimpleTest/test.css" />
<body onload="setTimeout(checkGCRace, 1000)">
<p id="display"></p>
<embed id="p" type="application/x-test" wmode="window"></embed>
<script class="testbody" type="application/javascript">
SimpleTest.waitForExplicitFinish();
var nested = false;
function cb(f) {
ok(!nested, "Callback shouldn't occur in a nested stack frame");
try {
f(35);
ok(true, "Callback was called, no crash");
}
catch (e) {
ok(false, "Exception calling callback object: " + e);
}
SimpleTest.executeSoon(removePlugin);
}
function removePlugin() {
var p = document.getElementById('p');
p.parentNode.removeChild(p);
p = null;
netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
Components.utils.forceGC();
SimpleTest.finish();
}
function checkGCRace() {
nested = true;
// The plugin will hand back a function and immediately sleep.
// We will lose our only reference to the function and force GC, followed
// by calling us with that function object again. We should be able to
// call the function and not crash.
var p = document.getElementById('p');
var f = p.checkGCRace(cb);
f = null; // 'f' should be collected next GC
nested = false;
setTimeout(function() {
netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
Components.utils.forceGC();
}, 2000);
}
</script>

4
modules/plugin/test/testplugin/README
Просмотреть файл

@ -94,10 +94,6 @@ with a boolean value, indicating whether the tests were successful.
NPN_PluginThreadAsyncCall. When finished, calls the script callback
with a boolean value, indicating whether the tests were successful.
* checkGCRace(callback) - return a function NPObject which may be called
with the number '35'. Immediately after returning, sleep for 5 seconds, then
call "callback" with the same NPObject.
== Private browsing ==
The test plugin object supports the following scriptable methods:

96
modules/plugin/test/testplugin/nptest.cpp
Просмотреть файл

@ -46,7 +46,6 @@
#ifdef XP_WIN
#include <process.h>
#include <float.h>
#include <windows.h>
#define getpid _getpid
#else
#include <unistd.h>
@ -145,7 +144,6 @@ static bool setCookie(NPObject* npobj, const NPVariant* args, uint32_t argCount,
static bool getCookie(NPObject* npobj, const NPVariant* args, uint32_t argCount, NPVariant* result);
static bool getAuthInfo(NPObject* npobj, const NPVariant* args, uint32_t argCount, NPVariant* result);
static bool asyncCallbackTest(NPObject* npobj, const NPVariant* args, uint32_t argCount, NPVariant* result);
static bool checkGCRace(NPObject* npobj, const NPVariant* args, uint32_t argCount, NPVariant* result);
static const NPUTF8* sPluginMethodIdentifierNames[] = {
"npnEvaluateTest",
@ -183,7 +181,6 @@ static const NPUTF8* sPluginMethodIdentifierNames[] = {
"getCookie",
"getAuthInfo",
"asyncCallbackTest",
"checkGCRace",
};
static NPIdentifier sPluginMethodIdentifiers[ARRAY_LENGTH(sPluginMethodIdentifierNames)];
static const ScriptableFunction sPluginMethodFunctions[ARRAY_LENGTH(sPluginMethodIdentifierNames)] = {
@ -222,7 +219,6 @@ static const ScriptableFunction sPluginMethodFunctions[ARRAY_LENGTH(sPluginMetho
getCookie,
getAuthInfo,
asyncCallbackTest,
checkGCRace,
};
struct URLNotifyData
@ -2454,95 +2450,3 @@ asyncCallbackTest(NPObject* npobj, const NPVariant* args, uint32_t argCount, NPV
return true;
}
static bool
GCRaceInvokeDefault(NPObject* o, const NPVariant* args, uint32_t argCount,
NPVariant* result)
{
if (1 != argCount || !NPVARIANT_IS_INT32(args[0]) ||
35 != NPVARIANT_TO_INT32(args[0]))
return false;
return true;
}
static const NPClass kGCRaceClass = {
NP_CLASS_STRUCT_VERSION,
NULL,
NULL,
NULL,
NULL,
NULL,
GCRaceInvokeDefault,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL
};
struct GCRaceData
{
GCRaceData(NPP npp, NPObject* callback, NPObject* localFunc)
: npp_(npp)
, callback_(callback)
, localFunc_(localFunc)
{
NPN_RetainObject(callback_);
NPN_RetainObject(localFunc_);
}
~GCRaceData()
{
NPN_ReleaseObject(callback_);
NPN_ReleaseObject(localFunc_);
}
NPP npp_;
NPObject* callback_;
NPObject* localFunc_;
};
static void
FinishGCRace(void* closure)
{
GCRaceData* rd = static_cast<GCRaceData*>(closure);
#ifdef XP_WIN
Sleep(5000);
#else
sleep(5);
#endif
NPVariant arg;
OBJECT_TO_NPVARIANT(rd->localFunc_, arg);
NPVariant result;
bool ok = NPN_InvokeDefault(rd->npp_, rd->callback_, &arg, 1, &result);
if (!ok)
return;
NPN_ReleaseVariantValue(&result);
delete rd;
}
bool
checkGCRace(NPObject* npobj, const NPVariant* args, uint32_t argCount,
NPVariant* result)
{
if (1 != argCount || !NPVARIANT_IS_OBJECT(args[0]))
return false;
NPP npp = static_cast<TestNPObject*>(npobj)->npp;
NPObject* localFunc =
NPN_CreateObject(npp, const_cast<NPClass*>(&kGCRaceClass));
GCRaceData* rd =
new GCRaceData(npp, NPVARIANT_TO_OBJECT(args[0]), localFunc);
NPN_PluginThreadAsyncCall(npp, FinishGCRace, rd);
OBJECT_TO_NPVARIANT(localFunc, *result);
return true;
}