Title: [171112] tags/Safari-538.46.1.1/Source/WebCore
- Revision
- 171112
- Author
- bshaf...@apple.com
- Date
- 2014-07-15 12:41:32 -0700 (Tue, 15 Jul 2014)
Log Message
Merged r171099. <rdar://problem/16917699>
Modified Paths
Diff
Modified: tags/Safari-538.46.1.1/Source/WebCore/ChangeLog (171111 => 171112)
--- tags/Safari-538.46.1.1/Source/WebCore/ChangeLog 2014-07-15 19:38:13 UTC (rev 171111)
+++ tags/Safari-538.46.1.1/Source/WebCore/ChangeLog 2014-07-15 19:41:32 UTC (rev 171112)
@@ -1,5 +1,21 @@
2014-07-15 Babak Shafiei <bshaf...@apple.com>
+ Merge r171099
+
+ 2014-07-14 Jeremy Jones <jere...@apple.com>
+
+ Fix crash on WebVideoFullscreenManagerProxy construction.
+ https://bugs.webkit.org/show_bug.cgi?id=134909
+
+ Unreviewed fix crash from r171089
+
+ Remove unnecessary dispatch to main queue since it can happen during construction.
+
+ * platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
+ (WebVideoFullscreenInterfaceAVKit::setWebVideoFullscreenModel): remove dispatch_async
+
+2014-07-15 Babak Shafiei <bshaf...@apple.com>
+
Merge r171089
2014-07-14 Jeremy Jones <jere...@apple.com>
Modified: tags/Safari-538.46.1.1/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (171111 => 171112)
--- tags/Safari-538.46.1.1/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2014-07-15 19:38:13 UTC (rev 171111)
+++ tags/Safari-538.46.1.1/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2014-07-15 19:41:32 UTC (rev 171112)
@@ -585,14 +585,7 @@
void WebVideoFullscreenInterfaceAVKit::setWebVideoFullscreenModel(WebVideoFullscreenModel* model)
{
m_videoFullscreenModel = model;
- __block RefPtr<WebVideoFullscreenInterfaceAVKit> protect(this);
-
- dispatch_async(dispatch_get_main_queue(), ^{
- if (m_playerController)
- playerController().delegate = m_videoFullscreenModel;
-
- protect.clear();
- });
+ [m_playerController setDelegate:m_videoFullscreenModel];
}
void WebVideoFullscreenInterfaceAVKit::setWebVideoFullscreenChangeObserver(WebVideoFullscreenChangeObserver* observer)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
