[webkit-changes] [226142] trunk/Source/WebCore

[timothy]

Title: [226142] trunk/Source/WebCore

Revision

226142

Author

timo...@hatcher.name

Date

2017-12-19 14:36:21 -0800 (Tue, 19 Dec 2017)

Log Message

Build failure in WebGL2 when Video feature is disabled
https://bugs.webkit.org/show_bug.cgi?id=180946

Reviewed by Brian Burg.

* html/canvas/WebGL2RenderingContext.h: Make TexImageSource conditional on ENABLE(VIDEO).
* html/canvas/WebGL2RenderingContext.idl: Ditto.

Modified Paths

• trunk/Source/WebCore/ChangeLog
• trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.h
• trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.idl

Diff

Modified: trunk/Source/WebCore/ChangeLog (226141 => 226142)

--- trunk/Source/WebCore/ChangeLog	2017-12-19 22:32:40 UTC (rev 226141)
+++ trunk/Source/WebCore/ChangeLog	2017-12-19 22:36:21 UTC (rev 226142)
@@ -1,3 +1,13 @@
+2017-12-19  Timothy Hatcher  <timo...@hatcher.name>
+
+        Build failure in WebGL2 when Video feature is disabled
+        https://bugs.webkit.org/show_bug.cgi?id=180946
+
+        Reviewed by Brian Burg.
+
+        * html/canvas/WebGL2RenderingContext.h: Make TexImageSource conditional on ENABLE(VIDEO).
+        * html/canvas/WebGL2RenderingContext.idl: Ditto.
+
 2017-12-19  Chris Dumez  <cdu...@apple.com>
 
         scopeURL should start with the provided scriptURL

Modified: trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.h (226141 => 226142)

--- trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.h	2017-12-19 22:32:40 UTC (rev 226141)
+++ trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.h	2017-12-19 22:36:21 UTC (rev 226142)
@@ -66,6 +66,12 @@
     void texStorage2D(GC3Denum target, GC3Dsizei levels, GC3Denum internalFormat, GC3Dsizei width, GC3Dsizei height);
     void texStorage3D(GC3Denum target, GC3Dsizei levels, GC3Denum internalFormat, GC3Dsizei width, GC3Dsizei height, GC3Dsizei depth);
 
+#if ENABLE(VIDEO)
+    using TexImageSource = WTF::Variant<RefPtr<ImageData>, RefPtr<HTMLImageElement>, RefPtr<HTMLCanvasElement>, RefPtr<HTMLVideoElement>>;
+#else
+    using TexImageSource = WTF::Variant<RefPtr<ImageData>, RefPtr<HTMLImageElement>, RefPtr<HTMLCanvasElement>>;
+#endif
+
     using WebGLRenderingContextBase::texImage2D;
     void texImage2D(GC3Denum target, GC3Dint level, GC3Dint internalformat, GC3Dsizei width, GC3Dsizei height, GC3Dint border, GC3Denum format, GC3Denum type, GC3Dint64 pboOffset);
     void texImage2D(GC3Denum target, GC3Dint level, GC3Dint internalformat, GC3Dsizei width, GC3Dsizei height, GC3Dint border, GC3Denum format, GC3Denum type, TexImageSource&&);
@@ -83,7 +89,6 @@
 
     void texSubImage3D(GC3Denum target, GC3Dint level, GC3Dint xoffset, GC3Dint yoffset, GC3Dint zoffset, GC3Dsizei width, GC3Dsizei height, GC3Dsizei depth, GC3Denum format, GC3Denum type, GC3Dint64 pboOffset);
     void texSubImage3D(GC3Denum target, GC3Dint level, GC3Dint xoffset, GC3Dint yoffset, GC3Dint zoffset, GC3Dsizei width, GC3Dsizei height, GC3Dsizei depth, GC3Denum format, GC3Denum type, RefPtr<ArrayBufferView>&& pixels, GC3Duint srcOffset);
-    using TexImageSource = WTF::Variant<RefPtr<ImageData>, RefPtr<HTMLImageElement>, RefPtr<HTMLCanvasElement>, RefPtr<HTMLVideoElement>>;
     void texSubImage3D(GC3Denum target, GC3Dint level, GC3Dint xoffset, GC3Dint yoffset, GC3Dint zoffset, GC3Dsizei width, GC3Dsizei height, GC3Dsizei depth, GC3Denum format, GC3Denum type, TexImageSource&&);
 
     void copyTexSubImage3D(GC3Denum target, GC3Dint level, GC3Dint xoffset, GC3Dint yoffset, GC3Dint zoffset, GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height);

Modified: trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.idl (226141 => 226142)

--- trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.idl	2017-12-19 22:32:40 UTC (rev 226141)
+++ trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.idl	2017-12-19 22:36:21 UTC (rev 226142)
@@ -45,7 +45,11 @@
 typedef (Uint32Array or sequence<GLuint>) Uint32List;
 
 // FIXME: Should allow ImageBitmap too.
+#ifdef ENABLE_VIDEO
 typedef (ImageData or HTMLImageElement or HTMLCanvasElement or HTMLVideoElement) TexImageSource;
+#else
+typedef (ImageData or HTMLImageElement or HTMLCanvasElement) TexImageSource;
+#endif
 
 [
     Conditional=WEBGL2,

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes