liangsheng8708
/
ruffle
mirror of https://mirror.ghproxy.com/https://github.com/ruffle-rs/ruffle.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: Rename Namespace::public_namespace to Namespace::public

This commit is contained in:
paq 2021-01-24 16:51:36 +09:00 committed by Mike Welsh
parent b58fcf3b05
commit e9ad1587a4
28 changed files with 283 additions and 297 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
core/src/avm2/activation.rs
View File

@ -244,7 +244,7 @@ impl<'a, 'gc, 'gc_context> Activation<'a, 'gc, 'gc_context> {
if method.method().needs_arguments_object {
args_object.set_property(
args_object,
&QName::new(Namespace::public_namespace(), "callee"),
&QName::new(Namespace::public(), "callee"),
callee.into(),
&mut activation,
)?;
@ -322,7 +322,7 @@ impl<'a, 'gc, 'gc_context> Activation<'a, 'gc, 'gc_context> {
receiver: Object<'gc>,
args: &[Value<'gc>],
) -> Result<Value<'gc>, Error> {
let name = QName::new(Namespace::public_namespace(), "constructor");
let name = QName::new(Namespace::public(), "constructor");
let base_proto: Result<Object<'gc>, Error> =
self.base_proto().and_then(|p| p.proto()).ok_or_else(|| {
"Attempted to call super constructor without a superclass."
@ -1184,7 +1184,7 @@ impl<'a, 'gc, 'gc_context> Activation<'a, 'gc, 'gc_context> {
let obj = self.context.avm2.pop().coerce_to_object(self)?;
let name = self.context.avm2.pop().coerce_to_string(self)?;
let qname = QName::new(Namespace::public_namespace(), name);
let qname = QName::new(Namespace::public(), name);
let has_prop = obj.has_property(&qname)?;
self.context.avm2.push(has_prop);
@ -1352,11 +1352,7 @@ impl<'a, 'gc, 'gc_context> Activation<'a, 'gc, 'gc_context> {
let mut ctor = self.context.avm2.pop().coerce_to_object(self)?;
let proto = ctor
.get_property(
ctor,
&QName::new(Namespace::public_namespace(), "prototype"),
self,
)?
.get_property(ctor, &QName::new(Namespace::public(), "prototype"), self)?
.coerce_to_object(self)?;
let object = proto.construct(self, &args)?;
@ -1385,11 +1381,7 @@ impl<'a, 'gc, 'gc_context> Activation<'a, 'gc, 'gc_context> {
.get_property(source, &ctor_name?, self)?
.coerce_to_object(self)?;
let proto = ctor
.get_property(
ctor,
&QName::new(Namespace::public_namespace(), "prototype"),
self,
)?
.get_property(ctor, &QName::new(Namespace::public(), "prototype"), self)?
.coerce_to_object(self)?;
let object = proto.construct(self, &args)?;
@ -1429,7 +1421,7 @@ impl<'a, 'gc, 'gc_context> Activation<'a, 'gc, 'gc_context> {
object.set_property(
object,
&QName::new(Namespace::public_namespace(), name.coerce_to_string(self)?),
&QName::new(Namespace::public(), name.coerce_to_string(self)?),
value,
self,
)?;
@ -1462,7 +1454,7 @@ impl<'a, 'gc, 'gc_context> Activation<'a, 'gc, 'gc_context> {
new_fn.install_slot(
self.context.gc_context,
QName::new(Namespace::public_namespace(), "prototype"),
QName::new(Namespace::public(), "prototype"),
0,
es3_proto.into(),
);

2
core/src/avm2/globals.rs
View File

@ -240,7 +240,7 @@ where
constr
.get_property(
constr,
&QName::new(Namespace::public_namespace(), "prototype"),
&QName::new(Namespace::public(), "prototype"),
activation,
)?
.coerce_to_object(activation)

44
core/src/avm2/globals/array.rs
View File

@ -127,7 +127,7 @@ pub fn resolve_array_hole<'gc>(
p.get_property(
p,
&QName::new(
Namespace::public_namespace(),
Namespace::public(),
AvmString::new(activation.context.gc_context, i.to_string()),
),
activation,
@ -210,7 +210,7 @@ pub fn to_locale_string<'gc>(
let tls = o.get_property(
o,
&QName::new(Namespace::public_namespace(), "toLocaleString"),
&QName::new(Namespace::public(), "toLocaleString"),
activation,
)?;
@ -261,7 +261,7 @@ impl<'gc> ArrayIter<'gc> {
let length = array_object
.get_property(
array_object,
&QName::new(Namespace::public_namespace(), "length"),
&QName::new(Namespace::public(), "length"),
activation,
)?
.coerce_to_u32(activation)?;
@ -291,7 +291,7 @@ impl<'gc> ArrayIter<'gc> {
.get_property(
self.array_object,
&QName::new(
Namespace::public_namespace(),
Namespace::public(),
AvmString::new(activation.context.gc_context, i.to_string()),
),
activation,
@ -1165,14 +1165,14 @@ pub fn sort_on<'gc>(
let mut a_object = a.coerce_to_object(activation)?;
let a_field = a_object.get_property(
a_object,
&QName::new(Namespace::public_namespace(), *field_name),
&QName::new(Namespace::public(), *field_name),
activation,
)?;
let mut b_object = b.coerce_to_object(activation)?;
let b_field = b_object.get_property(
b_object,
&QName::new(Namespace::public_namespace(), *field_name),
&QName::new(Namespace::public(), *field_name),
activation,
)?;
@ -1209,15 +1209,15 @@ pub fn sort_on<'gc>(
/// Construct `Array`'s class.
pub fn create_class<'gc>(mc: MutationContext<'gc, '_>) -> GcCell<'gc, Class<'gc>> {
let class = Class::new(
QName::new(Namespace::public_namespace(), "Array"),
Some(QName::new(Namespace::public_namespace(), "Object").into()),
QName::new(Namespace::public(), "Array"),
Some(QName::new(Namespace::public(), "Object").into()),
Method::from_builtin(instance_init),
Method::from_builtin(class_init),
mc,
);
class.write(mc).define_instance_trait(Trait::from_getter(
QName::new(Namespace::public_namespace(), "length"),
QName::new(Namespace::public(), "length"),
Method::from_builtin(length),
));
@ -1232,17 +1232,17 @@ pub fn create_class<'gc>(mc: MutationContext<'gc, '_>) -> GcCell<'gc, Class<'gc>
));
class.write(mc).define_instance_trait(Trait::from_method(
QName::new(Namespace::public_namespace(), "toString"),
QName::new(Namespace::public(), "toString"),
Method::from_builtin(to_string),
));
class.write(mc).define_instance_trait(Trait::from_method(
QName::new(Namespace::public_namespace(), "toLocaleString"),
QName::new(Namespace::public(), "toLocaleString"),
Method::from_builtin(to_locale_string),
));
class.write(mc).define_instance_trait(Trait::from_method(
QName::new(Namespace::public_namespace(), "valueOf"),
QName::new(Namespace::public(), "valueOf"),
Method::from_builtin(value_of),
));
@ -1327,32 +1327,32 @@ pub fn create_class<'gc>(mc: MutationContext<'gc, '_>) -> GcCell<'gc, Class<'gc>
));
class.write(mc).define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "CASEINSENSITIVE"),
Multiname::from(QName::new(Namespace::public_namespace(), "uint")),
QName::new(Namespace::public(), "CASEINSENSITIVE"),
Multiname::from(QName::new(Namespace::public(), "uint")),
Some(SortOptions::CASE_INSENSITIVE.bits().into()),
));
class.write(mc).define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "DESCENDING"),
Multiname::from(QName::new(Namespace::public_namespace(), "uint")),
QName::new(Namespace::public(), "DESCENDING"),
Multiname::from(QName::new(Namespace::public(), "uint")),
Some(SortOptions::DESCENDING.bits().into()),
));
class.write(mc).define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "NUMERIC"),
Multiname::from(QName::new(Namespace::public_namespace(), "uint")),
QName::new(Namespace::public(), "NUMERIC"),
Multiname::from(QName::new(Namespace::public(), "uint")),
Some(SortOptions::NUMERIC.bits().into()),
));
class.write(mc).define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "RETURNINDEXEDARRAY"),
Multiname::from(QName::new(Namespace::public_namespace(), "uint")),
QName::new(Namespace::public(), "RETURNINDEXEDARRAY"),
Multiname::from(QName::new(Namespace::public(), "uint")),
Some(SortOptions::RETURN_INDEXED_ARRAY.bits().into()),
));
class.write(mc).define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "UNIQUESORT"),
Multiname::from(QName::new(Namespace::public_namespace(), "uint")),
QName::new(Namespace::public(), "UNIQUESORT"),
Multiname::from(QName::new(Namespace::public(), "uint")),
Some(SortOptions::UNIQUE_SORT.bits().into()),
));

