Bug 910220 part 3. Always generate a defineProperty hook for DOM proxies. r=peterv

dom/bindings/Codegen.py

@@ -7376,9 +7376,6 @@ class CGDOMJSProxyHandler_defineProperty(ClassMethod):
                     "  return true;\n" +
                     "}\n") % (self.descriptor.nativeType)
         elif self.descriptor.supportsIndexedProperties():
-            # XXXbz Once this is fixed to only throw in strict mode, update the
-            # code that decides whether to do a
-            # CGDOMJSProxyHandler_defineProperty at all.
             set += ("if (IsArrayIndex(GetArrayIndexFromId(cx, id))) {\n"
                     "  return js::IsInNonStrictPropertySet(cx) || ThrowErrorMessage(cx, MSG_NO_INDEXED_SETTER, \"%s\");\n"
                     "}\n" % self.descriptor.name)
@@ -7408,11 +7405,6 @@ class CGDOMJSProxyHandler_defineProperty(ClassMethod):
                     "return true;\n")
         else:
             if self.descriptor.supportsNamedProperties():
-                # XXXbz Once this is fixed to only throw in strict mode, update
-                # the code that decides whether to do a
-                # CGDOMJSProxyHandler_defineProperty at all.  If we support
-                # indexed properties, we won't get down here for indices, so we
-                # can just do our setter unconditionally here.
                 set += (CGProxyNamedPresenceChecker(self.descriptor).define() + "\n" +
                         "if (found) {\n"
                         "  return js::IsInNonStrictPropertySet(cx) || ThrowErrorMessage(cx, MSG_NO_NAMED_SETTER, \"%s\");\n"
@@ -7799,26 +7791,22 @@ return &instance;"""
 
 class CGDOMJSProxyHandler(CGClass):
     def __init__(self, descriptor):
+        assert (descriptor.supportsIndexedProperties() or
+                descriptor.supportsNamedProperties())
         constructors = [CGDOMJSProxyHandler_CGDOMJSProxyHandler()]
-        methods = [CGDOMJSProxyHandler_getOwnPropertyDescriptor(descriptor)]
-        # XXXbz This should really just test supportsIndexedProperties() and
-        # supportsNamedProperties(), but that would make us throw in all cases
-        # because we don't know whether we're in strict mode.
-        if (descriptor.operations['IndexedSetter'] or
-            descriptor.operations['NamedSetter'] or
-            UseHolderForUnforgeable(descriptor)):
-            methods.extend([CGDOMJSProxyHandler_defineProperty(descriptor),
-                            ClassUsingDeclaration("mozilla::dom::DOMProxyHandler",
-                                                  "defineProperty")])
-        methods.extend([CGDOMJSProxyHandler_getOwnPropertyNames(descriptor),
-                        CGDOMJSProxyHandler_hasOwn(descriptor),
-                        CGDOMJSProxyHandler_get(descriptor),
-                        CGDOMJSProxyHandler_className(descriptor),
-                        CGDOMJSProxyHandler_finalizeInBackground(descriptor),
-                        CGDOMJSProxyHandler_finalize(descriptor),
-                        CGDOMJSProxyHandler_getElementIfPresent(descriptor),
-                        CGDOMJSProxyHandler_getInstance(),
-                        CGDOMJSProxyHandler_delete(descriptor)])
+        methods = [CGDOMJSProxyHandler_getOwnPropertyDescriptor(descriptor),
+                   CGDOMJSProxyHandler_defineProperty(descriptor),
+                   ClassUsingDeclaration("mozilla::dom::DOMProxyHandler",
+                                         "defineProperty"),
+                   CGDOMJSProxyHandler_getOwnPropertyNames(descriptor),
+                   CGDOMJSProxyHandler_hasOwn(descriptor),
+                   CGDOMJSProxyHandler_get(descriptor),
+                   CGDOMJSProxyHandler_className(descriptor),
+                   CGDOMJSProxyHandler_finalizeInBackground(descriptor),
+                   CGDOMJSProxyHandler_finalize(descriptor),
+                   CGDOMJSProxyHandler_getElementIfPresent(descriptor),
+                   CGDOMJSProxyHandler_getInstance(),
+                   CGDOMJSProxyHandler_delete(descriptor)]
         CGClass.__init__(self, 'DOMProxyHandler',
                          bases=[ClassBase('mozilla::dom::DOMProxyHandler')],
                          constructors=constructors,

dom/bindings/test/test_defineProperty.html

@@ -84,10 +84,74 @@ function namedSetNonStrict(obj) {
   ok(threw,
      "Should throw in non-strict mode when defining named property on " + obj);
 }
-for (var obj of [ document ]) {
+for (var obj of [ document, document.forms ]) {
   namedSetStrict(obj);
   namedSetNonStrict(obj);
 }
+
+function indexedSetStrict(obj) {
+  "use strict";
+  var threw;
+  try {
+    obj[0] = 5;
+    threw = false;
+  } catch (e) {
+    threw = true;
+  }
+  ok(threw,
+     "Should throw in strict mode when setting indexed property on " + obj);
+
+  try {
+    obj[1000] = 5;
+    threw = false;
+  } catch (e) {
+    threw = true;
+  }
+  ok(threw,
+     "Should throw in strict mode when setting out of bounds indexed property on " + obj);
+
+  try {
+    Object.defineProperty(obj, "0", { value: 17 });
+    threw = false;
+  } catch (e) {
+    threw = true;
+  }
+  ok(threw,
+     "Should throw in strict mode when defining indexed property on " + obj);
+}
+function indexedSetNonStrict(obj) {
+  var threw;
+  try {
+    obj[0] = 5;
+    threw = false;
+  } catch (e) {
+    threw = true;
+  }
+  ok(!threw,
+     "Should not throw in non-strict mode when setting indexed property on " + obj);
+
+  try {
+    obj[1000] = 5;
+    threw = false;
+  } catch (e) {
+    threw = true;
+  }
+  ok(!threw,
+     "Should not throw in non-strict mode when setting out of bounds indexed property on " + obj);
+
+  try {
+    Object.defineProperty(obj, "0", { value: 17 });
+    threw = false;
+  } catch (e) {
+    threw = true;
+  }
+  ok(threw,
+     "Should throw in non-strict mode when defining indexed property on " + obj);
+}
+for (var obj of [ document.forms, document.childNodes ]) {
+  indexedSetStrict(obj);
+  indexedSetNonStrict(obj);
+}
 </script>
 </body>
 </html>

dom/imptests/failures/webapps/DOMCore/tests/submissions/Ms2ger/test_Document-getElementsByTagName.html.json

@@ -1,5 +1,4 @@
 {
-  "Shouldn't be able to set unsigned properties on a HTMLCollection (strict mode)": true,
   "Document.getElementsByTagName 1": true,
   "Document.getElementsByTagName 2": true
 }

dom/webidl/TreeColumns.webidl

@@ -44,7 +44,7 @@ interface TreeColumns {
   /**
    * Parametric column getters.
    */
-  getter MozTreeColumn? getNamedColumn(DOMString id);
+  getter MozTreeColumn? getNamedColumn(DOMString name);
   getter MozTreeColumn? getColumnAt(unsigned long index);
 
   /**