[Gnash-commit] gnash ChangeLog server/character.h server/butto...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/01/16 10:20:29

Modified files:
        .              : ChangeLog 
        server         : character.h button_character_instance.h 
                         edit_text_character.h sprite_instance.h 
                         video_stream_instance.h 

Log message:
        const-correct wantsInstanceName() and isActionScriptReferenceable()
        virtual methods. Added a getClosestASReferenceableAncestor() method.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5410&r2=1.5411
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.h?cvsroot=gnash&r1=1.119&r2=1.120
http://cvs.savannah.gnu.org/viewcvs/gnash/server/button_character_instance.h?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.h?cvsroot=gnash&r1=1.62&r2=1.63
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.164&r2=1.165
http://cvs.savannah.gnu.org/viewcvs/gnash/server/video_stream_instance.h?cvsroot=gnash&r1=1.24&r2=1.25

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5410
retrieving revision 1.5411
diff -u -b -r1.5410 -r1.5411
--- ChangeLog   16 Jan 2008 08:42:16 -0000      1.5410
+++ ChangeLog   16 Jan 2008 10:20:28 -0000      1.5411
@@ -1,5 +1,12 @@
 2008-01-16 Sandro Santilli <address@hidden>
 
+       * server/: character.h, button_character_instance.h,
+         edit_text_character.h, sprite_instance.h, video_stream_instance.h:
+         const-correct wantsInstanceName() and isActionScriptReferenceable()
+         virtual methods. Added a getClosestASReferenceableAncestor() method.
+
+2008-01-16 Sandro Santilli <address@hidden>
+
        * gui/Player.cpp: fix confusing SECURITY message about sandbox
          appending.
        * server/impl.cpp: remove dead code.

Index: server/character.h
===================================================================
RCS file: /sources/gnash/gnash/server/character.h,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -b -r1.119 -r1.120
--- server/character.h  26 Dec 2007 12:35:13 -0000      1.119
+++ server/character.h  16 Jan 2008 10:20:29 -0000      1.120
@@ -19,7 +19,7 @@
 //
 //
 
-/* $Id: character.h,v 1.119 2007/12/26 12:35:13 strk Exp $ */
+/* $Id: character.h,v 1.120 2008/01/16 10:20:29 strk Exp $ */
 
 #ifndef GNASH_CHARACTER_H
 #define GNASH_CHARACTER_H
@@ -974,13 +974,13 @@
 
        /// Returns true when the object (type) should get a instance name even 
        /// if none is provided manually.
-       virtual bool wantsInstanceName()
+       virtual bool wantsInstanceName() const
        {
                return false; 
        }
 
        /// Returns true when the object (type) can be referenced by ActionScipt
-       bool isActionScriptReferenceable()
+       bool isActionScriptReferenceable() const
        {
                // The way around
                // [ wantsInstanceName() returning 
isActionScriptReferenceable() ]
@@ -988,6 +988,20 @@
                return wantsInstanceName();
        }
 
+       /// Returns the closest as-referenceable ancestor
+       character* getClosestASReferenceableAncestor() 
+       {
+               if ( isActionScriptReferenceable() ) return this;
+               assert(m_parent);
+               return m_parent->getClosestASReferenceableAncestor();
+       }
+
+       const character* getClosestASReferenceableAncestor() const
+       {
+               character* nonconst_this = const_cast<character*>(this);
+               return nonconst_this->getClosestASReferenceableAncestor();
+       }
+
        /// @}
 
        /// \brief

Index: server/button_character_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/button_character_instance.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- server/button_character_instance.h  10 Dec 2007 20:17:16 -0000      1.28
+++ server/button_character_instance.h  16 Jan 2008 10:20:29 -0000      1.29
@@ -21,7 +21,7 @@
 
 // SWF buttons.  Mouse-sensitive update/display, actions, etc.
 
-/* $Id: button_character_instance.h,v 1.28 2007/12/10 20:17:16 strk Exp $ */
+/* $Id: button_character_instance.h,v 1.29 2008/01/16 10:20:29 strk Exp $ */
 
 #ifndef GNASH_BUTTON_CHARACTER_INSTANCE_H
 #define GNASH_BUTTON_CHARACTER_INSTANCE_H
@@ -120,7 +120,7 @@
        ///
        virtual character* get_topmost_mouse_entity(float x, float y);
        
-       virtual bool wantsInstanceName()
+       virtual bool wantsInstanceName() const
        {
                return true; // buttons can be referenced 
        }

Index: server/edit_text_character.h
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.h,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- server/edit_text_character.h        19 Dec 2007 18:40:07 -0000      1.62
+++ server/edit_text_character.h        16 Jan 2008 10:20:29 -0000      1.63
@@ -75,7 +75,7 @@
 
        character* get_topmost_mouse_entity(float x, float y);
        
-       bool wantsInstanceName()
+       bool wantsInstanceName() const
        {
                return true; // text fields can be referenced 
        }       

Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -b -r1.164 -r1.165
--- server/sprite_instance.h    12 Jan 2008 12:48:07 -0000      1.164
+++ server/sprite_instance.h    16 Jan 2008 10:20:29 -0000      1.165
@@ -254,7 +254,7 @@
         return _droptarget;
     }
        
-       virtual bool wantsInstanceName()
+       virtual bool wantsInstanceName() const
        {
                return true; // sprites can be referenced 
        }

Index: server/video_stream_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/video_stream_instance.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- server/video_stream_instance.h      10 Dec 2007 20:17:18 -0000      1.24
+++ server/video_stream_instance.h      16 Jan 2008 10:20:29 -0000      1.25
@@ -16,7 +16,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // 
-// $Id: video_stream_instance.h,v 1.24 2007/12/10 20:17:18 strk Exp $
+// $Id: video_stream_instance.h,v 1.25 2008/01/16 10:20:29 strk Exp $
 
 #ifndef GNASH_VIDEO_STREAM_INSTANCE_H
 #define GNASH_VIDEO_STREAM_INSTANCE_H
@@ -67,7 +67,7 @@
        void    display();
 
        // For sure isActionScriptReferenceable...
-       bool wantsInstanceName()
+       bool wantsInstanceName() const
        {
                return true; // text fields can be referenced 
        }