4
core/src/avm2/globals/boolean.rs
View File

@ -30,8 +30,8 @@ pub fn class_init<'gc>(
/// Construct `Boolean`'s class.
pub fn create_class<'gc>(mc: MutationContext<'gc, '_>) -> GcCell<'gc, Class<'gc>> {
Class::new(
QName::new(Namespace::public_namespace(), "Boolean"),
Some(QName::new(Namespace::public_namespace(), "Object").into()),
QName::new(Namespace::public(), "Boolean"),
Some(QName::new(Namespace::public(), "Object").into()),
Method::from_builtin(instance_init),
Method::from_builtin(class_init),
mc,

4
core/src/avm2/globals/class.rs
View File

@ -39,8 +39,8 @@ pub fn create_class<'gc>(
fn_proto: Object<'gc>,
) -> (Object<'gc>, Object<'gc>, GcCell<'gc, Class<'gc>>) {
let class_class = Class::new(
QName::new(Namespace::public_namespace(), "Class"),
Some(QName::new(Namespace::public_namespace(), "Object").into()),
QName::new(Namespace::public(), "Class"),
Some(QName::new(Namespace::public(), "Object").into()),
Method::from_builtin(instance_init),
Method::from_builtin(class_init),
activation.context.gc_context,

52
core/src/avm2/globals/flash/display/displayobject.rs
View File

@ -507,107 +507,107 @@ pub fn create_class<'gc>(mc: MutationContext<'gc, '_>) -> GcCell<'gc, Class<'gc>
let mut write = class.write(mc);
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::public_namespace(), "alpha"),
QName::new(Namespace::public(), "alpha"),
Method::from_builtin(alpha),
));
write.define_instance_trait(Trait::from_setter(
QName::new(Namespace::public_namespace(), "alpha"),
QName::new(Namespace::public(), "alpha"),
Method::from_builtin(set_alpha),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::public_namespace(), "height"),
QName::new(Namespace::public(), "height"),
Method::from_builtin(height),
));
write.define_instance_trait(Trait::from_setter(
QName::new(Namespace::public_namespace(), "height"),
QName::new(Namespace::public(), "height"),
Method::from_builtin(set_height),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::public_namespace(), "scaleY"),
QName::new(Namespace::public(), "scaleY"),
Method::from_builtin(scale_y),
));
write.define_instance_trait(Trait::from_setter(
QName::new(Namespace::public_namespace(), "scaleY"),
QName::new(Namespace::public(), "scaleY"),
Method::from_builtin(set_scale_y),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::public_namespace(), "width"),
QName::new(Namespace::public(), "width"),
Method::from_builtin(width),
));
write.define_instance_trait(Trait::from_setter(
QName::new(Namespace::public_namespace(), "width"),
QName::new(Namespace::public(), "width"),
Method::from_builtin(set_width),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::public_namespace(), "scaleX"),
QName::new(Namespace::public(), "scaleX"),
Method::from_builtin(scale_x),
));
write.define_instance_trait(Trait::from_setter(
QName::new(Namespace::public_namespace(), "scaleX"),
QName::new(Namespace::public(), "scaleX"),
Method::from_builtin(set_scale_x),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::public_namespace(), "x"),
QName::new(Namespace::public(), "x"),
Method::from_builtin(x),
));
write.define_instance_trait(Trait::from_setter(
QName::new(Namespace::public_namespace(), "x"),
QName::new(Namespace::public(), "x"),
Method::from_builtin(set_x),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::public_namespace(), "y"),
QName::new(Namespace::public(), "y"),
Method::from_builtin(y),
));
write.define_instance_trait(Trait::from_setter(
QName::new(Namespace::public_namespace(), "y"),
QName::new(Namespace::public(), "y"),
Method::from_builtin(set_y),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::public_namespace(), "rotation"),
QName::new(Namespace::public(), "rotation"),
Method::from_builtin(rotation),
));
write.define_instance_trait(Trait::from_setter(
QName::new(Namespace::public_namespace(), "rotation"),
QName::new(Namespace::public(), "rotation"),
Method::from_builtin(set_rotation),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::public_namespace(), "name"),
QName::new(Namespace::public(), "name"),
Method::from_builtin(name),
));
write.define_instance_trait(Trait::from_setter(
QName::new(Namespace::public_namespace(), "name"),
QName::new(Namespace::public(), "name"),
Method::from_builtin(set_name),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::public_namespace(), "parent"),
QName::new(Namespace::public(), "parent"),
Method::from_builtin(parent),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::public_namespace(), "root"),
QName::new(Namespace::public(), "root"),
Method::from_builtin(root),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::public_namespace(), "visible"),
QName::new(Namespace::public(), "visible"),
Method::from_builtin(visible),
));
write.define_instance_trait(Trait::from_setter(
QName::new(Namespace::public_namespace(), "visible"),
QName::new(Namespace::public(), "visible"),
Method::from_builtin(set_visible),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::public_namespace(), "mouseX"),
QName::new(Namespace::public(), "mouseX"),
Method::from_builtin(mouse_x),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::public_namespace(), "mouseY"),
QName::new(Namespace::public(), "mouseY"),
Method::from_builtin(mouse_y),
));
write.define_instance_trait(Trait::from_method(
QName::new(Namespace::public_namespace(), "hitTestPoint"),
QName::new(Namespace::public(), "hitTestPoint"),
Method::from_builtin(hit_test_point),
));
write.define_instance_trait(Trait::from_method(
QName::new(Namespace::public_namespace(), "hitTestObject"),
QName::new(Namespace::public(), "hitTestObject"),
Method::from_builtin(hit_test_object),
));

