[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1629-gb068dc8

[Sandro Santilli]

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  b068dc8074ab77e4838a2b0f806089ba257ad4ca (commit)
      from  eb4e214269a6f54542f8e74fc19de5d8b92f7cbb (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=b068dc8074ab77e4838a2b0f806089ba257ad4ca


commit b068dc8074ab77e4838a2b0f806089ba257ad4ca
Author: Sandro Santilli <address@hidden>
Date:   Wed Jun 26 22:31:29 2013 +0200

    Fix NetStream as object as version 7+. Expect successes

diff --git a/libcore/asobj/NetStream_as.cpp b/libcore/asobj/NetStream_as.cpp
index d04619b..0665e3e 100644
--- a/libcore/asobj/NetStream_as.cpp
+++ b/libcore/asobj/NetStream_as.cpp
@@ -1859,14 +1859,6 @@ 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);
-    }
-
 }
 
 // Function to attach the properties of prototype
diff --git a/testsuite/actionscript.all/NetStream.as 
b/testsuite/actionscript.all/NetStream.as
index 8882f83..35a37d4 100644
--- a/testsuite/actionscript.all/NetStream.as
+++ b/testsuite/actionscript.all/NetStream.as
@@ -52,26 +52,26 @@ check_equals ( typeof(netstreamObj), 'object' );
  * when the NetStream connection is established.             *
  *                                                           */
 
-xcheck(! NetStream.prototype.hasOwnProperty('currentFps'));
+check(! NetStream.prototype.hasOwnProperty('currentFps'));
 check(! netstreamObj.hasOwnProperty('currentFps'));
 
-xcheck(! NetStream.prototype.hasOwnProperty('bufferLength'));
+check(! NetStream.prototype.hasOwnProperty('bufferLength'));
 check(! netstreamObj.hasOwnProperty('bufferLength'));
 
-xcheck(! NetStream.prototype.hasOwnProperty('bufferTime'));
+check(! NetStream.prototype.hasOwnProperty('bufferTime'));
 check(! netstreamObj.hasOwnProperty('bufferTime'));
 
-xcheck(! NetStream.prototype.hasOwnProperty('liveDelay'));
+check(! NetStream.prototype.hasOwnProperty('liveDelay'));
 check(! netstreamObj.hasOwnProperty('liveDelay'));
 
-xcheck(! NetStream.prototype.hasOwnProperty('time'));
+check(! NetStream.prototype.hasOwnProperty('time'));
 check(! netstreamObj.hasOwnProperty('time'));
 
 /* Added in SWF7 (still apply to SWF6) */
-xcheck(! NetStream.prototype.hasOwnProperty('bytesLoaded'));
+check(! NetStream.prototype.hasOwnProperty('bytesLoaded'));
 check(! netstreamObj.hasOwnProperty('bytesLoaded'));
 
-xcheck(! NetStream.prototype.hasOwnProperty('bytesTotal'));
+check(! NetStream.prototype.hasOwnProperty('bytesTotal'));
 check(! netstreamObj.hasOwnProperty('bytesTotal'));
 
 
@@ -154,42 +154,42 @@ check_equals(typeof(netstreamObj.onMetaData), 'string');
 // currentFps (read-only)
 check_equals ( typeof(netstreamObj.currentFps), 'undefined' );
 netstreamObj.currentFps = 'string';
-xcheck_equals ( typeof(netstreamObj.currentFps), 'string' );
+check_equals ( typeof(netstreamObj.currentFps), 'string' );
 netstreamObj.currentFps = false;
-xcheck_equals ( typeof(netstreamObj.currentFps), 'boolean' );
+check_equals ( typeof(netstreamObj.currentFps), 'boolean' );
 
 // bufferLength (read-only)
-xcheck_equals ( typeof(netstreamObj.bufferLength), 'undefined' );
+check_equals ( typeof(netstreamObj.bufferLength), 'undefined' );
 netstreamObj.bufferLength = 'string';
 
-xcheck_equals ( typeof(netstreamObj.bufferLength), 'string' );
+check_equals ( typeof(netstreamObj.bufferLength), 'string' );
 netstreamObj.bufferLength = false;
-xcheck_equals ( typeof(netstreamObj.bufferLength), 'boolean' );
+check_equals ( typeof(netstreamObj.bufferLength), 'boolean' );
 
 // bufferTime
-xcheck_equals ( typeof(netstreamObj.bufferTime), 'undefined' );
+check_equals ( typeof(netstreamObj.bufferTime), 'undefined' );
 netstreamObj.setBufferTime(10);
-xcheck_equals(netstreamObj.bufferTime, NULL);
+check_equals(netstreamObj.bufferTime, NULL);
 netstreamObj.bufferTime = 20;
-xcheck_equals(netstreamObj.bufferTime, 20);
+check_equals(netstreamObj.bufferTime, 20);
 netstreamObj.setBufferTime = 30;
-xcheck_equals(netstreamObj.bufferTime, 20);
+check_equals(netstreamObj.bufferTime, 20);
 netstreamObj.setBufferTime(false);
-xcheck_equals(netstreamObj.bufferTime, 20);
+check_equals(netstreamObj.bufferTime, 20);
 netstreamObj.setBufferTime('string');
-xcheck_equals(netstreamObj.bufferTime, 20);
+check_equals(netstreamObj.bufferTime, 20);
 netstreamObj.setBufferTime('5');
-xcheck_equals(netstreamObj.bufferTime, 20);
+check_equals(netstreamObj.bufferTime, 20);
 
 // liveDelay (read-only)
 check_equals ( typeof(netstreamObj.liveDelay), 'undefined' );
 netstreamObj.liveDelay = 'string';
-xcheck_equals ( typeof(netstreamObj.liveDelay), 'string' );
+check_equals ( typeof(netstreamObj.liveDelay), 'string' );
 
 // time (read-only)
-xcheck_equals ( typeof(netstreamObj.time), 'undefined' );
+check_equals ( typeof(netstreamObj.time), 'undefined' );
 netstreamObj.time = 'string';
-xcheck_equals ( typeof(netstreamObj.time), 'string' );
+check_equals ( typeof(netstreamObj.time), 'string' );
 
 
 /* Two properties added in SWF7 */

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

Summary of changes:
 libcore/asobj/NetStream_as.cpp          |    8 -----
 testsuite/actionscript.all/NetStream.as |   44 +++++++++++++++---------------
 2 files changed, 22 insertions(+), 30 deletions(-)


hooks/post-receive
-- 
Gnash