Changeset 218558 in webkit


Ignore:
Timestamp:
Jun 20, 2017 12:45:40 AM (7 years ago)
Author:
magomez@igalia.com
Message:

[GTK] Layout Test fast/canvas/webgl/tex-image-and-sub-image-2d-with-video.html makes the subsequent test case flaky crash.
https://bugs.webkit.org/show_bug.cgi?id=173459

Reviewed by Carlos Garcia Campos.

Source/WebCore:

When destructing the VideoTextureCopierGStreamer, ensure that there's a previous gl context before trying
to make it current again. There are situations where no previous context may exist, which can trigger a crash.
Also, add DefaultImageOrientation to the switch that handles the video frame possible orientations, as it's the
value used when no rotation needs to be performed, and it's currently triggering an assertion.

Covered by existent tests.

  • platform/graphics/gstreamer/VideoTextureCopierGStreamer.cpp:

(WebCore::VideoTextureCopierGStreamer::~VideoTextureCopierGStreamer):
(WebCore::VideoTextureCopierGStreamer::updateTextureSpaceMatrix):

LayoutTests:

Unskip fast/canvas/webgl/tex-image-and-sub-image-2d-with-video.html.

  • platform/gtk/TestExpectations:
Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r218544 r218558  
     12017-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
    1122017-06-19  Devin Rousso  <drousso@apple.com>
    213
  • trunk/LayoutTests/platform/gtk/TestExpectations

    r218493 r218558  
    585585webkit.org/b/169917 fast/canvas/webgl/webgl-draw-buffers.html [ Failure Crash ]
    586586webkit.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 ]
    588587
    589588# WebGL 2.0 still not enabled
  • trunk/Source/WebCore/ChangeLog

    r218544 r218558  
     12017-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
    1192017-06-19  Devin Rousso  <drousso@apple.com>
    220
  • trunk/Source/WebCore/platform/graphics/gstreamer/VideoTextureCopierGStreamer.cpp

    r217927 r218558  
    5858{
    5959    GLContext* previousContext = GLContext::current();
    60     ASSERT(previousContext);
    6160    PlatformDisplay::sharedDisplayForCompositing().sharingGLContext()->makeContextCurrent();
    6261
     
    6766    m_context3D = nullptr;
    6867
    69     previousContext->makeContextCurrent();
     68    if (previousContext)
     69        previousContext->makeContextCurrent();
    7070}
    7171
     
    8989
    9090    switch (m_orientation) {
     91    case DefaultImageOrientation:
     92        break;
    9193    case OriginRightTop:
    9294        m_textureSpaceMatrix.rotate(-90);
Note: See TracChangeset for help on using the changeset viewer.