CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/09/05 19:27:50
Modified files:
. : ChangeLog
server : dlist.cpp
Log message:
* server/dlist.cpp (removeUnloaded): also remove from
_timelineChars.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4233&r2=1.4234
http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.cpp?cvsroot=gnash&r1=1.87&r2=1.88
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4233
retrieving revision 1.4234
diff -u -b -r1.4233 -r1.4234
--- ChangeLog 5 Sep 2007 19:06:21 -0000 1.4233
+++ ChangeLog 5 Sep 2007 19:27:49 -0000 1.4234
@@ -1,5 +1,9 @@
2007-09-05 Sandro Santilli <[EMAIL PROTECTED]>
+ * server/dlist.cpp (removeUnloaded): also remove from _timelineChars.
+
+2007-09-05 Sandro Santilli <[EMAIL PROTECTED]>
+
* testsuite/misc-ming.all/action_execution_order_test3.c: attempt
to test REMOVEOBJECT before DOACTION (failed though, as Ming seems
to keep placing REMOVEOBJECT tags adjacent instead).
Index: server/dlist.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/dlist.cpp,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- server/dlist.cpp 5 Sep 2007 15:48:08 -0000 1.87
+++ server/dlist.cpp 5 Sep 2007 19:27:49 -0000 1.88
@@ -1127,18 +1127,16 @@
void
DisplayList::removeUnloaded()
{
- // TODO: erase from begin() to beginNonRemoved()-1 ?
- //log_debug("removeUnloaded called (dlist:%p)", (void*)this);
testInvariant();
- //log_debug(" first invTest passed, _charsByDepth have %d entries",
_charsByDepth.size());
- //dump();
+
+ // TODO: erase from begin() to beginNonRemoved()-1 ?
iterator last = std::remove_if(_charsByDepth.begin(),
_charsByDepth.end(), boost::bind(&character::isUnloaded, _1));
_charsByDepth.erase(last, _charsByDepth.end());
- //log_debug(" After remove_if, _charsByDepth have %d entries - dumping
them", _charsByDepth.size());
- //dump();
- //log_debug(" Now testing invariant again");
+
+ last = std::remove_if(_timelineChars.begin(), _timelineChars.end(),
boost::bind(&character::isUnloaded, _1));
+ _timelineChars.erase(last, _timelineChars.end());
+
testInvariant();
- //log_debug(" second invTest passed");
}
} // namespace gnash
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
