Changeset 122608 in webkit

Timestamp:

Jul 13, 2012 11:15:52 AM (12 years ago)

Author:

haraken@chromium.org

Message:

[CallWith=XXX] arguments should be placed at the head of method arguments
​https://bugs.webkit.org/show_bug.cgi?id=91217

Reviewed by Adam Barth.

The EFL build with the ENABLE_FILE_SYSTEM flag caused a build error,
because CodeGeneratorJS.pm assumes webkitEntries(ScriptExecutionContext*, HTMLInputElement*)
but the actual signature is webkitEntries(HTMLInputElement*, ScriptExecutionContext*) (bug 91185).

Per ​https://trac.webkit.org/wiki/WebKitIDL#CallWith, [CallWith=XXX] arguments should be placed
at the head of the arguments. (i.e. the behavior of CodeGeneratorJS.pm is correct.)

Thus the correct fix is (1) to change the signature of webkitEntries() and webkitGetAsEntry()
so that ScriptExecutionContext* comes first and (2) to modify CodeGeneratorV8.pm to support the order.

Test: bindings/scripts/test/TestObj.idl

• Modules/filesystem/DataTransferItemFileSystem.h: Placed ScriptExecutionContext* at the head of arguments.

(DataTransferItemFileSystem):

• Modules/filesystem/HTMLInputElementFileSystem.cpp: Ditto.

(WebCore::HTMLInputElementFileSystem::webkitEntries):

• Modules/filesystem/HTMLInputElementFileSystem.h: Ditto.

(HTMLInputElementFileSystem):

• Modules/filesystem/chromium/DataTransferItemFileSystemChromium.cpp: Ditto.

(WebCore::DataTransferItemFileSystem::webkitGetAsEntry):

• bindings/scripts/CodeGeneratorV8.pm: Modified to support the correct order.

(GenerateNormalAttrGetter):
(GenerateNormalAttrSetter):
(GenerateFunctionCallString):

• bindings/scripts/test/V8/V8TestInterface.cpp: Updated run-bindings-tests results.

(WebCore::TestInterfaceV8Internal::supplementalMethod2Callback):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/filesystem/DataTransferItemFileSystem.h (modified) (1 diff)
• Modules/filesystem/HTMLInputElementFileSystem.cpp (modified) (1 diff)
• Modules/filesystem/HTMLInputElementFileSystem.h (modified) (1 diff)
• Modules/filesystem/chromium/DataTransferItemFileSystemChromium.cpp (modified) (1 diff)
• bindings/scripts/CodeGeneratorV8.pm (modified) (5 diffs)
• bindings/scripts/test/V8/V8TestInterface.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-13  Kentaro Hara  <haraken@chromium.org>
+
+        [CallWith=XXX] arguments should be placed at the head of method arguments
+        https://bugs.webkit.org/show_bug.cgi?id=91217
+
+        Reviewed by Adam Barth.
+
+        The EFL build with the ENABLE_FILE_SYSTEM flag caused a build error,
+        because CodeGeneratorJS.pm assumes webkitEntries(ScriptExecutionContext*, HTMLInputElement*)
+        but the actual signature is webkitEntries(HTMLInputElement*, ScriptExecutionContext*) (bug 91185).
+
+        Per https://trac.webkit.org/wiki/WebKitIDL#CallWith, [CallWith=XXX] arguments should be placed
+        at the head of the arguments. (i.e. the behavior of CodeGeneratorJS.pm is correct.)
+
+        Thus the correct fix is (1) to change the signature of webkitEntries() and webkitGetAsEntry()
+        so that ScriptExecutionContext* comes first and (2) to modify CodeGeneratorV8.pm to support the order.
+
+        Test: bindings/scripts/test/TestObj.idl
+
+        * Modules/filesystem/DataTransferItemFileSystem.h: Placed ScriptExecutionContext* at the head of arguments.
+        (DataTransferItemFileSystem):
+        * Modules/filesystem/HTMLInputElementFileSystem.cpp: Ditto.
+        (WebCore::HTMLInputElementFileSystem::webkitEntries):
+        * Modules/filesystem/HTMLInputElementFileSystem.h: Ditto.
+        (HTMLInputElementFileSystem):
+        * Modules/filesystem/chromium/DataTransferItemFileSystemChromium.cpp: Ditto.
+        (WebCore::DataTransferItemFileSystem::webkitGetAsEntry):
+
+        * bindings/scripts/CodeGeneratorV8.pm: Modified to support the correct order.
+        (GenerateNormalAttrGetter):
+        (GenerateNormalAttrSetter):
+        (GenerateFunctionCallString):
+
+        * bindings/scripts/test/V8/V8TestInterface.cpp: Updated run-bindings-tests results.
+        (WebCore::TestInterfaceV8Internal::supplementalMethod2Callback):
+
 2012-07-13  Mary Wu  <mary.wu@torchmobile.com.cn>
 

