Backed out changeset dd834d38eaab for Windows debug build bustage
authorGregory Szorc <gps@mozilla.com>
Tue, 07 Nov 2017 17:19:22 -0800
changeset 443921 b72eaedcdfaa1154fb33e1638e4bd090375789ad
parent 443920 a17c2be449037a40006e9d9041cb20fca4317fcc
child 443922 1528ff0ed838f7079c3572e2dadc83dda6acbf8d
push id1618
push userCallek@gmail.com
push dateThu, 11 Jan 2018 17:45:48 +0000
treeherdermozilla-release@882ca853e05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone58.0a1
backs outdd834d38eaabe22f056d3eb37304f43f37edeb35
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset dd834d38eaab for Windows debug build bustage
servo/components/script/dom/bindings/codegen/Configuration.py
servo/components/script/dom/testbinding.rs
servo/components/script/dom/webidls/TestBinding.webidl
--- a/servo/components/script/dom/bindings/codegen/Configuration.py
+++ b/servo/components/script/dom/bindings/codegen/Configuration.py
@@ -1,15 +1,15 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import os
 
-from WebIDL import IDLExternalInterface, IDLSequenceType, IDLWrapperType, WebIDLError
+from WebIDL import IDLExternalInterface, IDLWrapperType, WebIDLError
 
 
 class Configuration:
     """
     Represents global configuration state based on IDL parse data and
     the configuration file.
     """
     def __init__(self, filename, parseData):
@@ -452,35 +452,29 @@ def getTypesFromDictionary(dictionary):
     """
     Get all member types for this dictionary
     """
     if isinstance(dictionary, IDLWrapperType):
         dictionary = dictionary.inner
     types = []
     curDict = dictionary
     while curDict:
-        types.extend([getUnwrappedType(m.type) for m in curDict.members])
+        types.extend([m.type for m in curDict.members])
         curDict = curDict.parent
     return types
 
 
 def getTypesFromCallback(callback):
     """
     Get the types this callback depends on: its return type and the
     types of its arguments.
     """
     sig = callback.signatures()[0]
     types = [sig[0]]  # Return type
     types.extend(arg.type for arg in sig[1])  # Arguments
     return types
 
 
-def getUnwrappedType(type):
-    if isinstance(type, IDLSequenceType):
-        return type.inner
-    return type
-
-
 def iteratorNativeType(descriptor, infer=False):
     assert descriptor.interface.isIterable()
     iterableDecl = descriptor.interface.maplikeOrSetlikeOrIterable
     assert iterableDecl.isPairIterator()
     return "IterableIterator%s" % ("" if infer else '<%s>' % descriptor.interface.identifier.name)
--- a/servo/components/script/dom/testbinding.rs
+++ b/servo/components/script/dom/testbinding.rs
@@ -385,17 +385,16 @@ impl TestBindingMethods for TestBinding 
             floatValue: None,
             interfaceValue: None,
             longLongValue: None,
             longValue: None,
             objectValue: None,
             octetValue: None,
             requiredValue: true,
             seqDict: None,
-            elementSequence: None,
             shortValue: None,
             stringValue: None,
             type_: Some(DOMString::from("success")),
             unrestrictedDoubleValue: None,
             unrestrictedFloatValue: None,
             unsignedLongLongValue: None,
             unsignedLongValue: None,
             unsignedShortValue: None,
--- a/servo/components/script/dom/webidls/TestBinding.webidl
+++ b/servo/components/script/dom/webidls/TestBinding.webidl
@@ -29,18 +29,16 @@ dictionary TestDictionary {
   DOMString stringValue;
   USVString usvstringValue;
   TestEnum enumValue;
   Blob interfaceValue;
   any anyValue;
   object objectValue;
   TestDictionaryDefaults dict;
   sequence<TestDictionaryDefaults> seqDict;
-  // Testing codegen to import Element correctly, ensure no other code references Element directly
-  sequence<Element> elementSequence;
   // Reserved rust keyword
   DOMString type;
   // These are used to test bidirectional conversion
   // and differentiation of non-required and nullable types
   // in dictionaries.
   DOMString? nonRequiredNullable;
   DOMString? nonRequiredNullable2;
 };