[Gnash-commit] [SCM] Gnash branch, master, updated. 51de3a02379b49911aa7df2015b0f3ae18739e46

[Benjamin Wolsey]

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  51de3a02379b49911aa7df2015b0f3ae18739e46 (commit)
       via  2d485daa27b96f113ddb77caaa2f761d50c22e8c (commit)
      from  20764275919d2ec05aeb3a876339e6c752e06c91 (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=51de3a02379b49911aa7df2015b0f3ae18739e46


commit 51de3a02379b49911aa7df2015b0f3ae18739e46
Merge: 2d485da 2076427
Author: Benjamin Wolsey <address@hidden>
Date:   Wed Oct 20 11:49:01 2010 +0200

    Merge branch 'master' of git.sv.gnu.org:/srv/git/gnash


http://git.savannah.gnu.org/cgit//commit/?id=2d485daa27b96f113ddb77caaa2f761d50c22e8c


commit 2d485daa27b96f113ddb77caaa2f761d50c22e8c
Author: Benjamin Wolsey <address@hidden>
Date:   Wed Oct 20 11:37:11 2010 +0200

    Return an array to pass some tests.

diff --git a/libcore/asobj/MovieClip_as.cpp b/libcore/asobj/MovieClip_as.cpp
index 4b32e49..c864006 100644
--- a/libcore/asobj/MovieClip_as.cpp
+++ b/libcore/asobj/MovieClip_as.cpp
@@ -368,8 +368,19 @@ as_value
 movieclip_filters(const fn_call& fn)
 {
     MovieClip* movieclip = ensure<IsDisplayObject<MovieClip> >(fn);
+    
     UNUSED(movieclip);
+
     LOG_ONCE(log_unimpl(_("MovieClip.filters()")));
+
+    if (!fn.nargs) {
+        // Getter
+        Global_as& gl = getGlobal(fn);
+        as_object* array = gl.createArray();
+        return as_value(array);
+    }
+
+    // Setter
     return as_value();
 }
 
diff --git a/testsuite/actionscript.all/MovieClip.as 
b/testsuite/actionscript.all/MovieClip.as
index 85d25de..1a0ad39 100644
--- a/testsuite/actionscript.all/MovieClip.as
+++ b/testsuite/actionscript.all/MovieClip.as
@@ -1094,32 +1094,32 @@ check_equals(typeof(this.$version), 'undefined');
 // A fake array works.
 
 #if OUTPUT_VERSION > 7
-    xcheck_equals(typeof(_root.filters), "object");
-    xcheck(_root.filters.hasOwnProperty("length"));
-    xcheck_equals(_root.filters.length, 0);
+    check_equals(typeof(_root.filters), "object");
+    check(_root.filters.hasOwnProperty("length"));
+    check_equals(_root.filters.length, 0);
 
     _root.filters = 7;
-    xcheck_equals(typeof(_root.filters), "object");
+    check_equals(typeof(_root.filters), "object");
 
     _root.filters.push(7);
-    xcheck_equals(_root.filters.toString(), "");
+    check_equals(_root.filters.toString(), "");
 
     _root.filters.push(new Object());
-    xcheck_equals(_root.filters.toString(), "");
+    check_equals(_root.filters.toString(), "");
 
     _root.filters.push(new Date(0));
-    xcheck_equals(_root.filters.toString(), "");
+    check_equals(_root.filters.toString(), "");
 
     _root.filters.length = 4;
-    xcheck_equals(_root.filters.toString(), "");
-    xcheck_equals(_root.filters.length, 0);
+    check_equals(_root.filters.toString(), "");
+    check_equals(_root.filters.length, 0);
 
     _root.filters.push(new flash.filters.ConvolutionFilter());
-    xcheck_equals(_root.filters.toString(), "");
+    check_equals(_root.filters.toString(), "");
 
     _root.filters = [ 1, 3, 4, 5 ];
-    xcheck_equals(_root.filters.length, 0);
-    xcheck_equals(_root.filters.toString(), "");
+    check_equals(_root.filters.length, 0);
+    check_equals(_root.filters.toString(), "");
 
     _root.filters = [ new flash.filters.ConvolutionFilter() ];
     xcheck_equals(_root.filters.length, 1);
@@ -1148,7 +1148,7 @@ check_equals(typeof(this.$version), 'undefined');
     xcheck_equals(_root.filters.toString(), "[object Object],[object Object]");
     
     _root.filters = 34;
-    xcheck_equals(_root.filters.length, 0);
+    check_equals(_root.filters.length, 0);
 
     fake = {};
     fake.length = 3;
@@ -1175,7 +1175,7 @@ check_equals(typeof(this.$version), 'undefined');
     _global.Array = backup;
     
     _root.filters = "";
-    xcheck_equals(_root.filters.length, 0);
+    check_equals(_root.filters.length, 0);
 
 #endif
 

-----------------------------------------------------------------------

Summary of changes:
 libcore/asobj/MovieClip_as.cpp          |   11 +++++++++++
 testsuite/actionscript.all/MovieClip.as |   28 ++++++++++++++--------------
 2 files changed, 25 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
Gnash