Title: [198411] branches/safari-601-branch/Source/WebCore
- Revision
- 198411
- Author
- bshaf...@apple.com
- Date
- 2016-03-18 08:41:38 -0700 (Fri, 18 Mar 2016)
Log Message
Merged r198370. rdar://problem/25234857
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (198410 => 198411)
--- branches/safari-601-branch/Source/WebCore/ChangeLog 2016-03-18 15:40:28 UTC (rev 198410)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2016-03-18 15:41:38 UTC (rev 198411)
@@ -1,5 +1,20 @@
2016-03-18 Babak Shafiei <bshaf...@apple.com>
+ Merge r198370.
+
+ 2016-03-17 Eric Carlson <eric.carl...@apple.com>
+
+ Improve some metadata tests
+ https://bugs.webkit.org/show_bug.cgi?id=155616
+
+ Reviewed by Saam Barati.
+
+ * html/track/DataCue.cpp:
+ (WebCore::DataCue::DataCue):
+ (WebCore::DataCue::setData):
+
+2016-03-18 Babak Shafiei <bshaf...@apple.com>
+
Merge r198361.
2016-03-17 Brent Fulgham <bfulg...@apple.com>
Modified: branches/safari-601-branch/Source/WebCore/html/track/DataCue.cpp (198410 => 198411)
--- branches/safari-601-branch/Source/WebCore/html/track/DataCue.cpp 2016-03-18 15:40:28 UTC (rev 198410)
+++ branches/safari-601-branch/Source/WebCore/html/track/DataCue.cpp 2016-03-18 15:41:38 UTC (rev 198411)
@@ -62,6 +62,8 @@
, m_type(type)
, m_value(value)
{
+ if (m_value)
+ JSC::gcProtect(m_value);
}
#endif
@@ -95,6 +97,8 @@
#if ENABLE(DATACUE_VALUE)
m_platformValue = nullptr;
+ if (m_value)
+ JSC::gcUnprotect(m_value);
m_value = JSC::JSValue();
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
