From 0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5 Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Tue, 11 Aug 2009 17:01:47 +0100
Subject: Merge in WebKit r47029.

---
 JavaScriptGlue/JavaScriptGlue.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'JavaScriptGlue/JavaScriptGlue.cpp')

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);
 }
-- 
cgit v1.1