[webkit-changes] [187181] trunk/Source/WebCore

Wed, 22 Jul 2015 14:28:36 -0700

Title: [187181] trunk/Source/WebCore
Revision
187181
Author
commit-qu...@webkit.org
Date
2015-07-22 14:27:27 -0700 (Wed, 22 Jul 2015)

Log Message

Adopt AVKit's AVSimplePlayerLayerView change for PiP.
https://bugs.webkit.org/show_bug.cgi?id=147186
<rdar://problem/21928170>

Patch by Jeremy Jones <jere...@apple.com> on 2015-07-22
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.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (187180 => 187181)


--- trunk/Source/WebCore/ChangeLog	2015-07-22 21:06:52 UTC (rev 187180)
+++ trunk/Source/WebCore/ChangeLog	2015-07-22 21:27:27 UTC (rev 187181)
@@ -1,3 +1,19 @@
+2015-07-22  Jeremy Jones  <jere...@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.
+
 2015-07-22  Beth Dakin  <bda...@apple.com>
 
         Animated images should animate in previews

Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (187180 => 187181)


--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm	2015-07-22 21:06:52 UTC (rev 187180)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm	2015-07-22 21:27:27 UTC (rev 187181)
@@ -61,7 +61,6 @@
 SOFT_LINK_CLASS(AVKit, AVPlayerViewController)
 SOFT_LINK_CLASS(AVKit, AVValueTiming)
 SOFT_LINK_CLASS(AVKit, AVPlayerLayerView)
-SOFT_LINK_CLASS(AVKit, AVPictureInPicturePlayerLayerView)
 
 SOFT_LINK_FRAMEWORK(UIKit)
 SOFT_LINK_CLASS(UIKit, UIApplication)
@@ -735,7 +734,7 @@
 
 @end
 
-@interface WebAVPictureInPicturePlayerLayerView : AVPictureInPicturePlayerLayerView
+@interface WebAVPictureInPicturePlayerLayerView : UIView
 @end
 
 static CALayer* WebAVPictureInPicturePlayerLayerView_layerClass(id, SEL)
@@ -748,7 +747,7 @@
     static Class theClass = nil;
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
-        theClass = objc_allocateClassPair(getAVPictureInPicturePlayerLayerViewClass(), "WebAVPictureInPicturePlayerLayerView", 0);
+        theClass = objc_allocateClassPair(getUIViewClass(), "WebAVPictureInPicturePlayerLayerView", 0);
         objc_registerClassPair(theClass);
         Class metaClass = objc_getMetaClass("WebAVPictureInPicturePlayerLayerView");
         class_addMethod(metaClass, @selector(layerClass), (IMP)WebAVPictureInPicturePlayerLayerView_layerClass, "@@:");
@@ -761,12 +760,12 @@
 @property (retain) UIView* videoView;
 @end
 
-static CALayer* WebAVPlayerLayerView_layerClass(id, SEL)
+static CALayer *WebAVPlayerLayerView_layerClass(id, SEL)
 {
     return [WebAVPlayerLayer class];
 }
 
-static AVPlayerController* WebAVPlayerLayerView_playerController(id aSelf, SEL)
+static AVPlayerController *WebAVPlayerLayerView_playerController(id aSelf, SEL)
 {
     AVPlayerLayerView *playerLayer = aSelf;
     WebAVPlayerLayer *webAVPlayerLayer = (WebAVPlayerLayer *)[playerLayer playerLayer];
@@ -780,7 +779,7 @@
     [webAVPlayerLayer setPlayerController: playerController];
 }
 
-static UIView* WebAVPlayerLayerView_videoView(id aSelf, SEL)
+static UIView *WebAVPlayerLayerView_videoView(id aSelf, SEL)
 {
     AVPlayerLayerView *playerLayer = aSelf;
     WebAVPlayerLayer *webAVPlayerLayer = (WebAVPlayerLayer *)[playerLayer playerLayer];
@@ -801,10 +800,10 @@
 static void WebAVPlayerLayerView_startRoutingVideoToPictureInPicturePlayerLayerView(id aSelf, SEL)
 {
     WebAVPlayerLayerView *playerLayerView = aSelf;
-    AVPictureInPicturePlayerLayerView *pipView = [playerLayerView pictureInPicturePlayerLayerView];
+    WebAVPictureInPicturePlayerLayerView *pipView = (WebAVPictureInPicturePlayerLayerView *)[playerLayerView pictureInPicturePlayerLayerView];
 
     WebAVPlayerLayer *playerLayer = (WebAVPlayerLayer *)[playerLayerView playerLayer];
-    WebAVPlayerLayer *pipPlayerLayer = (WebAVPlayerLayer *)[pipView playerLayer];
+    WebAVPlayerLayer *pipPlayerLayer = (WebAVPlayerLayer *)[pipView layer];
     [playerLayer setVideoGravity:getAVLayerVideoGravityResizeAspect()];
     [pipPlayerLayer setVideoSublayer:playerLayer.videoSublayer];
     [pipPlayerLayer setVideoDimensions:playerLayer.videoDimensions];
@@ -820,7 +819,7 @@
     [playerLayerView addSubview:playerLayerView.videoView];
 }
 
-static AVPictureInPicturePlayerLayerView *WebAVPlayerLayerView_pictureInPicturePlayerLayerView(id aSelf, SEL)
+static WebAVPictureInPicturePlayerLayerView *WebAVPlayerLayerView_pictureInPicturePlayerLayerView(id aSelf, SEL)
 {
     WebAVPlayerLayerView *playerLayerView = aSelf;
     WebAVPictureInPicturePlayerLayerView *pipView = [playerLayerView valueForKey:@"_pictureInPicturePlayerLayerView"];

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to