Diff
Modified: trunk/LayoutTests/ChangeLog (255530 => 255531)
--- trunk/LayoutTests/ChangeLog 2020-02-01 00:14:35 UTC (rev 255530)
+++ trunk/LayoutTests/ChangeLog 2020-02-01 00:23:20 UTC (rev 255531)
@@ -1,3 +1,14 @@
+2020-01-31 Justin Fan <justin_...@apple.com>
+
+ [WebGL] Revert logging added to investigate 205757
+ https://bugs.webkit.org/show_bug.cgi?id=207076
+
+ Unreviewed.
+
+ Revert https://trac.webkit.org/changeset/255468.
+
+ * TestExpectations:
+
2020-01-31 Jacob Uphoff <jacob_uph...@apple.com>
[ macOS wk2 ] webgpu/whlsl/textures-sample-level.html is flaky failing
Modified: trunk/LayoutTests/TestExpectations (255530 => 255531)
--- trunk/LayoutTests/TestExpectations 2020-02-01 00:14:35 UTC (rev 255530)
+++ trunk/LayoutTests/TestExpectations 2020-02-01 00:23:20 UTC (rev 255531)
@@ -3492,9 +3492,4 @@
webkit.org/b/206578 [ Debug ] imported/w3c/web-platform-tests/css/css-backgrounds/animations/border-image-width-interpolation.html [ Crash ]
webkit.org/b/206579 [ Debug ] imported/w3c/web-platform-tests/css/css-backgrounds/background-size/vector/zero-height-ratio-auto-5px.html [ Crash ]
-webkit.org/b/206579 [ Debug ] imported/w3c/web-platform-tests/css/css-backgrounds/background-size/vector/zero-width-ratio-auto-5px.html [ Crash ]
-
-# Slow now due to added logging for unrelated investigation. Will be reverted.
-webkit.org/b/207006 fast/canvas/webgl/uniform-samplers-test.html [ Timeout ]
-webkit.org/b/207006 webgl/1.0.3/conformance/state/gl-object-get-calls.html [ Timeout ]
-webkit.org/b/207006 webgl/1.0.3/conformance/uniforms/uniform-samplers-test.html [ Timeout ]
\ No newline at end of file
+webkit.org/b/206579 [ Debug ] imported/w3c/web-platform-tests/css/css-backgrounds/background-size/vector/zero-width-ratio-auto-5px.html [ Crash ]
\ No newline at end of file
Modified: trunk/Source/WebCore/ChangeLog (255530 => 255531)
--- trunk/Source/WebCore/ChangeLog 2020-02-01 00:14:35 UTC (rev 255530)
+++ trunk/Source/WebCore/ChangeLog 2020-02-01 00:23:20 UTC (rev 255531)
@@ -1,3 +1,26 @@
+2020-01-31 Justin Fan <justin_...@apple.com>
+
+ [WebGL] Revert logging added to investigate 205757
+ https://bugs.webkit.org/show_bug.cgi?id=207076
+
+ Unreviewed.
+
+ Revert https://trac.webkit.org/changeset/255468.
+
+ * html/canvas/WebGLRenderingContextBase.cpp:
+ (WebCore::WebGLRenderingContextBase::bindTexture):
+ (WebCore::WebGLRenderingContextBase::createTexture):
+ (WebCore::WebGLRenderingContextBase::getError):
+ (WebCore::WebGLRenderingContextBase::texSubImage2D):
+ (WebCore::WebGLRenderingContextBase::texImage2D):
+ * platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp:
+ (WebCore::GraphicsContextGLOpenGL::texImage2D):
+ * platform/graphics/opengl/GraphicsContextGLOpenGLCommon.cpp:
+ (WebCore::GraphicsContextGLOpenGL::bindTexture):
+ (WebCore::GraphicsContextGLOpenGL::getError):
+ (WebCore::GraphicsContextGLOpenGL::texSubImage2D):
+ (WebCore::GraphicsContextGLOpenGL::createTexture):
+
2020-01-31 Antoine Quint <grao...@apple.com>
[Web Animations] [WK1] REGRESSION: opacity doesn't animate
Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp (255530 => 255531)
--- trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2020-02-01 00:14:35 UTC (rev 255530)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2020-02-01 00:23:20 UTC (rev 255531)
@@ -1314,8 +1314,6 @@
void WebGLRenderingContextBase::bindTexture(GCGLenum target, WebGLTexture* texture)
{
- WTFLogAlways("[ WEBGL ] bindTexture()");
-
bool deleted;
if (!checkObjectToBeBound("bindTexture", texture, deleted))
return;
@@ -1745,8 +1743,6 @@
RefPtr<WebGLTexture> WebGLRenderingContextBase::createTexture()
{
- WTFLogAlways("[ WEBGL ] createTexture()");
-
if (isContextLostOrPending())
return nullptr;
auto texture = WebGLTexture::create(*this);
@@ -2655,8 +2651,6 @@
GCGLenum WebGLRenderingContextBase::getError()
{
- WTFLogAlways("[ WEBGL ] getError()");
-
if (m_isPendingPolicyResolution)
return GraphicsContextGL::NO_ERROR;
return m_context->getError();
@@ -3962,8 +3956,6 @@
ExceptionOr<void> WebGLRenderingContextBase::texSubImage2D(GCGLenum target, GCGLint level, GCGLint xoffset, GCGLint yoffset, GCGLenum format, GCGLenum type, Optional<TexImageSource>&& source)
{
- WTFLogAlways("[ WEBGL ] texSubImage2D()");
-
if (!source) {
synthesizeGLError(GraphicsContextGL::INVALID_VALUE, "texSubImage2D", "source is null");
return { };
@@ -4527,8 +4519,6 @@
ExceptionOr<void> WebGLRenderingContextBase::texImage2D(GCGLenum target, GCGLint level, GCGLenum internalformat, GCGLenum format, GCGLenum type, Optional<TexImageSource> source)
{
- WTFLogAlways("[ WEBGL ] texImage2D()");
-
if (!source) {
synthesizeGLError(GraphicsContextGL::INVALID_VALUE, "texImage2D", "source is null");
return { };
Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp (255530 => 255531)
--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp 2020-02-01 00:14:35 UTC (rev 255530)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp 2020-02-01 00:23:20 UTC (rev 255531)
@@ -391,8 +391,6 @@
bool GraphicsContextGLOpenGL::texImage2D(GCGLenum target, GCGLint level, GCGLenum internalformat, GCGLsizei width, GCGLsizei height, GCGLint border, GCGLenum format, GCGLenum type, const void* pixels)
{
- WTFLogAlways("[ GraphicsContextGL ] texImage2D()");
-
if (width && height && !pixels) {
synthesizeGLError(INVALID_VALUE);
return false;
Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLCommon.cpp (255530 => 255531)
--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLCommon.cpp 2020-02-01 00:14:35 UTC (rev 255530)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLCommon.cpp 2020-02-01 00:23:20 UTC (rev 255531)
@@ -504,8 +504,6 @@
void GraphicsContextGLOpenGL::bindTexture(GCGLenum target, PlatformGLObject texture)
{
- WTFLogAlways("[ GraphicsContextGL ] bindTexture()");
-
makeContextCurrent();
m_state.setBoundTexture(m_state.activeTextureUnit, texture, target);
::glBindTexture(target, texture);
@@ -1113,8 +1111,6 @@
GCGLenum GraphicsContextGLOpenGL::getError()
{
- WTFLogAlways("[ GraphicsContextGL ] getError()");
-
if (!m_syntheticErrors.isEmpty()) {
// Need to move the current errors to the synthetic error list in case
// that error is already there, since the expected behavior of both
@@ -1826,8 +1822,6 @@
void GraphicsContextGLOpenGL::texSubImage2D(GCGLenum target, GCGLint level, GCGLint xoff, GCGLint yoff, GCGLsizei width, GCGLsizei height, GCGLenum format, GCGLenum type, const void* pixels)
{
- WTFLogAlways("[ GraphicsContextGL ] texSubImage2D()");
-
makeContextCurrent();
#if !USE(OPENGL_ES)
@@ -1909,8 +1903,6 @@
PlatformGLObject GraphicsContextGLOpenGL::createTexture()
{
- WTFLogAlways("[ GraphicsContextGL ] createTexture()");
-
makeContextCurrent();
GLuint o = 0;
glGenTextures(1, &o);
