[Gnash-commit] gnash ChangeLog server/movie_root.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/03/06 19:25:59

Modified files:
        .              : ChangeLog 
        server         : movie_root.cpp 

Log message:
        character mouse and key listeners also don't need to be scanned again as
        all left would be on stage.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5829&r2=1.5830
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.164&r2=1.165

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5829
retrieving revision 1.5830
diff -u -b -r1.5829 -r1.5830
--- ChangeLog   6 Mar 2008 18:51:18 -0000       1.5829
+++ ChangeLog   6 Mar 2008 19:25:57 -0000       1.5830
@@ -1,5 +1,11 @@
 2008-03-06 Sandro Santilli <address@hidden>
 
+       * server/movie_root.cpp (markReachableResources): character mouse and
+         key listeners also don't need to be scanned again as all left would
+         be on stage.
+
+2008-03-06 Sandro Santilli <address@hidden>
+
        * server/fill_style.cpp: cast log arg to int, or boost::format will
          interpret as a character (string).
        * server/movie_root.cpp (markReachableResources): don't mark live

Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -b -r1.164 -r1.165
--- server/movie_root.cpp       6 Mar 2008 18:51:18 -0000       1.164
+++ server/movie_root.cpp       6 Mar 2008 19:25:58 -0000       1.165
@@ -1017,9 +1017,6 @@
        // NOTE: can throw ActionLimitException
        executeTimers();
 
-
-       cleanupUnloadedListeners();
-
        // Process queued actions
        // NOTE: can throw ActionLimitException
        processActionQueue();
@@ -1036,6 +1033,9 @@
        // from the display lists
        cleanupDisplayList();
 
+       // Delete unloaded characters from the listeners set
+       cleanupUnloadedListeners();
+
 #ifdef GNASH_USE_GC
        // Run the garbage collector (step back !!)
        GC::get().collect();
@@ -1564,11 +1564,13 @@
         }
     }
 
-    // Mark character key listeners
-    std::for_each(m_key_listeners.begin(), m_key_listeners.end(), 
boost::bind(&character::setReachable, _1));
-
-    // Mark character mouse listeners
-    std::for_each(m_mouse_listeners.begin(), m_mouse_listeners.end(), 
boost::bind(&character::setReachable, _1));
+    // NOTE: cleanupUnloadedListeners should have cleaned up all unloaded key 
listeners 
+    //       the remaining ones should be marked by their parents
+    //std::for_each(m_key_listeners.begin(), m_key_listeners.end(), 
boost::bind(&character::setReachable, _1));
+
+    // NOTE: cleanupUnloadedListeners should have cleaned up all unloaded 
mouse listeners 
+    //       the remaining ones should be marked by their parents
+    //std::for_each(m_mouse_listeners.begin(), m_mouse_listeners.end(), 
boost::bind(&character::setReachable, _1));
 
     // Mark global Key object
     if ( _keyobject ) _keyobject->setReachable();