<!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>[175090] branches/safari-600.1.4.12-branch/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/175090">175090</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2014-10-23 00:01:02 -0700 (Thu, 23 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/173974">r173974</a>. rdar://problem/18742384</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001412branchSourceWebCoreChangeLog">branches/safari-600.1.4.12-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001412branchSourceWebCoreplatformiosWebVideoFullscreenControllerAVKitmm">branches/safari-600.1.4.12-branch/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm</a></li>
<li><a href="#branchessafari6001412branchSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKitmm">branches/safari-600.1.4.12-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001412branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.12-branch/Source/WebCore/ChangeLog (175089 => 175090)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.12-branch/Source/WebCore/ChangeLog 2014-10-23 06:54:06 UTC (rev 175089)
+++ branches/safari-600.1.4.12-branch/Source/WebCore/ChangeLog 2014-10-23 07:01:02 UTC (rev 175090)
</span><span class="lines">@@ -1,5 +1,35 @@
</span><span class="cx"> 2014-10-22 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r173974.
+
+ 2014-09-25 Jeremy Jones <jeremyj@apple.com>
+
+ Race in ref pointer for WebVideoFullscreenInterfaceAVKit.
+ https://bugs.webkit.org/show_bug.cgi?id=137123
+
+ Reviewed by Eric Carlson.
+
+ Add WebThreadRun to prevent race with RefPtr of WebVideoFullscreenInterfaceAVKit.
+
+ * platform/ios/WebVideoFullscreenControllerAVKit.mm:
+ (-[WebVideoFullscreenController didSetupFullscreen]): add WebThreadRun
+ * platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
+ (WebVideoFullscreenInterfaceAVKit::setDuration): ditto
+ (WebVideoFullscreenInterfaceAVKit::setCurrentTime): ditto
+ (WebVideoFullscreenInterfaceAVKit::setRate): ditto
+ (WebVideoFullscreenInterfaceAVKit::setVideoDimensions): ditto
+ (WebVideoFullscreenInterfaceAVKit::setSeekableRanges): ditto
+ (WebVideoFullscreenInterfaceAVKit::setAudioMediaSelectionOptions): ditto
+ (WebVideoFullscreenInterfaceAVKit::setLegibleMediaSelectionOptions): ditto
+ (WebVideoFullscreenInterfaceAVKit::setExternalPlayback): ditto
+ (WebVideoFullscreenInterfaceAVKit::setupFullscreen): ditto
+ (WebVideoFullscreenInterfaceAVKit::enterFullscreen): ditto
+ (WebVideoFullscreenInterfaceAVKit::exitFullscreen): ditto
+ (WebVideoFullscreenInterfaceAVKit::cleanupFullscreen): ditto
+ (WebVideoFullscreenInterfaceAVKit::requestHideAndExitFullscreen): ditto
+
+2014-10-22 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r173848.
</span><span class="cx">
</span><span class="cx"> 2014-09-22 Alexey Proskuryakov <ap@apple.com>
</span></span></pre></div>
<a id="branchessafari6001412branchSourceWebCoreplatformiosWebVideoFullscreenControllerAVKitmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.12-branch/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm (175089 => 175090)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.12-branch/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm 2014-10-23 06:54:06 UTC (rev 175089)
+++ branches/safari-600.1.4.12-branch/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm 2014-10-23 07:01:02 UTC (rev 175090)
</span><span class="lines">@@ -141,8 +141,10 @@
</span><span class="cx">
</span><span class="cx"> - (void)didSetupFullscreen
</span><span class="cx"> {
</span><del>- _model->setVideoFullscreenLayer(_videoFullscreenLayer.get());
- _interface->enterFullscreen();
</del><ins>+ WebThreadRun(^{
+ _model->setVideoFullscreenLayer(_videoFullscreenLayer.get());
+ _interface->enterFullscreen();
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)didEnterFullscreen
</span></span></pre></div>
<a id="branchessafari6001412branchSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKitmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.12-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (175089 => 175090)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.12-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2014-10-23 06:54:06 UTC (rev 175089)
+++ branches/safari-600.1.4.12-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2014-10-23 07:01:02 UTC (rev 175090)
</span><span class="lines">@@ -607,7 +607,9 @@
</span><span class="cx"> playerController.minTime = 0;
</span><span class="cx"> playerController.status = AVPlayerControllerStatusReadyToPlay;
</span><span class="cx">
</span><del>- protect = nullptr;
</del><ins>+ WebThreadRun(^{
+ protect = nullptr;
+ });
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -621,7 +623,9 @@
</span><span class="cx"> anchorTimeStamp:anchorTimeStamp rate:0];
</span><span class="cx"> playerController().timing = timing;
</span><span class="cx">
</span><del>- protect = nullptr;
</del><ins>+ WebThreadRun(^{
+ protect = nullptr;
+ });
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -632,7 +636,9 @@
</span><span class="cx"> dispatch_async(dispatch_get_main_queue(), ^{
</span><span class="cx"> playerController().rate = isPlaying ? playbackRate : 0.;
</span><span class="cx">
</span><del>- protect = nullptr;
</del><ins>+ WebThreadRun(^{
+ protect = nullptr;
+ });
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -644,7 +650,9 @@
</span><span class="cx"> playerController().hasEnabledVideo = hasVideo;
</span><span class="cx"> playerController().contentDimensions = CGSizeMake(width, height);
</span><span class="cx">
</span><del>- protect = nullptr;
</del><ins>+ WebThreadRun(^{
+ protect = nullptr;
+ });
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -666,7 +674,9 @@
</span><span class="cx"> dispatch_async(dispatch_get_main_queue(), ^{
</span><span class="cx"> playerController().seekableTimeRanges = seekableRanges;
</span><span class="cx">
</span><del>- protect = nullptr;
</del><ins>+ WebThreadRun(^{
+ protect = nullptr;
+ });
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -696,7 +706,9 @@
</span><span class="cx"> if (selectedIndex < webOptions.count)
</span><span class="cx"> playerController().currentAudioMediaSelectionOption = webOptions[(size_t)selectedIndex];
</span><span class="cx">
</span><del>- protect = nullptr;
</del><ins>+ WebThreadRun(^{
+ protect = nullptr;
+ });
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -710,7 +722,9 @@
</span><span class="cx"> if (selectedIndex < webOptions.count)
</span><span class="cx"> playerController().currentLegibleMediaSelectionOption = webOptions[(size_t)selectedIndex];
</span><span class="cx">
</span><del>- protect = nullptr;
</del><ins>+ WebThreadRun(^{
+ protect = nullptr;
+ });
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -730,7 +744,9 @@
</span><span class="cx"> playerController().externalPlaybackActive = enabled;
</span><span class="cx"> [m_videoLayerContainer.get() setHidden:enabled];
</span><span class="cx">
</span><del>- protect = nullptr;
</del><ins>+ WebThreadRun(^{
+ protect = nullptr;
+ });
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -787,10 +803,12 @@
</span><span class="cx"> [CATransaction commit];
</span><span class="cx">
</span><span class="cx"> dispatch_async(dispatch_get_main_queue(), ^{
</span><del>- if (m_fullscreenChangeObserver)
- m_fullscreenChangeObserver->didSetupFullscreen();
-
- protect = nullptr;
</del><ins>+ WebThreadRun(^{
+ if (m_fullscreenChangeObserver)
+ m_fullscreenChangeObserver->didSetupFullscreen();
+
+ protect = nullptr;
+ });
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -804,9 +822,13 @@
</span><span class="cx"> [m_playerViewController enterFullScreenWithCompletionHandler:^(BOOL, NSError*)
</span><span class="cx"> {
</span><span class="cx"> [m_playerViewController setShowsPlaybackControls:YES];
</span><del>- if (m_fullscreenChangeObserver)
- m_fullscreenChangeObserver->didEnterFullscreen();
- protect = nullptr;
</del><ins>+
+ WebThreadRun(^{
+ if (m_fullscreenChangeObserver)
+ m_fullscreenChangeObserver->didEnterFullscreen();
+
+ protect = nullptr;
+ });
</ins><span class="cx"> }];
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -830,9 +852,12 @@
</span><span class="cx"> [m_playerViewController exitFullScreenWithCompletionHandler:^(BOOL, NSError*) {
</span><span class="cx"> [m_videoLayerContainer setBackgroundColor:[[getUIColorClass() clearColor] CGColor]];
</span><span class="cx"> [[m_playerViewController view] setBackgroundColor:[getUIColorClass() clearColor]];
</span><del>- if (m_fullscreenChangeObserver)
- m_fullscreenChangeObserver->didExitFullscreen();
- protect = nullptr;
</del><ins>+
+ WebThreadRun(^{
+ if (m_fullscreenChangeObserver)
+ m_fullscreenChangeObserver->didExitFullscreen();
+ protect = nullptr;
+ });
</ins><span class="cx"> }];
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -872,9 +897,11 @@
</span><span class="cx"> m_window = nil;
</span><span class="cx"> m_parentView = nil;
</span><span class="cx">
</span><del>- if (m_fullscreenChangeObserver)
- m_fullscreenChangeObserver->didCleanupFullscreen();
- protect = nullptr;
</del><ins>+ WebThreadRun(^{
+ if (m_fullscreenChangeObserver)
+ m_fullscreenChangeObserver->didCleanupFullscreen();
+ protect = nullptr;
+ });
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -908,7 +935,9 @@
</span><span class="cx"> dispatch_async(dispatch_get_main_queue(), ^{
</span><span class="cx"> [m_window setHidden:YES];
</span><span class="cx"> [m_playerViewController exitFullScreenAnimated:NO completionHandler:^(BOOL, NSError*) {
</span><del>- protect = nullptr;
</del><ins>+ WebThreadRun(^{
+ protect = nullptr;
+ });
</ins><span class="cx"> }];
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>