Title: [185556] trunk/Source/WebKit2
- Revision
- 185556
- Author
- [email protected]
- Date
- 2015-06-15 11:07:02 -0700 (Mon, 15 Jun 2015)
Log Message
[WK2] Add allowsPictureInPictureMediaPlayback
https://bugs.webkit.org/show_bug.cgi?id=145901
rdar://problem/21349851
Reviewed by Anders Carlsson.
Replace _allowsAlternateFullscreen with allowsPictureInPictureMediaPlayback.
* UIProcess/API/Cocoa/WKWebViewConfiguration.h: Add allowsPictureInPictureMediaPlayback.
* UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
(-[WKWebViewConfiguration init]): Remove _allowsAlternateFullscreen.
(-[WKWebViewConfiguration copyWithZone:]): Replace the variable.
(-[WKWebViewConfiguration _allowsAlternateFullscreen]): Deleted.
(-[WKWebViewConfiguration _setAllowsAlternateFullscreen:]): Deleted.
* UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h: Remove the SPI.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView initWithFrame:configuration:]): Update to use the new API.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (185555 => 185556)
--- trunk/Source/WebKit2/ChangeLog 2015-06-15 17:23:00 UTC (rev 185555)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-15 18:07:02 UTC (rev 185556)
@@ -1,3 +1,24 @@
+2015-06-11 Jon Lee <[email protected]>
+
+ [WK2] Add allowsPictureInPictureMediaPlayback
+ https://bugs.webkit.org/show_bug.cgi?id=145901
+ rdar://problem/21349851
+
+ Reviewed by Anders Carlsson.
+
+ Replace _allowsAlternateFullscreen with allowsPictureInPictureMediaPlayback.
+
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.h: Add allowsPictureInPictureMediaPlayback.
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+ (-[WKWebViewConfiguration init]): Remove _allowsAlternateFullscreen.
+ (-[WKWebViewConfiguration copyWithZone:]): Replace the variable.
+ (-[WKWebViewConfiguration _allowsAlternateFullscreen]): Deleted.
+ (-[WKWebViewConfiguration _setAllowsAlternateFullscreen:]): Deleted.
+ * UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h: Remove the SPI.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView initWithFrame:configuration:]): Update to use the new API.
+
2015-06-12 Alexey Proskuryakov <[email protected]>
-[WKWebView evaluateJavaScript] provides a misleading error when the return cannot be serialized
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (185555 => 185556)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-06-15 17:23:00 UTC (rev 185555)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-06-15 18:07:02 UTC (rev 185556)
@@ -323,7 +323,7 @@
webPageConfiguration.alwaysRunsAtForegroundPriority = [_configuration _alwaysRunsAtForegroundPriority];
webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::allowsInlineMediaPlaybackKey(), WebKit::WebPreferencesStore::Value(!![_configuration allowsInlineMediaPlayback]));
- webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::allowsAlternateFullscreenKey(), WebKit::WebPreferencesStore::Value(!![_configuration _allowsAlternateFullscreen] && shouldAllowAlternateFullscreen()));
+ webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::allowsAlternateFullscreenKey(), WebKit::WebPreferencesStore::Value(!![_configuration allowsPictureInPictureMediaPlayback] && shouldAllowAlternateFullscreen()));
webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::requiresUserGestureForMediaPlaybackKey(), WebKit::WebPreferencesStore::Value(!![_configuration requiresUserActionForMediaPlayback]));
#endif
#if ENABLE(WIRELESS_PLAYBACK_TARGET)
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h (185555 => 185556)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h 2015-06-15 17:23:00 UTC (rev 185555)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h 2015-06-15 18:07:02 UTC (rev 185556)
@@ -113,6 +113,12 @@
*/
@property (nonatomic) WKSelectionGranularity selectionGranularity;
+/*! @abstract A Boolean value indicating whether HTML5 videos may play
+ picture-in-picture.
+ @discussion The default value is YES.
+ */
+@property (nonatomic) BOOL allowsPictureInPictureMediaPlayback WK_AVAILABLE(NA, WK_IOS_TBA);
+
#endif
@end
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (185555 => 185556)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2015-06-15 17:23:00 UTC (rev 185555)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2015-06-15 18:07:02 UTC (rev 185556)
@@ -93,7 +93,6 @@
#if PLATFORM(IOS)
LazyInitialized<RetainPtr<WKWebViewContentProviderRegistry>> _contentProviderRegistry;
- BOOL _allowsAlternateFullscreen;
BOOL _alwaysRunsAtForegroundPriority;
#endif
}
@@ -105,8 +104,9 @@
#if PLATFORM(IOS)
_requiresUserActionForMediaPlayback = YES;
- _allowsAlternateFullscreen = YES;
+ _allowsPictureInPictureMediaPlayback = YES;
#endif
+
#if ENABLE(WIRELESS_TARGET_PLAYBACK)
_allowsAirPlayForMediaPlayback = YES;
#endif
@@ -140,7 +140,7 @@
#if PLATFORM(IOS)
configuration->_allowsInlineMediaPlayback = self->_allowsInlineMediaPlayback;
- configuration->_allowsAlternateFullscreen = self->_allowsAlternateFullscreen;
+ configuration->_allowsPictureInPictureMediaPlayback = self->_allowsPictureInPictureMediaPlayback;
configuration->_alwaysRunsAtForegroundPriority = _alwaysRunsAtForegroundPriority;
configuration->_requiresUserActionForMediaPlayback = self->_requiresUserActionForMediaPlayback;
configuration->_selectionGranularity = self->_selectionGranularity;
@@ -316,16 +316,6 @@
}
#if PLATFORM(IOS)
-- (BOOL)_allowsAlternateFullscreen
-{
- return _allowsAlternateFullscreen;
-}
-
-- (void)_setAllowsAlternateFullscreen:(BOOL)allowed
-{
- _allowsAlternateFullscreen = allowed;
-}
-
- (BOOL)_alwaysRunsAtForegroundPriority
{
return _alwaysRunsAtForegroundPriority;
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h (185555 => 185556)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2015-06-15 17:23:00 UTC (rev 185555)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2015-06-15 18:07:02 UTC (rev 185556)
@@ -45,8 +45,6 @@
@property (nonatomic, setter=_setTreatsSHA1SignedCertificatesAsInsecure:) BOOL _treatsSHA1SignedCertificatesAsInsecure WK_AVAILABLE(NA, WK_IOS_TBA);
#if TARGET_OS_IPHONE
-@property (nonatomic, setter=_setAllowsAlternateFullscreen:) BOOL _allowsAlternateFullscreen WK_AVAILABLE(NA, WK_IOS_TBA);
-
@property (nonatomic, setter=_setAlwaysRunsAtForegroundPriority:) BOOL _alwaysRunsAtForegroundPriority WK_AVAILABLE(NA, WK_IOS_TBA);
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
