Title: [207467] trunk/Source/WebCore
- Revision
- 207467
- Author
- commit-qu...@webkit.org
- Date
- 2016-10-18 10:10:06 -0700 (Tue, 18 Oct 2016)
Log 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
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (207466 => 207467)
--- trunk/Source/WebCore/ChangeLog 2016-10-18 17:07:35 UTC (rev 207466)
+++ trunk/Source/WebCore/ChangeLog 2016-10-18 17:10:06 UTC (rev 207467)
@@ -1,3 +1,18 @@
+2016-10-18 Commit Queue <commit-qu...@webkit.org>
+
+ 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
+
2016-10-18 Eric Carlson <eric.carl...@apple.com>
[MediaStream] Resolve constraints and enumerate devices in the UI process
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (207466 => 207467)
--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2016-10-18 17:07:35 UTC (rev 207466)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2016-10-18 17:10:06 UTC (rev 207467)
@@ -175,7 +175,7 @@
, m_fpsSink(0)
, m_readyState(MediaPlayer::HaveNothing)
, m_networkState(MediaPlayer::Empty)
-#if USE(GSTREAMER_GL) || USE(COORDINATED_GRAPHICS_THREADED)
+#if USE(GSTREAMER_GL)
, m_drawTimer(RunLoop::main(), this, &MediaPlayerPrivateGStreamerBase::repaint)
#endif
, m_usingFallbackVideoSink(false)
@@ -575,7 +575,7 @@
m_player->repaint();
-#if USE(GSTREAMER_GL) || USE(COORDINATED_GRAPHICS_THREADED)
+#if USE(GSTREAMER_GL)
m_drawCondition.notifyOne();
#endif
}
@@ -595,22 +595,22 @@
}
#if USE(COORDINATED_GRAPHICS_THREADED)
- if (!m_player->client().mediaPlayerRenderingCanBeAccelerated(m_player)) {
+#if USE(GSTREAMER_GL)
+ if (m_player->client().mediaPlayerRenderingCanBeAccelerated(m_player))
+ pushTextureToCompositor();
+ else {
LockHolder locker(m_drawMutex);
m_drawTimer.startOneShot(0);
m_drawCondition.wait(m_drawMutex);
- return;
}
-
-#if USE(GSTREAMER_GL)
- pushTextureToCompositor();
#else
- {
+ if (m_player->client().mediaPlayerRenderingCanBeAccelerated(m_player)) {
LockHolder lock(m_drawMutex);
if (!m_platformLayerProxy->scheduleUpdateOnCompositorThread([this] { this->pushTextureToCompositor(); }))
return;
m_drawCondition.wait(m_drawMutex);
- }
+ } else
+ repaint();
#endif
return;
#else
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h (207466 => 207467)
--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h 2016-10-18 17:07:35 UTC (rev 207466)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h 2016-10-18 17:10:06 UTC (rev 207467)
@@ -184,7 +184,7 @@
IntSize m_size;
mutable GMutex m_sampleMutex;
GRefPtr<GstSample> m_sample;
-#if USE(GSTREAMER_GL) || USE(COORDINATED_GRAPHICS_THREADED)
+#if USE(GSTREAMER_GL)
RunLoop::Timer<MediaPlayerPrivateGStreamerBase> m_drawTimer;
#endif
mutable FloatSize m_videoSize;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
