[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/trunk r10983: Clean up headers, modify isA
|
From: |
Benjamin Wolsey |
|
Subject: |
[Gnash-commit] /srv/bzr/gnash/trunk r10983: Clean up headers, modify isAS3() to take a fn_call argument for easier |
|
Date: |
Wed, 03 Jun 2009 18:36:59 +0200 |
|
User-agent: |
Bazaar (1.13.1) |
------------------------------------------------------------
revno: 10983
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Wed 2009-06-03 18:36:59 +0200
message:
Clean up headers, modify isAS3() to take a fn_call argument for easier
refactoring later.
modified:
gui/gtk_glue_agg_xv.cpp
libcore/DisplayObject.cpp
libcore/Property.cpp
libcore/PropertyList.cpp
libcore/URLAccessManager.cpp
libcore/Video.cpp
libcore/as_environment.cpp
libcore/as_object.cpp
libcore/asobj/Color_as.cpp
libcore/asobj/Key_as.h
libcore/asobj/LoadableObject.cpp
libcore/asobj/LocalConnection_as.cpp
libcore/asobj/Math_as.cpp
libcore/asobj/MovieClipLoader.cpp
libcore/asobj/Object.cpp
libcore/asobj/SharedObject_as.cpp
libcore/asobj/Sound_as.cpp
libcore/asobj/String_as.cpp
libcore/asobj/XMLSocket_as.cpp
libcore/asobj/flash/accessibility/accessibility_pkg.cpp
libcore/asobj/flash/desktop/desktop_pkg.cpp
libcore/asobj/flash/display/BitmapData_as.cpp
libcore/asobj/flash/display/display_pkg.cpp
libcore/asobj/flash/errors/errors_pkg.cpp
libcore/asobj/flash/events/events_pkg.cpp
libcore/asobj/flash/external/external_pkg.cpp
libcore/asobj/flash/filters/filters_pkg.cpp
libcore/asobj/flash/flash_pkg.cpp
libcore/asobj/flash/geom/geom_pkg.cpp
libcore/asobj/flash/media/media_pkg.cpp
libcore/asobj/flash/net/net_pkg.cpp
libcore/asobj/flash/printing/printing_pkg.cpp
libcore/asobj/flash/sampler/sampler_pkg.cpp
libcore/asobj/flash/system/system_pkg.cpp
libcore/asobj/flash/text/text_pkg.cpp
libcore/asobj/flash/ui/ui_pkg.cpp
libcore/asobj/flash/utils/utils_pkg.cpp
libcore/asobj/flash/xml/xml_pkg.cpp
libcore/swf/ScriptLimitsTag.h
libcore/swf/StartSoundTag.cpp
libcore/swf/StreamSoundBlockTag.cpp
libcore/vm/ActionExec.cpp
libcore/vm/VM.h
libcore/vm/action.cpp
libcore/vm/fn_call.h
testsuite/libcore.all/AsValueTest.cpp
testsuite/libcore.all/DisplayListTest.cpp
testsuite/libcore.all/PropertyListTest.cpp
------------------------------------------------------------
revno: 10976.1.13
committer: Benjamin Wolsey <address@hidden>
branch nick: work
timestamp: Wed 2009-06-03 18:05:40 +0200
message:
Move isAS3 logic to fn_call rather than VM, and clean up headers and
includes
as they made this simple change take a long time.
modified:
libcore/DisplayObject.cpp
libcore/Property.cpp
libcore/PropertyList.cpp
libcore/URLAccessManager.cpp
libcore/Video.cpp
libcore/as_environment.cpp
libcore/as_object.cpp
libcore/asobj/Color_as.cpp
libcore/asobj/Key_as.h
libcore/asobj/LoadableObject.cpp
libcore/asobj/LocalConnection_as.cpp
libcore/asobj/Math_as.cpp
libcore/asobj/MovieClipLoader.cpp
libcore/asobj/Object.cpp
libcore/asobj/SharedObject_as.cpp
libcore/asobj/Sound_as.cpp
libcore/asobj/String_as.cpp
libcore/asobj/XMLSocket_as.cpp
libcore/asobj/flash/accessibility/accessibility_pkg.cpp
libcore/asobj/flash/desktop/desktop_pkg.cpp
libcore/asobj/flash/display/BitmapData_as.cpp
libcore/asobj/flash/display/display_pkg.cpp
libcore/asobj/flash/errors/errors_pkg.cpp
libcore/asobj/flash/events/events_pkg.cpp
libcore/asobj/flash/external/external_pkg.cpp
libcore/asobj/flash/filters/filters_pkg.cpp
libcore/asobj/flash/flash_pkg.cpp
libcore/asobj/flash/geom/geom_pkg.cpp
libcore/asobj/flash/media/media_pkg.cpp
libcore/asobj/flash/net/net_pkg.cpp
libcore/asobj/flash/printing/printing_pkg.cpp
libcore/asobj/flash/sampler/sampler_pkg.cpp
libcore/asobj/flash/system/system_pkg.cpp
libcore/asobj/flash/text/text_pkg.cpp
libcore/asobj/flash/ui/ui_pkg.cpp
libcore/asobj/flash/utils/utils_pkg.cpp
libcore/asobj/flash/xml/xml_pkg.cpp
libcore/swf/ScriptLimitsTag.h
libcore/swf/StartSoundTag.cpp
libcore/swf/StreamSoundBlockTag.cpp
libcore/vm/ActionExec.cpp
libcore/vm/VM.h
libcore/vm/action.cpp
libcore/vm/fn_call.h
------------------------------------------------------------
revno: 10976.1.14
committer: Benjamin Wolsey <address@hidden>
branch nick: work
timestamp: Wed 2009-06-03 18:08:31 +0200
message:
One last file.
modified:
gui/gtk_glue_agg_xv.cpp
=== modified file 'gui/gtk_glue_agg_xv.cpp'
--- a/gui/gtk_glue_agg_xv.cpp 2009-04-14 17:49:58 +0000
+++ b/gui/gtk_glue_agg_xv.cpp 2009-06-03 16:08:31 +0000
@@ -32,14 +32,14 @@
#include "log.h"
#include "render_handler.h"
#include "render_handler_agg.h"
+#include "Movie.h"
+#include "movie_root.h"
#include "gtk_glue_agg_xv.h"
#include "VideoConverter.h"
#include "VM.h"
#include <cerrno>
-
#include <gdk/gdkx.h>
-
#include <sys/ipc.h>
#include <sys/shm.h>
=== modified file 'libcore/DisplayObject.cpp'
--- a/libcore/DisplayObject.cpp 2009-04-22 15:16:35 +0000
+++ b/libcore/DisplayObject.cpp 2009-06-03 16:05:40 +0000
@@ -24,6 +24,7 @@
#include "smart_ptr.h" // GNASH_USE_GC
#include "DisplayObject.h"
+#include "movie_root.h"
#include "MovieClip.h"
#include "drag_state.h" // for do_mouse_drag (to be moved in movie_root)
#include "VM.h" // for do_mouse_drag (to be moved in movie_root)
=== modified file 'libcore/Property.cpp'
--- a/libcore/Property.cpp 2009-05-14 10:26:47 +0000
+++ b/libcore/Property.cpp 2009-06-03 16:05:40 +0000
@@ -18,6 +18,8 @@
#include "Property.h"
#include "VM.h"
#include "as_function.h"
+#include "as_environment.h"
+#include "fn_call.h"
namespace gnash {
=== modified file 'libcore/PropertyList.cpp'
--- a/libcore/PropertyList.cpp 2009-04-20 20:07:45 +0000
+++ b/libcore/PropertyList.cpp 2009-06-03 16:05:40 +0000
@@ -23,9 +23,8 @@
#include "PropertyList.h"
#include "Property.h"
-
+#include "as_environment.h"
#include "log.h"
-
#include "as_function.h"
#include "as_value.h" // for enumerateValues
#include "VM.h" // For string_table
=== modified file 'libcore/URLAccessManager.cpp'
--- a/libcore/URLAccessManager.cpp 2009-04-23 14:46:54 +0000
+++ b/libcore/URLAccessManager.cpp 2009-06-03 16:05:40 +0000
@@ -24,6 +24,7 @@
#include "log.h"
#include "StringPredicates.h"
#include "VM.h"
+#include "movie_root.h"
#include "rc.h" // for rcfile
#include "GnashSystemIOHeaders.h"
=== modified file 'libcore/Video.cpp'
--- a/libcore/Video.cpp 2009-04-15 09:08:37 +0000
+++ b/libcore/Video.cpp 2009-06-03 16:05:40 +0000
@@ -27,6 +27,7 @@
#include "render.h"
#include "Range2d.h"
#include "builtin_function.h" // for getter/setter properties
+#include "movie_root.h"
#include "VM.h"
#include "Object.h"
#include "MediaHandler.h" // for setting up embedded video decoder
=== modified file 'libcore/as_environment.cpp'
--- a/libcore/as_environment.cpp 2009-05-14 11:45:23 +0000
+++ b/libcore/as_environment.cpp 2009-06-03 16:05:40 +0000
@@ -20,6 +20,7 @@
#include "smart_ptr.h" // GNASH_USE_GC
#include "as_environment.h"
#include "MovieClip.h"
+#include "movie_root.h"
#include "as_value.h"
#include "VM.h"
#include "log.h"
=== modified file 'libcore/as_object.cpp'
--- a/libcore/as_object.cpp 2009-05-21 18:42:50 +0000
+++ b/libcore/as_object.cpp 2009-06-03 16:05:40 +0000
@@ -26,6 +26,8 @@
#include "as_object.h"
#include "as_function.h"
#include "as_environment.h" // for enumerateProperties
+#include "movie_root.h" // for enumerateProperties
+#include "event_id.h" // for enumerateProperties
#include "Property.h" // for findGetterSetter
#include "VM.h"
#include "GnashException.h"
=== modified file 'libcore/asobj/Color_as.cpp'
--- a/libcore/asobj/Color_as.cpp 2009-04-22 11:55:09 +0000
+++ b/libcore/asobj/Color_as.cpp 2009-06-03 16:05:40 +0000
@@ -30,6 +30,7 @@
#include "Object.h" // for getObjectInterface
#include "cxform.h" // for composition
#include "VM.h"
+#include "MovieClip.h"
#include <sstream>
=== modified file 'libcore/asobj/Key_as.h'
--- a/libcore/asobj/Key_as.h 2009-04-03 09:18:40 +0000
+++ b/libcore/asobj/Key_as.h 2009-06-03 16:05:40 +0000
@@ -22,7 +22,6 @@
#include "smart_ptr.h" // GNASH_USE_GC
#include "as_object.h" // for inheritance
-#include "fn_call.h"
#include "GnashKey.h" // for key::code
#include "dsodefs.h"
#include <bitset>
=== modified file 'libcore/asobj/LoadableObject.cpp'
--- a/libcore/asobj/LoadableObject.cpp 2009-05-20 11:56:39 +0000
+++ b/libcore/asobj/LoadableObject.cpp 2009-06-03 16:05:40 +0000
@@ -24,6 +24,7 @@
#include "StreamProvider.h"
#include "URL.h"
#include "namedStrings.h"
+#include "movie_root.h"
#include "VM.h"
#include "builtin_function.h"
#include "utf8.h"
=== modified file 'libcore/asobj/LocalConnection_as.cpp'
--- a/libcore/asobj/LocalConnection_as.cpp 2009-05-24 22:25:59 +0000
+++ b/libcore/asobj/LocalConnection_as.cpp 2009-06-03 16:05:40 +0000
@@ -29,6 +29,7 @@
#include <boost/bind.hpp>
#include "VM.h"
+#include "movie_root.h"
#include "URLAccessManager.h"
#include "URL.h"
#include "log.h"
=== modified file 'libcore/asobj/Math_as.cpp'
--- a/libcore/asobj/Math_as.cpp 2009-03-17 11:39:48 +0000
+++ b/libcore/asobj/Math_as.cpp 2009-06-03 16:05:40 +0000
@@ -28,10 +28,6 @@
//
-#include <cmath>
-#include <string>
-#include <boost/random.hpp>
-
#include "VM.h" // get random generator
#include "fn_call.h"
#include "Math_as.h"
@@ -40,6 +36,10 @@
#include "Object.h" // for getObjectInterface
#include "GnashNumeric.h"
+#include <cmath>
+#include <string>
+#include <boost/random.hpp>
+
namespace gnash {
// Forward declarations
@@ -63,7 +63,8 @@
}
-void registerMathNative(as_object& proto)
+void
+registerMathNative(as_object& proto)
{
VM& vm = proto.getVM();
=== modified file 'libcore/asobj/MovieClipLoader.cpp'
--- a/libcore/asobj/MovieClipLoader.cpp 2009-04-03 09:18:40 +0000
+++ b/libcore/asobj/MovieClipLoader.cpp 2009-06-03 16:05:40 +0000
@@ -25,6 +25,7 @@
#include "action.h" // for call_method
#include "as_value.h"
#include "as_object.h" // for inheritance
+#include "movie_root.h"
#include "fn_call.h"
#include "as_function.h"
#include "MovieClip.h"
=== modified file 'libcore/asobj/Object.cpp'
--- a/libcore/asobj/Object.cpp 2009-05-26 07:32:04 +0000
+++ b/libcore/asobj/Object.cpp 2009-06-03 16:05:40 +0000
@@ -18,6 +18,8 @@
//
#include "Object.h"
+#include "Movie.h"
+#include "DisplayObject.h"
#include "smart_ptr.h"
#include "fn_call.h"
#include "as_object.h" // for inheritance
=== modified file 'libcore/asobj/SharedObject_as.cpp'
--- a/libcore/asobj/SharedObject_as.cpp 2009-04-23 14:46:54 +0000
+++ b/libcore/asobj/SharedObject_as.cpp 2009-06-03 16:05:40 +0000
@@ -28,6 +28,7 @@
#include "amf.h"
#include "element.h"
#include "sol.h"
+#include "movie_root.h"
#include "SharedObject_as.h"
#include "as_object.h" // for inheritance
#include "log.h"
=== modified file 'libcore/asobj/Sound_as.cpp'
--- a/libcore/asobj/Sound_as.cpp 2009-05-31 22:56:35 +0000
+++ b/libcore/asobj/Sound_as.cpp 2009-06-03 16:05:40 +0000
@@ -28,6 +28,7 @@
#include "MediaParser.h"
#include "MediaHandler.h"
#include "sound_definition.h" // for sound_sample
+#include "movie_root.h"
#include "movie_definition.h"
#include "fn_call.h"
#include "GnashException.h"
=== modified file 'libcore/asobj/String_as.cpp'
--- a/libcore/asobj/String_as.cpp 2009-05-26 19:17:16 +0000
+++ b/libcore/asobj/String_as.cpp 2009-06-03 16:05:40 +0000
@@ -29,6 +29,7 @@
#include "Array_as.h"
#include "as_value.h"
#include "GnashException.h"
+#include "movie_definition.h"
#include "VM.h"
#include "Object.h" // for getObjectInterface
#include "namedStrings.h"
=== modified file 'libcore/asobj/XMLSocket_as.cpp'
--- a/libcore/asobj/XMLSocket_as.cpp 2009-05-18 14:27:16 +0000
+++ b/libcore/asobj/XMLSocket_as.cpp 2009-06-03 16:05:40 +0000
@@ -27,6 +27,7 @@
#include "XML_as.h"
#include "XMLSocket_as.h"
#include "as_function.h"
+#include "movie_root.h"
#include "fn_call.h"
#include "VM.h"
#include "builtin_function.h" // for setting timer, should likely avoid that..
=== modified file 'libcore/asobj/flash/accessibility/accessibility_pkg.cpp'
--- a/libcore/asobj/flash/accessibility/accessibility_pkg.cpp 2009-06-01
19:12:38 +0000
+++ b/libcore/asobj/flash/accessibility/accessibility_pkg.cpp 2009-06-03
16:05:40 +0000
@@ -22,6 +22,7 @@
#include "string_table.h"
#include "VM.h"
+#include "fn_call.h"
#include "MovieClip.h"
#include "AccessibilityProperties_as.h"
@@ -36,7 +37,7 @@
get_flash_accessibility_package(const fn_call& fn)
{
// This package is AS3 only!
- assert(isAS3(fn.getVM()));
+ assert(isAS3(fn));
log_debug("Loading AVM2 flash.accessibility package");
as_object *pkg = new as_object(getObjectInterface());
=== modified file 'libcore/asobj/flash/desktop/desktop_pkg.cpp'
--- a/libcore/asobj/flash/desktop/desktop_pkg.cpp 2009-06-01 19:12:38
+0000
+++ b/libcore/asobj/flash/desktop/desktop_pkg.cpp 2009-06-03 16:05:40
+0000
@@ -21,6 +21,7 @@
#include "as_object.h"
#include "string_table.h"
#include "VM.h"
+#include "fn_call.h"
#include "MovieClip.h"
#include "ClipboardFormats_as.h"
@@ -36,7 +37,7 @@
get_flash_desktop_package(const fn_call& fn)
{
// This package is AS3 only!
- assert(isAS3(fn.getVM()));
+ assert(isAS3(fn));
log_debug("Loading AVM2 flash.desktop package");
as_object *pkg = new as_object(getObjectInterface());
=== modified file 'libcore/asobj/flash/display/BitmapData_as.cpp'
--- a/libcore/asobj/flash/display/BitmapData_as.cpp 2009-05-25 18:28:53
+0000
+++ b/libcore/asobj/flash/display/BitmapData_as.cpp 2009-06-03 16:05:40
+0000
@@ -22,6 +22,7 @@
#endif
#include "BitmapData_as.h"
+#include "MovieClip.h"
#include "GnashImage.h"
#include "Bitmap.h"
#include "flash/geom/Rectangle_as.h" // for BitmapData.rectangle
=== modified file 'libcore/asobj/flash/display/display_pkg.cpp'
--- a/libcore/asobj/flash/display/display_pkg.cpp 2009-06-01 19:12:38
+0000
+++ b/libcore/asobj/flash/display/display_pkg.cpp 2009-06-03 16:05:40
+0000
@@ -22,6 +22,7 @@
#include "string_table.h"
#include "VM.h"
+#include "fn_call.h"
#include "MovieClip.h"
#include "display/AVM1Movie_as.h"
#include "display/ActionScriptVersion_as.h"
@@ -65,7 +66,7 @@
static as_value
get_flash_display_package(const fn_call& fn)
{
- bool as3 = isAS3(fn.getVM());
+ bool as3 = isAS3(fn);
log_debug("Loading %s flash.display package", as3 ? "AVM2" : "AVM1");
as_object *pkg = new as_object(getObjectInterface());
=== modified file 'libcore/asobj/flash/errors/errors_pkg.cpp'
--- a/libcore/asobj/flash/errors/errors_pkg.cpp 2009-06-01 19:12:38 +0000
+++ b/libcore/asobj/flash/errors/errors_pkg.cpp 2009-06-03 16:05:40 +0000
@@ -22,6 +22,7 @@
#include "string_table.h"
#include "VM.h"
+#include "fn_call.h"
#include "MovieClip.h"
#include "EOFError_as.h"
@@ -41,7 +42,7 @@
get_flash_errors_package(const fn_call& fn)
{
// This package is AS3 only!
- assert(isAS3(fn.getVM()));
+ assert(isAS3(fn));
log_debug("Loading AVM2 flash.errors package");
as_object *pkg = new as_object(getObjectInterface());
=== modified file 'libcore/asobj/flash/events/events_pkg.cpp'
--- a/libcore/asobj/flash/events/events_pkg.cpp 2009-06-01 19:12:38 +0000
+++ b/libcore/asobj/flash/events/events_pkg.cpp 2009-06-03 16:05:40 +0000
@@ -22,6 +22,7 @@
#include "string_table.h"
#include "VM.h"
+#include "fn_call.h"
#include "MovieClip.h"
#include "ActivityEvent_as.h"
@@ -57,7 +58,7 @@
get_flash_events_package(const fn_call& fn)
{
// This package is AS3 only!
- assert(isAS3(fn.getVM()));
+ assert(isAS3(fn));
log_debug("Loading AVM2 flash.events package");
as_object *pkg = new as_object(getObjectInterface());
=== modified file 'libcore/asobj/flash/external/external_pkg.cpp'
--- a/libcore/asobj/flash/external/external_pkg.cpp 2009-06-01 19:12:38
+0000
+++ b/libcore/asobj/flash/external/external_pkg.cpp 2009-06-03 16:05:40
+0000
@@ -22,6 +22,7 @@
#include "string_table.h"
#include "VM.h"
+#include "fn_call.h"
#include "MovieClip.h"
#include "ExternalInterface_as.h"
@@ -34,7 +35,7 @@
static as_value
get_flash_external_package(const fn_call& fn)
{
- const bool as3 = isAS3(fn.getVM());
+ const bool as3 = isAS3(fn);
// This package is identical for AS2 and AS3 (as far as we know)
log_debug("Loading %s flash.external package", as3 ? "AVM2" : "AVM1");
=== modified file 'libcore/asobj/flash/filters/filters_pkg.cpp'
--- a/libcore/asobj/flash/filters/filters_pkg.cpp 2009-06-01 19:12:38
+0000
+++ b/libcore/asobj/flash/filters/filters_pkg.cpp 2009-06-03 16:05:40
+0000
@@ -21,6 +21,7 @@
#include "as_object.h"
#include "string_table.h"
#include "VM.h"
+#include "fn_call.h"
#include "MovieClip.h"
#include "BevelFilter_as.h"
=== modified file 'libcore/asobj/flash/flash_pkg.cpp'
--- a/libcore/asobj/flash/flash_pkg.cpp 2009-05-29 07:25:38 +0000
+++ b/libcore/asobj/flash/flash_pkg.cpp 2009-06-03 16:05:40 +0000
@@ -19,6 +19,7 @@
#include "string_table.h"
#include "VM.h"
+#include "fn_call.h"
#include "Object.h" // for getObjectInterface
#include "flash_pkg.h"
@@ -32,7 +33,7 @@
static as_value
get_flash_package(const fn_call& fn)
{
- bool as3 = isAS3(fn.getVM());
+ bool as3 = isAS3(fn);
log_debug("Loading %s flash package", as3 ? "AVM2" : "AVM1");
as_object *pkg = new as_object(getObjectInterface());
=== modified file 'libcore/asobj/flash/geom/geom_pkg.cpp'
--- a/libcore/asobj/flash/geom/geom_pkg.cpp 2009-06-01 19:12:38 +0000
+++ b/libcore/asobj/flash/geom/geom_pkg.cpp 2009-06-03 16:05:40 +0000
@@ -22,6 +22,7 @@
#include "string_table.h"
#include "VM.h"
+#include "fn_call.h"
#include "MovieClip.h"
#include "ColorTransform_as.h"
@@ -38,7 +39,7 @@
static as_value
get_flash_geom_package(const fn_call& fn)
{
- const bool as3 = isAS3(fn.getVM());
+ const bool as3 = isAS3(fn);
// The classes in this package are all both AS2 and AS3 (as far as we
// know).
=== modified file 'libcore/asobj/flash/media/media_pkg.cpp'
--- a/libcore/asobj/flash/media/media_pkg.cpp 2009-06-01 19:12:38 +0000
+++ b/libcore/asobj/flash/media/media_pkg.cpp 2009-06-03 16:05:40 +0000
@@ -22,6 +22,7 @@
#include "string_table.h"
#include "VM.h"
+#include "fn_call.h"
#include "MovieClip.h"
#include "Camera_as.h"
@@ -43,7 +44,7 @@
get_flash_media_package(const fn_call& fn)
{
// This package is AS3 only!
- assert(isAS3(fn.getVM()));
+ assert(isAS3(fn));
log_debug("Loading AVM2 flash.media package");
as_object *pkg = new as_object(getObjectInterface());
=== modified file 'libcore/asobj/flash/net/net_pkg.cpp'
--- a/libcore/asobj/flash/net/net_pkg.cpp 2009-06-01 19:12:38 +0000
+++ b/libcore/asobj/flash/net/net_pkg.cpp 2009-06-03 16:05:40 +0000
@@ -21,6 +21,7 @@
#include "as_object.h"
#include "string_table.h"
#include "VM.h"
+#include "fn_call.h"
#include "MovieClip.h"
#include "FileFilter_as.h"
@@ -53,7 +54,7 @@
static as_value
get_flash_net_package(const fn_call& fn)
{
- bool as3 = isAS3(fn.getVM());
+ bool as3 = isAS3(fn);
log_debug("Loading %s flash.display package", as3 ? "AVM2" : "AVM1");
as_object *pkg = new as_object(getObjectInterface());
=== modified file 'libcore/asobj/flash/printing/printing_pkg.cpp'
--- a/libcore/asobj/flash/printing/printing_pkg.cpp 2009-06-01 19:12:38
+0000
+++ b/libcore/asobj/flash/printing/printing_pkg.cpp 2009-06-03 16:05:40
+0000
@@ -21,6 +21,7 @@
#include "as_object.h"
#include "string_table.h"
#include "VM.h"
+#include "fn_call.h"
#include "MovieClip.h"
#include "PrintJobOptions_as.h"
@@ -37,7 +38,7 @@
{
// This package is AS3 only!
- assert(isAS3(fn.getVM()));
+ assert(isAS3(fn));
log_debug("Loading AVM2 flash.printing package");
as_object *pkg = new as_object(getObjectInterface());
=== modified file 'libcore/asobj/flash/sampler/sampler_pkg.cpp'
--- a/libcore/asobj/flash/sampler/sampler_pkg.cpp 2009-06-01 19:12:38
+0000
+++ b/libcore/asobj/flash/sampler/sampler_pkg.cpp 2009-06-03 16:05:40
+0000
@@ -21,6 +21,7 @@
#include "as_object.h"
#include "string_table.h"
#include "VM.h"
+#include "fn_call.h"
#include "MovieClip.h"
#include "DeleteObjectSample_as.h"
@@ -38,7 +39,7 @@
{
/// This package is AS2 only!
- assert(isAS3(fn.getVM()));
+ assert(isAS3(fn));
log_debug("Loading AVM2 flash.sampler package");
as_object *pkg = new as_object(getObjectInterface());
=== modified file 'libcore/asobj/flash/system/system_pkg.cpp'
--- a/libcore/asobj/flash/system/system_pkg.cpp 2009-06-01 19:12:38 +0000
+++ b/libcore/asobj/flash/system/system_pkg.cpp 2009-06-03 16:05:40 +0000
@@ -21,6 +21,7 @@
#include "as_object.h"
#include "string_table.h"
#include "VM.h"
+#include "fn_call.h"
#include "MovieClip.h"
#include "ApplicationDomain_as.h"
@@ -42,7 +43,7 @@
get_flash_system_package(const fn_call& fn)
{
// This package is AS3 only!
- assert(isAS3(fn.getVM()));
+ assert(isAS3(fn));
log_debug("Loading AVM2 flash.system package");
as_object *pkg = new as_object(getObjectInterface());
=== modified file 'libcore/asobj/flash/text/text_pkg.cpp'
--- a/libcore/asobj/flash/text/text_pkg.cpp 2009-06-01 19:12:38 +0000
+++ b/libcore/asobj/flash/text/text_pkg.cpp 2009-06-03 16:05:40 +0000
@@ -21,6 +21,7 @@
#include "as_object.h"
#include "string_table.h"
#include "VM.h"
+#include "fn_call.h"
#include "MovieClip.h"
#include "AntiAliasType_as.h"
@@ -50,7 +51,7 @@
static as_value
get_flash_text_package(const fn_call& fn)
{
- bool as3 = isAS3(fn.getVM());
+ bool as3 = isAS3(fn);
log_debug("Loading %s flash.text package", as3 ? "AVM2" : "AVM1");
as_object *pkg = new as_object(getObjectInterface());
=== modified file 'libcore/asobj/flash/ui/ui_pkg.cpp'
--- a/libcore/asobj/flash/ui/ui_pkg.cpp 2009-06-01 19:12:38 +0000
+++ b/libcore/asobj/flash/ui/ui_pkg.cpp 2009-06-03 16:05:40 +0000
@@ -21,6 +21,7 @@
#include "as_object.h"
#include "string_table.h"
#include "VM.h"
+#include "fn_call.h"
#include "MovieClip.h"
#include "ContextMenuBuiltInItems_as.h"
@@ -39,7 +40,7 @@
get_flash_ui_package(const fn_call& fn)
{
// This package is AS3 only!
- assert(isAS3(fn.getVM()));
+ assert(isAS3(fn));
log_debug("Loading AVM2 flash.ui package");
as_object *pkg = new as_object(getObjectInterface());
=== modified file 'libcore/asobj/flash/utils/utils_pkg.cpp'
--- a/libcore/asobj/flash/utils/utils_pkg.cpp 2009-06-01 19:12:38 +0000
+++ b/libcore/asobj/flash/utils/utils_pkg.cpp 2009-06-03 16:05:40 +0000
@@ -22,6 +22,7 @@
#include "string_table.h"
#include "VM.h"
+#include "fn_call.h"
#include "MovieClip.h"
#include "ByteArray_as.h"
@@ -42,7 +43,7 @@
get_flash_utils_package(const fn_call& fn)
{
// This package is AS3 only!
- assert(isAS3(fn.getVM()));
+ assert(isAS3(fn));
log_debug("Loading AVM2 flash.utils package");
as_object *pkg = new as_object(getObjectInterface());
=== modified file 'libcore/asobj/flash/xml/xml_pkg.cpp'
--- a/libcore/asobj/flash/xml/xml_pkg.cpp 2009-06-01 19:12:38 +0000
+++ b/libcore/asobj/flash/xml/xml_pkg.cpp 2009-06-03 16:05:40 +0000
@@ -22,6 +22,7 @@
#include "string_table.h"
#include "VM.h"
+#include "fn_call.h"
#include "MovieClip.h"
#include "XMLDocument_as.h"
@@ -38,7 +39,7 @@
{
/// This package is AS3 only!
- assert(isAS3(fn.getVM()));
+ assert(isAS3(fn));
log_debug("Loading AVM2 flash.xml package");
as_object *pkg = new as_object(getObjectInterface());
=== modified file 'libcore/swf/ScriptLimitsTag.h'
--- a/libcore/swf/ScriptLimitsTag.h 2009-02-20 12:24:00 +0000
+++ b/libcore/swf/ScriptLimitsTag.h 2009-06-03 16:05:40 +0000
@@ -20,6 +20,7 @@
#include "swf.h" // for TagType definition
#include "SWFStream.h" // for inlines
+#include "movie_root.h"
#include "movie_definition.h"
namespace gnash {
=== modified file 'libcore/swf/StartSoundTag.cpp'
--- a/libcore/swf/StartSoundTag.cpp 2009-02-20 12:24:00 +0000
+++ b/libcore/swf/StartSoundTag.cpp 2009-06-03 16:05:40 +0000
@@ -19,6 +19,7 @@
#include "StartSoundTag.h"
#include "SWFStream.h"
+#include "movie_root.h"
#include "movie_definition.h"
#include "log.h" // for log_parse
#include "sound_definition.h" // for sound_sample
=== modified file 'libcore/swf/StreamSoundBlockTag.cpp'
--- a/libcore/swf/StreamSoundBlockTag.cpp 2009-02-20 12:24:00 +0000
+++ b/libcore/swf/StreamSoundBlockTag.cpp 2009-06-03 16:05:40 +0000
@@ -18,6 +18,7 @@
#include "StreamSoundBlockTag.h"
#include "sound_handler.h"
+#include "movie_root.h"
#include "movie_definition.h" // for addControlTag
#include "MovieClip.h" // for execute
#include "SoundInfo.h" // for loader
=== modified file 'libcore/vm/ActionExec.cpp'
--- a/libcore/vm/ActionExec.cpp 2009-05-20 09:05:45 +0000
+++ b/libcore/vm/ActionExec.cpp 2009-06-03 16:05:40 +0000
@@ -28,12 +28,12 @@
#include "log.h"
#include "VM.h"
#include "GnashException.h"
-
+#include "DisplayObject.h"
+#include "movie_root.h"
#include "swf.h"
#include "ASHandlers.h"
#include "as_environment.h"
#include "debugger.h"
-//#include "WallClockTimer.h" // will probably be used for scriptTimeout
#include <sstream>
#include <string>
=== modified file 'libcore/vm/VM.h'
--- a/libcore/vm/VM.h 2009-05-29 06:50:02 +0000
+++ b/libcore/vm/VM.h 2009-06-03 16:05:40 +0000
@@ -23,22 +23,26 @@
#include "gnashconfig.h"
#endif
-#include "smart_ptr.h" // GNASH_USE_GC
-#include "movie_root.h" // for composition
-#include "GC.h" // for ineritance of VmGcRoot
-#include "string_table.h" // for the string table
+#include "smart_ptr.h"
+#include "GC.h"
+#include "string_table.h"
+#include "SafeStack.h"
+#include "CallStack.h"
-#include <memory> // for auto_ptr
+#include <memory>
#include <locale>
-#include <boost/cstdint.hpp> // for cstdints
+#include <boost/cstdint.hpp>
#include <boost/random.hpp>
#include <boost/noncopyable.hpp>
// Forward declarations
namespace gnash {
- class movie_definition;
+ class VM;
+ class fn_call;
+ class movie_root;
class builtin_function;
class SharedObjectLibrary;
+ class as_value;
class as_object;
class Machine;
class VirtualClock;
@@ -51,17 +55,12 @@
/// A GC root used to mark all reachable collectable pointers
class VmGcRoot : public GcRoot
{
- VM& _vm;
-
public:
-
- VmGcRoot(VM& vm)
- :
- _vm(vm)
- {
- }
-
+ VmGcRoot(VM& vm) : _vm(vm) {}
virtual void markReachableResources() const;
+
+private:
+ VM& _vm;
};
/// The virtual machine
@@ -353,15 +352,6 @@
};
-/// Check whether the currently executing code is AS3 (ABC)
-//
-/// This is a non-member, non-friend function for better encapsulation.
-/// TODO: drop these when there is a better design!
-inline bool
-isAS3(const VM& vm) {
- return vm.getAVMVersion() == VM::AVM2;
-}
-
} // namespace gnash
#endif // GNASH_VM_H
=== modified file 'libcore/vm/action.cpp'
--- a/libcore/vm/action.cpp 2009-04-01 07:00:32 +0000
+++ b/libcore/vm/action.cpp 2009-06-03 16:05:40 +0000
@@ -26,6 +26,7 @@
#include "GnashException.h"
#include "as_environment.h"
#include "fn_call.h"
+#include "event_id.h"
#include "VM.h"
#include "StringPredicates.h"
#include "namedStrings.h"
=== modified file 'libcore/vm/fn_call.h'
--- a/libcore/vm/fn_call.h 2009-04-01 07:00:32 +0000
+++ b/libcore/vm/fn_call.h 2009-06-03 16:05:40 +0000
@@ -25,6 +25,7 @@
#include "as_environment.h" // for inlines (arg)
#include "as_object.h" // for dtor visibility by boost::intrusive_ptr
#include "smart_ptr.h"
+#include "VM.h"
#include <cassert> // for inlines (arg)
#include <ostream> // for inlines (dump_args)
@@ -207,10 +208,20 @@
};
+/// Check whether the currently executing code is AS3 (ABC)
+//
+/// This is a non-member, non-friend function for better encapsulation.
+/// TODO: drop these when there is a better design!
+inline bool
+isAS3(const fn_call& fn)
+{
+ return fn.getVM().getAVMVersion() == VM::AVM2;
+}
+
} // namespace gnash
-#endif // _GNASH_FN_CALL_H_
+#endif
// Local Variables:
=== modified file 'testsuite/libcore.all/AsValueTest.cpp'
--- a/testsuite/libcore.all/AsValueTest.cpp 2009-04-15 05:33:51 +0000
+++ b/testsuite/libcore.all/AsValueTest.cpp 2009-06-03 16:36:59 +0000
@@ -21,18 +21,6 @@
#ifdef HAVE_DEJAGNU_H
-#include <string>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <iostream>
-#include <boost/shared_ptr.hpp>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <log.h>
-#include <iostream>
-#include <string>
#include "VM.h"
#include "DummyMovieDefinition.h"
#include "DummyCharacter.h"
@@ -47,6 +35,19 @@
#include "amf.h"
#include "element.h"
#include "GnashNumeric.h"
+#include "movie_root.h"
+#include <string>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <iostream>
+#include <boost/shared_ptr.hpp>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <log.h>
+#include <iostream>
+#include <string>
using namespace amf;
using namespace gnash;
=== modified file 'testsuite/libcore.all/DisplayListTest.cpp'
--- a/testsuite/libcore.all/DisplayListTest.cpp 2009-04-15 05:33:51 +0000
+++ b/testsuite/libcore.all/DisplayListTest.cpp 2009-06-03 16:36:59 +0000
@@ -20,6 +20,7 @@
#endif
#include "DisplayList.h"
+#include "movie_root.h"
#include "as_value.h"
#include "DisplayObject.h"
#include "log.h"
=== modified file 'testsuite/libcore.all/PropertyListTest.cpp'
--- a/testsuite/libcore.all/PropertyListTest.cpp 2009-04-15 05:33:51
+0000
+++ b/testsuite/libcore.all/PropertyListTest.cpp 2009-06-03 16:36:59
+0000
@@ -22,6 +22,7 @@
#include "PropertyList.h"
#include "DummyMovieDefinition.h"
#include "VM.h"
+#include "movie_root.h"
#include "as_object.h" // need to set as owner of PropertyList
#include "as_value.h"
#include "log.h"
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/trunk r10983: Clean up headers, modify isAS3() to take a fn_call argument for easier,
Benjamin Wolsey <=