Changeset 255468 in webkit
- Timestamp:
- Jan 30, 2020, 4:23:55 PM (7 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
-
LayoutTests/ChangeLog (modified) (1 diff)
-
LayoutTests/TestExpectations (modified) (1 diff)
-
Source/WebCore/ChangeLog (modified) (1 diff)
-
Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp (modified) (5 diffs)
-
Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp (modified) (1 diff)
-
Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLCommon.cpp (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r255462 r255468 1 2020-01-30 Justin Fan <justin_fan@apple.com> 2 3 [WebGL] Add logging statements to attempt to catch texture-upload-size.html timeout 4 https://bugs.webkit.org/show_bug.cgi?id=207006 5 6 Unreviewed temporary logging additions caused unrelated tests to time out. 7 8 * TestExpectations: 9 1 10 2020-01-30 Ryan Haddad <ryanhaddad@apple.com> 2 11 -
trunk/LayoutTests/TestExpectations
r255351 r255468 3494 3494 webkit.org/b/206579 [ Debug ] imported/w3c/web-platform-tests/css/css-backgrounds/background-size/vector/zero-height-ratio-auto-5px.html [ Crash ] 3495 3495 webkit.org/b/206579 [ Debug ] imported/w3c/web-platform-tests/css/css-backgrounds/background-size/vector/zero-width-ratio-auto-5px.html [ Crash ] 3496 3497 # Slow now due to added logging for unrelated investigation. Will be reverted. 3498 webkit.org/b/207006 fast/canvas/webgl/uniform-samplers-test.html [ Timeout ] 3499 webkit.org/b/207006 webgl/1.0.3/conformance/state/gl-object-get-calls.html [ Timeout ] 3500 webkit.org/b/207006 webgl/1.0.3/conformance/uniforms/uniform-samplers-test.html [ Timeout ] -
trunk/Source/WebCore/ChangeLog
r255457 r255468 1 2020-01-30 Justin Fan <justin_fan@apple.com> 2 3 [WebGL] Add logging statements to attempt to catch texture-upload-size.html timeout 4 https://bugs.webkit.org/show_bug.cgi?id=207006 5 6 Unreviewed temporary logging additions for flaky timeout investigation. 7 8 * html/canvas/WebGLRenderingContextBase.cpp: 9 (WebCore::WebGLRenderingContextBase::bindTexture): 10 (WebCore::WebGLRenderingContextBase::createTexture): 11 (WebCore::WebGLRenderingContextBase::getError): 12 (WebCore::WebGLRenderingContextBase::texSubImage2D): 13 (WebCore::WebGLRenderingContextBase::texImage2D): 14 * platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp: 15 (WebCore::GraphicsContextGLOpenGL::texImage2D): 16 * platform/graphics/opengl/GraphicsContextGLOpenGLCommon.cpp: 17 (WebCore::GraphicsContextGLOpenGL::bindTexture): 18 (WebCore::GraphicsContextGLOpenGL::getError): 19 (WebCore::GraphicsContextGLOpenGL::texSubImage2D): 20 (WebCore::GraphicsContextGLOpenGL::createTexture): 21 1 22 2020-01-30 Per Arne Vollan <pvollan@apple.com> 2 23 -
trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp
r254941 r255468 1315 1315 void WebGLRenderingContextBase::bindTexture(GCGLenum target, WebGLTexture* texture) 1316 1316 { 1317 WTFLogAlways("[ WEBGL ] bindTexture()"); 1318 1317 1319 bool deleted; 1318 1320 if (!checkObjectToBeBound("bindTexture", texture, deleted)) … … 1744 1746 RefPtr<WebGLTexture> WebGLRenderingContextBase::createTexture() 1745 1747 { 1748 WTFLogAlways("[ WEBGL ] createTexture()"); 1749 1746 1750 if (isContextLostOrPending()) 1747 1751 return nullptr; … … 2652 2656 GCGLenum WebGLRenderingContextBase::getError() 2653 2657 { 2658 WTFLogAlways("[ WEBGL ] getError()"); 2659 2654 2660 if (m_isPendingPolicyResolution) 2655 2661 return GraphicsContextGL::NO_ERROR; … … 3957 3963 ExceptionOr<void> WebGLRenderingContextBase::texSubImage2D(GCGLenum target, GCGLint level, GCGLint xoffset, GCGLint yoffset, GCGLenum format, GCGLenum type, Optional<TexImageSource>&& source) 3958 3964 { 3965 WTFLogAlways("[ WEBGL ] texSubImage2D()"); 3966 3959 3967 if (!source) { 3960 3968 synthesizeGLError(GraphicsContextGL::INVALID_VALUE, "texSubImage2D", "source is null"); … … 4520 4528 ExceptionOr<void> WebGLRenderingContextBase::texImage2D(GCGLenum target, GCGLint level, GCGLenum internalformat, GCGLenum format, GCGLenum type, Optional<TexImageSource> source) 4521 4529 { 4530 WTFLogAlways("[ WEBGL ] texImage2D()"); 4531 4522 4532 if (!source) { 4523 4533 synthesizeGLError(GraphicsContextGL::INVALID_VALUE, "texImage2D", "source is null"); -
trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp
r254214 r255468 392 392 bool GraphicsContextGLOpenGL::texImage2D(GCGLenum target, GCGLint level, GCGLenum internalformat, GCGLsizei width, GCGLsizei height, GCGLint border, GCGLenum format, GCGLenum type, const void* pixels) 393 393 { 394 WTFLogAlways("[ GraphicsContextGL ] texImage2D()"); 395 394 396 if (width && height && !pixels) { 395 397 synthesizeGLError(INVALID_VALUE); -
trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLCommon.cpp
r255316 r255468 505 505 void GraphicsContextGLOpenGL::bindTexture(GCGLenum target, PlatformGLObject texture) 506 506 { 507 WTFLogAlways("[ GraphicsContextGL ] bindTexture()"); 508 507 509 makeContextCurrent(); 508 510 m_state.setBoundTexture(m_state.activeTextureUnit, texture, target); … … 1112 1114 GCGLenum GraphicsContextGLOpenGL::getError() 1113 1115 { 1116 WTFLogAlways("[ GraphicsContextGL ] getError()"); 1117 1114 1118 if (!m_syntheticErrors.isEmpty()) { 1115 1119 // Need to move the current errors to the synthetic error list in case … … 1823 1827 void GraphicsContextGLOpenGL::texSubImage2D(GCGLenum target, GCGLint level, GCGLint xoff, GCGLint yoff, GCGLsizei width, GCGLsizei height, GCGLenum format, GCGLenum type, const void* pixels) 1824 1828 { 1829 WTFLogAlways("[ GraphicsContextGL ] texSubImage2D()"); 1830 1825 1831 makeContextCurrent(); 1826 1832 … … 1904 1910 PlatformGLObject GraphicsContextGLOpenGL::createTexture() 1905 1911 { 1912 WTFLogAlways("[ GraphicsContextGL ] createTexture()"); 1913 1906 1914 makeContextCurrent(); 1907 1915 GLuint o = 0;
Note:
See TracChangeset
for help on using the changeset viewer.