Changeset 207243 in webkit

Timestamp:

Oct 12, 2016 2:09:46 PM (8 years ago)

Author:

Chris Dumez

Message:

[Web IDL] Generated bindings include the wrong header when ImplementedAs is used on a dictionary
​https://bugs.webkit.org/show_bug.cgi?id=163352

Reviewed by Ryosuke Niwa.

Generated bindings include the wrong header when ImplementedAs is used
on a dictionary.

• bindings/scripts/CodeGeneratorJS.pm:

(GenerateDictionaryHeader):

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

(WebCore::jsTestObjPrototypeFunctionOperationWithExternalDictionaryParameterCaller):

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

(WebCore::convertDictionary<DictionaryImplName>):
(WebCore::convertDictionary<TestStandaloneDictionary>): Deleted.

• bindings/scripts/test/JS/JSTestStandaloneDictionary.h:
• bindings/scripts/test/TestStandaloneDictionary.idl:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/scripts/CodeGeneratorJS.pm (modified) (1 diff)
• bindings/scripts/test/JS/JSTestObj.cpp (modified) (1 diff)
• bindings/scripts/test/JS/JSTestStandaloneDictionary.cpp (modified) (2 diffs)
• bindings/scripts/test/JS/JSTestStandaloneDictionary.h (modified) (1 diff)
• bindings/scripts/test/TestStandaloneDictionary.idl (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-12  Chris Dumez  <cdumez@apple.com>
+
+        [Web IDL] Generated bindings include the wrong header when ImplementedAs is used on a dictionary
+        https://bugs.webkit.org/show_bug.cgi?id=163352
+
+        Reviewed by Ryosuke Niwa.
+
+        Generated bindings include the wrong header when ImplementedAs is used
+        on a dictionary.
+
+        * bindings/scripts/CodeGeneratorJS.pm:
+        (GenerateDictionaryHeader):
+        * bindings/scripts/test/JS/JSTestObj.cpp:
+        (WebCore::jsTestObjPrototypeFunctionOperationWithExternalDictionaryParameterCaller):
+        * bindings/scripts/test/JS/JSTestStandaloneDictionary.cpp:
+        (WebCore::convertDictionary<DictionaryImplName>):
+        (WebCore::convertDictionary<TestStandaloneDictionary>): Deleted.
+        * bindings/scripts/test/JS/JSTestStandaloneDictionary.h:
+        * bindings/scripts/test/TestStandaloneDictionary.idl:
+
 2016-10-12  Yusuke Suzuki  <utatane.tea@gmail.com>
 

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

@@ -4366 +4366 @@
     push(@headerContentHeader, GenerateHeaderContentHeader($dictionary));
 
-    $headerIncludes{"$dictionaryName.h"} = 1;
+    $headerIncludes{"$className.h"} = 1;
     $headerIncludes{"JSDOMConvert.h"} = 1;
 

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

@@ -7714 +7714 @@
     if (UNLIKELY(state->argumentCount() < 1))
         return throwVMError(state, throwScope, createNotEnoughArgumentsError(state));
-    auto dict = convert<IDLDictionary<TestStandaloneDictionary>>(*state, state->uncheckedArgument(0));
+    auto dict = convert<IDLDictionary<DictionaryImplName>>(*state, state->uncheckedArgument(0));
     RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
     impl.operationWithExternalDictionaryParameter(dict.value());

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

@@ -27 +27 @@
 namespace WebCore {
 
-template<> Optional<TestStandaloneDictionary> convertDictionary<TestStandaloneDictionary>(ExecState& state, JSValue value)
+template<> Optional<DictionaryImplName> convertDictionary<DictionaryImplName>(ExecState& state, JSValue value)
 {
     VM& vm = state.vm();
@@ -41 +41 @@
         return Nullopt;
     }
-    TestStandaloneDictionary result;
+    DictionaryImplName result;
     JSValue boolMemberValue = isNullOrUndefined ? jsUndefined() : object->get(&state, Identifier::fromString(&state, "boolMember"));
     if (!boolMemberValue.isUndefined()) {

trunk/Source/WebCore/bindings/scripts/test/JS/JSTestStandaloneDictionary.h

@@ -21 +21 @@
 #pragma once
 
+#include "DictionaryImplName.h"
 #include "JSDOMConvert.h"
-#include "TestStandaloneDictionary.h"
 
 namespace WebCore {
 
-template<> Optional<TestStandaloneDictionary> convertDictionary<TestStandaloneDictionary>(JSC::ExecState&, JSC::JSValue);
+template<> Optional<DictionaryImplName> convertDictionary<DictionaryImplName>(JSC::ExecState&, JSC::JSValue);
 
 } // namespace WebCore

trunk/Source/WebCore/bindings/scripts/test/TestStandaloneDictionary.idl

@@ -27 +27 @@
  */
 
-dictionary TestStandaloneDictionary {
+[
+    ImplementedAs=DictionaryImplName,
+] dictionary TestStandaloneDictionary {
     boolean boolMember;
     DOMString stringMember;