Reviewed by Tim.
authordarin@apple.com <darin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 1 Feb 2008 22:18:46 +0000 (22:18 +0000)
committerdarin@apple.com <darin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 1 Feb 2008 22:18:46 +0000 (22:18 +0000)
        - fixed mistake in the JSLock fix that caused an assertion every time

        * bindings/js/JSCustomSQLTransactionCallback.cpp:
        (WebCore::JSCustomSQLTransactionCallback::JSCustomSQLTransactionCallback): Added JSLock.
        (WebCore::unprotectOnMainThread): Ditto.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@29927 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/bindings/js/JSCustomSQLTransactionCallback.cpp

index 7e3e87f..f789cb7 100644 (file)
@@ -1,3 +1,13 @@
+2008-02-01  Darin Adler  <darin@apple.com>
+
+        Reviewed by Tim.
+
+        - fixed mistake in the JSLock fix that caused an assertion every time
+
+        * bindings/js/JSCustomSQLTransactionCallback.cpp:
+        (WebCore::JSCustomSQLTransactionCallback::JSCustomSQLTransactionCallback): Added JSLock.
+        (WebCore::unprotectOnMainThread): Ditto.
+
 2008-02-01  Anders Carlsson  <andersca@apple.com>
 
         Reviewed by Antti and Darin.
index a9a2fe4..d3e27cc 100644 (file)
@@ -62,6 +62,7 @@ JSCustomSQLTransactionCallback::JSCustomSQLTransactionCallback(JSObject* callbac
     : m_callback(callback)
     , m_frame(frame)
 {
+    JSLock lock;
     gcProtect(callback);
 
 #ifndef NDEBUG
@@ -71,6 +72,7 @@ JSCustomSQLTransactionCallback::JSCustomSQLTransactionCallback(JSObject* callbac
 
 static void unprotectOnMainThread(void* context)
 {
+    JSLock lock;
     gcUnprotect(static_cast<KJS::JSObject*>(context));
 }