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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/04/01 09:26:55

Modified files:
        .              : ChangeLog 
        server/asobj   : xmlsocket.cpp 
        testsuite/actionscript.all: XMLSocket.as 
        testsuite/swfdec: PASSING 

Log message:
        XMLSocket.onData is a prototype (not instance) member,

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6133&r2=1.6134
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlsocket.cpp?cvsroot=gnash&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/XMLSocket.as?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/swfdec/PASSING?cvsroot=gnash&r1=1.116&r2=1.117

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6133
retrieving revision 1.6134
diff -u -b -r1.6133 -r1.6134
--- ChangeLog   1 Apr 2008 08:04:05 -0000       1.6133
+++ ChangeLog   1 Apr 2008 09:26:53 -0000       1.6134
@@ -1,5 +1,13 @@
 2008-04-01 Sandro Santilli <address@hidden>
 
+       * server/asobj/xmlsocket.cpp: onData is a prototype (not instance)
+         member, and has weird inheritance as shown by swfdec testsuite.
+       * testsuite/actionscript.all/XMLSocket.as: onData is a prototype (not
+         instance) member. The test was wrong.
+       * testsuite/swfdec/PASSING: xml-socket-properties-{5,6,7,8} pass.
+
+2008-04-01 Sandro Santilli <address@hidden>
+
        * testsuite/actionscript.all/Number.as: rounding tests.
        * doc/C/gnashrc.xml: removed, the good one is
          doc/C/usermanual/gnashrc.xml

Index: server/asobj/xmlsocket.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlsocket.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- server/asobj/xmlsocket.cpp  28 Mar 2008 21:30:23 -0000      1.44
+++ server/asobj/xmlsocket.cpp  1 Apr 2008 09:26:54 -0000       1.45
@@ -597,12 +597,20 @@
     o.init_member("connect", new builtin_function(xmlsocket_connect));
     o.init_member("send", new builtin_function(xmlsocket_send));
     o.init_member("close", new builtin_function(xmlsocket_close));
+
+
+    // all this crap to satisfy swfdec testsuite... (xml-socket-properties*)
+    as_object* onDataIface = new as_object(getObjectInterface());
+    as_function* onDataFun = new builtin_function(xmlsocket_onData, 
onDataIface);
+    o.init_member("onData", onDataFun);
+    onDataIface->init_member(NSV::PROP_CONSTRUCTOR, as_value(onDataFun));
 }
 
 static void
 attachXMLSocketProperties(as_object& o)
 {
-    o.init_member("onData", new builtin_function(xmlsocket_onData));
+    // this is attached to proto
+    //o.init_member("onData", new builtin_function(xmlsocket_onData));
 }
 
 // extern (used by Global.cpp)

Index: testsuite/actionscript.all/XMLSocket.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/XMLSocket.as,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- testsuite/actionscript.all/XMLSocket.as     11 Mar 2008 19:31:48 -0000      
1.9
+++ testsuite/actionscript.all/XMLSocket.as     1 Apr 2008 09:26:54 -0000       
1.10
@@ -21,7 +21,7 @@
 // execute it like this gnash -1 -r 0 -v out.swf
 
 
-rcsid="$Id: XMLSocket.as,v 1.9 2008/03/11 19:31:48 strk Exp $";
+rcsid="$Id: XMLSocket.as,v 1.10 2008/04/01 09:26:54 strk Exp $";
 #include "check.as"
 
 check_equals(typeof(XMLSocket), 'function');
@@ -40,15 +40,13 @@
 check(XMLSocket.prototype.hasOwnProperty('connect'));
 check(XMLSocket.prototype.hasOwnProperty('close'));
 check(XMLSocket.prototype.hasOwnProperty('send'));
+check(XMLSocket.prototype.hasOwnProperty('onData'));
 #endif
 
 socketObj = new XMLSocket;
 
 // The default onData handler calls onXML after parsing the code
 check_equals(typeof(socketObj.onData), 'function');
-#if OUTPUT_VERSION >= 6
-check(socketObj.hasOwnProperty('onData'));
-#endif
 
 check_equals(typeof(socketObj), 'object');
 check_equals(socketObj.__proto__, XMLSocket.prototype);

Index: testsuite/swfdec/PASSING
===================================================================
RCS file: /sources/gnash/gnash/testsuite/swfdec/PASSING,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -b -r1.116 -r1.117
--- testsuite/swfdec/PASSING    31 Mar 2008 22:12:06 -0000      1.116
+++ testsuite/swfdec/PASSING    1 Apr 2008 09:26:55 -0000       1.117
@@ -811,3 +811,7 @@
 xml-init-5.swf:2ba1da174f2b1958749fede5667a60c4
 xml-init-5.swf:bb54cac64e38396084a147266f7d9711
 xml-node-init-5.swf:12fd3762a2bfa787b01fc0b8abfaa492
+xml-socket-properties-5.swf:856b75b9d2e45a688649afd247224176
+xml-socket-properties-6.swf:c2a153377e55fd70aed74a5711dc8bfd
+xml-socket-properties-7.swf:ad8a3f3b1ed9a4b6f068f74f003f2260
+xml-socket-properties-8.swf:a97dbf0b46416298ea32e285ea04f74f