[Gnash-commit] [SCM] Gnash branch, master, updated. d778ca9331ad8cebca89a0f890384a2a77c6929f

[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  d778ca9331ad8cebca89a0f890384a2a77c6929f (commit)
       via  a33143d4958af44096e906f19d8a835a7b78e4cd (commit)
       via  b56671c0f583a804cbd1ce167d49cbec6788a972 (commit)
      from  7c83f92bd211ab5bdaa9195806093ab6abc465f2 (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=d778ca9331ad8cebca89a0f890384a2a77c6929f


commit d778ca9331ad8cebca89a0f890384a2a77c6929f
Author: Benjamin Wolsey <address@hidden>
Date:   Wed Oct 20 11:32:30 2010 +0200

    Expect failure.

diff --git a/testsuite/actionscript.all/MovieClip.as 
b/testsuite/actionscript.all/MovieClip.as
index a8e2c4a..85d25de 100644
--- a/testsuite/actionscript.all/MovieClip.as
+++ b/testsuite/actionscript.all/MovieClip.as
@@ -1169,7 +1169,7 @@ check_equals(typeof(this.$version), 'undefined');
     ch = _root.filters;
     check_equals(ch.test, undefined);
     ch.toString = backup.prototype.toString;
-    check_equals(ch.toString(), 
+    xcheck_equals(ch.toString(), 
         "[object Object],[object Object],[object Object]");
     
     _global.Array = backup;

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


commit a33143d4958af44096e906f19d8a835a7b78e4cd
Author: Benjamin Wolsey <address@hidden>
Date:   Wed Oct 20 11:30:02 2010 +0200

    More tests.

diff --git a/testsuite/actionscript.all/MovieClip.as 
b/testsuite/actionscript.all/MovieClip.as
index 0e7cf51..a8e2c4a 100644
--- a/testsuite/actionscript.all/MovieClip.as
+++ b/testsuite/actionscript.all/MovieClip.as
@@ -127,7 +127,7 @@ endOfTest = function()
 #endif
 
 #if OUTPUT_VERSION >= 8
-       check_totals(1058); // SWF8+
+       check_totals(1060); // SWF8+
 #endif
 
        play();
@@ -1160,6 +1160,20 @@ check_equals(typeof(this.$version), 'undefined');
     xcheck_equals(_root.filters.toString(),
         "[object Object],[object Object],[object Object]");
 
+    backup = _global.Array;
+
+    called = 0;
+
+    // It uses [], not new Array().
+    _global.Array = function() { this.test = "passed"; };
+    ch = _root.filters;
+    check_equals(ch.test, undefined);
+    ch.toString = backup.prototype.toString;
+    check_equals(ch.toString(), 
+        "[object Object],[object Object],[object Object]");
+    
+    _global.Array = backup;
+    
     _root.filters = "";
     xcheck_equals(_root.filters.length, 0);
 

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


commit b56671c0f583a804cbd1ce167d49cbec6788a972
Author: Benjamin Wolsey <address@hidden>
Date:   Wed Oct 20 11:21:40 2010 +0200

    Add MovieClip.filters tests.

diff --git a/testsuite/actionscript.all/MovieClip.as 
b/testsuite/actionscript.all/MovieClip.as
index 2392dbd..0e7cf51 100644
--- a/testsuite/actionscript.all/MovieClip.as
+++ b/testsuite/actionscript.all/MovieClip.as
@@ -127,7 +127,7 @@ endOfTest = function()
 #endif
 
 #if OUTPUT_VERSION >= 8
-       check_totals(1033); // SWF8+
+       check_totals(1058); // SWF8+
 #endif
 
        play();
@@ -1086,6 +1086,85 @@ check_equals(this.$version, 'fake version');
 check(delete $version);
 check_equals(typeof(this.$version), 'undefined');
 
+// Test filters
+
+// A new array is returned each time; each element is recreated each time.
+// Non-filter objects passed to the setter in the array are ignored.
+// Assigning a non-array also clears the filters.
+// 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);
+
+    _root.filters = 7;
+    xcheck_equals(typeof(_root.filters), "object");
+
+    _root.filters.push(7);
+    xcheck_equals(_root.filters.toString(), "");
+
+    _root.filters.push(new Object());
+    xcheck_equals(_root.filters.toString(), "");
+
+    _root.filters.push(new Date(0));
+    xcheck_equals(_root.filters.toString(), "");
+
+    _root.filters.length = 4;
+    xcheck_equals(_root.filters.toString(), "");
+    xcheck_equals(_root.filters.length, 0);
+
+    _root.filters.push(new flash.filters.ConvolutionFilter());
+    xcheck_equals(_root.filters.toString(), "");
+
+    _root.filters = [ 1, 3, 4, 5 ];
+    xcheck_equals(_root.filters.length, 0);
+    xcheck_equals(_root.filters.toString(), "");
+
+    _root.filters = [ new flash.filters.ConvolutionFilter() ];
+    xcheck_equals(_root.filters.length, 1);
+    xcheck_equals(_root.filters.toString(), "[object Object]");
+
+    _root.filters = [ new flash.filters.ConvolutionFilter(),
+                      new flash.filters.DropShadowFilter() ];
+    xcheck_equals(_root.filters.length, 2);
+    xcheck_equals(_root.filters.toString(), "[object Object],[object Object]");
+
+    // The filters are recreated every time.
+    tmp1 = _root.filters;
+    tmp2 = _root.filters;
+    xcheck(tmp1[0] !== tmp2[0]);
+    
+    _root.filters = [ new flash.filters.ConvolutionFilter(),
+                      new flash.filters.DropShadowFilter(),
+                      "boh!" ];
+    xcheck_equals(_root.filters.length, 2);
+    xcheck_equals(_root.filters.toString(), "[object Object],[object Object]");
+
+    _root.filters = [ new flash.filters.ConvolutionFilter(),
+                      "boh!",
+                      new flash.filters.BlurFilter() ];
+    xcheck_equals(_root.filters.length, 2);
+    xcheck_equals(_root.filters.toString(), "[object Object],[object Object]");
+    
+    _root.filters = 34;
+    xcheck_equals(_root.filters.length, 0);
+
+    fake = {};
+    fake.length = 3;
+    fake[0] = new flash.filters.ConvolutionFilter();
+    fake[1] = new flash.filters.DisplacementMapFilter();
+    fake[2] = new flash.filters.ConvolutionFilter();
+    _root.filters = fake;
+    xcheck_equals(_root.filters.length, 3);
+    xcheck_equals(_root.filters.toString(),
+        "[object Object],[object Object],[object Object]");
+
+    _root.filters = "";
+    xcheck_equals(_root.filters.length, 0);
+
+#endif
+
 //------------------------------------------------
 // Test getProperty 
 //------------------------------------------------

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

Summary of changes:
 testsuite/actionscript.all/MovieClip.as |   95 ++++++++++++++++++++++++++++++-
 1 files changed, 94 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Gnash