Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 411365. JS Shark renames per brendan. r/a=brendan

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@243565 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
sayrer%gmail.com
2008-01-19 23:33:08 +00:00
parent 3414378215
commit bde09c8926
5 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/dom/src/base/nsJSEnvironment.cpp
View File

@@ -3074,10 +3074,10 @@ static JSFunctionSpec JProfFunctions[] = {
#ifdef MOZ_SHARK
static JSFunctionSpec SharkFunctions[] = {
{"startShark", StartShark, 0, 0, 0},
{"stopShark", StopShark, 0, 0, 0},
{"connectShark", ConnectShark, 0, 0, 0},
{"disconnectShark", DisconnectShark, 0, 0, 0},
{"startShark", js_StartShark, 0, 0, 0},
{"stopShark", js_StopShark, 0, 0, 0},
{"connectShark", js_ConnectShark, 0, 0, 0},
{"disconnectShark", js_DisconnectShark, 0, 0, 0},
{nsnull, nsnull, 0, 0, 0}
};
#endif

2
mozilla/js/src/js.c
View File

@@ -524,7 +524,7 @@ ProcessArgs(JSContext *cx, JSObject *obj, char **argv, int argc)
break;
#ifdef MOZ_SHARK
case 'k':
js_ConnectShark();
JS_ConnectShark();
break;
#endif
default:

40
mozilla/js/src/jsdbgapi.c
View File

@@ -1676,8 +1676,8 @@ JS_SetContextDebugHooks(JSContext *cx, JSDebugHooks *hooks)
#ifdef MOZ_SHARK
JS_FRIEND_API(JSBool)
js_StartChudRemote()
JS_PUBLIC_API(JSBool)
JS_StartChudRemote()
{
if (chudIsRemoteAccessAcquired() &&
(chudStartRemotePerfMonitor("Mozilla") == chudSuccess)) {
@@ -1687,8 +1687,8 @@ js_StartChudRemote()
return JS_FALSE;
}
JS_FRIEND_API(JSBool)
js_StopChudRemote()
JS_PUBLIC_API(JSBool)
JS_StopChudRemote()
{
if (chudIsRemoteAccessAcquired() &&
(chudStopRemotePerfMonitor() == chudSuccess)) {
@@ -1698,8 +1698,8 @@ js_StopChudRemote()
return JS_FALSE;
}
JS_FRIEND_API(JSBool)
js_ConnectShark()
JS_PUBLIC_API(JSBool)
JS_ConnectShark()
{
if (!chudIsInitialized() && (chudInitialize() != chudSuccess))
return JS_FALSE;
@@ -1710,8 +1710,8 @@ js_ConnectShark()
return JS_TRUE;
}
JS_FRIEND_API(JSBool)
js_DisconnectShark()
JS_PUBLIC_API(JSBool)
JS_DisconnectShark()
{
if (chudIsRemoteAccessAcquired() && (chudReleaseRemoteAccess() != chudSuccess))
return JS_FALSE;
@@ -1720,10 +1720,10 @@ js_DisconnectShark()
}
JS_FRIEND_API(JSBool)
StartShark(JSContext *cx, JSObject *obj,
uintN argc, jsval *argv, jsval *rval)
js_StartShark(JSContext *cx, JSObject *obj,
uintN argc, jsval *argv, jsval *rval)
{
if (!js_StartChudRemote()) {
if (!JS_StartChudRemote()) {
JS_ReportError(cx, "Error starting CHUD.");
}
@@ -1731,10 +1731,10 @@ StartShark(JSContext *cx, JSObject *obj,
}
JS_FRIEND_API(JSBool)
StopShark(JSContext *cx, JSObject *obj,
uintN argc, jsval *argv, jsval *rval)
js_StopShark(JSContext *cx, JSObject *obj,
uintN argc, jsval *argv, jsval *rval)
{
if (!js_StopChudRemote()) {
if (!JS_StopChudRemote()) {
JS_ReportError(cx, "Error stopping CHUD.");
}
@@ -1742,10 +1742,10 @@ StopShark(JSContext *cx, JSObject *obj,
}
JS_FRIEND_API(JSBool)
ConnectShark(JSContext *cx, JSObject *obj,
uintN argc, jsval *argv, jsval *rval)
js_ConnectShark(JSContext *cx, JSObject *obj,
uintN argc, jsval *argv, jsval *rval)
{
if (!js_ConnectShark()) {
if (!JS_ConnectShark()) {
JS_ReportError(cx, "Error connecting to Shark.");
}
@@ -1753,10 +1753,10 @@ ConnectShark(JSContext *cx, JSObject *obj,
}
JS_FRIEND_API(JSBool)
DisconnectShark(JSContext *cx, JSObject *obj,
uintN argc, jsval *argv, jsval *rval)
js_DisconnectShark(JSContext *cx, JSObject *obj,
uintN argc, jsval *argv, jsval *rval)
{
if (!js_DisconnectShark()) {
if (!JS_DisconnectShark()) {
JS_ReportError(cx, "Error disconnecting from Shark.");
}

26
mozilla/js/src/jsdbgapi.h
View File

@@ -422,24 +422,24 @@ extern JS_PUBLIC_API(JSDebugHooks *)
JS_SetContextDebugHooks(JSContext *cx, JSDebugHooks *hooks);
#ifdef MOZ_SHARK
extern JS_FRIEND_API(JSBool) js_StartChudRemote();
extern JS_FRIEND_API(JSBool) js_StopChudRemote();
extern JS_FRIEND_API(JSBool) js_ConnectShark();
extern JS_FRIEND_API(JSBool) js_DisconnectShark();
extern JS_PUBLIC_API(JSBool) JS_StartChudRemote();
extern JS_PUBLIC_API(JSBool) JS_StopChudRemote();
extern JS_PUBLIC_API(JSBool) JS_ConnectShark();
extern JS_PUBLIC_API(JSBool) JS_DisconnectShark();
extern JS_FRIEND_API(JSBool) StopShark(JSContext *cx, JSObject *obj,
uintN argc, jsval *argv, jsval *rval);
extern JS_FRIEND_API(JSBool) js_StopShark(JSContext *cx, JSObject *obj,
uintN argc, jsval *argv, jsval *rval);
extern JS_FRIEND_API(JSBool) StartShark(JSContext *cx, JSObject *obj,
uintN argc, jsval *argv, jsval *rval);
extern JS_FRIEND_API(JSBool) js_StartShark(JSContext *cx, JSObject *obj,
uintN argc, jsval *argv, jsval *rval);
extern JS_FRIEND_API(JSBool) ConnectShark(JSContext *cx, JSObject *obj,
uintN argc, jsval *argv,
jsval *rval);
extern JS_FRIEND_API(JSBool) DisconnectShark(JSContext *cx, JSObject *obj,
extern JS_FRIEND_API(JSBool) js_ConnectShark(JSContext *cx, JSObject *obj,
uintN argc, jsval *argv,
jsval *rval);
extern JS_FRIEND_API(JSBool) js_DisconnectShark(JSContext *cx, JSObject *obj,
uintN argc, jsval *argv,
jsval *rval);
#endif /* MOZ_SHARK */
JS_END_EXTERN_C

2
mozilla/js/src/xpconnect/shell/xpcshell.cpp
View File

@@ -896,7 +896,7 @@ ProcessArgs(JSContext *cx, JSObject *obj, char **argv, int argc)
break;
#ifdef MOZ_SHARK
case 'k':
js_ConnectShark();
JS_ConnectShark();
break;
#endif
default: