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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/12/14 22:01:24

Modified files:
        .              : ChangeLog 
        server         : sprite_instance.cpp sprite_instance.h 
        server/parser  : movie_def_impl.cpp movie_def_impl.h 
                         movie_definition.h sprite_definition.h 

Log message:
        Remove dead init actions code.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5178&r2=1.5179
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.414&r2=1.415
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.158&r2=1.159
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.cpp?cvsroot=gnash&r1=1.94&r2=1.95
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.h?cvsroot=gnash&r1=1.64&r2=1.65
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_definition.h?cvsroot=gnash&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/sprite_definition.h?cvsroot=gnash&r1=1.34&r2=1.35

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5178
retrieving revision 1.5179
diff -u -b -r1.5178 -r1.5179
--- ChangeLog   14 Dec 2007 20:51:19 -0000      1.5178
+++ ChangeLog   14 Dec 2007 22:01:23 -0000      1.5179
@@ -1,5 +1,13 @@
 2007-12-14 Sandro Santilli <address@hidden>
 
+       * server/sprite_instance.{cpp,h}, 
+         server/parser/movie_def_impl.{cpp,h},
+         server/parser/movie_definition.h,
+         server/parser/sprite_definition.h:
+         Remove dead init actions code. 
+
+2007-12-14 Sandro Santilli <address@hidden>
+
        * gui/gui.cpp, server/as_environment.cpp, server/as_value.cpp,
          server/character.cpp, server/character.h,
          server/movie_instance.cpp, server/movie_instance.h,

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.414
retrieving revision 1.415
diff -u -b -r1.414 -r1.415
--- server/sprite_instance.cpp  14 Dec 2007 20:51:20 -0000      1.414
+++ server/sprite_instance.cpp  14 Dec 2007 22:01:24 -0000      1.415
@@ -1829,7 +1829,6 @@
        m_has_looped(false),
        is_jumping_back(false),
        _callingFrameActions(false),
-       //m_init_actions_executed(),
        m_as_environment(),
        m_has_key_event(false),
        m_has_mouse_event(false),
@@ -1846,9 +1845,6 @@
        //m_root->add_ref();    // @@ circular!
        m_as_environment.set_target(this);
 
-       // Initialize the flags for init action executed.
-       //m_init_actions_executed.assign(m_def->get_frame_count(), false);
-
        // TODO: have the 'MovieClip' constructor take care of this !
        attachMovieClipProperties(*this);
 
@@ -2605,9 +2601,6 @@
                }
        }
 
-       // Mark this frame's init actions as executed 
-       //m_init_actions_executed.insert(frame);
-
        testInvariant();
 }
 

Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -b -r1.158 -r1.159
--- server/sprite_instance.h    14 Dec 2007 20:51:20 -0000      1.158
+++ server/sprite_instance.h    14 Dec 2007 22:01:24 -0000      1.159
@@ -979,9 +979,6 @@
        // true is we're calling frame actions
        bool _callingFrameActions;
 
-       // a bit-array class would be ideal for this
-       //std::set<size_t>      m_init_actions_executed;
-
        /// This timeline's variable scope
        as_environment  m_as_environment;
 

Index: server/parser/movie_def_impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.cpp,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -b -r1.94 -r1.95
--- server/parser/movie_def_impl.cpp    10 Dec 2007 10:25:56 -0000      1.94
+++ server/parser/movie_def_impl.cpp    14 Dec 2007 22:01:24 -0000      1.95
@@ -1050,14 +1050,4 @@
 }
 #endif // GNASH_USE_GC
 
-void
-movie_def_impl::add_init_action(ControlTag* e, int cid)
-{
-       assert(e);
-       if ( m_init_action_defined.insert(cid).second )
-       {
-               addControlTag(e); // ownership transferred
-       }
-}
-
 } // namespace gnash

Index: server/parser/movie_def_impl.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.h,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- server/parser/movie_def_impl.h      4 Dec 2007 11:45:32 -0000       1.64
+++ server/parser/movie_def_impl.h      14 Dec 2007 22:01:24 -0000      1.65
@@ -217,9 +217,6 @@
        /// Movie control events for each frame.
        PlayListMap m_playlist;
 
-       /// A map to track init actions ids (subsequent init actions for the 
same id have to be discarded)
-       std::set<int> m_init_action_defined;
-
        /// 0-based frame #'s
        typedef std::map<std::string, size_t> NamedFrameMap;
        NamedFrameMap _namedFrames;
@@ -493,10 +490,6 @@
            m_playlist[_frames_loaded].push_back(tag);
        }
 
-       /// Need to execute the given tag before entering the
-       /// currently-loading frame for the first time.
-       void    add_init_action(ControlTag* e, int cid);
-
        // See dox in movie_definition.h
        //
        // locks _namedFramesMutex and _frames_loaded_mutex

Index: server/parser/movie_definition.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_definition.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- server/parser/movie_definition.h    1 Dec 2007 01:08:09 -0000       1.38
+++ server/parser/movie_definition.h    14 Dec 2007 22:01:24 -0000      1.39
@@ -334,16 +334,6 @@
        {
        }
 
-       /// \brief
-       /// Add an init action to the frame currently being loaded
-       /// and the specified character id
-       //
-       /// The default implementation is a no-op.
-       ///
-       virtual void    add_init_action(ControlTag* /*c*/, int /*cid*/)
-       {
-       }
-
        /// Labels the frame currently being loaded with the given name. 
        //
        /// A copy of the name string is made and kept in this object.

Index: server/parser/sprite_definition.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/sprite_definition.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- server/parser/sprite_definition.h   23 Nov 2007 12:21:27 -0000      1.34
+++ server/parser/sprite_definition.h   14 Dec 2007 22:01:24 -0000      1.35
@@ -300,16 +300,6 @@
                m_playlist[m_loading_frame].push_back(c);
        }
 
-       /// Overridden just for complaining  about malformed SWF
-       //
-       /// Sprite def's should not have do_init_action tags in them!  (@@ 
correct?)
-       virtual void    add_init_action(ControlTag* /*c*/, int /*cid*/)
-       {
-               IF_VERBOSE_MALFORMED_SWF (
-               log_swferror(_("sprite_definition::add_init_action called!  
Ignored"));
-               );
-       }
-
        // See dox in movie_definition.h
        virtual void    add_frame_name(const std::string& name);