Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (187694 => 187695)
--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-08-01 00:09:23 UTC (rev 187694)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-08-01 00:19:07 UTC (rev 187695)
@@ -1,5 +1,24 @@
2015-07-31 Babak Shafiei <bshaf...@apple.com>
+ Merge r187684.
+
+ 2015-07-31 Jeremy Jones <jere...@apple.com>
+
+ 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 Babak Shafiei <bshaf...@apple.com>
+
Merge r187675.
2015-07-31 Jer Noble <jer.no...@apple.com>
Modified: branches/safari-601.1-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (187694 => 187695)
--- branches/safari-601.1-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2015-08-01 00:09:23 UTC (rev 187694)
+++ branches/safari-601.1-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2015-08-01 00:19:07 UTC (rev 187695)
@@ -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)
@@ -758,7 +758,7 @@
return theClass;
}
-@interface WebAVPlayerLayerView : AVPlayerLayerView
+@interface WebAVPlayerLayerView : __AVPlayerLayerView
@property (retain) UIView* videoView;
@end
@@ -769,21 +769,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)
@@ -794,7 +794,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]];
}
@@ -837,7 +837,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));
}
@@ -849,7 +849,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: branches/safari-601.1-branch/Source/WebCore/platform/spi/cocoa/AVKitSPI.h (187694 => 187695)
--- branches/safari-601.1-branch/Source/WebCore/platform/spi/cocoa/AVKitSPI.h 2015-08-01 00:09:23 UTC (rev 187694)
+++ branches/safari-601.1-branch/Source/WebCore/platform/spi/cocoa/AVKitSPI.h 2015-08-01 00:19:07 UTC (rev 187695)
@@ -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 (Details)
-- (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;
