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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/06/16 09:08:17

Modified files:
        .              : ChangeLog 
        server/asobj   : NetStream.cpp 

Log message:
        ops, forgot NetStream.cpp

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3557&r2=1.3558
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStream.cpp?cvsroot=gnash&r1=1.65&r2=1.66

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3557
retrieving revision 1.3558
diff -u -b -r1.3557 -r1.3558
--- ChangeLog   16 Jun 2007 09:07:33 -0000      1.3557
+++ ChangeLog   16 Jun 2007 09:08:15 -0000      1.3558
@@ -1,6 +1,6 @@
 2007-06-16 Sandro Santilli <address@hidden>
 
-       * server/asobj/NetStream.h: implement markReachableResources.
+       * server/asobj/NetStream.{h,cpp}: implement markReachableResources.
        * server/asobj/gen-asclass.sh: updated template to include
          a sample of a markReachableResources implementation.
        * server/asobj/LoadVars.cpp: implement markReachableResources

Index: server/asobj/NetStream.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStream.cpp,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- server/asobj/NetStream.cpp  15 Jun 2007 18:51:04 -0000      1.65
+++ server/asobj/NetStream.cpp  16 Jun 2007 09:08:16 -0000      1.66
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: NetStream.cpp,v 1.65 2007/06/15 18:51:04 strk Exp $ */
+/* $Id: NetStream.cpp,v 1.66 2007/06/16 09:08:16 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -461,6 +461,12 @@
                return;
        }
 
+       size_t initialStackSize = m_env->stack_size();
+       if ( initialStackSize > 0 )
+       {
+               log_debug("NetStream environment stack not empty at start of 
processStatusNotifications");
+       }
+
        StatusCode code;
        while (1)
        {
@@ -476,6 +482,14 @@
 
                m_env->push_val(as_value(o.get()));
                call_method(status, m_env, this, 1, m_env->get_top_index() );
+
+       }
+
+       // clear the stack after method execution
+       if ( m_env->stack_size() > initialStackSize )
+       {
+               log_debug("NetStream environment stack not empty at end of 
processStatusNotifications");
+               m_env->drop(m_env->stack_size() - initialStackSize);
        }
 
 
@@ -628,5 +642,16 @@
        _statusQueue.clear();
 }
 
+void
+NetStream::markReachableResources() const
+{
+
+       if ( _netCon ) _netCon->setReachable();
+
+       if ( m_statusHandler ) m_statusHandler->setReachable();
+
+       // Invoke generic as_object marker
+       markAsObjectReachable();
+}
 
 } // end of gnash namespace