35
core/src/avm2/globals/flash/display/displayobjectcontainer.rs
View File

@ -587,70 +587,67 @@ pub fn create_class<'gc>(mc: MutationContext<'gc, '_>) -> GcCell<'gc, Class<'gc>
let mut write = class.write(mc);
write.define_instance_trait(Trait::from_method(
QName::new(Namespace::public_namespace(), "getChildAt"),
QName::new(Namespace::public(), "getChildAt"),
Method::from_builtin(get_child_at),
));
write.define_instance_trait(Trait::from_method(
QName::new(Namespace::public_namespace(), "getChildByName"),
QName::new(Namespace::public(), "getChildByName"),
Method::from_builtin(get_child_by_name),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::public_namespace(), "numChildren"),
QName::new(Namespace::public(), "numChildren"),
Method::from_builtin(num_children),
));
write.define_instance_trait(Trait::from_method(
QName::new(Namespace::public_namespace(), "addChild"),
QName::new(Namespace::public(), "addChild"),
Method::from_builtin(add_child),
));
write.define_instance_trait(Trait::from_method(
QName::new(Namespace::public_namespace(), "addChildAt"),
QName::new(Namespace::public(), "addChildAt"),
Method::from_builtin(add_child_at),
));
write.define_instance_trait(Trait::from_method(
QName::new(Namespace::public_namespace(), "removeChild"),
QName::new(Namespace::public(), "removeChild"),
Method::from_builtin(remove_child),
));
write.define_instance_trait(Trait::from_method(
QName::new(Namespace::public_namespace(), "contains"),
QName::new(Namespace::public(), "contains"),
Method::from_builtin(contains),
));
write.define_instance_trait(Trait::from_method(
QName::new(Namespace::public_namespace(), "getChildIndex"),
QName::new(Namespace::public(), "getChildIndex"),
Method::from_builtin(get_child_index),
));
write.define_instance_trait(Trait::from_method(
QName::new(Namespace::public_namespace(), "removeChildAt"),
QName::new(Namespace::public(), "removeChildAt"),
Method::from_builtin(remove_child_at),
));
write.define_instance_trait(Trait::from_method(
QName::new(Namespace::public_namespace(), "removeChildren"),
QName::new(Namespace::public(), "removeChildren"),
Method::from_builtin(remove_children),
));
write.define_instance_trait(Trait::from_method(
QName::new(Namespace::public_namespace(), "setChildIndex"),
QName::new(Namespace::public(), "setChildIndex"),
Method::from_builtin(set_child_index),
));
write.define_instance_trait(Trait::from_method(
QName::new(Namespace::public_namespace(), "swapChildrenAt"),
QName::new(Namespace::public(), "swapChildrenAt"),
Method::from_builtin(swap_children_at),
));
write.define_instance_trait(Trait::from_method(
QName::new(Namespace::public_namespace(), "swapChildren"),
QName::new(Namespace::public(), "swapChildren"),
Method::from_builtin(swap_children),
));
write.define_instance_trait(Trait::from_method(
QName::new(Namespace::public_namespace(), "stopAllMovieClips"),
QName::new(Namespace::public(), "stopAllMovieClips"),
Method::from_builtin(stop_all_movie_clips),
));
write.define_instance_trait(Trait::from_method(
QName::new(Namespace::public_namespace(), "getObjectsUnderPoint"),
QName::new(Namespace::public(), "getObjectsUnderPoint"),
Method::from_builtin(get_objects_under_point),
));
write.define_instance_trait(Trait::from_method(
QName::new(
Namespace::public_namespace(),
"areInaccessibleObjectsUnderPoint",
),
QName::new(Namespace::public(), "areInaccessibleObjectsUnderPoint"),
Method::from_builtin(are_inaccessible_objects_under_point),
));

4
core/src/avm2/globals/flash/display/framelabel.rs
View File

@ -103,12 +103,12 @@ pub fn create_class<'gc>(mc: MutationContext<'gc, '_>) -> GcCell<'gc, Class<'gc>
let mut write = class.write(mc);
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::public_namespace(), "name"),
QName::new(Namespace::public(), "name"),
Method::from_builtin(name),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::public_namespace(), "frame"),
QName::new(Namespace::public(), "frame"),
Method::from_builtin(frame),
));

36
core/src/avm2/globals/flash/display/movieclip.rs
View File

