[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit 389288b295e3fb9f88b0063a3ac400eec6d11e00
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 17 00:17:07 2003 +0000

            Reviewed by Maciej.
    
    	- rolled in a change from the KJS folks
    
            * kjs/number_object.h: Use ObjectImp *, not Object, for the proto.
            * kjs/number_object.cpp:
            (NumberInstanceImp::NumberInstanceImp): Use ObjectImp *, not Object, for the proto.
            (NumberPrototypeImp::NumberPrototypeImp): Pass ObjectImp.
            (NumberObjectImp::construct): Use ObjectImp.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3338 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index b6757fe..b233a83 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,15 @@
+2003-01-16  Darin Adler  <darin at apple.com>
+
+        Reviewed by Maciej.
+
+	- rolled in a change from the KJS folks
+
+        * kjs/number_object.h: Use ObjectImp *, not Object, for the proto.
+        * kjs/number_object.cpp:
+        (NumberInstanceImp::NumberInstanceImp): Use ObjectImp *, not Object, for the proto.
+        (NumberPrototypeImp::NumberPrototypeImp): Pass ObjectImp.
+        (NumberObjectImp::construct): Use ObjectImp.
+
 === Safari-52 ===
 
 2003-01-14  Darin Adler  <darin at apple.com>
diff --git a/JavaScriptCore/ChangeLog-2003-10-25 b/JavaScriptCore/ChangeLog-2003-10-25
index b6757fe..b233a83 100644
--- a/JavaScriptCore/ChangeLog-2003-10-25
+++ b/JavaScriptCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2003-01-16  Darin Adler  <darin at apple.com>
+
+        Reviewed by Maciej.
+
+	- rolled in a change from the KJS folks
+
+        * kjs/number_object.h: Use ObjectImp *, not Object, for the proto.
+        * kjs/number_object.cpp:
+        (NumberInstanceImp::NumberInstanceImp): Use ObjectImp *, not Object, for the proto.
+        (NumberPrototypeImp::NumberPrototypeImp): Pass ObjectImp.
+        (NumberObjectImp::construct): Use ObjectImp.
+
 === Safari-52 ===
 
 2003-01-14  Darin Adler  <darin at apple.com>
diff --git a/JavaScriptCore/kjs/number_object.cpp b/JavaScriptCore/kjs/number_object.cpp
index 1e974bb..97d69df 100644
--- a/JavaScriptCore/kjs/number_object.cpp
+++ b/JavaScriptCore/kjs/number_object.cpp
@@ -36,7 +36,7 @@ using namespace KJS;
 
 const ClassInfo NumberInstanceImp::info = {"Number", 0, 0, 0};
 
-NumberInstanceImp::NumberInstanceImp(const Object &proto)
+NumberInstanceImp::NumberInstanceImp(ObjectImp *proto)
   : ObjectImp(proto)
 {
 }
@@ -47,7 +47,7 @@ NumberInstanceImp::NumberInstanceImp(const Object &proto)
 NumberPrototypeImp::NumberPrototypeImp(ExecState *exec,
                                        ObjectPrototypeImp *objProto,
                                        FunctionPrototypeImp *funcProto)
-  : NumberInstanceImp(Object(objProto))
+  : NumberInstanceImp(objProto)
 {
   Value protect(this);
   setInternalValue(NumberImp::zero());
@@ -162,7 +162,7 @@ bool NumberObjectImp::implementsConstruct() const
 // ECMA 15.7.1
 Object NumberObjectImp::construct(ExecState *exec, const List &args)
 {
-  Object proto = exec->interpreter()->builtinNumberPrototype();
+  Object Imp *proto = exec->interpreter()->builtinNumberPrototype().imp();
   Object obj(new NumberInstanceImp(proto));
 
   Number n;
diff --git a/JavaScriptCore/kjs/number_object.h b/JavaScriptCore/kjs/number_object.h
index 5b49e23..8c05151 100644
--- a/JavaScriptCore/kjs/number_object.h
+++ b/JavaScriptCore/kjs/number_object.h
@@ -29,7 +29,7 @@ namespace KJS {
 
   class NumberInstanceImp : public ObjectImp {
   public:
-    NumberInstanceImp(const Object &proto);
+    NumberInstanceImp(ObjectImp *proto);
 
     virtual const ClassInfo *classInfo() const { return &info; }
     static const ClassInfo info;

-- 
WebKit Debian packaging