<!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>[184946] 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/184946">184946</a></dd>
<dt>Author</dt> <dd>jonlee@apple.com</dd>
<dt>Date</dt> <dd>2015-05-28 00:27:13 -0700 (Thu, 28 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix macros for wireless playback
https://bugs.webkit.org/show_bug.cgi?id=145239
rdar://problem/21049541
Reviewed by Anders Carlsson.
Encompass the logic within ENABLE(WIRELESS_TARGET_PLAYBACK). Update property name.
Source/WebKit/mac:
* WebView/WebPreferenceKeysPrivate.h:
* WebView/WebPreferences.h:
* WebView/WebPreferences.mm:
(+[WebPreferences initialize]): Wrap in ENABLE.
(-[WebPreferences allowsAirPlayForMediaPlayback]): Ditto.
(-[WebPreferences setAllowsAirPlayForMediaPlayback:]): Ditto.
* WebView/WebView.mm:
(-[WebView _preferencesChanged:]): Ditto.
Source/WebKit2:
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView initWithFrame:configuration:]):
* UIProcess/API/Cocoa/WKWebViewConfiguration.h: Update names. Add a WKDeprecated
category section.
* UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
(-[WKWebViewConfiguration init]): Update name of variables to reflect new property names.
(-[WKWebViewConfiguration copyWithZone:]): Ditto.
(-[WKWebViewConfiguration mediaPlaybackAllowsAirPlay]): Get and set off of the new
variable.
(-[WKWebViewConfiguration setMediaPlaybackAllowsAirPlay:]): Ditto.
(-[WKWebViewConfiguration mediaPlaybackRequiresUserAction]): Ditto.
(-[WKWebViewConfiguration setMediaPlaybackRequiresUserAction:]): Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferenceKeysPrivateh">trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferencesh">trunk/Source/WebKit/mac/WebView/WebPreferences.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferencesmm">trunk/Source/WebKit/mac/WebView/WebPreferences.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (184945 => 184946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-05-28 06:14:50 UTC (rev 184945)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-05-28 07:27:13 UTC (rev 184946)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-05-22 Jon Lee <jonlee@apple.com>
+
+ Fix macros for wireless playback
+ https://bugs.webkit.org/show_bug.cgi?id=145239
+ rdar://problem/21049541
+
+ Reviewed by Anders Carlsson.
+
+ Encompass the logic within ENABLE(WIRELESS_TARGET_PLAYBACK). Update property name.
+
+ * WebView/WebPreferenceKeysPrivate.h:
+ * WebView/WebPreferences.h:
+ * WebView/WebPreferences.mm:
+ (+[WebPreferences initialize]): Wrap in ENABLE.
+ (-[WebPreferences allowsAirPlayForMediaPlayback]): Ditto.
+ (-[WebPreferences setAllowsAirPlayForMediaPlayback:]): Ditto.
+ * WebView/WebView.mm:
+ (-[WebView _preferencesChanged:]): Ditto.
+
</ins><span class="cx"> 2015-05-27 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> img.currentSrc problem in strict mode with old picturefill
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferenceKeysPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (184945 => 184946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2015-05-28 06:14:50 UTC (rev 184945)
+++ trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2015-05-28 07:27:13 UTC (rev 184946)
</span><span class="lines">@@ -122,6 +122,7 @@
</span><span class="cx"> #define WebKitRequiresUserGestureForMediaPlaybackPreferenceKey @"WebKitMediaPlaybackRequiresUserGesture"
</span><span class="cx"> #define WebKitAllowsInlineMediaPlaybackPreferenceKey @"WebKitMediaPlaybackAllowsInline"
</span><span class="cx"> #define WebKitAllowsAlternateFullscreenPreferenceKey @"WebKitAllowsAlternateFullscreen"
</span><ins>+#define WebKitAllowsAirPlayForMediaPlaybackPreferenceKey @"WebKitMediaPlaybackAllowsAirPlay"
</ins><span class="cx"> #define WebKitMockScrollbarsEnabledPreferenceKey @"WebKitMockScrollbarsEnabled"
</span><span class="cx"> #define WebKitShouldDisplaySubtitlesPreferenceKey @"WebKitShouldDisplaySubtitles"
</span><span class="cx"> #define WebKitShouldDisplayCaptionsPreferenceKey @"WebKitShouldDisplayCaptions"
</span><span class="lines">@@ -130,7 +131,6 @@
</span><span class="cx"> #define WebKitSuppressesIncrementalRenderingKey @"WebKitSuppressesIncrementalRendering"
</span><span class="cx"> #define WebKitSubpixelCSSOMElementMetricsEnabledPreferenceKey @"WebKitSubpixelCSSOMElementMetricsEnabled"
</span><span class="cx"> #if TARGET_OS_IPHONE
</span><del>-#define WebKitAllowsAirPlayForMediaPlaybackPreferenceKey @"WebKitMediaPlaybackAllowsAirPlay"
</del><span class="cx"> #define WebKitAudioSessionCategoryOverride @"WebKitAudioSessionCategoryOverride"
</span><span class="cx"> #define WebKitAVKitEnabled @"WebKitAVKitEnabled"
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.h (184945 => 184946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferences.h 2015-05-28 06:14:50 UTC (rev 184945)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.h 2015-05-28 07:27:13 UTC (rev 184946)
</span><span class="lines">@@ -267,4 +267,9 @@
</span><span class="cx"> */
</span><span class="cx"> @property (nonatomic) BOOL suppressesIncrementalRendering;
</span><span class="cx">
</span><ins>+/*!
+ @property allowsAirPlayForMediaPlayback
+ */
+@property (nonatomic) BOOL allowsAirPlayForMediaPlayback;
+
</ins><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (184945 => 184946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2015-05-28 06:14:50 UTC (rev 184945)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2015-05-28 07:27:13 UTC (rev 184946)
</span><span class="lines">@@ -529,7 +529,6 @@
</span><span class="cx"> #else
</span><span class="cx"> [NSNumber numberWithBool:YES], WebKitRequiresUserGestureForMediaPlaybackPreferenceKey,
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitAllowsInlineMediaPlaybackPreferenceKey,
</span><del>- [NSNumber numberWithBool:YES], WebKitAllowsAirPlayForMediaPlaybackPreferenceKey,
</del><span class="cx"> [NSNumber numberWithUnsignedInt:AudioSession::None], WebKitAudioSessionCategoryOverride,
</span><span class="cx"> #if HAVE(AVKIT)
</span><span class="cx"> [NSNumber numberWithBool:YES], WebKitAVKitEnabled,
</span><span class="lines">@@ -545,6 +544,9 @@
</span><span class="cx">
</span><span class="cx"> [NSNumber numberWithBool:YES], WebKitShouldRespectImageOrientationKey,
</span><span class="cx"> #endif // PLATFORM(IOS)
</span><ins>+#if ENABLE(WIRELESS_TARGET_PLAYBACK)
+ [NSNumber numberWithBool:YES], WebKitAllowsAirPlayForMediaPlaybackPreferenceKey,
+#endif
</ins><span class="cx"> [NSNumber numberWithBool:YES], WebKitAllowsAlternateFullscreenPreferenceKey,
</span><span class="cx"> [NSNumber numberWithBool:YES], WebKitRequestAnimationFrameEnabledPreferenceKey,
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitWantsBalancedSetDefersLoadingBehaviorKey,
</span><span class="lines">@@ -2076,6 +2078,22 @@
</span><span class="cx"> [self _setBoolValue:flag forKey: WebKitEnableInheritURIQueryComponentPreferenceKey];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)allowsAirPlayForMediaPlayback
+{
+#if ENABLE(WIRELESS_TARGET_PLAYBACK)
+ return [self _boolValueForKey:WebKitAllowsAirPlayForMediaPlaybackPreferenceKey];
+#else
+ return false;
+#endif
+}
+
+- (void)setAllowsAirPlayForMediaPlayback:(BOOL)flag
+{
+#if ENABLE(WIRELESS_TARGET_PLAYBACK)
+ [self _setBoolValue:flag forKey:WebKitAllowsAirPlayForMediaPlaybackPreferenceKey];
+#endif
+}
+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> - (BOOL)mediaPlaybackAllowsAirPlay
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (184945 => 184946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2015-05-28 06:14:50 UTC (rev 184945)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2015-05-28 07:27:13 UTC (rev 184946)
</span><span class="lines">@@ -2343,6 +2343,9 @@
</span><span class="cx"> settings.setRubberBandingForSubScrollableRegionsEnabled(false);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(WIRELESS_PLAYBACK_TARGET)
+ settings.setAllowsAirPlayForMediaPlayback([preferences allowsAirPlayForMediaPlayback]);
+#endif
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> settings.setStandalone([preferences _standalone]);
</span><span class="cx"> settings.setTelephoneNumberParsingEnabled([preferences _telephoneNumberParsingEnabled]);
</span><span class="lines">@@ -2350,7 +2353,6 @@
</span><span class="cx"> settings.setLayoutInterval(std::chrono::milliseconds([preferences _layoutInterval]));
</span><span class="cx"> settings.setMaxParseDuration([preferences _maxParseDuration]);
</span><span class="cx"> settings.setAlwaysUseAcceleratedOverflowScroll([preferences _alwaysUseAcceleratedOverflowScroll]);
</span><del>- settings.setAllowsAirPlayForMediaPlayback([preferences mediaPlaybackAllowsAirPlay]);
</del><span class="cx"> settings.setAudioSessionCategoryOverride([preferences audioSessionCategoryOverride]);
</span><span class="cx"> settings.setNetworkDataUsageTrackingEnabled([preferences networkDataUsageTrackingEnabled]);
</span><span class="cx"> settings.setNetworkInterfaceName([preferences networkInterfaceName]);
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (184945 => 184946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-05-28 06:14:50 UTC (rev 184945)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-28 07:27:13 UTC (rev 184946)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2015-05-22 Jon Lee <jonlee@apple.com>
+
+ Fix macros for wireless playback
+ https://bugs.webkit.org/show_bug.cgi?id=145239
+ rdar://problem/21049541
+
+ Reviewed by Anders Carlsson.
+
+ Encompass the logic within ENABLE(WIRELESS_TARGET_PLAYBACK). Update property name.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView initWithFrame:configuration:]):
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.h: Update names. Add a WKDeprecated
+ category section.
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+ (-[WKWebViewConfiguration init]): Update name of variables to reflect new property names.
+ (-[WKWebViewConfiguration copyWithZone:]): Ditto.
+ (-[WKWebViewConfiguration mediaPlaybackAllowsAirPlay]): Get and set off of the new
+ variable.
+ (-[WKWebViewConfiguration setMediaPlaybackAllowsAirPlay:]): Ditto.
+ (-[WKWebViewConfiguration mediaPlaybackRequiresUserAction]): Ditto.
+ (-[WKWebViewConfiguration setMediaPlaybackRequiresUserAction:]): Ditto.
+
</ins><span class="cx"> 2015-05-27 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Add a "should open urls externally" flag to DocumentLoader.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (184945 => 184946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-05-28 06:14:50 UTC (rev 184945)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-05-28 07:27:13 UTC (rev 184946)
</span><span class="lines">@@ -322,9 +322,11 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::allowsInlineMediaPlaybackKey(), WebKit::WebPreferencesStore::Value(!![_configuration allowsInlineMediaPlayback]));
</span><span class="cx"> webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::allowsAlternateFullscreenKey(), WebKit::WebPreferencesStore::Value(!![_configuration _allowsAlternateFullscreen] && shouldAllowAlternateFullscreen()));
</span><del>- webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::requiresUserGestureForMediaPlaybackKey(), WebKit::WebPreferencesStore::Value(!![_configuration mediaPlaybackRequiresUserAction]));
- webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::allowsAirPlayForMediaPlaybackKey(), WebKit::WebPreferencesStore::Value(!![_configuration mediaPlaybackAllowsAirPlay]));
</del><ins>+ webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::requiresUserGestureForMediaPlaybackKey(), WebKit::WebPreferencesStore::Value(!![_configuration requiresUserActionForMediaPlayback]));
</ins><span class="cx"> #endif
</span><ins>+#if ENABLE(WIRELESS_PLAYBACK_TARGET)
+ webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::allowsAirPlayForMediaPlaybackKey(), WebKit::WebPreferencesStore::Value(!![_configuration allowsAirPlayForMediaPlayback]));
+#endif
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> _scrollView = adoptNS([[WKScrollView alloc] initWithFrame:bounds]);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h (184945 => 184946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h 2015-05-28 06:14:50 UTC (rev 184945)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h 2015-05-28 07:27:13 UTC (rev 184946)
</span><span class="lines">@@ -88,6 +88,11 @@
</span><span class="cx"> */
</span><span class="cx"> @property (WK_NULLABLE_PROPERTY nonatomic, copy) NSString *applicationNameForUserAgent WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
</span><span class="cx">
</span><ins>+/*! @abstract A Boolean value indicating whether AirPlay is allowed.
+ @discussion The default value is YES.
+ */
+@property (nonatomic) BOOL allowsAirPlayForMediaPlayback WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+
</ins><span class="cx"> #if TARGET_OS_IPHONE
</span><span class="cx"> /*! @abstract A Boolean value indicating whether HTML5 videos play inline
</span><span class="cx"> (YES) or use the native full-screen controller (NO).
</span><span class="lines">@@ -99,13 +104,8 @@
</span><span class="cx"> user to start playing them (YES) or can play automatically (NO).
</span><span class="cx"> @discussion The default value is YES.
</span><span class="cx"> */
</span><del>-@property (nonatomic) BOOL mediaPlaybackRequiresUserAction;
</del><ins>+@property (nonatomic) BOOL requiresUserActionForMediaPlayback WK_AVAILABLE(NA, WK_IOS_TBA);
</ins><span class="cx">
</span><del>-/*! @abstract A Boolean value indicating whether AirPlay is allowed.
- @discussion The default value is YES.
- */
-@property (nonatomic) BOOL mediaPlaybackAllowsAirPlay;
-
</del><span class="cx"> /*! @abstract The level of granularity with which the user can interactively
</span><span class="cx"> select content in the web view.
</span><span class="cx"> @discussion Possible values are described in WKSelectionGranularity.
</span><span class="lines">@@ -117,6 +117,15 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+@interface WKWebViewConfiguration (WKDeprecated)
+
+#if TARGET_OS_IPHONE
+@property (nonatomic) BOOL mediaPlaybackRequiresUserAction WK_DEPRECATED(NA, NA, 8_0, WK_IOS_TBA, "Please use requiresUserActionForMediaPlayback");
+@property (nonatomic) BOOL mediaPlaybackAllowsAirPlay WK_DEPRECATED(NA, NA, 8_0, WK_IOS_TBA, "Please use allowsAirPlayForMediaPlayback");
+#endif
+
+@end
+
</ins><span class="cx"> WK_ASSUME_NONNULL_END
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (184945 => 184946)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2015-05-28 06:14:50 UTC (rev 184945)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2015-05-28 07:27:13 UTC (rev 184946)
</span><span class="lines">@@ -103,11 +103,13 @@
</span><span class="cx"> return nil;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- _mediaPlaybackRequiresUserAction = YES;
- _mediaPlaybackAllowsAirPlay = YES;
</del><ins>+ _requiresUserActionForMediaPlayback = YES;
</ins><span class="cx"> _allowsAlternateFullscreen = YES;
</span><span class="cx"> #endif
</span><del>-
</del><ins>+#if ENABLE(WIRELESS_TARGET_PLAYBACK)
+ _allowsAirPlayForMediaPlayback = YES;
+#endif
+
</ins><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -138,10 +140,12 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> configuration->_allowsInlineMediaPlayback = self->_allowsInlineMediaPlayback;
</span><span class="cx"> configuration->_allowsAlternateFullscreen = self->_allowsAlternateFullscreen;
</span><del>- configuration->_mediaPlaybackRequiresUserAction = self->_mediaPlaybackRequiresUserAction;
- configuration->_mediaPlaybackAllowsAirPlay = self->_mediaPlaybackAllowsAirPlay;
</del><ins>+ configuration->_requiresUserActionForMediaPlayback = self->_requiresUserActionForMediaPlayback;
</ins><span class="cx"> configuration->_selectionGranularity = self->_selectionGranularity;
</span><span class="cx"> #endif
</span><ins>+#if ENABLE(WIRELESS_TARGET_PLAYBACK)
+ configuration->_allowsAirPlayForMediaPlayback = self->_allowsAirPlayForMediaPlayback;
+#endif
</ins><span class="cx">
</span><span class="cx"> return configuration;
</span><span class="cx"> }
</span><span class="lines">@@ -323,4 +327,30 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+@implementation WKWebViewConfiguration (WKDeprecated)
+
+#if PLATFORM(IOS)
+- (BOOL)mediaPlaybackAllowsAirPlay
+{
+ return self.allowsAirPlayForMediaPlayback;
+}
+
+- (void)setMediaPlaybackAllowsAirPlay:(BOOL)allowed
+{
+ self.allowsAirPlayForMediaPlayback = allowed;
+}
+
+- (BOOL)mediaPlaybackRequiresUserAction
+{
+ return self.requiresUserActionForMediaPlayback;
+}
+
+- (void)setMediaPlaybackRequiresUserAction:(BOOL)required
+{
+ self.requiresUserActionForMediaPlayback = required;
+}
+#endif // PLATFORM(IOS)
+
+@end
+
</ins><span class="cx"> #endif // WK_API_ENABLED
</span></span></pre>
</div>
</div>
</body>
</html>