[Gnash-commit] /srv/bzr/gnash/trunk r12098: Use registerBuiltinClass rather than relying on statics.

[Bastiaan Jacques]

------------------------------------------------------------
revno: 12098
committer: Bastiaan Jacques <address@hidden>
branch nick: trunk
timestamp: Mon 2010-03-22 17:24:24 +0100
message:
  Use registerBuiltinClass rather than relying on statics.
modified:
  libcore/asobj/flash/display/DisplayObjectContainer_as.cpp

=== modified file 'libcore/asobj/flash/display/DisplayObjectContainer_as.cpp'
--- a/libcore/asobj/flash/display/DisplayObjectContainer_as.cpp 2010-01-25 
18:52:20 +0000
+++ b/libcore/asobj/flash/display/DisplayObjectContainer_as.cpp 2010-03-22 
16:24:24 +0000
@@ -56,27 +56,8 @@
     // This should never be called during AVM1 execution!
     assert(isAS3(getVM(where)));
 
-    static boost::intrusive_ptr<as_object> cl;
-
-    if (!cl) {
-        Global_as& gl = getGlobal(where);
-        as_object* proto = getDisplayObjectContainerInterface();
-        cl = gl.createClass(&displayobjectcontainer_ctor, proto);
-    }
-
-    // Register _global.DisplayObjectContainer
-    where.init_member(uri, cl.get(), as_object::DefaultFlags);
-}
-
-as_object*
-getDisplayObjectContainerInterface()
-{
-    static boost::intrusive_ptr<as_object> o;
-    if ( ! o ) {
-        o = new as_object();
-        attachDisplayObjectContainerInterface(*o);
-    }
-    return o.get();
+    registerBuiltinClass(where, displayobjectcontainer_ctor,
+                         attachDisplayObjectContainerInterface, 0, uri);
 }
 
 namespace {