@ -537,92 +537,92 @@ pub fn create_class<'gc>(mc: MutationContext<'gc, '_>) -> GcCell<'gc, Class<'gc>
let mut write = class.write(mc);
write.define_instance_trait(Trait::from_method(
QName::new(Namespace::public_namespace(), "addFrameScript"),
QName::new(Namespace::public(), "addFrameScript"),
Method::from_builtin(add_frame_script),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::public_namespace(), "currentFrame"),
QName::new(Namespace::public(), "currentFrame"),
Method::from_builtin(current_frame),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::public_namespace(), "currentFrameLabel"),
QName::new(Namespace::public(), "currentFrameLabel"),
Method::from_builtin(current_frame_label),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::public_namespace(), "currentLabel"),
QName::new(Namespace::public(), "currentLabel"),
Method::from_builtin(current_label),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::public_namespace(), "currentLabels"),
QName::new(Namespace::public(), "currentLabels"),
Method::from_builtin(current_labels),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::public_namespace(), "currentScene"),
QName::new(Namespace::public(), "currentScene"),
Method::from_builtin(current_scene),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::public_namespace(), "scenes"),
QName::new(Namespace::public(), "scenes"),
Method::from_builtin(scenes),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::public_namespace(), "framesLoaded"),
QName::new(Namespace::public(), "framesLoaded"),
Method::from_builtin(frames_loaded),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::public_namespace(), "isPlaying"),
QName::new(Namespace::public(), "isPlaying"),
Method::from_builtin(is_playing),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::public_namespace(), "totalFrames"),
QName::new(Namespace::public(), "totalFrames"),
Method::from_builtin(total_frames),
));
write.define_instance_trait(Trait::from_method(
QName::new(Namespace::public_namespace(), "gotoAndPlay"),
QName::new(Namespace::public(), "gotoAndPlay"),
Method::from_builtin(goto_and_play),
));
write.define_instance_trait(Trait::from_method(
QName::new(Namespace::public_namespace(), "gotoAndStop"),
QName::new(Namespace::public(), "gotoAndStop"),
Method::from_builtin(goto_and_stop),
));
write.define_instance_trait(Trait::from_method(
QName::new(Namespace::public_namespace(), "stop"),
QName::new(Namespace::public(), "stop"),
Method::from_builtin(stop),
));
write.define_instance_trait(Trait::from_method(
QName::new(Namespace::public_namespace(), "play"),
QName::new(Namespace::public(), "play"),
Method::from_builtin(play),
));
write.define_instance_trait(Trait::from_method(
QName::new(Namespace::public_namespace(), "prevFrame"),
QName::new(Namespace::public(), "prevFrame"),
Method::from_builtin(prev_frame),
));
write.define_instance_trait(Trait::from_method(
QName::new(Namespace::public_namespace(), "nextFrame"),
QName::new(Namespace::public(), "nextFrame"),
Method::from_builtin(next_frame),
));
write.define_instance_trait(Trait::from_method(
QName::new(Namespace::public_namespace(), "prevScene"),
QName::new(Namespace::public(), "prevScene"),
Method::from_builtin(prev_scene),
));
write.define_instance_trait(Trait::from_method(
QName::new(Namespace::public_namespace(), "nextScene"),
QName::new(Namespace::public(), "nextScene"),
Method::from_builtin(next_scene),
));

8
core/src/avm2/globals/flash/display/scene.rs
View File

@ -118,7 +118,7 @@ pub fn num_frames<'gc>(
pub fn create_class<'gc>(mc: MutationContext<'gc, '_>) -> GcCell<'gc, Class<'gc>> {
let class = Class::new(
QName::new(Namespace::package("flash.display"), "Scene"),
Some(QName::new(Namespace::public_namespace(), "Object").into()),
Some(QName::new(Namespace::public(), "Object").into()),
Method::from_builtin(instance_init),
Method::from_builtin(class_init),
mc,
@ -127,17 +127,17 @@ pub fn create_class<'gc>(mc: MutationContext<'gc, '_>) -> GcCell<'gc, Class<'gc>
let mut write = class.write(mc);
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::public_namespace(), "labels"),
QName::new(Namespace::public(), "labels"),
Method::from_builtin(labels),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::public_namespace(), "name"),
QName::new(Namespace::public(), "name"),
Method::from_builtin(name),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::public_namespace(), "numFrames"),
QName::new(Namespace::public(), "numFrames"),
Method::from_builtin(num_frames),
));

259
core/src/avm2/globals/flash/events/event.rs
View File

