<!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>[200206] tags/Safari-602.1.30/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/200206">200206</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-04-28 12:58:04 -0700 (Thu, 28 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/200205">r200205</a>. rdar://problem/25986324</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari602130SourceWebCoreChangeLog">tags/Safari-602.1.30/Source/WebCore/ChangeLog</a></li>
<li><a href="#tagsSafari602130SourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKitmm">tags/Safari-602.1.30/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari602130SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.30/Source/WebCore/ChangeLog (200205 => 200206)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.30/Source/WebCore/ChangeLog 2016-04-28 19:52:16 UTC (rev 200205)
+++ tags/Safari-602.1.30/Source/WebCore/ChangeLog 2016-04-28 19:58:04 UTC (rev 200206)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-04-28 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r200205.
+
+ 2016-04-28 Dan Bernstein <mitz@apple.com>
+
+ <rdar://problem/25986324> WebKit build broken with error: undeclared selector 'childViewControllerForWhitePointAdaptivityStyle'
+
+ Fixed the build by removing use of API that no longer does anything.
+
+ * platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
+ (WebVideoFullscreenInterfaceAVKit::setupFullscreen): Revert to using a plain UIViewController.
+ (createFullScreenVideoRootViewControllerClass): Deleted.
+ (allocWebFullScreenVideoRootViewControllerInstance): Deleted.
+
</ins><span class="cx"> 2016-04-27 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r200151.
</span></span></pre></div>
<a id="tagsSafari602130SourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKitmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.30/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (200205 => 200206)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.30/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2016-04-28 19:52:16 UTC (rev 200205)
+++ tags/Safari-602.1.30/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2016-04-28 19:58:04 UTC (rev 200206)
</span><span class="lines">@@ -81,46 +81,6 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-@interface WebFullScreenVideoRootViewController : UIViewController
-- (instancetype)initWithSourceWindow:(UIWindow *)sourceWindow;
-@end
-
-static Class createFullScreenVideoRootViewControllerClass()
-{
- Class newClass = objc_allocateClassPair(getUIViewControllerClass(), "WebFullScreenVideoRootViewController", 0);
-
- class_addIvar(newClass, "_sourceWindow", sizeof(UIWindow *), log2(alignof(UIWindow *)), @encode(UIWindow *));
- Ivar sourceWindowIvar = class_getInstanceVariable(newClass, "_sourceWindow");
-
- class_addMethod(newClass, @selector(initWithSourceWindow:), imp_implementationWithBlock(^(id self, UIWindow *sourceWindow){
- self = [self init];
- object_setIvar(self, sourceWindowIvar, [sourceWindow retain]);
- return self;
- }), "@@:@");
-
- class_addMethod(newClass, @selector(dealloc), imp_implementationWithBlock(^(id self){
- [object_getIvar(self, sourceWindowIvar) release];
- objc_super superClass { self, getUIViewControllerClass() };
- ((void (*)(objc_super*, SEL))objc_msgSendSuper)(&superClass, @selector(dealloc));
- }), "v@:");
-
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
- class_addMethod(newClass, @selector(childViewControllerForWhitePointAdaptivityStyle), imp_implementationWithBlock(^(id self){
- UIWindow *sourceWindow = object_getIvar(self, sourceWindowIvar);
- return sourceWindow.rootViewController;
- }), "@@:");
-#endif
-
- objc_registerClassPair(newClass);
- return newClass;
-}
-
-static WebFullScreenVideoRootViewController *allocWebFullScreenVideoRootViewControllerInstance()
-{
- static Class fullScreenVideoRootViewControllerClass = createFullScreenVideoRootViewControllerClass();
- return [fullScreenVideoRootViewControllerClass alloc];
-}
-
</del><span class="cx"> static const double DefaultWatchdogTimerInterval = 1;
</span><span class="cx">
</span><span class="cx"> @class WebAVMediaSelectionOption;
</span><span class="lines">@@ -682,7 +642,7 @@
</span><span class="cx"> m_window = adoptNS([allocUIWindowInstance() initWithFrame:[[getUIScreenClass() mainScreen] bounds]]);
</span><span class="cx"> [m_window setBackgroundColor:[getUIColorClass() clearColor]];
</span><span class="cx"> if (!m_viewController)
</span><del>- m_viewController = adoptNS([allocWebFullScreenVideoRootViewControllerInstance() initWithSourceWindow:[parentView window]]);
</del><ins>+ m_viewController = adoptNS([allocUIViewControllerInstance() init]);
</ins><span class="cx"> [[m_viewController view] setFrame:[m_window bounds]];
</span><span class="cx"> [m_viewController _setIgnoreAppSupportedOrientations:YES];
</span><span class="cx"> [m_window setRootViewController:m_viewController.get()];
</span></span></pre>
</div>
</div>
</body>
</html>