Merge branch 'qtwebkit-4.6-staging' into qtscript-jsc-backend

Conflicts:
	src/corelib/tools/qregexp.cpp
	src/script/qscriptengine.cpp
	src/script/qscriptvalue.cpp

1 files changed, 15 insertions, 13 deletions

diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/JSLock.h b/src/3rdparty/webkit/JavaScriptCore/runtime/JSLock.h
index 3dde358..8b015c4 100644
--- a/src/3rdparty/webkit/JavaScriptCore/runtime/JSLock.h
+++ b/src/3rdparty/webkit/JavaScriptCore/runtime/JSLock.h
@@ -50,50 +50,52 @@ namespace JSC {
 
     class ExecState;
 
-    class JSLock : Noncopyable {
+    enum JSLockBehavior { SilenceAssertionsOnly, LockForReal };
+
+    class JSLock : public Noncopyable {
     public:
         JSLock(ExecState*);
 
-        JSLock(bool lockingForReal)
-            : m_lockingForReal(lockingForReal)
+        JSLock(JSLockBehavior lockBehavior)
+            : m_lockBehavior(lockBehavior)
         {
 #ifdef NDEBUG
             // Locking "not for real" is a debug-only feature.
-            if (!lockingForReal)
+            if (lockBehavior == SilenceAssertionsOnly)
                 return;
 #endif
-            lock(lockingForReal);
+            lock(lockBehavior);
         }
 
         ~JSLock()
         { 
 #ifdef NDEBUG
             // Locking "not for real" is a debug-only feature.
-            if (!m_lockingForReal)
+            if (m_lockBehavior == SilenceAssertionsOnly)
                 return;
 #endif
-            unlock(m_lockingForReal); 
+            unlock(m_lockBehavior); 
         }
         
-        static void lock(bool);
-        static void unlock(bool);
+        static void lock(JSLockBehavior);
+        static void unlock(JSLockBehavior);
         static void lock(ExecState*);
         static void unlock(ExecState*);
 
         static intptr_t lockCount();
         static bool currentThreadIsHoldingLock();
 
-        bool m_lockingForReal;
+        JSLockBehavior m_lockBehavior;
 
-        class DropAllLocks : Noncopyable {
+        class DropAllLocks : public Noncopyable {
         public:
             DropAllLocks(ExecState* exec);
-            DropAllLocks(bool);
+            DropAllLocks(JSLockBehavior);
             ~DropAllLocks();
             
         private:
             intptr_t m_lockCount;
-            bool m_lockingForReal;
+            JSLockBehavior m_lockBehavior;
         };
     };