corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

back out 3a8893b28489 (bug 712939) and 39adab158c17,16add78c43e3,37193db7e15b (bug 712873), for build bustage.

Browse Source
This commit is contained in:
Daniel Holbert
2014-02-19 00:15:51 -08:00
parent 7e12e52dd2
commit 89c63da190
36 changed files with 261 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
js/jsd/jsdebug.cpp
View File

@@ -390,7 +390,7 @@ JSD_PUBLIC_API(JSDSourceText*)
JSD_FindSourceForURL(JSDContext* jsdc, const char* url)
{
JSD_ASSERT_VALID_CONTEXT(jsdc);
MOZ_ASSERT(url);
JS_ASSERT(url);
return jsd_FindSourceForURL(jsdc, url);
}
@@ -408,8 +408,8 @@ JSD_GetSourceText(JSDContext* jsdc, JSDSourceText* jsdsrc,
{
JSD_ASSERT_VALID_CONTEXT(jsdc);
JSD_ASSERT_VALID_SOURCE_TEXT(jsdsrc);
MOZ_ASSERT(ppBuf);
MOZ_ASSERT(pLen);
JS_ASSERT(ppBuf);
JS_ASSERT(pLen);
return jsd_GetSourceText(jsdc, jsdsrc, ppBuf, pLen);
}
@@ -473,7 +473,7 @@ JSD_PUBLIC_API(JSDSourceText*)
JSD_NewSourceText(JSDContext* jsdc, const char* url)
{
JSD_ASSERT_VALID_CONTEXT(jsdc);
MOZ_ASSERT(url);
JS_ASSERT(url);
return jsd_NewSourceText(jsdc, url);
}
@@ -508,7 +508,7 @@ JSD_AddFullSourceText(JSDContext* jsdc,
const char* url)
{
JSD_ASSERT_VALID_CONTEXT(jsdc);
MOZ_ASSERT(url);
JS_ASSERT(url);
return jsd_AddFullSourceText(jsdc, text, length, url);
}
@@ -769,9 +769,9 @@ JSD_EvaluateUCScriptInStackFrame(JSDContext* jsdc,
const char *filename, unsigned lineno, JS::MutableHandleValue rval)
{
JSD_ASSERT_VALID_CONTEXT(jsdc);
MOZ_ASSERT(bytes);
MOZ_ASSERT(length);
MOZ_ASSERT(filename);
JS_ASSERT(bytes);
JS_ASSERT(length);
JS_ASSERT(filename);
return jsd_EvaluateUCScriptInStackFrame(jsdc, jsdthreadstate,jsdframe,
bytes, length, filename, lineno,
@@ -787,9 +787,9 @@ JSD_AttemptUCScriptInStackFrame(JSDContext* jsdc,
JS::MutableHandleValue rval)
{
JSD_ASSERT_VALID_CONTEXT(jsdc);
MOZ_ASSERT(bytes);
MOZ_ASSERT(length);
MOZ_ASSERT(filename);
JS_ASSERT(bytes);
JS_ASSERT(length);
JS_ASSERT(filename);
return jsd_EvaluateUCScriptInStackFrame(jsdc, jsdthreadstate,jsdframe,
bytes, length, filename, lineno,
@@ -804,9 +804,9 @@ JSD_EvaluateScriptInStackFrame(JSDContext* jsdc,
const char *filename, unsigned lineno, JS::MutableHandleValue rval)
{
JSD_ASSERT_VALID_CONTEXT(jsdc);
MOZ_ASSERT(bytes);
MOZ_ASSERT(length);
MOZ_ASSERT(filename);
JS_ASSERT(bytes);
JS_ASSERT(length);
JS_ASSERT(filename);
return jsd_EvaluateScriptInStackFrame(jsdc, jsdthreadstate,jsdframe,
bytes, length,
@@ -821,9 +821,9 @@ JSD_AttemptScriptInStackFrame(JSDContext* jsdc,
const char *filename, unsigned lineno, JS::MutableHandleValue rval)
{
JSD_ASSERT_VALID_CONTEXT(jsdc);
MOZ_ASSERT(bytes);
MOZ_ASSERT(length);
MOZ_ASSERT(filename);
JS_ASSERT(bytes);
JS_ASSERT(length);
JS_ASSERT(filename);
return jsd_EvaluateScriptInStackFrame(jsdc, jsdthreadstate,jsdframe,
bytes, length,
@@ -1128,7 +1128,7 @@ JSD_IterateProperties(JSDContext* jsdc, JSDValue* jsdval, JSDProperty **iterp)
{
JSD_ASSERT_VALID_CONTEXT(jsdc);
JSD_ASSERT_VALID_VALUE(jsdval);
MOZ_ASSERT(iterp);
JS_ASSERT(iterp);
return jsd_IterateProperties(jsdc, jsdval, iterp);
}
@@ -1137,7 +1137,7 @@ JSD_GetValueProperty(JSDContext* jsdc, JSDValue* jsdval, JSString* name)
{
JSD_ASSERT_VALID_CONTEXT(jsdc);
JSD_ASSERT_VALID_VALUE(jsdval);
MOZ_ASSERT(name);
JS_ASSERT(name);
return jsd_GetValueProperty(jsdc, jsdval, name);
}
@@ -1299,7 +1299,7 @@ JSD_PUBLIC_API(JSDObject*)
JSD_GetJSDObjectForJSObject(JSDContext* jsdc, JSObject* jsobj)
{
JSD_ASSERT_VALID_CONTEXT(jsdc);
MOZ_ASSERT(jsobj);
JS_ASSERT(jsobj);
return jsd_GetJSDObjectForJSObject(jsdc, jsobj);
}