[Gnash-commit] gnash ChangeLog server/namedStrings.cpp server/...

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/05/06 11:16:27

Modified files:
        .              : ChangeLog 
        server         : namedStrings.cpp namedStrings.h 
        server/asobj   : Global.cpp ClassHierarchy.cpp 

Log message:
                * server/namedStrings{h,cpp}, server/asobj/ClassHierarchy.cpp:
                  support loading TextFormat on demand.
                * server/asobj/Global.cpp: load TextFormat on demand, use 
LOG_ONCE,
                  indentation.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6522&r2=1.6523
http://cvs.savannah.gnu.org/viewcvs/gnash/server/namedStrings.cpp?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/server/namedStrings.h?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Global.cpp?cvsroot=gnash&r1=1.124&r2=1.125
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/ClassHierarchy.cpp?cvsroot=gnash&r1=1.15&r2=1.16

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6522
retrieving revision 1.6523
diff -u -b -r1.6522 -r1.6523
--- ChangeLog   6 May 2008 09:56:29 -0000       1.6522
+++ ChangeLog   6 May 2008 11:16:23 -0000       1.6523
@@ -1,5 +1,12 @@
 2008-05-06 Benjamin Wolsey <address@hidden>
 
+       * server/namedStrings{h,cpp}, server/asobj/ClassHierarchy.cpp:
+         support loading TextFormat on demand.
+       * server/asobj/Global.cpp: load TextFormat on demand, use LOG_ONCE,
+         indentation.
+
+2008-05-06 Benjamin Wolsey <address@hidden>
+
        * server/render.h: fix build with visibility.
 
 2008-05-06 Sandro Santilli <address@hidden>

Index: server/namedStrings.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/namedStrings.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- server/namedStrings.cpp     5 May 2008 19:01:54 -0000       1.17
+++ server/namedStrings.cpp     6 May 2008 11:16:25 -0000       1.18
@@ -158,6 +158,7 @@
        string_table::svt( "AsBroadcaster", NSV::CLASS_AS_BROADCASTER ),
        string_table::svt( "Function", NSV::CLASS_FUNCTION ),
        string_table::svt( "TextSnapshot", NSV::CLASS_TEXT_SNAPSHOT ),
+       string_table::svt( "TextFormat", NSV::CLASS_TEXT_FORMAT ),
        string_table::svt( "Video", NSV::CLASS_VIDEO ),
        string_table::svt( "Camera", NSV::CLASS_CAMERA ),
        string_table::svt( "Microphone", NSV::CLASS_MICROPHONE ),

Index: server/namedStrings.h
===================================================================
RCS file: /sources/gnash/gnash/server/namedStrings.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- server/namedStrings.h       5 May 2008 19:01:54 -0000       1.17
+++ server/namedStrings.h       6 May 2008 11:16:26 -0000       1.18
@@ -176,6 +176,7 @@
                CLASS_AS_BROADCASTER,
                CLASS_FUNCTION,
                CLASS_TEXT_SNAPSHOT,
+               CLASS_TEXT_FORMAT,
                CLASS_VIDEO,
                CLASS_CAMERA,
                CLASS_MICROPHONE,

Index: server/asobj/Global.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Global.cpp,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -b -r1.124 -r1.125
--- server/asobj/Global.cpp     5 May 2008 15:35:03 -0000       1.124
+++ server/asobj/Global.cpp     6 May 2008 11:16:26 -0000       1.125
@@ -187,6 +187,7 @@
     {
         case 9:
         case 8:
+
                flash_package_init(*this);
 
         case 7:
@@ -195,7 +196,6 @@
                function_class_init(*this);
                ch->getGlobalNs()->stubPrototype(NSV::CLASS_FUNCTION);
                ch->getGlobalNs()->getClass(NSV::CLASS_FUNCTION)->setDeclared();
-
                init_member("LocalConnection", new 
builtin_function(localconnection_new));
 
         case 5:
@@ -231,11 +231,7 @@
                init_member("Infinity", as_value(INFINITY));
 
                registerColorNative(*this);
-
-               // The following initializations are necessary
-               // to register ASnative functions
-               textformat_class_init(*this);
-
+            registerTextFormatNative(*this);
                registerDateNative(*this);
                registerMouseNative(*this);
 
@@ -373,9 +369,11 @@
             )
          return as_value();
     }
+
     IF_VERBOSE_ASCODING_ERRORS(
-       if (fn.nargs > 2)
+        if (fn.nargs > 2) {
             log_aserror(_("%s has more than two arguments"), __FUNCTION__);
+        }
     )
 
     const std::string digits = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
@@ -685,7 +683,6 @@
 Global::loadExtensions()
 {
 
-
        if ( RcInitFile::getDefaultInstance().enableExtensions() )
        {
                log_security(_("Extensions enabled, scanning plugin dir for 
load"));

Index: server/asobj/ClassHierarchy.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/ClassHierarchy.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- server/asobj/ClassHierarchy.cpp     6 May 2008 08:54:30 -0000       1.15
+++ server/asobj/ClassHierarchy.cpp     6 May 2008 11:16:26 -0000       1.16
@@ -50,6 +50,7 @@
 #include "Stage.h"
 #include "System.h"
 #include "TextSnapshot.h"
+#include "TextFormat.h"
 #include "video_stream_instance.h"
 #include "extension.h"
 #include "VM.h"
@@ -279,6 +280,7 @@
        { xmlnode_class_init, NSV::CLASS_X_M_L_NODE, NSV::CLASS_OBJECT, 
NSV::NS_FLASH_XML, 5 },
        { mouse_class_init, NSV::CLASS_MOUSE, NSV::CLASS_OBJECT, 
NSV::NS_FLASH_UI, 5 },
        { number_class_init, NSV::CLASS_NUMBER, NSV::CLASS_OBJECT, NS_GLOBAL, 5 
},
+       { textformat_class_init, NSV::CLASS_TEXT_FORMAT, NSV::CLASS_OBJECT, 
NS_GLOBAL, 5 },
 //     { string_class_init, NSV::CLASS_STRING, NSV::CLASS_OBJECT, NS_GLOBAL, 5 
}, // string is special
        { key_class_init, NSV::CLASS_KEY, NSV::CLASS_OBJECT, NS_GLOBAL, 5 },
        { AsBroadcaster_init, NSV::CLASS_AS_BROADCASTER, NSV::CLASS_OBJECT, 
NS_GLOBAL, 5 },
@@ -302,8 +304,8 @@
        // Natives get declared first. It doesn't make any sense for a native
        // to depend on an extension, but it does make sense the other way
        // around.
-       unsigned int size = sizeof (knownClasses) / sizeof (nativeClass);
-       for (unsigned int i = 0; i < size; ++i)
+       const size_t size = sizeof (knownClasses) / sizeof (nativeClass);
+       for (size_t i = 0; i < size; ++i)
        {
                nativeClass& c = knownClasses[i];
                if (c.version > version)