Attachment 320887 Details for Bug 176895 – Patch

[patch] Patch

bug-176895-20170915123624.patch (text/plain), 5.49 KB, created by Ms2ger (he/him; ⌚ UTC+1/+2) on 2017-09-15 03:36:25 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ms2ger (he/him; ⌚ UTC+1/+2)

Created: 2017-09-15 03:36:25 PDT

Size: 5.49 KB

patch

obsolete

>Subversion Revision: 222080
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index b9bbab6d0973edb88dd3c10b224642bc8c6242a7..174744522bb3627c21ace847f04dd16a7b7e1f7b 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,19 @@
>+2017-09-15  Ms2ger  <Ms2ger@igalia.com>
>+
>+        Disallow passing a null program to getFragDataLocation.
>+        https://bugs.webkit.org/show_bug.cgi?id=176895
>+
>+        Reviewed by Sam Weinig.
>+
>+        This matches the specification as well as Gecko and Chromium.
>+
>+        Test: fast/canvas/webgl/webgl2/bindings.html
>+
>+        * html/canvas/WebGL2RenderingContext.cpp:
>+        (WebCore::WebGL2RenderingContext::getFragDataLocation):
>+        * html/canvas/WebGL2RenderingContext.h:
>+        * html/canvas/WebGL2RenderingContext.idl:
>+
> 2017-09-14  Carlos Garcia Campos  <cgarcia@igalia.com>
> 
>         [FreeType] Complex text is enabled too often after r221909
>diff --git a/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp b/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp
>index 77d219aba3115374a58440dc1b4911fcda3b3773..246f03fe994a073e91d87a751388f178eaae0688 100644
>--- a/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp
>+++ b/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp
>@@ -503,7 +503,7 @@ void WebGL2RenderingContext::compressedTexSubImage3D(GC3Denum, GC3Dint, GC3Dint,
> {
> }
> 
>-GC3Dint WebGL2RenderingContext::getFragDataLocation(WebGLProgram*, const String&)
>+GC3Dint WebGL2RenderingContext::getFragDataLocation(WebGLProgram&, const String&)
> {
>     return 0;
> }
>diff --git a/Source/WebCore/html/canvas/WebGL2RenderingContext.h b/Source/WebCore/html/canvas/WebGL2RenderingContext.h
>index e52e57c4e99aa6cc74889bd5346de3e63cdaf659..ebceace463f5608bb2b9233c1218a1b4c56b66c3 100644
>--- a/Source/WebCore/html/canvas/WebGL2RenderingContext.h
>+++ b/Source/WebCore/html/canvas/WebGL2RenderingContext.h
>@@ -76,7 +76,7 @@ public:
>     void compressedTexSubImage3D(GC3Denum target, GC3Dint level, GC3Dint xoffset, GC3Dint yoffset, GC3Dint zoffset, GC3Dsizei width, GC3Dsizei height, GC3Dsizei depth, GC3Denum format, GC3Dsizei imageSize, RefPtr<ArrayBufferView>&& data);
>     
>     // Programs and shaders
>-    GC3Dint getFragDataLocation(WebGLProgram*, const String& name);
>+    GC3Dint getFragDataLocation(WebGLProgram&, const String& name);
> 
>     // Uniforms and attributes
>     using Uint32List = TypedList<Uint32Array, uint32_t>;
>diff --git a/Source/WebCore/html/canvas/WebGL2RenderingContext.idl b/Source/WebCore/html/canvas/WebGL2RenderingContext.idl
>index 111c42ca387296382fdfe8f7d62c19bdf913c779..0dc0a5f4f3ce657b73e79c7bc1d77f7c36629475 100644
>--- a/Source/WebCore/html/canvas/WebGL2RenderingContext.idl
>+++ b/Source/WebCore/html/canvas/WebGL2RenderingContext.idl
>@@ -373,7 +373,7 @@ typedef (ImageData or HTMLImageElement or HTMLCanvasElement or HTMLVideoElement)
>     void compressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, ArrayBufferView? data);
> 
>     /* Programs and shaders */
>-    GLint getFragDataLocation(WebGLProgram? program, DOMString name);
>+    GLint getFragDataLocation(WebGLProgram program, DOMString name);
> 
>     /* Uniforms and attributes */
>     void uniform1ui(WebGLUniformLocation? location, GLuint v0);
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 285d7341aa56c3cbfc6ff4ef8d45c84377a33c1e..9c1c6c9d4790d8d4a3fa91769187bfb575e11428 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,15 @@
>+2017-09-15  Ms2ger  <Ms2ger@igalia.com>
>+
>+        Disallow passing a null program to getFragDataLocation.
>+        https://bugs.webkit.org/show_bug.cgi?id=176895
>+
>+        Reviewed by Sam Weinig.
>+
>+        This matches the specification as well as Gecko and Chromium.
>+
>+        * fast/canvas/webgl/webgl2/bindings-expected.txt:
>+        * fast/canvas/webgl/webgl2/bindings.html:
>+
> 2017-09-15  Ryosuke Niwa  <rniwa@webkit.org>
> 
>         iOS: WebKitTestRunner hits an assertion in editing/pasteboard/datatransfer-items-copy-plaintext.html
>diff --git a/LayoutTests/fast/canvas/webgl/webgl2/bindings-expected.txt b/LayoutTests/fast/canvas/webgl/webgl2/bindings-expected.txt
>index 0a71f6d478db2366ce03ecf31dc36ab9e34bfc23..a766937e5ab7a4917a1a425e263ea224729dabd9 100644
>--- a/LayoutTests/fast/canvas/webgl/webgl2/bindings-expected.txt
>+++ b/LayoutTests/fast/canvas/webgl/webgl2/bindings-expected.txt
>@@ -30,4 +30,5 @@ PASS getUniformBlockIndex with null program
> PASS getActiveUniformBlockParameter with null program 
> PASS getActiveUniformBlockName with null program 
> PASS uniformBlockBinding with null program 
>+PASS getFragDataLocation with null program 
> 
>diff --git a/LayoutTests/fast/canvas/webgl/webgl2/bindings.html b/LayoutTests/fast/canvas/webgl/webgl2/bindings.html
>index c57ffbdb8a3b15e564a1d8d882f072f897475220..bc5fb461ab0f6279df23c491bfe5b8d1bee84e7c 100644
>--- a/LayoutTests/fast/canvas/webgl/webgl2/bindings.html
>+++ b/LayoutTests/fast/canvas/webgl/webgl2/bindings.html
>@@ -43,6 +43,7 @@ setup(function() {
>   error_methods.push(["getActiveUniformBlockParameter", [null, 0, 0], "getActiveUniformBlockParameter with null program"]);
>   error_methods.push(["getActiveUniformBlockName", [null, 0], "getActiveUniformBlockName with null program"]);
>   error_methods.push(["uniformBlockBinding", [null, 0, 0], "uniformBlockBinding with null program"]);
>+  error_methods.push(["getFragDataLocation", [null, ""], "getFragDataLocation with null program"]);
> });
> 
> for (var [method, args, name] of error_methods) {

Actions: View | Formatted Diff | Diff

Attachments on bug 176895: 320755 | 320887