Changeset 116232 in webkit


Ignore:
Timestamp:
May 5, 2012 4:04:13 PM (12 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, rolling out r116221.
​http://trac.webkit.org/changeset/116221
​https://bugs.webkit.org/show_bug.cgi?id=85722

broke builds that use -Wshorten-64-to-32 (Requested by pizlo
on #webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2012-05-05

Source/WebCore:

  • html/canvas/WebGLRenderingContext.cpp:

(WebCore):
(WebCore::WebGLRenderingContext::bufferData):
(WebCore::WebGLRenderingContext::bufferSubData):
(WebCore::WebGLRenderingContext::drawElements):
(WebCore::WebGLRenderingContext::getVertexAttribOffset):
(WebCore::WebGLRenderingContext::vertexAttribPointer):

  • html/canvas/WebGLRenderingContext.h:

(WebGLRenderingContext):

  • html/canvas/WebGLRenderingContext.idl:

LayoutTests:

  • fast/canvas/webgl/index-validation-expected.txt:
  • fast/canvas/webgl/index-validation.html:
Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r116230 r116232  
     12012-05-05  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r116221.
     4        http://trac.webkit.org/changeset/116221
     5        https://bugs.webkit.org/show_bug.cgi?id=85722
     6
     7        broke builds that use -Wshorten-64-to-32 (Requested by pizlo
     8        on #webkit).
     9
     10        * fast/canvas/webgl/index-validation-expected.txt:
     11        * fast/canvas/webgl/index-validation.html:
     12
    1132012-05-05  Dean Jackson  <dino@apple.com>
    214

  • trunk/LayoutTests/fast/canvas/webgl/index-validation-expected.txt

    r116221 r116232  
    55Testing with valid indices
    66PASS gl.checkFramebufferStatus(gl.FRAMEBUFFER) is gl.FRAMEBUFFER_COMPLETE
    7 PASS getError was expected value: NO_ERROR :
     7PASS gl.getError() is 0
    88PASS gl.drawElements(gl.TRIANGLES, 3, gl.UNSIGNED_SHORT, 0) is undefined.
    9 PASS getError was expected value: NO_ERROR :
     9PASS gl.getError() is 0
    1010Testing with out-of-range indices
    1111Enable vertices, valid
    12 PASS getError was expected value: NO_ERROR :
     12PASS gl.getError() is 0
    1313PASS gl.drawElements(gl.TRIANGLES, 3, gl.UNSIGNED_SHORT, 0) is undefined.
    14 PASS getError was expected value: NO_ERROR :
     14PASS gl.getError() is 0
    1515Enable normals, out-of-range
    16 PASS getError was expected value: NO_ERROR :
     16PASS gl.getError() is 0
    1717PASS gl.drawElements(gl.TRIANGLES, 3, gl.UNSIGNED_SHORT, 0) is undefined.
    18 PASS getError was expected value: INVALID_OPERATION :
     18PASS gl.getError() is gl.INVALID_OPERATION
    1919Test with enabled attribute that does not belong to current program
    2020Enable an extra attribute with null
    21 PASS getError was expected value: NO_ERROR :
     21PASS gl.getError() is 0
    2222PASS gl.drawElements(gl.TRIANGLES, 3, gl.UNSIGNED_SHORT, 0) is undefined.
    23 PASS getError was expected value: INVALID_OPERATION :
     23PASS gl.getError() is gl.INVALID_OPERATION
    2424Enable an extra attribute with insufficient data buffer
    25 PASS getError was expected value: NO_ERROR :
     25PASS gl.getError() is 0
    2626PASS gl.drawElements(gl.TRIANGLES, 3, gl.UNSIGNED_SHORT, 0) is undefined.
    27 Pass large negative index to vertexAttribPointer
    28 PASS getError was expected value: INVALID_VALUE :
    29 PASS gl.drawElements(gl.TRIANGLES, 3, gl.UNSIGNED_SHORT, 0) is undefined.
     27PASS gl.getError() is 0
    3028PASS successfullyParsed is true
    3129

  • trunk/LayoutTests/fast/canvas/webgl/index-validation.html

    r116221 r116232  
    1 <!DOCTYPE html>
    21<html>
    32<head>
    4 <meta charset="utf-8">
    5 <link rel="stylesheet" href="../../js/resources/js-test-style.css"/>
    63<script src="../../js/resources/js-test-pre.js"></script>
    74<script src="resources/webgl-test.js"></script>
    … …  
    6461gl.enableVertexAttribArray(normalLoc);
    6562shouldBe('gl.checkFramebufferStatus(gl.FRAMEBUFFER)', 'gl.FRAMEBUFFER_COMPLETE');
    66 glErrorShouldBe(gl, gl.NO_ERROR);
     63shouldBe('gl.getError()', '0');
    6764shouldBeUndefined('gl.drawElements(gl.TRIANGLES, 3, gl.UNSIGNED_SHORT, 0)');
    68 glErrorShouldBe(gl, gl.NO_ERROR);
     65shouldBe('gl.getError()', '0');
    6966
    7067debug("Testing with out-of-range indices");
    … …  
    7774gl.disableVertexAttribArray(normalLoc);
    7875debug("Enable vertices, valid");
    79 glErrorShouldBe(gl, gl.NO_ERROR);
     76shouldBe('gl.getError()', '0');
    8077shouldBeUndefined('gl.drawElements(gl.TRIANGLES, 3, gl.UNSIGNED_SHORT, 0)');
    81 glErrorShouldBe(gl, gl.NO_ERROR);
     78shouldBe('gl.getError()', '0');
    8279debug("Enable normals, out-of-range");
    8380gl.vertexAttribPointer(normalLoc, 3, gl.FLOAT, false, 7 * sizeInBytes(gl.FLOAT), 4 * sizeInBytes(gl.FLOAT));
    8481gl.enableVertexAttribArray(normalLoc);
    85 glErrorShouldBe(gl, gl.NO_ERROR);
     82shouldBe('gl.getError()', '0');
    8683shouldBeUndefined('gl.drawElements(gl.TRIANGLES, 3, gl.UNSIGNED_SHORT, 0)');
    87 glErrorShouldBe(gl, gl.INVALID_OPERATION);
     84shouldBe('gl.getError()', 'gl.INVALID_OPERATION');
    8885
    8986debug("Test with enabled attribute that does not belong to current program");
    … …  
    9390gl.enableVertexAttribArray(extraLoc);
    9491debug("Enable an extra attribute with null");
    95 glErrorShouldBe(gl, gl.NO_ERROR);
     92shouldBe('gl.getError()', '0');
    9693shouldBeUndefined('gl.drawElements(gl.TRIANGLES, 3, gl.UNSIGNED_SHORT, 0)');
    97 glErrorShouldBe(gl, gl.INVALID_OPERATION);
     94shouldBe('gl.getError()', 'gl.INVALID_OPERATION');
    9895debug("Enable an extra attribute with insufficient data buffer");
    9996gl.vertexAttribPointer(extraLoc, 3, gl.FLOAT, false, 7 * sizeInBytes(gl.FLOAT), 4 * sizeInBytes(gl.FLOAT));
    100 glErrorShouldBe(gl, gl.NO_ERROR);
     97shouldBe('gl.getError()', '0');
    10198shouldBeUndefined('gl.drawElements(gl.TRIANGLES, 3, gl.UNSIGNED_SHORT, 0)');
    102 debug("Pass large negative index to vertexAttribPointer");
    103 gl.vertexAttribPointer(normalLoc, 3, gl.FLOAT, false, 7 * sizeInBytes(gl.FLOAT), -2000000000 * sizeInBytes(gl.FLOAT));
    104 glErrorShouldBe(gl, gl.INVALID_VALUE);
    105 shouldBeUndefined('gl.drawElements(gl.TRIANGLES, 3, gl.UNSIGNED_SHORT, 0)');
    106 
    107 successfullyParsed = true;
     99shouldBe('gl.getError()', '0');
    108100</script>
    109101

  • trunk/Source/WebCore/ChangeLog

    r116231 r116232  
     12012-05-05  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r116221.
     4        http://trac.webkit.org/changeset/116221
     5        https://bugs.webkit.org/show_bug.cgi?id=85722
     6
     7        broke builds that use -Wshorten-64-to-32 (Requested by pizlo
     8        on #webkit).
     9
     10        * html/canvas/WebGLRenderingContext.cpp:
     11        (WebCore):
     12        (WebCore::WebGLRenderingContext::bufferData):
     13        (WebCore::WebGLRenderingContext::bufferSubData):
     14        (WebCore::WebGLRenderingContext::drawElements):
     15        (WebCore::WebGLRenderingContext::getVertexAttribOffset):
     16        (WebCore::WebGLRenderingContext::vertexAttribPointer):
     17        * html/canvas/WebGLRenderingContext.h:
     18        (WebGLRenderingContext):
     19        * html/canvas/WebGLRenderingContext.idl:
     20
    1212012-05-05  Martin Robinson  <mrobinson@igalia.com>
    222

  • trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp

    r116221 r116232  
    10371037}
    10381038
    1039 void WebGLRenderingContext::bufferData(GC3Denum target, long long size, GC3Denum usage, ExceptionCode& ec)
     1039void WebGLRenderingContext::bufferData(GC3Denum target, GC3Dsizeiptr size, GC3Denum usage, ExceptionCode& ec)
    10401040{
    10411041    UNUSED_PARAM(ec);
    … …  
    11061106}
    11071107
    1108 void WebGLRenderingContext::bufferSubData(GC3Denum target, long long offset, ArrayBuffer* data, ExceptionCode& ec)
     1108void WebGLRenderingContext::bufferSubData(GC3Denum target, GC3Dintptr offset, ArrayBuffer* data, ExceptionCode& ec)
    11091109{
    11101110    UNUSED_PARAM(ec);
    … …  
    11311131}
    11321132
    1133 void WebGLRenderingContext::bufferSubData(GC3Denum target, long long offset, ArrayBufferView* data, ExceptionCode& ec)
     1133void WebGLRenderingContext::bufferSubData(GC3Denum target, GC3Dintptr offset, ArrayBufferView* data, ExceptionCode& ec)
    11341134{
    11351135    UNUSED_PARAM(ec);
    … …  
    18991899}
    19001900
    1901 void WebGLRenderingContext::drawElements(GC3Denum mode, GC3Dsizei count, GC3Denum type, long long offset, ExceptionCode& ec)
     1901void WebGLRenderingContext::drawElements(GC3Denum mode, GC3Dsizei count, GC3Denum type, GC3Dintptr offset, ExceptionCode& ec)
    19021902{
    19031903    UNUSED_PARAM(ec);
    … …  
    30393039}
    30403040
    3041 long long WebGLRenderingContext::getVertexAttribOffset(GC3Duint index, GC3Denum pname)
     3041GC3Dsizeiptr WebGLRenderingContext::getVertexAttribOffset(GC3Duint index, GC3Denum pname)
    30423042{
    30433043    if (isContextLost())
    … …  
    42514251}
    42524252
    4253 void WebGLRenderingContext::vertexAttribPointer(GC3Duint index, GC3Dint size, GC3Denum type, GC3Dboolean normalized, GC3Dsizei stride, long long offset, ExceptionCode& ec)
     4253void WebGLRenderingContext::vertexAttribPointer(GC3Duint index, GC3Dint size, GC3Denum type, GC3Dboolean normalized, GC3Dsizei stride, GC3Dintptr offset, ExceptionCode& ec)
    42544254{
    42554255    UNUSED_PARAM(ec);

  • trunk/Source/WebCore/html/canvas/WebGLRenderingContext.h

    r116221 r116232  
    9797    void blendFuncSeparate(GC3Denum srcRGB, GC3Denum dstRGB, GC3Denum srcAlpha, GC3Denum dstAlpha);
    9898
    99     void bufferData(GC3Denum target, long long size, GC3Denum usage, ExceptionCode&);
     99    void bufferData(GC3Denum target, GC3Dsizeiptr size, GC3Denum usage, ExceptionCode&);
    100100    void bufferData(GC3Denum target, ArrayBuffer* data, GC3Denum usage, ExceptionCode&);
    101101    void bufferData(GC3Denum target, ArrayBufferView* data, GC3Denum usage, ExceptionCode&);
    102     void bufferSubData(GC3Denum target, long long offset, ArrayBuffer* data, ExceptionCode&);
    103     void bufferSubData(GC3Denum target, long long offset, ArrayBufferView* data, ExceptionCode&);
     102    void bufferSubData(GC3Denum target, GC3Dintptr offset, ArrayBuffer* data, ExceptionCode&);
     103    void bufferSubData(GC3Denum target, GC3Dintptr offset, ArrayBufferView* data, ExceptionCode&);
    104104
    105105    GC3Denum checkFramebufferStatus(GC3Denum target);
    … …  
    142142    void disableVertexAttribArray(GC3Duint index, ExceptionCode&);
    143143    void drawArrays(GC3Denum mode, GC3Dint first, GC3Dsizei count, ExceptionCode&);
    144     void drawElements(GC3Denum mode, GC3Dsizei count, GC3Denum type, long long offset, ExceptionCode&);
     144    void drawElements(GC3Denum mode, GC3Dsizei count, GC3Denum type, GC3Dintptr offset, ExceptionCode&);
    145145
    146146    void enable(GC3Denum cap);
    … …  
    175175    PassRefPtr<WebGLUniformLocation> getUniformLocation(WebGLProgram*, const String&, ExceptionCode&);
    176176    WebGLGetInfo getVertexAttrib(GC3Duint index, GC3Denum pname, ExceptionCode&);
    177     long long getVertexAttribOffset(GC3Duint index, GC3Denum pname);
     177    GC3Dsizeiptr getVertexAttribOffset(GC3Duint index, GC3Denum pname);
    178178
    179179    void hint(GC3Denum target, GC3Denum mode);
    … …  
    282282    void vertexAttrib4fv(GC3Duint index, GC3Dfloat* values, GC3Dsizei size);
    283283    void vertexAttribPointer(GC3Duint index, GC3Dint size, GC3Denum type, GC3Dboolean normalized,
    284                              GC3Dsizei stride, long long offset, ExceptionCode&);
     284                             GC3Dsizei stride, GC3Dintptr offset, ExceptionCode&);
    285285
    286286    void viewport(GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height);

  • trunk/Source/WebCore/html/canvas/WebGLRenderingContext.idl

    r116221 r116232  
    464464        [StrictTypeChecking] void         bufferData(in unsigned long target, in ArrayBuffer data, in unsigned long usage) raises (DOMException);
    465465        [StrictTypeChecking] void         bufferData(in unsigned long target, in ArrayBufferView data, in unsigned long usage) raises (DOMException);
    466         [StrictTypeChecking] void         bufferData(in unsigned long target, in long long size, in unsigned long usage) raises (DOMException);
    467         [StrictTypeChecking] void         bufferSubData(in unsigned long target, in long long offset, in ArrayBuffer data) raises (DOMException);
    468         [StrictTypeChecking] void         bufferSubData(in unsigned long target, in long long offset, in ArrayBufferView data) raises (DOMException);
     466        [StrictTypeChecking] void         bufferData(in unsigned long target, in long size, in unsigned long usage) raises (DOMException);
     467        [StrictTypeChecking] void         bufferSubData(in unsigned long target, in long offset, in ArrayBuffer data) raises (DOMException);
     468        [StrictTypeChecking] void         bufferSubData(in unsigned long target, in long offset, in ArrayBufferView data) raises (DOMException);
    469469
    470470        [StrictTypeChecking] unsigned long checkFramebufferStatus(in unsigned long target);
    … …  
    508508        [StrictTypeChecking] void         disableVertexAttribArray(in unsigned long index) raises(DOMException);
    509509        [StrictTypeChecking] void         drawArrays(in unsigned long mode, in long first, in long count) raises(DOMException);
    510         [StrictTypeChecking] void         drawElements(in unsigned long mode, in long count, in unsigned long type, in long long offset) raises(DOMException);
     510        [StrictTypeChecking] void         drawElements(in unsigned long mode, in long count, in unsigned long type, in long offset) raises(DOMException);
    511511
    512512        [StrictTypeChecking] void         enable(in unsigned long cap);
    … …  
    568568        [StrictTypeChecking, Custom] void getVertexAttrib();
    569569
    570         [StrictTypeChecking] long long getVertexAttribOffset(in unsigned long index, in unsigned long pname);
     570        [StrictTypeChecking] long getVertexAttribOffset(in unsigned long index, in unsigned long pname);
    571571
    572572        [StrictTypeChecking] void         hint(in unsigned long target, in unsigned long mode);
    … …  
    662662        [StrictTypeChecking, Custom] void         vertexAttrib4fv(in unsigned long indx, in Float32Array values);
    663663        [StrictTypeChecking] void         vertexAttribPointer(in unsigned long indx, in long size, in unsigned long type, in boolean normalized,
    664                                                               in long stride, in long long offset) raises(DOMException);
     664                                                              in long stride, in long offset) raises(DOMException);
    665665
    666666        [StrictTypeChecking] void         viewport(in long x, in long y, in long width, in long height);
Note: See TracChangeset for help on using the changeset viewer.