[Gnash-commit] /srv/bzr/gnash/trunk r12214: Formatting, comments, drop obsolete code.

[Benjamin Wolsey]

------------------------------------------------------------
revno: 12214 [merge]
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Thu 2010-06-03 17:39:55 +0200
message:
  Formatting, comments, drop obsolete code.
modified:
  libcore/DisplayList.cpp
  libcore/MovieClip.cpp

=== modified file 'libcore/DisplayList.cpp'
--- a/libcore/DisplayList.cpp   2010-01-11 06:41:38 +0000
+++ b/libcore/DisplayList.cpp   2010-05-27 11:01:11 +0000
@@ -320,9 +320,9 @@
         // extend invalidated bounds
         // WARNING: when a new Button DisplayObject is added,
         //          the invalidated bounds computation will likely
-        //          be bogus, as the actual DisplayObject shown is not 
instantiated
-        //          until ::stagePlacementCallback for buttons (I'd
-        //          say this is a bug in Button). 
+        //          be bogus, as the actual DisplayObject shown is not
+        //          instantiated until stagePlacementCallback for buttons
+        //          (I'd say this is a bug in Button). 
         ch->extend_invalidated_bounds(old_ranges);                
 
     }

=== modified file 'libcore/MovieClip.cpp'
--- a/libcore/MovieClip.cpp     2010-05-20 09:57:10 +0000
+++ b/libcore/MovieClip.cpp     2010-05-27 11:01:27 +0000
@@ -1298,16 +1298,11 @@
 void
 MovieClip::increment_frame_and_check_for_loop()
 {
-    size_t frame_count = get_loaded_frames(); 
-    if ( ++_currentFrame >= frame_count )
-    {
+    const size_t frame_count = get_loaded_frames(); 
+    if (++_currentFrame >= frame_count) {
         // Loop.
         _currentFrame = 0;
         _hasLooped = true;
-        if (frame_count > 1)
-        {
-            //_displayList.reset();
-        }
     }
 
 }