[Gnash-commit] /srv/bzr/gnash/trunk r10941: FP 10 constant classes.

[Benjamin Wolsey]

------------------------------------------------------------
revno: 10941
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Thu 2009-05-28 09:49:34 +0200
message:
  FP 10 constant classes.
modified:
  libcore/asobj/flash/desktop/ClipboardFormats_as.cpp
  libcore/asobj/flash/desktop/ClipboardFormats_as.h
  libcore/asobj/flash/desktop/ClipboardTransferMode_as.cpp
  libcore/asobj/flash/desktop/ClipboardTransferMode_as.h
    ------------------------------------------------------------
    revno: 10940.1.1
    committer: Benjamin Wolsey <address@hidden>
    branch nick: work
    timestamp: Thu 2009-05-28 09:44:18 +0200
    message:
      Complete and reduce more classes.
    modified:
      libcore/asobj/flash/desktop/ClipboardFormats_as.cpp
      libcore/asobj/flash/desktop/ClipboardFormats_as.h
      libcore/asobj/flash/desktop/ClipboardTransferMode_as.cpp
      libcore/asobj/flash/desktop/ClipboardTransferMode_as.h

=== modified file 'libcore/asobj/flash/desktop/ClipboardFormats_as.cpp'
--- a/libcore/asobj/flash/desktop/ClipboardFormats_as.cpp       2009-05-25 
02:00:57 +0000
+++ b/libcore/asobj/flash/desktop/ClipboardFormats_as.cpp       2009-05-28 
07:44:18 +0000
@@ -26,63 +26,35 @@
 #include "fn_call.h"
 #include "smart_ptr.h" // for boost intrusive_ptr
 #include "builtin_function.h" // need builtin_function
