Put globalObject and interfaceNmae into scope for replacement code

Now the replacement code returned by the processCEReactions and processHTMLConstructor handlers can reference the globalObject and interfaceName variables, as is documented in the README. This was meant to be introduced in fda810e, but the previous merging of 7c8037f prevented that from working properly.

Author: ExE-Boss

lib/constructs/interface.js

@@ -90,6 +90,7 @@ class Interface {
     this.namedSetter = null;
     this.namedDeleter = null;
     this.stringifier = null;
+    this.needsPerGlobalProxyHandler = false;
 
     this.iterable = null;
     this._analyzed = false;
@@ -229,11 +230,17 @@ class Interface {
               throw new Error(msg + "duplicated indexed setter");
             }
             this.indexedSetter = member;
+            if (utils.hasCEReactions(member)) {
+              this.needsPerGlobalProxyHandler = true;
+            }
           } else if (isNamed(member)) {
             if (this.namedSetter) {
               throw new Error(msg + "duplicated named setter");
             }
             this.namedSetter = member;
+            if (utils.hasCEReactions(member)) {
+              this.needsPerGlobalProxyHandler = true;
+            }
           } else {
             throw new Error(msg + "setter is neither indexed nor named");
           }
@@ -253,6 +260,9 @@ class Interface {
               throw new Error(msg + "duplicated named deleter");
             }
             this.namedDeleter = member;
+            if (utils.hasCEReactions(member)) {
+              this.needsPerGlobalProxyHandler = true;
+            }
           } else {
             throw new Error(msg + "deleter is not named");
           }
@@ -683,7 +693,6 @@ class Interface {
         ${conv.body}
       `;
 
-
       let invocation;
       if (!this.namedSetter.name) {
         invocation = `
@@ -709,9 +718,21 @@ class Interface {
       return prolog + invocation;
     };
 
-    this.str += `
-      const proxyHandler = {
-    `;
+    let sep = "";
+    if (this.needsPerGlobalProxyHandler) {
+      this.str += `
+        const proxyHandlerCache = new WeakMap();
+        class ProxyHandler {
+          constructor(globalObject) {
+            this._globalObject = globalObject;
+          }
+      `;
+    } else {
+      this.str += `
+        const proxyHandler = {
+      `;
+      sep = ",";
+    }
 
     // [[Get]] (necessary because of proxy semantics)
     this.str += `
@@ -735,7 +756,7 @@ class Interface {
             return undefined;
           }
           return Reflect.apply(getter, receiver, []);
-        },
+        }${sep}
     `;
 
     // [[HasProperty]] (necessary because of proxy semantics)
@@ -753,7 +774,7 @@ class Interface {
             return Reflect.has(parent, P);
           }
           return false;
-        },
+        }${sep}
     `;
 
     // [[OwnPropertyKeys]]
@@ -784,7 +805,7 @@ class Interface {
             keys.add(key);
           }
           return [...keys];
-        },
+        }${sep}
     `;
 
     // [[GetOwnProperty]]
@@ -858,7 +879,7 @@ class Interface {
     }
     this.str += `
           return Reflect.getOwnPropertyDescriptor(target, P);
-        },
+        }${sep}
     `;
 
     // [[Set]]
@@ -870,6 +891,12 @@ class Interface {
           if (target === receiver) {
     `;
 
+    if (this.needsPerGlobalProxyHandler) {
+      this.str += `
+          const globalObject = this._globalObject;
+      `;
+    }
+
     if (this.supportsIndexedProperties) {
       if (hasIndexedSetter) {
         this.str += `
@@ -966,7 +993,7 @@ class Interface {
             valueDesc = { writable: true, enumerable: true, configurable: true, value: V };
           }
           return Reflect.defineProperty(receiver, P, valueDesc);
-        },
+        }${sep}
     `;
 
     // [[DefineOwnProperty]]
@@ -976,6 +1003,13 @@ class Interface {
             return Reflect.defineProperty(target, P, desc);
           }
     `;
+
+    if (this.needsPerGlobalProxyHandler) {
+      this.str += `
+          const globalObject = this._globalObject;
+      `;
+    }
+
     if (this.supportsIndexedProperties) {
       this.str += `
           if (utils.isArrayIndexPropName(P)) {
@@ -1054,7 +1088,7 @@ class Interface {
       `;
     }
     this.str += `
-        },
+        }${sep}
     `;
 
     // [[Delete]]
@@ -1064,6 +1098,13 @@ class Interface {
             return Reflect.deleteProperty(target, P);
           }
     `;
+
+    if (this.needsPerGlobalProxyHandler) {
+      this.str += `
+          const globalObject = this._globalObject;
+      `;
+    }
+
     if (this.supportsIndexedProperties) {
       this.str += `
           if (utils.isArrayIndexPropName(P)) {
@@ -1109,7 +1150,7 @@ class Interface {
     }
     this.str += `
           return Reflect.deleteProperty(target, P);
-        },
+        }${sep}
     `;
 
     // [[PreventExtensions]]
@@ -1168,9 +1209,22 @@ class Interface {
     `;
 
     if (this.isLegacyPlatformObj) {
-      this.str += `
+      if (this.needsPerGlobalProxyHandler) {
+        this.str += `
+        {
+          let proxyHandler = proxyHandlerCache.get(globalObject);
+          if (proxyHandler === undefined) {
+            proxyHandler = new ProxyHandler(globalObject);
+            proxyHandlerCache.set(globalObject, proxyHandler);
+          }
+          obj = new Proxy(obj, proxyHandler);
+        }
+        `;
+      } else {
+        this.str += `
         obj = new Proxy(obj, proxyHandler);
-      `;
+        `;
+      }
     }
 
     this.str += `
@@ -1451,7 +1505,6 @@ class Interface {
 
     this.str += `
       exports.install = function install(globalObject) {
-        const interfaceName = "${name}";
     `;
 
     if (idl.inheritance) {
@@ -1486,6 +1539,9 @@ class Interface {
   }
 
   generate() {
+    this.str += `
+      const interfaceName = "${this.name}";
+    `;
     this.generateIterator();
 
     this.generateExport();