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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/09/03 11:41:54

Modified files:
        .              : ChangeLog 
        server         : sprite_instance.cpp 

Log message:
                * server/sprite_instance.cpp (advance_sprite): don't call
                  removeUnloaded on DisplayList copies (their ::advance will 
skip
                  unloaded elements, anyway).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4198&r2=1.4199
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.321&r2=1.322

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4198
retrieving revision 1.4199
diff -u -b -r1.4198 -r1.4199
--- ChangeLog   3 Sep 2007 10:54:52 -0000       1.4198
+++ ChangeLog   3 Sep 2007 11:41:54 -0000       1.4199
@@ -1,5 +1,8 @@
 2007-09-03 Sandro Santilli <address@hidden>
 
+       * server/sprite_instance.cpp (advance_sprite): don't call
+         removeUnloaded on DisplayList copies (their ::advance will skip
+         unloaded elements, anyway).
        * server/as_value.cpp (to_sprite): make the dangling reference a
          debugging info, not an error.
 

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -b -r1.321 -r1.322
--- server/sprite_instance.cpp  2 Sep 2007 00:12:48 -0000       1.321
+++ server/sprite_instance.cpp  3 Sep 2007 11:41:54 -0000       1.322
@@ -2332,7 +2332,7 @@
        // to need oldDisplayList again later, to extract the list of
        // newly added characters
        //
-       //oldDisplayList.removeUnloaded(); // TODO: clean oldDisplayList here 
instead than in cleanupDisplayList ?
+       //oldDisplayList.removeUnloaded(); // don't call removeUnloaded
        oldDisplayList.sort(); // this is to avoid failing assertions, since we 
know characters might have changed depth...
        DisplayList stillAlive = oldDisplayList;
        stillAlive.clear_except(m_display_list, false);
@@ -2357,7 +2357,7 @@
        //
        DisplayList newlyAdded = m_display_list;
        //log_msg(_("%s has %d current children and %d old children"), 
getTargetPath().c_str(), m_display_list.size(), oldDisplayList.size());
-       newlyAdded.removeUnloaded();
+       //newlyAdded.removeUnloaded();
        newlyAdded.clear(oldDisplayList, false);
        //log_msg(_("Advancing %d newly-added (after clearing) children of 
%s"), newlyAdded.size(), getTargetPath().c_str());
        newlyAdded.advance(delta_time);
@@ -3658,7 +3658,7 @@
 {
         //log_debug("%s.cleanDisplayList() called, current dlist is %p, old is 
%p", getTarget().c_str(), (void*)&m_display_list, (void*)&oldDisplayList);
        m_display_list.removeUnloaded();
-       oldDisplayList.removeUnloaded(); // TODO: move unloaded-cleanup of 
oldDisplayList in advance_sprite ?
+       oldDisplayList = m_display_list; // TODO: move unloaded-cleanup of 
oldDisplayList in advance_sprite ?
 }
 
 #ifdef GNASH_USE_GC