Modified: tags/Safari-602.1.30/Source/WebCore/ChangeLog (200205 => 200206)
--- 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)
@@ -1,3 +1,18 @@
+2016-04-28 Babak Shafiei <[email protected]>
+
+ Merge r200205.
+
+ 2016-04-28 Dan Bernstein <[email protected]>
+
+ <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.
+
2016-04-27 Babak Shafiei <[email protected]>
Merge r200151.
Modified: tags/Safari-602.1.30/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (200205 => 200206)
--- 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)
@@ -81,46 +81,6 @@
}
#endif
-@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];
-}
-
static const double DefaultWatchdogTimerInterval = 1;
@class WebAVMediaSelectionOption;
@@ -682,7 +642,7 @@
m_window = adoptNS([allocUIWindowInstance() initWithFrame:[[getUIScreenClass() mainScreen] bounds]]);
[m_window setBackgroundColor:[getUIColorClass() clearColor]];
if (!m_viewController)
- m_viewController = adoptNS([allocWebFullScreenVideoRootViewControllerInstance() initWithSourceWindow:[parentView window]]);
+ m_viewController = adoptNS([allocUIViewControllerInstance() init]);
[[m_viewController view] setFrame:[m_window bounds]];
[m_viewController _setIgnoreAppSupportedOrientations:YES];
[m_window setRootViewController:m_viewController.get()];
