<!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>[187186] 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/187186">187186</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-07-22 14:40:08 -0700 (Wed, 22 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/187181">r187181</a>. rdar://problem/21928170</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>
</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 (187185 => 187186)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-22 21:36:04 UTC (rev 187185)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-22 21:40:08 UTC (rev 187186)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-07-22 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r187181.
+
+ 2015-07-22 Jeremy Jones <jeremyj@apple.com>
+
+ Adopt AVKit's AVSimplePlayerLayerView change for PiP.
+ https://bugs.webkit.org/show_bug.cgi?id=147186
+ <rdar://problem/21928170>
+
+ Reviewed by Jer Noble.
+
+ Adopt AVKit changes by inheriting from UIView instead of from AVPictureInPicturePlayerLayerView.
+
+ * platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
+ (WebAVPlayerLayerView_layerClass): Style.
+ (WebAVPlayerLayerView_playerController): Style.
+ (WebAVPlayerLayerView_videoView): Style.
+ (getWebAVPictureInPicturePlayerLayerViewClass): Inherit from UIView.
+
</ins><span class="cx"> 2015-07-21 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r186980.
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKitmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (187185 => 187186)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2015-07-22 21:36:04 UTC (rev 187185)
+++ branches/safari-601.1-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2015-07-22 21:40:08 UTC (rev 187186)
</span><span class="lines">@@ -61,7 +61,6 @@
</span><span class="cx"> SOFT_LINK_CLASS(AVKit, AVPlayerViewController)
</span><span class="cx"> SOFT_LINK_CLASS(AVKit, AVValueTiming)
</span><span class="cx"> SOFT_LINK_CLASS(AVKit, AVPlayerLayerView)
</span><del>-SOFT_LINK_CLASS(AVKit, AVPictureInPicturePlayerLayerView)
</del><span class="cx">
</span><span class="cx"> SOFT_LINK_FRAMEWORK(UIKit)
</span><span class="cx"> SOFT_LINK_CLASS(UIKit, UIApplication)
</span><span class="lines">@@ -735,7 +734,7 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-@interface WebAVPictureInPicturePlayerLayerView : AVPictureInPicturePlayerLayerView
</del><ins>+@interface WebAVPictureInPicturePlayerLayerView : UIView
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> static CALayer* WebAVPictureInPicturePlayerLayerView_layerClass(id, SEL)
</span><span class="lines">@@ -748,7 +747,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(getAVPictureInPicturePlayerLayerViewClass(), "WebAVPictureInPicturePlayerLayerView", 0);
</del><ins>+ theClass = objc_allocateClassPair(getUIViewClass(), "WebAVPictureInPicturePlayerLayerView", 0);
</ins><span class="cx"> objc_registerClassPair(theClass);
</span><span class="cx"> Class metaClass = objc_getMetaClass("WebAVPictureInPicturePlayerLayerView");
</span><span class="cx"> class_addMethod(metaClass, @selector(layerClass), (IMP)WebAVPictureInPicturePlayerLayerView_layerClass, "@@:");
</span><span class="lines">@@ -761,12 +760,12 @@
</span><span class="cx"> @property (retain) UIView* videoView;
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-static CALayer* WebAVPlayerLayerView_layerClass(id, SEL)
</del><ins>+static CALayer *WebAVPlayerLayerView_layerClass(id, SEL)
</ins><span class="cx"> {
</span><span class="cx"> return [WebAVPlayerLayer class];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static AVPlayerController* WebAVPlayerLayerView_playerController(id aSelf, SEL)
</del><ins>+static AVPlayerController *WebAVPlayerLayerView_playerController(id aSelf, SEL)
</ins><span class="cx"> {
</span><span class="cx"> AVPlayerLayerView *playerLayer = aSelf;
</span><span class="cx"> WebAVPlayerLayer *webAVPlayerLayer = (WebAVPlayerLayer *)[playerLayer playerLayer];
</span><span class="lines">@@ -780,7 +779,7 @@
</span><span class="cx"> [webAVPlayerLayer setPlayerController: playerController];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static UIView* WebAVPlayerLayerView_videoView(id aSelf, SEL)
</del><ins>+static UIView *WebAVPlayerLayerView_videoView(id aSelf, SEL)
</ins><span class="cx"> {
</span><span class="cx"> AVPlayerLayerView *playerLayer = aSelf;
</span><span class="cx"> WebAVPlayerLayer *webAVPlayerLayer = (WebAVPlayerLayer *)[playerLayer playerLayer];
</span><span class="lines">@@ -801,10 +800,10 @@
</span><span class="cx"> static void WebAVPlayerLayerView_startRoutingVideoToPictureInPicturePlayerLayerView(id aSelf, SEL)
</span><span class="cx"> {
</span><span class="cx"> WebAVPlayerLayerView *playerLayerView = aSelf;
</span><del>- AVPictureInPicturePlayerLayerView *pipView = [playerLayerView pictureInPicturePlayerLayerView];
</del><ins>+ WebAVPictureInPicturePlayerLayerView *pipView = (WebAVPictureInPicturePlayerLayerView *)[playerLayerView pictureInPicturePlayerLayerView];
</ins><span class="cx">
</span><span class="cx"> WebAVPlayerLayer *playerLayer = (WebAVPlayerLayer *)[playerLayerView playerLayer];
</span><del>- WebAVPlayerLayer *pipPlayerLayer = (WebAVPlayerLayer *)[pipView playerLayer];
</del><ins>+ WebAVPlayerLayer *pipPlayerLayer = (WebAVPlayerLayer *)[pipView layer];
</ins><span class="cx"> [playerLayer setVideoGravity:getAVLayerVideoGravityResizeAspect()];
</span><span class="cx"> [pipPlayerLayer setVideoSublayer:playerLayer.videoSublayer];
</span><span class="cx"> [pipPlayerLayer setVideoDimensions:playerLayer.videoDimensions];
</span><span class="lines">@@ -820,7 +819,7 @@
</span><span class="cx"> [playerLayerView addSubview:playerLayerView.videoView];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static AVPictureInPicturePlayerLayerView *WebAVPlayerLayerView_pictureInPicturePlayerLayerView(id aSelf, SEL)
</del><ins>+static WebAVPictureInPicturePlayerLayerView *WebAVPlayerLayerView_pictureInPicturePlayerLayerView(id aSelf, SEL)
</ins><span class="cx"> {
</span><span class="cx"> WebAVPlayerLayerView *playerLayerView = aSelf;
</span><span class="cx"> WebAVPictureInPicturePlayerLayerView *pipView = [playerLayerView valueForKey:@"_pictureInPicturePlayerLayerView"];
</span></span></pre>
</div>
</div>
</body>
</html>