[Gnash-commit] gnash ChangeLog server/asobj/NetStream.cpp test...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/03/26 18:37:18

Modified files:
        .              : ChangeLog 
        server/asobj   : NetStream.cpp 
        testsuite/misc-ming.all: NetStream-SquareTest.c 

Log message:
        Elements of the info object passed to NetStream.onStatus are enumerable
        and deletable.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6031&r2=1.6032
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStream.cpp?cvsroot=gnash&r1=1.86&r2=1.87
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/NetStream-SquareTest.c?cvsroot=gnash&r1=1.24&r2=1.25

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6031
retrieving revision 1.6032
diff -u -b -r1.6031 -r1.6032
--- ChangeLog   26 Mar 2008 17:02:24 -0000      1.6031
+++ ChangeLog   26 Mar 2008 18:37:17 -0000      1.6032
@@ -1,3 +1,10 @@
+2008-03-26 Sandro Santilli <address@hidden>
+
+       * server/asobj/NetStream.cpp: make elements of the info object
+         enumerable and deletable.
+       * testsuite/misc-ming.all/NetStream-SquareTest.c: test that elements
+         of the info object passed to onStatus are enumerable and deletable.
+
 2008-03-26 Benjamin Wolsey <address@hidden>
 
        * testsuite/actionscript.all/Global.as: more tests for int().

Index: server/asobj/NetStream.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStream.cpp,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- server/asobj/NetStream.cpp  6 Mar 2008 15:29:57 -0000       1.86
+++ server/asobj/NetStream.cpp  26 Mar 2008 18:37:17 -0000      1.87
@@ -597,8 +597,8 @@
        std::pair<const char*, const char*> info = getStatusCodeInfo(code);
 
        boost::intrusive_ptr<as_object> o = new as_object(getObjectInterface());
-       o->init_member("code",  info.first,  1);
-       o->init_member("level", info.second, 
as_prop_flags::dontDelete|as_prop_flags::dontEnum);
+       o->init_member("code",  info.first,  0); // enumerable, deletable
+       o->init_member("level", info.second, 0); // enumerable, deletable
 
        return o;
 }

Index: testsuite/misc-ming.all/NetStream-SquareTest.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/NetStream-SquareTest.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- testsuite/misc-ming.all/NetStream-SquareTest.c      25 Jan 2008 18:48:30 
-0000      1.24
+++ testsuite/misc-ming.all/NetStream-SquareTest.c      26 Mar 2008 18:37:17 
-0000      1.25
@@ -238,6 +238,28 @@
 
                "stream.onStatus = function(info) {"
 
+               "  if ( ! _root.enumerableStatusInfoChecked ) {"
+               "    _root.check(info.code != undefined);"
+               "    _root.check(info.level != undefined);"
+               "    var tmp = new Array();"
+               "    for (var e in info) tmp.push(e);"
+               "    tmp.sort();"
+               "    _root.check_equals(tmp.length, 2);"
+               "    _root.check_equals(tmp[0], 'code');"
+               "    _root.check_equals(tmp[1], 'level');"
+               "    _root.enumerableStatusInfoChecked=true;"
+               "    var backup = info.code; info.code = 65;"
+               "    _root.check_equals(info.code, 65);"
+               "    _root.check(delete info.code);"
+               "    _root.check_equals(info.code, undefined);"
+               "    info.code = backup;"
+               "    var backup = info.level; info.level = 66;"
+               "    _root.check_equals(info.level, 66);"
+               "    _root.check(delete info.level);"
+               "    _root.check_equals(info.level, undefined);"
+               "    info.level = backup;"
+               "  }"
+
                // Ignore Buffer.Flush for now
                "  if ( info.code == 'NetStream.Buffer.Flush' ) return; "
 
@@ -380,7 +402,7 @@
 
   SWFMovie_nextFrame(mo);
 
-  SWFMovie_add(mo, (SWFBlock)newSWFAction("totals(101); stop();"));
+  SWFMovie_add(mo, (SWFBlock)newSWFAction("totals(112); stop();"));
 
   SWFMovie_nextFrame(mo);