aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-12-04 14:46:47 -05:00
Code

SMJS bookmark_set_property: Don't use JS_ValueToId.

Browse Source 
Partially revert commits
a1c5fe51 (2011-05-08) bookmark_folder_get_property: xulrunner-2.0 fix
e86ec567 (2012-03-04) Compilation fixes (--enable-debug)

jsval_to_bookmark_string once again takes jsval val, rather than jsid id.
This way, bookmark_set_property does not have to call JS_ValueToId,
which would needlessly intern the new string value of the property,
i.e. the title or the URI.  Instead, bookmark_folder_get_property
has to call JS_IdToValue.
This commit is contained in:
Kalle Olavi Niemitalo 2012-11-18 22:21:30 +02:00 committed by Kalle Olavi Niemitalo
parent 380d910ad8
commit d3022aa7be
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/scripting/smjs/bookmarks.c
View File

@ -107,21 +107,15 @@ bookmark_string_to_jsval(JSContext *ctx, const unsigned char *str, jsval *vp)
* @return JS_TRUE if successful. On error, report the error to * @return JS_TRUE if successful. On error, report the error to
* SpiderMonkey and return JS_FALSE. */ * SpiderMonkey and return JS_FALSE. */
static JSBool static JSBool
jsval_to_bookmark_string(JSContext *ctx, jsid id, unsigned char **result) jsval_to_bookmark_string(JSContext *ctx, jsval val, unsigned char **result)
{ {
JSString *jsstr = NULL; JSString *jsstr = NULL;
unsigned char *str; unsigned char *str;
jsval val;
/* jsstring_to_utf8() might GC; protect the string to come. */ /* jsstring_to_utf8() might GC; protect the string to come. */
if (!JS_AddNamedStringRoot(ctx, &jsstr, "jsval_to_bookmark_string")) if (!JS_AddNamedStringRoot(ctx, &jsstr, "jsval_to_bookmark_string"))
return JS_FALSE; return JS_FALSE;
if (JS_TRUE != JS_IdToValue(ctx, id, &val)) {
JS_RemoveStringRoot(ctx, &jsstr);
return JS_FALSE;
}
jsstr = JS_ValueToString(ctx, val); jsstr = JS_ValueToString(ctx, val);
if (jsstr == NULL) { if (jsstr == NULL) {
JS_RemoveStringRoot(ctx, &jsstr); JS_RemoveStringRoot(ctx, &jsstr);
@ -186,7 +180,6 @@ static JSBool
bookmark_set_property(JSContext *ctx, JSObject *obj, jsid id, JSBool strict, jsval *vp) bookmark_set_property(JSContext *ctx, JSObject *obj, jsid id, JSBool strict, jsval *vp)
{ {
struct bookmark *bookmark; struct bookmark *bookmark;
jsid tmp;
unsigned char *title = NULL; unsigned char *title = NULL;
unsigned char *url = NULL; unsigned char *url = NULL;
int ok; int ok;
@ -207,15 +200,11 @@ bookmark_set_property(JSContext *ctx, JSObject *obj, jsid id, JSBool strict, jsv
switch (JSID_TO_INT(id)) { switch (JSID_TO_INT(id)) {
case BOOKMARK_TITLE: case BOOKMARK_TITLE:
if (!JS_ValueToId(ctx, *vp, &tmp)) if (!jsval_to_bookmark_string(ctx, *vp, &title))
return JS_FALSE;
if (!jsval_to_bookmark_string(ctx, tmp, &title))
return JS_FALSE; return JS_FALSE;
break; break;
case BOOKMARK_URL: case BOOKMARK_URL:
if (!JS_ValueToId(ctx, *vp, &tmp)) if (!jsval_to_bookmark_string(ctx, *vp, &url))
return JS_FALSE;
if (!jsval_to_bookmark_string(ctx, tmp, &url))
return JS_FALSE; return JS_FALSE;
break; break;
default: default:
@ -265,6 +254,7 @@ bookmark_folder_get_property(JSContext *ctx, JSObject *obj, jsid id, jsval *vp)
{ {
struct bookmark *bookmark; struct bookmark *bookmark;
struct bookmark *folder; struct bookmark *folder;
jsval title_jsval = JSVAL_VOID;
unsigned char *title = NULL; unsigned char *title = NULL;
/* This can be called if @obj if not itself an instance of the /* This can be called if @obj if not itself an instance of the
@ -278,7 +268,10 @@ bookmark_folder_get_property(JSContext *ctx, JSObject *obj, jsid id, jsval *vp)
*vp = JSVAL_NULL; *vp = JSVAL_NULL;
if (!jsval_to_bookmark_string(ctx, id, &title)) if (!JS_IdToValue(ctx, id, &title_jsval))
return JS_FALSE;
if (!jsval_to_bookmark_string(ctx, title_jsval, &title))
return JS_FALSE; return JS_FALSE;
bookmark = get_bookmark_by_name(folder, title); bookmark = get_bookmark_by_name(folder, title);