Changeset 33038 in webkit for trunk/JavaScriptCore/kjs/JSGlobalObject.h

Timestamp:

May 12, 2008, 12:12:31 AM (17 years ago)

Author:

[email protected]

Message:

Roll out recent threading changes (r32807, r32810, r32819, r32822) to simplify
SquirrelFish merging.

File:

• trunk/JavaScriptCore/kjs/JSGlobalObject.h (modified) (3 diffs)

trunk/JavaScriptCore/kjs/JSGlobalObject.h

@@ -167 +167 @@
         virtual void putWithAttributes(ExecState*, const Identifier& propertyName, JSValue* value, unsigned attributes);
 
-        // Per-thread linked list of all global objects.
-        static JSGlobalObject*& head();
+        // Linked list of all global objects.
+        static JSGlobalObject* head() { return s_head; }
         JSGlobalObject* next() { return d()->next; }
 
@@ -251 +251 @@
 
         // Per-thread hash tables, cached on the global object for faster access.
-        PerThreadData* perThreadData() { return &d()->perThreadData; }
+        const PerThreadData* perThreadData() const { return &d()->perThreadData; }
 
         // Initialize and/or retrieve per-thread hash tables - use perThreadData() for faster access instead.
         static ThreadClassInfoHashTables* threadClassInfoHashTables();
-
-        void* operator new(size_t);
 
     private:
@@ -268 +266 @@
         void deleteActivationStack();
         void checkActivationCount();
+
+        static JSGlobalObject* s_head;
     };