Changeset 207467 in webkit


Ignore:
Timestamp:
Oct 18, 2016 10:10:06 AM (7 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, rolling out r207409.
https://bugs.webkit.org/show_bug.cgi?id=163602

Introduced many test failures and timeouts, causing release
bot to exit early (Requested by mcatanzaro on #webkit).

Reverted changeset:

"[GTK] Several tests crashing on debug bot in (anonymous
namespace)::MediaPlayerPrivateGStreamerBase::repaint"
https://bugs.webkit.org/show_bug.cgi?id=163511
http://trac.webkit.org/changeset/207409

Location:
trunk/Source/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r207463 r207467  
     12016-10-18  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r207409.
     4        https://bugs.webkit.org/show_bug.cgi?id=163602
     5
     6        Introduced many test failures and timeouts, causing release
     7        bot to exit early (Requested by mcatanzaro on #webkit).
     8
     9        Reverted changeset:
     10
     11        "[GTK] Several tests crashing on debug bot in (anonymous
     12        namespace)::MediaPlayerPrivateGStreamerBase::repaint"
     13        https://bugs.webkit.org/show_bug.cgi?id=163511
     14        http://trac.webkit.org/changeset/207409
     15
    1162016-10-18  Eric Carlson  <eric.carlson@apple.com>
    217
  • trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp

    r207409 r207467  
    176176    , m_readyState(MediaPlayer::HaveNothing)
    177177    , m_networkState(MediaPlayer::Empty)
    178 #if USE(GSTREAMER_GL) || USE(COORDINATED_GRAPHICS_THREADED)
     178#if USE(GSTREAMER_GL)
    179179    , m_drawTimer(RunLoop::main(), this, &MediaPlayerPrivateGStreamerBase::repaint)
    180180#endif
     
    576576    m_player->repaint();
    577577
    578 #if USE(GSTREAMER_GL) || USE(COORDINATED_GRAPHICS_THREADED)
     578#if USE(GSTREAMER_GL)
    579579    m_drawCondition.notifyOne();
    580580#endif
     
    596596
    597597#if USE(COORDINATED_GRAPHICS_THREADED)
    598     if (!m_player->client().mediaPlayerRenderingCanBeAccelerated(m_player)) {
     598#if USE(GSTREAMER_GL)
     599    if (m_player->client().mediaPlayerRenderingCanBeAccelerated(m_player))
     600        pushTextureToCompositor();
     601    else {
    599602        LockHolder locker(m_drawMutex);
    600603        m_drawTimer.startOneShot(0);
    601604        m_drawCondition.wait(m_drawMutex);
    602         return;
    603     }
    604 
    605 #if USE(GSTREAMER_GL)
    606     pushTextureToCompositor();
     605    }
    607606#else
    608     {
     607    if (m_player->client().mediaPlayerRenderingCanBeAccelerated(m_player)) {
    609608        LockHolder lock(m_drawMutex);
    610609        if (!m_platformLayerProxy->scheduleUpdateOnCompositorThread([this] { this->pushTextureToCompositor(); }))
    611610            return;
    612611        m_drawCondition.wait(m_drawMutex);
    613     }
     612    } else
     613        repaint();
    614614#endif
    615615    return;
  • trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h

    r207409 r207467  
    185185    mutable GMutex m_sampleMutex;
    186186    GRefPtr<GstSample> m_sample;
    187 #if USE(GSTREAMER_GL) || USE(COORDINATED_GRAPHICS_THREADED)
     187#if USE(GSTREAMER_GL)
    188188    RunLoop::Timer<MediaPlayerPrivateGStreamerBase> m_drawTimer;
    189189#endif
Note: See TracChangeset for help on using the changeset viewer.