Changeset 218558 in webkit
- Timestamp:
- Jun 20, 2017 12:45:40 AM (7 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r218544 r218558 1 2017-06-20 Miguel Gomez <magomez@igalia.com> 2 3 [GTK] Layout Test fast/canvas/webgl/tex-image-and-sub-image-2d-with-video.html makes the subsequent test case flaky crash. 4 https://bugs.webkit.org/show_bug.cgi?id=173459 5 6 Reviewed by Carlos Garcia Campos. 7 8 Unskip fast/canvas/webgl/tex-image-and-sub-image-2d-with-video.html. 9 10 * platform/gtk/TestExpectations: 11 1 12 2017-06-19 Devin Rousso <drousso@apple.com> 2 13 -
trunk/LayoutTests/platform/gtk/TestExpectations
r218493 r218558 585 585 webkit.org/b/169917 fast/canvas/webgl/webgl-draw-buffers.html [ Failure Crash ] 586 586 webkit.org/b/169917 webgl/1.0.3/conformance/extensions/webgl-draw-buffers.html [ Crash ] 587 webkit.org/b/173459 fast/canvas/webgl/tex-image-and-sub-image-2d-with-video.html [ Skip ]588 587 589 588 # WebGL 2.0 still not enabled -
trunk/Source/WebCore/ChangeLog
r218544 r218558 1 2017-06-20 Miguel Gomez <magomez@igalia.com> 2 3 [GTK] Layout Test fast/canvas/webgl/tex-image-and-sub-image-2d-with-video.html makes the subsequent test case flaky crash. 4 https://bugs.webkit.org/show_bug.cgi?id=173459 5 6 Reviewed by Carlos Garcia Campos. 7 8 When destructing the VideoTextureCopierGStreamer, ensure that there's a previous gl context before trying 9 to make it current again. There are situations where no previous context may exist, which can trigger a crash. 10 Also, add DefaultImageOrientation to the switch that handles the video frame possible orientations, as it's the 11 value used when no rotation needs to be performed, and it's currently triggering an assertion. 12 13 Covered by existent tests. 14 15 * platform/graphics/gstreamer/VideoTextureCopierGStreamer.cpp: 16 (WebCore::VideoTextureCopierGStreamer::~VideoTextureCopierGStreamer): 17 (WebCore::VideoTextureCopierGStreamer::updateTextureSpaceMatrix): 18 1 19 2017-06-19 Devin Rousso <drousso@apple.com> 2 20 -
trunk/Source/WebCore/platform/graphics/gstreamer/VideoTextureCopierGStreamer.cpp
r217927 r218558 58 58 { 59 59 GLContext* previousContext = GLContext::current(); 60 ASSERT(previousContext);61 60 PlatformDisplay::sharedDisplayForCompositing().sharingGLContext()->makeContextCurrent(); 62 61 … … 67 66 m_context3D = nullptr; 68 67 69 previousContext->makeContextCurrent(); 68 if (previousContext) 69 previousContext->makeContextCurrent(); 70 70 } 71 71 … … 89 89 90 90 switch (m_orientation) { 91 case DefaultImageOrientation: 92 break; 91 93 case OriginRightTop: 92 94 m_textureSpaceMatrix.rotate(-90);
Note: See TracChangeset
for help on using the changeset viewer.