Changeset 226142 in webkit

Timestamp:

Dec 19, 2017 2:36:21 PM (6 years ago)

Author:

timothy@hatcher.name

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.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/canvas/WebGL2RenderingContext.h (modified) (2 diffs)
• html/canvas/WebGL2RenderingContext.idl (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-12-19  Timothy Hatcher  <timothy@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  <cdumez@apple.com>
 

trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.h

@@ -67 +67 @@
     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);
@@ -84 +90 @@
     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&&);
 

trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.idl

@@ -46 +46 @@
 
 // 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
 
 [