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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 13f7326cf91acb2cc61c3a32021a6b2ec434e717
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 12 09:20:02 2002 +0000

    Revert stuff I committed by mistake.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3015 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/kjs/array_instance.h b/JavaScriptCore/kjs/array_instance.h
index db6e38d..d2b06a9 100644
--- a/JavaScriptCore/kjs/array_instance.h
+++ b/JavaScriptCore/kjs/array_instance.h
@@ -40,7 +40,6 @@ namespace KJS {
     virtual bool hasProperty(ExecState *exec, unsigned propertyName) const;
     virtual bool deleteProperty(ExecState *exec, const Identifier &propertyName);
     virtual bool deleteProperty(ExecState *exec, unsigned propertyName);
-    virtual ReferenceList propList(ExecState *exec, bool recursive);
 
     virtual void mark();
 
diff --git a/JavaScriptCore/kjs/array_object.cpp b/JavaScriptCore/kjs/array_object.cpp
index 37c95a8..f264f10 100644
--- a/JavaScriptCore/kjs/array_object.cpp
+++ b/JavaScriptCore/kjs/array_object.cpp
@@ -196,18 +196,6 @@ bool ArrayInstanceImp::deleteProperty(ExecState *exec, unsigned index)
   return ObjectImp::deleteProperty(exec, Identifier::from(index));
 }
 
-ReferenceList ArrayInstanceImp::propList(ExecState *exec, bool recursive)
-{
-  ReferenceList properties = ObjectImp::propList(exec,recursive);
-  for (unsigned i = 0; i < storageLength; ++i) {
-    if (storage[i]) {
-      properties.append(Reference(this, Identifier::from(i);
-    }
-  }
-  return properties;
-}
-
-
 void ArrayInstanceImp::resizeStorage(unsigned newLength)
 {
     if (newLength < storageLength) {
diff --git a/JavaScriptCore/kjs/array_object.h b/JavaScriptCore/kjs/array_object.h
index 4353d01..04aa870 100644
--- a/JavaScriptCore/kjs/array_object.h
+++ b/JavaScriptCore/kjs/array_object.h
@@ -59,6 +59,7 @@ namespace KJS {
     virtual Object construct(ExecState *exec, const List &args);
     virtual bool implementsCall() const;
     virtual Value call(ExecState *exec, Object &thisObj, const List &args);
+
   };
 
 }; // namespace
diff --git a/JavaScriptCore/kjs/object.h b/JavaScriptCore/kjs/object.h
index ba0b042..427caa1 100644
--- a/JavaScriptCore/kjs/object.h
+++ b/JavaScriptCore/kjs/object.h
@@ -572,7 +572,7 @@ namespace KJS {
     const ScopeChain &scope() const { return _scope; }
     void setScope(const ScopeChain &s) { _scope = s; }
 
-    virtual ReferenceList propList(ExecState *exec, bool recursive = true);
+    ReferenceList propList(ExecState *exec, bool recursive = true);
 
     Value internalValue() const;
     void setInternalValue(const Value &v);

-- 
WebKit Debian packaging