Changeset 44522 in webkit for trunk/JavaScriptCore/runtime

Timestamp:

Jun 8, 2009, 11:24:37 PM (16 years ago)

Author:

[email protected]

Message:

Revert r44521 as it causes regressions on windows for some reason.

Location:

trunk/JavaScriptCore/runtime

Files:

• CommonIdentifiers.h (modified) (1 diff)
• JSGlobalData.cpp (modified) (4 diffs)
• JSGlobalData.h (modified) (1 diff)
• JSGlobalObject.cpp (modified) (2 diffs)
• JSONObject.cpp (deleted)
• JSONObject.h (deleted)

trunk/JavaScriptCore/runtime/CommonIdentifiers.h

@@ -60 +60 @@
     macro(toExponential) \
     macro(toFixed) \
-    macro(toJSON) \
     macro(toLocaleString) \
     macro(toPrecision) \

trunk/JavaScriptCore/runtime/JSGlobalData.cpp

@@ -61 +61 @@
 
 extern const HashTable arrayTable;
-extern const HashTable jsonTable;
 extern const HashTable dateTable;
 extern const HashTable mathTable;
@@ -107 +106 @@
     , arrayTable(fastNew<HashTable>(JSC::arrayTable))
     , dateTable(fastNew<HashTable>(JSC::dateTable))
-    , jsonTable(fastNew<HashTable>(JSC::jsonTable))
     , mathTable(fastNew<HashTable>(JSC::mathTable))
     , numberTable(fastNew<HashTable>(JSC::numberTable))
@@ -158 +156 @@
     arrayTable->deleteTable();
     dateTable->deleteTable();
-    jsonTable->deleteTable();
     mathTable->deleteTable();
     numberTable->deleteTable();
@@ -170 +167 @@
     fastDelete(const_cast<HashTable*>(arrayTable));
     fastDelete(const_cast<HashTable*>(dateTable));
-    fastDelete(const_cast<HashTable*>(jsonTable));
     fastDelete(const_cast<HashTable*>(mathTable));
     fastDelete(const_cast<HashTable*>(numberTable));

trunk/JavaScriptCore/runtime/JSGlobalData.h

@@ -83 +83 @@
         const HashTable* arrayTable;
         const HashTable* dateTable;
-        const HashTable* jsonTable;
         const HashTable* mathTable;
         const HashTable* numberTable;

trunk/JavaScriptCore/runtime/JSGlobalObject.cpp

@@ -51 +51 @@
 #include "JSGlobalObjectFunctions.h"
 #include "JSLock.h"
-#include "JSONObject.h"
 #include "Interpreter.h"
 #include "MathObject.h"
@@ -320 +319 @@
         GlobalPropertyInfo(Identifier(exec, "NaN"), jsNaN(exec), DontEnum | DontDelete),
         GlobalPropertyInfo(Identifier(exec, "Infinity"), jsNumber(exec, Inf), DontEnum | DontDelete),
-        GlobalPropertyInfo(Identifier(exec, "undefined"), jsUndefined(), DontEnum | DontDelete),
-        GlobalPropertyInfo(Identifier(exec, "JSON"), new (exec) JSONObject(JSONObject::createStructure(d()->objectPrototype)), DontEnum | DontDelete)
+        GlobalPropertyInfo(Identifier(exec, "undefined"), jsUndefined(), DontEnum | DontDelete)
     };