[Gnash-commit] gnash ChangeLog server/asobj/Object.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/05/03 00:12:15

Modified files:
        .              : ChangeLog 
        server/asobj   : Object.cpp 

Log message:
        (object_registerClass): use symbol table from the current environment,
        not _level0. I'm sure failures are hiding as our concept of "current
        environment" is pretty vague. Anyway, makes youtube embedded player beta
        (bug #23130) much closer to working.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6480&r2=1.6481
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Object.cpp?cvsroot=gnash&r1=1.51&r2=1.52

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6480
retrieving revision 1.6481
diff -u -b -r1.6480 -r1.6481
--- ChangeLog   2 May 2008 20:23:29 -0000       1.6480
+++ ChangeLog   3 May 2008 00:12:14 -0000       1.6481
@@ -1,3 +1,11 @@
+2008-05-02 Sandro Santilli <address@hidden>
+
+       * server/asobj/Object.cpp (object_registerClass): use symbol table
+         from the current environment, not _level0. I'm sure failures
+         are hiding as our concept of "current environment" is pretty
+         vague. Anyway, makes youtube embedded player beta (bug #23130)
+         much closer to working.
+
 2008-05-02 Russ Nelson <address@hidden>
 
        * incorporate the rest of Craig Kelley's "dump" gui code.

Index: server/asobj/Object.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Object.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- server/asobj/Object.cpp     5 Apr 2008 10:19:26 -0000       1.51
+++ server/asobj/Object.cpp     3 May 2008 00:12:15 -0000       1.52
@@ -311,7 +311,20 @@
 
        // TODO: check to *which* definition should we ask the export
        //       this code uses the *relative* root of current environment's 
target
+#if 0
        movie_definition* def = VM::get().getRoot().get_movie_definition();
+#else
+       // Using definition of current target fixes the youtube beta case
+       // https://savannah.gnu.org/bugs/index.php?23130
+       character* tgt = fn.env().get_target();
+       if ( ! tgt ) {
+               log_error("current environment has no target, wouldn't know 
where to look for symbol required for registerClass"); 
+               return as_value(false);
+       }
+       movie_instance* relRoot = tgt->get_root();
+       assert(relRoot);
+       movie_definition* def = relRoot->get_movie_definition();
+#endif
        boost::intrusive_ptr<resource> exp_res = 
def->get_exported_resource(symbolid.c_str());
        if ( ! exp_res )
        {