[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-
From: |
Benjamin Wolsey |
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-257-g361639d |
Date: |
Tue, 12 Apr 2011 07:47:01 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".
The branch, master has been updated
via 361639dcdd2798487c7303c5d4dfe517fed5b8e6 (commit)
from fa6734bce7e70bfed07c1e1f6e63b2d7581b39d9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=361639dcdd2798487c7303c5d4dfe517fed5b8e6
commit 361639dcdd2798487c7303c5d4dfe517fed5b8e6
Author: Benjamin Wolsey <address@hidden>
Date: Tue Apr 12 08:40:11 2011 +0200
Fix __resolve lookup with prop flags.
Ignore prop flags when searching for __resolve; passes in swfdec
testsuite.
diff --git a/libcore/as_object.cpp b/libcore/as_object.cpp
index 2eeaea7..25f227e 100644
--- a/libcore/as_object.cpp
+++ b/libcore/as_object.cpp
@@ -401,7 +401,12 @@ as_object::get_member(const ObjectURI& uri, as_value* val)
// inheritance chain, try the __resolve property.
if (!prop) {
- Property* res = findProperty(NSV::PROP_uuRESOLVE);
+ PrototypeRecursor<Exists> pr(this, NSV::PROP_uuRESOLVE);
+ Property* res = pr.getProperty();
+
+ while (!res && pr()) {
+ res = pr.getProperty();
+ }
// No __resolve
if (!res) return false;
diff --git a/testsuite/swfdec/PASSING b/testsuite/swfdec/PASSING
index d02c893..e08457a 100644
--- a/testsuite/swfdec/PASSING
+++ b/testsuite/swfdec/PASSING
@@ -905,6 +905,10 @@ object-properties-6.swf:c34734222b0c6eef649ab3b92b1b830f
object-properties-7.swf:71ebb1f47408d993409748dae8d32d5e
object-properties-8.swf:992fafbfd6ae4927116892eb205aac0f
object-resolve-5.swf:5ec01818d35026f5ec889416fbbf8320
+object-resolve-propflags-5.swf:e62bfe8b6c63f9e88ef4f00ff71e000e
+object-resolve-propflags-6.swf:d66b51e3f2364a2ba81ed709b243cca8
+object-resolve-propflags-7.swf:79349b6a00865b1fdaadf0e474eddbfa
+object-resolve-propflags-8.swf:5625deae4ff35f82d274b5a33dcfc34b
object-resolve-propflags-9.swf:db769008cba912cd906834a4722fdb95
object-valueof-5.swf:2520f058ac5a1af3db81ba9b3002e6ab
object-valueof-6.swf:68d80a5ba580357d1dfeb3b515691e7e
-----------------------------------------------------------------------
Summary of changes:
libcore/as_object.cpp | 7 ++++++-
testsuite/swfdec/PASSING | 4 ++++
2 files changed, 10 insertions(+), 1 deletions(-)
hooks/post-receive
--
Gnash
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-257-g361639d,
Benjamin Wolsey <=