<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[163118] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/163118">163118</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2014-01-30 14:58:49 -0800 (Thu, 30 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Convert blocks to lambdas in iOS Fullscreen code.
https://bugs.webkit.org/show_bug.cgi?id=127946
Reviewed by Anders Carlsson.
Pushing a block into a std::function will eventually cause a crash, since std::function
does not know about Block_copy and Block_release.
Lamdas can be intrinsicly converted to blocks, but not vice versa. Switch over all the
blocks in the new iOS Fullscreen code to use lamdas, and use the ref-counted this object
directly rather than implicitly.
* platform/ios/WebVideoFullscreenControllerAVKit.mm:
(-[WebVideoFullscreenController exitFullscreen]):
* platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
(WebVideoFullscreenInterfaceAVKit::setVideoLayer):
(WebVideoFullscreenInterfaceAVKit::enterFullscreen):
(WebVideoFullscreenInterfaceAVKit::exitFullscreen):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformiosWebVideoFullscreenControllerAVKitmm">trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKitmm">trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163117 => 163118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-30 22:52:47 UTC (rev 163117)
+++ trunk/Source/WebCore/ChangeLog 2014-01-30 22:58:49 UTC (rev 163118)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-01-30 Jer Noble <jer.noble@apple.com>
+
+ [iOS] Convert blocks to lambdas in iOS Fullscreen code.
+ https://bugs.webkit.org/show_bug.cgi?id=127946
+
+ Reviewed by Anders Carlsson.
+
+ Pushing a block into a std::function will eventually cause a crash, since std::function
+ does not know about Block_copy and Block_release.
+
+ Lamdas can be intrinsicly converted to blocks, but not vice versa. Switch over all the
+ blocks in the new iOS Fullscreen code to use lamdas, and use the ref-counted this object
+ directly rather than implicitly.
+
+ * platform/ios/WebVideoFullscreenControllerAVKit.mm:
+ (-[WebVideoFullscreenController exitFullscreen]):
+ * platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
+ (WebVideoFullscreenInterfaceAVKit::setVideoLayer):
+ (WebVideoFullscreenInterfaceAVKit::enterFullscreen):
+ (WebVideoFullscreenInterfaceAVKit::exitFullscreen):
+
</ins><span class="cx"> 2014-01-30 Martin Robinson <mrobinson@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] [CMake] Add a "make dist" target
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebVideoFullscreenControllerAVKitmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm (163117 => 163118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm 2014-01-30 22:52:47 UTC (rev 163117)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm 2014-01-30 22:58:49 UTC (rev 163118)
</span><span class="lines">@@ -80,16 +80,15 @@
</span><span class="cx">
</span><span class="cx"> - (void)exitFullscreen
</span><span class="cx"> {
</span><del>- __block RetainPtr<WebVideoFullscreenController> protect{self};
</del><ins>+ RetainPtr<WebVideoFullscreenController> strongSelf(self);
</ins><span class="cx">
</span><del>- _interface->exitFullscreen(^{
- WebThreadRun(^{
- _model->setMediaElement(nullptr);
- _interface->setWebVideoFullscreenModel(nullptr);
- _model->setWebVideoFullscreenInterface(nullptr);
- _model = nullptr;
- _interface = nullptr;
- protect.clear();
</del><ins>+ _interface->exitFullscreen([strongSelf]{
+ WebThreadRun([strongSelf]{
+ strongSelf->_model->setMediaElement(nullptr);
+ strongSelf->_interface->setWebVideoFullscreenModel(nullptr);
+ strongSelf->_model->setWebVideoFullscreenInterface(nullptr);
+ strongSelf->_model = nullptr;
+ strongSelf->_interface = nullptr;
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKitmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (163117 => 163118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2014-01-30 22:52:47 UTC (rev 163117)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2014-01-30 22:58:49 UTC (rev 163118)
</span><span class="lines">@@ -267,63 +267,64 @@
</span><span class="cx"> {
</span><span class="cx"> [m_playerController.get().playerLayer removeFromSuperlayer];
</span><span class="cx"> [videoLayer removeFromSuperlayer];
</span><del>- ASSERT([videoLayer isKindOfClass:[classAVPlayerLayer class]]
</del><ins>+ ASSERT(!videoLayer
+ || [videoLayer isKindOfClass:[classAVPlayerLayer class]]
</ins><span class="cx"> || ([videoLayer isKindOfClass:[CALayer class]] && [videoLayer conformsToProtocol:@protocol(AVPlayerLayer)]));
</span><span class="cx"> m_playerController.get().playerLayer = (CALayer<AVPlayerLayer>*)videoLayer;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebVideoFullscreenInterfaceAVKit::enterFullscreen(std::function<void()> completion)
</span><span class="cx"> {
</span><del>- __block RefPtr<WebVideoFullscreenInterfaceAVKit> protect(this);
</del><ins>+ RefPtr<WebVideoFullscreenInterfaceAVKit> strongThis(this);
</ins><span class="cx">
</span><del>- dispatch_async(dispatch_get_main_queue(), ^{
- m_playerViewController = [[[classAVPlayerViewController alloc] init] autorelease];
- m_playerViewController.get().playerController = (AVPlayerController *)m_playerController.get();
</del><ins>+ dispatch_async(dispatch_get_main_queue(), [strongThis, completion]{
+ strongThis->m_playerViewController = [[[classAVPlayerViewController alloc] init] autorelease];
+ strongThis->m_playerViewController.get().playerController = (AVPlayerController *)strongThis->m_playerController.get();
</ins><span class="cx">
</span><del>- if ([m_playerViewController respondsToSelector:@selector(setDelegate:)])
- m_playerViewController.get().delegate = m_playerController.get();
</del><ins>+ if ([strongThis->m_playerViewController respondsToSelector:@selector(setDelegate:)])
+ strongThis->m_playerViewController.get().delegate = strongThis->m_playerController.get();
</ins><span class="cx">
</span><del>- m_viewController = adoptNS([[classUIViewController alloc] init]);
</del><ins>+ strongThis->m_viewController = adoptNS([[classUIViewController alloc] init]);
</ins><span class="cx">
</span><del>- m_window = [[[classUIWindow alloc] initWithFrame:[[classUIScreen mainScreen] bounds]] autorelease];
- m_window.get().backgroundColor = [classUIColor clearColor];
- m_window.get().rootViewController = m_viewController.get();
- [m_window makeKeyAndVisible];
</del><ins>+ strongThis->m_window = [[[classUIWindow alloc] initWithFrame:[[classUIScreen mainScreen] bounds]] autorelease];
+ strongThis->m_window.get().backgroundColor = [classUIColor clearColor];
+ strongThis->m_window.get().rootViewController = strongThis->m_viewController.get();
+ [strongThis->m_window makeKeyAndVisible];
</ins><span class="cx">
</span><del>- [m_viewController presentViewController:m_playerViewController.get() animated:YES completion:nil];
- completion();
- protect.clear();
</del><ins>+ [strongThis->m_viewController presentViewController:strongThis->m_playerViewController.get() animated:YES completion:nil];
+ if (completion)
+ completion();
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebVideoFullscreenInterfaceAVKit::enterFullscreen()
</span><span class="cx"> {
</span><del>- enterFullscreen(^{ });
</del><ins>+ enterFullscreen(nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebVideoFullscreenInterfaceAVKit::exitFullscreen(std::function<void()> completion)
</span><span class="cx"> {
</span><span class="cx"> m_playerController.clear();
</span><del>- __block RefPtr<WebVideoFullscreenInterfaceAVKit> protect(this);
</del><ins>+ RefPtr<WebVideoFullscreenInterfaceAVKit> strongThis(this);
</ins><span class="cx">
</span><del>- dispatch_async(dispatch_get_main_queue(), ^{
- [m_viewController dismissViewControllerAnimated:YES completion:^{
- m_window.get().hidden = YES;
- m_window.get().rootViewController = nil;
- m_playerViewController = nil;
- m_viewController = nil;
- m_window = nil;
- if (m_videoFullscreenModel)
- m_videoFullscreenModel->didExitFullscreen();
- completion();
- protect.clear();
</del><ins>+ dispatch_async(dispatch_get_main_queue(), [strongThis, completion]{
+ [strongThis->m_viewController dismissViewControllerAnimated:YES completion:[strongThis, completion]{
+ strongThis->m_window.get().hidden = YES;
+ strongThis->m_window.get().rootViewController = nil;
+ strongThis->m_playerViewController = nil;
+ strongThis->m_viewController = nil;
+ strongThis->m_window = nil;
+ if (strongThis->m_videoFullscreenModel)
+ strongThis->m_videoFullscreenModel->didExitFullscreen();
+ if (completion)
+ completion();
</ins><span class="cx"> }];
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebVideoFullscreenInterfaceAVKit::exitFullscreen()
</span><span class="cx"> {
</span><del>- exitFullscreen(^{ });
</del><ins>+ exitFullscreen(nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>