CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/09/13 10:14:57
Modified files:
. : ChangeLog
server : sprite_instance.cpp sprite_instance.h
Log message:
* server/sprite_instance.{cpp,h}: drop obsoleted oldDisplayList.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4301&r2=1.4302
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.338&r2=1.339
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.137&r2=1.138
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4301
retrieving revision 1.4302
diff -u -b -r1.4301 -r1.4302
--- ChangeLog 13 Sep 2007 09:59:23 -0000 1.4301
+++ ChangeLog 13 Sep 2007 10:14:56 -0000 1.4302
@@ -1,5 +1,9 @@
2007-09-13 Sandro Santilli <[EMAIL PROTECTED]>
+ * server/sprite_instance.{cpp,h}: drop obsoleted oldDisplayList.
+
+2007-09-13 Sandro Santilli <[EMAIL PROTECTED]>
+
* server/sprite_instance.cpp (sprite_create_text_field):
fix log_aserror calls (too few, too many args and
log_error to log_aserror).
Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.338
retrieving revision 1.339
diff -u -b -r1.338 -r1.339
--- server/sprite_instance.cpp 13 Sep 2007 09:59:23 -0000 1.338
+++ server/sprite_instance.cpp 13 Sep 2007 10:14:57 -0000 1.339
@@ -1723,7 +1723,6 @@
character(parent, id),
m_root(r),
m_display_list(),
- oldDisplayList(),
_drawable(new DynamicShape),
_drawable_inst(_drawable->create_character_instance(this, 0)),
//m_goto_frame_action_list(),
@@ -2279,10 +2278,9 @@
#ifdef GNASH_DEBUG
size_t frame_count = m_def->get_frame_count();
- log_debug(_("Advance_sprite for sprite '%s' - frame %u/%u "
- "- oldDIsplayList has %d elements"),
+ log_debug(_("Advance_sprite for sprite '%s' - frame %u/%u "),
getTarget().c_str(), m_current_frame,
- frame_count, oldDisplayList.size());
+ frame_count);
#endif
// Advance DisplayList elements already placed (even if looping back ?)
@@ -2344,9 +2342,6 @@
//execute_frame_tags(m_current_frame);
}
#endif
-
- // Remember current state of the DisplayList for next iteration
- oldDisplayList = m_display_list;
}
// child movieclip advance
@@ -2355,10 +2350,9 @@
// GNASH_REPORT_FUNCTION;
#ifdef GNASH_DEBUG
- log_debug(_("Advance sprite '%s' at frame %u/%u "
- "- oldDIsplayList has %d elements"),
+ log_debug(_("Advance sprite '%s' at frame %u/%u"),
getTargetPath().c_str(), m_current_frame,
- get_frame_count(), oldDisplayList.size());
+ get_frame_count());
#endif
// child movieclip frame rate is the same the root movieclip frame rate
@@ -3094,7 +3088,6 @@
// Clear current display list and
// its backup
m_display_list.clear();
- oldDisplayList.clear();
// TODO: wipe out all members !!
clearProperties();
@@ -3299,10 +3292,6 @@
// We *might* avoid this, but better safe then sorry
m_def->ensure_frame_loaded(0);
- // Backup the DisplayList *before* manipulating it !
- // TODO: still needed ? what for ?
- assert( oldDisplayList.empty() );
-
// Execute CONSTRUCT event immediately
on_event(event_id::CONSTRUCT);
if (isUnloaded())
@@ -3683,9 +3672,8 @@
void
sprite_instance::cleanupDisplayList()
{
- //log_debug("%s.cleanDisplayList() called, current dlist is %p, old is
%p", getTarget().c_str(), (void*)&m_display_list, (void*)&oldDisplayList);
+ //log_debug("%s.cleanDisplayList() called, current dlist is %p",
getTarget().c_str(), (void*)&m_display_list);
m_display_list.removeUnloaded();
- oldDisplayList = m_display_list; // TODO: move unloaded-cleanup of
oldDisplayList in advance_sprite ?
}
#ifdef GNASH_USE_GC
@@ -3704,10 +3692,6 @@
m_display_list.visitByReversePlacement(marker);
- oldDisplayList.visitAll(marker);
-
- oldDisplayList.visitByReversePlacement(marker);
-
_drawable->setReachable();
_drawable_inst->setReachable();
Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -b -r1.137 -r1.138
--- server/sprite_instance.h 7 Sep 2007 11:56:06 -0000 1.137
+++ server/sprite_instance.h 13 Sep 2007 10:14:57 -0000 1.138
@@ -863,13 +863,6 @@
/// Current Display List contents.
DisplayList m_display_list;
- /// oldDisplayList is a backup of current DisplayList
- /// (m_display_list) updated at each call to ::advance
- /// and at first call to ::construct (it's empty in
- /// this latter case).
- /// It will be used to control actions execution order.
- DisplayList oldDisplayList;
-
/// The canvas for dynamic drawing
//
/// WARNING: since DynamicShape is a character_def, which is
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
