Changeset 207467 in webkit
- Timestamp:
- Oct 18, 2016 10:10:06 AM (8 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r207463 r207467 1 2016-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 1 16 2016-10-18 Eric Carlson <eric.carlson@apple.com> 2 17 -
trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
r207409 r207467 176 176 , m_readyState(MediaPlayer::HaveNothing) 177 177 , m_networkState(MediaPlayer::Empty) 178 #if USE(GSTREAMER_GL) || USE(COORDINATED_GRAPHICS_THREADED)178 #if USE(GSTREAMER_GL) 179 179 , m_drawTimer(RunLoop::main(), this, &MediaPlayerPrivateGStreamerBase::repaint) 180 180 #endif … … 576 576 m_player->repaint(); 577 577 578 #if USE(GSTREAMER_GL) || USE(COORDINATED_GRAPHICS_THREADED)578 #if USE(GSTREAMER_GL) 579 579 m_drawCondition.notifyOne(); 580 580 #endif … … 596 596 597 597 #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 { 599 602 LockHolder locker(m_drawMutex); 600 603 m_drawTimer.startOneShot(0); 601 604 m_drawCondition.wait(m_drawMutex); 602 return; 603 } 604 605 #if USE(GSTREAMER_GL) 606 pushTextureToCompositor(); 605 } 607 606 #else 608 {607 if (m_player->client().mediaPlayerRenderingCanBeAccelerated(m_player)) { 609 608 LockHolder lock(m_drawMutex); 610 609 if (!m_platformLayerProxy->scheduleUpdateOnCompositorThread([this] { this->pushTextureToCompositor(); })) 611 610 return; 612 611 m_drawCondition.wait(m_drawMutex); 613 } 612 } else 613 repaint(); 614 614 #endif 615 615 return; -
trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h
r207409 r207467 185 185 mutable GMutex m_sampleMutex; 186 186 GRefPtr<GstSample> m_sample; 187 #if USE(GSTREAMER_GL) || USE(COORDINATED_GRAPHICS_THREADED)187 #if USE(GSTREAMER_GL) 188 188 RunLoop::Timer<MediaPlayerPrivateGStreamerBase> m_drawTimer; 189 189 #endif
Note: See TracChangeset
for help on using the changeset viewer.