@ -264,7 +264,7 @@ pub fn to_string<'gc>(
pub fn create_class<'gc>(mc: MutationContext<'gc, '_>) -> GcCell<'gc, Class<'gc>> {
let class = Class::new(
QName::new(Namespace::package("flash.events"), "Event"),
Some(QName::new(Namespace::public_namespace(), "Object").into()),
Some(QName::new(Namespace::public(), "Object").into()),
Method::from_builtin(instance_init),
Method::from_builtin(class_init),
mc,
@ -275,344 +275,341 @@ pub fn create_class<'gc>(mc: MutationContext<'gc, '_>) -> GcCell<'gc, Class<'gc>
write.set_attributes(ClassAttributes::SEALED);
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::public_namespace(), "bubbles"),
QName::new(Namespace::public(), "bubbles"),
Method::from_builtin(bubbles),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::public_namespace(), "cancelable"),
QName::new(Namespace::public(), "cancelable"),
Method::from_builtin(cancelable),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::public_namespace(), "type"),
QName::new(Namespace::public(), "type"),
Method::from_builtin(get_type),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::public_namespace(), "target"),
QName::new(Namespace::public(), "target"),
Method::from_builtin(target),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::public_namespace(), "currentTarget"),
QName::new(Namespace::public(), "currentTarget"),
Method::from_builtin(current_target),
));
write.define_instance_trait(Trait::from_getter(
QName::new(Namespace::public_namespace(), "eventPhase"),
QName::new(Namespace::public(), "eventPhase"),
Method::from_builtin(event_phase),
));
write.define_instance_trait(Trait::from_method(
QName::new(Namespace::public_namespace(), "clone"),
QName::new(Namespace::public(), "clone"),
Method::from_builtin(clone),
));
write.define_instance_trait(Trait::from_method(
QName::new(Namespace::public_namespace(), "formatToString"),
QName::new(Namespace::public(), "formatToString"),
Method::from_builtin(format_to_string),
));
write.define_instance_trait(Trait::from_method(
QName::new(Namespace::public_namespace(), "isDefaultPrevented"),
QName::new(Namespace::public(), "isDefaultPrevented"),
Method::from_builtin(is_default_prevented),
));
write.define_instance_trait(Trait::from_method(
QName::new(Namespace::public_namespace(), "preventDefault"),
QName::new(Namespace::public(), "preventDefault"),
Method::from_builtin(prevent_default),
));
write.define_instance_trait(Trait::from_method(
QName::new(Namespace::public_namespace(), "stopPropagation"),
QName::new(Namespace::public(), "stopPropagation"),
Method::from_builtin(stop_propagation),
));
write.define_instance_trait(Trait::from_method(
QName::new(Namespace::public_namespace(), "stopImmediatePropagation"),
QName::new(Namespace::public(), "stopImmediatePropagation"),
Method::from_builtin(stop_immediate_propagation),
));
write.define_instance_trait(Trait::from_method(
QName::new(Namespace::public_namespace(), "toString"),
QName::new(Namespace::public(), "toString"),
Method::from_builtin(to_string),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "ACTIVATE"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "ACTIVATE"),
QName::new(Namespace::public(), "String").into(),
Some("activate".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "ADDED"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "ADDED"),
QName::new(Namespace::public(), "String").into(),
Some("added".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "ADDED_TO_STAGE"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "ADDED_TO_STAGE"),
QName::new(Namespace::public(), "String").into(),
Some("addedToStage".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "BROWSER_ZOOM_CHANGE"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "BROWSER_ZOOM_CHANGE"),
QName::new(Namespace::public(), "String").into(),
Some("browserZoomChange".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "CANCEL"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "CANCEL"),
QName::new(Namespace::public(), "String").into(),
Some("cancel".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "CHANGE"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "CHANGE"),
QName::new(Namespace::public(), "String").into(),
Some("change".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "CHANNEL_MESSAGE"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "CHANNEL_MESSAGE"),
QName::new(Namespace::public(), "String").into(),
Some("channelMessage".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "CHANNEL_STATE"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "CHANNEL_STATE"),
QName::new(Namespace::public(), "String").into(),
Some("channelState".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "CLEAR"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "CLEAR"),
QName::new(Namespace::public(), "String").into(),
Some("clear".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "CLOSE"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "CLOSE"),
QName::new(Namespace::public(), "String").into(),
Some("close".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "CLOSING"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "CLOSING"),
QName::new(Namespace::public(), "String").into(),
Some("closing".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "COMPLETE"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "COMPLETE"),
QName::new(Namespace::public(), "String").into(),
Some("complete".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "CONNECT"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "CONNECT"),
QName::new(Namespace::public(), "String").into(),
Some("connect".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "CONTEXT3D_CREATE"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "CONTEXT3D_CREATE"),
QName::new(Namespace::public(), "String").into(),
Some("context3DCreate".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "COPY"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "COPY"),
QName::new(Namespace::public(), "String").into(),
Some("copy".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "CUT"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "CUT"),
QName::new(Namespace::public(), "String").into(),
Some("cut".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "DEACTIVATE"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "DEACTIVATE"),
QName::new(Namespace::public(), "String").into(),
Some("deactivate".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "DISPLAYING"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "DISPLAYING"),
QName::new(Namespace::public(), "String").into(),
Some("displaying".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "ENTER_FRAME"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "ENTER_FRAME"),
QName::new(Namespace::public(), "String").into(),
Some("enterFrame".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "EXIT_FRAME"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "EXIT_FRAME"),
QName::new(Namespace::public(), "String").into(),
Some("exitFrame".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "EXITING"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "EXITING"),
QName::new(Namespace::public(), "String").into(),
Some("exiting".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "FRAME_CONSTRUCTED"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "FRAME_CONSTRUCTED"),
QName::new(Namespace::public(), "String").into(),
Some("frameConstructed".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "FRAME_LABEL"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "FRAME_LABEL"),
QName::new(Namespace::public(), "String").into(),
Some("frameLabel".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "FULLSCREEN"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "FULLSCREEN"),
QName::new(Namespace::public(), "String").into(),
Some("fullScreen".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "HTML_BOUNDS_CHANGE"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "HTML_BOUNDS_CHANGE"),
QName::new(Namespace::public(), "String").into(),
Some("htmlBoundsChange".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "HTML_DOM_INITIALIZE"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "HTML_DOM_INITIALIZE"),
QName::new(Namespace::public(), "String").into(),
Some("htmlDOMInitialize".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "HTML_RENDER"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "HTML_RENDER"),
QName::new(Namespace::public(), "String").into(),
Some("htmlRender".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "ID3"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "ID3"),
QName::new(Namespace::public(), "String").into(),
Some("id3".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "INIT"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "INIT"),
QName::new(Namespace::public(), "String").into(),
Some("init".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "LOCATION_CHANGE"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "LOCATION_CHANGE"),
QName::new(Namespace::public(), "String").into(),
Some("locationChange".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "MOUSE_LEAVE"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "MOUSE_LEAVE"),
QName::new(Namespace::public(), "String").into(),
Some("mouseLeave".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "NETWORK_CHANGE"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "NETWORK_CHANGE"),
QName::new(Namespace::public(), "String").into(),
Some("networkChange".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "OPEN"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "OPEN"),
QName::new(Namespace::public(), "String").into(),
Some("open".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "PASTE"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "PASTE"),
QName::new(Namespace::public(), "String").into(),
Some("paste".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "PREPARING"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "PREPARING"),
QName::new(Namespace::public(), "String").into(),
Some("preparing".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "REMOVED"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "REMOVED"),
QName::new(Namespace::public(), "String").into(),
Some("removed".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "REMOVED_FROM_STAGE"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "REMOVED_FROM_STAGE"),
QName::new(Namespace::public(), "String").into(),
Some("removedFromStage".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "RENDER"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "RENDER"),
QName::new(Namespace::public(), "String").into(),
Some("render".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "RESIZE"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "RESIZE"),
QName::new(Namespace::public(), "String").into(),
Some("resize".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "SCROLL"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "SCROLL"),
QName::new(Namespace::public(), "String").into(),
Some("scroll".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "SELECT"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "SELECT"),
QName::new(Namespace::public(), "String").into(),
Some("select".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "SELECT_ALL"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "SELECT_ALL"),
QName::new(Namespace::public(), "String").into(),
Some("selectAll".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "SOUND_COMPLETE"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "SOUND_COMPLETE"),
QName::new(Namespace::public(), "String").into(),
Some("soundComplete".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "STANDARD_ERROR_CLOSE"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "STANDARD_ERROR_CLOSE"),
QName::new(Namespace::public(), "String").into(),
Some("standardErrorClose".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "STANDARD_INPUT_CLOSE"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "STANDARD_INPUT_CLOSE"),
QName::new(Namespace::public(), "String").into(),
Some("standardInputClose".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "STANDARD_OUTPUT_CLOSE"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "STANDARD_OUTPUT_CLOSE"),
QName::new(Namespace::public(), "String").into(),
Some("standardOutputClose".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "SUSPEND"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "SUSPEND"),
QName::new(Namespace::public(), "String").into(),
Some("suspend".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "TAB_CHILDREN_CHANGE"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "TAB_CHILDREN_CHANGE"),
QName::new(Namespace::public(), "String").into(),
Some("tabChildrenChange".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "TAB_ENABLED_CHANGE"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "TAB_ENABLED_CHANGE"),
QName::new(Namespace::public(), "String").into(),
Some("tabEnabledChange".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "TAB_INDEX_CHANGE"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "TAB_INDEX_CHANGE"),
QName::new(Namespace::public(), "String").into(),
Some("tabIndexChange".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(
Namespace::public_namespace(),
"TEXT_INTERACTION_MODE_CHANGE",
),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "TEXT_INTERACTION_MODE_CHANGE"),
QName::new(Namespace::public(), "String").into(),
Some("textInteractionModeChange".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "TEXTURE_READY"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "TEXTURE_READY"),
QName::new(Namespace::public(), "String").into(),
Some("textureReady".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "UNLOAD"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "UNLOAD"),
QName::new(Namespace::public(), "String").into(),
Some("unload".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "USER_IDLE"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "USER_IDLE"),
QName::new(Namespace::public(), "String").into(),
Some("userIdle".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "USER_PRESENT"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "USER_PRESENT"),
QName::new(Namespace::public(), "String").into(),
Some("userPresent".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "VIDEO_FRAME"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "VIDEO_FRAME"),
QName::new(Namespace::public(), "String").into(),
Some("videoFrame".into()),
));
write.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), "WORKER_STATE"),
QName::new(Namespace::public_namespace(), "String").into(),
QName::new(Namespace::public(), "WORKER_STATE"),
QName::new(Namespace::public(), "String").into(),
Some("workerState".into()),
));

