Title: [269970] branches/safari-611.1.6-branch/Source/WebCore
- Revision
- 269970
- Author
- [email protected]
- Date
- 2020-11-18 11:31:27 -0800 (Wed, 18 Nov 2020)
Log Message
Cherry-pick r269944. rdar://problem/71547824
REGRESSION(r269614): [iOS] WebContent crashes when entering Full Screen video with text captions
https://bugs.webkit.org/show_bug.cgi?id=219065
Reviewed by Tim Horton.
Pass a CGImageRef of the video caption to CALayer instead of passing a
NativeImage which is now a WebCore class.
* platform/graphics/cocoa/TextTrackRepresentationCocoa.mm:
(WebCore::TextTrackRepresentationCocoa::update):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@269944 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-611.1.6-branch/Source/WebCore/ChangeLog (269969 => 269970)
--- branches/safari-611.1.6-branch/Source/WebCore/ChangeLog 2020-11-18 18:42:36 UTC (rev 269969)
+++ branches/safari-611.1.6-branch/Source/WebCore/ChangeLog 2020-11-18 19:31:27 UTC (rev 269970)
@@ -1,3 +1,34 @@
+2020-11-18 Kocsen Chung <[email protected]>
+
+ Cherry-pick r269944. rdar://problem/71547824
+
+ REGRESSION(r269614): [iOS] WebContent crashes when entering Full Screen video with text captions
+ https://bugs.webkit.org/show_bug.cgi?id=219065
+
+ Reviewed by Tim Horton.
+
+ Pass a CGImageRef of the video caption to CALayer instead of passing a
+ NativeImage which is now a WebCore class.
+
+ * platform/graphics/cocoa/TextTrackRepresentationCocoa.mm:
+ (WebCore::TextTrackRepresentationCocoa::update):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@269944 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-11-17 Said Abou-Hallawa <[email protected]>
+
+ REGRESSION(r269614): [iOS] WebContent crashes when entering Full Screen video with text captions
+ https://bugs.webkit.org/show_bug.cgi?id=219065
+
+ Reviewed by Tim Horton.
+
+ Pass a CGImageRef of the video caption to CALayer instead of passing a
+ NativeImage which is now a WebCore class.
+
+ * platform/graphics/cocoa/TextTrackRepresentationCocoa.mm:
+ (WebCore::TextTrackRepresentationCocoa::update):
+
2020-11-16 Antti Koivisto <[email protected]>
[LFC][Integration] Remove isLastTextRunOnLine/isLastTextRun from run iterator
Modified: branches/safari-611.1.6-branch/Source/WebCore/platform/graphics/cocoa/TextTrackRepresentationCocoa.mm (269969 => 269970)
--- branches/safari-611.1.6-branch/Source/WebCore/platform/graphics/cocoa/TextTrackRepresentationCocoa.mm 2020-11-18 18:42:36 UTC (rev 269969)
+++ branches/safari-611.1.6-branch/Source/WebCore/platform/graphics/cocoa/TextTrackRepresentationCocoa.mm 2020-11-18 19:31:27 UTC (rev 269970)
@@ -130,7 +130,7 @@
void TextTrackRepresentationCocoa::update()
{
if (auto representation = m_client.createTextTrackRepresentationImage())
- [m_layer.get() setContents:(__bridge id)representation->nativeImage().get()];
+ [m_layer.get() setContents:(__bridge id)representation->nativeImage()->platformImage().get()];
}
void TextTrackRepresentationCocoa::setContentScale(float scale)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
