From 89d4fac36edb094f09db2c89afb4ca48b9c81522 Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Sat, 26 Apr 2014 18:32:45 +0200
Subject: [PATCH] Use handleOptional for the enumeration conversion.

---
 src/components/script/dom/bindings/codegen/CodegenRust.py | 2 +-
 src/components/script/dom/testbinding.rs                  | 2 +-
 src/components/script/dom/webidls/TestBinding.webidl      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py
index 5151179f89a..40b5d9c56f7 100644
--- a/src/components/script/dom/bindings/codegen/CodegenRust.py
+++ b/src/components/script/dom/bindings/codegen/CodegenRust.py
@@ -722,7 +722,7 @@ def getJSToNativeConversionTemplate(type, descriptorProvider, failureCode=None,
                                       (enum,
                                        getEnumValueName(defaultValue.value))))
 
-        return (template, CGGeneric(enum), isOptional, None)
+        return handleOptional(template, CGGeneric(enum), isOptional)
 
     if type.isCallback():
         assert not isEnforceRange and not isClamp
diff --git a/src/components/script/dom/testbinding.rs b/src/components/script/dom/testbinding.rs
index 44a6b3e3d02..a441cbddcd2 100644
--- a/src/components/script/dom/testbinding.rs
+++ b/src/components/script/dom/testbinding.rs
@@ -127,7 +127,7 @@ impl TestBinding {
     pub fn PassOptionalFloat(&self, _: Option<f32>) {}
     pub fn PassOptionalDouble(&self, _: Option<f64>) {}
     pub fn PassOptionalString(&self, _: Option<DOMString>) {}
-    // pub fn PassOptionalEnum(&self, _: Option<TestEnum>) {}
+    pub fn PassOptionalEnum(&self, _: Option<TestEnum>) {}
     pub fn PassOptionalInterface(&self, _: Option<JS<Blob>>) {}
     pub fn PassOptionalUnion(&self, _: Option<HTMLElementOrLong>) {}
     pub fn PassOptionalAny(&self, _: *JSContext, _: Option<JSVal>) {}
diff --git a/src/components/script/dom/webidls/TestBinding.webidl b/src/components/script/dom/webidls/TestBinding.webidl
index 70e7fd5dc8f..e2a236e9199 100644
--- a/src/components/script/dom/webidls/TestBinding.webidl
+++ b/src/components/script/dom/webidls/TestBinding.webidl
@@ -132,7 +132,7 @@ interface TestBinding {
   void passOptionalFloat(optional float arg);
   void passOptionalDouble(optional double arg);
   void passOptionalString(optional DOMString arg);
-  // void passOptionalEnum(optional TestEnum arg);
+  void passOptionalEnum(optional TestEnum arg);
   void passOptionalInterface(optional Blob arg);
   void passOptionalUnion(optional (HTMLElement or long) arg);
   void passOptionalAny(optional any arg);