Changeset 207632 in webkit

Timestamp:

Oct 20, 2016 12:17:06 PM (8 years ago)

Author:

mmaxfield@apple.com

Message:

Improve error message when passing a null ArrayBuffer to bufferData()
​https://bugs.webkit.org/show_bug.cgi?id=163745

Reviewed by Dean Jackson.

Source/WebCore:

Test: fast/canvas/webgl/bufferData-nullable-array-buffer-view.html

Update the idl file to accept a nullable ArrayBuffer, and throw
the relevant error with a more helpful error string.

• html/canvas/WebGLRenderingContextBase.cpp:

(WebCore::WebGLRenderingContextBase::bufferData):

• html/canvas/WebGLRenderingContextBase.h:
• html/canvas/WebGLRenderingContextBase.idl:

LayoutTests:

• fast/canvas/webgl/bufferData-nullable-array-buffer-view-expected.txt: Added.
• fast/canvas/webgl/bufferData-nullable-array-buffer-view.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/webgl/bufferData-nullable-array-buffer-view-expected.txt (added)
• LayoutTests/fast/canvas/webgl/bufferData-nullable-array-buffer-view.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp (modified) (4 diffs)
• Source/WebCore/html/canvas/WebGLRenderingContextBase.h (modified) (1 diff)
• Source/WebCore/html/canvas/WebGLRenderingContextBase.idl (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-10-20  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        Improve error message when passing a null ArrayBuffer to bufferData()
+        https://bugs.webkit.org/show_bug.cgi?id=163745
+
+        Reviewed by Dean Jackson.
+
+        * fast/canvas/webgl/bufferData-nullable-array-buffer-view-expected.txt: Added.
+        * fast/canvas/webgl/bufferData-nullable-array-buffer-view.html: Added.
+
 2016-10-20  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-20  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        Improve error message when passing a null ArrayBuffer to bufferData()
+        https://bugs.webkit.org/show_bug.cgi?id=163745
+
+        Reviewed by Dean Jackson.
+
+        Test: fast/canvas/webgl/bufferData-nullable-array-buffer-view.html
+
+        Update the idl file to accept a nullable ArrayBuffer, and throw
+        the relevant error with a more helpful error string.
+
+        * html/canvas/WebGLRenderingContextBase.cpp:
+        (WebCore::WebGLRenderingContextBase::bufferData):
+        * html/canvas/WebGLRenderingContextBase.h:
+        * html/canvas/WebGLRenderingContextBase.idl:
+
 2016-10-20  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp

@@ -1076 +1076 @@
 }
 
-void WebGLRenderingContextBase::bufferData(GC3Denum target, ArrayBuffer& data, GC3Denum usage, ExceptionCode&)
-{
-    if (isContextLostOrPending())
-        return;
+void WebGLRenderingContextBase::bufferData(GC3Denum target, ArrayBuffer* data, GC3Denum usage, ExceptionCode&)
+{
+    if (isContextLostOrPending())
+        return;
+    if (!data) {
+        synthesizeGLError(GraphicsContext3D::INVALID_VALUE, "bufferData", "null data");
+        return;
+    }
     WebGLBuffer* buffer = validateBufferDataParameters("bufferData", target, usage);
     if (!buffer)
         return;
     if (!isErrorGeneratedOnOutOfBoundsAccesses()) {
-        if (!buffer->associateBufferData(&data)) {
+        if (!buffer->associateBufferData(data)) {
             synthesizeGLError(GraphicsContext3D::INVALID_VALUE, "bufferData", "invalid buffer");
             return;
@@ -1091 +1095 @@
 
     m_context->moveErrorsToSyntheticErrorList();
-    m_context->bufferData(target, data.byteLength(), data.data(), usage);
+    m_context->bufferData(target, data->byteLength(), data->data(), usage);
     if (m_context->moveErrorsToSyntheticErrorList()) {
         // The bufferData function failed. Tell the buffer it doesn't have the data it thinks it does.
@@ -1098 +1102 @@
 }
 
-void WebGLRenderingContextBase::bufferData(GC3Denum target, ArrayBufferView& data, GC3Denum usage, ExceptionCode&)
-{
-    if (isContextLostOrPending())
-        return;
+void WebGLRenderingContextBase::bufferData(GC3Denum target, RefPtr<ArrayBufferView>&& data, GC3Denum usage, ExceptionCode&)
+{
+    if (isContextLostOrPending())
+        return;
+    if (!data) {
+        synthesizeGLError(GraphicsContext3D::INVALID_VALUE, "bufferData", "null data");
+        return;
+    }
     WebGLBuffer* buffer = validateBufferDataParameters("bufferData", target, usage);
     if (!buffer)
         return;
     if (!isErrorGeneratedOnOutOfBoundsAccesses()) {
-        if (!buffer->associateBufferData(&data)) {
+        if (!buffer->associateBufferData(data.get())) {
             synthesizeGLError(GraphicsContext3D::INVALID_VALUE, "bufferData", "invalid buffer");
             return;
@@ -1113 +1121 @@
 
     m_context->moveErrorsToSyntheticErrorList();
-    m_context->bufferData(target, data.byteLength(), data.baseAddress(), usage);
+    m_context->bufferData(target, data->byteLength(), data->baseAddress(), usage);
     if (m_context->moveErrorsToSyntheticErrorList()) {
         // The bufferData function failed. Tell the buffer it doesn't have the data it thinks it does.

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

@@ -140 +140 @@
 
     void bufferData(GC3Denum target, long long size, GC3Denum usage, ExceptionCode&);
-    void bufferData(GC3Denum target, ArrayBuffer& data, GC3Denum usage, ExceptionCode&);
-    void bufferData(GC3Denum target, ArrayBufferView& data, GC3Denum usage, ExceptionCode&);
+    void bufferData(GC3Denum target, ArrayBuffer* data, GC3Denum usage, ExceptionCode&);
+    void bufferData(GC3Denum target, RefPtr<ArrayBufferView>&& data, GC3Denum usage, ExceptionCode&);
     void bufferSubData(GC3Denum target, long long offset, ArrayBuffer* data, ExceptionCode&);
     void bufferSubData(GC3Denum target, long long offset, RefPtr<ArrayBufferView>&& data, ExceptionCode&);

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

@@ -485 +485 @@
     void blendFunc(GLenum sfactor, GLenum dfactor);
     void blendFuncSeparate(GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
-    [MayThrowLegacyException] void bufferData(GLenum target, ArrayBuffer data, GLenum usage);
-    [MayThrowLegacyException] void bufferData(GLenum target, ArrayBufferView data, GLenum usage);
+    [MayThrowLegacyException] void bufferData(GLenum target, ArrayBuffer? data, GLenum usage);
+    [MayThrowLegacyException] void bufferData(GLenum target, ArrayBufferView? data, GLenum usage);
     [MayThrowLegacyException] void bufferData(GLenum target, GLsizeiptr size, GLenum usage);
     [MayThrowLegacyException] void bufferSubData(GLenum target, GLintptr offset, ArrayBuffer? data);