Changeset 206090 in webkit

Timestamp:

Sep 19, 2016 2:00:38 AM (8 years ago)

Author:

nael.ouedraogo@crf.canon.fr

Message:

JSDOMBindings' toArguments() should return a more descriptive object
​https://bugs.webkit.org/show_bug.cgi?id=161793

Reviewed by Youenn Fablet.

Replace std::pair with new VariadicHelperResult class with more
readable members names.

No additional tests required.

• bindings/js/JSDOMBinding.h:

(WebCore::VariadicHelper::Result::Result):

• bindings/scripts/CodeGeneratorJS.pm:

(GenerateParametersCheck):

• bindings/scripts/test/JS/JSTestObj.cpp:

(WebCore::jsTestObjPrototypeFunctionOverloadedMethod12):
(WebCore::jsTestObjPrototypeFunctionVariadicStringMethod):
(WebCore::jsTestObjPrototypeFunctionVariadicDoubleMethod):
(WebCore::jsTestObjPrototypeFunctionVariadicNodeMethod):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/JSDOMBinding.h (modified) (1 diff)
• bindings/scripts/CodeGeneratorJS.pm (modified) (1 diff)
• bindings/scripts/test/JS/JSTestObj.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-09-19  Nael Ouedraogo  <nael.ouedraogo@crf.canon.fr>
+
+        JSDOMBindings' toArguments() should return a more descriptive object
+        https://bugs.webkit.org/show_bug.cgi?id=161793
+
+        Reviewed by Youenn Fablet.
+
+        Replace std::pair with new VariadicHelperResult class with more
+        readable members names.
+
+        No additional tests required.
+
+        * bindings/js/JSDOMBinding.h:
+        (WebCore::VariadicHelper::Result::Result):
+        * bindings/scripts/CodeGeneratorJS.pm:
+        (GenerateParametersCheck):
+        * bindings/scripts/test/JS/JSTestObj.cpp:
+        (WebCore::jsTestObjPrototypeFunctionOverloadedMethod12):
+        (WebCore::jsTestObjPrototypeFunctionVariadicStringMethod):
+        (WebCore::jsTestObjPrototypeFunctionVariadicDoubleMethod):
+        (WebCore::jsTestObjPrototypeFunctionVariadicNodeMethod):
+
 2016-09-18  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/bindings/js/JSDOMBinding.h

@@ -357 +357 @@
     using Item = typename VariadicHelperBase<JSClass, DOMClass>::Item;
     using Container = Vector<Item>;
-    using Result = typename std::pair<size_t, Optional<Container>>;
+
+    struct Result {
+        Result(size_t argumentIndex, Optional<Container>&& arguments)
+            : argumentIndex(argumentIndex)
+            , arguments(WTFMove(arguments))
+        {
+        }
+        size_t argumentIndex;
+        Optional<Container> arguments;
+    };
 };
 

trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm

@@ -4011 +4011 @@
             }
             else {
-                push(@$outputArray, "    if (!$name.second)\n");
-                push(@$outputArray, "        return throwArgumentTypeError(*state, throwScope, $name.first, \"$name\", \"$visibleInterfaceName\", $quotedFunctionName, \"$type\");\n");
-            }
-            $value = "WTFMove(*$name.second)";
+                push(@$outputArray, "    if (!$name.arguments)\n");
+                push(@$outputArray, "        return throwArgumentTypeError(*state, throwScope, $name.argumentIndex, \"$name\", \"$visibleInterfaceName\", $quotedFunctionName, \"$type\");\n");
+            }
+            $value = "WTFMove($name.arguments.value())";
 
         } elsif ($codeGenerator->IsEnumType($type)) {

trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp

@@ -6552 +6552 @@
     auto& impl = castedThis->wrapped();
     auto blobArgs = toArguments<VariadicHelper<JSBlob, Blob>>(*state, 0);
-    if (!blobArgs.second)
-        return throwArgumentTypeError(*state, throwScope, blobArgs.first, "blobArgs", "TestObject", "overloadedMethod", "Blob");
-    impl.overloadedMethod(WTFMove(*blobArgs.second));
+    if (!blobArgs.arguments)
+        return throwArgumentTypeError(*state, throwScope, blobArgs.argumentIndex, "blobArgs", "TestObject", "overloadedMethod", "Blob");
+    impl.overloadedMethod(WTFMove(blobArgs.arguments.value()));
     return JSValue::encode(jsUndefined());
 }
@@ -7087 +7087 @@
     if (UNLIKELY(throwScope.exception()))
         return JSValue::encode(jsUndefined());
-    impl.variadicStringMethod(WTFMove(head), WTFMove(*tail.second));
+    impl.variadicStringMethod(WTFMove(head), WTFMove(tail.arguments.value()));
     return JSValue::encode(jsUndefined());
 }
@@ -7110 +7110 @@
     if (UNLIKELY(throwScope.exception()))
         return JSValue::encode(jsUndefined());
-    impl.variadicDoubleMethod(WTFMove(head), WTFMove(*tail.second));
+    impl.variadicDoubleMethod(WTFMove(head), WTFMove(tail.arguments.value()));
     return JSValue::encode(jsUndefined());
 }
@@ -7131 +7131 @@
         return throwArgumentTypeError(*state, throwScope, 0, "head", "TestObject", "variadicNodeMethod", "Node");
     auto tail = toArguments<VariadicHelper<JSNode, Node>>(*state, 1);
-    if (!tail.second)
-        return throwArgumentTypeError(*state, throwScope, tail.first, "tail", "TestObject", "variadicNodeMethod", "Node");
-    impl.variadicNodeMethod(*head, WTFMove(*tail.second));
+    if (!tail.arguments)
+        return throwArgumentTypeError(*state, throwScope, tail.argumentIndex, "tail", "TestObject", "variadicNodeMethod", "Node");
+    impl.variadicNodeMethod(*head, WTFMove(tail.arguments.value()));
     return JSValue::encode(jsUndefined());
 }