-#include "GnashException.h" // for ActionException
+#include "Object.h"
 
 namespace gnash {
 
 // Forward declarations
 namespace {
-    as_value clipboardformats_ctor(const fn_call& fn);
-    void attachClipboardFormatsInterface(as_object& o);
     void attachClipboardFormatsStaticInterface(as_object& o);
-    as_object* getClipboardFormatsInterface();
-
 }
 
 // extern (used by Global.cpp)
-void clipboardformats_class_init(as_object& global)
+void
+clipboardformats_class_init(as_object& where)
 {
-    static boost::intrusive_ptr<builtin_function> cl;
-
-    if (!cl) {
-        cl = new builtin_function(&clipboardformats_ctor, 
getClipboardFormatsInterface());
-        attachClipboardFormatsStaticInterface(*cl);
-    }
-
-    // Register _global.ClipboardFormats
-    global.init_member("ClipboardFormats", cl.get());
+
+    static as_object* obj = new as_object(getObjectInterface());
+    attachClipboardFormatsStaticInterface(*obj);
+    where.init_member("ClipboardFormats", obj);
 }
 
 namespace {
 
 void
-attachClipboardFormatsInterface(as_object& o)
-{
-}
-
-void
 attachClipboardFormatsStaticInterface(as_object& o)
 {
-
-}
-
-as_object*
-getClipboardFormatsInterface()
-{
-    static boost::intrusive_ptr<as_object> o;
-    if ( ! o ) {
-        o = new as_object();
-        attachClipboardFormatsInterface(*o);
-    }
-    return o.get();
-}
-
-as_value
-clipboardformats_ctor(const fn_call& fn)
-{
-    boost::intrusive_ptr<as_object> obj = new ClipboardFormats_as;
-
-    return as_value(obj.get()); // will keep alive
+    // These were introduced to the Flash Player 10 API. AIR has 3 more
+    // constants.
+    o.init_member("HTML_FORMAT", "air:html");
+    o.init_member("RICH_TEXT_FORMAT", "air:rtf");
+    o.init_member("TEXT_FORMAT", "air:text");
 }
 
 } // anonymous namespace 

=== modified file 'libcore/asobj/flash/desktop/ClipboardFormats_as.h'
--- a/libcore/asobj/flash/desktop/ClipboardFormats_as.h 2009-05-25 02:00:57 
+0000
+++ b/libcore/asobj/flash/desktop/ClipboardFormats_as.h 2009-05-28 07:44:18 
+0000
@@ -24,34 +24,16 @@
 #include "gnashconfig.h"
 #endif
 
-#include "fn_call.h"
-
 namespace gnash {
 
 // Forward declarations
 class as_object;
-namespace {
-    as_object* getClipboardFormatsInterface();
-}
-
-class ClipboardFormats_as: public as_object
-{
-
-public:
-
-    ClipboardFormats_as()
-        :
-        as_object(getClipboardFormatsInterface())
-    {}
-
-};
 
 /// Initialize the global ClipboardFormats class
 void clipboardformats_class_init(as_object& global);
 
 } // gnash namespace
 
-// GNASH_ASOBJ3_CLIPBOARDFORMATS_H
 #endif
 
 // local Variables:

=== modified file 'libcore/asobj/flash/desktop/ClipboardTransferMode_as.cpp'
--- a/libcore/asobj/flash/desktop/ClipboardTransferMode_as.cpp  2009-05-25 
02:00:57 +0000
+++ b/libcore/asobj/flash/desktop/ClipboardTransferMode_as.cpp  2009-05-28 
07:44:18 +0000
@@ -26,63 +26,35 @@
 #include "fn_call.h"
 #include "smart_ptr.h" // for boost intrusive_ptr
 #include "builtin_function.h" // need builtin_function
-#include "GnashException.h" // for ActionException
+#include "Object.h"
+
+// Added to the Flash Player 10 API from AIR.
 
 namespace gnash {
 
 // Forward declarations
 namespace {
-    as_value clipboardtransfermode_ctor(const fn_call& fn);
-    void attachClipboardTransferModeInterface(as_object& o);
     void attachClipboardTransferModeStaticInterface(as_object& o);
-    as_object* getClipboardTransferModeInterface();
-
 }
 
 // extern (used by Global.cpp)
-void clipboardtransfermode_class_init(as_object& global)
+void
+clipboardtransfermode_class_init(as_object& where)
 {
-    static boost::intrusive_ptr<builtin_function> cl;
-
-    if (!cl) {
-        cl = new builtin_function(&clipboardtransfermode_ctor, 
getClipboardTransferModeInterface());
-        attachClipboardTransferModeStaticInterface(*cl);
-    }
-
-    // Register _global.ClipboardTransferMode
-    global.init_member("ClipboardTransferMode", cl.get());
+    static as_object* obj = new as_object(getObjectInterface());
+    attachClipboardTransferModeStaticInterface(*obj);
+    where.init_member("ClipboardTransferMode", obj);
 }
 
 namespace {
 
 void
-attachClipboardTransferModeInterface(as_object& o)
-{
-}
-
-void
 attachClipboardTransferModeStaticInterface(as_object& o)
 {
-
-}
-
-as_object*
-getClipboardTransferModeInterface()
-{
-    static boost::intrusive_ptr<as_object> o;
-    if ( ! o ) {
-        o = new as_object();
-        attachClipboardTransferModeInterface(*o);
-    }
-    return o.get();
-}
-
-as_value
-clipboardtransfermode_ctor(const fn_call& fn)
-{
-    boost::intrusive_ptr<as_object> obj = new ClipboardTransferMode_as;
-
-    return as_value(obj.get()); // will keep alive
+    o.init_member("CLONE_ONLY", "cloneOnly");
+    o.init_member("CLONE_PREFERRED", "clonePreferred");
+    o.init_member("ORIGINAL_ONLY", "originalOnly");
+    o.init_member("ORIGINAL_PREFERRED", "originalPreferred");
 }
 
 } // anonymous namespace 

=== modified file 'libcore/asobj/flash/desktop/ClipboardTransferMode_as.h'
--- a/libcore/asobj/flash/desktop/ClipboardTransferMode_as.h    2009-05-25 
02:00:57 +0000
+++ b/libcore/asobj/flash/desktop/ClipboardTransferMode_as.h    2009-05-28 
07:44:18 +0000
@@ -24,34 +24,16 @@
 #include "gnashconfig.h"
 #endif
 
-#include "fn_call.h"
-
 namespace gnash {
 
 // Forward declarations
 class as_object;
-namespace {
-    as_object* getClipboardTransferModeInterface();
-}
-
-class ClipboardTransferMode_as: public as_object
-{
-
-public:
-
-    ClipboardTransferMode_as()
-        :
-        as_object(getClipboardTransferModeInterface())
-    {}
-
-};
 
 /// Initialize the global ClipboardTransferMode class
 void clipboardtransfermode_class_init(as_object& global);
 
 } // gnash namespace
 
-// GNASH_ASOBJ3_CLIPBOARDTRANSFERMODE_H
 #endif
 
 // local Variables: