JavaScriptCore-903.tar.gz

[apple/javascriptcore.git] / runtime / DateInstance.cpp

diff --git a/runtime/DateInstance.cpp b/runtime/DateInstance.cpp
index b43b183e27ea3974066e1e2d3fab74d16e84d55c..d8ca072491b8583dfc81e1295a2d8b392a6447df 100644 (file)
--- a/runtime/DateInstance.cpp
+++ b/runtime/DateInstance.cpp
@@ -32,24 +32,20 @@ using namespace WTF;
 
 namespace JSC {
 
 
 namespace JSC {
 

-const ClassInfo DateInstance::info = {"Date", 0, 0, 0};
+const ClassInfo DateInstance::s_info = {"Date", &JSWrapperObject::s_info, 0, 0};

 
 

-DateInstance::DateInstance(ExecState* exec, NonNullPassRefPtr<Structure> structure)
-    : JSWrapperObject(structure)
+DateInstance::DateInstance(ExecState* exec, Structure* structure)
+    : JSWrapperObject(exec->globalData(), structure)

 {
 {

-    setInternalValue(jsNaN(exec));
+    ASSERT(inherits(&s_info));
+    setInternalValue(exec->globalData(), jsNaN());

 }
 
 }
 

-DateInstance::DateInstance(ExecState* exec, NonNullPassRefPtr<Structure> structure, double time)
-    : JSWrapperObject(structure)
+DateInstance::DateInstance(ExecState* exec, Structure* structure, double time)
+    : JSWrapperObject(exec->globalData(), structure)

 {
 {

-    setInternalValue(jsNumber(exec, timeClip(time)));
-}
-
-DateInstance::DateInstance(ExecState* exec, double time)
-    : JSWrapperObject(exec->lexicalGlobalObject()->dateStructure())
-{
-    setInternalValue(jsNumber(exec, timeClip(time)));
+    ASSERT(inherits(&s_info));
+    setInternalValue(exec->globalData(), jsNumber(timeClip(time)));

 }
 
 const GregorianDateTime* DateInstance::calculateGregorianDateTime(ExecState* exec) const
 }
 
 const GregorianDateTime* DateInstance::calculateGregorianDateTime(ExecState* exec) const