Changeset 71289 in webkit
- Timestamp:
- Nov 3, 2010 5:26:05 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r71288 r71289 1 2010-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 1 12 2010-10-29 Ryosuke Niwa <rniwa@webkit.org> 2 13 -
trunk/LayoutTests/fast/canvas/webgl/gl-object-get-calls-expected.txt
r71164 r71289 6 6 PASS shaders[0] == standardVert && shaders[1] == standardFrag || shaders[1] == standardVert && shaders[0] == standardFrag is true 7 7 PASS getError was expected value: NO_ERROR : 8 PASS gl.getAttachedShaders(null) is undefined.8 PASS gl.getAttachedShaders(null) == undefined is true 9 9 PASS getError was expected value: INVALID_VALUE : 10 10 PASS gl.getAttachedShaders(standardVert) threw exception TypeError: Type error. … … 91 91 92 92 TEST COMPLETE 93 -
trunk/LayoutTests/fast/canvas/webgl/gl-object-get-calls.html
r71164 r71289 41 41 shouldBeTrue('shaders[0] == standardVert && shaders[1] == standardFrag || shaders[1] == standardVert && shaders[0] == standardFrag'); 42 42 glErrorShouldBe(gl, gl.NO_ERROR); 43 shouldBe Undefined('gl.getAttachedShaders(null)');43 shouldBeTrue('gl.getAttachedShaders(null) == undefined'); 44 44 glErrorShouldBe(gl, gl.INVALID_VALUE); 45 45 shouldThrow('gl.getAttachedShaders(standardVert)'); -
trunk/WebCore/ChangeLog
r71288 r71289 1 2010-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 1 14 2010-11-01 Ryosuke Niwa <rniwa@webkit.org> 2 15 -
trunk/WebCore/html/canvas/WebGLRenderingContext.cpp
r71282 r71289 1631 1631 { 1632 1632 UNUSED_PARAM(ec); 1633 if (isContextLost() || !validateWebGLObject(program))1633 if (isContextLost()) 1634 1634 return String(); 1635 if (!validateWebGLObject(program)) 1636 return ""; 1635 1637 WebGLStateRestorer(this, false); 1636 1638 return m_context->getProgramInfoLog(objectOrZero(program)); … … 1700 1702 { 1701 1703 UNUSED_PARAM(ec); 1702 if (isContextLost() || !validateWebGLObject(shader))1704 if (isContextLost()) 1703 1705 return String(); 1706 if (!validateWebGLObject(shader)) 1707 return ""; 1704 1708 WebGLStateRestorer(this, false); 1705 1709 return m_context->getShaderInfoLog(objectOrZero(shader)); … … 1709 1713 { 1710 1714 UNUSED_PARAM(ec); 1711 if (isContextLost() || !validateWebGLObject(shader))1715 if (isContextLost()) 1712 1716 return String(); 1717 if (!validateWebGLObject(shader)) 1718 return ""; 1713 1719 WebGLStateRestorer(this, false); 1714 1720 return m_context->getShaderSource(objectOrZero(shader));
Note: See TracChangeset
for help on using the changeset viewer.