avm2: Multiple fixes to frame script running and frame construction #22687
+329
−114
Conversation
This file contains hidden or 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
Use the `Write` only for getting a mutable reference to the movie clip's frame scripts. The rest of the uses of the `Write` can be replaced with calls to `MovieClip` methods- none of these method calls require a `Mutation`.
...instead of an `Object`.
Call `DisplayObjectContainer::remove_child` instead of `display_object_container::remove_child_at`. This should make the method a little faster and allow it to be called without an `Activation`.
In SWFv9, a goto queued by a frame script should construct children on that frame before running the frame script of that frame. This adds back a `construct_frame` that was removed in ruffle-rs#21572, and fully addresses the comment made by Aaron that was removed in that PR. In SWFv10 and above, a frame-script-queued goto should run the "no-op goto" logic when the goto is to the current frame. Also add lots of test coverage.
Lord-McSweeney
added
A-avm2
Collaborator
Author
|
I'm going to split this into multiple PRs |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
All commits except for the last are minor refactors.
The last commit fixes #22677. #21572 removed an extra
construct_framecall inrun_inner_goto_frame. Theconstruct_framewas actually supposed to be run, though only for frame-script-queued gotos. This fully addresses Aaron's comment that that PR removed. If theconstruct_frameisn't run, queued frame scripts can observe not-yet-constructed children.The last commit also includes another minor fix to "no-op" frame-script-queued gotos that allows for the added tests to pass.