From 85221fd9fc132760736b8a3127120b248b281f5f Mon Sep 17 00:00:00 2001
From: Yury Delendik <ydelendik@mozilla.com>
Date: Fri, 3 Oct 2014 11:37:07 -0500
Subject: [PATCH] Refactors looking up of the AVM1 movie children.

---
 src/avm1/interpreter.ts                       |  32 +----------
 src/avm1lib/AVM1MovieClip.ts                  |  50 ++++++++++++++++--
 src/avm1lib/flash.d.ts                        |   2 +
 test/swfs/avm1/lookup/avm1-childlookup.fla    | Bin 0 -> 4900 bytes
 test/swfs/avm1/lookup/avm1-childlookup.swf    | Bin 0 -> 759 bytes
 .../avm1/lookup/avm1-childlookup.swf.trace    |   3 ++
 test/test_manifest.json                       |   7 +++
 7 files changed, 59 insertions(+), 35 deletions(-)
 create mode 100644 test/swfs/avm1/lookup/avm1-childlookup.fla
 create mode 100644 test/swfs/avm1/lookup/avm1-childlookup.swf
 create mode 100644 test/swfs/avm1/lookup/avm1-childlookup.swf.trace

diff --git a/src/avm1/interpreter.ts b/src/avm1/interpreter.ts
index 490317751..c226feffa 100644
--- a/src/avm1/interpreter.ts
+++ b/src/avm1/interpreter.ts
@@ -345,21 +345,13 @@ module Shumway.AVM1 {
     }
     obj = Object(obj);
     // checking if avm2 public property is present
