Title: [145989] releases/WebKitGTK/webkit-2.0/Source/WebCore
- Revision
- 145989
- Author
- [email protected]
- Date
- 2013-03-16 04:18:59 -0700 (Sat, 16 Mar 2013)
Log Message
Merge r145808 - [GTK] Wrong ASSERT in AudioDestinationGstreamer::stop
https://bugs.webkit.org/show_bug.cgi?id=112344
Patch by Xan Lopez <[email protected]> on 2013-03-14
Reviewed by Philippe Normand.
Correct erroneous ASSERT, we want both member variables to exist.
* platform/audio/gstreamer/AudioDestinationGStreamer.cpp:
(WebCore::AudioDestinationGStreamer::stop):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.0/Source/WebCore/ChangeLog (145988 => 145989)
--- releases/WebKitGTK/webkit-2.0/Source/WebCore/ChangeLog 2013-03-16 08:51:52 UTC (rev 145988)
+++ releases/WebKitGTK/webkit-2.0/Source/WebCore/ChangeLog 2013-03-16 11:18:59 UTC (rev 145989)
@@ -1,3 +1,15 @@
+2013-03-14 Xan Lopez <[email protected]>
+
+ [GTK] Wrong ASSERT in AudioDestinationGstreamer::stop
+ https://bugs.webkit.org/show_bug.cgi?id=112344
+
+ Reviewed by Philippe Normand.
+
+ Correct erroneous ASSERT, we want both member variables to exist.
+
+ * platform/audio/gstreamer/AudioDestinationGStreamer.cpp:
+ (WebCore::AudioDestinationGStreamer::stop):
+
2013-03-13 Carlos Garcia Campos <[email protected]>
[GTK] Add webkit_uri_request_get_http_headers to WebKit2 GTK+ API
Modified: releases/WebKitGTK/webkit-2.0/Source/WebCore/platform/audio/gstreamer/AudioDestinationGStreamer.cpp (145988 => 145989)
--- releases/WebKitGTK/webkit-2.0/Source/WebCore/platform/audio/gstreamer/AudioDestinationGStreamer.cpp 2013-03-16 08:51:52 UTC (rev 145988)
+++ releases/WebKitGTK/webkit-2.0/Source/WebCore/platform/audio/gstreamer/AudioDestinationGStreamer.cpp 2013-03-16 11:18:59 UTC (rev 145989)
@@ -187,7 +187,7 @@
void AudioDestinationGStreamer::stop()
{
ASSERT(m_wavParserAvailable && m_audioSinkAvailable);
- if (!m_wavParserAvailable || m_audioSinkAvailable)
+ if (!m_wavParserAvailable || !m_audioSinkAvailable)
return;
gst_element_set_state(m_pipeline, GST_STATE_PAUSED);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
