Title: [165443] releases/WebKitGTK/webkit-2.4/Source/WebCore
- Revision
- 165443
- Author
- [email protected]
- Date
- 2014-03-11 04:03:46 -0700 (Tue, 11 Mar 2014)
Log Message
Merge r165257 - [GTK] Timeout sources not correctly removed
https://bugs.webkit.org/show_bug.cgi?id=129877
Reviewed by Philippe Normand.
Set source ID variables to 0 after removing the sources from the
context. Also give a name to the sources.
* platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp:
(WebCore::TrackPrivateBaseGStreamer::disconnect):
(WebCore::TrackPrivateBaseGStreamer::activeChanged):
(WebCore::TrackPrivateBaseGStreamer::tagsChanged):
(WebCore::TrackPrivateBaseGStreamer::notifyTrackOfActiveChanged):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog (165442 => 165443)
--- releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2014-03-11 10:56:51 UTC (rev 165442)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2014-03-11 11:03:46 UTC (rev 165443)
@@ -1,3 +1,19 @@
+2014-03-07 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Timeout sources not correctly removed
+ https://bugs.webkit.org/show_bug.cgi?id=129877
+
+ Reviewed by Philippe Normand.
+
+ Set source ID variables to 0 after removing the sources from the
+ context. Also give a name to the sources.
+
+ * platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp:
+ (WebCore::TrackPrivateBaseGStreamer::disconnect):
+ (WebCore::TrackPrivateBaseGStreamer::activeChanged):
+ (WebCore::TrackPrivateBaseGStreamer::tagsChanged):
+ (WebCore::TrackPrivateBaseGStreamer::notifyTrackOfActiveChanged):
+
2014-03-03 Lorenzo Tilve <[email protected]>
Optimize StylePropertiesSet::findPropertyIndex() to improve CSS properties performance
Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp (165442 => 165443)
--- releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp 2014-03-11 10:56:51 UTC (rev 165442)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp 2014-03-11 11:03:46 UTC (rev 165443)
@@ -97,9 +97,11 @@
if (m_activeTimerHandler)
g_source_remove(m_activeTimerHandler);
+ m_activeTimerHandler = 0;
if (m_tagTimerHandler)
g_source_remove(m_tagTimerHandler);
+ m_tagTimerHandler = 0;
m_pad.clear();
m_tags.clear();
@@ -111,6 +113,7 @@
g_source_remove(m_activeTimerHandler);
m_activeTimerHandler = g_timeout_add(0,
reinterpret_cast<GSourceFunc>(trackPrivateActiveChangeTimeoutCallback), this);
+ g_source_set_name_by_id(m_activeTimerHandler, "[WebKit] trackPrivateActiveChangeTimeoutCallback");
}
void TrackPrivateBaseGStreamer::tagsChanged()
@@ -127,10 +130,12 @@
m_tagTimerHandler = g_timeout_add(0,
reinterpret_cast<GSourceFunc>(trackPrivateTagsChangeTimeoutCallback), this);
+ g_source_set_name_by_id(m_tagTimerHandler, "[WebKit] trackPrivateTagsChangeTimeoutCallback");
}
void TrackPrivateBaseGStreamer::notifyTrackOfActiveChanged()
{
+ m_activeTimerHandler = 0;
if (!m_pad)
return;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
