[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
mjs
mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:14:14 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 7884603b978cf4d26aa676fb9c8862cdc804a2ad
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Dec 12 10:38:17 2002 +0000
JavaScriptCore:
Reviewed by Darin.
- fixed 3056449 - can't select state at tucows.com
* kjs/array_instance.h:
* kjs/array_object.cpp:
(ArrayInstanceImp::propList): Add numeric proprties that are in
special storage.
* kjs/array_object.h:
* kjs/object.h: Make propList a virtual method.
WebCore:
Reviewed by Darin.
* force-js-clean-timestamp: Update for JavaScriptCore changes.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3018 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 14f3b31..796ec72 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,16 @@
+2002-12-12 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by Darin.
+
+ - fixed 3056449 - can't select state at tucows.com
+
+ * kjs/array_instance.h:
+ * kjs/array_object.cpp:
+ (ArrayInstanceImp::propList): Add numeric proprties that are in
+ special storage.
+ * kjs/array_object.h:
+ * kjs/object.h: Make propList a virtual method.
+
2002-12-11 Maciej Stachowiak <mjs at apple.com>
Reviewed by Don.
diff --git a/JavaScriptCore/ChangeLog-2003-10-25 b/JavaScriptCore/ChangeLog-2003-10-25
index 14f3b31..796ec72 100644
--- a/JavaScriptCore/ChangeLog-2003-10-25
+++ b/JavaScriptCore/ChangeLog-2003-10-25
@@ -1,3 +1,16 @@
+2002-12-12 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by Darin.
+
+ - fixed 3056449 - can't select state at tucows.com
+
+ * kjs/array_instance.h:
+ * kjs/array_object.cpp:
+ (ArrayInstanceImp::propList): Add numeric proprties that are in
+ special storage.
+ * kjs/array_object.h:
+ * kjs/object.h: Make propList a virtual method.
+
2002-12-11 Maciej Stachowiak <mjs at apple.com>
Reviewed by Don.
diff --git a/JavaScriptCore/kjs/array_instance.h b/JavaScriptCore/kjs/array_instance.h
index d2b06a9..db6e38d 100644
--- a/JavaScriptCore/kjs/array_instance.h
+++ b/JavaScriptCore/kjs/array_instance.h
@@ -40,6 +40,7 @@ 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 f264f10..943f249 100644
--- a/JavaScriptCore/kjs/array_object.cpp
+++ b/JavaScriptCore/kjs/array_object.cpp
@@ -196,6 +196,23 @@ 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);
+
+ // avoid fetching this every time through the loop
+ ValueImp *undefined = UndefinedImp::staticUndefined;
+
+ for (unsigned i = 0; i < storageLength; ++i) {
+ ValueImp *imp = storage[i];
+ if (imp && imp != undefined) {
+ properties.append(Reference(this, i));
+ }
+ }
+ return properties;
+}
+
+
void ArrayInstanceImp::resizeStorage(unsigned newLength)
{
if (newLength < storageLength) {
diff --git a/JavaScriptCore/kjs/object.h b/JavaScriptCore/kjs/object.h
index 427caa1..ba0b042 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; }
- ReferenceList propList(ExecState *exec, bool recursive = true);
+ virtual ReferenceList propList(ExecState *exec, bool recursive = true);
Value internalValue() const;
void setInternalValue(const Value &v);
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 46f5ee6..692f159 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,11 @@
+2002-12-12 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by Darin.
+
+ * force-js-clean-timestamp: Update for JavaScriptCore changes.
+
+2002-12-12 Darin Adler <darin at apple.com>
+
2002-12-12 Darin Adler <darin at apple.com>
Reviewed by Maciej.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 46f5ee6..692f159 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,11 @@
+2002-12-12 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by Darin.
+
+ * force-js-clean-timestamp: Update for JavaScriptCore changes.
+
+2002-12-12 Darin Adler <darin at apple.com>
+
2002-12-12 Darin Adler <darin at apple.com>
Reviewed by Maciej.
diff --git a/WebCore/force-js-clean-timestamp b/WebCore/force-js-clean-timestamp
index bb7a19b..e395d61 100644
--- a/WebCore/force-js-clean-timestamp
+++ b/WebCore/force-js-clean-timestamp
@@ -1 +1 @@
-ScopeChain inlining 11/24 - Darin
+Made Object::propList virtual - 12/12 Maciej
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list