Changeset 71289 in webkit


Ignore:
Timestamp:
Nov 3, 2010 5:26:05 PM (13 years ago)
Author:
kbr@google.com
Message:

2010-11-03 Adrienne Walker <enne@google.com>

Reviewed by Kenneth Russell.

Properly return empty strings instead of null when using invalid
objects for some WebGL calls. This fixes issues caused by r71274.
https://bugs.webkit.org/show_bug.cgi?id=48962

  • html/canvas/WebGLRenderingContext.cpp: (WebCore::WebGLRenderingContext::getProgramInfoLog): (WebCore::WebGLRenderingContext::getShaderInfoLog): (WebCore::WebGLRenderingContext::getShaderSource):

2010-11-03 Adrienne Walker <enne@google.com>

Reviewed by Kenneth Russell.

WebGL spec doesn't specify whether the return from getAttachedShaders
can be undefined or null. Tolerate both.
https://bugs.webkit.org/show_bug.cgi?id=48962

  • fast/canvas/webgl/gl-object-get-calls-expected.txt:
  • fast/canvas/webgl/gl-object-get-calls.html:
Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r71288 r71289  
     12010-11-03  Adrienne Walker  <enne@google.com>
     2
     3        Reviewed by Kenneth Russell.
     4
     5        WebGL spec doesn't specify whether the return from getAttachedShaders
     6        can be undefined or null.  Tolerate both.
     7        https://bugs.webkit.org/show_bug.cgi?id=48962
     8
     9        * fast/canvas/webgl/gl-object-get-calls-expected.txt:
     10        * fast/canvas/webgl/gl-object-get-calls.html:
     11
    1122010-10-29  Ryosuke Niwa  <rniwa@webkit.org>
    213
  • trunk/LayoutTests/fast/canvas/webgl/gl-object-get-calls-expected.txt

    r71164 r71289  
    66PASS shaders[0] == standardVert && shaders[1] == standardFrag || shaders[1] == standardVert && shaders[0] == standardFrag is true
    77PASS getError was expected value: NO_ERROR :
    8 PASS gl.getAttachedShaders(null) is undefined.
     8PASS gl.getAttachedShaders(null) == undefined is true
    99PASS getError was expected value: INVALID_VALUE :
    1010PASS gl.getAttachedShaders(standardVert) threw exception TypeError: Type error.
     
    9191
    9292TEST COMPLETE
    93 
  • trunk/LayoutTests/fast/canvas/webgl/gl-object-get-calls.html

    r71164 r71289  
    4141shouldBeTrue('shaders[0] == standardVert && shaders[1] == standardFrag || shaders[1] == standardVert && shaders[0] == standardFrag');
    4242glErrorShouldBe(gl, gl.NO_ERROR);
    43 shouldBeUndefined('gl.getAttachedShaders(null)');
     43shouldBeTrue('gl.getAttachedShaders(null) == undefined');
    4444glErrorShouldBe(gl, gl.INVALID_VALUE);
    4545shouldThrow('gl.getAttachedShaders(standardVert)');
  • trunk/WebCore/ChangeLog

    r71288 r71289  
     12010-11-03  Adrienne Walker  <enne@google.com>
     2
     3        Reviewed by Kenneth Russell.
     4
     5        Properly return empty strings instead of null when using invalid
     6        objects for some WebGL calls.  This fixes issues caused by r71274.
     7        https://bugs.webkit.org/show_bug.cgi?id=48962
     8
     9        * html/canvas/WebGLRenderingContext.cpp:
     10        (WebCore::WebGLRenderingContext::getProgramInfoLog):
     11        (WebCore::WebGLRenderingContext::getShaderInfoLog):
     12        (WebCore::WebGLRenderingContext::getShaderSource):
     13
    1142010-11-01  Ryosuke Niwa  <rniwa@webkit.org>
    215
  • trunk/WebCore/html/canvas/WebGLRenderingContext.cpp

    r71282 r71289  
    16311631{
    16321632    UNUSED_PARAM(ec);
    1633     if (isContextLost() || !validateWebGLObject(program))
     1633    if (isContextLost())
    16341634        return String();
     1635    if (!validateWebGLObject(program))
     1636        return "";
    16351637    WebGLStateRestorer(this, false);
    16361638    return m_context->getProgramInfoLog(objectOrZero(program));
     
    17001702{
    17011703    UNUSED_PARAM(ec);
    1702     if (isContextLost() || !validateWebGLObject(shader))
     1704    if (isContextLost())
    17031705        return String();
     1706    if (!validateWebGLObject(shader))
     1707        return "";
    17041708    WebGLStateRestorer(this, false);
    17051709    return m_context->getShaderInfoLog(objectOrZero(shader));
     
    17091713{
    17101714    UNUSED_PARAM(ec);
    1711     if (isContextLost() || !validateWebGLObject(shader))
     1715    if (isContextLost())
    17121716        return String();
     1717    if (!validateWebGLObject(shader))
     1718        return "";
    17131719    WebGLStateRestorer(this, false);
    17141720    return m_context->getShaderSource(objectOrZero(shader));
Note: See TracChangeset for help on using the changeset viewer.