Title: [224849] trunk/Source/WebCore
- Revision
- 224849
- Author
- d...@apple.com
- Date
- 2017-11-14 14:31:50 -0800 (Tue, 14 Nov 2017)
Log Message
Fix Windows build.
* html/OffscreenCanvas.cpp:
* html/OffscreenCanvas.h:
* html/OffscreenCanvas.idl:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (224848 => 224849)
--- trunk/Source/WebCore/ChangeLog 2017-11-14 22:26:21 UTC (rev 224848)
+++ trunk/Source/WebCore/ChangeLog 2017-11-14 22:31:50 UTC (rev 224849)
@@ -1,3 +1,11 @@
+2017-11-14 Dean Jackson <d...@apple.com>
+
+ Fix Windows build.
+
+ * html/OffscreenCanvas.cpp:
+ * html/OffscreenCanvas.h:
+ * html/OffscreenCanvas.idl:
+
2017-11-14 Alex Christensen <achristen...@webkit.org>
Remove Cocoa CFURLConnection loading code
Modified: trunk/Source/WebCore/html/OffscreenCanvas.cpp (224848 => 224849)
--- trunk/Source/WebCore/html/OffscreenCanvas.cpp 2017-11-14 22:26:21 UTC (rev 224848)
+++ trunk/Source/WebCore/html/OffscreenCanvas.cpp 2017-11-14 22:31:50 UTC (rev 224849)
@@ -64,6 +64,7 @@
return m_size.setHeight(newHeight);
}
+#if ENABLE(WEBGL)
ExceptionOr<RefPtr<WebGLRenderingContext>> OffscreenCanvas::getContext(JSC::ExecState&, RenderingContextType contextType, Vector<JSC::Strong<JSC::Unknown>>&& arguments)
{
UNUSED_PARAM(contextType);
@@ -70,6 +71,7 @@
UNUSED_PARAM(arguments);
return { nullptr };
}
+#endif
RefPtr<ImageBitmap> OffscreenCanvas::transferToImageBitmap()
{
Modified: trunk/Source/WebCore/html/OffscreenCanvas.h (224848 => 224849)
--- trunk/Source/WebCore/html/OffscreenCanvas.h 2017-11-14 22:26:21 UTC (rev 224848)
+++ trunk/Source/WebCore/html/OffscreenCanvas.h 2017-11-14 22:31:50 UTC (rev 224849)
@@ -68,8 +68,10 @@
unsigned height() const;
void setHeight(unsigned);
+#if ENABLE(WEBGL)
// FIXME: Should be optional<OffscreenRenderingContext> from above.
ExceptionOr<RefPtr<WebGLRenderingContext>> getContext(JSC::ExecState&, RenderingContextType, Vector<JSC::Strong<JSC::Unknown>>&& arguments);
+#endif
RefPtr<ImageBitmap> transferToImageBitmap();
// void convertToBlob(ImageEncodeOptions options);
Modified: trunk/Source/WebCore/html/OffscreenCanvas.idl (224848 => 224849)
--- trunk/Source/WebCore/html/OffscreenCanvas.idl 2017-11-14 22:26:21 UTC (rev 224848)
+++ trunk/Source/WebCore/html/OffscreenCanvas.idl 2017-11-14 22:31:50 UTC (rev 224849)
@@ -45,7 +45,7 @@
attribute [EnforceRange] unsigned long width;
attribute [EnforceRange] unsigned long height;
- [CallWith=ScriptState, MayThrowException] WebGLRenderingContext? getContext(OffscreenRenderingContextType contextType, any... arguments);
+ [CallWith=ScriptState, MayThrowException, Conditional=WEBGL] WebGLRenderingContext? getContext(OffscreenRenderingContextType contextType, any... arguments);
ImageBitmap transferToImageBitmap();
// Promise<Blob> convertToBlob(optional ImageEncodeOptions options);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
