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

avm1: Remove is_function from Activation, it's no longer needed

This commit is contained in:
Nathan Adams 2020-06-30 19:40:21 +02:00
parent ec4affcf10
commit 3e9c380ba1
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/src/avm1/activation.rs
View File

@ -77,10 +77,6 @@ pub struct Activation<'gc> {
/// The arguments this function was called by.
arguments: Option<Object<'gc>>,
/// Indicates if this activation object represents a function or embedded
/// block (e.g. ActionWith).
is_function: bool,
/// Local registers, if any.
///
/// None indicates a function executing out of the global register set.
@ -141,7 +137,6 @@ impl<'gc> Activation<'gc> {
target_clip: Some(base_clip),
this,
arguments,
is_function: false,
local_registers: None,
is_executing: false,
}
@ -166,7 +161,6 @@ impl<'gc> Activation<'gc> {
target_clip: Some(base_clip),
this,
arguments,
is_function: true,
local_registers: None,
is_executing: false,
}
@ -202,7 +196,6 @@ impl<'gc> Activation<'gc> {
target_clip: Some(base_clip),
this: globals,
arguments: None,
is_function: false,
local_registers: None,
is_executing: false,
}
@ -220,7 +213,6 @@ impl<'gc> Activation<'gc> {
target_clip: self.target_clip,
this: self.this,
arguments: self.arguments,
is_function: false,
local_registers: self.local_registers,
is_executing: false,
}
@ -297,11 +289,6 @@ impl<'gc> Activation<'gc> {
self.target_clip = value;
}
/// Indicates whether or not the end of this scope should return a value.
pub fn can_return(&self) -> bool {
self.is_function
}
/// Resolve a particular named local variable within this activation.
///
/// Because scopes are object chains, the same rules for `Object::get`