<!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>[187695] branches/safari-601.1-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/187695">187695</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-07-31 17:19:07 -0700 (Fri, 31 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/187684">r187684</a>. rdar://problem/22000865</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6011branchSourceWebCoreChangeLog">branches/safari-601.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6011branchSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKitmm">branches/safari-601.1-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm</a></li>
<li><a href="#branchessafari6011branchSourceWebCoreplatformspicocoaAVKitSPIh">branches/safari-601.1-branch/Source/WebCore/platform/spi/cocoa/AVKitSPI.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6011branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (187694 => 187695)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-08-01 00:09:23 UTC (rev 187694)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-08-01 00:19:07 UTC (rev 187695)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2015-07-31 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r187684.
+
+ 2015-07-31 Jeremy Jones <jeremyj@apple.com>
+
+ Rename AVPlayerLayerView to _AVPlayerLayerView.
+ https://bugs.webkit.org/show_bug.cgi?id=147399
+
+ Reviewed by Eric Carlson.
+
+ Change class name AVPlayerLayerView to match change in AVKit SPI.
+ This prevents conflicts with 3rd party apps.
+
+ * platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
+ (WebAVPlayerLayerView_dealloc):
+ (getWebAVPlayerLayerViewClass):
+ * platform/spi/cocoa/AVKitSPI.h:
+
+2015-07-31 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r187675.
</span><span class="cx">
</span><span class="cx"> 2015-07-31 Jer Noble <jer.noble@apple.com>
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKitmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (187694 => 187695)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2015-08-01 00:09:23 UTC (rev 187694)
+++ branches/safari-601.1-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2015-08-01 00:19:07 UTC (rev 187695)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> SOFT_LINK_CLASS(AVKit, AVPlayerController)
</span><span class="cx"> SOFT_LINK_CLASS(AVKit, AVPlayerViewController)
</span><span class="cx"> SOFT_LINK_CLASS(AVKit, AVValueTiming)
</span><del>-SOFT_LINK_CLASS(AVKit, AVPlayerLayerView)
</del><ins>+SOFT_LINK_CLASS(AVKit, __AVPlayerLayerView)
</ins><span class="cx">
</span><span class="cx"> SOFT_LINK_FRAMEWORK(UIKit)
</span><span class="cx"> SOFT_LINK_CLASS(UIKit, UIApplication)
</span><span class="lines">@@ -758,7 +758,7 @@
</span><span class="cx"> return theClass;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-@interface WebAVPlayerLayerView : AVPlayerLayerView
</del><ins>+@interface WebAVPlayerLayerView : __AVPlayerLayerView
</ins><span class="cx"> @property (retain) UIView* videoView;
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="lines">@@ -769,21 +769,21 @@
</span><span class="cx">
</span><span class="cx"> static AVPlayerController *WebAVPlayerLayerView_playerController(id aSelf, SEL)
</span><span class="cx"> {
</span><del>- AVPlayerLayerView *playerLayer = aSelf;
</del><ins>+ __AVPlayerLayerView *playerLayer = aSelf;
</ins><span class="cx"> WebAVPlayerLayer *webAVPlayerLayer = (WebAVPlayerLayer *)[playerLayer playerLayer];
</span><span class="cx"> return [webAVPlayerLayer playerController];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void WebAVPlayerLayerView_setPlayerController(id aSelf, SEL, AVPlayerController *playerController)
</span><span class="cx"> {
</span><del>- AVPlayerLayerView *playerLayerView = aSelf;
</del><ins>+ __AVPlayerLayerView *playerLayerView = aSelf;
</ins><span class="cx"> WebAVPlayerLayer *webAVPlayerLayer = (WebAVPlayerLayer *)[playerLayerView playerLayer];
</span><span class="cx"> [webAVPlayerLayer setPlayerController: playerController];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static UIView *WebAVPlayerLayerView_videoView(id aSelf, SEL)
</span><span class="cx"> {
</span><del>- AVPlayerLayerView *playerLayer = aSelf;
</del><ins>+ __AVPlayerLayerView *playerLayer = aSelf;
</ins><span class="cx"> WebAVPlayerLayer *webAVPlayerLayer = (WebAVPlayerLayer *)[playerLayer playerLayer];
</span><span class="cx"> CALayer* videoLayer = [webAVPlayerLayer videoSublayer];
</span><span class="cx"> if (!videoLayer)
</span><span class="lines">@@ -794,7 +794,7 @@
</span><span class="cx">
</span><span class="cx"> static void WebAVPlayerLayerView_setVideoView(id aSelf, SEL, UIView *videoView)
</span><span class="cx"> {
</span><del>- AVPlayerLayerView *playerLayerView = aSelf;
</del><ins>+ __AVPlayerLayerView *playerLayerView = aSelf;
</ins><span class="cx"> WebAVPlayerLayer *webAVPlayerLayer = (WebAVPlayerLayer *)[playerLayerView playerLayer];
</span><span class="cx"> [webAVPlayerLayer setVideoSublayer:[videoView layer]];
</span><span class="cx"> }
</span><span class="lines">@@ -837,7 +837,7 @@
</span><span class="cx"> WebAVPlayerLayerView *playerLayerView = aSelf;
</span><span class="cx"> RetainPtr<WebAVPictureInPicturePlayerLayerView> pipView = adoptNS([playerLayerView valueForKey:@"_pictureInPicturePlayerLayerView"]);
</span><span class="cx"> [playerLayerView setValue:nil forKey:@"_pictureInPicturePlayerLayerView"];
</span><del>- objc_super superClass { playerLayerView, getAVPlayerLayerViewClass() };
</del><ins>+ objc_super superClass { playerLayerView, get__AVPlayerLayerViewClass() };
</ins><span class="cx"> auto super_dealloc = reinterpret_cast<void(*)(objc_super*, SEL)>(objc_msgSendSuper);
</span><span class="cx"> super_dealloc(&superClass, @selector(dealloc));
</span><span class="cx"> }
</span><span class="lines">@@ -849,7 +849,7 @@
</span><span class="cx"> static Class theClass = nil;
</span><span class="cx"> static dispatch_once_t onceToken;
</span><span class="cx"> dispatch_once(&onceToken, ^{
</span><del>- theClass = objc_allocateClassPair(getAVPlayerLayerViewClass(), "WebAVPlayerLayerView", 0);
</del><ins>+ theClass = objc_allocateClassPair(get__AVPlayerLayerViewClass(), "WebAVPlayerLayerView", 0);
</ins><span class="cx"> class_addMethod(theClass, @selector(dealloc), (IMP)WebAVPlayerLayerView_dealloc, "v@:");
</span><span class="cx"> class_addMethod(theClass, @selector(setPlayerController:), (IMP)WebAVPlayerLayerView_setPlayerController, "v@:@");
</span><span class="cx"> class_addMethod(theClass, @selector(playerController), (IMP)WebAVPlayerLayerView_playerController, "@@:");
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCoreplatformspicocoaAVKitSPIh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/platform/spi/cocoa/AVKitSPI.h (187694 => 187695)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/platform/spi/cocoa/AVKitSPI.h 2015-08-01 00:09:23 UTC (rev 187694)
+++ branches/safari-601.1-branch/Source/WebCore/platform/spi/cocoa/AVKitSPI.h 2015-08-01 00:19:07 UTC (rev 187695)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> @property (nonatomic, readonly) AVPlayerLayer *playerLayer;
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-@interface AVPlayerLayerView : UIView
</del><ins>+@interface __AVPlayerLayerView : UIView
</ins><span class="cx"> @property (nonatomic, readonly) AVPlayerLayer *playerLayer;
</span><span class="cx"> @property (nonatomic, readonly) AVPictureInPicturePlayerLayerView *pictureInPicturePlayerLayerView;
</span><span class="cx"> - (void)startRoutingVideoToPictureInPicturePlayerLayerView;
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @interface AVPlayerViewController (Details)
</span><del>-- (instancetype)initWithPlayerLayerView:(AVPlayerLayerView *)playerLayerView;
</del><ins>+- (instancetype)initWithPlayerLayerView:(__AVPlayerLayerView *)playerLayerView;
</ins><span class="cx"> - (void)enterFullScreenAnimated:(BOOL)animated completionHandler:(void (^)(BOOL success, NSError *))completionHandler;
</span><span class="cx"> - (void)exitFullScreenAnimated:(BOOL)animated completionHandler:(void (^)(BOOL success, NSError *))completionHandler;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>