Changeset 198783 in webkit

Timestamp:

Mar 29, 2016, 9:49:07 AM (9 years ago)

Author:

mitz@apple.com

Message:

Inline WebFullScreenVideoRootViewController.m
​https://bugs.webkit.org/show_bug.cgi?id=155971

Reviewed by Anders Carlsson.

• platform/ios/WebVideoFullscreenInterfaceAVKit.mm:

(createFullScreenVideoRootViewControllerClass): Replaced with the code from

WebFullScreenVideoRootViewController.m.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/ios/WebVideoFullscreenInterfaceAVKit.mm (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-03-29  Dan Bernstein  <mitz@apple.com>
+
+        Inline WebFullScreenVideoRootViewController.m
+        https://bugs.webkit.org/show_bug.cgi?id=155971
+
+        Reviewed by Anders Carlsson.
+
+        * platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
+        (createFullScreenVideoRootViewControllerClass): Replaced with the code from
+          WebFullScreenVideoRootViewController.m.
+
 2016-03-29  Said Abou-Hallawa  <sabouhallawa@apple,com>
 

trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm

@@ -82 +82 @@
 #endif
 
-#if USE(APPLE_INTERNAL_SDK)
-#import <WebKitAdditions/WebFullScreenVideoRootViewController.m>
-#else
 @interface WebFullScreenVideoRootViewController : UIViewController
 - (instancetype)initWithSourceWindow:(UIWindow *)sourceWindow;
@@ -93 +90 @@
     Class newClass = objc_allocateClassPair(getUIViewControllerClass(), "WebFullScreenVideoRootViewController", 0);
 
-    class_addMethod(newClass, @selector(initWithSourceWindow:), imp_implementationWithBlock(^(id self, UIWindow*){
-        return [self init];
+    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);
@@ -106 +121 @@
     return [fullScreenVideoRootViewControllerClass alloc];
 }
-#endif
 
 static const double DefaultWatchdogTimerInterval = 1;