From 38b9a543a3c38092f9b0ef02932c09944b7d5cd4 Mon Sep 17 00:00:00 2001 From: Gecko Backout Date: Wed, 8 Nov 2017 01:21:17 +0000 Subject: [PATCH] Backed out changeset dd834d38eaab for Windows debug build bustage Backs out https://github.com/servo/servo/pull/19133 --- .../script/dom/bindings/codegen/Configuration.py | 10 ++-------- components/script/dom/testbinding.rs | 1 - components/script/dom/webidls/TestBinding.webidl | 2 -- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/components/script/dom/bindings/codegen/Configuration.py b/components/script/dom/bindings/codegen/Configuration.py index 49da308047d..56141e52b09 100644 --- a/components/script/dom/bindings/codegen/Configuration.py +++ b/components/script/dom/bindings/codegen/Configuration.py @@ -4,7 +4,7 @@ import os -from WebIDL import IDLExternalInterface, IDLSequenceType, IDLWrapperType, WebIDLError +from WebIDL import IDLExternalInterface, IDLWrapperType, WebIDLError class Configuration: @@ -457,7 +457,7 @@ def getTypesFromDictionary(dictionary): 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 @@ -473,12 +473,6 @@ def getTypesFromCallback(callback): 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 diff --git a/components/script/dom/testbinding.rs b/components/script/dom/testbinding.rs index 9a8f9633072..ce8bce56878 100644 --- a/components/script/dom/testbinding.rs +++ b/components/script/dom/testbinding.rs @@ -390,7 +390,6 @@ impl TestBindingMethods for TestBinding { octetValue: None, requiredValue: true, seqDict: None, - elementSequence: None, shortValue: None, stringValue: None, type_: Some(DOMString::from("success")), diff --git a/components/script/dom/webidls/TestBinding.webidl b/components/script/dom/webidls/TestBinding.webidl index 4fc1ba4d414..3e6be1b4edd 100644 --- a/components/script/dom/webidls/TestBinding.webidl +++ b/components/script/dom/webidls/TestBinding.webidl @@ -34,8 +34,6 @@ dictionary TestDictionary { object objectValue; TestDictionaryDefaults dict; sequence seqDict; - // Testing codegen to import Element correctly, ensure no other code references Element directly - sequence elementSequence; // Reserved rust keyword DOMString type; // These are used to test bidirectional conversion