[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/trunk r11324: First stage towards sorting
|
From: |
Benjamin Wolsey |
|
Subject: |
[Gnash-commit] /srv/bzr/gnash/trunk r11324: First stage towards sorting out prototypes and as_objects for a non-singleton |
|
Date: |
Tue, 28 Jul 2009 18:35:57 +0200 |
|
User-agent: |
Bazaar (1.13.1) |
------------------------------------------------------------
revno: 11324
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Tue 2009-07-28 18:35:57 +0200
message:
First stage towards sorting out prototypes and as_objects for a non-singleton
VM.
modified:
libcore/as_object.cpp
libcore/asobj/Global_as.h
libcore/asobj/flash/accessibility/AccessibilityProperties_as.cpp
libcore/asobj/flash/accessibility/AccessibilityProperties_as.h
libcore/asobj/flash/accessibility/Accessibility_as.cpp
libcore/asobj/flash/accessibility/Accessibility_as.h
libcore/asobj/flash/desktop/ClipboardFormats_as.h
libcore/asobj/flash/desktop/ClipboardTransferMode_as.cpp
libcore/asobj/flash/desktop/ClipboardTransferMode_as.h
libcore/asobj/flash/desktop/Clipboard_as.cpp
libcore/asobj/flash/desktop/Clipboard_as.h
libcore/asobj/flash/display/AVM1Movie_as.cpp
libcore/asobj/flash/display/AVM1Movie_as.h
libcore/asobj/flash/display/ActionScriptVersion_as.cpp
libcore/asobj/flash/display/ActionScriptVersion_as.h
libcore/asobj/flash/display/BitmapDataChannel_as.cpp
libcore/asobj/flash/display/BitmapDataChannel_as.h
libcore/asobj/flash/display/BitmapData_as.cpp
libcore/asobj/flash/display/BitmapData_as.h
libcore/asobj/flash/display/Bitmap_as.cpp
libcore/asobj/flash/display/Bitmap_as.h
libcore/asobj/flash/display/BlendMode_as.cpp
libcore/asobj/flash/display/BlendMode_as.h
libcore/asobj/flash/display/CapsStyle_as.cpp
libcore/asobj/flash/display/CapsStyle_as.h
libcore/asobj/flash/display/DisplayObjectContainer_as.h
libcore/asobj/flash/display/DisplayObject_as.cpp
libcore/asobj/flash/display/DisplayObject_as.h
libcore/asobj/flash/display/FrameLabel_as.cpp
libcore/asobj/flash/display/FrameLabel_as.h
libcore/asobj/flash/display/GradientType_as.cpp
libcore/asobj/flash/display/GradientType_as.h
libcore/asobj/flash/display/Graphics_as.cpp
libcore/asobj/flash/display/Graphics_as.h
libcore/asobj/flash/display/IBitmapDrawable_as.cpp
libcore/asobj/flash/display/IBitmapDrawable_as.h
libcore/asobj/flash/display/InteractiveObject_as.cpp
libcore/asobj/flash/display/InteractiveObject_as.h
libcore/asobj/flash/display/InterpolationMethod_as.cpp
libcore/asobj/flash/display/InterpolationMethod_as.h
libcore/asobj/flash/display/JointStyle_as.cpp
libcore/asobj/flash/display/JointStyle_as.h
libcore/asobj/flash/display/LineScaleMode_as.cpp
libcore/asobj/flash/display/LineScaleMode_as.h
libcore/asobj/flash/display/LoaderInfo_as.cpp
libcore/asobj/flash/display/LoaderInfo_as.h
libcore/asobj/flash/display/Loader_as.cpp
libcore/asobj/flash/display/Loader_as.h
libcore/asobj/flash/display/MorphShape_as.cpp
libcore/asobj/flash/display/MorphShape_as.h
libcore/asobj/flash/display/MovieClip_as.cpp
libcore/asobj/flash/display/MovieClip_as.h
libcore/asobj/flash/display/PixelSnapping_as.cpp
libcore/asobj/flash/display/PixelSnapping_as.h
libcore/asobj/flash/display/SWFVersion_as.cpp
libcore/asobj/flash/display/SWFVersion_as.h
libcore/asobj/flash/display/Scene_as.cpp
libcore/asobj/flash/display/Scene_as.h
libcore/asobj/flash/display/Shape_as.cpp
libcore/asobj/flash/display/Shape_as.h
libcore/asobj/flash/display/SimpleButton_as.cpp
libcore/asobj/flash/display/SimpleButton_as.h
libcore/asobj/flash/display/SpreadMethod_as.cpp
libcore/asobj/flash/display/SpreadMethod_as.h
libcore/asobj/flash/display/Sprite_as.cpp
libcore/asobj/flash/display/Sprite_as.h
libcore/asobj/flash/display/StageAlign_as.cpp
libcore/asobj/flash/display/StageAlign_as.h
libcore/asobj/flash/display/StageDisplayState_as.h
libcore/asobj/flash/display/StageQuality_as.h
libcore/asobj/flash/display/StageScaleMode_as.h
libcore/asobj/flash/display/Stage_as.cpp
libcore/asobj/flash/display/Stage_as.h
libcore/asobj/flash/errors/EOFError_as.cpp
libcore/asobj/flash/errors/EOFError_as.h
libcore/asobj/flash/errors/IOError_as.cpp
libcore/asobj/flash/errors/IOError_as.h
libcore/asobj/flash/errors/IllegalOperationError_as.cpp
libcore/asobj/flash/errors/IllegalOperationError_as.h
libcore/asobj/flash/errors/InvalidSWFError_as.cpp
libcore/asobj/flash/errors/InvalidSWFError_as.h
libcore/asobj/flash/errors/MemoryError_as.cpp
libcore/asobj/flash/errors/MemoryError_as.h
libcore/asobj/flash/errors/ScriptTimeoutError_as.cpp
libcore/asobj/flash/errors/ScriptTimeoutError_as.h
libcore/asobj/flash/errors/StackOverflowError_as.cpp
libcore/asobj/flash/errors/StackOverflowError_as.h
libcore/asobj/flash/events/ActivityEvent_as.cpp
libcore/asobj/flash/events/ActivityEvent_as.h
libcore/asobj/flash/events/AsyncErrorEvent_as.cpp
libcore/asobj/flash/events/AsyncErrorEvent_as.h
libcore/asobj/flash/events/ContextMenuEvent_as.cpp
libcore/asobj/flash/events/ContextMenuEvent_as.h
libcore/asobj/flash/events/DataEvent_as.cpp
libcore/asobj/flash/events/DataEvent_as.h
libcore/asobj/flash/events/ErrorEvent_as.cpp
libcore/asobj/flash/events/ErrorEvent_as.h
libcore/asobj/flash/events/EventDispatcher_as.cpp
libcore/asobj/flash/events/EventDispatcher_as.h
libcore/asobj/flash/events/EventPhase_as.cpp
libcore/asobj/flash/events/EventPhase_as.h
libcore/asobj/flash/events/Event_as.cpp
libcore/asobj/flash/events/Event_as.h
libcore/asobj/flash/events/FocusEvent_as.cpp
libcore/asobj/flash/events/FocusEvent_as.h
libcore/asobj/flash/events/FullScreenEvent_as.cpp
libcore/asobj/flash/events/FullScreenEvent_as.h
libcore/asobj/flash/events/HTTPStatusEvent_as.cpp
libcore/asobj/flash/events/HTTPStatusEvent_as.h
libcore/asobj/flash/events/IEventDispatcher_as.cpp
libcore/asobj/flash/events/IEventDispatcher_as.h
libcore/asobj/flash/events/IMEEvent_as.cpp
libcore/asobj/flash/events/IMEEvent_as.h
libcore/asobj/flash/events/IOErrorEvent_as.cpp
libcore/asobj/flash/events/IOErrorEvent_as.h
libcore/asobj/flash/events/KeyboardEvent_as.cpp
libcore/asobj/flash/events/KeyboardEvent_as.h
libcore/asobj/flash/events/MouseEvent_as.cpp
libcore/asobj/flash/events/MouseEvent_as.h
libcore/asobj/flash/events/NetStatusEvent_as.cpp
libcore/asobj/flash/events/NetStatusEvent_as.h
libcore/asobj/flash/events/ProgressEvent_as.cpp
libcore/asobj/flash/events/ProgressEvent_as.h
libcore/asobj/flash/events/SecurityErrorEvent_as.cpp
libcore/asobj/flash/events/SecurityErrorEvent_as.h
libcore/asobj/flash/events/StatusEvent_as.cpp
libcore/asobj/flash/events/StatusEvent_as.h
libcore/asobj/flash/events/SyncEvent_as.cpp
libcore/asobj/flash/events/SyncEvent_as.h
libcore/asobj/flash/events/TextEvent_as.cpp
libcore/asobj/flash/events/TextEvent_as.h
libcore/asobj/flash/events/TimerEvent_as.cpp
libcore/asobj/flash/events/TimerEvent_as.h
libcore/asobj/flash/external/ExternalInterface_as.h
libcore/asobj/flash/filters/BevelFilter_as.cpp
libcore/asobj/flash/filters/BevelFilter_as.h
libcore/asobj/flash/filters/BitmapFilterQuality_as.cpp
libcore/asobj/flash/filters/BitmapFilterQuality_as.h
libcore/asobj/flash/filters/BitmapFilterType_as.cpp
libcore/asobj/flash/filters/BitmapFilterType_as.h
libcore/asobj/flash/filters/BitmapFilter_as.cpp
libcore/asobj/flash/filters/BitmapFilter_as.h
libcore/asobj/flash/filters/BlurFilter_as.cpp
libcore/asobj/flash/filters/BlurFilter_as.h
libcore/asobj/flash/filters/ColorMatrixFilter_as.cpp
libcore/asobj/flash/filters/ColorMatrixFilter_as.h
libcore/asobj/flash/filters/ConvolutionFilter_as.cpp
libcore/asobj/flash/filters/ConvolutionFilter_as.h
libcore/asobj/flash/filters/DisplacementMapFilterMode_as.cpp
libcore/asobj/flash/filters/DisplacementMapFilterMode_as.h
libcore/asobj/flash/filters/DisplacementMapFilter_as.h
libcore/asobj/flash/filters/DropShadowFilter_as.cpp
libcore/asobj/flash/filters/DropShadowFilter_as.h
libcore/asobj/flash/filters/GlowFilter_as.cpp
libcore/asobj/flash/filters/GlowFilter_as.h
libcore/asobj/flash/filters/GradientBevelFilter_as.cpp
libcore/asobj/flash/filters/GradientBevelFilter_as.h
libcore/asobj/flash/filters/GradientGlowFilter_as.cpp
libcore/asobj/flash/filters/GradientGlowFilter_as.h
libcore/asobj/flash/geom/ColorTransform_as.h
libcore/asobj/flash/geom/Matrix_as.h
libcore/asobj/flash/geom/Point_as.h
libcore/asobj/flash/geom/Rectangle_as.h
libcore/asobj/flash/geom/Transform_as.h
libcore/asobj/flash/media/Camera_as.cpp
libcore/asobj/flash/media/Camera_as.h
libcore/asobj/flash/media/ID3Info_as.cpp
libcore/asobj/flash/media/ID3Info_as.h
libcore/asobj/flash/media/Microphone_as.cpp
libcore/asobj/flash/media/Microphone_as.h
libcore/asobj/flash/media/SoundChannel_as.cpp
libcore/asobj/flash/media/SoundChannel_as.h
libcore/asobj/flash/media/SoundLoaderContext_as.cpp
libcore/asobj/flash/media/SoundLoaderContext_as.h
libcore/asobj/flash/media/SoundMixer_as.cpp
libcore/asobj/flash/media/SoundMixer_as.h
libcore/asobj/flash/media/SoundTransform_as.cpp
libcore/asobj/flash/media/SoundTransform_as.h
libcore/asobj/flash/media/Sound_as.cpp
libcore/asobj/flash/media/Sound_as.h
libcore/asobj/flash/media/Video_as.cpp
libcore/asobj/flash/media/Video_as.h
libcore/asobj/flash/media/media_as.cpp
libcore/asobj/flash/media/media_as.h
libcore/asobj/flash/net/FileFilter_as.cpp
libcore/asobj/flash/net/FileFilter_as.h
libcore/asobj/flash/net/FileReferenceList_as.h
libcore/asobj/flash/net/FileReference_as.h
libcore/asobj/flash/net/IDynamicPropertyOutput_as.cpp
libcore/asobj/flash/net/IDynamicPropertyOutput_as.h
libcore/asobj/flash/net/IDynamicPropertyWriter_as.cpp
libcore/asobj/flash/net/IDynamicPropertyWriter_as.h
libcore/asobj/flash/net/NetConnection_as.cpp
libcore/asobj/flash/net/NetConnection_as.h
libcore/asobj/flash/net/NetStream_as.cpp
libcore/asobj/flash/net/NetStream_as.h
libcore/asobj/flash/net/ObjectEncoding_as.cpp
libcore/asobj/flash/net/ObjectEncoding_as.h
libcore/asobj/flash/net/Responder_as.cpp
libcore/asobj/flash/net/Responder_as.h
libcore/asobj/flash/net/SharedObjectFlushStatus_as.cpp
libcore/asobj/flash/net/SharedObjectFlushStatus_as.h
libcore/asobj/flash/net/SharedObject_as.cpp
libcore/asobj/flash/net/SharedObject_as.h
libcore/asobj/flash/net/Socket_as.cpp
libcore/asobj/flash/net/Socket_as.h
libcore/asobj/flash/net/URLLoaderDataFormat_as.cpp
libcore/asobj/flash/net/URLLoaderDataFormat_as.h
libcore/asobj/flash/net/URLLoader_as.cpp
libcore/asobj/flash/net/URLLoader_as.h
libcore/asobj/flash/net/URLRequestHeader_as.cpp
libcore/asobj/flash/net/URLRequestHeader_as.h
libcore/asobj/flash/net/URLRequestMethod_as.cpp
libcore/asobj/flash/net/URLRequestMethod_as.h
libcore/asobj/flash/net/URLRequest_as.cpp
libcore/asobj/flash/net/URLRequest_as.h
libcore/asobj/flash/net/URLStream_as.cpp
libcore/asobj/flash/net/URLStream_as.h
libcore/asobj/flash/net/URLVariables_as.cpp
libcore/asobj/flash/net/URLVariables_as.h
libcore/asobj/flash/net/XMLSocket_as.cpp
libcore/asobj/flash/net/XMLSocket_as.h
libcore/asobj/flash/printing/PrintJobOptions_as.cpp
libcore/asobj/flash/printing/PrintJobOptions_as.h
libcore/asobj/flash/printing/PrintJobOrientation_as.cpp
libcore/asobj/flash/printing/PrintJobOrientation_as.h
libcore/asobj/flash/printing/PrintJob_as.cpp
libcore/asobj/flash/printing/PrintJob_as.h
libcore/asobj/flash/sampler/DeleteObjectSample_as.cpp
libcore/asobj/flash/sampler/DeleteObjectSample_as.h
libcore/asobj/flash/sampler/NewObjectSample_as.cpp
libcore/asobj/flash/sampler/NewObjectSample_as.h
libcore/asobj/flash/sampler/Sample_as.cpp
libcore/asobj/flash/sampler/Sample_as.h
libcore/asobj/flash/sampler/StackFrame_as.cpp
libcore/asobj/flash/sampler/StackFrame_as.h
libcore/asobj/flash/system/ApplicationDomain_as.cpp
libcore/asobj/flash/system/ApplicationDomain_as.h
libcore/asobj/flash/system/Capabilities_as.cpp
libcore/asobj/flash/system/Capabilities_as.h
libcore/asobj/flash/system/IMEConversionMode_as.cpp
libcore/asobj/flash/system/IMEConversionMode_as.h
libcore/asobj/flash/system/IME_as.cpp
libcore/asobj/flash/system/IME_as.h
libcore/asobj/flash/system/LoaderContext_as.cpp
libcore/asobj/flash/system/LoaderContext_as.h
libcore/asobj/flash/system/SecurityDomain_as.cpp
libcore/asobj/flash/system/SecurityDomain_as.h
libcore/asobj/flash/system/SecurityPanel_as.cpp
libcore/asobj/flash/system/SecurityPanel_as.h
libcore/asobj/flash/system/Security_as.cpp
libcore/asobj/flash/system/Security_as.h
libcore/asobj/flash/system/System_as.cpp
libcore/asobj/flash/system/System_as.h
libcore/asobj/flash/text/AntiAliasType_as.cpp
libcore/asobj/flash/text/AntiAliasType_as.h
libcore/asobj/flash/text/CSMSettings_as.cpp
libcore/asobj/flash/text/CSMSettings_as.h
libcore/asobj/flash/text/FontStyle_as.cpp
libcore/asobj/flash/text/FontStyle_as.h
libcore/asobj/flash/text/FontType_as.cpp
libcore/asobj/flash/text/FontType_as.h
libcore/asobj/flash/text/Font_as.cpp
libcore/asobj/flash/text/Font_as.h
libcore/asobj/flash/text/GridFitType_as.cpp
libcore/asobj/flash/text/GridFitType_as.h
libcore/asobj/flash/text/StaticText_as.cpp
libcore/asobj/flash/text/StaticText_as.h
libcore/asobj/flash/text/StyleSheet_as.cpp
libcore/asobj/flash/text/StyleSheet_as.h
libcore/asobj/flash/text/TextColorType_as.cpp
libcore/asobj/flash/text/TextColorType_as.h
libcore/asobj/flash/text/TextDisplayMode_as.cpp
libcore/asobj/flash/text/TextDisplayMode_as.h
libcore/asobj/flash/text/TextFieldAutoSize_as.cpp
libcore/asobj/flash/text/TextFieldType_as.cpp
libcore/asobj/flash/text/TextFieldType_as.h
libcore/asobj/flash/text/TextField_as.cpp
libcore/asobj/flash/text/TextField_as.h
libcore/asobj/flash/text/TextFormatAlign_as.cpp
libcore/asobj/flash/text/TextFormatAlign_as.h
libcore/asobj/flash/text/TextFormat_as.cpp
libcore/asobj/flash/text/TextFormat_as.h
libcore/asobj/flash/text/TextLineMetrics_as.cpp
libcore/asobj/flash/text/TextLineMetrics_as.h
libcore/asobj/flash/text/TextRenderer_as.h
libcore/asobj/flash/text/TextSnapshot_as.cpp
libcore/asobj/flash/text/TextSnapshot_as.h
libcore/asobj/flash/ui/ContextMenuBuiltInItems_as.cpp
libcore/asobj/flash/ui/ContextMenuBuiltInItems_as.h
libcore/asobj/flash/ui/ContextMenuItem_as.cpp
libcore/asobj/flash/ui/ContextMenuItem_as.h
libcore/asobj/flash/ui/ContextMenu_as.cpp
libcore/asobj/flash/ui/ContextMenu_as.h
libcore/asobj/flash/ui/KeyLocation_as.cpp
libcore/asobj/flash/ui/KeyLocation_as.h
libcore/asobj/flash/ui/Keyboard_as.cpp
libcore/asobj/flash/ui/Keyboard_as.h
libcore/asobj/flash/ui/Mouse_as.cpp
libcore/asobj/flash/ui/Mouse_as.h
libcore/asobj/flash/utils/ByteArray_as.cpp
libcore/asobj/flash/utils/ByteArray_as.h
libcore/asobj/flash/utils/Dictionary_as.cpp
libcore/asobj/flash/utils/Dictionary_as.h
libcore/asobj/flash/utils/Endian_as.cpp
libcore/asobj/flash/utils/Endian_as.h
libcore/asobj/flash/utils/IDataInput_as.cpp
libcore/asobj/flash/utils/IDataInput_as.h
libcore/asobj/flash/utils/IDataOutput_as.cpp
libcore/asobj/flash/utils/IDataOutput_as.h
libcore/asobj/flash/utils/IExternalizable_as.cpp
libcore/asobj/flash/utils/IExternalizable_as.h
libcore/asobj/flash/utils/Proxy_as.cpp
libcore/asobj/flash/utils/Proxy_as.h
libcore/asobj/flash/utils/Timer_as.cpp
libcore/asobj/flash/utils/Timer_as.h
libcore/asobj/flash/xml/XMLDocument_as.cpp
libcore/asobj/flash/xml/XMLDocument_as.h
libcore/asobj/flash/xml/XMLNodeType_as.cpp
libcore/asobj/flash/xml/XMLNodeType_as.h
libcore/asobj/flash/xml/XMLNode_as.cpp
libcore/asobj/flash/xml/XMLNode_as.h
testsuite/actionscript.all/flash.as
------------------------------------------------------------
revno: 11323.1.1
committer: Benjamin Wolsey <address@hidden>
branch nick: work
timestamp: Tue 2009-07-28 13:11:43 +0200
message:
Remove duplicated documentation.
modified:
libcore/asobj/Global_as.h
------------------------------------------------------------
revno: 11323.1.2
committer: Benjamin Wolsey <address@hidden>
branch nick: work
timestamp: Tue 2009-07-28 13:40:52 +0200
message:
Use Global_as::createObject().
modified:
libcore/asobj/flash/desktop/ClipboardTransferMode_as.cpp
libcore/asobj/flash/display/ActionScriptVersion_as.cpp
libcore/asobj/flash/display/BitmapDataChannel_as.cpp
libcore/asobj/flash/display/CapsStyle_as.cpp
libcore/asobj/flash/display/GradientType_as.cpp
libcore/asobj/flash/display/InterpolationMethod_as.cpp
libcore/asobj/flash/display/JointStyle_as.cpp
libcore/asobj/flash/display/LineScaleMode_as.cpp
libcore/asobj/flash/display/PixelSnapping_as.cpp
libcore/asobj/flash/display/SWFVersion_as.cpp
libcore/asobj/flash/display/SpreadMethod_as.cpp
libcore/asobj/flash/display/StageAlign_as.cpp
libcore/asobj/flash/net/SharedObjectFlushStatus_as.cpp
libcore/asobj/flash/net/URLLoaderDataFormat_as.cpp
libcore/asobj/flash/net/URLRequestMethod_as.cpp
libcore/asobj/flash/printing/PrintJobOrientation_as.cpp
libcore/asobj/flash/system/IMEConversionMode_as.cpp
libcore/asobj/flash/system/System_as.cpp
libcore/asobj/flash/text/AntiAliasType_as.cpp
libcore/asobj/flash/text/GridFitType_as.cpp
libcore/asobj/flash/text/TextColorType_as.cpp
libcore/asobj/flash/text/TextDisplayMode_as.cpp
libcore/asobj/flash/text/TextFieldAutoSize_as.cpp
libcore/asobj/flash/text/TextFieldType_as.cpp
libcore/asobj/flash/ui/Mouse_as.cpp
libcore/asobj/flash/xml/XMLNodeType_as.cpp
------------------------------------------------------------
revno: 11323.1.3
committer: Benjamin Wolsey <address@hidden>
branch nick: work
timestamp: Tue 2009-07-28 13:58:27 +0200
message:
Make variable names consistent for easier sedding.
Fix some problems from last sed run.
modified:
libcore/asobj/flash/accessibility/AccessibilityProperties_as.cpp
libcore/asobj/flash/accessibility/AccessibilityProperties_as.h
libcore/asobj/flash/accessibility/Accessibility_as.cpp
libcore/asobj/flash/accessibility/Accessibility_as.h
libcore/asobj/flash/desktop/ClipboardFormats_as.h
libcore/asobj/flash/desktop/ClipboardTransferMode_as.cpp
libcore/asobj/flash/desktop/ClipboardTransferMode_as.h
libcore/asobj/flash/desktop/Clipboard_as.cpp
libcore/asobj/flash/desktop/Clipboard_as.h
libcore/asobj/flash/display/AVM1Movie_as.cpp
libcore/asobj/flash/display/AVM1Movie_as.h
libcore/asobj/flash/display/ActionScriptVersion_as.cpp
libcore/asobj/flash/display/ActionScriptVersion_as.h
libcore/asobj/flash/display/BitmapDataChannel_as.cpp
libcore/asobj/flash/display/BitmapDataChannel_as.h
libcore/asobj/flash/display/BitmapData_as.cpp
libcore/asobj/flash/display/BitmapData_as.h
libcore/asobj/flash/display/Bitmap_as.cpp
libcore/asobj/flash/display/Bitmap_as.h
libcore/asobj/flash/display/BlendMode_as.cpp
libcore/asobj/flash/display/BlendMode_as.h
libcore/asobj/flash/display/CapsStyle_as.cpp
libcore/asobj/flash/display/CapsStyle_as.h
libcore/asobj/flash/display/DisplayObjectContainer_as.h
libcore/asobj/flash/display/DisplayObject_as.cpp
libcore/asobj/flash/display/DisplayObject_as.h
libcore/asobj/flash/display/FrameLabel_as.cpp
libcore/asobj/flash/display/FrameLabel_as.h
libcore/asobj/flash/display/GradientType_as.cpp
libcore/asobj/flash/display/GradientType_as.h
libcore/asobj/flash/display/Graphics_as.cpp
libcore/asobj/flash/display/Graphics_as.h
libcore/asobj/flash/display/IBitmapDrawable_as.cpp
libcore/asobj/flash/display/IBitmapDrawable_as.h
libcore/asobj/flash/display/InteractiveObject_as.cpp
libcore/asobj/flash/display/InteractiveObject_as.h
libcore/asobj/flash/display/InterpolationMethod_as.cpp
libcore/asobj/flash/display/InterpolationMethod_as.h
libcore/asobj/flash/display/JointStyle_as.cpp
libcore/asobj/flash/display/JointStyle_as.h
libcore/asobj/flash/display/LineScaleMode_as.cpp
libcore/asobj/flash/display/LineScaleMode_as.h
libcore/asobj/flash/display/LoaderInfo_as.cpp
libcore/asobj/flash/display/LoaderInfo_as.h
libcore/asobj/flash/display/Loader_as.cpp
libcore/asobj/flash/display/Loader_as.h
libcore/asobj/flash/display/MorphShape_as.cpp
libcore/asobj/flash/display/MorphShape_as.h
libcore/asobj/flash/display/MovieClip_as.cpp
libcore/asobj/flash/display/MovieClip_as.h
libcore/asobj/flash/display/PixelSnapping_as.cpp
libcore/asobj/flash/display/PixelSnapping_as.h
libcore/asobj/flash/display/SWFVersion_as.cpp
libcore/asobj/flash/display/SWFVersion_as.h
libcore/asobj/flash/display/Scene_as.cpp
libcore/asobj/flash/display/Scene_as.h
libcore/asobj/flash/display/Shape_as.cpp
libcore/asobj/flash/display/Shape_as.h
libcore/asobj/flash/display/SimpleButton_as.cpp
libcore/asobj/flash/display/SimpleButton_as.h
libcore/asobj/flash/display/SpreadMethod_as.cpp
libcore/asobj/flash/display/SpreadMethod_as.h
libcore/asobj/flash/display/Sprite_as.cpp
libcore/asobj/flash/display/Sprite_as.h
libcore/asobj/flash/display/StageAlign_as.cpp
libcore/asobj/flash/display/StageAlign_as.h
libcore/asobj/flash/display/StageDisplayState_as.h
libcore/asobj/flash/display/StageQuality_as.h
libcore/asobj/flash/display/StageScaleMode_as.h
libcore/asobj/flash/display/Stage_as.cpp
libcore/asobj/flash/display/Stage_as.h
libcore/asobj/flash/errors/EOFError_as.cpp
libcore/asobj/flash/errors/EOFError_as.h
libcore/asobj/flash/errors/IOError_as.cpp
libcore/asobj/flash/errors/IOError_as.h
libcore/asobj/flash/errors/IllegalOperationError_as.cpp
libcore/asobj/flash/errors/IllegalOperationError_as.h
libcore/asobj/flash/errors/InvalidSWFError_as.cpp
libcore/asobj/flash/errors/InvalidSWFError_as.h
libcore/asobj/flash/errors/MemoryError_as.cpp
libcore/asobj/flash/errors/MemoryError_as.h
libcore/asobj/flash/errors/ScriptTimeoutError_as.cpp
libcore/asobj/flash/errors/ScriptTimeoutError_as.h
libcore/asobj/flash/errors/StackOverflowError_as.cpp
libcore/asobj/flash/errors/StackOverflowError_as.h
libcore/asobj/flash/events/ActivityEvent_as.cpp
libcore/asobj/flash/events/ActivityEvent_as.h
libcore/asobj/flash/events/AsyncErrorEvent_as.cpp
libcore/asobj/flash/events/AsyncErrorEvent_as.h
libcore/asobj/flash/events/ContextMenuEvent_as.cpp
libcore/asobj/flash/events/ContextMenuEvent_as.h
libcore/asobj/flash/events/DataEvent_as.cpp
libcore/asobj/flash/events/DataEvent_as.h
libcore/asobj/flash/events/ErrorEvent_as.cpp
libcore/asobj/flash/events/ErrorEvent_as.h
libcore/asobj/flash/events/EventDispatcher_as.cpp
libcore/asobj/flash/events/EventDispatcher_as.h
libcore/asobj/flash/events/EventPhase_as.cpp
libcore/asobj/flash/events/EventPhase_as.h
libcore/asobj/flash/events/Event_as.cpp
libcore/asobj/flash/events/Event_as.h
libcore/asobj/flash/events/FocusEvent_as.cpp
libcore/asobj/flash/events/FocusEvent_as.h
libcore/asobj/flash/events/FullScreenEvent_as.cpp
libcore/asobj/flash/events/FullScreenEvent_as.h
libcore/asobj/flash/events/HTTPStatusEvent_as.cpp
libcore/asobj/flash/events/HTTPStatusEvent_as.h
libcore/asobj/flash/events/IEventDispatcher_as.cpp
libcore/asobj/flash/events/IEventDispatcher_as.h
libcore/asobj/flash/events/IMEEvent_as.cpp
libcore/asobj/flash/events/IMEEvent_as.h
libcore/asobj/flash/events/IOErrorEvent_as.cpp
libcore/asobj/flash/events/IOErrorEvent_as.h
libcore/asobj/flash/events/KeyboardEvent_as.cpp
libcore/asobj/flash/events/KeyboardEvent_as.h
libcore/asobj/flash/events/MouseEvent_as.cpp
libcore/asobj/flash/events/MouseEvent_as.h
libcore/asobj/flash/events/NetStatusEvent_as.cpp
libcore/asobj/flash/events/NetStatusEvent_as.h
libcore/asobj/flash/events/ProgressEvent_as.cpp
libcore/asobj/flash/events/ProgressEvent_as.h
libcore/asobj/flash/events/SecurityErrorEvent_as.cpp
libcore/asobj/flash/events/SecurityErrorEvent_as.h
libcore/asobj/flash/events/StatusEvent_as.cpp
libcore/asobj/flash/events/StatusEvent_as.h
libcore/asobj/flash/events/SyncEvent_as.cpp
libcore/asobj/flash/events/SyncEvent_as.h
libcore/asobj/flash/events/TextEvent_as.cpp
libcore/asobj/flash/events/TextEvent_as.h
libcore/asobj/flash/events/TimerEvent_as.cpp
libcore/asobj/flash/events/TimerEvent_as.h
libcore/asobj/flash/external/ExternalInterface_as.h
libcore/asobj/flash/filters/BevelFilter_as.cpp
libcore/asobj/flash/filters/BevelFilter_as.h
libcore/asobj/flash/filters/BitmapFilterQuality_as.cpp
libcore/asobj/flash/filters/BitmapFilterQuality_as.h
libcore/asobj/flash/filters/BitmapFilterType_as.cpp
libcore/asobj/flash/filters/BitmapFilterType_as.h
libcore/asobj/flash/filters/BitmapFilter_as.cpp
libcore/asobj/flash/filters/BitmapFilter_as.h
libcore/asobj/flash/filters/BlurFilter_as.cpp
libcore/asobj/flash/filters/BlurFilter_as.h
libcore/asobj/flash/filters/ColorMatrixFilter_as.cpp
libcore/asobj/flash/filters/ColorMatrixFilter_as.h
libcore/asobj/flash/filters/ConvolutionFilter_as.cpp
libcore/asobj/flash/filters/ConvolutionFilter_as.h
libcore/asobj/flash/filters/DisplacementMapFilterMode_as.cpp
libcore/asobj/flash/filters/DisplacementMapFilterMode_as.h
libcore/asobj/flash/filters/DisplacementMapFilter_as.h
libcore/asobj/flash/filters/DropShadowFilter_as.cpp
libcore/asobj/flash/filters/DropShadowFilter_as.h
libcore/asobj/flash/filters/GlowFilter_as.cpp
libcore/asobj/flash/filters/GlowFilter_as.h
libcore/asobj/flash/filters/GradientBevelFilter_as.cpp
libcore/asobj/flash/filters/GradientBevelFilter_as.h
libcore/asobj/flash/filters/GradientGlowFilter_as.cpp
libcore/asobj/flash/filters/GradientGlowFilter_as.h
libcore/asobj/flash/geom/ColorTransform_as.h
libcore/asobj/flash/geom/Matrix_as.h
libcore/asobj/flash/geom/Point_as.h
libcore/asobj/flash/geom/Rectangle_as.h
libcore/asobj/flash/geom/Transform_as.h
libcore/asobj/flash/media/Camera_as.cpp
libcore/asobj/flash/media/Camera_as.h
libcore/asobj/flash/media/ID3Info_as.cpp
libcore/asobj/flash/media/ID3Info_as.h
libcore/asobj/flash/media/Microphone_as.cpp
libcore/asobj/flash/media/Microphone_as.h
libcore/asobj/flash/media/SoundChannel_as.cpp
libcore/asobj/flash/media/SoundChannel_as.h
libcore/asobj/flash/media/SoundLoaderContext_as.cpp
libcore/asobj/flash/media/SoundLoaderContext_as.h
libcore/asobj/flash/media/SoundMixer_as.cpp
libcore/asobj/flash/media/SoundMixer_as.h
libcore/asobj/flash/media/SoundTransform_as.cpp
libcore/asobj/flash/media/SoundTransform_as.h
libcore/asobj/flash/media/Sound_as.cpp
libcore/asobj/flash/media/Sound_as.h
libcore/asobj/flash/media/Video_as.cpp
libcore/asobj/flash/media/Video_as.h
libcore/asobj/flash/media/media_as.cpp
libcore/asobj/flash/media/media_as.h
libcore/asobj/flash/net/FileFilter_as.cpp
libcore/asobj/flash/net/FileFilter_as.h
libcore/asobj/flash/net/FileReferenceList_as.h
libcore/asobj/flash/net/FileReference_as.h
libcore/asobj/flash/net/IDynamicPropertyOutput_as.cpp
libcore/asobj/flash/net/IDynamicPropertyOutput_as.h
libcore/asobj/flash/net/IDynamicPropertyWriter_as.cpp
libcore/asobj/flash/net/IDynamicPropertyWriter_as.h
libcore/asobj/flash/net/NetConnection_as.cpp
libcore/asobj/flash/net/NetConnection_as.h
libcore/asobj/flash/net/NetStream_as.cpp
libcore/asobj/flash/net/NetStream_as.h
libcore/asobj/flash/net/ObjectEncoding_as.cpp
libcore/asobj/flash/net/ObjectEncoding_as.h
libcore/asobj/flash/net/Responder_as.cpp
libcore/asobj/flash/net/Responder_as.h
libcore/asobj/flash/net/SharedObjectFlushStatus_as.cpp
libcore/asobj/flash/net/SharedObjectFlushStatus_as.h
libcore/asobj/flash/net/SharedObject_as.cpp
libcore/asobj/flash/net/SharedObject_as.h
libcore/asobj/flash/net/Socket_as.cpp
libcore/asobj/flash/net/Socket_as.h
libcore/asobj/flash/net/URLLoaderDataFormat_as.cpp
libcore/asobj/flash/net/URLLoaderDataFormat_as.h
libcore/asobj/flash/net/URLLoader_as.cpp
libcore/asobj/flash/net/URLLoader_as.h
libcore/asobj/flash/net/URLRequestHeader_as.cpp
libcore/asobj/flash/net/URLRequestHeader_as.h
libcore/asobj/flash/net/URLRequestMethod_as.cpp
libcore/asobj/flash/net/URLRequestMethod_as.h
libcore/asobj/flash/net/URLRequest_as.cpp
libcore/asobj/flash/net/URLRequest_as.h
libcore/asobj/flash/net/URLStream_as.cpp
libcore/asobj/flash/net/URLStream_as.h
libcore/asobj/flash/net/URLVariables_as.cpp
libcore/asobj/flash/net/URLVariables_as.h
libcore/asobj/flash/net/XMLSocket_as.cpp
libcore/asobj/flash/net/XMLSocket_as.h
libcore/asobj/flash/printing/PrintJobOptions_as.cpp
libcore/asobj/flash/printing/PrintJobOptions_as.h
libcore/asobj/flash/printing/PrintJobOrientation_as.cpp
libcore/asobj/flash/printing/PrintJobOrientation_as.h
libcore/asobj/flash/printing/PrintJob_as.cpp
libcore/asobj/flash/printing/PrintJob_as.h
libcore/asobj/flash/sampler/DeleteObjectSample_as.cpp
libcore/asobj/flash/sampler/DeleteObjectSample_as.h
libcore/asobj/flash/sampler/NewObjectSample_as.cpp
libcore/asobj/flash/sampler/NewObjectSample_as.h
libcore/asobj/flash/sampler/Sample_as.cpp
libcore/asobj/flash/sampler/Sample_as.h
libcore/asobj/flash/sampler/StackFrame_as.cpp
libcore/asobj/flash/sampler/StackFrame_as.h
libcore/asobj/flash/system/ApplicationDomain_as.cpp
libcore/asobj/flash/system/ApplicationDomain_as.h
libcore/asobj/flash/system/Capabilities_as.cpp
libcore/asobj/flash/system/Capabilities_as.h
libcore/asobj/flash/system/IMEConversionMode_as.cpp
libcore/asobj/flash/system/IMEConversionMode_as.h
libcore/asobj/flash/system/IME_as.cpp
libcore/asobj/flash/system/IME_as.h
libcore/asobj/flash/system/LoaderContext_as.cpp
libcore/asobj/flash/system/LoaderContext_as.h
libcore/asobj/flash/system/SecurityDomain_as.cpp
libcore/asobj/flash/system/SecurityDomain_as.h
libcore/asobj/flash/system/SecurityPanel_as.cpp
libcore/asobj/flash/system/SecurityPanel_as.h
libcore/asobj/flash/system/Security_as.cpp
libcore/asobj/flash/system/Security_as.h
libcore/asobj/flash/system/System_as.cpp
libcore/asobj/flash/system/System_as.h
libcore/asobj/flash/text/AntiAliasType_as.cpp
libcore/asobj/flash/text/AntiAliasType_as.h
libcore/asobj/flash/text/CSMSettings_as.cpp
libcore/asobj/flash/text/CSMSettings_as.h
libcore/asobj/flash/text/FontStyle_as.cpp
libcore/asobj/flash/text/FontStyle_as.h
libcore/asobj/flash/text/FontType_as.cpp
libcore/asobj/flash/text/FontType_as.h
libcore/asobj/flash/text/Font_as.cpp
libcore/asobj/flash/text/Font_as.h
libcore/asobj/flash/text/GridFitType_as.cpp
libcore/asobj/flash/text/GridFitType_as.h
libcore/asobj/flash/text/StaticText_as.cpp
libcore/asobj/flash/text/StaticText_as.h
libcore/asobj/flash/text/StyleSheet_as.cpp
libcore/asobj/flash/text/StyleSheet_as.h
libcore/asobj/flash/text/TextColorType_as.cpp
libcore/asobj/flash/text/TextColorType_as.h
libcore/asobj/flash/text/TextDisplayMode_as.cpp
libcore/asobj/flash/text/TextDisplayMode_as.h
libcore/asobj/flash/text/TextFieldAutoSize_as.cpp
libcore/asobj/flash/text/TextFieldType_as.cpp
libcore/asobj/flash/text/TextFieldType_as.h
libcore/asobj/flash/text/TextField_as.cpp
libcore/asobj/flash/text/TextField_as.h
libcore/asobj/flash/text/TextFormatAlign_as.cpp
libcore/asobj/flash/text/TextFormatAlign_as.h
libcore/asobj/flash/text/TextFormat_as.cpp
libcore/asobj/flash/text/TextFormat_as.h
libcore/asobj/flash/text/TextLineMetrics_as.cpp
libcore/asobj/flash/text/TextLineMetrics_as.h
libcore/asobj/flash/text/TextRenderer_as.h
libcore/asobj/flash/text/TextSnapshot_as.cpp
libcore/asobj/flash/text/TextSnapshot_as.h
libcore/asobj/flash/ui/ContextMenuBuiltInItems_as.cpp
libcore/asobj/flash/ui/ContextMenuBuiltInItems_as.h
libcore/asobj/flash/ui/ContextMenuItem_as.cpp
libcore/asobj/flash/ui/ContextMenuItem_as.h
libcore/asobj/flash/ui/ContextMenu_as.cpp
libcore/asobj/flash/ui/ContextMenu_as.h
libcore/asobj/flash/ui/KeyLocation_as.cpp
libcore/asobj/flash/ui/KeyLocation_as.h
libcore/asobj/flash/ui/Keyboard_as.cpp
libcore/asobj/flash/ui/Keyboard_as.h
libcore/asobj/flash/ui/Mouse_as.cpp
libcore/asobj/flash/ui/Mouse_as.h
libcore/asobj/flash/utils/ByteArray_as.cpp
libcore/asobj/flash/utils/ByteArray_as.h
libcore/asobj/flash/utils/Dictionary_as.cpp
libcore/asobj/flash/utils/Dictionary_as.h
libcore/asobj/flash/utils/Endian_as.cpp
libcore/asobj/flash/utils/Endian_as.h
libcore/asobj/flash/utils/IDataInput_as.cpp
libcore/asobj/flash/utils/IDataInput_as.h
libcore/asobj/flash/utils/IDataOutput_as.cpp
libcore/asobj/flash/utils/IDataOutput_as.h
libcore/asobj/flash/utils/IExternalizable_as.cpp
libcore/asobj/flash/utils/IExternalizable_as.h
libcore/asobj/flash/utils/Proxy_as.cpp
libcore/asobj/flash/utils/Proxy_as.h
libcore/asobj/flash/utils/Timer_as.cpp
libcore/asobj/flash/utils/Timer_as.h
libcore/asobj/flash/xml/XMLDocument_as.cpp
libcore/asobj/flash/xml/XMLDocument_as.h
libcore/asobj/flash/xml/XMLNodeType_as.cpp
libcore/asobj/flash/xml/XMLNodeType_as.h
libcore/asobj/flash/xml/XMLNode_as.cpp
libcore/asobj/flash/xml/XMLNode_as.h
------------------------------------------------------------
revno: 11323.1.4
committer: Benjamin Wolsey <address@hidden>
branch nick: work
timestamp: Tue 2009-07-28 14:23:57 +0200
message:
Test transform property. There is a real SWF, version 7, that assigns a
property named transform to a MovieClip, and this currently fails.
modified:
testsuite/actionscript.all/flash.as
------------------------------------------------------------
revno: 11323.1.5
committer: Benjamin Wolsey <address@hidden>
branch nick: work
timestamp: Tue 2009-07-28 14:29:13 +0200
message:
Add hasOwnProperty for version 5.
modified:
testsuite/actionscript.all/flash.as
------------------------------------------------------------
revno: 11323.1.6
committer: Benjamin Wolsey <address@hidden>
branch nick: work
timestamp: Tue 2009-07-28 15:32:07 +0200
message:
Initialize MovieClip.transform with SWF8 visibility.
modified:
libcore/asobj/flash/display/MovieClip_as.cpp
------------------------------------------------------------
revno: 11323.1.7
committer: Benjamin Wolsey <address@hidden>
branch nick: work
timestamp: Tue 2009-07-28 15:35:32 +0200
message:
Clean up.
modified:
libcore/as_object.cpp
------------------------------------------------------------
revno: 11323.1.8
committer: Benjamin Wolsey <address@hidden>
branch nick: test
timestamp: Tue 2009-07-28 18:04:00 +0200
message:
Expect failure.
modified:
testsuite/actionscript.all/flash.as
=== modified file 'libcore/as_object.cpp'
--- a/libcore/as_object.cpp 2009-07-16 08:53:33 +0000
+++ b/libcore/as_object.cpp 2009-07-28 13:35:32 +0000
@@ -302,7 +302,7 @@
as_object::add_property(const std::string& name, as_function& getter,
as_function* setter)
{
- string_table &st = _vm.getStringTable();
+ string_table &st = getStringTable(*this);
string_table::key k = st.find(name);
as_value cacheVal;
@@ -370,7 +370,7 @@
/// If __resolve exists, call it with the name of the undefined
/// property.
- string_table& st = _vm.getStringTable();
+ string_table& st = getStringTable(*this);
const std::string& undefinedName = st.value(name);
log_debug("__resolve exists, calling with '%s'", undefinedName);
@@ -498,7 +498,7 @@
as_object::findProperty(string_table::key key, string_table::key nsname,
as_object **owner)
{
- int swfVersion = _vm.getSWFVersion();
+ int swfVersion = getSWFVersion(*this);
// don't enter an infinite loop looking for __proto__ ...
if (key == NSV::PROP_uuPROTOuu && !nsname)
@@ -547,7 +547,7 @@
Property*
as_object::findUpdatableProperty(string_table::key key, string_table::key
nsname)
{
- int swfVersion = _vm.getSWFVersion();
+ const int swfVersion = getSWFVersion(*this);
Property* prop = _members.getProperty(key, nsname);
//
@@ -635,7 +635,7 @@
{
IF_VERBOSE_ASCODING_ERRORS(log_aserror(_(""
"Attempt to set read-only property '%s'"),
- _vm.getStringTable().value(key)););
+ getStringTable(*this).value(key)););
return true;
}
@@ -654,7 +654,7 @@
as_value curVal = prop->getCache(); //
getValue(*this);
log_debug("Existing property %s is being
watched: firing trigger on update (current val:%s, new val:%s)",
- _vm.getStringTable().value(key),
curVal, val);
+ getStringTable(*this).value(key),
curVal, val);
as_value newVal = trig.call(curVal, val, *this);
// The trigger call could have deleted the
property,
// so we check for its existance again, and do
NOT put
@@ -662,7 +662,7 @@
prop = findUpdatableProperty(key, nsname);
if ( ! prop )
{
- log_debug("Property %s deleted by
trigger on update", _vm.getStringTable().value(key));
+ log_debug("Property %s deleted by
trigger on update", getStringTable(*this).value(key));
return true;
}
@@ -675,12 +675,12 @@
prop->setValue(*this, val);
}
- prop->clearVisible(_vm.getSWFVersion());
+ prop->clearVisible(getSWFVersion(*this));
}
catch (ActionTypeError& exc)
{
log_aserror(_("%s: Exception %s. Will create a new
member"),
- _vm.getStringTable().value(key), exc.what());
+ getStringTable(*this).value(key), exc.what());
}
return true;
@@ -694,7 +694,7 @@
{
IF_VERBOSE_ASCODING_ERRORS(
log_aserror(_("Unknown failure in setting property '%s'
on "
- "object '%p'"), _vm.getStringTable().value(key),
(void*) this);
+ "object '%p'"), getStringTable(*this).value(key),
(void*) this);
);
return false;
}
@@ -708,7 +708,7 @@
{
Trigger& trig = trigIter->second;
- log_debug("Property %s is being watched, calling trigger on
create", _vm.getStringTable().value(key));
+ log_debug("Property %s is being watched, calling trigger on
create", getStringTable(*this).value(key));
// NOTE: the trigger call might delete the propery being added
// so we first add the property, then call the trigger
@@ -721,7 +721,7 @@
if ( ! prop )
{
log_debug("Property %s deleted by trigger on create",
- _vm.getStringTable().value(key));
+ getStringTable(*this).value(key));
}
else
{
@@ -737,7 +737,7 @@
as_object::init_member(const std::string& key1, const as_value& val, int flags,
string_table::key nsname)
{
- init_member(_vm.getStringTable().find(PROPNAME(key1)), val, flags,
nsname);
+ init_member(getStringTable(*this).find(PROPNAME(key1)), val, flags,
nsname);
}
void
@@ -758,7 +758,7 @@
{
log_error(_("Attempt to initialize read-only property ``%s''"
" on object ``%p'' twice"),
- _vm.getStringTable().value(key), (void*)this);
+ getStringTable(*this).value(key), (void*)this);
// We shouldn't attempt to initialize a member twice, should we
?
abort();
}
@@ -768,7 +768,7 @@
as_object::init_property(const std::string& key, as_function& getter,
as_function& setter, int flags, string_table::key nsname)
{
- string_table::key k = _vm.getStringTable().find(PROPNAME(key));
+ string_table::key k = getStringTable(*this).find(PROPNAME(key));
init_property(k, getter, setter, flags, nsname);
}
@@ -787,7 +787,7 @@
as_object::init_property(const std::string& key, as_c_function_ptr getter,
as_c_function_ptr setter, int flags, string_table::key nsname)
{
- string_table::key k = _vm.getStringTable().find(PROPNAME(key));
+ string_table::key k = getStringTable(*this).find(PROPNAME(key));
init_property(k, getter, setter, flags, nsname);
}
@@ -822,7 +822,7 @@
as_object::init_readonly_property(const std::string& key, as_function& getter,
int initflags, string_table::key nsname)
{
- string_table::key k = _vm.getStringTable().find(PROPNAME(key));
+ string_table::key k = getStringTable(*this).find(PROPNAME(key));
init_property(k, getter, getter, initflags | PropFlags::readOnly
| PropFlags::isProtected, nsname);
@@ -842,7 +842,7 @@
as_object::init_readonly_property(const std::string& key,
as_c_function_ptr getter, int initflags, string_table::key nsname)
{
- string_table::key k = _vm.getStringTable().find(PROPNAME(key));
+ string_table::key k = getStringTable(*this).find(PROPNAME(key));
init_property(k, getter, getter, initflags | PropFlags::readOnly
| PropFlags::isProtected, nsname);
@@ -1018,7 +1018,7 @@
}
// set_member_flags will take care of case conversion
- if (!set_member_flags(_vm.getStringTable().find(prop),
set_true, set_false) )
+ if (!set_member_flags(getStringTable(*this).find(prop),
set_true, set_false) )
{
IF_VERBOSE_ASCODING_ERRORS(
log_aserror(_("Can't set propflags on object "
@@ -1300,7 +1300,7 @@
{
#ifdef DEBUG_TARGET_FINDING
log_debug("Member %s not found in object %p",
- _vm.getStringTable().value(key), (void*)this);
+ getStringTable(*this).value(key), (void*)this);
#endif
return NULL;
}
@@ -1308,7 +1308,7 @@
{
#ifdef DEBUG_TARGET_FINDING
log_debug("Member %s of object %p is not an object (%s)",
- _vm.getStringTable().value(key), (void*)this, tmp);
+ getStringTable(*this).value(key), (void*)this, tmp);
#endif
return NULL;
}
=== modified file 'libcore/asobj/Global_as.h'
--- a/libcore/asobj/Global_as.h 2009-07-16 12:46:26 +0000
+++ b/libcore/asobj/Global_as.h 2009-07-28 11:11:43 +0000
@@ -16,31 +16,6 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/// This file provides implementations of two different ActionScript global
-/// objects: one for AVM1, one for AVM2.
-//
-/// The AVM1 global object has more (known) global functions. All AS2 classes
-/// are initialized as object prototypes and functions attached to the
-/// global object. From SWF8, the 'flash' package is attached as follows:
-///
-/// _global
-/// |
-/// flash
-/// |
-/// ---------------------------------------------------
-/// | | | | | |
-/// display net external filters geom text
-///
-/// where each item is an object.
-///
-/// The AVM2 global object has functions such as trace(), escape(),
-/// parseFloat(), parseInt() in common with AVM1. Some classes, such as
-/// Array, Boolean, Date, String, and Object, are also directly attached.
-/// Other classes, however, are different. The flash package in AVM2 is a
-/// namespace, not an object, and all members of the flash package are
-/// attached with a namespace to the global object. As we do this on
-/// demand, the AVM2 global object is much emptier than the AVM1 equivalent
-/// to start with.
#ifndef GNASH_GLOBAL_H
#define GNASH_GLOBAL_H
=== modified file
'libcore/asobj/flash/accessibility/AccessibilityProperties_as.cpp'
--- a/libcore/asobj/flash/accessibility/AccessibilityProperties_as.cpp
2009-07-16 09:02:35 +0000
+++ b/libcore/asobj/flash/accessibility/AccessibilityProperties_as.cpp
2009-07-28 11:58:27 +0000
@@ -52,18 +52,18 @@
};
// extern (used by Global.cpp)
-void accessibilityproperties_class_init(as_object& global, const ObjectURI&
uri)
+void accessibilityproperties_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&accessibilityproperties_ctor,
getAccessibilityPropertiesInterface());
attachAccessibilityPropertiesStaticInterface(*cl);
}
// Register _global.AccessibilityProperties
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file
'libcore/asobj/flash/accessibility/AccessibilityProperties_as.h'
--- a/libcore/asobj/flash/accessibility/AccessibilityProperties_as.h
2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/accessibility/AccessibilityProperties_as.h
2009-07-28 11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global AccessibilityProperties class
-void accessibilityproperties_class_init(as_object& global, const ObjectURI&
uri);
+void accessibilityproperties_class_init(as_object& where, const ObjectURI&
uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/accessibility/Accessibility_as.cpp'
--- a/libcore/asobj/flash/accessibility/Accessibility_as.cpp 2009-07-16
09:12:10 +0000
+++ b/libcore/asobj/flash/accessibility/Accessibility_as.cpp 2009-07-28
11:58:27 +0000
@@ -57,13 +57,13 @@
};
// extern (used by Global.cpp)
-void accessibility_class_init(as_object& global, const ObjectURI& uri)
+void accessibility_class_init(as_object& where, const ObjectURI& uri)
{
boost::intrusive_ptr<as_object> obj = new as_object(getObjectInterface());
attachAccessibilityInterface(*obj);
// Register _global.Accessibility
- global.init_member(getName(uri), obj.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), obj.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/accessibility/Accessibility_as.h'
--- a/libcore/asobj/flash/accessibility/Accessibility_as.h 2009-07-16
08:30:06 +0000
+++ b/libcore/asobj/flash/accessibility/Accessibility_as.h 2009-07-28
11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global Accessibility class
-void accessibility_class_init(as_object& global, const ObjectURI& uri);
+void accessibility_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/desktop/ClipboardFormats_as.h'
--- a/libcore/asobj/flash/desktop/ClipboardFormats_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/desktop/ClipboardFormats_as.h 2009-07-28 11:58:27
+0000
@@ -31,7 +31,7 @@
class ObjectURI;
/// Initialize the global ClipboardFormats class
-void clipboardformats_class_init(as_object& global, const ObjectURI& uri);
+void clipboardformats_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/desktop/ClipboardTransferMode_as.cpp'
--- a/libcore/asobj/flash/desktop/ClipboardTransferMode_as.cpp 2009-07-16
09:37:37 +0000
+++ b/libcore/asobj/flash/desktop/ClipboardTransferMode_as.cpp 2009-07-28
11:58:27 +0000
@@ -42,7 +42,9 @@
void
clipboardtransfermode_class_init(as_object& where, const ObjectURI& uri)
{
- static as_object* obj = new as_object(getObjectInterface());
+ Global_as* gl = getGlobal(where);
+ as_object* proto = getObjectInterface();
+ static as_object* obj = gl->createObject(proto);
attachClipboardTransferModeStaticInterface(*obj);
where.init_member(getName(uri), obj, as_object::DefaultFlags,
getNamespace(uri));
=== modified file 'libcore/asobj/flash/desktop/ClipboardTransferMode_as.h'
--- a/libcore/asobj/flash/desktop/ClipboardTransferMode_as.h 2009-07-16
08:30:06 +0000
+++ b/libcore/asobj/flash/desktop/ClipboardTransferMode_as.h 2009-07-28
11:58:27 +0000
@@ -31,7 +31,7 @@
class ObjectURI;
/// Initialize the global ClipboardTransferMode class
-void clipboardtransfermode_class_init(as_object& global, const ObjectURI& uri);
+void clipboardtransfermode_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/desktop/Clipboard_as.cpp'
--- a/libcore/asobj/flash/desktop/Clipboard_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/desktop/Clipboard_as.cpp 2009-07-28 11:58:27
+0000
@@ -52,18 +52,18 @@
};
// extern (used by Global.cpp)
-void clipboard_class_init(as_object& global, const ObjectURI& uri)
+void clipboard_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&clipboard_ctor, getClipboardInterface());
attachClipboardStaticInterface(*cl);
}
// Register _global.Clipboard
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/desktop/Clipboard_as.h'
--- a/libcore/asobj/flash/desktop/Clipboard_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/desktop/Clipboard_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global Clipboard class
-void clipboard_class_init(as_object& global, const ObjectURI& uri);
+void clipboard_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/display/AVM1Movie_as.cpp'
--- a/libcore/asobj/flash/display/AVM1Movie_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/display/AVM1Movie_as.cpp 2009-07-28 11:58:27
+0000
@@ -52,18 +52,18 @@
};
// extern (used by Global.cpp)
-void avm1movie_class_init(as_object& global, const ObjectURI& uri)
+void avm1movie_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&avm1movie_ctor, getAVM1MovieInterface());
attachAVM1MovieStaticInterface(*cl);
}
// Register _global.AVM1Movie
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/display/AVM1Movie_as.h'
--- a/libcore/asobj/flash/display/AVM1Movie_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/display/AVM1Movie_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
namespace gnash {
/// Initialize the global AVM1Movie class
-void avm1movie_class_init(as_object& global, const ObjectURI& uri);
+void avm1movie_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/display/ActionScriptVersion_as.cpp'
--- a/libcore/asobj/flash/display/ActionScriptVersion_as.cpp 2009-07-16
09:06:51 +0000
+++ b/libcore/asobj/flash/display/ActionScriptVersion_as.cpp 2009-07-28
11:58:27 +0000
@@ -41,11 +41,13 @@
// extern (used by Global.cpp)
void
-actionscriptversion_class_init(as_object& global, const ObjectURI& uri)
+actionscriptversion_class_init(as_object& where, const ObjectURI& uri)
{
- static as_object* o = new as_object(getObjectInterface());
+ Global_as* gl = getGlobal(where);
+ as_object* proto = getObjectInterface();
+ static as_object* o = gl->createObject(proto);
attachActionScriptVersionStaticInterface(*o);
- global.init_member(getName(uri), o, as_object::DefaultFlags,
+ where.init_member(getName(uri), o, as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/display/ActionScriptVersion_as.h'
--- a/libcore/asobj/flash/display/ActionScriptVersion_as.h 2009-07-16
08:30:06 +0000
+++ b/libcore/asobj/flash/display/ActionScriptVersion_as.h 2009-07-28
11:58:27 +0000
@@ -32,7 +32,7 @@
namespace gnash {
/// Initialize the global ActionScriptVersion class
-void actionscriptversion_class_init(as_object& global, const ObjectURI& uri);
+void actionscriptversion_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/display/BitmapDataChannel_as.cpp'
--- a/libcore/asobj/flash/display/BitmapDataChannel_as.cpp 2009-07-16
09:06:51 +0000
+++ b/libcore/asobj/flash/display/BitmapDataChannel_as.cpp 2009-07-28
11:58:27 +0000
@@ -41,11 +41,13 @@
// extern (used by Global.cpp)
void
-bitmapdatachannel_class_init(as_object& global, const ObjectURI& uri)
+bitmapdatachannel_class_init(as_object& where, const ObjectURI& uri)
{
- static as_object* o = new as_object(getObjectInterface());
+ Global_as* gl = getGlobal(where);
+ as_object* proto = getObjectInterface();
+ static as_object* o = gl->createObject(proto);
attachBitmapDataChannelStaticInterface(*o);
- global.init_member(getName(uri), o, as_object::DefaultFlags,
+ where.init_member(getName(uri), o, as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/display/BitmapDataChannel_as.h'
--- a/libcore/asobj/flash/display/BitmapDataChannel_as.h 2009-07-16
08:30:06 +0000
+++ b/libcore/asobj/flash/display/BitmapDataChannel_as.h 2009-07-28
11:58:27 +0000
@@ -32,7 +32,7 @@
namespace gnash {
/// Initialize the global BitmapDataChannel class
-void bitmapdatachannel_class_init(as_object& global, const ObjectURI& uri);
+void bitmapdatachannel_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/display/BitmapData_as.cpp'
--- a/libcore/asobj/flash/display/BitmapData_as.cpp 2009-07-16 10:07:08
+0000
+++ b/libcore/asobj/flash/display/BitmapData_as.cpp 2009-07-28 11:58:27
+0000
@@ -225,12 +225,12 @@
}
as_object*
-getFlashDisplayBitmapDataConstructor(as_object& global)
+getFlashDisplayBitmapDataConstructor(as_object& where)
{
static as_object* cl = NULL;
if ( ! cl )
{
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&BitmapData_ctor, getBitmapDataInterface());
VM::get().addStatic(cl);
attachBitmapDataStaticProperties(*cl);
=== modified file 'libcore/asobj/flash/display/BitmapData_as.h'
--- a/libcore/asobj/flash/display/BitmapData_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/display/BitmapData_as.h 2009-07-28 11:58:27
+0000
@@ -118,7 +118,7 @@
/// Initialize the global BitmapData class
-void bitmapdata_class_init(as_object& global, const ObjectURI& uri);
+void bitmapdata_class_init(as_object& where, const ObjectURI& uri);
} // end of gnash namespace
=== modified file 'libcore/asobj/flash/display/Bitmap_as.cpp'
--- a/libcore/asobj/flash/display/Bitmap_as.cpp 2009-07-16 09:02:35 +0000
+++ b/libcore/asobj/flash/display/Bitmap_as.cpp 2009-07-28 11:58:27 +0000
@@ -52,18 +52,18 @@
};
// extern (used by Global.cpp)
-void bitmap_class_init(as_object& global, const ObjectURI& uri)
+void bitmap_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&bitmap_ctor, getBitmapInterface());
attachBitmapStaticInterface(*cl);
}
// Register _global.Bitmap
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/display/Bitmap_as.h'
--- a/libcore/asobj/flash/display/Bitmap_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/display/Bitmap_as.h 2009-07-28 11:58:27 +0000
@@ -32,7 +32,7 @@
namespace gnash {
/// Initialize the global Bitmap class
-void bitmap_class_init(as_object& global, const ObjectURI& uri);
+void bitmap_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/display/BlendMode_as.cpp'
--- a/libcore/asobj/flash/display/BlendMode_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/display/BlendMode_as.cpp 2009-07-28 11:58:27
+0000
@@ -52,18 +52,18 @@
};
// extern (used by Global.cpp)
-void blendmode_class_init(as_object& global, const ObjectURI& uri)
+void blendmode_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&blendmode_ctor, getBlendModeInterface());
attachBlendModeStaticInterface(*cl);
}
// Register _global.BlendMode
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/display/BlendMode_as.h'
--- a/libcore/asobj/flash/display/BlendMode_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/display/BlendMode_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
namespace gnash {
/// Initialize the global BlendMode class
-void blendmode_class_init(as_object& global, const ObjectURI& uri);
+void blendmode_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/display/CapsStyle_as.cpp'
--- a/libcore/asobj/flash/display/CapsStyle_as.cpp 2009-07-16 09:06:51
+0000
+++ b/libcore/asobj/flash/display/CapsStyle_as.cpp 2009-07-28 11:58:27
+0000
@@ -41,11 +41,13 @@
// extern (used by Global.cpp)
void
-capsstyle_class_init(as_object& global, const ObjectURI& uri)
+capsstyle_class_init(as_object& where, const ObjectURI& uri)
{
- static as_object* o = new as_object(getObjectInterface());
+ Global_as* gl = getGlobal(where);
+ as_object* proto = getObjectInterface();
+ static as_object* o = gl->createObject(proto);
attachCapsStyleStaticInterface(*o);
- global.init_member(getName(uri), o, as_object::DefaultFlags,
+ where.init_member(getName(uri), o, as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/display/CapsStyle_as.h'
--- a/libcore/asobj/flash/display/CapsStyle_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/display/CapsStyle_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
namespace gnash {
/// Initialize the global CapsStyle class
-void capsstyle_class_init(as_object& global, const ObjectURI& uri);
+void capsstyle_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/display/DisplayObjectContainer_as.h'
--- a/libcore/asobj/flash/display/DisplayObjectContainer_as.h 2009-07-16
08:30:06 +0000
+++ b/libcore/asobj/flash/display/DisplayObjectContainer_as.h 2009-07-28
11:58:27 +0000
@@ -32,7 +32,7 @@
namespace gnash {
/// Initialize the global DisplayObjectContainer class
-void displayobjectcontainer_class_init(as_object& global, const ObjectURI&
uri);
+void displayobjectcontainer_class_init(as_object& where, const ObjectURI& uri);
/// Get an as_object with the DisplayObjectContainer interface.
as_object* getDisplayObjectContainerInterface();
=== modified file 'libcore/asobj/flash/display/DisplayObject_as.cpp'
--- a/libcore/asobj/flash/display/DisplayObject_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/display/DisplayObject_as.cpp 2009-07-28 11:58:27
+0000
@@ -63,18 +63,18 @@
};
// extern (used by Global.cpp)
-void displayobject_class_init(as_object& global, const ObjectURI& uri)
+void displayobject_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&displayobject_ctor, getDisplayObjectInterface());
attachDisplayObjectStaticInterface(*cl);
}
// Register _global.DisplayObject
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/display/DisplayObject_as.h'
--- a/libcore/asobj/flash/display/DisplayObject_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/display/DisplayObject_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
namespace gnash {
/// Initialize the global DisplayObject class
-void displayobject_class_init(as_object& global, const ObjectURI& uri);
+void displayobject_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/display/FrameLabel_as.cpp'
--- a/libcore/asobj/flash/display/FrameLabel_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/display/FrameLabel_as.cpp 2009-07-28 11:58:27
+0000
@@ -52,18 +52,18 @@
};
// extern (used by Global.cpp)
-void framelabel_class_init(as_object& global, const ObjectURI& uri)
+void framelabel_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&framelabel_ctor, getFrameLabelInterface());
attachFrameLabelStaticInterface(*cl);
}
// Register _global.FrameLabel
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/display/FrameLabel_as.h'
--- a/libcore/asobj/flash/display/FrameLabel_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/display/FrameLabel_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
namespace gnash {
/// Initialize the global FrameLabel class
-void framelabel_class_init(as_object& global, const ObjectURI& uri);
+void framelabel_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/display/GradientType_as.cpp'
--- a/libcore/asobj/flash/display/GradientType_as.cpp 2009-07-16 09:06:51
+0000
+++ b/libcore/asobj/flash/display/GradientType_as.cpp 2009-07-28 11:58:27
+0000
@@ -41,11 +41,13 @@
// extern (used by Global.cpp)
void
-gradienttype_class_init(as_object& global, const ObjectURI& uri)
+gradienttype_class_init(as_object& where, const ObjectURI& uri)
{
- static as_object* o = new as_object(getObjectInterface());
+ Global_as* gl = getGlobal(where);
+ as_object* proto = getObjectInterface();
+ static as_object* o = gl->createObject(proto);
attachGradientTypeStaticInterface(*o);
- global.init_member(getName(uri), o, as_object::DefaultFlags,
+ where.init_member(getName(uri), o, as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/display/GradientType_as.h'
--- a/libcore/asobj/flash/display/GradientType_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/display/GradientType_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
namespace gnash {
/// Initialize the global GradientType class
-void gradienttype_class_init(as_object& global, const ObjectURI& uri);
+void gradienttype_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/display/Graphics_as.cpp'
--- a/libcore/asobj/flash/display/Graphics_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/display/Graphics_as.cpp 2009-07-28 11:58:27
+0000
@@ -65,18 +65,18 @@
};
// extern (used by Global.cpp)
-void graphics_class_init(as_object& global, const ObjectURI& uri)
+void graphics_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&graphics_ctor, getGraphicsInterface());
attachGraphicsStaticInterface(*cl);
}
// Register _global.Graphics
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/display/Graphics_as.h'
--- a/libcore/asobj/flash/display/Graphics_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/display/Graphics_as.h 2009-07-28 11:58:27 +0000
@@ -32,7 +32,7 @@
namespace gnash {
/// Initialize the global Graphics class
-void graphics_class_init(as_object& global, const ObjectURI& uri);
+void graphics_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/display/IBitmapDrawable_as.cpp'
--- a/libcore/asobj/flash/display/IBitmapDrawable_as.cpp 2009-07-16
09:02:35 +0000
+++ b/libcore/asobj/flash/display/IBitmapDrawable_as.cpp 2009-07-28
11:58:27 +0000
@@ -52,18 +52,18 @@
};
// extern (used by Global.cpp)
-void ibitmapdrawable_class_init(as_object& global, const ObjectURI& uri)
+void ibitmapdrawable_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&ibitmapdrawable_ctor,
getIBitmapDrawableInterface());
attachIBitmapDrawableStaticInterface(*cl);
}
// Register _global.IBitmapDrawable
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/display/IBitmapDrawable_as.h'
--- a/libcore/asobj/flash/display/IBitmapDrawable_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/display/IBitmapDrawable_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
namespace gnash {
/// Initialize the global IBitmapDrawable class
-void ibitmapdrawable_class_init(as_object& global, const ObjectURI& uri);
+void ibitmapdrawable_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/display/InteractiveObject_as.cpp'
--- a/libcore/asobj/flash/display/InteractiveObject_as.cpp 2009-07-16
09:02:35 +0000
+++ b/libcore/asobj/flash/display/InteractiveObject_as.cpp 2009-07-28
11:58:27 +0000
@@ -52,18 +52,18 @@
};
// extern (used by Global.cpp)
-void interactiveobject_class_init(as_object& global, const ObjectURI& uri)
+void interactiveobject_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&interactiveobject_ctor,
getInteractiveObjectInterface());
attachInteractiveObjectStaticInterface(*cl);
}
// Register _global.InteractiveObject
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/display/InteractiveObject_as.h'
--- a/libcore/asobj/flash/display/InteractiveObject_as.h 2009-07-16
08:30:06 +0000
+++ b/libcore/asobj/flash/display/InteractiveObject_as.h 2009-07-28
11:58:27 +0000
@@ -32,7 +32,7 @@
namespace gnash {
/// Initialize the global InteractiveObject class
-void interactiveobject_class_init(as_object& global, const ObjectURI& uri);
+void interactiveobject_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/display/InterpolationMethod_as.cpp'
--- a/libcore/asobj/flash/display/InterpolationMethod_as.cpp 2009-07-16
09:06:51 +0000
+++ b/libcore/asobj/flash/display/InterpolationMethod_as.cpp 2009-07-28
11:58:27 +0000
@@ -41,11 +41,13 @@
// extern (used by Global.cpp)
void
-interpolationmethod_class_init(as_object& global, const ObjectURI& uri)
+interpolationmethod_class_init(as_object& where, const ObjectURI& uri)
{
- static as_object* o = new as_object(getObjectInterface());
+ Global_as* gl = getGlobal(where);
+ as_object* proto = getObjectInterface();
+ static as_object* o = gl->createObject(proto);
attachInterpolationMethodStaticInterface(*o);
- global.init_member(getName(uri), o, as_object::DefaultFlags,
+ where.init_member(getName(uri), o, as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/display/InterpolationMethod_as.h'
--- a/libcore/asobj/flash/display/InterpolationMethod_as.h 2009-07-16
08:30:06 +0000
+++ b/libcore/asobj/flash/display/InterpolationMethod_as.h 2009-07-28
11:58:27 +0000
@@ -32,7 +32,7 @@
namespace gnash {
/// Initialize the global InterpolationMethod class
-void interpolationmethod_class_init(as_object& global, const ObjectURI& uri);
+void interpolationmethod_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/display/JointStyle_as.cpp'
--- a/libcore/asobj/flash/display/JointStyle_as.cpp 2009-07-16 09:06:51
+0000
+++ b/libcore/asobj/flash/display/JointStyle_as.cpp 2009-07-28 11:58:27
+0000
@@ -41,11 +41,13 @@
// extern (used by Global.cpp)
void
-jointstyle_class_init(as_object& global, const ObjectURI& uri)
+jointstyle_class_init(as_object& where, const ObjectURI& uri)
{
- static as_object* o = new as_object(getObjectInterface());
+ Global_as* gl = getGlobal(where);
+ as_object* proto = getObjectInterface();
+ static as_object* o = gl->createObject(proto);
attachJointStyleStaticInterface(*o);
- global.init_member(getName(uri), o, as_object::DefaultFlags,
+ where.init_member(getName(uri), o, as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/display/JointStyle_as.h'
--- a/libcore/asobj/flash/display/JointStyle_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/display/JointStyle_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
namespace gnash {
/// Initialize the global JointStyle class
-void jointstyle_class_init(as_object& global, const ObjectURI& uri);
+void jointstyle_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/display/LineScaleMode_as.cpp'
--- a/libcore/asobj/flash/display/LineScaleMode_as.cpp 2009-07-16 09:06:51
+0000
+++ b/libcore/asobj/flash/display/LineScaleMode_as.cpp 2009-07-28 11:58:27
+0000
@@ -41,11 +41,13 @@
// extern (used by Global.cpp)
void
-linescalemode_class_init(as_object& global, const ObjectURI& uri)
+linescalemode_class_init(as_object& where, const ObjectURI& uri)
{
- static as_object* o = new as_object(getObjectInterface());
+ Global_as* gl = getGlobal(where);
+ as_object* proto = getObjectInterface();
+ static as_object* o = gl->createObject(proto);
attachLineScaleModeStaticInterface(*o);
- global.init_member(getName(uri), o, as_object::DefaultFlags,
+ where.init_member(getName(uri), o, as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/display/LineScaleMode_as.h'
--- a/libcore/asobj/flash/display/LineScaleMode_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/display/LineScaleMode_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
namespace gnash {
/// Initialize the global LineScaleMode class
-void linescalemode_class_init(as_object& global, const ObjectURI& uri);
+void linescalemode_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/display/LoaderInfo_as.cpp'
--- a/libcore/asobj/flash/display/LoaderInfo_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/display/LoaderInfo_as.cpp 2009-07-28 11:58:27
+0000
@@ -59,18 +59,18 @@
};
// extern (used by Global.cpp)
-void loaderinfo_class_init(as_object& global, const ObjectURI& uri)
+void loaderinfo_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&loaderinfo_ctor, getLoaderInfoInterface());
attachLoaderInfoStaticInterface(*cl);
}
// Register _global.LoaderInfo
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/display/LoaderInfo_as.h'
--- a/libcore/asobj/flash/display/LoaderInfo_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/display/LoaderInfo_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
namespace gnash {
/// Initialize the global LoaderInfo class
-void loaderinfo_class_init(as_object& global, const ObjectURI& uri);
+void loaderinfo_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/display/Loader_as.cpp'
--- a/libcore/asobj/flash/display/Loader_as.cpp 2009-07-16 09:02:35 +0000
+++ b/libcore/asobj/flash/display/Loader_as.cpp 2009-07-28 11:58:27 +0000
@@ -55,18 +55,18 @@
};
// extern (used by Global.cpp)
-void loader_class_init(as_object& global, const ObjectURI& uri)
+void loader_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&loader_ctor, getLoaderInterface());
attachLoaderStaticInterface(*cl);
}
// Register _global.Loader
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/display/Loader_as.h'
--- a/libcore/asobj/flash/display/Loader_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/display/Loader_as.h 2009-07-28 11:58:27 +0000
@@ -32,7 +32,7 @@
namespace gnash {
/// Initialize the global Loader class
-void loader_class_init(as_object& global, const ObjectURI& uri);
+void loader_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/display/MorphShape_as.cpp'
--- a/libcore/asobj/flash/display/MorphShape_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/display/MorphShape_as.cpp 2009-07-28 11:58:27
+0000
@@ -52,18 +52,18 @@
};
// extern (used by Global.cpp)
-void morphshape_class_init(as_object& global, const ObjectURI& uri)
+void morphshape_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&morphshape_ctor, getMorphShapeInterface());
attachMorphShapeStaticInterface(*cl);
}
// Register _global.MorphShape
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/display/MorphShape_as.h'
--- a/libcore/asobj/flash/display/MorphShape_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/display/MorphShape_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
namespace gnash {
/// Initialize the global MorphShape class
-void morphshape_class_init(as_object& global, const ObjectURI& uri);
+void morphshape_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/display/MovieClip_as.cpp'
--- a/libcore/asobj/flash/display/MovieClip_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/display/MovieClip_as.cpp 2009-07-28 13:32:07
+0000
@@ -164,9 +164,9 @@
}
void
-registerMovieClipNative(as_object& global)
+registerMovieClipNative(as_object& where)
{
- VM& vm = getVM(global);
+ VM& vm = getVM(where);
// Natives are always here (at least in swf5 I guess)
vm.registerNative(movieclip_attachMovie, 900, 0);
@@ -372,12 +372,8 @@
o.init_property("scrollRect", &movieclip_scrollRect,
&movieclip_scrollRect);
o.init_property("tabIndex", &movieclip_tabIndex, &movieclip_tabIndex);
- o.init_property("transform", &movieclip_transform,
- &movieclip_transform);
- const int swf6Flags = PropFlags::dontDelete |
- PropFlags::dontEnum |
- PropFlags::onlySWF6Up;
+ const int swf6Flags = as_object::DefaultFlags | PropFlags::onlySWF6Up;
o.init_member("attachAudio", vm.getNative(900, 8), swf6Flags);
o.init_member("attachVideo", vm.getNative(900, 9), swf6Flags);
@@ -396,14 +392,17 @@
o.init_member("getTextSnapshot",
gl->createFunction(movieclip_getTextSnapshot), swf6Flags);
- const int swf7Flags = PropFlags::dontDelete |
- PropFlags::dontEnum |
- PropFlags::onlySWF7Up;
+ const int swf7Flags = as_object::DefaultFlags | PropFlags::onlySWF7Up;
o.init_member("getNextHighestDepth", gl->createFunction(
movieclip_getNextHighestDepth), swf7Flags);
o.init_member("getInstanceAtDepth", gl->createFunction(
movieclip_getInstanceAtDepth), swf7Flags);
+
+ const int swf8Flags = as_object::DefaultFlags | PropFlags::onlySWF8Up;
+
+ o.init_property("transform", &movieclip_transform, &movieclip_transform,
+ swf8Flags);
}
=== modified file 'libcore/asobj/flash/display/MovieClip_as.h'
--- a/libcore/asobj/flash/display/MovieClip_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/display/MovieClip_as.h 2009-07-28 11:58:27
+0000
@@ -33,13 +33,13 @@
class DisplayObject;
/// Initialize the global MovieClip class
-void movieclip_class_init(as_object& global, const ObjectURI& uri);
+void movieclip_class_init(as_object& where, const ObjectURI& uri);
/// Get an as_object with the AS3 MovieClip interface.
as_object* getMovieClipAS3Interface();
/// Register ASNative MovieClip methods (AS2 only).
-void registerMovieClipNative(as_object& global);
+void registerMovieClipNative(as_object& where);
/// Used by MovieClip's ctor to attach properties to MovieClip instances.
void attachMovieClipAS2Properties(DisplayObject& d);
=== modified file 'libcore/asobj/flash/display/PixelSnapping_as.cpp'
--- a/libcore/asobj/flash/display/PixelSnapping_as.cpp 2009-07-16 09:06:51
+0000
+++ b/libcore/asobj/flash/display/PixelSnapping_as.cpp 2009-07-28 11:58:27
+0000
@@ -41,11 +41,13 @@
// extern (used by Global.cpp)
void
-pixelsnapping_class_init(as_object& global, const ObjectURI& uri)
+pixelsnapping_class_init(as_object& where, const ObjectURI& uri)
{
- static as_object* o = new as_object(getObjectInterface());
+ Global_as* gl = getGlobal(where);
+ as_object* proto = getObjectInterface();
+ static as_object* o = gl->createObject(proto);
attachPixelSnappingStaticInterface(*o);
- global.init_member(getName(uri), o, as_object::DefaultFlags,
+ where.init_member(getName(uri), o, as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/display/PixelSnapping_as.h'
--- a/libcore/asobj/flash/display/PixelSnapping_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/display/PixelSnapping_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
namespace gnash {
/// Initialize the global PixelSnapping class
-void pixelsnapping_class_init(as_object& global, const ObjectURI& uri);
+void pixelsnapping_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/display/SWFVersion_as.cpp'
--- a/libcore/asobj/flash/display/SWFVersion_as.cpp 2009-07-16 09:06:51
+0000
+++ b/libcore/asobj/flash/display/SWFVersion_as.cpp 2009-07-28 11:58:27
+0000
@@ -41,11 +41,13 @@
// extern (used by Global.cpp)
void
-swfversion_class_init(as_object& global, const ObjectURI& uri)
+swfversion_class_init(as_object& where, const ObjectURI& uri)
{
- static as_object* o = new as_object(getObjectInterface());
+ Global_as* gl = getGlobal(where);
+ as_object* proto = getObjectInterface();
+ static as_object* o = gl->createObject(proto);
attachSWFVersionStaticInterface(*o);
- global.init_member(getName(uri), o, as_object::DefaultFlags,
+ where.init_member(getName(uri), o, as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/display/SWFVersion_as.h'
--- a/libcore/asobj/flash/display/SWFVersion_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/display/SWFVersion_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
namespace gnash {
/// Initialize the global SWFVersion class
-void swfversion_class_init(as_object& global, const ObjectURI& uri);
+void swfversion_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/display/Scene_as.cpp'
--- a/libcore/asobj/flash/display/Scene_as.cpp 2009-07-16 09:02:35 +0000
+++ b/libcore/asobj/flash/display/Scene_as.cpp 2009-07-28 11:58:27 +0000
@@ -52,18 +52,18 @@
};
// extern (used by Global.cpp)
-void scene_class_init(as_object& global, const ObjectURI& uri)
+void scene_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&scene_ctor, getSceneInterface());
attachSceneStaticInterface(*cl);
}
// Register _global.Scene
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/display/Scene_as.h'
--- a/libcore/asobj/flash/display/Scene_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/display/Scene_as.h 2009-07-28 11:58:27 +0000
@@ -32,7 +32,7 @@
namespace gnash {
/// Initialize the global Scene class
-void scene_class_init(as_object& global, const ObjectURI& uri);
+void scene_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/display/Shape_as.cpp'
--- a/libcore/asobj/flash/display/Shape_as.cpp 2009-07-16 09:02:35 +0000
+++ b/libcore/asobj/flash/display/Shape_as.cpp 2009-07-28 11:58:27 +0000
@@ -52,18 +52,18 @@
};
// extern (used by Global.cpp)
-void shape_class_init(as_object& global, const ObjectURI& uri)
+void shape_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&shape_ctor, getShapeInterface());
attachShapeStaticInterface(*cl);
}
// Register _global.Shape
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/display/Shape_as.h'
--- a/libcore/asobj/flash/display/Shape_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/display/Shape_as.h 2009-07-28 11:58:27 +0000
@@ -32,7 +32,7 @@
namespace gnash {
/// Initialize the global Shape class
-void shape_class_init(as_object& global, const ObjectURI& uri);
+void shape_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/display/SimpleButton_as.cpp'
--- a/libcore/asobj/flash/display/SimpleButton_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/display/SimpleButton_as.cpp 2009-07-28 11:58:27
+0000
@@ -52,18 +52,18 @@
};
// extern (used by Global.cpp)
-void simplebutton_class_init(as_object& global, const ObjectURI& uri)
+void simplebutton_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&simplebutton_ctor, getSimpleButtonInterface());
attachSimpleButtonStaticInterface(*cl);
}
// Register _global.SimpleButton
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/display/SimpleButton_as.h'
--- a/libcore/asobj/flash/display/SimpleButton_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/display/SimpleButton_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
namespace gnash {
/// Initialize the global SimpleButton class
-void simplebutton_class_init(as_object& global, const ObjectURI& uri);
+void simplebutton_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/display/SpreadMethod_as.cpp'
--- a/libcore/asobj/flash/display/SpreadMethod_as.cpp 2009-07-16 09:06:51
+0000
+++ b/libcore/asobj/flash/display/SpreadMethod_as.cpp 2009-07-28 11:58:27
+0000
@@ -41,11 +41,13 @@
// extern (used by Global.cpp)
void
-spreadmethod_class_init(as_object& global, const ObjectURI& uri)
+spreadmethod_class_init(as_object& where, const ObjectURI& uri)
{
- static as_object* o = new as_object(getObjectInterface());
+ Global_as* gl = getGlobal(where);
+ as_object* proto = getObjectInterface();
+ static as_object* o = gl->createObject(proto);
attachSpreadMethodStaticInterface(*o);
- global.init_member(getName(uri), o, as_object::DefaultFlags,
+ where.init_member(getName(uri), o, as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/display/SpreadMethod_as.h'
--- a/libcore/asobj/flash/display/SpreadMethod_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/display/SpreadMethod_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
namespace gnash {
/// Initialize the global SpreadMethod class
-void spreadmethod_class_init(as_object& global, const ObjectURI& uri);
+void spreadmethod_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/display/Sprite_as.cpp'
--- a/libcore/asobj/flash/display/Sprite_as.cpp 2009-07-16 09:02:35 +0000
+++ b/libcore/asobj/flash/display/Sprite_as.cpp 2009-07-28 11:58:27 +0000
@@ -53,18 +53,18 @@
};
// extern (used by Global.cpp)
-void sprite_class_init(as_object& global, const ObjectURI& uri)
+void sprite_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&sprite_ctor, getSpriteInterface());
attachSpriteStaticInterface(*cl);
}
// Register _global.Sprite
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/display/Sprite_as.h'
--- a/libcore/asobj/flash/display/Sprite_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/display/Sprite_as.h 2009-07-28 11:58:27 +0000
@@ -32,7 +32,7 @@
namespace gnash {
/// Initialize the global Sprite class
-void sprite_class_init(as_object& global, const ObjectURI& uri);
+void sprite_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/display/StageAlign_as.cpp'
--- a/libcore/asobj/flash/display/StageAlign_as.cpp 2009-07-16 09:37:37
+0000
+++ b/libcore/asobj/flash/display/StageAlign_as.cpp 2009-07-28 11:58:27
+0000
@@ -43,8 +43,9 @@
void
stagealign_class_init(as_object& where, const ObjectURI& uri)
{
- static boost::intrusive_ptr<as_object> obj =
- new as_object(getObjectInterface());
+ Global_as* gl = getGlobal(where);
+ as_object* proto = getObjectInterface();
+ static boost::intrusive_ptr<as_object> obj = gl->createObject(proto);
attachStageAlignStaticInterface(*obj);
=== modified file 'libcore/asobj/flash/display/StageAlign_as.h'
--- a/libcore/asobj/flash/display/StageAlign_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/display/StageAlign_as.h 2009-07-28 11:58:27
+0000
@@ -31,7 +31,7 @@
class ObjectURI;
/// Initialize the global StageAlign class
-void stagealign_class_init(as_object& global, const ObjectURI& uri);
+void stagealign_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/display/StageDisplayState_as.h'
--- a/libcore/asobj/flash/display/StageDisplayState_as.h 2009-07-16
08:30:06 +0000
+++ b/libcore/asobj/flash/display/StageDisplayState_as.h 2009-07-28
11:58:27 +0000
@@ -31,7 +31,7 @@
class ObjectURI;
/// Initialize the global StageDisplayState class
-void stagedisplaystate_class_init(as_object& global, const ObjectURI& uri);
+void stagedisplaystate_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/display/StageQuality_as.h'
--- a/libcore/asobj/flash/display/StageQuality_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/display/StageQuality_as.h 2009-07-28 11:58:27
+0000
@@ -31,7 +31,7 @@
namespace gnash {
/// Initialize the global StageQuality class
-void stagequality_class_init(as_object& global, const ObjectURI& uri);
+void stagequality_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/display/StageScaleMode_as.h'
--- a/libcore/asobj/flash/display/StageScaleMode_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/display/StageScaleMode_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
namespace gnash {
/// Initialize the global StageScaleMode class
-void stagescalemode_class_init(as_object& global, const ObjectURI& uri);
+void stagescalemode_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/display/Stage_as.cpp'
--- a/libcore/asobj/flash/display/Stage_as.cpp 2009-07-21 21:54:27 +0000
+++ b/libcore/asobj/flash/display/Stage_as.cpp 2009-07-28 11:58:27 +0000
@@ -298,10 +298,10 @@
}
// extern (used by Global.cpp)
-void stage_class_init(as_object& global, const ObjectURI& uri)
+void stage_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> obj = new Stage_as();
- global.init_member(getName(uri), obj.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), obj.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/display/Stage_as.h'
--- a/libcore/asobj/flash/display/Stage_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/display/Stage_as.h 2009-07-28 11:58:27 +0000
@@ -61,7 +61,7 @@
void registerStageNative(as_object& o);
/// Initialize the global Stage class
-void stage_class_init(as_object& global, const ObjectURI& uri);
+void stage_class_init(as_object& where, const ObjectURI& uri);
} // end of gnash namespace
=== modified file 'libcore/asobj/flash/errors/EOFError_as.cpp'
--- a/libcore/asobj/flash/errors/EOFError_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/errors/EOFError_as.cpp 2009-07-28 11:58:27
+0000
@@ -52,18 +52,18 @@
};
// extern (used by Global.cpp)
-void eoferror_class_init(as_object& global, const ObjectURI& uri)
+void eoferror_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&eoferror_ctor, getEOFErrorInterface());
attachEOFErrorStaticInterface(*cl);
}
// Register _global.EOFError
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/errors/EOFError_as.h'
--- a/libcore/asobj/flash/errors/EOFError_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/errors/EOFError_as.h 2009-07-28 11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global EOFError class
-void eoferror_class_init(as_object& global, const ObjectURI& uri);
+void eoferror_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/errors/IOError_as.cpp'
--- a/libcore/asobj/flash/errors/IOError_as.cpp 2009-07-16 09:02:35 +0000
+++ b/libcore/asobj/flash/errors/IOError_as.cpp 2009-07-28 11:58:27 +0000
@@ -52,18 +52,18 @@
};
// extern (used by Global.cpp)
-void ioerror_class_init(as_object& global, const ObjectURI& uri)
+void ioerror_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&ioerror_ctor, getIOErrorInterface());
attachIOErrorStaticInterface(*cl);
}
// Register _global.IOError
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/errors/IOError_as.h'
--- a/libcore/asobj/flash/errors/IOError_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/errors/IOError_as.h 2009-07-28 11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global IOError class
-void ioerror_class_init(as_object& global, const ObjectURI& uri);
+void ioerror_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/errors/IllegalOperationError_as.cpp'
--- a/libcore/asobj/flash/errors/IllegalOperationError_as.cpp 2009-07-16
09:02:35 +0000
+++ b/libcore/asobj/flash/errors/IllegalOperationError_as.cpp 2009-07-28
11:58:27 +0000
@@ -52,18 +52,18 @@
};
// extern (used by Global.cpp)
-void illegaloperationerror_class_init(as_object& global, const ObjectURI& uri)
+void illegaloperationerror_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&illegaloperationerror_ctor,
getIllegalOperationErrorInterface());
attachIllegalOperationErrorStaticInterface(*cl);
}
// Register _global.IllegalOperationError
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/errors/IllegalOperationError_as.h'
--- a/libcore/asobj/flash/errors/IllegalOperationError_as.h 2009-07-16
08:30:06 +0000
+++ b/libcore/asobj/flash/errors/IllegalOperationError_as.h 2009-07-28
11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global IllegalOperationError class
-void illegaloperationerror_class_init(as_object& global, const ObjectURI& uri);
+void illegaloperationerror_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/errors/InvalidSWFError_as.cpp'
--- a/libcore/asobj/flash/errors/InvalidSWFError_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/errors/InvalidSWFError_as.cpp 2009-07-28 11:58:27
+0000
@@ -52,18 +52,18 @@
};
// extern (used by Global.cpp)
-void invalidswferror_class_init(as_object& global, const ObjectURI& uri)
+void invalidswferror_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&invalidswferror_ctor,
getInvalidSWFErrorInterface());
attachInvalidSWFErrorStaticInterface(*cl);
}
// Register _global.InvalidSWFError
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/errors/InvalidSWFError_as.h'
--- a/libcore/asobj/flash/errors/InvalidSWFError_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/errors/InvalidSWFError_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global InvalidSWFError class
-void invalidswferror_class_init(as_object& global, const ObjectURI& uri);
+void invalidswferror_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/errors/MemoryError_as.cpp'
--- a/libcore/asobj/flash/errors/MemoryError_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/errors/MemoryError_as.cpp 2009-07-28 11:58:27
+0000
@@ -52,18 +52,18 @@
};
// extern (used by Global.cpp)
-void memoryerror_class_init(as_object& global, const ObjectURI& uri)
+void memoryerror_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&memoryerror_ctor, getMemoryErrorInterface());
attachMemoryErrorStaticInterface(*cl);
}
// Register _global.MemoryError
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/errors/MemoryError_as.h'
--- a/libcore/asobj/flash/errors/MemoryError_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/errors/MemoryError_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global MemoryError class
-void memoryerror_class_init(as_object& global, const ObjectURI& uri);
+void memoryerror_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/errors/ScriptTimeoutError_as.cpp'
--- a/libcore/asobj/flash/errors/ScriptTimeoutError_as.cpp 2009-07-16
09:02:35 +0000
+++ b/libcore/asobj/flash/errors/ScriptTimeoutError_as.cpp 2009-07-28
11:58:27 +0000
@@ -52,18 +52,18 @@
};
// extern (used by Global.cpp)
-void scripttimeouterror_class_init(as_object& global, const ObjectURI& uri)
+void scripttimeouterror_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&scripttimeouterror_ctor,
getScriptTimeoutErrorInterface());
attachScriptTimeoutErrorStaticInterface(*cl);
}
// Register _global.ScriptTimeoutError
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/errors/ScriptTimeoutError_as.h'
--- a/libcore/asobj/flash/errors/ScriptTimeoutError_as.h 2009-07-16
08:30:06 +0000
+++ b/libcore/asobj/flash/errors/ScriptTimeoutError_as.h 2009-07-28
11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global ScriptTimeoutError class
-void scripttimeouterror_class_init(as_object& global, const ObjectURI& uri);
+void scripttimeouterror_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/errors/StackOverflowError_as.cpp'
--- a/libcore/asobj/flash/errors/StackOverflowError_as.cpp 2009-07-16
09:02:35 +0000
+++ b/libcore/asobj/flash/errors/StackOverflowError_as.cpp 2009-07-28
11:58:27 +0000
@@ -52,18 +52,18 @@
};
// extern (used by Global.cpp)
-void stackoverflowerror_class_init(as_object& global, const ObjectURI& uri)
+void stackoverflowerror_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&stackoverflowerror_ctor,
getStackOverflowErrorInterface());
attachStackOverflowErrorStaticInterface(*cl);
}
// Register _global.StackOverflowError
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/errors/StackOverflowError_as.h'
--- a/libcore/asobj/flash/errors/StackOverflowError_as.h 2009-07-16
08:30:06 +0000
+++ b/libcore/asobj/flash/errors/StackOverflowError_as.h 2009-07-28
11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global StackOverflowError class
-void stackoverflowerror_class_init(as_object& global, const ObjectURI& uri);
+void stackoverflowerror_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/events/ActivityEvent_as.cpp'
--- a/libcore/asobj/flash/events/ActivityEvent_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/events/ActivityEvent_as.cpp 2009-07-28 11:58:27
+0000
@@ -54,18 +54,18 @@
};
// extern (used by Global.cpp)
-void activityevent_class_init(as_object& global, const ObjectURI& uri)
+void activityevent_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&activityevent_ctor, getActivityEventInterface());
attachActivityEventStaticInterface(*cl);
}
// Register _global.ActivityEvent
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/events/ActivityEvent_as.h'
--- a/libcore/asobj/flash/events/ActivityEvent_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/events/ActivityEvent_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global ActivityEvent class
-void activityevent_class_init(as_object& global, const ObjectURI& uri);
+void activityevent_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/events/AsyncErrorEvent_as.cpp'
--- a/libcore/asobj/flash/events/AsyncErrorEvent_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/events/AsyncErrorEvent_as.cpp 2009-07-28 11:58:27
+0000
@@ -54,18 +54,18 @@
};
// extern (used by Global.cpp)
-void asyncerrorevent_class_init(as_object& global, const ObjectURI& uri)
+void asyncerrorevent_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&asyncerrorevent_ctor,
getAsyncErrorEventInterface());
attachAsyncErrorEventStaticInterface(*cl);
}
// Register _global.AsyncErrorEvent
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/events/AsyncErrorEvent_as.h'
--- a/libcore/asobj/flash/events/AsyncErrorEvent_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/events/AsyncErrorEvent_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global AsyncErrorEvent class
-void asyncerrorevent_class_init(as_object& global, const ObjectURI& uri);
+void asyncerrorevent_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/events/ContextMenuEvent_as.cpp'
--- a/libcore/asobj/flash/events/ContextMenuEvent_as.cpp 2009-07-16
09:02:35 +0000
+++ b/libcore/asobj/flash/events/ContextMenuEvent_as.cpp 2009-07-28
11:58:27 +0000
@@ -55,18 +55,18 @@
};
// extern (used by Global.cpp)
-void contextmenuevent_class_init(as_object& global, const ObjectURI& uri)
+void contextmenuevent_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&contextmenuevent_ctor,
getContextMenuEventInterface());
attachContextMenuEventStaticInterface(*cl);
}
// Register _global.ContextMenuEvent
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/events/ContextMenuEvent_as.h'
--- a/libcore/asobj/flash/events/ContextMenuEvent_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/events/ContextMenuEvent_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global ContextMenuEvent class
-void contextmenuevent_class_init(as_object& global, const ObjectURI& uri);
+void contextmenuevent_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/events/DataEvent_as.cpp'
--- a/libcore/asobj/flash/events/DataEvent_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/events/DataEvent_as.cpp 2009-07-28 11:58:27
+0000
@@ -55,18 +55,18 @@
};
// extern (used by Global.cpp)
-void dataevent_class_init(as_object& global, const ObjectURI& uri)
+void dataevent_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&dataevent_ctor, getDataEventInterface());
attachDataEventStaticInterface(*cl);
}
// Register _global.DataEvent
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/events/DataEvent_as.h'
--- a/libcore/asobj/flash/events/DataEvent_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/events/DataEvent_as.h 2009-07-28 11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global DataEvent class
-void dataevent_class_init(as_object& global, const ObjectURI& uri);
+void dataevent_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/events/ErrorEvent_as.cpp'
--- a/libcore/asobj/flash/events/ErrorEvent_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/events/ErrorEvent_as.cpp 2009-07-28 11:58:27
+0000
@@ -54,18 +54,18 @@
};
// extern (used by Global.cpp)
-void errorevent_class_init(as_object& global, const ObjectURI& uri)
+void errorevent_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&errorevent_ctor, getErrorEventInterface());
attachErrorEventStaticInterface(*cl);
}
// Register _global.ErrorEvent
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/events/ErrorEvent_as.h'
--- a/libcore/asobj/flash/events/ErrorEvent_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/events/ErrorEvent_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global ErrorEvent class
-void errorevent_class_init(as_object& global, const ObjectURI& uri);
+void errorevent_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/events/EventDispatcher_as.cpp'
--- a/libcore/asobj/flash/events/EventDispatcher_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/events/EventDispatcher_as.cpp 2009-07-28 11:58:27
+0000
@@ -58,18 +58,18 @@
};
// extern (used by Global.cpp)
-void eventdispatcher_class_init(as_object& global, const ObjectURI& uri)
+void eventdispatcher_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&eventdispatcher_ctor,
getEventDispatcherInterface());
attachEventDispatcherStaticInterface(*cl);
}
// Register _global.EventDispatcher
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/events/EventDispatcher_as.h'
--- a/libcore/asobj/flash/events/EventDispatcher_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/events/EventDispatcher_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global EventDispatcher class
-void eventdispatcher_class_init(as_object& global, const ObjectURI& uri);
+void eventdispatcher_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/events/EventPhase_as.cpp'
--- a/libcore/asobj/flash/events/EventPhase_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/events/EventPhase_as.cpp 2009-07-28 11:58:27
+0000
@@ -52,18 +52,18 @@
};
// extern (used by Global.cpp)
-void eventphase_class_init(as_object& global, const ObjectURI& uri)
+void eventphase_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&eventphase_ctor, getEventPhaseInterface());
attachEventPhaseStaticInterface(*cl);
}
// Register _global.EventPhase
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/events/EventPhase_as.h'
--- a/libcore/asobj/flash/events/EventPhase_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/events/EventPhase_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global EventPhase class
-void eventphase_class_init(as_object& global, const ObjectURI& uri);
+void eventphase_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/events/Event_as.cpp'
--- a/libcore/asobj/flash/events/Event_as.cpp 2009-07-16 09:02:35 +0000
+++ b/libcore/asobj/flash/events/Event_as.cpp 2009-07-28 11:58:27 +0000
@@ -85,18 +85,18 @@
};
// extern (used by Global.cpp)
-void event_class_init(as_object& global, const ObjectURI& uri)
+void event_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&event_ctor, getEventInterface());
attachEventStaticInterface(*cl);
}
// Register _global.Event
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/events/Event_as.h'
--- a/libcore/asobj/flash/events/Event_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/events/Event_as.h 2009-07-28 11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global Event class
-void event_class_init(as_object& global, const ObjectURI& uri);
+void event_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/events/FocusEvent_as.cpp'
--- a/libcore/asobj/flash/events/FocusEvent_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/events/FocusEvent_as.cpp 2009-07-28 11:58:27
+0000
@@ -57,18 +57,18 @@
};
// extern (used by Global.cpp)
-void focusevent_class_init(as_object& global, const ObjectURI& uri)
+void focusevent_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&focusevent_ctor, getFocusEventInterface());
attachFocusEventStaticInterface(*cl);
}
// Register _global.FocusEvent
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/events/FocusEvent_as.h'
--- a/libcore/asobj/flash/events/FocusEvent_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/events/FocusEvent_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global FocusEvent class
-void focusevent_class_init(as_object& global, const ObjectURI& uri);
+void focusevent_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/events/FullScreenEvent_as.cpp'
--- a/libcore/asobj/flash/events/FullScreenEvent_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/events/FullScreenEvent_as.cpp 2009-07-28 11:58:27
+0000
@@ -54,18 +54,18 @@
};
// extern (used by Global.cpp)
-void fullscreenevent_class_init(as_object& global, const ObjectURI& uri)
+void fullscreenevent_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&fullscreenevent_ctor,
getFullScreenEventInterface());
attachFullScreenEventStaticInterface(*cl);
}
// Register _global.FullScreenEvent
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/events/FullScreenEvent_as.h'
--- a/libcore/asobj/flash/events/FullScreenEvent_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/events/FullScreenEvent_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global FullScreenEvent class
-void fullscreenevent_class_init(as_object& global, const ObjectURI& uri);
+void fullscreenevent_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/events/HTTPStatusEvent_as.cpp'
--- a/libcore/asobj/flash/events/HTTPStatusEvent_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/events/HTTPStatusEvent_as.cpp 2009-07-28 11:58:27
+0000
@@ -54,18 +54,18 @@
};
// extern (used by Global.cpp)
-void httpstatusevent_class_init(as_object& global, const ObjectURI& uri)
+void httpstatusevent_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&httpstatusevent_ctor,
getHTTPStatusEventInterface());
attachHTTPStatusEventStaticInterface(*cl);
}
// Register _global.HTTPStatusEvent
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/events/HTTPStatusEvent_as.h'
--- a/libcore/asobj/flash/events/HTTPStatusEvent_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/events/HTTPStatusEvent_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global HTTPStatusEvent class
-void httpstatusevent_class_init(as_object& global, const ObjectURI& uri);
+void httpstatusevent_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/events/IEventDispatcher_as.cpp'
--- a/libcore/asobj/flash/events/IEventDispatcher_as.cpp 2009-07-16
09:02:35 +0000
+++ b/libcore/asobj/flash/events/IEventDispatcher_as.cpp 2009-07-28
11:58:27 +0000
@@ -56,18 +56,18 @@
};
// extern (used by Global.cpp)
-void ieventdispatcher_class_init(as_object& global, const ObjectURI& uri)
+void ieventdispatcher_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&ieventdispatcher_ctor,
getIEventDispatcherInterface());
attachIEventDispatcherStaticInterface(*cl);
}
// Register _global.IEventDispatcher
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/events/IEventDispatcher_as.h'
--- a/libcore/asobj/flash/events/IEventDispatcher_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/events/IEventDispatcher_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global IEventDispatcher class
-void ieventdispatcher_class_init(as_object& global, const ObjectURI& uri);
+void ieventdispatcher_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/events/IMEEvent_as.cpp'
--- a/libcore/asobj/flash/events/IMEEvent_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/events/IMEEvent_as.cpp 2009-07-28 11:58:27
+0000
@@ -54,18 +54,18 @@
};
// extern (used by Global.cpp)
-void imeevent_class_init(as_object& global, const ObjectURI& uri)
+void imeevent_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&imeevent_ctor, getIMEEventInterface());
attachIMEEventStaticInterface(*cl);
}
// Register _global.IMEEvent
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/events/IMEEvent_as.h'
--- a/libcore/asobj/flash/events/IMEEvent_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/events/IMEEvent_as.h 2009-07-28 11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global IMEEvent class
-void imeevent_class_init(as_object& global, const ObjectURI& uri);
+void imeevent_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/events/IOErrorEvent_as.cpp'
--- a/libcore/asobj/flash/events/IOErrorEvent_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/events/IOErrorEvent_as.cpp 2009-07-28 11:58:27
+0000
@@ -54,18 +54,18 @@
};
// extern (used by Global.cpp)
-void ioerrorevent_class_init(as_object& global, const ObjectURI& uri)
+void ioerrorevent_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&ioerrorevent_ctor, getIOErrorEventInterface());
attachIOErrorEventStaticInterface(*cl);
}
// Register _global.IOErrorEvent
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/events/IOErrorEvent_as.h'
--- a/libcore/asobj/flash/events/IOErrorEvent_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/events/IOErrorEvent_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global IOErrorEvent class
-void ioerrorevent_class_init(as_object& global, const ObjectURI& uri);
+void ioerrorevent_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/events/KeyboardEvent_as.cpp'
--- a/libcore/asobj/flash/events/KeyboardEvent_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/events/KeyboardEvent_as.cpp 2009-07-28 11:58:27
+0000
@@ -56,18 +56,18 @@
};
// extern (used by Global.cpp)
-void keyboardevent_class_init(as_object& global, const ObjectURI& uri)
+void keyboardevent_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&keyboardevent_ctor, getKeyboardEventInterface());
attachKeyboardEventStaticInterface(*cl);
}
// Register _global.KeyboardEvent
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/events/KeyboardEvent_as.h'
--- a/libcore/asobj/flash/events/KeyboardEvent_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/events/KeyboardEvent_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global KeyboardEvent class
-void keyboardevent_class_init(as_object& global, const ObjectURI& uri);
+void keyboardevent_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/events/MouseEvent_as.cpp'
--- a/libcore/asobj/flash/events/MouseEvent_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/events/MouseEvent_as.cpp 2009-07-28 11:58:27
+0000
@@ -64,18 +64,18 @@
};
// extern (used by Global.cpp)
-void mouseevent_class_init(as_object& global, const ObjectURI& uri)
+void mouseevent_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&mouseevent_ctor, getMouseEventInterface());
attachMouseEventStaticInterface(*cl);
}
// Register _global.MouseEvent
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/events/MouseEvent_as.h'
--- a/libcore/asobj/flash/events/MouseEvent_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/events/MouseEvent_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global MouseEvent class
-void mouseevent_class_init(as_object& global, const ObjectURI& uri);
+void mouseevent_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/events/NetStatusEvent_as.cpp'
--- a/libcore/asobj/flash/events/NetStatusEvent_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/events/NetStatusEvent_as.cpp 2009-07-28 11:58:27
+0000
@@ -54,18 +54,18 @@
};
// extern (used by Global.cpp)
-void netstatusevent_class_init(as_object& global, const ObjectURI& uri)
+void netstatusevent_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&netstatusevent_ctor,
getNetStatusEventInterface());
attachNetStatusEventStaticInterface(*cl);
}
// Register _global.NetStatusEvent
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/events/NetStatusEvent_as.h'
--- a/libcore/asobj/flash/events/NetStatusEvent_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/events/NetStatusEvent_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global NetStatusEvent class
-void netstatusevent_class_init(as_object& global, const ObjectURI& uri);
+void netstatusevent_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/events/ProgressEvent_as.cpp'
--- a/libcore/asobj/flash/events/ProgressEvent_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/events/ProgressEvent_as.cpp 2009-07-28 11:58:27
+0000
@@ -55,18 +55,18 @@
};
// extern (used by Global.cpp)
-void progressevent_class_init(as_object& global, const ObjectURI& uri)
+void progressevent_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&progressevent_ctor, getProgressEventInterface());
attachProgressEventStaticInterface(*cl);
}
// Register _global.ProgressEvent
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/events/ProgressEvent_as.h'
--- a/libcore/asobj/flash/events/ProgressEvent_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/events/ProgressEvent_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global ProgressEvent class
-void progressevent_class_init(as_object& global, const ObjectURI& uri);
+void progressevent_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/events/SecurityErrorEvent_as.cpp'
--- a/libcore/asobj/flash/events/SecurityErrorEvent_as.cpp 2009-07-16
09:02:35 +0000
+++ b/libcore/asobj/flash/events/SecurityErrorEvent_as.cpp 2009-07-28
11:58:27 +0000
@@ -54,18 +54,18 @@
};
// extern (used by Global.cpp)
-void securityerrorevent_class_init(as_object& global, const ObjectURI& uri)
+void securityerrorevent_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&securityerrorevent_ctor,
getSecurityErrorEventInterface());
attachSecurityErrorEventStaticInterface(*cl);
}
// Register _global.SecurityErrorEvent
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/events/SecurityErrorEvent_as.h'
--- a/libcore/asobj/flash/events/SecurityErrorEvent_as.h 2009-07-16
08:30:06 +0000
+++ b/libcore/asobj/flash/events/SecurityErrorEvent_as.h 2009-07-28
11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global SecurityErrorEvent class
-void securityerrorevent_class_init(as_object& global, const ObjectURI& uri);
+void securityerrorevent_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/events/StatusEvent_as.cpp'
--- a/libcore/asobj/flash/events/StatusEvent_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/events/StatusEvent_as.cpp 2009-07-28 11:58:27
+0000
@@ -54,18 +54,18 @@
};
// extern (used by Global.cpp)
-void statusevent_class_init(as_object& global, const ObjectURI& uri)
+void statusevent_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&statusevent_ctor, getStatusEventInterface());
attachStatusEventStaticInterface(*cl);
}
// Register _global.StatusEvent
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/events/StatusEvent_as.h'
--- a/libcore/asobj/flash/events/StatusEvent_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/events/StatusEvent_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global StatusEvent class
-void statusevent_class_init(as_object& global, const ObjectURI& uri);
+void statusevent_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/events/SyncEvent_as.cpp'
--- a/libcore/asobj/flash/events/SyncEvent_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/events/SyncEvent_as.cpp 2009-07-28 11:58:27
+0000
@@ -54,18 +54,18 @@
};
// extern (used by Global.cpp)
-void syncevent_class_init(as_object& global, const ObjectURI& uri)
+void syncevent_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&syncevent_ctor, getSyncEventInterface());
attachSyncEventStaticInterface(*cl);
}
// Register _global.SyncEvent
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/events/SyncEvent_as.h'
--- a/libcore/asobj/flash/events/SyncEvent_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/events/SyncEvent_as.h 2009-07-28 11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global SyncEvent class
-void syncevent_class_init(as_object& global, const ObjectURI& uri);
+void syncevent_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/events/TextEvent_as.cpp'
--- a/libcore/asobj/flash/events/TextEvent_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/events/TextEvent_as.cpp 2009-07-28 11:58:27
+0000
@@ -55,18 +55,18 @@
};
// extern (used by Global.cpp)
-void textevent_class_init(as_object& global, const ObjectURI& uri)
+void textevent_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&textevent_ctor, getTextEventInterface());
attachTextEventStaticInterface(*cl);
}
// Register _global.TextEvent
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/events/TextEvent_as.h'
--- a/libcore/asobj/flash/events/TextEvent_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/events/TextEvent_as.h 2009-07-28 11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global TextEvent class
-void textevent_class_init(as_object& global, const ObjectURI& uri);
+void textevent_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/events/TimerEvent_as.cpp'
--- a/libcore/asobj/flash/events/TimerEvent_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/events/TimerEvent_as.cpp 2009-07-28 11:58:27
+0000
@@ -56,18 +56,18 @@
};
// extern (used by Global.cpp)
-void timerevent_class_init(as_object& global, const ObjectURI& uri)
+void timerevent_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&timerevent_ctor, getTimerEventInterface());
attachTimerEventStaticInterface(*cl);
}
// Register _global.TimerEvent
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/events/TimerEvent_as.h'
--- a/libcore/asobj/flash/events/TimerEvent_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/events/TimerEvent_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global TimerEvent class
-void timerevent_class_init(as_object& global, const ObjectURI& uri);
+void timerevent_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/external/ExternalInterface_as.h'
--- a/libcore/asobj/flash/external/ExternalInterface_as.h 2009-07-16
08:30:06 +0000
+++ b/libcore/asobj/flash/external/ExternalInterface_as.h 2009-07-28
11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global ExternalInterface class
-void externalinterface_class_init(as_object& global, const ObjectURI& uri);
+void externalinterface_class_init(as_object& where, const ObjectURI& uri);
} // end of gnash namespace
=== modified file 'libcore/asobj/flash/filters/BevelFilter_as.cpp'
--- a/libcore/asobj/flash/filters/BevelFilter_as.cpp 2009-07-16 10:07:08
+0000
+++ b/libcore/asobj/flash/filters/BevelFilter_as.cpp 2009-07-28 11:58:27
+0000
@@ -50,7 +50,7 @@
static as_object* Interface();
static void attachInterface(as_object& o);
static void attachProperties(as_object& o);
- static void registerCtor(as_object& global);
+ static void registerCtor(as_object& where);
static as_value ctor(const fn_call& fn);
private:
static boost::intrusive_ptr<as_object> s_interface;
@@ -72,15 +72,15 @@
void
-bevelfilter_class_init(as_object& global, const ObjectURI& uri)
+bevelfilter_class_init(as_object& where, const ObjectURI& uri)
{
boost::intrusive_ptr<as_object> cl;
if (cl != NULL) return;
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&BevelFilter_as::ctor, BevelFilter_as::Interface());
VM::get().addStatic(cl.get());
BevelFilter_as::attachInterface(*cl);
- global.init_member(getName(uri) , cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri) , cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/filters/BevelFilter_as.h'
--- a/libcore/asobj/flash/filters/BevelFilter_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/filters/BevelFilter_as.h 2009-07-28 11:58:27
+0000
@@ -25,7 +25,7 @@
class ObjectURI;
/// Initialize the global BitmapFilter class
-void bevelfilter_class_init(as_object& global, const ObjectURI& uri);
+void bevelfilter_class_init(as_object& where, const ObjectURI& uri);
} // end of gnash namespace
=== modified file 'libcore/asobj/flash/filters/BitmapFilterQuality_as.cpp'
--- a/libcore/asobj/flash/filters/BitmapFilterQuality_as.cpp 2009-07-16
09:02:35 +0000
+++ b/libcore/asobj/flash/filters/BitmapFilterQuality_as.cpp 2009-07-28
11:58:27 +0000
@@ -39,13 +39,13 @@
}
// extern (used by Global.cpp)
-void bitmapfilterquality_class_init(as_object& global, const ObjectURI& uri)
+void bitmapfilterquality_class_init(as_object& where, const ObjectURI& uri)
{
boost::intrusive_ptr<as_object> cl = new as_object(getObjectInterface());
attachBitmapFilterQualityStaticInterface(*cl);
// Register _global.BitmapFilterQuality
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/filters/BitmapFilterQuality_as.h'
--- a/libcore/asobj/flash/filters/BitmapFilterQuality_as.h 2009-07-16
08:30:06 +0000
+++ b/libcore/asobj/flash/filters/BitmapFilterQuality_as.h 2009-07-28
11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global BitmapFilterQuality class
-void bitmapfilterquality_class_init(as_object& global, const ObjectURI& uri);
+void bitmapfilterquality_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/filters/BitmapFilterType_as.cpp'
--- a/libcore/asobj/flash/filters/BitmapFilterType_as.cpp 2009-07-16
09:02:35 +0000
+++ b/libcore/asobj/flash/filters/BitmapFilterType_as.cpp 2009-07-28
11:58:27 +0000
@@ -39,11 +39,11 @@
// extern (used by Global.cpp)
void
-bitmapfiltertype_class_init(as_object& global, const ObjectURI& uri)
+bitmapfiltertype_class_init(as_object& where, const ObjectURI& uri)
{
boost::intrusive_ptr<as_object> cl = new as_object(getObjectInterface());
attachBitmapFilterTypeStaticInterface(*cl);
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/filters/BitmapFilterType_as.h'
--- a/libcore/asobj/flash/filters/BitmapFilterType_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/filters/BitmapFilterType_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global BitmapFilterType class
-void bitmapfiltertype_class_init(as_object& global, const ObjectURI& uri);
+void bitmapfiltertype_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/filters/BitmapFilter_as.cpp'
--- a/libcore/asobj/flash/filters/BitmapFilter_as.cpp 2009-07-16 10:07:08
+0000
+++ b/libcore/asobj/flash/filters/BitmapFilter_as.cpp 2009-07-28 11:58:27
+0000
@@ -45,11 +45,11 @@
void
-bitmapfilter_class_init(as_object& global, const ObjectURI& uri)
+bitmapfilter_class_init(as_object& where, const ObjectURI& uri)
{
// TODO: this may not be correct, but it should be enumerable.
const int flags = 0;
- global.init_destructive_property(getName(uri), getBitmapFilterConstructor,
+ where.init_destructive_property(getName(uri), getBitmapFilterConstructor,
flags, getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/filters/BitmapFilter_as.h'
--- a/libcore/asobj/flash/filters/BitmapFilter_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/filters/BitmapFilter_as.h 2009-07-28 11:58:27
+0000
@@ -29,7 +29,7 @@
class ObjectURI;
/// Initialize the global BitmapFilter class
-void bitmapfilter_class_init(as_object& global, const ObjectURI& uri);
+void bitmapfilter_class_init(as_object& where, const ObjectURI& uri);
/// Get the interface, for inheritance.
as_object *getBitmapFilterInterface();
=== modified file 'libcore/asobj/flash/filters/BlurFilter_as.cpp'
--- a/libcore/asobj/flash/filters/BlurFilter_as.cpp 2009-07-16 09:12:10
+0000
+++ b/libcore/asobj/flash/filters/BlurFilter_as.cpp 2009-07-28 11:58:27
+0000
@@ -43,7 +43,7 @@
static as_object* Interface();
static void attachInterface(as_object& o);
static void attachProperties(as_object& o);
- static void registerCtor(as_object& global);
+ static void registerCtor(as_object& where);
static as_value ctor(const fn_call& fn);
private:
static boost::intrusive_ptr<as_object> s_interface;
@@ -64,16 +64,16 @@
}
void
-blurfilter_class_init(as_object& global, const ObjectURI& uri)
+blurfilter_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) return;
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&BlurFilter_as::ctor, BlurFilter_as::Interface());
BlurFilter_as::attachInterface(*cl);
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/filters/BlurFilter_as.h'
--- a/libcore/asobj/flash/filters/BlurFilter_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/filters/BlurFilter_as.h 2009-07-28 11:58:27
+0000
@@ -25,7 +25,7 @@
class ObjectURI;
/// Initialize the global BlurFilter class
-void blurfilter_class_init(as_object& global, const ObjectURI& uri);
+void blurfilter_class_init(as_object& where, const ObjectURI& uri);
} // end of gnash namespace
=== modified file 'libcore/asobj/flash/filters/ColorMatrixFilter_as.cpp'
--- a/libcore/asobj/flash/filters/ColorMatrixFilter_as.cpp 2009-07-16
09:12:10 +0000
+++ b/libcore/asobj/flash/filters/ColorMatrixFilter_as.cpp 2009-07-28
11:58:27 +0000
@@ -57,16 +57,16 @@
}
void
-colormatrixfilter_class_init(as_object& global, const ObjectURI& uri)
+colormatrixfilter_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) return;
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&ColorMatrixFilter_as::ctor,
ColorMatrixFilter_as::Interface());
ColorMatrixFilter_as::attachInterface(*cl);
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/filters/ColorMatrixFilter_as.h'
--- a/libcore/asobj/flash/filters/ColorMatrixFilter_as.h 2009-07-16
08:30:06 +0000
+++ b/libcore/asobj/flash/filters/ColorMatrixFilter_as.h 2009-07-28
11:58:27 +0000
@@ -25,7 +25,7 @@
class ObjectURI;
/// Initialize the global ColorMatrixFilter class
-void colormatrixfilter_class_init(as_object& global, const ObjectURI& uri);
+void colormatrixfilter_class_init(as_object& where, const ObjectURI& uri);
} // end of gnash namespace
=== modified file 'libcore/asobj/flash/filters/ConvolutionFilter_as.cpp'
--- a/libcore/asobj/flash/filters/ConvolutionFilter_as.cpp 2009-07-16
10:07:08 +0000
+++ b/libcore/asobj/flash/filters/ConvolutionFilter_as.cpp 2009-07-28
11:58:27 +0000
@@ -57,11 +57,11 @@
void
-convolutionfilter_class_init(as_object& global, const ObjectURI& uri)
+convolutionfilter_class_init(as_object& where, const ObjectURI& uri)
{
// TODO: this may not be correct, but it should be enumerable.
const int flags = 0;
- global.init_destructive_property(getName(uri),
+ where.init_destructive_property(getName(uri),
getConvolutionFilterConstructor, flags, getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/filters/ConvolutionFilter_as.h'
--- a/libcore/asobj/flash/filters/ConvolutionFilter_as.h 2009-07-16
08:30:06 +0000
+++ b/libcore/asobj/flash/filters/ConvolutionFilter_as.h 2009-07-28
11:58:27 +0000
@@ -25,7 +25,7 @@
class ObjectURI;
/// Initialize the global ConvolutionFilter class
-void convolutionfilter_class_init(as_object& global, const ObjectURI& uri);
+void convolutionfilter_class_init(as_object& where, const ObjectURI& uri);
} // end of gnash namespace
=== modified file 'libcore/asobj/flash/filters/DisplacementMapFilterMode_as.cpp'
--- a/libcore/asobj/flash/filters/DisplacementMapFilterMode_as.cpp
2009-07-16 09:02:35 +0000
+++ b/libcore/asobj/flash/filters/DisplacementMapFilterMode_as.cpp
2009-07-28 11:58:27 +0000
@@ -39,13 +39,13 @@
}
// extern (used by Global.cpp)
-void displacementmapfiltermode_class_init(as_object& global, const ObjectURI&
uri)
+void displacementmapfiltermode_class_init(as_object& where, const ObjectURI&
uri)
{
boost::intrusive_ptr<as_object> cl = new as_object(getObjectInterface());
attachDisplacementMapFilterModeStaticInterface(*cl);
// Register _global.DisplacementMapFilterMode
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/filters/DisplacementMapFilterMode_as.h'
--- a/libcore/asobj/flash/filters/DisplacementMapFilterMode_as.h
2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/filters/DisplacementMapFilterMode_as.h
2009-07-28 11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global DisplacementMapFilterMode class
-void displacementmapfiltermode_class_init(as_object& global, const ObjectURI&
uri);
+void displacementmapfiltermode_class_init(as_object& where, const ObjectURI&
uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/filters/DisplacementMapFilter_as.h'
--- a/libcore/asobj/flash/filters/DisplacementMapFilter_as.h 2009-07-16
08:30:06 +0000
+++ b/libcore/asobj/flash/filters/DisplacementMapFilter_as.h 2009-07-28
11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global DisplacementMapFilter class
-void displacementmapfilter_class_init(as_object& global, const ObjectURI& uri);
+void displacementmapfilter_class_init(as_object& where, const ObjectURI& uri);
/// Return a DisplacementMapFilter instance (in case the core lib needs it)
//std::auto_ptr<as_object> init_DisplacementMapFilter_instance();
=== modified file 'libcore/asobj/flash/filters/DropShadowFilter_as.cpp'
--- a/libcore/asobj/flash/filters/DropShadowFilter_as.cpp 2009-07-16
10:07:08 +0000
+++ b/libcore/asobj/flash/filters/DropShadowFilter_as.cpp 2009-07-28
11:58:27 +0000
@@ -50,7 +50,7 @@
static as_object* Interface();
static void attachInterface(as_object& o);
static void attachProperties(as_object& o);
- static void registerCtor(as_object& global);
+ static void registerCtor(as_object& where);
static as_value ctor(const fn_call& fn);
private:
@@ -73,15 +73,15 @@
}
void
-dropshadowfilter_class_init(as_object& global, const ObjectURI& uri)
+dropshadowfilter_class_init(as_object& where, const ObjectURI& uri)
{
boost:: intrusive_ptr<as_object> cl;
if (cl != NULL) return;
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&DropShadowFilter_as::ctor,
DropShadowFilter_as::Interface());
VM::get().addStatic(cl.get());
DropShadowFilter_as::attachInterface(*cl);
- global.init_member(getName(uri), cl.get(),
+ where.init_member(getName(uri), cl.get(),
as_object::DefaultFlags, getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/filters/DropShadowFilter_as.h'
--- a/libcore/asobj/flash/filters/DropShadowFilter_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/filters/DropShadowFilter_as.h 2009-07-28 11:58:27
+0000
@@ -25,7 +25,7 @@
class ObjectURI;
/// Initialize the global DropShadowFilter class
-void dropshadowfilter_class_init(as_object& global, const ObjectURI& uri);
+void dropshadowfilter_class_init(as_object& where, const ObjectURI& uri);
} // end of gnash namespace
=== modified file 'libcore/asobj/flash/filters/GlowFilter_as.cpp'
--- a/libcore/asobj/flash/filters/GlowFilter_as.cpp 2009-07-16 10:07:08
+0000
+++ b/libcore/asobj/flash/filters/GlowFilter_as.cpp 2009-07-28 11:58:27
+0000
@@ -55,7 +55,7 @@
static as_object* Interface();
static void attachInterface(as_object& o);
static void attachProperties(as_object& o);
- static void registerCtor(as_object& global);
+ static void registerCtor(as_object& where);
static as_value ctor(const fn_call& fn);
private:
static boost::intrusive_ptr<as_object> s_interface;
@@ -76,15 +76,15 @@
}
void
-glowfilter_class_init(as_object& global, const ObjectURI& uri)
+glowfilter_class_init(as_object& where, const ObjectURI& uri)
{
boost::intrusive_ptr<as_object> cl;
if (cl != NULL) return;
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&GlowFilter_as::ctor, GlowFilter_as::Interface());
VM::get().addStatic(cl.get());
GlowFilter_as::attachInterface(*cl);
- global.init_member(getName(uri), cl.get(),
+ where.init_member(getName(uri), cl.get(),
as_object::DefaultFlags, getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/filters/GlowFilter_as.h'
--- a/libcore/asobj/flash/filters/GlowFilter_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/filters/GlowFilter_as.h 2009-07-28 11:58:27
+0000
@@ -25,7 +25,7 @@
class ObjectURI;
/// Initialize the global GlowFilter class
-void glowfilter_class_init(as_object& global, const ObjectURI& uri);
+void glowfilter_class_init(as_object& where, const ObjectURI& uri);
} // end of gnash namespace
=== modified file 'libcore/asobj/flash/filters/GradientBevelFilter_as.cpp'
--- a/libcore/asobj/flash/filters/GradientBevelFilter_as.cpp 2009-07-16
10:07:08 +0000
+++ b/libcore/asobj/flash/filters/GradientBevelFilter_as.cpp 2009-07-28
11:58:27 +0000
@@ -71,15 +71,15 @@
}
void
-gradientbevelfilter_class_init(as_object& global, const ObjectURI& uri)
+gradientbevelfilter_class_init(as_object& where, const ObjectURI& uri)
{
boost::intrusive_ptr<as_object> cl;
if (cl != NULL) return;
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&GradientBevelFilter_as::ctor,
GradientBevelFilter_as::Interface());
VM::get().addStatic(cl.get());
GradientBevelFilter_as::attachInterface(*cl);
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/filters/GradientBevelFilter_as.h'
--- a/libcore/asobj/flash/filters/GradientBevelFilter_as.h 2009-07-16
08:30:06 +0000
+++ b/libcore/asobj/flash/filters/GradientBevelFilter_as.h 2009-07-28
11:58:27 +0000
@@ -25,7 +25,7 @@
class ObjectURI;
/// Initialize the global GradientBevelFilter class
-void gradientbevelfilter_class_init(as_object& global, const ObjectURI& uri);
+void gradientbevelfilter_class_init(as_object& where, const ObjectURI& uri);
} // end of gnash namespace
=== modified file 'libcore/asobj/flash/filters/GradientGlowFilter_as.cpp'
--- a/libcore/asobj/flash/filters/GradientGlowFilter_as.cpp 2009-07-16
10:07:08 +0000
+++ b/libcore/asobj/flash/filters/GradientGlowFilter_as.cpp 2009-07-28
11:58:27 +0000
@@ -72,15 +72,15 @@
}
void
-gradientglowfilter_class_init(as_object& global, const ObjectURI& uri)
+gradientglowfilter_class_init(as_object& where, const ObjectURI& uri)
{
boost::intrusive_ptr<as_object> cl;
if (cl != NULL) return;
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&GradientGlowFilter_as::ctor,
GradientGlowFilter_as::Interface());
VM::get().addStatic(cl.get());
GradientGlowFilter_as::attachInterface(*cl);
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/filters/GradientGlowFilter_as.h'
--- a/libcore/asobj/flash/filters/GradientGlowFilter_as.h 2009-07-16
08:30:06 +0000
+++ b/libcore/asobj/flash/filters/GradientGlowFilter_as.h 2009-07-28
11:58:27 +0000
@@ -25,7 +25,7 @@
class ObjectURI;
/// Initialize the global GradientGlowFilter class
-void gradientglowfilter_class_init(as_object& global, const ObjectURI& uri);
+void gradientglowfilter_class_init(as_object& where, const ObjectURI& uri);
} // end of gnash namespace
=== modified file 'libcore/asobj/flash/geom/ColorTransform_as.h'
--- a/libcore/asobj/flash/geom/ColorTransform_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/geom/ColorTransform_as.h 2009-07-28 11:58:27
+0000
@@ -79,7 +79,7 @@
/// Initialize the global ColorTransform class
-void colortransform_class_init(as_object& global, const ObjectURI& uri);
+void colortransform_class_init(as_object& where, const ObjectURI& uri);
} // end of gnash namespace
=== modified file 'libcore/asobj/flash/geom/Matrix_as.h'
--- a/libcore/asobj/flash/geom/Matrix_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/geom/Matrix_as.h 2009-07-28 11:58:27 +0000
@@ -30,7 +30,7 @@
class ObjectURI;
/// Initialize the global Matrix class
-void matrix_class_init(as_object& global, const ObjectURI& uri);
+void matrix_class_init(as_object& where, const ObjectURI& uri);
} // end of gnash namespace
=== modified file 'libcore/asobj/flash/geom/Point_as.h'
--- a/libcore/asobj/flash/geom/Point_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/geom/Point_as.h 2009-07-28 11:58:27 +0000
@@ -34,7 +34,7 @@
class fn_call;
/// Initialize the global Point class
-void point_class_init(as_object& global, const ObjectURI& uri);
+void point_class_init(as_object& where, const ObjectURI& uri);
/// Return a Point instance (in case the core lib needs it)
boost::intrusive_ptr<as_object> init_Point_instance();
=== modified file 'libcore/asobj/flash/geom/Rectangle_as.h'
--- a/libcore/asobj/flash/geom/Rectangle_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/geom/Rectangle_as.h 2009-07-28 11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global Rectangle class
-void rectangle_class_init(as_object& global, const ObjectURI& uri);
+void rectangle_class_init(as_object& where, const ObjectURI& uri);
/// Return a Rectangle instance (in case the core lib needs it)
boost::intrusive_ptr<as_object> init_Rectangle_instance();
=== modified file 'libcore/asobj/flash/geom/Transform_as.h'
--- a/libcore/asobj/flash/geom/Transform_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/geom/Transform_as.h 2009-07-28 11:58:27 +0000
@@ -30,7 +30,7 @@
class ObjectURI;
/// Initialize the global Transform class
-void transform_class_init(as_object& global, const ObjectURI& uri);
+void transform_class_init(as_object& where, const ObjectURI& uri);
} // end of gnash namespace
=== modified file 'libcore/asobj/flash/media/Camera_as.cpp'
--- a/libcore/asobj/flash/media/Camera_as.cpp 2009-07-16 09:02:35 +0000
+++ b/libcore/asobj/flash/media/Camera_as.cpp 2009-07-28 11:58:27 +0000
@@ -104,14 +104,14 @@
}
// extern (used by Global.cpp)
-void camera_class_init(as_object& global, const ObjectURI& uri)
+void camera_class_init(as_object& where, const ObjectURI& uri)
{
// This is going to be the global Camera "class"/"function"
static boost::intrusive_ptr<as_object> cl;
if ( cl == NULL )
{
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&camera_ctor, getCameraInterface());
// replicate all interface to class, to be able to access
// all methods as static functions
@@ -120,7 +120,7 @@
}
// Register _global.Camera
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/media/Camera_as.h'
--- a/libcore/asobj/flash/media/Camera_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/media/Camera_as.h 2009-07-28 11:58:27 +0000
@@ -28,7 +28,7 @@
class ObjectURI;
/// Initialize the global Camera class
-void camera_class_init(as_object& global, const ObjectURI& uri);
+void camera_class_init(as_object& where, const ObjectURI& uri);
/// Return a Camera instance (in case the core lib needs it)
//std::auto_ptr<as_object> init_camera_instance();
=== modified file 'libcore/asobj/flash/media/ID3Info_as.cpp'
--- a/libcore/asobj/flash/media/ID3Info_as.cpp 2009-07-16 09:02:35 +0000
+++ b/libcore/asobj/flash/media/ID3Info_as.cpp 2009-07-28 11:58:27 +0000
@@ -52,18 +52,18 @@
};
// extern (used by Global.cpp)
-void id3info_class_init(as_object& global, const ObjectURI& uri)
+void id3info_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&id3info_ctor, getID3InfoInterface());
attachID3InfoStaticInterface(*cl);
}
// Register _global.ID3Info
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/media/ID3Info_as.h'
--- a/libcore/asobj/flash/media/ID3Info_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/media/ID3Info_as.h 2009-07-28 11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global ID3Info class
-void id3info_class_init(as_object& global, const ObjectURI& uri);
+void id3info_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/media/Microphone_as.cpp'
--- a/libcore/asobj/flash/media/Microphone_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/media/Microphone_as.cpp 2009-07-28 11:58:27
+0000
@@ -109,14 +109,14 @@
}
// extern (used by Global.cpp)
-void microphone_class_init(as_object& global, const ObjectURI& uri)
+void microphone_class_init(as_object& where, const ObjectURI& uri)
{
// This is going to be the global Microphone "class"/"function"
static boost::intrusive_ptr<as_object> cl;
if ( cl == NULL )
{
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(µphone_ctor, getMicrophoneInterface());
// replicate all interface to class, to be able to access
// all methods as static functions
@@ -124,7 +124,7 @@
}
// Register _global.Microphone
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/media/Microphone_as.h'
--- a/libcore/asobj/flash/media/Microphone_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/media/Microphone_as.h 2009-07-28 11:58:27 +0000
@@ -27,7 +27,7 @@
class ObjectURI;
/// Initialize the global Microphone class
-void microphone_class_init(as_object& global, const ObjectURI& uri);
+void microphone_class_init(as_object& where, const ObjectURI& uri);
/// Return a Microphone instance (in case the core lib needs it)
//std::auto_ptr<as_object> init_microphone_instance();
=== modified file 'libcore/asobj/flash/media/SoundChannel_as.cpp'
--- a/libcore/asobj/flash/media/SoundChannel_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/media/SoundChannel_as.cpp 2009-07-28 11:58:27
+0000
@@ -53,18 +53,18 @@
};
// extern (used by Global.cpp)
-void soundchannel_class_init(as_object& global, const ObjectURI& uri)
+void soundchannel_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&soundchannel_ctor, getSoundChannelInterface());
attachSoundChannelStaticInterface(*cl);
}
// Register _global.SoundChannel
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/media/SoundChannel_as.h'
--- a/libcore/asobj/flash/media/SoundChannel_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/media/SoundChannel_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global SoundChannel class
-void soundchannel_class_init(as_object& global, const ObjectURI& uri);
+void soundchannel_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/media/SoundLoaderContext_as.cpp'
--- a/libcore/asobj/flash/media/SoundLoaderContext_as.cpp 2009-07-16
09:02:35 +0000
+++ b/libcore/asobj/flash/media/SoundLoaderContext_as.cpp 2009-07-28
11:58:27 +0000
@@ -52,18 +52,18 @@
};
// extern (used by Global.cpp)
-void soundloadercontext_class_init(as_object& global, const ObjectURI& uri)
+void soundloadercontext_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&soundloadercontext_ctor,
getSoundLoaderContextInterface());
attachSoundLoaderContextStaticInterface(*cl);
}
// Register _global.SoundLoaderContext
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/media/SoundLoaderContext_as.h'
--- a/libcore/asobj/flash/media/SoundLoaderContext_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/media/SoundLoaderContext_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global SoundLoaderContext class
-void soundloadercontext_class_init(as_object& global, const ObjectURI& uri);
+void soundloadercontext_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/media/SoundMixer_as.cpp'
--- a/libcore/asobj/flash/media/SoundMixer_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/media/SoundMixer_as.cpp 2009-07-28 11:58:27
+0000
@@ -54,18 +54,18 @@
};
// extern (used by Global.cpp)
-void soundmixer_class_init(as_object& global, const ObjectURI& uri)
+void soundmixer_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&soundmixer_ctor, getSoundMixerInterface());
attachSoundMixerStaticInterface(*cl);
}
// Register _global.SoundMixer
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/media/SoundMixer_as.h'
--- a/libcore/asobj/flash/media/SoundMixer_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/media/SoundMixer_as.h 2009-07-28 11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global SoundMixer class
-void soundmixer_class_init(as_object& global, const ObjectURI& uri);
+void soundmixer_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/media/SoundTransform_as.cpp'
--- a/libcore/asobj/flash/media/SoundTransform_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/media/SoundTransform_as.cpp 2009-07-28 11:58:27
+0000
@@ -52,18 +52,18 @@
};
// extern (used by Global.cpp)
-void soundtransform_class_init(as_object& global, const ObjectURI& uri)
+void soundtransform_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&soundtransform_ctor,
getSoundTransformInterface());
attachSoundTransformStaticInterface(*cl);
}
// Register _global.SoundTransform
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/media/SoundTransform_as.h'
--- a/libcore/asobj/flash/media/SoundTransform_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/media/SoundTransform_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global SoundTransform class
-void soundtransform_class_init(as_object& global, const ObjectURI& uri);
+void soundtransform_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/media/Sound_as.cpp'
--- a/libcore/asobj/flash/media/Sound_as.cpp 2009-07-16 09:02:35 +0000
+++ b/libcore/asobj/flash/media/Sound_as.cpp 2009-07-28 11:58:27 +0000
@@ -115,7 +115,7 @@
// extern (used by Global.cpp)
void
-Sound_as::init(as_object& global, const ObjectURI& uri)
+Sound_as::init(as_object& where, const ObjectURI& uri)
{
// This is going to be the global Sound "class"/"function"
@@ -124,13 +124,13 @@
if ( cl == NULL )
{
as_object* iface = getSoundInterface();
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&sound_new, iface);
iface->set_member_flags(NSV::PROP_CONSTRUCTOR, PropFlags::readOnly);
}
// Register _global.String
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/media/Sound_as.h'
--- a/libcore/asobj/flash/media/Sound_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/media/Sound_as.h 2009-07-28 11:58:27 +0000
@@ -56,7 +56,7 @@
~Sound_as();
- static void init(as_object& global, const ObjectURI& uri);
+ static void init(as_object& where, const ObjectURI& uri);
/// Make this sound control the given DisplayObject
//
=== modified file 'libcore/asobj/flash/media/Video_as.cpp'
--- a/libcore/asobj/flash/media/Video_as.cpp 2009-07-16 09:02:35 +0000
+++ b/libcore/asobj/flash/media/Video_as.cpp 2009-07-28 11:58:27 +0000
@@ -54,18 +54,18 @@
};
// extern (used by Global.cpp)
-void video_class_init(as_object& global, const ObjectURI& uri)
+void video_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&video_ctor, getVideoInterface());
attachVideoStaticInterface(*cl);
}
// Register _global.Video
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/media/Video_as.h'
--- a/libcore/asobj/flash/media/Video_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/media/Video_as.h 2009-07-28 11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global Video class
-void video_class_init(as_object& global, const ObjectURI& uri);
+void video_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/media/media_as.cpp'
--- a/libcore/asobj/flash/media/media_as.cpp 2009-07-16 09:02:35 +0000
+++ b/libcore/asobj/flash/media/media_as.cpp 2009-07-28 11:58:27 +0000
@@ -52,18 +52,18 @@
};
// extern (used by Global.cpp)
-void media_class_init(as_object& global, const ObjectURI& uri)
+void media_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&media_ctor, getmediaInterface());
attachmediaStaticInterface(*cl);
}
// Register _global.media
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/media/media_as.h'
--- a/libcore/asobj/flash/media/media_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/media/media_as.h 2009-07-28 11:58:27 +0000
@@ -32,7 +32,7 @@
namespace gnash {
/// Initialize the global media class
-void media_class_init(as_object& global, const ObjectURI& uri);
+void media_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/net/FileFilter_as.cpp'
--- a/libcore/asobj/flash/net/FileFilter_as.cpp 2009-07-16 09:02:35 +0000
+++ b/libcore/asobj/flash/net/FileFilter_as.cpp 2009-07-28 11:58:27 +0000
@@ -52,18 +52,18 @@
};
// extern (used by Global.cpp)
-void filefilter_class_init(as_object& global, const ObjectURI& uri)
+void filefilter_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&filefilter_ctor, getFileFilterInterface());
attachFileFilterStaticInterface(*cl);
}
// Register _global.FileFilter
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/net/FileFilter_as.h'
--- a/libcore/asobj/flash/net/FileFilter_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/net/FileFilter_as.h 2009-07-28 11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global FileFilter class
-void filefilter_class_init(as_object& global, const ObjectURI& uri);
+void filefilter_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/net/FileReferenceList_as.h'
--- a/libcore/asobj/flash/net/FileReferenceList_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/net/FileReferenceList_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global FileReferenceList class
-void filereferencelist_class_init(as_object& global, const ObjectURI& uri);
+void filereferencelist_class_init(as_object& where, const ObjectURI& uri);
/// Return a FileReferenceList instance (in case the core lib needs it)
//std::auto_ptr<as_object> init_FileReferenceList_instance();
=== modified file 'libcore/asobj/flash/net/FileReference_as.h'
--- a/libcore/asobj/flash/net/FileReference_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/net/FileReference_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global FileReference class
-void filereference_class_init(as_object& global, const ObjectURI& uri);
+void filereference_class_init(as_object& where, const ObjectURI& uri);
/// Return a FileReference instance (in case the core lib needs it)
//std::auto_ptr<as_object> init_FileReference_instance();
=== modified file 'libcore/asobj/flash/net/IDynamicPropertyOutput_as.cpp'
--- a/libcore/asobj/flash/net/IDynamicPropertyOutput_as.cpp 2009-07-16
09:02:35 +0000
+++ b/libcore/asobj/flash/net/IDynamicPropertyOutput_as.cpp 2009-07-28
11:58:27 +0000
@@ -52,18 +52,18 @@
};
// extern (used by Global.cpp)
-void idynamicpropertyoutput_class_init(as_object& global, const ObjectURI& uri)
+void idynamicpropertyoutput_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&idynamicpropertyoutput_ctor,
getIDynamicPropertyOutputInterface());
attachIDynamicPropertyOutputStaticInterface(*cl);
}
// Register _global.IDynamicPropertyOutput
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/net/IDynamicPropertyOutput_as.h'
--- a/libcore/asobj/flash/net/IDynamicPropertyOutput_as.h 2009-07-16
08:30:06 +0000
+++ b/libcore/asobj/flash/net/IDynamicPropertyOutput_as.h 2009-07-28
11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global IDynamicPropertyOutput class
-void idynamicpropertyoutput_class_init(as_object& global, const ObjectURI&
uri);
+void idynamicpropertyoutput_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/net/IDynamicPropertyWriter_as.cpp'
--- a/libcore/asobj/flash/net/IDynamicPropertyWriter_as.cpp 2009-07-16
09:02:35 +0000
+++ b/libcore/asobj/flash/net/IDynamicPropertyWriter_as.cpp 2009-07-28
11:58:27 +0000
@@ -52,18 +52,18 @@
};
// extern (used by Global.cpp)
-void idynamicpropertywriter_class_init(as_object& global, const ObjectURI& uri)
+void idynamicpropertywriter_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&idynamicpropertywriter_ctor,
getIDynamicPropertyWriterInterface());
attachIDynamicPropertyWriterStaticInterface(*cl);
}
// Register _global.IDynamicPropertyWriter
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/net/IDynamicPropertyWriter_as.h'
--- a/libcore/asobj/flash/net/IDynamicPropertyWriter_as.h 2009-07-16
08:30:06 +0000
+++ b/libcore/asobj/flash/net/IDynamicPropertyWriter_as.h 2009-07-28
11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global IDynamicPropertyWriter class
-void idynamicpropertywriter_class_init(as_object& global, const ObjectURI&
uri);
+void idynamicpropertywriter_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/net/NetConnection_as.cpp'
--- a/libcore/asobj/flash/net/NetConnection_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/net/NetConnection_as.cpp 2009-07-28 11:58:27
+0000
@@ -59,18 +59,18 @@
};
// extern (used by Global.cpp)
-void netconnection_class_init(as_object& global, const ObjectURI& uri)
+void netconnection_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&netconnection_ctor, getNetConnectionInterface());
attachNetConnectionStaticInterface(*cl);
}
// Register _global.NetConnection
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/net/NetConnection_as.h'
--- a/libcore/asobj/flash/net/NetConnection_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/net/NetConnection_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global NetConnection class
-void netconnection_class_init(as_object& global, const ObjectURI& uri);
+void netconnection_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/net/NetStream_as.cpp'
--- a/libcore/asobj/flash/net/NetStream_as.cpp 2009-07-16 09:02:35 +0000
+++ b/libcore/asobj/flash/net/NetStream_as.cpp 2009-07-28 11:58:27 +0000
@@ -72,18 +72,18 @@
};
// extern (used by Global.cpp)
-void netstream_class_init(as_object& global, const ObjectURI& uri)
+void netstream_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&netstream_ctor, getNetStreamInterface());
attachNetStreamStaticInterface(*cl);
}
// Register _global.NetStream
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/net/NetStream_as.h'
--- a/libcore/asobj/flash/net/NetStream_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/net/NetStream_as.h 2009-07-28 11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global NetStream class
-void netstream_class_init(as_object& global, const ObjectURI& uri);
+void netstream_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/net/ObjectEncoding_as.cpp'
--- a/libcore/asobj/flash/net/ObjectEncoding_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/net/ObjectEncoding_as.cpp 2009-07-28 11:58:27
+0000
@@ -52,18 +52,18 @@
};
// extern (used by Global.cpp)
-void objectencoding_class_init(as_object& global, const ObjectURI& uri)
+void objectencoding_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&objectencoding_ctor,
getObjectEncodingInterface());
attachObjectEncodingStaticInterface(*cl);
}
// Register _global.ObjectEncoding
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/net/ObjectEncoding_as.h'
--- a/libcore/asobj/flash/net/ObjectEncoding_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/net/ObjectEncoding_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global ObjectEncoding class
-void objectencoding_class_init(as_object& global, const ObjectURI& uri);
+void objectencoding_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/net/Responder_as.cpp'
--- a/libcore/asobj/flash/net/Responder_as.cpp 2009-07-16 09:02:35 +0000
+++ b/libcore/asobj/flash/net/Responder_as.cpp 2009-07-28 11:58:27 +0000
@@ -52,18 +52,18 @@
};
// extern (used by Global.cpp)
-void responder_class_init(as_object& global, const ObjectURI& uri)
+void responder_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&responder_ctor, getResponderInterface());
attachResponderStaticInterface(*cl);
}
// Register _global.Responder
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/net/Responder_as.h'
--- a/libcore/asobj/flash/net/Responder_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/net/Responder_as.h 2009-07-28 11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global Responder class
-void responder_class_init(as_object& global, const ObjectURI& uri);
+void responder_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/net/SharedObjectFlushStatus_as.cpp'
--- a/libcore/asobj/flash/net/SharedObjectFlushStatus_as.cpp 2009-07-16
09:06:51 +0000
+++ b/libcore/asobj/flash/net/SharedObjectFlushStatus_as.cpp 2009-07-28
11:58:27 +0000
@@ -41,11 +41,13 @@
// extern (used by Global.cpp)
void
-sharedobjectflushstatus_class_init(as_object& global, const ObjectURI& uri)
+sharedobjectflushstatus_class_init(as_object& where, const ObjectURI& uri)
{
- static as_object* o = new as_object(getObjectInterface());
+ Global_as* gl = getGlobal(where);
+ as_object* proto = getObjectInterface();
+ static as_object* o = gl->createObject(proto);
attachSharedObjectFlushStatusStaticInterface(*o);
- global.init_member(getName(uri), o, as_object::DefaultFlags,
+ where.init_member(getName(uri), o, as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/net/SharedObjectFlushStatus_as.h'
--- a/libcore/asobj/flash/net/SharedObjectFlushStatus_as.h 2009-07-16
08:30:06 +0000
+++ b/libcore/asobj/flash/net/SharedObjectFlushStatus_as.h 2009-07-28
11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global SharedObjectFlushStatus class
-void sharedobjectflushstatus_class_init(as_object& global, const ObjectURI&
uri);
+void sharedobjectflushstatus_class_init(as_object& where, const ObjectURI&
uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/net/SharedObject_as.cpp'
--- a/libcore/asobj/flash/net/SharedObject_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/net/SharedObject_as.cpp 2009-07-28 11:58:27
+0000
@@ -605,18 +605,18 @@
}
void
-sharedobject_class_init(as_object& global, const ObjectURI& uri)
+sharedobject_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (cl == NULL) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&sharedobject_ctor, getSharedObjectInterface());
attachSharedObjectStaticInterface(*cl);
}
// Register _global.SharedObject
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/net/SharedObject_as.h'
--- a/libcore/asobj/flash/net/SharedObject_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/net/SharedObject_as.h 2009-07-28 11:58:27 +0000
@@ -70,7 +70,7 @@
};
/// Initialize the global SharedObject class
-void sharedobject_class_init(as_object& global, const ObjectURI& uri);
+void sharedobject_class_init(as_object& where, const ObjectURI& uri);
void registerSharedObjectNative(as_object& o);
=== modified file 'libcore/asobj/flash/net/Socket_as.cpp'
--- a/libcore/asobj/flash/net/Socket_as.cpp 2009-07-16 09:02:35 +0000
+++ b/libcore/asobj/flash/net/Socket_as.cpp 2009-07-28 11:58:27 +0000
@@ -84,18 +84,18 @@
};
// extern (used by Global.cpp)
-void socket_class_init(as_object& global, const ObjectURI& uri)
+void socket_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&socket_ctor, getSocketInterface());
attachSocketStaticInterface(*cl);
}
// Register _global.Socket
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/net/Socket_as.h'
--- a/libcore/asobj/flash/net/Socket_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/net/Socket_as.h 2009-07-28 11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global Socket class
-void socket_class_init(as_object& global, const ObjectURI& uri);
+void socket_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/net/URLLoaderDataFormat_as.cpp'
--- a/libcore/asobj/flash/net/URLLoaderDataFormat_as.cpp 2009-07-16
09:06:51 +0000
+++ b/libcore/asobj/flash/net/URLLoaderDataFormat_as.cpp 2009-07-28
11:58:27 +0000
@@ -41,11 +41,13 @@
// extern (used by Global.cpp)
void
-urlloaderdataformat_class_init(as_object& global, const ObjectURI& uri)
+urlloaderdataformat_class_init(as_object& where, const ObjectURI& uri)
{
- static as_object* o = new as_object(getObjectInterface());
+ Global_as* gl = getGlobal(where);
+ as_object* proto = getObjectInterface();
+ static as_object* o = gl->createObject(proto);
attachURLLoaderDataFormatStaticInterface(*o);
- global.init_member(getName(uri), o, as_object::DefaultFlags,
+ where.init_member(getName(uri), o, as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/net/URLLoaderDataFormat_as.h'
--- a/libcore/asobj/flash/net/URLLoaderDataFormat_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/net/URLLoaderDataFormat_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global URLLoaderDataFormat class
-void urlloaderdataformat_class_init(as_object& global, const ObjectURI& uri);
+void urlloaderdataformat_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/net/URLLoader_as.cpp'
--- a/libcore/asobj/flash/net/URLLoader_as.cpp 2009-07-16 09:02:35 +0000
+++ b/libcore/asobj/flash/net/URLLoader_as.cpp 2009-07-28 11:58:27 +0000
@@ -60,18 +60,18 @@
};
// extern (used by Global.cpp)
-void urlloader_class_init(as_object& global, const ObjectURI& uri)
+void urlloader_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&urlloader_ctor, getURLLoaderInterface());
attachURLLoaderStaticInterface(*cl);
}
// Register _global.URLLoader
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/net/URLLoader_as.h'
--- a/libcore/asobj/flash/net/URLLoader_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/net/URLLoader_as.h 2009-07-28 11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global URLLoader class
-void urlloader_class_init(as_object& global, const ObjectURI& uri);
+void urlloader_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/net/URLRequestHeader_as.cpp'
--- a/libcore/asobj/flash/net/URLRequestHeader_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/net/URLRequestHeader_as.cpp 2009-07-28 11:58:27
+0000
@@ -52,18 +52,18 @@
};
// extern (used by Global.cpp)
-void urlrequestheader_class_init(as_object& global, const ObjectURI& uri)
+void urlrequestheader_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&urlrequestheader_ctor,
getURLRequestHeaderInterface());
attachURLRequestHeaderStaticInterface(*cl);
}
// Register _global.URLRequestHeader
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/net/URLRequestHeader_as.h'
--- a/libcore/asobj/flash/net/URLRequestHeader_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/net/URLRequestHeader_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global URLRequestHeader class
-void urlrequestheader_class_init(as_object& global, const ObjectURI& uri);
+void urlrequestheader_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/net/URLRequestMethod_as.cpp'
--- a/libcore/asobj/flash/net/URLRequestMethod_as.cpp 2009-07-16 09:06:51
+0000
+++ b/libcore/asobj/flash/net/URLRequestMethod_as.cpp 2009-07-28 11:58:27
+0000
@@ -41,11 +41,13 @@
// extern (used by Global.cpp)
void
-urlrequestmethod_class_init(as_object& global, const ObjectURI& uri)
+urlrequestmethod_class_init(as_object& where, const ObjectURI& uri)
{
- static as_object* o = new as_object(getObjectInterface());
+ Global_as* gl = getGlobal(where);
+ as_object* proto = getObjectInterface();
+ static as_object* o = gl->createObject(proto);
attachURLRequestMethodStaticInterface(*o);
- global.init_member(getName(uri), o, as_object::DefaultFlags,
+ where.init_member(getName(uri), o, as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/net/URLRequestMethod_as.h'
--- a/libcore/asobj/flash/net/URLRequestMethod_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/net/URLRequestMethod_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global URLRequestMethod class
-void urlrequestmethod_class_init(as_object& global, const ObjectURI& uri);
+void urlrequestmethod_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/net/URLRequest_as.cpp'
--- a/libcore/asobj/flash/net/URLRequest_as.cpp 2009-07-16 09:02:35 +0000
+++ b/libcore/asobj/flash/net/URLRequest_as.cpp 2009-07-28 11:58:27 +0000
@@ -52,18 +52,18 @@
};
// extern (used by Global.cpp)
-void urlrequest_class_init(as_object& global, const ObjectURI& uri)
+void urlrequest_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&urlrequest_ctor, getURLRequestInterface());
attachURLRequestStaticInterface(*cl);
}
// Register _global.URLRequest
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/net/URLRequest_as.h'
--- a/libcore/asobj/flash/net/URLRequest_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/net/URLRequest_as.h 2009-07-28 11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global URLRequest class
-void urlrequest_class_init(as_object& global, const ObjectURI& uri);
+void urlrequest_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/net/URLStream_as.cpp'
--- a/libcore/asobj/flash/net/URLStream_as.cpp 2009-07-16 09:02:35 +0000
+++ b/libcore/asobj/flash/net/URLStream_as.cpp 2009-07-28 11:58:27 +0000
@@ -73,18 +73,18 @@
};
// extern (used by Global.cpp)
-void urlstream_class_init(as_object& global, const ObjectURI& uri)
+void urlstream_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&urlstream_ctor, getURLStreamInterface());
attachURLStreamStaticInterface(*cl);
}
// Register _global.URLStream
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/net/URLStream_as.h'
--- a/libcore/asobj/flash/net/URLStream_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/net/URLStream_as.h 2009-07-28 11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global URLStream class
-void urlstream_class_init(as_object& global, const ObjectURI& uri);
+void urlstream_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/net/URLVariables_as.cpp'
--- a/libcore/asobj/flash/net/URLVariables_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/net/URLVariables_as.cpp 2009-07-28 11:58:27
+0000
@@ -53,18 +53,18 @@
};
// extern (used by Global.cpp)
-void urlvariables_class_init(as_object& global, const ObjectURI& uri)
+void urlvariables_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&urlvariables_ctor, getURLVariablesInterface());
attachURLVariablesStaticInterface(*cl);
}
// Register _global.URLVariables
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/net/URLVariables_as.h'
--- a/libcore/asobj/flash/net/URLVariables_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/net/URLVariables_as.h 2009-07-28 11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global URLVariables class
-void urlvariables_class_init(as_object& global, const ObjectURI& uri);
+void urlvariables_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/net/XMLSocket_as.cpp'
--- a/libcore/asobj/flash/net/XMLSocket_as.cpp 2009-07-16 09:02:35 +0000
+++ b/libcore/asobj/flash/net/XMLSocket_as.cpp 2009-07-28 11:58:27 +0000
@@ -420,18 +420,18 @@
// extern (used by Global.cpp)
void
-xmlsocket_class_init(as_object& global, const ObjectURI& uri)
+xmlsocket_class_init(as_object& where, const ObjectURI& uri)
{
// This is the global XMLSocket class
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&xmlsocket_new, getXMLSocketInterface());
}
// Register _global.XMLSocket
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/net/XMLSocket_as.h'
--- a/libcore/asobj/flash/net/XMLSocket_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/net/XMLSocket_as.h 2009-07-28 11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global XMLSocket class
-void xmlsocket_class_init(as_object& global, const ObjectURI& uri);
+void xmlsocket_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/printing/PrintJobOptions_as.cpp'
--- a/libcore/asobj/flash/printing/PrintJobOptions_as.cpp 2009-07-16
09:02:35 +0000
+++ b/libcore/asobj/flash/printing/PrintJobOptions_as.cpp 2009-07-28
11:58:27 +0000
@@ -52,18 +52,18 @@
};
// extern (used by Global.cpp)
-void printjoboptions_class_init(as_object& global, const ObjectURI& uri)
+void printjoboptions_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&printjoboptions_ctor,
getPrintJobOptionsInterface());
attachPrintJobOptionsStaticInterface(*cl);
}
// Register _global.PrintJobOptions
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/printing/PrintJobOptions_as.h'
--- a/libcore/asobj/flash/printing/PrintJobOptions_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/printing/PrintJobOptions_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global PrintJobOptions class
-void printjoboptions_class_init(as_object& global, const ObjectURI& uri);
+void printjoboptions_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/printing/PrintJobOrientation_as.cpp'
--- a/libcore/asobj/flash/printing/PrintJobOrientation_as.cpp 2009-07-16
09:06:51 +0000
+++ b/libcore/asobj/flash/printing/PrintJobOrientation_as.cpp 2009-07-28
11:58:27 +0000
@@ -41,11 +41,13 @@
// extern (used by Global.cpp)
void
-printjoborientation_class_init(as_object& global, const ObjectURI& uri)
+printjoborientation_class_init(as_object& where, const ObjectURI& uri)
{
- static as_object* o = new as_object(getObjectInterface());
+ Global_as* gl = getGlobal(where);
+ as_object* proto = getObjectInterface();
+ static as_object* o = gl->createObject(proto);
attachPrintJobOrientationStaticInterface(*o);
- global.init_member(getName(uri), o, as_object::DefaultFlags,
+ where.init_member(getName(uri), o, as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/printing/PrintJobOrientation_as.h'
--- a/libcore/asobj/flash/printing/PrintJobOrientation_as.h 2009-07-16
08:30:06 +0000
+++ b/libcore/asobj/flash/printing/PrintJobOrientation_as.h 2009-07-28
11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global PrintJobOrientation class
-void printjoborientation_class_init(as_object& global, const ObjectURI& uri);
+void printjoborientation_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/printing/PrintJob_as.cpp'
--- a/libcore/asobj/flash/printing/PrintJob_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/printing/PrintJob_as.cpp 2009-07-28 11:58:27
+0000
@@ -54,18 +54,18 @@
};
// extern (used by Global.cpp)
-void printjob_class_init(as_object& global, const ObjectURI& uri)
+void printjob_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&printjob_ctor, getPrintJobInterface());
attachPrintJobStaticInterface(*cl);
}
// Register _global.PrintJob
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/printing/PrintJob_as.h'
--- a/libcore/asobj/flash/printing/PrintJob_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/printing/PrintJob_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global PrintJob class
-void printjob_class_init(as_object& global, const ObjectURI& uri);
+void printjob_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/sampler/DeleteObjectSample_as.cpp'
--- a/libcore/asobj/flash/sampler/DeleteObjectSample_as.cpp 2009-07-16
09:02:35 +0000
+++ b/libcore/asobj/flash/sampler/DeleteObjectSample_as.cpp 2009-07-28
11:58:27 +0000
@@ -52,18 +52,18 @@
};
// extern (used by Global.cpp)
-void deleteobjectsample_class_init(as_object& global, const ObjectURI& uri)
+void deleteobjectsample_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&deleteobjectsample_ctor,
getDeleteObjectSampleInterface());
attachDeleteObjectSampleStaticInterface(*cl);
}
// Register _global.DeleteObjectSample
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/sampler/DeleteObjectSample_as.h'
--- a/libcore/asobj/flash/sampler/DeleteObjectSample_as.h 2009-07-16
08:30:06 +0000
+++ b/libcore/asobj/flash/sampler/DeleteObjectSample_as.h 2009-07-28
11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global DeleteObjectSample class
-void deleteobjectsample_class_init(as_object& global, const ObjectURI& uri);
+void deleteobjectsample_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/sampler/NewObjectSample_as.cpp'
--- a/libcore/asobj/flash/sampler/NewObjectSample_as.cpp 2009-07-16
09:02:35 +0000
+++ b/libcore/asobj/flash/sampler/NewObjectSample_as.cpp 2009-07-28
11:58:27 +0000
@@ -52,18 +52,18 @@
};
// extern (used by Global.cpp)
-void newobjectsample_class_init(as_object& global, const ObjectURI& uri)
+void newobjectsample_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&newobjectsample_ctor,
getNewObjectSampleInterface());
attachNewObjectSampleStaticInterface(*cl);
}
// Register _global.NewObjectSample
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/sampler/NewObjectSample_as.h'
--- a/libcore/asobj/flash/sampler/NewObjectSample_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/sampler/NewObjectSample_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global NewObjectSample class
-void newobjectsample_class_init(as_object& global, const ObjectURI& uri);
+void newobjectsample_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/sampler/Sample_as.cpp'
--- a/libcore/asobj/flash/sampler/Sample_as.cpp 2009-07-16 09:02:35 +0000
+++ b/libcore/asobj/flash/sampler/Sample_as.cpp 2009-07-28 11:58:27 +0000
@@ -52,18 +52,18 @@
};
// extern (used by Global.cpp)
-void sample_class_init(as_object& global, const ObjectURI& uri)
+void sample_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&sample_ctor, getSampleInterface());
attachSampleStaticInterface(*cl);
}
// Register _global.Sample
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/sampler/Sample_as.h'
--- a/libcore/asobj/flash/sampler/Sample_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/sampler/Sample_as.h 2009-07-28 11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global Sample class
-void sample_class_init(as_object& global, const ObjectURI& uri);
+void sample_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/sampler/StackFrame_as.cpp'
--- a/libcore/asobj/flash/sampler/StackFrame_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/sampler/StackFrame_as.cpp 2009-07-28 11:58:27
+0000
@@ -55,18 +55,18 @@
};
// extern (used by Global.cpp)
-void stackframe_class_init(as_object& global, const ObjectURI& uri)
+void stackframe_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&stackframe_ctor, getStackFrameInterface());
attachStackFrameStaticInterface(*cl);
}
// Register _global.StackFrame
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/sampler/StackFrame_as.h'
--- a/libcore/asobj/flash/sampler/StackFrame_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/sampler/StackFrame_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global StackFrame class
-void stackframe_class_init(as_object& global, const ObjectURI& uri);
+void stackframe_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/system/ApplicationDomain_as.cpp'
--- a/libcore/asobj/flash/system/ApplicationDomain_as.cpp 2009-07-16
09:02:35 +0000
+++ b/libcore/asobj/flash/system/ApplicationDomain_as.cpp 2009-07-28
11:58:27 +0000
@@ -53,18 +53,18 @@
};
// extern (used by Global.cpp)
-void applicationdomain_class_init(as_object& global, const ObjectURI& uri)
+void applicationdomain_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&applicationdomain_ctor,
getApplicationDomainInterface());
attachApplicationDomainStaticInterface(*cl);
}
// Register _global.ApplicationDomain
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/system/ApplicationDomain_as.h'
--- a/libcore/asobj/flash/system/ApplicationDomain_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/system/ApplicationDomain_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global ApplicationDomain class
-void applicationdomain_class_init(as_object& global, const ObjectURI& uri);
+void applicationdomain_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/system/Capabilities_as.cpp'
--- a/libcore/asobj/flash/system/Capabilities_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/system/Capabilities_as.cpp 2009-07-28 11:58:27
+0000
@@ -52,18 +52,18 @@
};
// extern (used by Global.cpp)
-void capabilities_class_init(as_object& global, const ObjectURI& uri)
+void capabilities_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&capabilities_ctor, getCapabilitiesInterface());
attachCapabilitiesStaticInterface(*cl);
}
// Register _global.Capabilities
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/system/Capabilities_as.h'
--- a/libcore/asobj/flash/system/Capabilities_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/system/Capabilities_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global Capabilities class
-void capabilities_class_init(as_object& global, const ObjectURI& uri);
+void capabilities_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/system/IMEConversionMode_as.cpp'
--- a/libcore/asobj/flash/system/IMEConversionMode_as.cpp 2009-07-16
09:06:51 +0000
+++ b/libcore/asobj/flash/system/IMEConversionMode_as.cpp 2009-07-28
11:58:27 +0000
@@ -41,11 +41,13 @@
// extern (used by Global.cpp)
void
-imeconversionmode_class_init(as_object& global, const ObjectURI& uri)
+imeconversionmode_class_init(as_object& where, const ObjectURI& uri)
{
- static as_object* o = new as_object(getObjectInterface());
+ Global_as* gl = getGlobal(where);
+ as_object* proto = getObjectInterface();
+ static as_object* o = gl->createObject(proto);
attachIMEConversionModeStaticInterface(*o);
- global.init_member(getName(uri), o, as_object::DefaultFlags,
+ where.init_member(getName(uri), o, as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/system/IMEConversionMode_as.h'
--- a/libcore/asobj/flash/system/IMEConversionMode_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/system/IMEConversionMode_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global IMEConversionMode class
-void imeconversionmode_class_init(as_object& global, const ObjectURI& uri);
+void imeconversionmode_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/system/IME_as.cpp'
--- a/libcore/asobj/flash/system/IME_as.cpp 2009-07-16 09:02:35 +0000
+++ b/libcore/asobj/flash/system/IME_as.cpp 2009-07-28 11:58:27 +0000
@@ -54,18 +54,18 @@
};
// extern (used by Global.cpp)
-void ime_class_init(as_object& global, const ObjectURI& uri)
+void ime_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&ime_ctor, getIMEInterface());
attachIMEStaticInterface(*cl);
}
// Register _global.IME
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/system/IME_as.h'
--- a/libcore/asobj/flash/system/IME_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/system/IME_as.h 2009-07-28 11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global IME class
-void ime_class_init(as_object& global, const ObjectURI& uri);
+void ime_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/system/LoaderContext_as.cpp'
--- a/libcore/asobj/flash/system/LoaderContext_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/system/LoaderContext_as.cpp 2009-07-28 11:58:27
+0000
@@ -52,18 +52,18 @@
};
// extern (used by Global.cpp)
-void loadercontext_class_init(as_object& global, const ObjectURI& uri)
+void loadercontext_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&loadercontext_ctor, getLoaderContextInterface());
attachLoaderContextStaticInterface(*cl);
}
// Register _global.LoaderContext
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/system/LoaderContext_as.h'
--- a/libcore/asobj/flash/system/LoaderContext_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/system/LoaderContext_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global LoaderContext class
-void loadercontext_class_init(as_object& global, const ObjectURI& uri);
+void loadercontext_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/system/SecurityDomain_as.cpp'
--- a/libcore/asobj/flash/system/SecurityDomain_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/system/SecurityDomain_as.cpp 2009-07-28 11:58:27
+0000
@@ -52,18 +52,18 @@
};
// extern (used by Global.cpp)
-void securitydomain_class_init(as_object& global, const ObjectURI& uri)
+void securitydomain_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&securitydomain_ctor,
getSecurityDomainInterface());
attachSecurityDomainStaticInterface(*cl);
}
// Register _global.SecurityDomain
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/system/SecurityDomain_as.h'
--- a/libcore/asobj/flash/system/SecurityDomain_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/system/SecurityDomain_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global SecurityDomain class
-void securitydomain_class_init(as_object& global, const ObjectURI& uri);
+void securitydomain_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/system/SecurityPanel_as.cpp'
--- a/libcore/asobj/flash/system/SecurityPanel_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/system/SecurityPanel_as.cpp 2009-07-28 11:58:27
+0000
@@ -52,18 +52,18 @@
};
// extern (used by Global.cpp)
-void securitypanel_class_init(as_object& global, const ObjectURI& uri)
+void securitypanel_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&securitypanel_ctor, getSecurityPanelInterface());
attachSecurityPanelStaticInterface(*cl);
}
// Register _global.SecurityPanel
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/system/SecurityPanel_as.h'
--- a/libcore/asobj/flash/system/SecurityPanel_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/system/SecurityPanel_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global SecurityPanel class
-void securitypanel_class_init(as_object& global, const ObjectURI& uri);
+void securitypanel_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/system/Security_as.cpp'
--- a/libcore/asobj/flash/system/Security_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/system/Security_as.cpp 2009-07-28 11:58:27
+0000
@@ -59,18 +59,18 @@
};
// extern (used by Global.cpp)
-void security_class_init(as_object& global, const ObjectURI& uri)
+void security_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&security_ctor, getSecurityInterface());
attachSecurityStaticInterface(*cl);
}
// Register _global.Security
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/system/Security_as.h'
--- a/libcore/asobj/flash/system/Security_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/system/Security_as.h 2009-07-28 11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global Security class
-void security_class_init(as_object& global, const ObjectURI& uri);
+void security_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/system/System_as.cpp'
--- a/libcore/asobj/flash/system/System_as.cpp 2009-07-23 13:28:29 +0000
+++ b/libcore/asobj/flash/system/System_as.cpp 2009-07-28 11:58:27 +0000
@@ -64,21 +64,23 @@
void
-system_class_init(as_object& global, const ObjectURI& uri)
+system_class_init(as_object& where, const ObjectURI& uri)
{
// _global.System is NOT a class, but a simple object, see System.as
- boost::intrusive_ptr<as_object> obj = new
as_object(getObjectInterface());
+ Global_as* gl = getGlobal(where);
+ as_object* proto = getObjectInterface();
+ boost::intrusive_ptr<as_object> obj = gl->createObject(proto);
attachSystemInterface(*obj);
- global.init_member(getName(uri), obj.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), obj.get(), as_object::DefaultFlags,
getNamespace(uri));
}
void
-registerSystemNative(as_object& global)
+registerSystemNative(as_object& where)
{
- VM& vm = getVM(global);
+ VM& vm = getVM(where);
vm.registerNative(system_security_allowdomain, 12, 0);
vm.registerNative(system_showsettings, 2107, 0);
=== modified file 'libcore/asobj/flash/system/System_as.h'
--- a/libcore/asobj/flash/system/System_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/system/System_as.h 2009-07-28 11:58:27 +0000
@@ -34,9 +34,9 @@
class ObjectURI;
/// Initialize the global System class
-void system_class_init(as_object& global, const ObjectURI& uri);
+void system_class_init(as_object& where, const ObjectURI& uri);
-void registerSystemNative(as_object& global);
+void registerSystemNative(as_object& where);
/// Get the vector aof allowed domains to access
=== modified file 'libcore/asobj/flash/text/AntiAliasType_as.cpp'
--- a/libcore/asobj/flash/text/AntiAliasType_as.cpp 2009-07-16 09:06:51
+0000
+++ b/libcore/asobj/flash/text/AntiAliasType_as.cpp 2009-07-28 11:58:27
+0000
@@ -41,11 +41,13 @@
// extern (used by Global.cpp)
void
-antialiastype_class_init(as_object& global, const ObjectURI& uri)
+antialiastype_class_init(as_object& where, const ObjectURI& uri)
{
- static as_object* o = new as_object(getObjectInterface());
+ Global_as* gl = getGlobal(where);
+ as_object* proto = getObjectInterface();
+ static as_object* o = gl->createObject(proto);
attachAntiAliasTypeStaticInterface(*o);
- global.init_member(getName(uri), o, as_object::DefaultFlags,
+ where.init_member(getName(uri), o, as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/text/AntiAliasType_as.h'
--- a/libcore/asobj/flash/text/AntiAliasType_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/text/AntiAliasType_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global AntiAliasType class
-void antialiastype_class_init(as_object& global, const ObjectURI& uri);
+void antialiastype_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/text/CSMSettings_as.cpp'
--- a/libcore/asobj/flash/text/CSMSettings_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/text/CSMSettings_as.cpp 2009-07-28 11:58:27
+0000
@@ -52,18 +52,18 @@
};
// extern (used by Global.cpp)
-void csmsettings_class_init(as_object& global, const ObjectURI& uri)
+void csmsettings_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&csmsettings_ctor, getCSMSettingsInterface());
attachCSMSettingsStaticInterface(*cl);
}
// Register _global.CSMSettings
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/text/CSMSettings_as.h'
--- a/libcore/asobj/flash/text/CSMSettings_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/text/CSMSettings_as.h 2009-07-28 11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global CSMSettings class
-void csmsettings_class_init(as_object& global, const ObjectURI& uri);
+void csmsettings_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/text/FontStyle_as.cpp'
--- a/libcore/asobj/flash/text/FontStyle_as.cpp 2009-07-16 09:02:35 +0000
+++ b/libcore/asobj/flash/text/FontStyle_as.cpp 2009-07-28 11:58:27 +0000
@@ -52,18 +52,18 @@
};
// extern (used by Global.cpp)
-void fontstyle_class_init(as_object& global, const ObjectURI& uri)
+void fontstyle_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&fontstyle_ctor, getFontStyleInterface());
attachFontStyleStaticInterface(*cl);
}
// Register _global.FontStyle
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/text/FontStyle_as.h'
--- a/libcore/asobj/flash/text/FontStyle_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/text/FontStyle_as.h 2009-07-28 11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global FontStyle class
-void fontstyle_class_init(as_object& global, const ObjectURI& uri);
+void fontstyle_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/text/FontType_as.cpp'
--- a/libcore/asobj/flash/text/FontType_as.cpp 2009-07-16 09:02:35 +0000
+++ b/libcore/asobj/flash/text/FontType_as.cpp 2009-07-28 11:58:27 +0000
@@ -52,18 +52,18 @@
};
// extern (used by Global.cpp)
-void fonttype_class_init(as_object& global, const ObjectURI& uri)
+void fonttype_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&fonttype_ctor, getFontTypeInterface());
attachFontTypeStaticInterface(*cl);
}
// Register _global.FontType
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/text/FontType_as.h'
--- a/libcore/asobj/flash/text/FontType_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/text/FontType_as.h 2009-07-28 11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global FontType class
-void fonttype_class_init(as_object& global, const ObjectURI& uri);
+void fonttype_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/text/Font_as.cpp'
--- a/libcore/asobj/flash/text/Font_as.cpp 2009-07-16 09:02:35 +0000
+++ b/libcore/asobj/flash/text/Font_as.cpp 2009-07-28 11:58:27 +0000
@@ -54,18 +54,18 @@
};
// extern (used by Global.cpp)
-void font_class_init(as_object& global, const ObjectURI& uri)
+void font_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&font_ctor, getFontInterface());
attachFontStaticInterface(*cl);
}
// Register _global.Font
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/text/Font_as.h'
--- a/libcore/asobj/flash/text/Font_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/text/Font_as.h 2009-07-28 11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global Font class
-void font_class_init(as_object& global, const ObjectURI& uri);
+void font_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/text/GridFitType_as.cpp'
--- a/libcore/asobj/flash/text/GridFitType_as.cpp 2009-07-16 09:06:51
+0000
+++ b/libcore/asobj/flash/text/GridFitType_as.cpp 2009-07-28 11:58:27
+0000
@@ -41,11 +41,13 @@
// extern (used by Global.cpp)
void
-gridfittype_class_init(as_object& global, const ObjectURI& uri)
+gridfittype_class_init(as_object& where, const ObjectURI& uri)
{
- static as_object* o = new as_object(getObjectInterface());
+ Global_as* gl = getGlobal(where);
+ as_object* proto = getObjectInterface();
+ static as_object* o = gl->createObject(proto);
attachGridFitTypeStaticInterface(*o);
- global.init_member(getName(uri), o, as_object::DefaultFlags,
+ where.init_member(getName(uri), o, as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/text/GridFitType_as.h'
--- a/libcore/asobj/flash/text/GridFitType_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/text/GridFitType_as.h 2009-07-28 11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global GridFitType class
-void gridfittype_class_init(as_object& global, const ObjectURI& uri);
+void gridfittype_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/text/StaticText_as.cpp'
--- a/libcore/asobj/flash/text/StaticText_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/text/StaticText_as.cpp 2009-07-28 11:58:27
+0000
@@ -52,18 +52,18 @@
};
// extern (used by Global.cpp)
-void statictext_class_init(as_object& global, const ObjectURI& uri)
+void statictext_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&statictext_ctor, getStaticTextInterface());
attachStaticTextStaticInterface(*cl);
}
// Register _global.StaticText
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/text/StaticText_as.h'
--- a/libcore/asobj/flash/text/StaticText_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/text/StaticText_as.h 2009-07-28 11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global StaticText class
-void statictext_class_init(as_object& global, const ObjectURI& uri);
+void statictext_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/text/StyleSheet_as.cpp'
--- a/libcore/asobj/flash/text/StyleSheet_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/text/StyleSheet_as.cpp 2009-07-28 11:58:27
+0000
@@ -56,18 +56,18 @@
};
// extern (used by Global.cpp)
-void stylesheet_class_init(as_object& global, const ObjectURI& uri)
+void stylesheet_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&stylesheet_ctor, getStyleSheetInterface());
attachStyleSheetStaticInterface(*cl);
}
// Register _global.StyleSheet
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/text/StyleSheet_as.h'
--- a/libcore/asobj/flash/text/StyleSheet_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/text/StyleSheet_as.h 2009-07-28 11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global StyleSheet class
-void stylesheet_class_init(as_object& global, const ObjectURI& uri);
+void stylesheet_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/text/TextColorType_as.cpp'
--- a/libcore/asobj/flash/text/TextColorType_as.cpp 2009-07-16 09:06:51
+0000
+++ b/libcore/asobj/flash/text/TextColorType_as.cpp 2009-07-28 11:58:27
+0000
@@ -41,11 +41,13 @@
// extern (used by Global.cpp)
void
-textcolortype_class_init(as_object& global, const ObjectURI& uri)
+textcolortype_class_init(as_object& where, const ObjectURI& uri)
{
- static as_object* o = new as_object(getObjectInterface());
+ Global_as* gl = getGlobal(where);
+ as_object* proto = getObjectInterface();
+ static as_object* o = gl->createObject(proto);
attachTextColorTypeStaticInterface(*o);
- global.init_member(getName(uri), o, as_object::DefaultFlags,
+ where.init_member(getName(uri), o, as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/text/TextColorType_as.h'
--- a/libcore/asobj/flash/text/TextColorType_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/text/TextColorType_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global TextColorType class
-void textcolortype_class_init(as_object& global, const ObjectURI& uri);
+void textcolortype_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/text/TextDisplayMode_as.cpp'
--- a/libcore/asobj/flash/text/TextDisplayMode_as.cpp 2009-07-16 09:06:51
+0000
+++ b/libcore/asobj/flash/text/TextDisplayMode_as.cpp 2009-07-28 11:58:27
+0000
@@ -41,11 +41,13 @@
// extern (used by Global.cpp)
void
-textdisplaymode_class_init(as_object& global, const ObjectURI& uri)
+textdisplaymode_class_init(as_object& where, const ObjectURI& uri)
{
- static as_object* o = new as_object(getObjectInterface());
+ Global_as* gl = getGlobal(where);
+ as_object* proto = getObjectInterface();
+ static as_object* o = gl->createObject(proto);
attachTextDisplayModeStaticInterface(*o);
- global.init_member(getName(uri), o, as_object::DefaultFlags,
+ where.init_member(getName(uri), o, as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/text/TextDisplayMode_as.h'
--- a/libcore/asobj/flash/text/TextDisplayMode_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/text/TextDisplayMode_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global TextDisplayMode class
-void textdisplaymode_class_init(as_object& global, const ObjectURI& uri);
+void textdisplaymode_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/text/TextFieldAutoSize_as.cpp'
--- a/libcore/asobj/flash/text/TextFieldAutoSize_as.cpp 2009-07-16 09:37:37
+0000
+++ b/libcore/asobj/flash/text/TextFieldAutoSize_as.cpp 2009-07-28 11:58:27
+0000
@@ -38,8 +38,9 @@
void
textfieldautosize_class_init(as_object& where, const ObjectURI& uri)
{
- static boost::intrusive_ptr<as_object> obj =
- new as_object(getObjectInterface());
+ Global_as* gl = getGlobal(where);
+ as_object* proto = getObjectInterface();
+ static boost::intrusive_ptr<as_object> obj = gl->createObject(proto);
attachTextFieldAutoSizeInterface(*obj);
where.init_member(getName(uri), obj.get(), as_object::DefaultFlags,
=== modified file 'libcore/asobj/flash/text/TextFieldType_as.cpp'
--- a/libcore/asobj/flash/text/TextFieldType_as.cpp 2009-07-16 09:37:37
+0000
+++ b/libcore/asobj/flash/text/TextFieldType_as.cpp 2009-07-28 11:58:27
+0000
@@ -42,8 +42,9 @@
void
textfieldtype_class_init(as_object& where, const ObjectURI& uri)
{
- static boost::intrusive_ptr<as_object> obj =
- new as_object(getObjectInterface());
+ Global_as* gl = getGlobal(where);
+ as_object* proto = getObjectInterface();
+ static boost::intrusive_ptr<as_object> obj = gl->createObject(proto);
attachTextFieldTypeStaticInterface(*obj);
where.init_member(getName(uri), obj.get(), as_object::DefaultFlags,
=== modified file 'libcore/asobj/flash/text/TextFieldType_as.h'
--- a/libcore/asobj/flash/text/TextFieldType_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/text/TextFieldType_as.h 2009-07-28 11:58:27
+0000
@@ -31,7 +31,7 @@
class ObjectURI;
/// Initialize the global TextFieldType class
-void textfieldtype_class_init(as_object& global, const ObjectURI& uri);
+void textfieldtype_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/text/TextField_as.cpp'
--- a/libcore/asobj/flash/text/TextField_as.cpp 2009-07-16 09:02:35 +0000
+++ b/libcore/asobj/flash/text/TextField_as.cpp 2009-07-28 11:58:27 +0000
@@ -72,18 +72,18 @@
};
// extern (used by Global.cpp)
-void textfield_class_init(as_object& global, const ObjectURI& uri)
+void textfield_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&textfield_ctor, getTextFieldInterface());
attachTextFieldStaticInterface(*cl);
}
// Register _global.TextField
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/text/TextField_as.h'
--- a/libcore/asobj/flash/text/TextField_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/text/TextField_as.h 2009-07-28 11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global TextField class
-void textfield_class_init(as_object& global, const ObjectURI& uri);
+void textfield_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/text/TextFormatAlign_as.cpp'
--- a/libcore/asobj/flash/text/TextFormatAlign_as.cpp 2009-07-16 09:12:10
+0000
+++ b/libcore/asobj/flash/text/TextFormatAlign_as.cpp 2009-07-28 11:58:27
+0000
@@ -39,7 +39,7 @@
}
// extern (used by Global.cpp)
-void textformatalign_class_init(as_object& global, const ObjectURI& uri)
+void textformatalign_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> obj =
new as_object(getObjectInterface());
@@ -47,7 +47,7 @@
attachTextFormatAlignStaticInterface(*obj);
// Register _global.TextFormatAlign
- global.init_member(getName(uri), obj.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), obj.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/text/TextFormatAlign_as.h'
--- a/libcore/asobj/flash/text/TextFormatAlign_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/text/TextFormatAlign_as.h 2009-07-28 11:58:27
+0000
@@ -31,7 +31,7 @@
class ObjectURI;
/// Initialize the global TextFormatAlign class
-void textformatalign_class_init(as_object& global, const ObjectURI& uri);
+void textformatalign_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/text/TextFormat_as.cpp'
--- a/libcore/asobj/flash/text/TextFormat_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/text/TextFormat_as.cpp 2009-07-28 11:58:27
+0000
@@ -52,18 +52,18 @@
};
// extern (used by Global.cpp)
-void textformat_class_init(as_object& global, const ObjectURI& uri)
+void textformat_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&textformat_ctor, getTextFormatInterface());
attachTextFormatStaticInterface(*cl);
}
// Register _global.TextFormat
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/text/TextFormat_as.h'
--- a/libcore/asobj/flash/text/TextFormat_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/text/TextFormat_as.h 2009-07-28 11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global TextFormat class
-void textformat_class_init(as_object& global, const ObjectURI& uri);
+void textformat_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/text/TextLineMetrics_as.cpp'
--- a/libcore/asobj/flash/text/TextLineMetrics_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/text/TextLineMetrics_as.cpp 2009-07-28 11:58:27
+0000
@@ -52,18 +52,18 @@
};
// extern (used by Global.cpp)
-void textlinemetrics_class_init(as_object& global, const ObjectURI& uri)
+void textlinemetrics_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&textlinemetrics_ctor,
getTextLineMetricsInterface());
attachTextLineMetricsStaticInterface(*cl);
}
// Register _global.TextLineMetrics
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/text/TextLineMetrics_as.h'
--- a/libcore/asobj/flash/text/TextLineMetrics_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/text/TextLineMetrics_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global TextLineMetrics class
-void textlinemetrics_class_init(as_object& global, const ObjectURI& uri);
+void textlinemetrics_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/text/TextRenderer_as.h'
--- a/libcore/asobj/flash/text/TextRenderer_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/text/TextRenderer_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global TextRenderer class
-void textrenderer_class_init(as_object& global, const ObjectURI& uri);
+void textrenderer_class_init(as_object& where, const ObjectURI& uri);
/// Return a TextRenderer instance (in case the core lib needs it)
//std::auto_ptr<as_object> init_TextRenderer_instance();
=== modified file 'libcore/asobj/flash/text/TextSnapshot_as.cpp'
--- a/libcore/asobj/flash/text/TextSnapshot_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/text/TextSnapshot_as.cpp 2009-07-28 11:58:27
+0000
@@ -72,18 +72,18 @@
}
// extern (used by Global.cpp)
-void TextSnapshot_as::init(as_object& global, const ObjectURI& uri)
+void TextSnapshot_as::init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&textsnapshot_ctor, getTextSnapshotInterface());
attachTextSnapshotStaticInterface(*cl);
}
// Register _global.TextSnapshot
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/text/TextSnapshot_as.h'
--- a/libcore/asobj/flash/text/TextSnapshot_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/text/TextSnapshot_as.h 2009-07-28 11:58:27
+0000
@@ -55,7 +55,7 @@
/// AS return values.
TextSnapshot_as(const MovieClip* mc);
- static void init(as_object& global, const ObjectURI& uri);
+ static void init(as_object& where, const ObjectURI& uri);
std::string getText(boost::int32_t start, boost::int32_t end,
bool nl) const;
=== modified file 'libcore/asobj/flash/ui/ContextMenuBuiltInItems_as.cpp'
--- a/libcore/asobj/flash/ui/ContextMenuBuiltInItems_as.cpp 2009-07-16
09:02:35 +0000
+++ b/libcore/asobj/flash/ui/ContextMenuBuiltInItems_as.cpp 2009-07-28
11:58:27 +0000
@@ -52,18 +52,18 @@
};
// extern (used by Global.cpp)
-void contextmenubuiltinitems_class_init(as_object& global, const ObjectURI&
uri)
+void contextmenubuiltinitems_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&contextmenubuiltinitems_ctor,
getContextMenuBuiltInItemsInterface());
attachContextMenuBuiltInItemsStaticInterface(*cl);
}
// Register _global.ContextMenuBuiltInItems
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/ui/ContextMenuBuiltInItems_as.h'
--- a/libcore/asobj/flash/ui/ContextMenuBuiltInItems_as.h 2009-07-16
08:30:06 +0000
+++ b/libcore/asobj/flash/ui/ContextMenuBuiltInItems_as.h 2009-07-28
11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global ContextMenuBuiltInItems class
-void contextmenubuiltinitems_class_init(as_object& global, const ObjectURI&
uri);
+void contextmenubuiltinitems_class_init(as_object& where, const ObjectURI&
uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/ui/ContextMenuItem_as.cpp'
--- a/libcore/asobj/flash/ui/ContextMenuItem_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/ui/ContextMenuItem_as.cpp 2009-07-28 11:58:27
+0000
@@ -42,18 +42,18 @@
// extern (used by Global.cpp)
void
-contextmenuitem_class_init(as_object& global, const ObjectURI& uri)
+contextmenuitem_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&contextmenuitem_ctor,
getContextMenuItemInterface());
}
// Register _global.ContextMenuItem
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/ui/ContextMenuItem_as.h'
--- a/libcore/asobj/flash/ui/ContextMenuItem_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/ui/ContextMenuItem_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global ContextMenuItem class
-void contextmenuitem_class_init(as_object& global, const ObjectURI& uri);
+void contextmenuitem_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/ui/ContextMenu_as.cpp'
--- a/libcore/asobj/flash/ui/ContextMenu_as.cpp 2009-07-16 09:02:35 +0000
+++ b/libcore/asobj/flash/ui/ContextMenu_as.cpp 2009-07-28 11:58:27 +0000
@@ -50,17 +50,17 @@
// extern (used by Global.cpp)
void
-contextmenu_class_init(as_object& global, const ObjectURI& uri)
+contextmenu_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (cl == NULL) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(contextmenu_ctor, getContextMenuInterface());
}
// Register _global.ContextMenu
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/ui/ContextMenu_as.h'
--- a/libcore/asobj/flash/ui/ContextMenu_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/ui/ContextMenu_as.h 2009-07-28 11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global ContextMenu class
-void contextmenu_class_init(as_object& global, const ObjectURI& uri);
+void contextmenu_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/ui/KeyLocation_as.cpp'
--- a/libcore/asobj/flash/ui/KeyLocation_as.cpp 2009-07-16 09:02:35 +0000
+++ b/libcore/asobj/flash/ui/KeyLocation_as.cpp 2009-07-28 11:58:27 +0000
@@ -52,18 +52,18 @@
};
// extern (used by Global.cpp)
-void keylocation_class_init(as_object& global, const ObjectURI& uri)
+void keylocation_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&keylocation_ctor, getKeyLocationInterface());
attachKeyLocationStaticInterface(*cl);
}
// Register _global.KeyLocation
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/ui/KeyLocation_as.h'
--- a/libcore/asobj/flash/ui/KeyLocation_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/ui/KeyLocation_as.h 2009-07-28 11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global KeyLocation class
-void keylocation_class_init(as_object& global, const ObjectURI& uri);
+void keylocation_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/ui/Keyboard_as.cpp'
--- a/libcore/asobj/flash/ui/Keyboard_as.cpp 2009-07-16 09:46:59 +0000
+++ b/libcore/asobj/flash/ui/Keyboard_as.cpp 2009-07-28 11:58:27 +0000
@@ -220,7 +220,7 @@
#endif // def GNASH_USE_GC
// extern (used by Global.cpp)
-void Keyboard_as::init(as_object& global, const ObjectURI& uri)
+void Keyboard_as::init(as_object& where, const ObjectURI& uri)
{
// Create built-in key object.
@@ -255,8 +255,8 @@
// methods
- VM& vm = getVM(global);
- Global_as* gl = getGlobal(global);
+ VM& vm = getVM(where);
+ Global_as* gl = getGlobal(where);
vm.registerNative(key_get_ascii, 800, 0);
key_obj->init_member("getAscii", vm.getNative(800, 0), flags);
@@ -273,7 +273,7 @@
key_obj->init_member("isAccessible",
gl->createFunction(key_is_accessible), flags);
- global.init_member(getName(uri), key_obj, as_object::DefaultFlags,
+ where.init_member(getName(uri), key_obj, as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/ui/Keyboard_as.h'
--- a/libcore/asobj/flash/ui/Keyboard_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/ui/Keyboard_as.h 2009-07-28 11:58:27 +0000
@@ -47,7 +47,7 @@
public:
Keyboard_as();
- static void init(as_object& global, const ObjectURI& uri);
+ static void init(as_object& where, const ObjectURI& uri);
// Pass SWF keycode, returns true if currently pressed.
bool is_key_down(int keycode);
=== modified file 'libcore/asobj/flash/ui/Mouse_as.cpp'
--- a/libcore/asobj/flash/ui/Mouse_as.cpp 2009-07-16 09:12:10 +0000
+++ b/libcore/asobj/flash/ui/Mouse_as.cpp 2009-07-28 11:58:27 +0000
@@ -54,14 +54,16 @@
// extern (used by Global.cpp)
void
-mouse_class_init(as_object& global, const ObjectURI& uri)
+mouse_class_init(as_object& where, const ObjectURI& uri)
{
// This is going to be the global Mouse "class"/"function"
- boost::intrusive_ptr<as_object> obj = new as_object(getObjectInterface());
+ Global_as* gl = getGlobal(where);
+ as_object* proto = getObjectInterface();
+ boost::intrusive_ptr<as_object> obj = gl->createObject(proto);
attachMouseInterface(*obj);
// Register _global.Mouse
- global.init_member(getName(uri), obj.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), obj.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/ui/Mouse_as.h'
--- a/libcore/asobj/flash/ui/Mouse_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/ui/Mouse_as.h 2009-07-28 11:58:27 +0000
@@ -28,7 +28,7 @@
{
public:
/// Register native functions with the VM
- static void registerNative(as_object& global);
+ static void registerNative(as_object& where);
};
void mouse_class_init(as_object& where, const ObjectURI& uri);
=== modified file 'libcore/asobj/flash/utils/ByteArray_as.cpp'
--- a/libcore/asobj/flash/utils/ByteArray_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/utils/ByteArray_as.cpp 2009-07-28 11:58:27
+0000
@@ -80,18 +80,18 @@
};
// extern (used by Global.cpp)
-void bytearray_class_init(as_object& global, const ObjectURI& uri)
+void bytearray_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&bytearray_ctor, getByteArrayInterface());
attachByteArrayStaticInterface(*cl);
}
// Register _global.ByteArray
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/utils/ByteArray_as.h'
--- a/libcore/asobj/flash/utils/ByteArray_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/utils/ByteArray_as.h 2009-07-28 11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global ByteArray class
-void bytearray_class_init(as_object& global, const ObjectURI& uri);
+void bytearray_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/utils/Dictionary_as.cpp'
--- a/libcore/asobj/flash/utils/Dictionary_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/utils/Dictionary_as.cpp 2009-07-28 11:58:27
+0000
@@ -52,18 +52,18 @@
};
// extern (used by Global.cpp)
-void dictionary_class_init(as_object& global, const ObjectURI& uri)
+void dictionary_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&dictionary_ctor, getDictionaryInterface());
attachDictionaryStaticInterface(*cl);
}
// Register _global.Dictionary
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/utils/Dictionary_as.h'
--- a/libcore/asobj/flash/utils/Dictionary_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/utils/Dictionary_as.h 2009-07-28 11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global Dictionary class
-void dictionary_class_init(as_object& global, const ObjectURI& uri);
+void dictionary_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/utils/Endian_as.cpp'
--- a/libcore/asobj/flash/utils/Endian_as.cpp 2009-07-16 09:02:35 +0000
+++ b/libcore/asobj/flash/utils/Endian_as.cpp 2009-07-28 11:58:27 +0000
@@ -52,18 +52,18 @@
};
// extern (used by Global.cpp)
-void endian_class_init(as_object& global, const ObjectURI& uri)
+void endian_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&endian_ctor, getEndianInterface());
attachEndianStaticInterface(*cl);
}
// Register _global.Endian
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/utils/Endian_as.h'
--- a/libcore/asobj/flash/utils/Endian_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/utils/Endian_as.h 2009-07-28 11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global Endian class
-void endian_class_init(as_object& global, const ObjectURI& uri);
+void endian_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/utils/IDataInput_as.cpp'
--- a/libcore/asobj/flash/utils/IDataInput_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/utils/IDataInput_as.cpp 2009-07-28 11:58:27
+0000
@@ -65,18 +65,18 @@
};
// extern (used by Global.cpp)
-void idatainput_class_init(as_object& global, const ObjectURI& uri)
+void idatainput_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&idatainput_ctor, getIDataInputInterface());
attachIDataInputStaticInterface(*cl);
}
// Register _global.IDataInput
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/utils/IDataInput_as.h'
--- a/libcore/asobj/flash/utils/IDataInput_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/utils/IDataInput_as.h 2009-07-28 11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global IDataInput class
-void idatainput_class_init(as_object& global, const ObjectURI& uri);
+void idatainput_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/utils/IDataOutput_as.cpp'
--- a/libcore/asobj/flash/utils/IDataOutput_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/utils/IDataOutput_as.cpp 2009-07-28 11:58:27
+0000
@@ -63,18 +63,18 @@
};
// extern (used by Global.cpp)
-void idataoutput_class_init(as_object& global, const ObjectURI& uri)
+void idataoutput_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&idataoutput_ctor, getIDataOutputInterface());
attachIDataOutputStaticInterface(*cl);
}
// Register _global.IDataOutput
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/utils/IDataOutput_as.h'
--- a/libcore/asobj/flash/utils/IDataOutput_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/utils/IDataOutput_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global IDataOutput class
-void idataoutput_class_init(as_object& global, const ObjectURI& uri);
+void idataoutput_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/utils/IExternalizable_as.cpp'
--- a/libcore/asobj/flash/utils/IExternalizable_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/utils/IExternalizable_as.cpp 2009-07-28 11:58:27
+0000
@@ -53,18 +53,18 @@
};
// extern (used by Global.cpp)
-void iexternalizable_class_init(as_object& global, const ObjectURI& uri)
+void iexternalizable_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&iexternalizable_ctor,
getIExternalizableInterface());
attachIExternalizableStaticInterface(*cl);
}
// Register _global.IExternalizable
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/utils/IExternalizable_as.h'
--- a/libcore/asobj/flash/utils/IExternalizable_as.h 2009-07-16 08:30:06
+0000
+++ b/libcore/asobj/flash/utils/IExternalizable_as.h 2009-07-28 11:58:27
+0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global IExternalizable class
-void iexternalizable_class_init(as_object& global, const ObjectURI& uri);
+void iexternalizable_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/utils/Proxy_as.cpp'
--- a/libcore/asobj/flash/utils/Proxy_as.cpp 2009-07-16 09:02:35 +0000
+++ b/libcore/asobj/flash/utils/Proxy_as.cpp 2009-07-28 11:58:27 +0000
@@ -61,18 +61,18 @@
};
// extern (used by Global.cpp)
-void proxy_class_init(as_object& global, const ObjectURI& uri)
+void proxy_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&proxy_ctor, getProxyInterface());
attachProxyStaticInterface(*cl);
}
// Register _global.Proxy
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/utils/Proxy_as.h'
--- a/libcore/asobj/flash/utils/Proxy_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/utils/Proxy_as.h 2009-07-28 11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global Proxy class
-void proxy_class_init(as_object& global, const ObjectURI& uri);
+void proxy_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/utils/Timer_as.cpp'
--- a/libcore/asobj/flash/utils/Timer_as.cpp 2009-07-16 09:02:35 +0000
+++ b/libcore/asobj/flash/utils/Timer_as.cpp 2009-07-28 11:58:27 +0000
@@ -56,18 +56,18 @@
};
// extern (used by Global.cpp)
-void timer_class_init(as_object& global, const ObjectURI& uri)
+void timer_class_init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if (!cl) {
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&timer_ctor, getTimerInterface());
attachTimerStaticInterface(*cl);
}
// Register _global.Timer
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/utils/Timer_as.h'
--- a/libcore/asobj/flash/utils/Timer_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/utils/Timer_as.h 2009-07-28 11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global Timer class
-void timer_class_init(as_object& global, const ObjectURI& uri);
+void timer_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/xml/XMLDocument_as.cpp'
--- a/libcore/asobj/flash/xml/XMLDocument_as.cpp 2009-07-16 09:02:35
+0000
+++ b/libcore/asobj/flash/xml/XMLDocument_as.cpp 2009-07-28 11:58:27
+0000
@@ -620,26 +620,26 @@
// extern (used by Global.cpp)
void
-XMLDocument_as::init(as_object& global, const ObjectURI& uri)
+XMLDocument_as::init(as_object& where, const ObjectURI& uri)
{
static boost::intrusive_ptr<as_object> cl;
if ( cl == NULL )
{
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&xml_new, getXMLInterface());
}
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
void
-XMLDocument_as::registerNative(as_object& global)
+XMLDocument_as::registerNative(as_object& where)
{
- VM& vm = getVM(global);
+ VM& vm = getVM(where);
vm.registerNative(xml_escape, 100, 5);
vm.registerNative(xml_createElement, 253, 8);
vm.registerNative(xml_createTextNode, 253, 9);
=== modified file 'libcore/asobj/flash/xml/XMLDocument_as.h'
--- a/libcore/asobj/flash/xml/XMLDocument_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/xml/XMLDocument_as.h 2009-07-28 11:58:27 +0000
@@ -68,8 +68,8 @@
~XMLDocument_as() {};
- static void init(as_object& global, const ObjectURI& uri);
- static void registerNative(as_object& global);
+ static void init(as_object& where, const ObjectURI& uri);
+ static void registerNative(as_object& where);
/// Convert the XML object to a string
//
=== modified file 'libcore/asobj/flash/xml/XMLNodeType_as.cpp'
--- a/libcore/asobj/flash/xml/XMLNodeType_as.cpp 2009-07-16 09:06:51
+0000
+++ b/libcore/asobj/flash/xml/XMLNodeType_as.cpp 2009-07-28 11:58:27
+0000
@@ -41,11 +41,13 @@
// extern (used by Global.cpp)
void
-xmlnodetype_class_init(as_object& global, const ObjectURI& uri)
+xmlnodetype_class_init(as_object& where, const ObjectURI& uri)
{
- static as_object* o = new as_object(getObjectInterface());
+ Global_as* gl = getGlobal(where);
+ as_object* proto = getObjectInterface();
+ static as_object* o = gl->createObject(proto);
attachXMLNodeTypeStaticInterface(*o);
- global.init_member(getName(uri), o, as_object::DefaultFlags,
+ where.init_member(getName(uri), o, as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/xml/XMLNodeType_as.h'
--- a/libcore/asobj/flash/xml/XMLNodeType_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/xml/XMLNodeType_as.h 2009-07-28 11:58:27 +0000
@@ -32,7 +32,7 @@
class ObjectURI;
/// Initialize the global XMLNodeType class
-void xmlnodetype_class_init(as_object& global, const ObjectURI& uri);
+void xmlnodetype_class_init(as_object& where, const ObjectURI& uri);
} // gnash namespace
=== modified file 'libcore/asobj/flash/xml/XMLNode_as.cpp'
--- a/libcore/asobj/flash/xml/XMLNode_as.cpp 2009-07-16 09:02:35 +0000
+++ b/libcore/asobj/flash/xml/XMLNode_as.cpp 2009-07-28 11:58:27 +0000
@@ -421,9 +421,9 @@
#endif // GNASH_USE_GC
void
-XMLNode_as::registerNative(as_object& global)
+XMLNode_as::registerNative(as_object& where)
{
- VM& vm = getVM(global);
+ VM& vm = getVM(where);
vm.registerNative(xmlnode_cloneNode, 253, 1);
vm.registerNative(xmlnode_removeNode, 253, 2);
vm.registerNative(xmlnode_insertBefore, 253, 3);
@@ -444,18 +444,18 @@
}
void
-XMLNode_as::init(as_object& global, const ObjectURI& uri)
+XMLNode_as::init(as_object& where, const ObjectURI& uri)
{
// This is the global XMLNode_as "class"
static boost::intrusive_ptr<as_object> cl;
if ( cl == NULL )
{
- Global_as* gl = getGlobal(global);
+ Global_as* gl = getGlobal(where);
cl = gl->createClass(&xmlnode_new, getXMLNodeInterface());
}
- global.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
+ where.init_member(getName(uri), cl.get(), as_object::DefaultFlags,
getNamespace(uri));
}
=== modified file 'libcore/asobj/flash/xml/XMLNode_as.h'
--- a/libcore/asobj/flash/xml/XMLNode_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/flash/xml/XMLNode_as.h 2009-07-28 11:58:27 +0000
@@ -58,13 +58,13 @@
virtual ~XMLNode_as();
// Initialize the global XMLNode class
- static void init(as_object& global, const ObjectURI& uri);
+ static void init(as_object& where, const ObjectURI& uri);
// Used by XML_as
static as_object* getXMLNodeInterface();
/// Register ASnative methods
- static void registerNative(as_object& global);
+ static void registerNative(as_object& where);
size_t length() const { return _children.size(); }
=== modified file 'testsuite/actionscript.all/flash.as'
--- a/testsuite/actionscript.all/flash.as 2009-05-29 14:39:11 +0000
+++ b/testsuite/actionscript.all/flash.as 2009-07-28 16:04:00 +0000
@@ -16,14 +16,26 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+// This is for miscellaneous testing of SWF8 flash package and related
+// functions.
#include "check.as"
+#if OUTPUT_VERSION == 5
+MovieClip.prototype.hasOwnProperty = ASNative(101, 5);
+#endif
+
#if OUTPUT_VERSION < 8
check_equals(typeof(flash), 'undefined');
-check_totals(1);
+// The transform property of MovieClip is not visible to SWF6 or SWF7
+check_equals(MovieClip.prototype.transform, undefined);
+check(MovieClip.prototype.hasOwnProperty("transform"));
+MovieClip.prototype.transform = 8;
+xcheck_equals(MovieClip.prototype.transform, 8);
+
+check_totals(4);
#else
@@ -74,8 +86,16 @@
check_equals(flash.utils.toString(), undefined);
check_equals(flash.xml.toString(), undefined);
+// MovieClip.transform is protected from deletion and change.
+check_equals(MovieClip.prototype.transform, undefined);
+check(MovieClip.prototype.hasOwnProperty("transform"));
+MovieClip.prototype.transform = 8;
+check_equals(MovieClip.prototype.transform, undefined);
+delete MovieClip.prototype.transform;
+check_equals(MovieClip.prototype.transform, undefined);
+check(MovieClip.prototype.hasOwnProperty("transform"));
-totals(30);
+totals(35);
#endif
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/trunk r11324: First stage towards sorting out prototypes and as_objects for a non-singleton,
Benjamin Wolsey <=