Title: [170560] trunk/Source/WebCore
- Revision
- 170560
- Author
- commit-qu...@webkit.org
- Date
- 2014-06-27 16:28:35 -0700 (Fri, 27 Jun 2014)
Log Message
Lazily link frameworks in WebVideoFullscreenInterfaceAVKit.
https://bugs.webkit.org/show_bug.cgi?id=134407
Patch by Jeremy Jones <jere...@apple.com> on 2014-06-27
Reviewed by Eric Carlson.
* platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
(-[WebAVPlayerController init]):
Load AVPlayerController on use.
(WebVideoFullscreenInterfaceAVKit::WebVideoFullscreenInterfaceAVKit):
Remove loading on construction.
(WebVideoFullscreenInterfaceAVKit::setCurrentTime): Load AVValueTiming on use.
(WebVideoFullscreenInterfaceAVKit::setupFullscreen): Load several classes on use.
(WebVideoFullscreenInterfaceAVKit::exitFullscreen): Load UIColor on use.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (170559 => 170560)
--- trunk/Source/WebCore/ChangeLog 2014-06-27 22:29:24 UTC (rev 170559)
+++ trunk/Source/WebCore/ChangeLog 2014-06-27 23:28:35 UTC (rev 170560)
@@ -1,3 +1,19 @@
+2014-06-27 Jeremy Jones <jere...@apple.com>
+
+ Lazily link frameworks in WebVideoFullscreenInterfaceAVKit.
+ https://bugs.webkit.org/show_bug.cgi?id=134407
+
+ Reviewed by Eric Carlson.
+
+ * platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
+ (-[WebAVPlayerController init]):
+ Load AVPlayerController on use.
+ (WebVideoFullscreenInterfaceAVKit::WebVideoFullscreenInterfaceAVKit):
+ Remove loading on construction.
+ (WebVideoFullscreenInterfaceAVKit::setCurrentTime): Load AVValueTiming on use.
+ (WebVideoFullscreenInterfaceAVKit::setupFullscreen): Load several classes on use.
+ (WebVideoFullscreenInterfaceAVKit::exitFullscreen): Load UIColor on use.
+
2014-06-27 Alex Christensen <achristen...@webkit.org>
Remove extra operations from 64-bit or on armv7.
Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (170559 => 170560)
--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2014-06-27 22:29:24 UTC (rev 170559)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2014-06-27 23:28:35 UTC (rev 170560)
@@ -137,7 +137,7 @@
return self;
initAVPlayerController();
- self.playerControllerProxy = [[[classAVPlayerController alloc] init] autorelease];
+ self.playerControllerProxy = [[[getAVPlayerControllerClass() alloc] init] autorelease];
return self;
}
@@ -568,15 +568,6 @@
WebVideoFullscreenInterfaceAVKit::WebVideoFullscreenInterfaceAVKit()
: m_videoFullscreenModel(nullptr)
{
- initUIScreen();
- initUIView();
- initUIColor();
- initUIWindow();
- initAVPlayerController();
- initAVPlayerViewController();
- initAVValueTiming();
- initUIViewController();
- initAVPlayerLayer();
}
WebAVPlayerController *WebVideoFullscreenInterfaceAVKit::playerController()
@@ -625,7 +616,7 @@
void WebVideoFullscreenInterfaceAVKit::setCurrentTime(double currentTime, double anchorTime)
{
NSTimeInterval anchorTimeStamp = ![playerController() rate] ? NAN : anchorTime;
- AVValueTiming *timing = [classAVValueTiming valueTimingWithAnchorValue:currentTime
+ AVValueTiming *timing = [getAVValueTimingClass() valueTimingWithAnchorValue:currentTime
anchorTimeStamp:anchorTimeStamp rate:0];
playerController().timing = timing;
}
@@ -719,16 +710,16 @@
CGRect videoRect = CGRectMake(0, 0, videoSize.width, videoSize.height);
[m_videoLayerContainer setVideoRect:videoRect];
- m_playerViewController = adoptNS([[classAVPlayerViewController alloc] initWithVideoLayer:m_videoLayerContainer.get()]);
+ m_playerViewController = adoptNS([[getAVPlayerViewControllerClass() alloc] initWithVideoLayer:m_videoLayerContainer.get()]);
[m_playerViewController setShowsPlaybackControls:NO];
[m_playerViewController setPlayerController:(AVPlayerController *)playerController()];
[m_playerViewController setDelegate:playerController()];
[m_videoLayerContainer setPlayerViewController:m_playerViewController.get()];
- m_viewController = adoptNS([[classUIViewController alloc] init]);
+ m_viewController = adoptNS([[getUIViewControllerClass() alloc] init]);
- m_window = adoptNS([[classUIWindow alloc] initWithFrame:[[classUIScreen mainScreen] bounds]]);
- [m_window setBackgroundColor:[classUIColor clearColor]];
+ m_window = adoptNS([[getUIWindowClass() alloc] initWithFrame:[[getUIScreenClass() mainScreen] bounds]]);
+ [m_window setBackgroundColor:[getUIColorClass() clearColor]];
[m_window setRootViewController:m_viewController.get()];
[m_window makeKeyAndVisible];
@@ -776,7 +767,7 @@
[[m_playerViewController view] layoutIfNeeded];
[m_playerViewController exitFullScreenWithCompletionHandler:^(BOOL, NSError*)
{
- [[m_playerViewController view] setBackgroundColor:[classUIColor clearColor]];
+ [[m_playerViewController view] setBackgroundColor:[getUIColorClass() clearColor]];
if (m_fullscreenChangeObserver)
m_fullscreenChangeObserver->didExitFullscreen();
protect.clear();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