-    var avm2PublicName = Multiname.getPublicQualifiedName(name);
-    if (avm2PublicName in obj) {
+    if (obj.asHasProperty(undefined, name, 0)) {
       return name;
     }
     if (isNumeric(name)) {
       return null;
     }
 
-    if (isAVM1MovieClip(obj)) {
-      var child = (<Shumway.AVM2.AS.avm1lib.AVM1MovieClip> obj).__lookupChild(name);
-      if (child) {
-        return name;
-      }
-    }
-
     // versions 6 and below ignore identifier case
     if (as2GetCurrentSwfVersion() > 6) {
       return null;
@@ -382,9 +374,6 @@ module Shumway.AVM1 {
       return undefined;
     }
     obj = Object(obj);
-    if (!obj.asHasProperty(undefined, name, 0) && isAVM1MovieClip(obj)) {
-      return (<Shumway.AVM2.AS.avm1lib.AVM1MovieClip> obj).__lookupChild(name);
-    }
     return obj.asGetPublicProperty(name);
   }
 
@@ -420,19 +409,6 @@ module Shumway.AVM1 {
 
   function as2Enumerate(obj, fn, thisArg) {
     forEachPublicProperty(obj, fn, thisArg);
-
-    if (!isAVM1MovieClip(obj)) {
-      return;
-    }
-    // if it's a movie listing the children as well
-    var as3MovieClip = obj._nativeAS3Object;
-    for (var i = 0, length = as3MovieClip._children.length; i < length; i++) {
-      var child = as3MovieClip._children[i];
-      var name = child.name;
-      if (!obj.asHasProperty(undefined, name, 0)) {
-        fn.call(thisArg, name);
-      }
-    }
   }
 
   function isAvm2Class(obj): boolean {
@@ -880,12 +856,6 @@ module Shumway.AVM1 {
         return currentTarget;
       }
 
-      // trying movie clip children (if object is a MovieClip)
-      var mc = isAVM1MovieClip(currentTarget) &&
-               currentTarget.__lookupChild(variableName);
-      if (mc) {
-        return mc;
-      }
       return undefined;
     }
     function avm1SetVariable(ectx: ExecutionContext, variableName: string, value) {
diff --git a/src/avm1lib/AVM1MovieClip.ts b/src/avm1lib/AVM1MovieClip.ts
index 136f33dda..f02625a1d 100644
--- a/src/avm1lib/AVM1MovieClip.ts
+++ b/src/avm1lib/AVM1MovieClip.ts
@@ -21,10 +21,21 @@ module Shumway.AVM2.AS.avm1lib {
 
   import asCoerceString = Shumway.AVM2.Runtime.asCoerceString;
   import construct = Shumway.AVM2.Runtime.construct;
+  import Multiname = Shumway.AVM2.ABC.Multiname;
+  import Namespace = Shumway.AVM2.ABC.Namespace;
+  import resolveMultinameProperty = Shumway.AVM2.Runtime.resolveMultinameProperty;
 
   import AVM1Context = Shumway.AVM1.AVM1Context;
   import Bitmap = flash.display.Bitmap;
 
+  var _asGetProperty = Object.prototype.asGetProperty;
+  var _asSetProperty = Object.prototype.asSetProperty;
+  var _asCallProperty = Object.prototype.asCallProperty;
+  var _asHasProperty = Object.prototype.asHasProperty;
+  var _asHasOwnProperty = Object.prototype.asHasOwnProperty;
+  var _asHasTraitProperty = Object.prototype.asHasTraitProperty;
+  var _asDeleteProperty = Object.prototype.asDeleteProperty;
+  var _asGetEnumerableKeys = Object.prototype.asGetEnumerableKeys;
 
   export class AVM1MovieClip extends ASNative {
 
@@ -78,6 +89,41 @@ module Shumway.AVM2.AS.avm1lib {
       this._context = value;
     }
 
+    public asGetProperty(namespaces: Namespace [], name: any, flags: number) {
+      if (_asHasProperty.call(this, namespaces, name, flags)) {
+        return _asGetProperty.call(this, namespaces, name, flags);
+      }
+      var resolved = resolveMultinameProperty(namespaces, name, flags);
+      if (Multiname.isPublicQualifiedName(resolved)) {
+        return this.__lookupChild(Multiname.getNameFromPublicQualifiedName(resolved));
+      }
+      return undefined;
+    }
+
+    public asHasProperty(namespaces: Namespace [], name: any, flags: number) {
+      if (_asHasProperty.call(this, namespaces, name, flags)) {
+        return true;
+      }
+      var resolved = resolveMultinameProperty(namespaces, name, flags);
+      if (Multiname.isPublicQualifiedName(resolved)) {
+        return !!this.__lookupChild(Multiname.getNameFromPublicQualifiedName(resolved));
+      }
+      return false;
+    }
+
+    public asGetEnumerableKeys() {
+      var keys = _asGetEnumerableKeys.call(this);
+      // if it's a movie listing the children as well
+      var as3MovieClip = this._nativeAS3Object;
+      for (var i = 0, length = as3MovieClip._children.length; i < length; i++) {
+        var child = as3MovieClip._children[i];
+        var name = child.name;
+        if (!_asHasProperty.call(this, undefined, name, 0)) {
+          keys.push(Multiname.getPublicQualifiedName(name));
+        }
+      }
+      return keys;
+    }
 
     static _initFromConstructor(ctor, nativeMovieClip: flash.display.MovieClip): flash.display.MovieClip {
       var mc = Object.create(ctor.asGetPublicProperty('prototype'));
@@ -195,10 +241,6 @@ module Shumway.AVM2.AS.avm1lib {
         return null;
       }
       var as2mc = getAVM1Object(mc);
-      var name:string = mc.name;
-      if (name && this.asGetPublicProperty(name) === undefined) {
-        this.asSetPublicProperty(name, as2mc);
-      }
       return as2mc;
     }
 
diff --git a/src/avm1lib/flash.d.ts b/src/avm1lib/flash.d.ts
index 1326c464a..2d4b9c990 100644
--- a/src/avm1lib/flash.d.ts
+++ b/src/avm1lib/flash.d.ts
@@ -22,8 +22,10 @@ declare module Shumway.AVM2.AS.flash {
       loaderInfo: {
         _avm1Context: AVM1.AVM1Context
       };
+      name: string;
       _mouseOver: boolean;
       _mouseDown: boolean;
+      _children: DisplayObject [];
     }
     class MovieClip extends DisplayObject {
       _as2SymbolClass;
diff --git a/test/swfs/avm1/lookup/avm1-childlookup.fla b/test/swfs/avm1/lookup/avm1-childlookup.fla
new file mode 100644
index 0000000000000000000000000000000000000000..0d60e48955d9c7c7ce1f9ea0213895fddb827920
GIT binary patch
literal 4900
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

literal 0
HcmV?d00001

diff --git a/test/swfs/avm1/lookup/avm1-childlookup.swf b/test/swfs/avm1/lookup/avm1-childlookup.swf
new file mode 100644
index 0000000000000000000000000000000000000000..95d0058db604a0c87ecd2e5015a580d3b7aa6277
GIT binary patch
literal 759
zcmV<T0to#>S5py_1^@tfoTZgdQ`$fn#$Uic*qOFy4|O^oGC1SdL)avMNCv0~+VOxo
z%Aq%BNfymC$)?#w@MLFt=_l~gOHV!b8}!(Ilb(9(tp~aZK~Sl+mYKl2Z=UCu&9h6=
zgXtrH#~%R}V^E(@0l@i_)HFcJH{1F_eOu}|w##%eDyL64_jH81-EO9v%~1assl{Ru
zDH_r=Stw+7=5pMVUACOANFkw4nBiL<x2P)xW89)0UQVYYY|rs7u`bJCleS34pbqL`
z52+ai1soyLYd*o8`b|phN;ObP+cst=(!NjIgfW4~wp2S@lVqvYv20VyXA32C-8sf0
zb#YWQMa{{oA}iUZQq;3KUDaeIuPe%!cc2_t8-!yMb9~*bs=B7?YIfXwMH|_vX|>Pp
zWF9G{61tY;-Lf@}%V@ohZ-?t;8i?4$AueYkUNwx@H1sz09n34(^K8q&0TA_Mc0!HU
zU3^O9b`W(5jfD4|lDM-*<Msu295hrjen8r{t6B5RBj|uI+VKq{<jc{9X*Bd5mvQVG
zWT##cjf`cPdVW2Zs}>5HQq65{<y5t(*0<KRd^NvTQ#T8m8fJghI;7R9(Ft;kXy!lA
z#;ilyo^KsnV#`jV=I%zFfViA1@vT#0Zu`^;SHZ(RBSBK-^f0O*rZ8XKnh?`pr*OkM
zq?z}*p&QmAjs8zee?&-^3p2`T@|H%?L$D%2E#B|<UnIVZ2ju&Gm;)QPh^?+_&!wmY
zPI?@Ud`hG5%%Cp;GpI-4%BV>g2S#|)a)|hcz=ua;eSl@Sn1UoEV@nrtNXB<xuDnaZ
z_F;`W4t7obO~(?d;8Y?M#C8LDJek-Fey2v=$Q+KA2Ab(mGc$(1n1$H~;-bmfrJ#%l
zWwQJf`U?+58H1_V%n`#b3tkNiiLkYCK9?0m9J;^eKAnGFeDy<*!8g%?J`6sq;tk?S
p*tU+{a@r<sp01RTSAj1x^WyAEOn9Gt{h4|jWw#-kzX9hl@?;0qcPan?

literal 0
HcmV?d00001

diff --git a/test/swfs/avm1/lookup/avm1-childlookup.swf.trace b/test/swfs/avm1/lookup/avm1-childlookup.swf.trace
new file mode 100644
index 000000000..60c478e78
--- /dev/null
+++ b/test/swfs/avm1/lookup/avm1-childlookup.swf.trace
@@ -0,0 +1,3 @@
+_root.label1 _root
+label1 scope
+label1(2) scope
diff --git a/test/test_manifest.json b/test/test_manifest.json
index 378e17d2f..21857cffe 100644
--- a/test/test_manifest.json
+++ b/test/test_manifest.json
@@ -258,6 +258,13 @@
       ],
       "type": "stas"
     },
+    {  "id": "avm1basic",
+      "stas": "swfs/trace.stas",
+      "filenames": [
+        "swfs/avm1/lookup/avm1-childlookup.swf"
+      ],
+      "type": "stas"
+    },
     {  "id": "flash_net_URLRequest trace",
       "stas": "swfs/trace.stas",
       "filenames": [