[Gnash-commit] [SCM] Gnash branch, master, updated. 1bcd7fa18316dbe553eb6f01183fdc850622c2c1

[Benjamin Wolsey]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  1bcd7fa18316dbe553eb6f01183fdc850622c2c1 (commit)
       via  6db60d286dba0242447caed82d4a10dca580d6b5 (commit)
      from  4b4b6574afc96fcb14ced9220cf6a391d38316ea (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=1bcd7fa18316dbe553eb6f01183fdc850622c2c1


commit 1bcd7fa18316dbe553eb6f01183fdc850622c2c1
Author: Benjamin Wolsey <address@hidden>
Date:   Mon Oct 25 13:00:28 2010 +0200

    CustomActions is not part of the Player API.

diff --git a/libcore/asobj/CustomActions.cpp b/libcore/asobj/CustomActions.cpp
deleted file mode 100644
index 0ccfaec..0000000
--- a/libcore/asobj/CustomActions.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-// CustomActions.cpp:  ActionScript CustomActions class, for Gnash.
-// 
-//   Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-//   Foundation, Inc
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-//
-
-#include "CustomActions.h"
-#include "as_object.h" // for inheritance
-#include "log.h"
-#include "fn_call.h"
-#include "smart_ptr.h" // for boost intrusive_ptr
-#include "builtin_function.h" // need builtin_function
-#include "Global_as.h"
-
-namespace gnash {
-
-namespace {
-
-    as_value customactions_get(const fn_call& fn);
-    as_value customactions_install(const fn_call& fn);
-    as_value customactions_list(const fn_call& fn);
-    as_value customactions_uninstall(const fn_call& fn);
-    void attachCustomActionsInterface(as_object& o);
-
-}
-
-// extern (used by Global.cpp)
-void 
-customactions_class_init(as_object& where, const ObjectURI& uri)
-{
-    registerBuiltinObject(where, attachCustomActionsInterface, uri);
-}
-
-
-namespace {
-
-void
-attachCustomActionsInterface(as_object& o)
-{
-    Global_as& gl = getGlobal(o);
-       o.init_member("get", gl.createFunction(customactions_get));
-       o.init_member("install", gl.createFunction(customactions_install));
-       o.init_member("list", gl.createFunction(customactions_list));
-       o.init_member("uninstall", gl.createFunction(customactions_uninstall));
-}
-
-as_value
-customactions_get(const fn_call& /*fn*/)
-{
-    log_unimpl (__FUNCTION__);
-    return as_value();
-}
-
-as_value
-customactions_install(const fn_call& /*fn*/)
-{
-    log_unimpl (__FUNCTION__);
-    return as_value();
-}
-
-as_value
-customactions_list(const fn_call& /*fn*/)
-{
-    log_unimpl (__FUNCTION__);
-    return as_value();
-}
-
-as_value
-customactions_uninstall(const fn_call& /*fn*/)
-{
-    log_unimpl (__FUNCTION__);
-    return as_value();
-}
-
-}
-
-} // end of gnash namespace
-
diff --git a/libcore/asobj/CustomActions.h b/libcore/asobj/CustomActions.h
deleted file mode 100644
index 898f153..0000000
--- a/libcore/asobj/CustomActions.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// 
-//   Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-//   Foundation, Inc
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-//
-
-#ifndef GNASH_ASOBJ_CUSTOMACTIONS_H
-#define GNASH_ASOBJ_CUSTOMACTIONS_H
-
-namespace gnash {
-
-class as_object;
-struct ObjectURI;
-
-/// Initialize the global CustomActions class
-void customactions_class_init(as_object& global, const ObjectURI& uri);
-
-  
-} // end of gnash namespace
-
-#endif
-
diff --git a/libcore/asobj/Global_as.cpp b/libcore/asobj/Global_as.cpp
index 1164d99..add0255 100644
--- a/libcore/asobj/Global_as.cpp
+++ b/libcore/asobj/Global_as.cpp
@@ -32,7 +32,6 @@
 #include "AsBroadcaster.h"
 #include "Boolean_as.h"
 #include "Color_as.h"
-#include "CustomActions.h"
 #include "Date_as.h" 
 #include "Array_as.h" 
 #include "Error_as.h"
@@ -395,7 +394,6 @@ avm1Classes()
         (N(sharedobject_class_init, NSV::CLASS_SHARED_OBJECT, 5))
         (N(loadvars_class_init, NSV::CLASS_LOAD_VARS, 5))
         (N(localconnection_class_init, NSV::CLASS_LOCALCONNECTION, 6))
-        (N(customactions_class_init, NSV::CLASS_CUSTOM_ACTIONS, 6))
         (N(netconnection_class_init, NSV::CLASS_NET_CONNECTION, 6))
         (N(netstream_class_init, NSV::CLASS_NET_STREAM, 6))
         (N(contextmenu_class_init, NSV::CLASS_CONTEXTMENU, 5))
diff --git a/libcore/asobj/flash.am b/libcore/asobj/flash.am
index 3a9837d..136065c 100644
--- a/libcore/asobj/flash.am
+++ b/libcore/asobj/flash.am
@@ -31,7 +31,6 @@ libgnashasobjs_la_SOURCES = \
        asobj/Array_as.cpp \
        asobj/Boolean_as.cpp \
        asobj/Color_as.cpp \
-       asobj/CustomActions.cpp\
        asobj/Date_as.cpp \
        asobj/Error_as.cpp \
        asobj/Global_as.cpp \
@@ -71,7 +70,6 @@ inst_HEADERS = \
        asobj/AsBroadcaster.h \
        asobj/Boolean_as.h \
        asobj/Color_as.h        \
-       asobj/CustomActions.h   \
        asobj/Date_as.h \
        asobj/Error_as.h        \
        asobj/Math_as.h \
diff --git a/libcore/namedStrings.cpp b/libcore/namedStrings.cpp
index d43aa40..0a9e082 100644
--- a/libcore/namedStrings.cpp
+++ b/libcore/namedStrings.cpp
@@ -210,7 +210,6 @@ static const string_table::svt preload_names[] =
     string_table::svt( "SharedObject", NSV::CLASS_SHARED_OBJECT ),
     string_table::svt( "LoadVars", NSV::CLASS_LOAD_VARS ),
     string_table::svt( "LocalConnection", NSV::CLASS_LOCALCONNECTION ),
-    string_table::svt( "CustomActions", NSV::CLASS_CUSTOM_ACTIONS ),
     string_table::svt( "QName", NSV::CLASS_QNAME ),
     string_table::svt( "Namespace", NSV::CLASS_NAMESPACE ),
     string_table::svt( "NetConnection", NSV::CLASS_NET_CONNECTION ),
diff --git a/libcore/namedStrings.h b/libcore/namedStrings.h
index 7378f33..c4292a8 100644
--- a/libcore/namedStrings.h
+++ b/libcore/namedStrings.h
@@ -201,7 +201,6 @@ enum NamedStrings {
         CLASS_COLOR,
         CLASS_CONTEXTMENU,
         CLASS_CONTEXTMENUITEM,
-        CLASS_CUSTOM_ACTIONS,
         CLASS_CSMTEXTSETTINGS,
         CLASS_DATE,
         CLASS_DISPLAYOBJECT,
diff --git a/testsuite/actionscript.all/CustomActions.as 
b/testsuite/actionscript.all/CustomActions.as
deleted file mode 100644
index 4584d72..0000000
--- a/testsuite/actionscript.all/CustomActions.as
+++ /dev/null
@@ -1,55 +0,0 @@
-// 
-//   Copyright (C) 2005, 2006, 2007, 2009, 2010 Free Software
-//   Foundation, Inc
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-//
-
-
-// Test case for CustomActions ActionScript class
-// compile this test case with Ming makeswf, and then
-// execute it like this gnash -1 -r 0 -v out.swf
-
-
-// CustomActions is only intended foro use in the Flash authoring tool,
-// See http://sephiroth.it/reference.php?id=156&cat=1
-
-
-rcsid="$Id: CustomActions.as,v 1.13 2008/03/11 19:31:47 strk Exp $";
-#include "check.as"
-
-note();
-note(' CustomActions is only intended foro use in the Flash authoring tool, so 
this file performs no tests');
-note(' See http://sephiroth.it/reference.php?id=156&cat=1');
-
-#if 0
-
-
-var customactionsObj = new CustomActions;
-
-// test the CustomActions constuctor
-check (customactionsObj != undefined);
-
-// test the CustomActions::get method
-check (customactionsObj.get != undefined);
-// test the CustomActions::install method
-check (customactionsObj.install != undefined);
-// test the CustomActions::list method
-check (customactionsObj.list != undefined);
-// test the CustomActions::uninstall method
-check (customactionsObj.uninstall != undefined);
-
-#endif
-totals();
diff --git a/testsuite/actionscript.all/Makefile.am 
b/testsuite/actionscript.all/Makefile.am
index 3a0da21..d830ee6 100644
--- a/testsuite/actionscript.all/Makefile.am
+++ b/testsuite/actionscript.all/Makefile.am
@@ -84,7 +84,6 @@ ASTESTS =                     \
        Color.as                \
        ColorTransform.as       \
        ContextMenu.as          \
-       CustomActions.as        \
        Date.as                 \
        Error.as                \
        ExternalInterface.as    \

http://git.savannah.gnu.org/cgit//commit/?id=6db60d286dba0242447caed82d4a10dca580d6b5


commit 6db60d286dba0242447caed82d4a10dca580d6b5
Author: Benjamin Wolsey <address@hidden>
Date:   Mon Oct 25 12:56:21 2010 +0200

    Check that CustomActions doesn't exist.

diff --git a/testsuite/actionscript.all/Global.as 
b/testsuite/actionscript.all/Global.as
index 998dee9..4ddfee5 100644
--- a/testsuite/actionscript.all/Global.as
+++ b/testsuite/actionscript.all/Global.as
@@ -28,6 +28,9 @@ rcsid="$Id: Global.as,v 1.51 2008/03/31 23:48:33 strk Exp $";
 
 check_equals(typeof(Button), 'function'); // random check
 
+// Check that CustomActions isn't recognized by the player.
+check_equals(typeof(_global.CustomActions), "undefined");
+
 #if OUTPUT_VERSION > 5
 check_equals(typeof(_global.updateAfterEvent), 'function');
 check( ! _global.hasOwnProperty('updateAfterEvent') );
@@ -503,15 +506,15 @@ check_equals(r, "l,j,k,");
 
 
 #if OUTPUT_VERSION == 5
-       check_totals(158); // SWF5
+       check_totals(159); // SWF5
 #else
 # if OUTPUT_VERSION == 6
-       check_totals(192); // SWF6
+       check_totals(193); // SWF6
 # else
 #  if OUTPUT_VERSION == 7
-       check_totals(174); // SWF7
+       check_totals(175); // SWF7
 #  else
-       check_totals(161); // SWF8+
+       check_totals(162); // SWF8+
 #  endif
 # endif
 #endif

-----------------------------------------------------------------------

Summary of changes:
 libcore/asobj/CustomActions.cpp             |   92 ---------------------------
 libcore/asobj/CustomActions.h               |   35 ----------
 libcore/asobj/Global_as.cpp                 |    2 -
 libcore/asobj/flash.am                      |    2 -
 libcore/namedStrings.cpp                    |    1 -
 libcore/namedStrings.h                      |    1 -
 testsuite/actionscript.all/CustomActions.as |   55 ----------------
 testsuite/actionscript.all/Global.as        |   11 ++-
 testsuite/actionscript.all/Makefile.am      |    1 -
 9 files changed, 7 insertions(+), 193 deletions(-)
 delete mode 100644 libcore/asobj/CustomActions.cpp
 delete mode 100644 libcore/asobj/CustomActions.h
 delete mode 100644 testsuite/actionscript.all/CustomActions.as


hooks/post-receive
-- 
Gnash