[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1616-ge309f67

[Rob Savoye]

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  e309f67f4436abd1fa7d31981b556ee66052113e (commit)
      from  ceaf5e4a988750da050514de5d36f22787d5257e (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=e309f67f4436abd1fa7d31981b556ee66052113e


commit e309f67f4436abd1fa7d31981b556ee66052113e
Author: George Thomas <address@hidden>
Date:   Fri Mar 1 12:21:27 2013 -0700

    Converting prototype members into members of the object when flash7 and 
above. Updated the test cases. Added xfail for livedelay as it has not yet been 
implemented

diff --git a/libcore/asobj/NetStream_as.cpp b/libcore/asobj/NetStream_as.cpp
index 7b23641..d04619b 100644
--- a/libcore/asobj/NetStream_as.cpp
+++ b/libcore/asobj/NetStream_as.cpp
@@ -1859,6 +1859,13 @@ attachNetStreamInterface(as_object& o)
     o.init_member("receiveAudio", gl.createFunction(netstream_receiveAudio));
     o.init_member("receiveVideo", gl.createFunction(netstream_receiveVideo));
     o.init_member("send", vm.getNative(2101, 3));
+   
+    // Attching to the object itself the prototype properties 
+    // in case of swf7 and above 
+    if (vm.getSWFVersion () >= 7) {
+       
+        attachPrototypeProperties (o);
+    }
 
 }
 
diff --git a/testsuite/misc-haxe.all/classes.all/net/NetStream_as.hx 
b/testsuite/misc-haxe.all/classes.all/net/NetStream_as.hx
index a973d7b..d6771f4 100644
--- a/testsuite/misc-haxe.all/classes.all/net/NetStream_as.hx
+++ b/testsuite/misc-haxe.all/classes.all/net/NetStream_as.hx
@@ -74,50 +74,50 @@ class NetStream_as {
        // existance of a property, and don't test the functionality at all. 
This
        // is primarily useful only to test completeness of the API 
implementation.
        //FIXME: This read-only property must be initialized before it can be 
tested
-       if (Type.typeof(x1.bufferLength) == ValueType.TNull) {
+       if (Type.typeof(x1.bufferLength) == ValueType.TInt) {
            DejaGnu.pass("NetStream.bufferLength property exists");
        } else {
            DejaGnu.fail("NetStream.bufferLength property doesn't exist");
        }
-       if (Type.typeof(x1.bufferTime) == ValueType.TNull) {
+       if (Type.typeof(x1.bufferTime) == ValueType.TFloat) {
            DejaGnu.pass("NetStream.bufferTime property exists");
        } else {
            DejaGnu.fail("NetStream.bufferTime property doesn't exist");
        }
-       if (Type.typeof(x1.bytesLoaded) == ValueType.TNull) {
+       if (Type.typeof(x1.bytesLoaded) == ValueType.TInt) {
            DejaGnu.pass("NetStream.bytesLoaded property exists");
        } else {
            DejaGnu.fail("NetStream.bytesLoaded property doesn't exist");
        }
 #if flash9
-       if (Type.typeof(x1.bytesTotal) == ValueType.TNull) {
+       if (Type.typeof(x1.bytesTotal) == ValueType.TFloat) {
            DejaGnu.pass("NetStream.bytesTotal property exists");
        } else {
            DejaGnu.fail("NetStream.bytesTotal property doesn't exist");
        }
 #end
-       if (Type.typeof(x1.time) == ValueType.TNull) {
+       if (Type.typeof(x1.time) == ValueType.TInt) {
            DejaGnu.pass("NetStream.time property exists");
        } else {
            DejaGnu.fail("NetStream.time property doesn't exist");
        }
 #if !flash9
-       if (Type.typeof(x1.bytesTotal) == ValueType.TNull) {
+       if (Type.typeof(x1.bytesTotal) == ValueType.TInt) {
            DejaGnu.pass("NetStream.bytesTotal property exists");
        } else {
            DejaGnu.fail("NetStream.bytesTotal property doesn't exist");
        }
-       if (Type.typeof(x1.currentFps) == ValueType.TNull) {
+       if (Type.typeof(x1.currentFps) == ValueType.TInt) {
            DejaGnu.pass("NetStream.currentFps property exists");
        } else {
            DejaGnu.fail("NetStream.currentFps property doesn't exist");
        }
 #end
        // Not implemented for gnash
-       if (Type.typeof(x1.liveDelay) == ValueType.TNull) {
-           DejaGnu.pass("NetStream.liveDelay property exists");
+       if (Type.typeof(x1.liveDelay) == ValueType.TInt) {
+           DejaGnu.xpass("NetStream.liveDelay property exists");
        } else {
-           DejaGnu.fail("NetStream.liveDelay property doesn't exist");
+           DejaGnu.xfail("NetStream.liveDelay property doesn't exist");
        }
 #if flash9
        if (Type.typeof(x1.currentFPS) == ValueType.TInt) {

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

Summary of changes:
 libcore/asobj/NetStream_as.cpp                     |    7 +++++++
 .../misc-haxe.all/classes.all/net/NetStream_as.hx  |   20 ++++++++++----------
 2 files changed, 17 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
Gnash