Title: [220699] trunk
- Revision
- 220699
- Author
- zandober...@gmail.com
- Date
- 2017-08-14 09:37:01 -0700 (Mon, 14 Aug 2017)
Log Message
REGRESSION(r220517-r220521) [GTK] Various compositing tests fail
https://bugs.webkit.org/show_bug.cgi?id=175478
Reviewed by Sergio Villar Senin.
Source/WebCore:
Fix a regression introduced in r220519. Move a framebuffer binding in TextureMapperGL
away from GraphicsContext3D and onto the OpenGL API to work around the framebuffer
binding state that's kept in the GraphicsContext3D class. This mismatch in how the
framebuffer was bound was causing a couple of test failures in compositing tests.
No new tests -- regressed tests have their failure expectations removed.
* platform/graphics/texmap/TextureMapperGL.cpp:
(WebCore::TextureMapperGL::bindDefaultSurface): Don't use GraphicsContext3D for the
glBindFramebuffer() call. This would be done in subsequent patches that would move
TextureMapperGL off the GraphicsContext3D usage, but this specific use case clashes
with the framebuffer binding that's done in BitmapTextureGL and was causing test
failures.
LayoutTests:
* platform/gtk/TestExpectations: Remove failure and flakiness expectations.
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (220698 => 220699)
--- trunk/LayoutTests/ChangeLog 2017-08-14 16:08:02 UTC (rev 220698)
+++ trunk/LayoutTests/ChangeLog 2017-08-14 16:37:01 UTC (rev 220699)
@@ -1,3 +1,12 @@
+2017-08-14 Zan Dobersek <zdober...@igalia.com>
+
+ REGRESSION(r220517-r220521) [GTK] Various compositing tests fail
+ https://bugs.webkit.org/show_bug.cgi?id=175478
+
+ Reviewed by Sergio Villar Senin.
+
+ * platform/gtk/TestExpectations: Remove failure and flakiness expectations.
+
2017-08-14 Ms2ger <ms2...@igalia.com>
GTK-focused gardening.
Modified: trunk/LayoutTests/platform/gtk/TestExpectations (220698 => 220699)
--- trunk/LayoutTests/platform/gtk/TestExpectations 2017-08-14 16:08:02 UTC (rev 220698)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2017-08-14 16:37:01 UTC (rev 220699)
@@ -1896,9 +1896,6 @@
webkit.org/b/174354 imported/w3c/IndexedDB-private-browsing/idbfactory_open.html [ Crash Pass ]
-webkit.org/b/175478 compositing/images/positioned-image-content-rect.html [ Pass ImageOnlyFailure ]
-webkit.org/b/175478 compositing/images/truncated-direct-png-image.html [ Pass ImageOnlyFailure ]
-
#////////////////////////////////////////////////////////////////////////////////////////
# End of Flaky tests
#////////////////////////////////////////////////////////////////////////////////////////
@@ -3414,13 +3411,6 @@
webkit.org/b/175422 http/tests/blink/sendbeacon/beacon-same-origin.html [ Failure ]
webkit.org/b/175422 imported/w3c/web-platform-tests/beacon/headers/header-content-type.html [ Failure ]
-webkit.org/b/175478 compositing/contents-opaque/opaque-with-clip-path.html [ ImageOnlyFailure ]
-webkit.org/b/175478 compositing/masks/compositing-clip-path-and-mask.html [ ImageOnlyFailure ]
-webkit.org/b/175478 compositing/masks/compositing-clip-path.html [ ImageOnlyFailure ]
-webkit.org/b/175478 compositing/masks/compositing-clip-path-origin.html [ ImageOnlyFailure ]
-webkit.org/b/175478 compositing/masks/reference-clip-path-on-composited.html [ ImageOnlyFailure ]
-webkit.org/b/175478 css3/filters/animation-from-initial-values-with-color-matrix.html [ ImageOnlyFailure ]
-
#////////////////////////////////////////////////////////////////////////////////////////
# End of non-crashing, non-flaky tests failing
#////////////////////////////////////////////////////////////////////////////////////////
Modified: trunk/Source/WebCore/ChangeLog (220698 => 220699)
--- trunk/Source/WebCore/ChangeLog 2017-08-14 16:08:02 UTC (rev 220698)
+++ trunk/Source/WebCore/ChangeLog 2017-08-14 16:37:01 UTC (rev 220699)
@@ -1,3 +1,24 @@
+2017-08-14 Zan Dobersek <zdober...@igalia.com>
+
+ REGRESSION(r220517-r220521) [GTK] Various compositing tests fail
+ https://bugs.webkit.org/show_bug.cgi?id=175478
+
+ Reviewed by Sergio Villar Senin.
+
+ Fix a regression introduced in r220519. Move a framebuffer binding in TextureMapperGL
+ away from GraphicsContext3D and onto the OpenGL API to work around the framebuffer
+ binding state that's kept in the GraphicsContext3D class. This mismatch in how the
+ framebuffer was bound was causing a couple of test failures in compositing tests.
+
+ No new tests -- regressed tests have their failure expectations removed.
+
+ * platform/graphics/texmap/TextureMapperGL.cpp:
+ (WebCore::TextureMapperGL::bindDefaultSurface): Don't use GraphicsContext3D for the
+ glBindFramebuffer() call. This would be done in subsequent patches that would move
+ TextureMapperGL off the GraphicsContext3D usage, but this specific use case clashes
+ with the framebuffer binding that's done in BitmapTextureGL and was causing test
+ failures.
+
2017-08-14 Chris Dumez <cdu...@apple.com>
Unreviewed fix after r220622 to address crashes on iOS.
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp (220698 => 220699)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp 2017-08-14 16:08:02 UTC (rev 220698)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp 2017-08-14 16:37:01 UTC (rev 220699)
@@ -649,7 +649,7 @@
void TextureMapperGL::bindDefaultSurface()
{
- m_context3D->bindFramebuffer(GraphicsContext3D::FRAMEBUFFER, data().targetFrameBuffer);
+ glBindFramebuffer(GL_FRAMEBUFFER, data().targetFrameBuffer);
auto& viewport = data().viewport;
data().projectionMatrix = createProjectionMatrix(IntSize(viewport[2], viewport[3]), data().PaintFlags & PaintingMirrored);
m_context3D->viewport(viewport[0], viewport[1], viewport[2], viewport[3]);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