trunk/Source/WebCore/Modules/filesystem/DataTransferItemFileSystem.h

@@ -44 +44 @@
 class DataTransferItemFileSystem {
 public:
-    static PassRefPtr<Entry> webkitGetAsEntry(DataTransferItem*, ScriptExecutionContext*);
+    static PassRefPtr<Entry> webkitGetAsEntry(ScriptExecutionContext*, DataTransferItem*);
 
 private:

trunk/Source/WebCore/Modules/filesystem/HTMLInputElementFileSystem.cpp

@@ -47 +47 @@
 
 // static
-PassRefPtr<EntryArray> HTMLInputElementFileSystem::webkitEntries(HTMLInputElement* input, ScriptExecutionContext* scriptExecutionContext)
+PassRefPtr<EntryArray> HTMLInputElementFileSystem::webkitEntries(ScriptExecutionContext* scriptExecutionContext, HTMLInputElement* input)
 {
     RefPtr<EntryArray> array = EntryArray::create();

trunk/Source/WebCore/Modules/filesystem/HTMLInputElementFileSystem.h

@@ -42 +42 @@
 class HTMLInputElementFileSystem {
 public:
-    static PassRefPtr<EntryArray> webkitEntries(HTMLInputElement*, ScriptExecutionContext*);
+    static PassRefPtr<EntryArray> webkitEntries(ScriptExecutionContext*, HTMLInputElement*);
 
 private:

trunk/Source/WebCore/Modules/filesystem/chromium/DataTransferItemFileSystemChromium.cpp

@@ -52 +52 @@
 
 // static
-PassRefPtr<Entry> DataTransferItemFileSystem::webkitGetAsEntry(DataTransferItem* item, ScriptExecutionContext* scriptExecutionContext)
+PassRefPtr<Entry> DataTransferItemFileSystem::webkitGetAsEntry(ScriptExecutionContext* scriptExecutionContext, DataTransferItem* item)
 {
     DataTransferItemPolicyWrapper* itemPolicyWrapper = static_cast<DataTransferItemPolicyWrapper*>(item);

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

@@ -923 +923 @@
     if ($getterStringUsesImp) {
         my ($functionName, @arguments) = $codeGenerator->GetterExpression(\%implIncludes, $interfaceName, $attribute);
-
-        push(@arguments, GenerateCallWith($attribute->signature->extendedAttributes->{"CallWith"}, \@implContentDecls, "    ", 0, 0));
-
         push(@arguments, "ec") if $useExceptions;
         if ($attribute->signature->extendedAttributes->{"ImplementedBy"}) {
@@ -935 +932 @@
             $functionName = "imp->${functionName}";
         }
+        unshift(@arguments, GenerateCallWith($attribute->signature->extendedAttributes->{"CallWith"}, \@implContentDecls, "    ", 0, 0));
         $getterString = "${functionName}(" . join(", ", @arguments) . ")";
     } else {
@@ -1216 +1214 @@
         } else {
             my ($functionName, @arguments) = $codeGenerator->SetterExpression(\%implIncludes, $interfaceName, $attribute);
-
-            push(@arguments, GenerateCallWith($attribute->signature->extendedAttributes->{"CallWith"}, \@implContentDecls, "    ", 1, 0));
-
             push(@arguments, $result);
             push(@arguments, "ec") if $useExceptions;
@@ -1229 +1224 @@
                 $functionName = "imp->${functionName}";
             }
+            unshift(@arguments, GenerateCallWith($attribute->signature->extendedAttributes->{"CallWith"}, \@implContentDecls, "    ", 1, 0));
             push(@implContentDecls, "    ${functionName}(" . join(", ", @arguments) . ");\n");
         }
@@ -3375 +3371 @@
     my @callWithArgs = GenerateCallWith($callWith, \@callWithOutput, $indent, 0, 1, $function);
     $result .= join("", @callWithOutput);
-    push(@arguments, @callWithArgs);
+    unshift(@arguments, @callWithArgs);
     $index += @callWithArgs;
     $numberOfParameters += @callWithArgs;

trunk/Source/WebCore/bindings/scripts/test/V8/V8TestInterface.cpp

@@ -135 +135 @@
     if (!scriptContext)
         return v8::Undefined();
-    RefPtr<TestObj> result = TestSupplemental::supplementalMethod2(imp, scriptContext, strArg, objArg, ec);
+    RefPtr<TestObj> result = TestSupplemental::supplementalMethod2(scriptContext, imp, strArg, objArg, ec);
     if (UNLIKELY(ec))
         goto fail;