Changeset 46598 in webkit for trunk/JavaScriptCore/runtime/JSGlobalObject.h

Timestamp:

Jul 30, 2009, 1:57:44 PM (16 years ago)

Author:

[email protected]

Message:

Merged nitro-extreme branch into trunk.

File:

• trunk/JavaScriptCore/runtime/JSGlobalObject.h (modified) (2 diffs)

trunk/JavaScriptCore/runtime/JSGlobalObject.h

@@ -348 +348 @@
             return m_prototype;
 
+#if USE(JSVALUE32)
         if (typeInfo().type() == StringType)
             return exec->lexicalGlobalObject()->stringPrototype();
@@ -353 +354 @@
         ASSERT(typeInfo().type() == NumberType);
         return exec->lexicalGlobalObject()->numberPrototype();
+#else
+        ASSERT(typeInfo().type() == StringType);
+        return exec->lexicalGlobalObject()->stringPrototype();
+#endif
     }