12
core/src/avm2/globals/flash/events/eventdispatcher.rs
View File

@ -367,7 +367,7 @@ pub fn class_init<'gc>(
pub fn create_class<'gc>(mc: MutationContext<'gc, '_>) -> GcCell<'gc, Class<'gc>> {
let class = Class::new(
QName::new(Namespace::package("flash.events"), "EventDispatcher"),
Some(QName::new(Namespace::public_namespace(), "Object").into()),
Some(QName::new(Namespace::public(), "Object").into()),
Method::from_builtin(instance_init),
Method::from_builtin(class_init),
mc,
@ -380,23 +380,23 @@ pub fn create_class<'gc>(mc: MutationContext<'gc, '_>) -> GcCell<'gc, Class<'gc>
write.implements(QName::new(Namespace::package("flash.events"), "IEventDispatcher").into());
write.define_instance_trait(Trait::from_method(
QName::new(Namespace::public_namespace(), "addEventListener"),
QName::new(Namespace::public(), "addEventListener"),
Method::from_builtin(add_event_listener),
));
write.define_instance_trait(Trait::from_method(
QName::new(Namespace::public_namespace(), "removeEventListener"),
QName::new(Namespace::public(), "removeEventListener"),
Method::from_builtin(remove_event_listener),
));
write.define_instance_trait(Trait::from_method(
QName::new(Namespace::public_namespace(), "hasEventListener"),
QName::new(Namespace::public(), "hasEventListener"),
Method::from_builtin(has_event_listener),
));
write.define_instance_trait(Trait::from_method(
QName::new(Namespace::public_namespace(), "willTrigger"),
QName::new(Namespace::public(), "willTrigger"),
Method::from_builtin(will_trigger),
));
write.define_instance_trait(Trait::from_method(
QName::new(Namespace::public_namespace(), "dispatchEvent"),
QName::new(Namespace::public(), "dispatchEvent"),
Method::from_builtin(dispatch_event),
));

14
core/src/avm2/globals/flash/system/application_domain.rs
View File

@ -84,7 +84,7 @@ pub fn get_definition<'gc>(
.cloned()
.unwrap_or_else(|| "".into())
.coerce_to_string(activation)?;
let qname = QName::new(Namespace::public_namespace(), local_name);
let qname = QName::new(Namespace::public(), local_name);
let (qname, mut defined_script) = appdomain
.get_defining_script(&qname.into())?
@ -110,7 +110,7 @@ pub fn has_definition<'gc>(
.cloned()
.unwrap_or_else(|| "".into())
.coerce_to_string(activation)?;
let qname = QName::new(Namespace::public_namespace(), local_name);
let qname = QName::new(Namespace::public(), local_name);
return Ok(appdomain.has_definition(qname).into());
}
@ -122,7 +122,7 @@ pub fn has_definition<'gc>(
pub fn create_class<'gc>(mc: MutationContext<'gc, '_>) -> GcCell<'gc, Class<'gc>> {
let class = Class::new(
QName::new(Namespace::package("flash.system"), "ApplicationDomain"),
Some(QName::new(Namespace::public_namespace(), "Object").into()),
Some(QName::new(Namespace::public(), "Object").into()),
Method::from_builtin(instance_init),
Method::from_builtin(class_init),
mc,
@ -131,19 +131,19 @@ pub fn create_class<'gc>(mc: MutationContext<'gc, '_>) -> GcCell<'gc, Class<'gc>
let mut write = class.write(mc);
write.define_class_trait(Trait::from_getter(
QName::new(Namespace::public_namespace(), "currentDomain"),
QName::new(Namespace::public(), "currentDomain"),
Method::from_builtin(current_domain),
));
write.define_class_trait(Trait::from_getter(
QName::new(Namespace::public_namespace(), "parentDomain"),
QName::new(Namespace::public(), "parentDomain"),
Method::from_builtin(parent_domain),
));
write.define_class_trait(Trait::from_method(
QName::new(Namespace::public_namespace(), "getDefinition"),
QName::new(Namespace::public(), "getDefinition"),
Method::from_builtin(get_definition),
));
write.define_class_trait(Trait::from_method(
QName::new(Namespace::public_namespace(), "hasDefinition"),
QName::new(Namespace::public(), "hasDefinition"),
Method::from_builtin(has_definition),
));

4
core/src/avm2/globals/function.rs
View File

@ -95,8 +95,8 @@ pub fn create_class<'gc>(
proto: Object<'gc>,
) -> (Object<'gc>, Object<'gc>, GcCell<'gc, Class<'gc>>) {
let function_class = Class::new(
QName::new(Namespace::public_namespace(), "Function"),
Some(QName::new(Namespace::public_namespace(), "Object").into()),
QName::new(Namespace::public(), "Function"),
Some(QName::new(Namespace::public(), "Object").into()),
Method::from_builtin(instance_init),
Method::from_builtin(class_init),
activation.context.gc_context,

4
core/src/avm2/globals/global_scope.rs
View File

@ -34,8 +34,8 @@ pub fn class_init<'gc>(
/// Construct `global`'s class.
pub fn create_class<'gc>(mc: MutationContext<'gc, '_>) -> GcCell<'gc, Class<'gc>> {
Class::new(
QName::new(Namespace::public_namespace(), "global"),
Some(QName::new(Namespace::public_namespace(), "Object").into()),
QName::new(Namespace::public(), "global"),
Some(QName::new(Namespace::public(), "Object").into()),
Method::from_builtin(instance_init),
Method::from_builtin(class_init),
mc,

4
core/src/avm2/globals/int.rs
View File

@ -30,8 +30,8 @@ pub fn class_init<'gc>(
/// Construct `int`'s class.
pub fn create_class<'gc>(mc: MutationContext<'gc, '_>) -> GcCell<'gc, Class<'gc>> {
Class::new(
QName::new(Namespace::public_namespace(), "int"),
Some(QName::new(Namespace::public_namespace(), "Object").into()),
QName::new(Namespace::public(), "int"),
Some(QName::new(Namespace::public(), "Object").into()),
Method::from_builtin(instance_init),
Method::from_builtin(class_init),
mc,

12
core/src/avm2/globals/math.rs
View File

@ -16,8 +16,8 @@ macro_rules! math_constants {
($class:ident, $($name:expr => $value:expr),*) => {{
$(
$class.define_class_trait(Trait::from_const(
QName::new(Namespace::public_namespace(), $name),
Multiname::from(QName::new(Namespace::public_namespace(), "Number")),
QName::new(Namespace::public(), $name),
Multiname::from(QName::new(Namespace::public(), "Number")),
Some($value.into()),
));
)*
@ -28,7 +28,7 @@ macro_rules! math_method {
($class:ident, $($name:expr => $f:expr),*) => {{
$(
$class.define_class_trait(Trait::from_method(
QName::new(Namespace::public_namespace(), $name),
QName::new(Namespace::public(), $name),
Method::from_builtin($f),
));
)*
@ -39,7 +39,7 @@ macro_rules! math_wrap_std {
($class:ident, $($name:expr => $std:expr),*) => {{
$(
$class.define_class_trait(Trait::from_method(
QName::new(Namespace::public_namespace(), $name),
QName::new(Namespace::public(), $name),
Method::from_builtin(
|activation, _this, args| -> Result<Value<'gc>, Error> {
if let Some(input) = args.get(0) {
@ -76,8 +76,8 @@ pub fn class_init<'gc>(
/// Construct `Math`'s class.
pub fn create_class<'gc>(mc: MutationContext<'gc, '_>) -> GcCell<'gc, Class<'gc>> {
let class = Class::new(
QName::new(Namespace::public_namespace(), "Math"),
Some(QName::new(Namespace::public_namespace(), "Object").into()),
QName::new(Namespace::public(), "Math"),
Some(QName::new(Namespace::public(), "Object").into()),
Method::from_builtin(instance_init),
Method::from_builtin(class_init),
mc,

4
core/src/avm2/globals/namespace.rs
View File

@ -30,8 +30,8 @@ pub fn class_init<'gc>(
/// Construct `Namespace`'s class.
pub fn create_class<'gc>(mc: MutationContext<'gc, '_>) -> GcCell<'gc, Class<'gc>> {
Class::new(
QName::new(Namespace::public_namespace(), "Namespace"),
Some(QName::new(Namespace::public_namespace(), "Object").into()),
QName::new(Namespace::public(), "Namespace"),
Some(QName::new(Namespace::public(), "Object").into()),
Method::from_builtin(instance_init),
Method::from_builtin(class_init),
mc,

4
core/src/avm2/globals/number.rs
View File

@ -30,8 +30,8 @@ pub fn class_init<'gc>(
/// Construct `Number`'s class.
pub fn create_class<'gc>(mc: MutationContext<'gc, '_>) -> GcCell<'gc, Class<'gc>> {
Class::new(
QName::new(Namespace::public_namespace(), "Number"),
Some(QName::new(Namespace::public_namespace(), "Object").into()),
QName::new(Namespace::public(), "Number"),
Some(QName::new(Namespace::public(), "Object").into()),
Method::from_builtin(instance_init),
Method::from_builtin(class_init),
mc,

10
core/src/avm2/globals/object.rs
View File

@ -159,7 +159,7 @@ pub fn create_proto<'gc>(
globals: Object<'gc>,
) -> (Object<'gc>, GcCell<'gc, Class<'gc>>) {
let object_class = Class::new(
QName::new(Namespace::public_namespace(), "Object"),
QName::new(Namespace::public(), "Object"),
None,
Method::from_builtin(instance_init),
Method::from_builtin(class_init),
@ -189,19 +189,19 @@ pub fn fill_proto<'gc>(
) -> Object<'gc> {
object_proto.install_method(
gc_context,
QName::new(Namespace::public_namespace(), "toString"),
QName::new(Namespace::public(), "toString"),
0,
FunctionObject::from_builtin(gc_context, to_string, fn_proto),
);
object_proto.install_method(
gc_context,
QName::new(Namespace::public_namespace(), "toLocaleString"),
QName::new(Namespace::public(), "toLocaleString"),
0,
FunctionObject::from_builtin(gc_context, to_locale_string, fn_proto),
);
object_proto.install_method(
gc_context,
QName::new(Namespace::public_namespace(), "valueOf"),
QName::new(Namespace::public(), "valueOf"),
0,
FunctionObject::from_builtin(gc_context, value_of, fn_proto),
);
@ -225,7 +225,7 @@ pub fn fill_proto<'gc>(
);
object_proto.install_method(
gc_context,
QName::new(Namespace::public_namespace(), "setPropertyIsEnumerable"),
QName::new(Namespace::public(), "setPropertyIsEnumerable"),
0,
FunctionObject::from_builtin(gc_context, set_property_is_enumerable, fn_proto),
);

4
core/src/avm2/globals/string.rs
View File

@ -30,8 +30,8 @@ pub fn class_init<'gc>(
/// Construct `String`'s class.
pub fn create_class<'gc>(mc: MutationContext<'gc, '_>) -> GcCell<'gc, Class<'gc>> {
Class::new(
QName::new(Namespace::public_namespace(), "String"),
Some(QName::new(Namespace::public_namespace(), "Object").into()),
QName::new(Namespace::public(), "String"),
Some(QName::new(Namespace::public(), "Object").into()),
Method::from_builtin(instance_init),
Method::from_builtin(class_init),
mc,

4
core/src/avm2/globals/uint.rs
View File

@ -30,8 +30,8 @@ pub fn class_init<'gc>(
/// Construct `uint`'s class.
pub fn create_class<'gc>(mc: MutationContext<'gc, '_>) -> GcCell<'gc, Class<'gc>> {
Class::new(
QName::new(Namespace::public_namespace(), "uint"),
Some(QName::new(Namespace::public_namespace(), "Object").into()),
QName::new(Namespace::public(), "uint"),
Some(QName::new(Namespace::public(), "Object").into()),
Method::from_builtin(instance_init),
Method::from_builtin(class_init),
mc,

6
core/src/avm2/names.rs
View File

@ -62,7 +62,7 @@ impl<'gc> Namespace<'gc> {
})
}
pub fn public_namespace() -> Self {
pub fn public() -> Self {
Namespace::Package("".into())
}
@ -137,7 +137,7 @@ impl<'gc> QName<'gc> {
pub fn dynamic_name(local_part: impl Into<AvmString<'gc>>) -> Self {
Self {
ns: Namespace::public_namespace(),
ns: Namespace::public(),
name: local_part.into(),
}
}
@ -183,7 +183,7 @@ impl<'gc> QName<'gc> {
name: AvmString::new(mc, local_name.to_string()),
}),
[local_name] => Some(Self {
ns: Namespace::public_namespace(),
ns: Namespace::public(),
name: AvmString::new(mc, local_name.to_string()),
}),
_ => None,

2
core/src/avm2/object.rs
View File

@ -603,7 +603,7 @@ pub trait TObject<'gc>: 'gc + Collect + Debug + Into<Object<'gc>> + Clone + Copy
fobject.install_slot(
activation.context.gc_context,
QName::new(Namespace::public_namespace(), "prototype"),
QName::new(Namespace::public(), "prototype"),
0,
es3_proto.into(),
);

2
core/src/avm2/object/array_object.rs
View File

@ -191,7 +191,7 @@ impl<'gc> TObject<'gc> for ArrayObject<'gc> {
fn resolve_any(self, local_name: AvmString<'gc>) -> Result<Option<Namespace<'gc>>, Error> {
if let Ok(index) = local_name.parse::<usize>() {
if self.0.read().array.get(index).is_some() {
return Ok(Some(Namespace::public_namespace()));
return Ok(Some(Namespace::public()));
}
}

12
core/src/avm2/object/function_object.rs
View File

@ -93,7 +93,7 @@ impl<'gc> FunctionObject<'gc> {
let super_proto: Result<_, Error> = base_class
.get_property(
base_class,
&QName::new(Namespace::public_namespace(), "prototype"),
&QName::new(Namespace::public(), "prototype"),
activation,
)?
.coerce_to_object(activation)
@ -143,7 +143,7 @@ impl<'gc> FunctionObject<'gc> {
let iface_proto = interface
.get_property(
interface,
&QName::new(Namespace::public_namespace(), "prototype"),
&QName::new(Namespace::public(), "prototype"),
activation,
)?
.coerce_to_object(activation)?;
@ -180,12 +180,12 @@ impl<'gc> FunctionObject<'gc> {
constr.install_dynamic_property(
activation.context.gc_context,
QName::new(Namespace::public_namespace(), "prototype"),
QName::new(Namespace::public(), "prototype"),
class_proto.into(),
)?;
class_proto.install_dynamic_property(
activation.context.gc_context,
QName::new(Namespace::public_namespace(), "constructor"),
QName::new(Namespace::public(), "constructor"),
constr.into(),
)?;
@ -263,12 +263,12 @@ impl<'gc> FunctionObject<'gc> {
base.install_dynamic_property(
mc,
QName::new(Namespace::public_namespace(), "prototype"),
QName::new(Namespace::public(), "prototype"),
prototype.into(),
)?;
prototype.install_dynamic_property(
mc,
QName::new(Namespace::public_namespace(), "constructor"),
QName::new(Namespace::public(), "constructor"),
base.into(),
)?;

6
core/src/avm2/object/namespace_object.rs
View File

@ -61,7 +61,7 @@ impl<'gc> NamespaceObject<'gc> {
mc,
NamespaceObjectData {
base,
namespace: Namespace::public_namespace(),
namespace: Namespace::public(),
},
))
.into())
@ -96,7 +96,7 @@ impl<'gc> TObject<'gc> for NamespaceObject<'gc> {
activation.context.gc_context,
NamespaceObjectData {
base,
namespace: Namespace::public_namespace(),
namespace: Namespace::public(),
},
))
.into())
@ -118,7 +118,7 @@ impl<'gc> TObject<'gc> for NamespaceObject<'gc> {
activation.context.gc_context,
NamespaceObjectData {
base,
namespace: Namespace::public_namespace(),
namespace: Namespace::public(),
},
))
.into())

6
core/src/display_object/movie_clip.rs
View File

@ -1085,7 +1085,7 @@ impl<'gc> MovieClip<'gc> {
if let Avm2Value::Object(mut p) = self.object2() {
if let Avm2Value::Object(c) = child.object2() {
let name = Avm2QName::new(
Avm2Namespace::public_namespace(),
Avm2Namespace::public(),
AvmString::new(context.gc_context, child.name().to_owned()),
);
let mut activation = Avm2Activation::from_nothing(context.reborrow());
@ -1419,7 +1419,7 @@ impl<'gc> MovieClip<'gc> {
mc_proto
.get_property(
mc_proto,
&Avm2QName::new(Avm2Namespace::public_namespace(), "constructor"),
&Avm2QName::new(Avm2Namespace::public(), "constructor"),
&mut activation,
)
.unwrap()
@ -1432,7 +1432,7 @@ impl<'gc> MovieClip<'gc> {
let proto = constructor
.get_property(
constructor,
&Avm2QName::new(Avm2Namespace::public_namespace(), "prototype"),
&Avm2QName::new(Avm2Namespace::public(), "prototype"),
&mut activation,
)?
.coerce_to_object(&mut activation)?;