diff options
author | Ben Murdoch <benm@google.com> | 2009-08-11 17:01:47 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2009-08-11 18:21:02 +0100 |
commit | 0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5 (patch) | |
tree | 2943df35f62d885c89d01063cc528dd73b480fea /JavaScriptGlue/JavaScriptGlue.cpp | |
parent | 7e7a70bfa49a1122b2597a1e6367d89eb4035eca (diff) | |
download | external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.zip external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.gz external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.bz2 |
Merge in WebKit r47029.
Diffstat (limited to 'JavaScriptGlue/JavaScriptGlue.cpp')
-rw-r--r-- | JavaScriptGlue/JavaScriptGlue.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/JavaScriptGlue/JavaScriptGlue.cpp b/JavaScriptGlue/JavaScriptGlue.cpp index 3b203cc..b4f26e9 100644 --- a/JavaScriptGlue/JavaScriptGlue.cpp +++ b/JavaScriptGlue/JavaScriptGlue.cpp @@ -246,7 +246,7 @@ JSRunRef JSRunCreate(CFStringRef jsSource, JSFlags inFlags) JSRunRef result = 0; if (jsSource) { - JSLock lock(true); + JSLock lock(LockForReal); result = (JSRunRef) new JSRun(jsSource, inFlags); } return result; @@ -291,7 +291,7 @@ JSObjectRef JSRunEvaluate(JSRunRef ref) JSRun* ptr = (JSRun*)ref; if (ptr) { - JSLock lock(true); + JSLock lock(LockForReal); Completion completion = ptr->Evaluate(); if (completion.isValueCompletion()) { @@ -325,7 +325,7 @@ bool JSRunCheckSyntax(JSRunRef ref) JSRun* ptr = (JSRun*)ref; if (ptr) { - JSLock lock(true); + JSLock lock(LockForReal); result = ptr->CheckSyntax(); } return result; @@ -338,7 +338,7 @@ void JSCollect() { initializeThreading(); - JSLock lock(true); + JSLock lock(LockForReal); getThreadGlobalExecState()->heap()->collect(); } @@ -649,11 +649,11 @@ CFMutableArrayRef JSCreateJSArrayFromCFArray(CFArrayRef array) void JSLockInterpreter() { initializeThreading(); - JSLock::lock(true); + JSLock::lock(LockForReal); } void JSUnlockInterpreter() { - JSLock::unlock(true); + JSLock::unlock(LockForReal); } |