Title: [206094] trunk/Source/WebCore
Revision
206094
Author
nael.ouedra...@crf.canon.fr
Date
2016-09-19 05:30:53 -0700 (Mon, 19 Sep 2016)

Log Message

If a host object is only used as a variadic argument, its bindings header isn't properly included
https://bugs.webkit.org/show_bug.cgi?id=150121

Reviewed by Youenn Fablet.

Modify JS binding generator to include binding headers of objects passed
as variadic argument.

* Modules/mediastream/RTCPeerConnection.h: Remove workaround.
* bindings/scripts/CodeGeneratorJS.pm:
(AddVariadicToImplIncludes):
(GenerateParametersCheck):
* bindings/scripts/test/JS/JSTestObj.cpp:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (206093 => 206094)


--- trunk/Source/WebCore/ChangeLog	2016-09-19 11:30:28 UTC (rev 206093)
+++ trunk/Source/WebCore/ChangeLog	2016-09-19 12:30:53 UTC (rev 206094)
@@ -1,3 +1,19 @@
+2016-09-19  Nael Ouedraogo  <nael.ouedra...@crf.canon.fr>
+
+        If a host object is only used as a variadic argument, its bindings header isn't properly included
+        https://bugs.webkit.org/show_bug.cgi?id=150121
+
+        Reviewed by Youenn Fablet.
+
+        Modify JS binding generator to include binding headers of objects passed
+        as variadic argument.
+
+        * Modules/mediastream/RTCPeerConnection.h: Remove workaround.
+        * bindings/scripts/CodeGeneratorJS.pm:
+        (AddVariadicToImplIncludes):
+        (GenerateParametersCheck):
+        * bindings/scripts/test/JS/JSTestObj.cpp:
+
 2016-09-19  Joseph Pecoraro  <pecor...@apple.com>
 
         Web Inspector: ⇧⌘C should highlight node under cursor without re-moving mouse

Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h (206093 => 206094)


--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h	2016-09-19 11:30:28 UTC (rev 206093)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h	2016-09-19 12:30:53 UTC (rev 206094)
@@ -38,8 +38,7 @@
 #include "ActiveDOMObject.h"
 #include "Dictionary.h"
 #include "EventTarget.h"
-// FIXME: Workaround for bindings bug http://webkit.org/b/150121
-#include "JSMediaStream.h"
+#include "MediaStream.h"
 #include "PeerConnectionBackend.h"
 #include "RTCRtpTransceiver.h"
 #include "ScriptWrappable.h"
@@ -48,7 +47,6 @@
 
 namespace WebCore {
 
-class MediaStream;
 class MediaStreamTrack;
 class PeerConnectionBackend;
 class RTCConfiguration;

Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (206093 => 206094)


--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm	2016-09-19 11:30:28 UTC (rev 206093)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm	2016-09-19 12:30:53 UTC (rev 206094)
@@ -4002,6 +4002,7 @@
             }
             $value = "WTFMove($name)";
         } elsif ($parameter->isVariadic) {
+            AddToImplIncludes("JS${type}.h", $function->signature->extendedAttributes->{"Conditional"}) unless $codeGenerator->SkipIncludeHeader($type) or !$codeGenerator->IsWrapperType($type);
             my ($wrapperType, $wrappedType) = GetVariadicType($interface, $type);
             push(@$outputArray, "    auto $name = toArguments<VariadicHelper<$wrapperType, $wrappedType>>(*state, $argumentIndex);\n");
 

Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (206093 => 206094)


--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp	2016-09-19 11:30:28 UTC (rev 206093)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp	2016-09-19 12:30:53 UTC (rev 206094)
@@ -31,6 +31,7 @@
 #include "ExceptionCode.h"
 #include "Frame.h"
 #include "HTMLNames.h"
+#include "JSBlob.h"
 #include "JSDOMBinding.h"
 #include "JSDOMConstructor.h"
 #include "JSDOMConvert.h"
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to