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

Fri, 31 Jul 2015 15:21:06 -0700

Title: [187684] trunk/Source/WebCore
Revision
187684
Author
[email protected]
Date
2015-07-31 15:20:30 -0700 (Fri, 31 Jul 2015)

Log Message

Rename AVPlayerLayerView to _AVPlayerLayerView.
https://bugs.webkit.org/show_bug.cgi?id=147399

Patch by Jeremy Jones <[email protected]> on 2015-07-31
Reviewed by Eric Carlson.

Change class name AVPlayerLayerView to match change in AVKit SPI.
This prevents conflicts with 3rd party apps.

* platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
(WebAVPlayerLayerView_dealloc):
(getWebAVPlayerLayerViewClass):
* platform/spi/cocoa/AVKitSPI.h:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (187683 => 187684)


--- trunk/Source/WebCore/ChangeLog	2015-07-31 21:40:39 UTC (rev 187683)
+++ trunk/Source/WebCore/ChangeLog	2015-07-31 22:20:30 UTC (rev 187684)
@@ -1,3 +1,18 @@
+2015-07-31  Jeremy Jones  <[email protected]>
+
+        Rename AVPlayerLayerView to _AVPlayerLayerView.
+        https://bugs.webkit.org/show_bug.cgi?id=147399
+
+        Reviewed by Eric Carlson.
+
+        Change class name AVPlayerLayerView to match change in AVKit SPI. 
+        This prevents conflicts with 3rd party apps.
+
+        * platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
+        (WebAVPlayerLayerView_dealloc):
+        (getWebAVPlayerLayerViewClass):
+        * platform/spi/cocoa/AVKitSPI.h:
+
 2015-07-31  Chris Dumez  <[email protected]>
 
         ImageBufferDataCG should not add IOSurfaces to the pool

Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (187683 => 187684)


--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm	2015-07-31 21:40:39 UTC (rev 187683)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm	2015-07-31 22:20:30 UTC (rev 187684)
@@ -60,7 +60,7 @@
 SOFT_LINK_CLASS(AVKit, AVPlayerController)
 SOFT_LINK_CLASS(AVKit, AVPlayerViewController)
 SOFT_LINK_CLASS(AVKit, AVValueTiming)
-SOFT_LINK_CLASS(AVKit, AVPlayerLayerView)
+SOFT_LINK_CLASS(AVKit, __AVPlayerLayerView)
 
 SOFT_LINK_FRAMEWORK(UIKit)
 SOFT_LINK_CLASS(UIKit, UIApplication)
@@ -759,7 +759,7 @@
     return theClass;
 }
 
-@interface WebAVPlayerLayerView : AVPlayerLayerView
+@interface WebAVPlayerLayerView : __AVPlayerLayerView
 @property (retain) UIView* videoView;
 @end
 
@@ -770,21 +770,21 @@
 
 static AVPlayerController *WebAVPlayerLayerView_playerController(id aSelf, SEL)
 {
-    AVPlayerLayerView *playerLayer = aSelf;
+    __AVPlayerLayerView *playerLayer = aSelf;
     WebAVPlayerLayer *webAVPlayerLayer = (WebAVPlayerLayer *)[playerLayer playerLayer];
     return [webAVPlayerLayer playerController];
 }
 
 static void WebAVPlayerLayerView_setPlayerController(id aSelf, SEL, AVPlayerController *playerController)
 {
-    AVPlayerLayerView *playerLayerView = aSelf;
+    __AVPlayerLayerView *playerLayerView = aSelf;
     WebAVPlayerLayer *webAVPlayerLayer = (WebAVPlayerLayer *)[playerLayerView playerLayer];
     [webAVPlayerLayer setPlayerController: playerController];
 }
 
 static UIView *WebAVPlayerLayerView_videoView(id aSelf, SEL)
 {
-    AVPlayerLayerView *playerLayer = aSelf;
+    __AVPlayerLayerView *playerLayer = aSelf;
     WebAVPlayerLayer *webAVPlayerLayer = (WebAVPlayerLayer *)[playerLayer playerLayer];
     CALayer* videoLayer = [webAVPlayerLayer videoSublayer];
     if (!videoLayer)
@@ -795,7 +795,7 @@
 
 static void WebAVPlayerLayerView_setVideoView(id aSelf, SEL, UIView *videoView)
 {
-    AVPlayerLayerView *playerLayerView = aSelf;
+    __AVPlayerLayerView *playerLayerView = aSelf;
     WebAVPlayerLayer *webAVPlayerLayer = (WebAVPlayerLayer *)[playerLayerView playerLayer];
     [webAVPlayerLayer setVideoSublayer:[videoView layer]];
 }
@@ -838,7 +838,7 @@
     WebAVPlayerLayerView *playerLayerView = aSelf;
     RetainPtr<WebAVPictureInPicturePlayerLayerView> pipView = adoptNS([playerLayerView valueForKey:@"_pictureInPicturePlayerLayerView"]);
     [playerLayerView setValue:nil forKey:@"_pictureInPicturePlayerLayerView"];
-    objc_super superClass { playerLayerView, getAVPlayerLayerViewClass() };
+    objc_super superClass { playerLayerView, get__AVPlayerLayerViewClass() };
     auto super_dealloc = reinterpret_cast<void(*)(objc_super*, SEL)>(objc_msgSendSuper);
     super_dealloc(&superClass, @selector(dealloc));
 }
@@ -850,7 +850,7 @@
     static Class theClass = nil;
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
-        theClass = objc_allocateClassPair(getAVPlayerLayerViewClass(), "WebAVPlayerLayerView", 0);
+        theClass = objc_allocateClassPair(get__AVPlayerLayerViewClass(), "WebAVPlayerLayerView", 0);
         class_addMethod(theClass, @selector(dealloc), (IMP)WebAVPlayerLayerView_dealloc, "v@:");
         class_addMethod(theClass, @selector(setPlayerController:), (IMP)WebAVPlayerLayerView_setPlayerController, "v@:@");
         class_addMethod(theClass, @selector(playerController), (IMP)WebAVPlayerLayerView_playerController, "@@:");

Modified: trunk/Source/WebCore/platform/spi/cocoa/AVKitSPI.h (187683 => 187684)


--- trunk/Source/WebCore/platform/spi/cocoa/AVKitSPI.h	2015-07-31 21:40:39 UTC (rev 187683)
+++ trunk/Source/WebCore/platform/spi/cocoa/AVKitSPI.h	2015-07-31 22:20:30 UTC (rev 187684)
@@ -67,7 +67,7 @@
 @property (nonatomic, readonly) AVPlayerLayer *playerLayer;
 @end
 
-@interface AVPlayerLayerView : UIView
+@interface __AVPlayerLayerView : UIView
 @property (nonatomic, readonly) AVPlayerLayer *playerLayer;
 @property (nonatomic, readonly) AVPictureInPicturePlayerLayerView *pictureInPicturePlayerLayerView;
 - (void)startRoutingVideoToPictureInPicturePlayerLayerView;
@@ -88,7 +88,7 @@
 @end
 
 @interface AVPlayerViewController ()
-- (instancetype)initWithPlayerLayerView:(AVPlayerLayerView *)playerLayerView;
+- (instancetype)initWithPlayerLayerView:(__AVPlayerLayerView *)playerLayerView;
 - (void)enterFullScreenAnimated:(BOOL)animated completionHandler:(void (^)(BOOL success, NSError *))completionHandler;
 - (void)exitFullScreenAnimated:(BOOL)animated completionHandler:(void (^)(BOOL success, NSError *))completionHandler;
 

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to