<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[176206] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/176206">176206</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2014-11-17 10:30:18 -0800 (Mon, 17 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] AVKit and MediaPlayer SPI are not available in public SDK
https://bugs.webkit.org/show_bug.cgi?id=138756
Reviewed by Eric Carlson.
Source/WebCore:
Add a SPI wrapper headers {AVKit, MPAVRoutingController}SPI.h that forward declares
AVKit and MPAVRoutingController SPI, respectively, and use these header instead of
including private headers of AVKit and MediaPlayer directly.
* WebCore.xcodeproj/project.pbxproj: Add project and private header AVKitSPI.h
and MPAVRoutingControllerSPI.h, respectively.
* platform/audio/ios/MediaSessionManagerIOS.mm: Include header MPAVRoutingControllerSPI.h
instead of including the private header MPAVRoutingController.h.
* platform/ios/WebVideoFullscreenInterfaceAVKit.mm: Include header AVKitSPI.h
instead of including AVKit headers directly.
Source/WebKit2:
Include header MPAVRoutingControllerSPI.h instead of including the
private header MPAVRoutingController.h.
Additionally, sort the list of #import directives.
* UIProcess/ios/forms/WKAirPlayRoutePicker.mm:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreplatformaudioiosMediaSessionManagerIOSmm">trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKitmm">trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosformsWKAirPlayRoutePickermm">trunk/Source/WebKit2/UIProcess/ios/forms/WKAirPlayRoutePicker.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformspiiosAVKitSPIh">trunk/Source/WebCore/platform/spi/ios/AVKitSPI.h</a></li>
<li><a href="#trunkSourceWebCoreplatformspiiosMPAVRoutingControllerSPIh">trunk/Source/WebCore/platform/spi/ios/MPAVRoutingControllerSPI.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (176205 => 176206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-17 17:56:00 UTC (rev 176205)
+++ trunk/Source/WebCore/ChangeLog 2014-11-17 18:30:18 UTC (rev 176206)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2014-11-17 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><ins>+ [iOS] AVKit and MediaPlayer SPI are not available in public SDK
+ https://bugs.webkit.org/show_bug.cgi?id=138756
+
+ Reviewed by Eric Carlson.
+
+ Add a SPI wrapper headers {AVKit, MPAVRoutingController}SPI.h that forward declares
+ AVKit and MPAVRoutingController SPI, respectively, and use these header instead of
+ including private headers of AVKit and MediaPlayer directly.
+
+ * WebCore.xcodeproj/project.pbxproj: Add project and private header AVKitSPI.h
+ and MPAVRoutingControllerSPI.h, respectively.
+ * platform/audio/ios/MediaSessionManagerIOS.mm: Include header MPAVRoutingControllerSPI.h
+ instead of including the private header MPAVRoutingController.h.
+ * platform/ios/WebVideoFullscreenInterfaceAVKit.mm: Include header AVKitSPI.h
+ instead of including AVKit headers directly.
+
+2014-11-17 Daniel Bates <dabates@apple.com>
+
</ins><span class="cx"> Attempt to fix the Mac build after <https://trac.webkit.org/changeset/176204>
</span><span class="cx"> (https://bugs.webkit.org/show_bug.cgi?id=138751)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (176205 => 176206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-11-17 17:56:00 UTC (rev 176205)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-11-17 18:30:18 UTC (rev 176206)
</span><span class="lines">@@ -5749,6 +5749,8 @@
</span><span class="cx"> CE1252391A166FA000864480 /* QuickLookSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1252381A166FA000864480 /* QuickLookSPI.h */; };
</span><span class="cx"> CE12523B1A16711000864480 /* NSFileManagerSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE12523A1A16711000864480 /* NSFileManagerSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> CE12523D1A1676CD00864480 /* QuartzCoreSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE12523C1A1676CD00864480 /* QuartzCoreSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ CE12523F1A16AE1200864480 /* AVKitSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE12523E1A16AE1200864480 /* AVKitSPI.h */; };
+ CE1252411A16B1B600864480 /* MPAVRoutingControllerSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1252401A16B1B600864480 /* MPAVRoutingControllerSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> CE7B2DB31586ABAD0098B3FA /* AlternativeTextUIController.h in Headers */ = {isa = PBXBuildFile; fileRef = CE7B2DAF1586ABAD0098B3FA /* AlternativeTextUIController.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> CE7B2DB41586ABAD0098B3FA /* AlternativeTextUIController.mm in Sources */ = {isa = PBXBuildFile; fileRef = CE7B2DB01586ABAD0098B3FA /* AlternativeTextUIController.mm */; };
</span><span class="cx"> CE7B2DB51586ABAD0098B3FA /* TextAlternativeWithRange.h in Headers */ = {isa = PBXBuildFile; fileRef = CE7B2DB11586ABAD0098B3FA /* TextAlternativeWithRange.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -13233,6 +13235,8 @@
</span><span class="cx"> CE1252381A166FA000864480 /* QuickLookSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = QuickLookSPI.h; path = ios/QuickLookSPI.h; sourceTree = "<group>"; };
</span><span class="cx"> CE12523A1A16711000864480 /* NSFileManagerSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSFileManagerSPI.h; sourceTree = "<group>"; };
</span><span class="cx"> CE12523C1A1676CD00864480 /* QuartzCoreSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QuartzCoreSPI.h; sourceTree = "<group>"; };
</span><ins>+ CE12523E1A16AE1200864480 /* AVKitSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AVKitSPI.h; path = ios/AVKitSPI.h; sourceTree = "<group>"; };
+ CE1252401A16B1B600864480 /* MPAVRoutingControllerSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MPAVRoutingControllerSPI.h; path = ios/MPAVRoutingControllerSPI.h; sourceTree = "<group>"; };
</ins><span class="cx"> CE5CB1B314EDAB6F00BB2795 /* EventSender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventSender.h; sourceTree = "<group>"; };
</span><span class="cx"> CE6D89294C7AACE0AD89B3DD /* MathMLMencloseElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MathMLMencloseElement.h; sourceTree = "<group>"; };
</span><span class="cx"> CE7B2DAF1586ABAD0098B3FA /* AlternativeTextUIController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AlternativeTextUIController.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -18463,6 +18467,8 @@
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><span class="cx"> A172182519DE183F00464D17 /* _UIHighlightViewSPI.h */,
</span><ins>+ CE12523E1A16AE1200864480 /* AVKitSPI.h */,
+ CE1252401A16B1B600864480 /* MPAVRoutingControllerSPI.h */,
</ins><span class="cx"> CE1252381A166FA000864480 /* QuickLookSPI.h */,
</span><span class="cx"> );
</span><span class="cx"> name = ios;
</span><span class="lines">@@ -23427,6 +23433,7 @@
</span><span class="cx"> A8CFF04E0A154F09000A4234 /* AutoTableLayout.h in Headers */,
</span><span class="cx"> 070363E0181A1CDC00C074A5 /* AVAudioCaptureSource.h in Headers */,
</span><span class="cx"> 070363E2181A1CDC00C074A5 /* AVCaptureDeviceManager.h in Headers */,
</span><ins>+ CE12523F1A16AE1200864480 /* AVKitSPI.h in Headers */,
</ins><span class="cx"> 070363E4181A1CDC00C074A5 /* AVMediaCaptureSource.h in Headers */,
</span><span class="cx"> CD336F6217F9F64700DDDCD0 /* AVTrackPrivateAVFObjCImpl.h in Headers */,
</span><span class="cx"> 070363E6181A1CDC00C074A5 /* AVVideoCaptureSource.h in Headers */,
</span><span class="lines">@@ -25406,6 +25413,7 @@
</span><span class="cx"> 935C476309AC4CE600A6AAB4 /* MouseEventWithHitTestResults.h in Headers */,
</span><span class="cx"> 85031B480A44EFC700F992E0 /* MouseRelatedEvent.h in Headers */,
</span><span class="cx"> 93309DFC099E64920056E581 /* MoveSelectionCommand.h in Headers */,
</span><ins>+ CE1252411A16B1B600864480 /* MPAVRoutingControllerSPI.h in Headers */,
</ins><span class="cx"> FDB1700614A2BAB200A2B5D9 /* MultiChannelResampler.h in Headers */,
</span><span class="cx"> C6F0900A14327B6100685849 /* MutationCallback.h in Headers */,
</span><span class="cx"> 85031B4A0A44EFC700F992E0 /* MutationEvent.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioiosMediaSessionManagerIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm (176205 => 176206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm 2014-11-17 17:56:00 UTC (rev 176205)
+++ trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm 2014-11-17 18:30:18 UTC (rev 176206)
</span><span class="lines">@@ -29,13 +29,13 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx">
</span><span class="cx"> #import "Logging.h"
</span><ins>+#import "MPAVRoutingControllerSPI.h"
</ins><span class="cx"> #import "MediaPlayer.h"
</span><span class="cx"> #import "MediaSession.h"
</span><span class="cx"> #import "SoftLinking.h"
</span><span class="cx"> #import "WebCoreSystemInterface.h"
</span><span class="cx"> #import "WebCoreThreadRun.h"
</span><span class="cx"> #import <AVFoundation/AVAudioSession.h>
</span><del>-#import <MediaPlayer/MPAVRoutingController.h>
</del><span class="cx"> #import <MediaPlayer/MPMediaItem.h>
</span><span class="cx"> #import <MediaPlayer/MPNowPlayingInfoCenter.h>
</span><span class="cx"> #import <MediaPlayer/MPVolumeView.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebVideoFullscreenInterfaceAVKitmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (176205 => 176206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2014-11-17 17:56:00 UTC (rev 176205)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2014-11-17 18:30:18 UTC (rev 176206)
</span><span class="lines">@@ -30,16 +30,11 @@
</span><span class="cx">
</span><span class="cx"> #import "WebVideoFullscreenInterfaceAVKit.h"
</span><span class="cx">
</span><ins>+#import "AVKitSPI.h"
</ins><span class="cx"> #import "Logging.h"
</span><span class="cx"> #import "GeometryUtilities.h"
</span><span class="cx"> #import "WebVideoFullscreenModel.h"
</span><span class="cx"> #import <AVFoundation/AVTime.h>
</span><del>-#import <AVKit/AVKit.h>
-#import <AVKit/AVPlayerController.h>
-#import <AVKit/AVPlayerViewController_Private.h>
-#import <AVKit/AVPlayerViewController_WebKitOnly.h>
-#import <AVKit/AVValueTiming.h>
-#import <AVKit/AVVideoLayer.h>
</del><span class="cx"> #import <CoreMedia/CMTime.h>
</span><span class="cx"> #import <UIKit/UIKit.h>
</span><span class="cx"> #import <WebCore/RuntimeApplicationChecksIOS.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspiiosAVKitSPIh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/spi/ios/AVKitSPI.h (0 => 176206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/ios/AVKitSPI.h (rev 0)
+++ trunk/Source/WebCore/platform/spi/ios/AVKitSPI.h 2014-11-17 18:30:18 UTC (rev 176206)
</span><span class="lines">@@ -0,0 +1,96 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <AVKit/AVKit.h>
+#import <QuartzCore/QuartzCore.h>
+#import <UIKit/UIKit.h>
+
+#if USE(APPLE_INTERNAL_SDK)
+
+#import <AVKit/AVPlayerController.h>
+#import <AVKit/AVPlayerViewController_Private.h>
+#import <AVKit/AVPlayerViewController_WebKitOnly.h>
+#import <AVKit/AVValueTiming.h>
+#import <AVKit/AVVideoLayer.h>
+
+#else
+
+@interface AVPlayerController : UIResponder
+@end
+
+@interface AVPlayerController (Details)
+typedef NS_ENUM(NSInteger, AVPlayerControllerStatus) {
+ AVPlayerControllerStatusReadyToPlay = 2,
+};
+
+typedef NS_ENUM(NSInteger, AVPlayerControllerExternalPlaybackType) {
+ AVPlayerControllerExternalPlaybackTypeNone = 0,
+ AVPlayerControllerExternalPlaybackTypeAirPlay = 1,
+ AVPlayerControllerExternalPlaybackTypeTVOut = 2,
+};
+
+@property (NS_NONATOMIC_IOSONLY, readonly) AVPlayerControllerStatus status;
+@end
+
+@protocol AVVideoLayer
+typedef NS_ENUM(NSInteger, AVVideoLayerGravity) {
+ AVVideoLayerGravityInvalid = 0,
+ AVVideoLayerGravityResizeAspect = 1,
+ AVVideoLayerGravityResizeAspectFill = 2,
+ AVVideoLayerGravityResize = 3,
+};
+- (void)setPlayerController:(AVPlayerController *)playerController;
+@property (nonatomic) AVVideoLayerGravity videoLayerGravity;
+@property (nonatomic) CGRect videoRect;
+@property (nonatomic, readonly, getter=isReadyForDisplay) BOOL readyForDisplay;
+@end
+
+@protocol AVPlayerViewControllerDelegate <NSObject>
+@optional
+typedef NS_ENUM(NSInteger, AVPlayerViewControllerExitFullScreenReason) {
+ AVPlayerViewControllerExitFullScreenReasonDoneButtonTapped = 0,
+ AVPlayerViewControllerExitFullScreenReasonRemoteControlStopEventReceived = 3,
+};
+- (BOOL)playerViewController:(AVPlayerViewController *)playerViewController shouldExitFullScreenWithReason:(AVPlayerViewControllerExitFullScreenReason)reason;
+@end
+
+@interface AVPlayerViewController (Details)
+- (instancetype)initWithVideoLayer:(CALayer <AVVideoLayer> *)videoLayer;
+- (void)enterFullScreenWithCompletionHandler:(void (^)(BOOL success, NSError *))completionHandler;
+- (void)exitFullScreenAnimated:(BOOL)animated completionHandler:(void (^)(BOOL success, NSError *))completionHandler;
+- (void)exitFullScreenWithCompletionHandler:(void (^)(BOOL success, NSError *))completionHandler;
+@property (nonatomic, strong) AVPlayerController *playerController;
+@property (nonatomic, weak) id <AVPlayerViewControllerDelegate> delegate;
+@end
+
+@interface AVValueTiming : NSObject <NSCoding, NSCopying, NSMutableCopying>
+@end
+
+@interface AVValueTiming (Details)
++ (AVValueTiming *)valueTimingWithAnchorValue:(double)anchorValue anchorTimeStamp:(NSTimeInterval)timeStamp rate:(double)rate;
+@property (NS_NONATOMIC_IOSONLY, readonly) double currentValue;
+@end
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformspiiosMPAVRoutingControllerSPIh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/spi/ios/MPAVRoutingControllerSPI.h (0 => 176206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/ios/MPAVRoutingControllerSPI.h (rev 0)
+++ trunk/Source/WebCore/platform/spi/ios/MPAVRoutingControllerSPI.h 2014-11-17 18:30:18 UTC (rev 176206)
</span><span class="lines">@@ -0,0 +1,48 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <Foundation/Foundation.h>
+
+#if USE(APPLE_INTERNAL_SDK)
+
+#import <MediaPlayer/MPAVRoutingController.h>
+
+#else
+
+enum {
+ MPRouteDiscoveryModePresence = 1,
+ MPRouteDiscoveryModeDetailed = 2,
+};
+typedef NSInteger MPRouteDiscoveryMode;
+
+@interface MPAVRoutingController : NSObject
+@end
+
+@interface MPAVRoutingController (Details)
+- (instancetype)initWithName:(NSString *)name;
+@property (nonatomic, assign) MPRouteDiscoveryMode discoveryMode;
+@end
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (176205 => 176206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-11-17 17:56:00 UTC (rev 176205)
+++ trunk/Source/WebKit2/ChangeLog 2014-11-17 18:30:18 UTC (rev 176206)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2014-11-17 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><ins>+ [iOS] AVKit and MediaPlayer SPI are not available in public SDK
+ https://bugs.webkit.org/show_bug.cgi?id=138756
+
+ Reviewed by Eric Carlson.
+
+ Include header MPAVRoutingControllerSPI.h instead of including the
+ private header MPAVRoutingController.h.
+
+ Additionally, sort the list of #import directives.
+
+ * UIProcess/ios/forms/WKAirPlayRoutePicker.mm:
+
+2014-11-17 Daniel Bates <dabates@apple.com>
+
</ins><span class="cx"> [iOS] QuartzCore SPI not available in public SDK
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=138751
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosformsWKAirPlayRoutePickermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/forms/WKAirPlayRoutePicker.mm (176205 => 176206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/forms/WKAirPlayRoutePicker.mm 2014-11-17 17:56:00 UTC (rev 176205)
+++ trunk/Source/WebKit2/UIProcess/ios/forms/WKAirPlayRoutePicker.mm 2014-11-17 18:30:18 UTC (rev 176206)
</span><span class="lines">@@ -32,9 +32,9 @@
</span><span class="cx"> #import "WKContentViewInteraction.h"
</span><span class="cx"> #import "WebPageProxy.h"
</span><span class="cx"> #import <MediaPlayer/MPAVItem.h>
</span><del>-#import <MediaPlayer/MPAVRoutingController.h>
</del><ins>+#import <MediaPlayer/MPAudioVideoRoutingActionSheet.h>
</ins><span class="cx"> #import <MediaPlayer/MPAudioVideoRoutingPopoverController.h>
</span><del>-#import <MediaPlayer/MPAudioVideoRoutingActionSheet.h>
</del><ins>+#import <WebCore/MPAVRoutingControllerSPI.h>
</ins><span class="cx"> #import <WebCore/SoftLinking.h>
</span><span class="cx"> #import <UIKit/UIApplication_Private.h>
</span><span class="cx"> #import <UIKit/UIWindow_Private.h>
</span></span></pre>
</div>
</div>
</body>
</html>