avm1: Remove incorrect properties from display object prototypes (fix #768) #6921
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…rs#768) Remove `_root`, `_parent` and `_global` from `MovieClip.prototype`. Instead, these are "magic" properties similar to `_x` and `_y`. Add `StageObject::resolve_path_property` to handle these, alongside the `_levelN` property. Fixes ruffle-rs#768.
* Avoid an extraneous check to `ScriptObject::has_own_property`. * Avoid magic property branches if property name does not start with `_`.
`MovieClip` and others do not have a `toString`; instead, stage objects are special cased to return their path when coerced to string.
This module is now mostly empty, so move the items up to `globals`. `getDepth` was the only shared method, so declare this property inline in each display object type. `Video` was also incorrectly declaring `getDepth`.
relrelb
approved these changes
May 9, 2022
relrelb
reviewed
May 9, 2022
| } | ||
|
|
||
| // 2) Path properties such as `_root`, `_parent`, `_levelN` (obeys case sensitivity) | ||
| let magic_property = name.starts_with(b'_'); |
There was a problem hiding this comment.
I guess this check if for performance only, since it doesn't affect the lookup logic at all.
There was a problem hiding this comment.
Yes, seemed a little wasteful to do extra hashes and string compares if we can tell quickly that it isn't a _ property. Haven't measured if it makes a noticeable difference though.
relrelb
reviewed
May 9, 2022
| "[type Function]".into() | ||
| } else { | ||
| "[type Object]".into() | ||
| if let Some(object) = object.as_display_object() { |
There was a problem hiding this comment.
That's another argument for #6548 (comment).
|
LGTM, I haven't found any regression in my testings. 👍 Checking the other related issues:
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
_root,_global, and_parentfromMovieClip.prototypeand others.StageObject::resolve_path_property.StageObject::get_local_storeda bit.toStringfromMovieClip.prototypeand others. StageObjects instead naturally use their path when coerced to string.avm1::globals::display_objectis mostly empty, so remove it. Move the items up one level intoglobals.Video.getDepthdeclaration.Fixes #768.