Title: [230281] tags/Safari-606.1.12/Source/WebCore
- Revision
- 230281
- Author
- [email protected]
- Date
- 2018-04-04 15:58:02 -0700 (Wed, 04 Apr 2018)
Log Message
Cherry-pick r230272. rdar://problem/39007591
RELEASE_ASSERT in CaptionUserPreferencesMediaAF::CaptionUserPreferencesMediaAF() when MediaToolbox.framework missing
https://bugs.webkit.org/show_bug.cgi?id=184247
<rdar://problem/39007591>
Rubber-stamped by Eric Carlson.
Use SOFT_LINK_FRAMEWORK_OPTIONAL for frameworks which are not guaranteed to be present.
* page/CaptionUserPreferencesMediaAF.cpp:
(WebCore::CaptionUserPreferencesMediaAF::CaptionUserPreferencesMediaAF):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@230272 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: tags/Safari-606.1.12/Source/WebCore/ChangeLog (230280 => 230281)
--- tags/Safari-606.1.12/Source/WebCore/ChangeLog 2018-04-04 22:29:25 UTC (rev 230280)
+++ tags/Safari-606.1.12/Source/WebCore/ChangeLog 2018-04-04 22:58:02 UTC (rev 230281)
@@ -1,3 +1,34 @@
+2018-04-04 Jason Marcell <[email protected]>
+
+ Cherry-pick r230272. rdar://problem/39007591
+
+ RELEASE_ASSERT in CaptionUserPreferencesMediaAF::CaptionUserPreferencesMediaAF() when MediaToolbox.framework missing
+ https://bugs.webkit.org/show_bug.cgi?id=184247
+ <rdar://problem/39007591>
+
+ Rubber-stamped by Eric Carlson.
+
+ Use SOFT_LINK_FRAMEWORK_OPTIONAL for frameworks which are not guaranteed to be present.
+
+ * page/CaptionUserPreferencesMediaAF.cpp:
+ (WebCore::CaptionUserPreferencesMediaAF::CaptionUserPreferencesMediaAF):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@230272 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-04-04 Jer Noble <[email protected]>
+
+ RELEASE_ASSERT in CaptionUserPreferencesMediaAF::CaptionUserPreferencesMediaAF() when MediaToolbox.framework missing
+ https://bugs.webkit.org/show_bug.cgi?id=184247
+ <rdar://problem/39007591>
+
+ Rubber-stamped by Eric Carlson.
+
+ Use SOFT_LINK_FRAMEWORK_OPTIONAL for frameworks which are not guaranteed to be present.
+
+ * page/CaptionUserPreferencesMediaAF.cpp:
+ (WebCore::CaptionUserPreferencesMediaAF::CaptionUserPreferencesMediaAF):
+
2018-04-04 Carlos Garcia Campos <[email protected]>
Unreviewed. Fix the build with libsoup < 2.49.91 after r230251.
Modified: tags/Safari-606.1.12/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp (230280 => 230281)
--- tags/Safari-606.1.12/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp 2018-04-04 22:29:25 UTC (rev 230280)
+++ tags/Safari-606.1.12/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp 2018-04-04 22:58:02 UTC (rev 230281)
@@ -85,7 +85,7 @@
#else
-SOFT_LINK_FRAMEWORK(MediaToolbox)
+SOFT_LINK_FRAMEWORK_OPTIONAL(MediaToolbox)
SOFT_LINK_OPTIONAL(MediaToolbox, MTEnableCaption2015Behavior, Boolean, (), ())
#endif // PLATFORM(WIN)
@@ -118,6 +118,11 @@
if (!initialized) {
initialized = true;
+#if !PLATFORM(WIN)
+ if (!MediaToolboxLibrary())
+ return;
+#endif
+
MTEnableCaption2015BehaviorPtrType function = MTEnableCaption2015BehaviorPtr();
if (!function || !function())
return;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
