Diff
Modified: trunk/Source/WebCore/ChangeLog (203854 => 203855)
--- trunk/Source/WebCore/ChangeLog 2016-07-29 02:09:38 UTC (rev 203854)
+++ trunk/Source/WebCore/ChangeLog 2016-07-29 03:03:21 UTC (rev 203855)
@@ -1,3 +1,27 @@
+2016-07-28 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ Remove deprecated SPI for video inline / fullscreen controls
+ https://bugs.webkit.org/show_bug.cgi?id=160318
+
+ Reviewed by Tim Horton.
+
+ r203752 deprecated the SPI allowsInlineMediaPlaybackWithPlaysInlineAttribute
+ and allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute (in favor of
+ inlineMediaPlaybackRequiresPlaysInlineAttribute). This patch removes the
+ deprecated SPI symbols.
+
+ No new tests because there is no behavior change.
+
+ * page/Settings.cpp:
+ * page/Settings.in:
+ * testing/InternalSettings.cpp:
+ (WebCore::InternalSettings::Backup::Backup): Deleted.
+ (WebCore::InternalSettings::Backup::restoreTo): Deleted.
+ (WebCore::InternalSettings::setAllowsInlineMediaPlaybackWithPlaysInlineAttribute): Deleted.
+ (WebCore::InternalSettings::setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute): Deleted.
+ * testing/InternalSettings.h:
+ * testing/InternalSettings.idl:
+
2016-07-28 Chris Dumez <cdu...@apple.com>
Add support for Element.getAttributeNames()
Modified: trunk/Source/WebCore/page/Settings.cpp (203854 => 203855)
--- trunk/Source/WebCore/page/Settings.cpp 2016-07-29 02:09:38 UTC (rev 203854)
+++ trunk/Source/WebCore/page/Settings.cpp 2016-07-29 03:03:21 UTC (rev 203855)
@@ -139,8 +139,6 @@
static const bool defaultAcceleratedCompositingForFixedPositionEnabled = true;
static const bool defaultAllowsInlineMediaPlayback = false;
static const bool defaultInlineMediaPlaybackRequiresPlaysInlineAttribute = true;
-static const bool defaultAllowsInlineMediaPlaybackWithPlaysInlineAttribute = true;
-static const bool defaultAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute = true;
static const bool defaultVideoPlaybackRequiresUserGesture = true;
static const bool defaultAudioPlaybackRequiresUserGesture = true;
static const bool defaultMediaDataLoadsAutomatically = false;
@@ -154,8 +152,6 @@
static const bool defaultAcceleratedCompositingForFixedPositionEnabled = false;
static const bool defaultAllowsInlineMediaPlayback = true;
static const bool defaultInlineMediaPlaybackRequiresPlaysInlineAttribute = false;
-static const bool defaultAllowsInlineMediaPlaybackWithPlaysInlineAttribute = false;
-static const bool defaultAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute = false;
static const bool defaultVideoPlaybackRequiresUserGesture = false;
static const bool defaultAudioPlaybackRequiresUserGesture = false;
static const bool defaultMediaDataLoadsAutomatically = true;
Modified: trunk/Source/WebCore/page/Settings.in (203854 => 203855)
--- trunk/Source/WebCore/page/Settings.in 2016-07-29 02:09:38 UTC (rev 203854)
+++ trunk/Source/WebCore/page/Settings.in 2016-07-29 03:03:21 UTC (rev 203855)
@@ -132,8 +132,6 @@
allowsInlineMediaPlayback initial=defaultAllowsInlineMediaPlayback
allowsInlineMediaPlaybackAfterFullscreen initial=true
inlineMediaPlaybackRequiresPlaysInlineAttribute initial=defaultInlineMediaPlaybackRequiresPlaysInlineAttribute
-allowsInlineMediaPlaybackWithPlaysInlineAttribute initial=defaultAllowsInlineMediaPlaybackWithPlaysInlineAttribute
-allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute initial=defaultAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute
allowsPictureInPictureMediaPlayback initial=defaultAllowsPictureInPictureMediaPlayback
mediaControlsScaleWithPageZoom initial=defaultMediaControlsScaleWithPageZoom
invisibleAutoplayNotPermitted initial=false
Modified: trunk/Source/WebCore/testing/InternalSettings.cpp (203854 => 203855)
--- trunk/Source/WebCore/testing/InternalSettings.cpp 2016-07-29 02:09:38 UTC (rev 203854)
+++ trunk/Source/WebCore/testing/InternalSettings.cpp 2016-07-29 03:03:21 UTC (rev 203855)
@@ -108,8 +108,6 @@
, m_allowsInlineMediaPlayback(settings.allowsInlineMediaPlayback())
, m_allowsInlineMediaPlaybackAfterFullscreen(settings.allowsInlineMediaPlaybackAfterFullscreen())
, m_inlineMediaPlaybackRequiresPlaysInlineAttribute(settings.inlineMediaPlaybackRequiresPlaysInlineAttribute())
- , m_allowsInlineMediaPlaybackWithPlaysInlineAttribute(settings.allowsInlineMediaPlaybackWithPlaysInlineAttribute())
- , m_allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(settings.allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute())
#if ENABLE(INDEXED_DATABASE_IN_WORKERS)
, m_indexedDBWorkersEnabled(RuntimeEnabledFeatures::sharedFeatures().indexedDBWorkersEnabled())
#endif
@@ -186,8 +184,6 @@
settings.setAllowsInlineMediaPlayback(m_allowsInlineMediaPlayback);
settings.setAllowsInlineMediaPlaybackAfterFullscreen(m_allowsInlineMediaPlaybackAfterFullscreen);
settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(m_inlineMediaPlaybackRequiresPlaysInlineAttribute);
- settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(m_allowsInlineMediaPlaybackWithPlaysInlineAttribute);
- settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(m_allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute);
RuntimeEnabledFeatures::sharedFeatures().setPluginReplacementEnabled(m_pluginReplacementEnabled);
#if ENABLE(INDEXED_DATABASE_IN_WORKERS)
RuntimeEnabledFeatures::sharedFeatures().setIndexedDBWorkersEnabled(m_indexedDBWorkersEnabled);
@@ -584,18 +580,6 @@
settings()->setInlineMediaPlaybackRequiresPlaysInlineAttribute(requires);
}
-void InternalSettings::setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(bool requires, ExceptionCode& ec)
-{
- InternalSettingsGuardForSettings();
- settings()->setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(requires);
-}
-
-void InternalSettings::setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(bool requires, ExceptionCode& ec)
-{
- InternalSettingsGuardForSettings();
- settings()->setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(requires);
-}
-
void InternalSettings::setIndexedDBWorkersEnabled(bool enabled, ExceptionCode&)
{
#if ENABLE(INDEXED_DATABASE_IN_WORKERS)
Modified: trunk/Source/WebCore/testing/InternalSettings.h (203854 => 203855)
--- trunk/Source/WebCore/testing/InternalSettings.h 2016-07-29 02:09:38 UTC (rev 203854)
+++ trunk/Source/WebCore/testing/InternalSettings.h 2016-07-29 03:03:21 UTC (rev 203855)
@@ -108,8 +108,6 @@
bool m_allowsInlineMediaPlayback;
bool m_allowsInlineMediaPlaybackAfterFullscreen;
bool m_inlineMediaPlaybackRequiresPlaysInlineAttribute;
- bool m_allowsInlineMediaPlaybackWithPlaysInlineAttribute;
- bool m_allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute;
#if ENABLE(INDEXED_DATABASE_IN_WORKERS)
bool m_indexedDBWorkersEnabled;
#endif
@@ -165,8 +163,6 @@
void setAllowsInlineMediaPlayback(bool, ExceptionCode&);
void setAllowsInlineMediaPlaybackAfterFullscreen(bool, ExceptionCode&);
void setInlineMediaPlaybackRequiresPlaysInlineAttribute(bool, ExceptionCode&);
- void setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(bool, ExceptionCode&);
- void setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(bool, ExceptionCode&);
void setIndexedDBWorkersEnabled(bool, ExceptionCode&);
String userInterfaceDirectionPolicy(ExceptionCode&);
void setUserInterfaceDirectionPolicy(const String& policy, ExceptionCode&);
Modified: trunk/Source/WebCore/testing/InternalSettings.idl (203854 => 203855)
--- trunk/Source/WebCore/testing/InternalSettings.idl 2016-07-29 02:09:38 UTC (rev 203854)
+++ trunk/Source/WebCore/testing/InternalSettings.idl 2016-07-29 03:03:21 UTC (rev 203855)
@@ -78,8 +78,6 @@
[RaisesException] void setAllowsInlineMediaPlayback(boolean allows);
[RaisesException] void setAllowsInlineMediaPlaybackAfterFullscreen(boolean allows);
[RaisesException] void setInlineMediaPlaybackRequiresPlaysInlineAttribute(boolean requires);
- [RaisesException] void setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(boolean requires);
- [RaisesException] void setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(boolean requires);
[RaisesException] void setIndexedDBWorkersEnabled(boolean requires);
Modified: trunk/Source/WebKit/mac/ChangeLog (203854 => 203855)
--- trunk/Source/WebKit/mac/ChangeLog 2016-07-29 02:09:38 UTC (rev 203854)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-07-29 03:03:21 UTC (rev 203855)
@@ -1,3 +1,21 @@
+2016-07-28 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ Remove deprecated SPI for video inline / fullscreen controls
+ https://bugs.webkit.org/show_bug.cgi?id=160318
+
+ Reviewed by Tim Horton.
+
+ * WebView/WebPreferenceKeysPrivate.h:
+ * WebView/WebPreferences.mm:
+ (+[WebPreferences initialize]): Deleted.
+ (-[WebPreferences allowsInlineMediaPlaybackWithPlaysInlineAttribute]): Deleted.
+ (-[WebPreferences setAllowsInlineMediaPlaybackWithPlaysInlineAttribute:]): Deleted.
+ (-[WebPreferences allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute]): Deleted.
+ (-[WebPreferences setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute:]): Deleted.
+ * WebView/WebPreferencesPrivate.h:
+ * WebView/WebView.mm:
+ (-[WebView _preferencesChanged:]): Deleted.
+
2016-07-28 Anders Carlsson <ander...@apple.com>
Move a Mail.app workaround closer to where it's actually needed
Modified: trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (203854 => 203855)
--- trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2016-07-29 02:09:38 UTC (rev 203854)
+++ trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2016-07-29 03:03:21 UTC (rev 203855)
@@ -127,8 +127,6 @@
#define WebKitAllowsInlineMediaPlaybackPreferenceKey @"WebKitMediaPlaybackAllowsInline"
#define WebKitAllowsInlineMediaPlaybackAfterFullscreenPreferenceKey @"WebKitAllowsInlineMediaPlaybackAfterFullscreen"
#define WebKitInlineMediaPlaybackRequiresPlaysInlineAttributeKey @"InlineMediaPlaybackRequiresPlaysInlineAttribute"
-#define WebKitAllowsInlineMediaPlaybackWithPlaysInlineAttributeKey @"AllowsInlineMediaPlaybackWithPlaysInlineAttribute"
-#define WebKitAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttributeKey @"AllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute"
#define WebKitInvisibleAutoplayNotPermittedKey @"InvisibleAutoplayNotPermitted"
#define WebKitAllowsPictureInPictureMediaPlaybackPreferenceKey @"WebKitAllowsPictureInPictureMediaPlayback"
#define WebKitAllowsAirPlayForMediaPlaybackPreferenceKey @"WebKitMediaPlaybackAllowsAirPlay"
Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (203854 => 203855)
--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2016-07-29 02:09:38 UTC (rev 203854)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2016-07-29 03:03:21 UTC (rev 203855)
@@ -526,8 +526,6 @@
[NSNumber numberWithBool:YES], WebKitAllowsInlineMediaPlaybackPreferenceKey,
[NSNumber numberWithBool:NO], WebKitAllowsInlineMediaPlaybackAfterFullscreenPreferenceKey,
[NSNumber numberWithBool:NO], WebKitInlineMediaPlaybackRequiresPlaysInlineAttributeKey,
- [NSNumber numberWithBool:NO], WebKitAllowsInlineMediaPlaybackWithPlaysInlineAttributeKey,
- [NSNumber numberWithBool:NO], WebKitAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttributeKey,
[NSNumber numberWithBool:YES], WebKitMediaControlsScaleWithPageZoomPreferenceKey,
[NSNumber numberWithBool:NO], WebKitWebAudioEnabledPreferenceKey,
[NSNumber numberWithBool:YES], WebKitBackspaceKeyNavigationEnabledKey,
@@ -541,8 +539,6 @@
[NSNumber numberWithBool:allowsInlineMediaPlayback], WebKitAllowsInlineMediaPlaybackPreferenceKey,
[NSNumber numberWithBool:allowsInlineMediaPlaybackAfterFullscreen], WebKitAllowsInlineMediaPlaybackAfterFullscreenPreferenceKey,
[NSNumber numberWithBool:requiresPlaysInlineAttribute], WebKitInlineMediaPlaybackRequiresPlaysInlineAttributeKey,
- [NSNumber numberWithBool:requiresPlaysInlineAttribute], WebKitAllowsInlineMediaPlaybackWithPlaysInlineAttributeKey,
- [NSNumber numberWithBool:requiresPlaysInlineAttribute], WebKitAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttributeKey,
[NSNumber numberWithBool:NO], WebKitMediaControlsScaleWithPageZoomPreferenceKey,
[NSNumber numberWithUnsignedInt:AudioSession::None], WebKitAudioSessionCategoryOverride,
[NSNumber numberWithBool:NO], WebKitMediaDataLoadsAutomaticallyPreferenceKey,
@@ -2297,26 +2293,6 @@
[self _setBoolValue:flag forKey:WebKitInlineMediaPlaybackRequiresPlaysInlineAttributeKey];
}
-- (BOOL)allowsInlineMediaPlaybackWithPlaysInlineAttribute
-{
- return [self _boolValueForKey:WebKitAllowsInlineMediaPlaybackWithPlaysInlineAttributeKey];
-}
-
-- (void)setAllowsInlineMediaPlaybackWithPlaysInlineAttribute:(BOOL)flag
-{
- [self _setBoolValue:flag forKey:WebKitAllowsInlineMediaPlaybackWithPlaysInlineAttributeKey];
-}
-
-- (BOOL)allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute
-{
- return [self _boolValueForKey:WebKitAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttributeKey];
-}
-
-- (void)setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute:(BOOL)flag
-{
- [self _setBoolValue:flag forKey:WebKitAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttributeKey];
-}
-
- (BOOL)invisibleAutoplayNotPermitted
{
return [self _boolValueForKey:WebKitInvisibleAutoplayNotPermittedKey];
Modified: trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (203854 => 203855)
--- trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2016-07-29 02:09:38 UTC (rev 203854)
+++ trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2016-07-29 03:03:21 UTC (rev 203855)
@@ -265,12 +265,6 @@
- (void)setInlineMediaPlaybackRequiresPlaysInlineAttribute:(BOOL)flag;
- (BOOL)inlineMediaPlaybackRequiresPlaysInlineAttribute;
-- (void)setAllowsInlineMediaPlaybackWithPlaysInlineAttribute:(BOOL)flag;
-- (BOOL)allowsInlineMediaPlaybackWithPlaysInlineAttribute;
-
-- (void)setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute:(BOOL)flag;
-- (BOOL)allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute;
-
- (void)setInvisibleAutoplayNotPermitted:(BOOL)flag;
- (BOOL)invisibleAutoplayNotPermitted;
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (203854 => 203855)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2016-07-29 02:09:38 UTC (rev 203854)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2016-07-29 03:03:21 UTC (rev 203855)
@@ -2349,8 +2349,6 @@
settings.setAllowsInlineMediaPlayback([preferences mediaPlaybackAllowsInline]);
settings.setAllowsInlineMediaPlaybackAfterFullscreen([preferences allowsInlineMediaPlaybackAfterFullscreen]);
settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute([preferences inlineMediaPlaybackRequiresPlaysInlineAttribute]);
- settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute([preferences allowsInlineMediaPlaybackWithPlaysInlineAttribute]);
- settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute([preferences allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute]);
settings.setInvisibleAutoplayNotPermitted([preferences invisibleAutoplayNotPermitted]);
settings.setAllowsPictureInPictureMediaPlayback([preferences allowsPictureInPictureMediaPlayback] && shouldAllowPictureInPictureMediaPlayback());
settings.setMediaControlsScaleWithPageZoom([preferences mediaControlsScaleWithPageZoom]);
Modified: trunk/Source/WebKit2/ChangeLog (203854 => 203855)
--- trunk/Source/WebKit2/ChangeLog 2016-07-29 02:09:38 UTC (rev 203854)
+++ trunk/Source/WebKit2/ChangeLog 2016-07-29 03:03:21 UTC (rev 203855)
@@ -1,3 +1,30 @@
+2016-07-28 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ Remove deprecated SPI for video inline / fullscreen controls
+ https://bugs.webkit.org/show_bug.cgi?id=160318
+
+ Reviewed by Tim Horton.
+
+ * Shared/WebPreferencesDefinitions.h:
+ * UIProcess/API/C/WKPreferences.cpp:
+ (WKPreferencesSetAllowsInlineMediaPlaybackWithPlaysInlineAttribute): Deleted.
+ (WKPreferencesGetAllowsInlineMediaPlaybackWithPlaysInlineAttribute): Deleted.
+ (WKPreferencesSetAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute): Deleted.
+ (WKPreferencesGetAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute): Deleted.
+ * UIProcess/API/C/WKPreferencesRefPrivate.h:
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _initializeWithConfiguration:]): Deleted.
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+ (-[WKWebViewConfiguration init]): Deleted.
+ (-[WKWebViewConfiguration copyWithZone:]): Deleted.
+ (-[WKWebViewConfiguration _allowsInlineMediaPlaybackWithPlaysInlineAttribute]): Deleted.
+ (-[WKWebViewConfiguration _setAllowsInlineMediaPlaybackWithPlaysInlineAttribute:]): Deleted.
+ (-[WKWebViewConfiguration _allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute]): Deleted.
+ (-[WKWebViewConfiguration _setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute:]): Deleted.
+ * UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences): Deleted.
+
2016-07-28 Tim Horton <timothy_hor...@apple.com>
Frequent animation lags when interacting with Safari (sidebar, tab switching, etc.)
Modified: trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (203854 => 203855)
--- trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2016-07-29 02:09:38 UTC (rev 203854)
+++ trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2016-07-29 03:03:21 UTC (rev 203855)
@@ -66,8 +66,6 @@
#define DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK false
#define DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK_AFTER_FULLSCREEN true
#define DEFAULT_INLINE_MEDIA_PLAYBACK_REQUIRES_PLAYS_INLINE_ATTRIBUTE true
-#define DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK_WITH_PLAYS_INLINE_ATTRIBUTE true
-#define DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK_WITH_WEBKIT_PLAYS_INLINE_ATTRIBUTE true
#define DEFAULT_INVISIBLE_AUTOPLAY_NOT_PERMITTED true
#define DEFAULT_MEDIA_DATA_LOADS_AUTOMATICALLY false
#define DEFAULT_MEDIA_CONTROLS_SCALE_WITH_PAGE_ZOOM false
@@ -85,8 +83,6 @@
#define DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK true
#define DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK_AFTER_FULLSCREEN false
#define DEFAULT_INLINE_MEDIA_PLAYBACK_REQUIRES_PLAYS_INLINE_ATTRIBUTE false
-#define DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK_WITH_PLAYS_INLINE_ATTRIBUTE false
-#define DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK_WITH_WEBKIT_PLAYS_INLINE_ATTRIBUTE false
#define DEFAULT_INVISIBLE_AUTOPLAY_NOT_PERMITTED false
#define DEFAULT_MEDIA_DATA_LOADS_AUTOMATICALLY true
#define DEFAULT_MEDIA_CONTROLS_SCALE_WITH_PAGE_ZOOM true
@@ -157,8 +153,6 @@
macro(AllowsInlineMediaPlayback, allowsInlineMediaPlayback, Bool, bool, DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK, "", "") \
macro(AllowsInlineMediaPlaybackAfterFullscreen, allowsInlineMediaPlaybackAfterFullscreen, Bool, bool, DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK_AFTER_FULLSCREEN, "", "") \
macro(InlineMediaPlaybackRequiresPlaysInlineAttribute, inlineMediaPlaybackRequiresPlaysInlineAttribute, Bool, bool, DEFAULT_INLINE_MEDIA_PLAYBACK_REQUIRES_PLAYS_INLINE_ATTRIBUTE, "", "") \
- macro(AllowsInlineMediaPlaybackWithPlaysInlineAttribute, allowsInlineMediaPlaybackWithPlaysInlineAttribute, Bool, bool, DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK_WITH_PLAYS_INLINE_ATTRIBUTE, "", "") \
- macro(AllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute, allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute, Bool, bool, DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK_WITH_WEBKIT_PLAYS_INLINE_ATTRIBUTE, "", "") \
macro(InvisibleAutoplayNotPermitted, invisibleAutoplayNotPermitted, Bool, bool, DEFAULT_INVISIBLE_AUTOPLAY_NOT_PERMITTED, "", "") \
macro(MediaDataLoadsAutomatically, mediaDataLoadsAutomatically, Bool, bool, DEFAULT_MEDIA_DATA_LOADS_AUTOMATICALLY, "", "") \
macro(AllowsPictureInPictureMediaPlayback, allowsPictureInPictureMediaPlayback, Bool, bool, DEFAULT_ALLOWS_PICTURE_IN_PICTURE_MEDIA_PLAYBACK, "", "") \
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (203854 => 203855)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2016-07-29 02:09:38 UTC (rev 203854)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2016-07-29 03:03:21 UTC (rev 203855)
@@ -803,26 +803,6 @@
return toImpl(preferencesRef)->inlineMediaPlaybackRequiresPlaysInlineAttribute();
}
-void WKPreferencesSetAllowsInlineMediaPlaybackWithPlaysInlineAttribute(WKPreferencesRef preferencesRef, bool flag)
-{
- toImpl(preferencesRef)->setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(flag);
-}
-
-bool WKPreferencesGetAllowsInlineMediaPlaybackWithPlaysInlineAttribute(WKPreferencesRef preferencesRef)
-{
- return toImpl(preferencesRef)->allowsInlineMediaPlaybackWithPlaysInlineAttribute();
-}
-
-void WKPreferencesSetAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(WKPreferencesRef preferencesRef, bool flag)
-{
- toImpl(preferencesRef)->setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(flag);
-}
-
-bool WKPreferencesGetAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(WKPreferencesRef preferencesRef)
-{
- return toImpl(preferencesRef)->allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute();
-}
-
void WKPreferencesSetMediaControlsScaleWithPageZoom(WKPreferencesRef preferencesRef, bool flag)
{
toImpl(preferencesRef)->setMediaControlsScaleWithPageZoom(flag);
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h (203854 => 203855)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2016-07-29 02:09:38 UTC (rev 203854)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2016-07-29 03:03:21 UTC (rev 203855)
@@ -195,14 +195,6 @@
WK_EXPORT void WKPreferencesSetInlineMediaPlaybackRequiresPlaysInlineAttribute(WKPreferencesRef preferencesRef, bool flag);
WK_EXPORT bool WKPreferencesGetInlineMediaPlaybackRequiresPlaysInlineAttribute(WKPreferencesRef preferencesRef);
-// Defaults to true on iOS, false elsewhere.
-WK_EXPORT void WKPreferencesSetAllowsInlineMediaPlaybackWithPlaysInlineAttribute(WKPreferencesRef preferencesRef, bool flag);
-WK_EXPORT bool WKPreferencesGetAllowsInlineMediaPlaybackWithPlaysInlineAttribute(WKPreferencesRef preferencesRef);
-
-// Defaults to true on iOS, false elsewhere.
-WK_EXPORT void WKPreferencesSetAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(WKPreferencesRef preferencesRef, bool flag);
-WK_EXPORT bool WKPreferencesGetAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(WKPreferencesRef preferencesRef);
-
// Defaults to false on iOS, true elsewhere.
WK_EXPORT void WKPreferencesSetMediaControlsScaleWithPageZoom(WKPreferencesRef preferencesRef, bool flag);
WK_EXPORT bool WKPreferencesGetMediaControlsScaleWithPageZoom(WKPreferencesRef preferencesRef);
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (203854 => 203855)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-07-29 02:09:38 UTC (rev 203854)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-07-29 03:03:21 UTC (rev 203855)
@@ -458,8 +458,6 @@
pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::allowsInlineMediaPlaybackKey(), WebKit::WebPreferencesStore::Value(!![_configuration allowsInlineMediaPlayback]));
pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::allowsInlineMediaPlaybackAfterFullscreenKey(), WebKit::WebPreferencesStore::Value(!![_configuration _allowsInlineMediaPlaybackAfterFullscreen]));
pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::inlineMediaPlaybackRequiresPlaysInlineAttributeKey(), WebKit::WebPreferencesStore::Value(!![_configuration _inlineMediaPlaybackRequiresPlaysInlineAttribute]));
- pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::allowsInlineMediaPlaybackWithPlaysInlineAttributeKey(), WebKit::WebPreferencesStore::Value(!![_configuration _allowsInlineMediaPlaybackWithPlaysInlineAttribute]));
- pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::allowsInlineMediaPlaybackWithWebKitPlaysInlineAttributeKey(), WebKit::WebPreferencesStore::Value(!![_configuration _allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute]));
pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::allowsPictureInPictureMediaPlaybackKey(), WebKit::WebPreferencesStore::Value(!![_configuration allowsPictureInPictureMediaPlayback] && shouldAllowPictureInPictureMediaPlayback()));
pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::userInterfaceDirectionPolicyKey(), WebKit::WebPreferencesStore::Value(static_cast<uint32_t>(WebCore::UserInterfaceDirectionPolicy::Content)));
pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::systemLayoutDirectionKey(), WebKit::WebPreferencesStore::Value(static_cast<uint32_t>(WebCore::LTR)));
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (203854 => 203855)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2016-07-29 02:09:38 UTC (rev 203854)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2016-07-29 03:03:21 UTC (rev 203855)
@@ -108,8 +108,6 @@
BOOL _alwaysRunsAtForegroundPriority;
BOOL _allowsInlineMediaPlayback;
BOOL _inlineMediaPlaybackRequiresPlaysInlineAttribute;
- BOOL _allowsInlineMediaPlaybackWithPlaysInlineAttribute;
- BOOL _allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute;
BOOL _allowsInlineMediaPlaybackAfterFullscreen;
#endif
@@ -140,8 +138,6 @@
_allowsPictureInPictureMediaPlayback = YES;
_allowsInlineMediaPlayback = WebCore::deviceClass() == MGDeviceClassiPad;
_inlineMediaPlaybackRequiresPlaysInlineAttribute = !_allowsInlineMediaPlayback;
- _allowsInlineMediaPlaybackWithPlaysInlineAttribute = !_allowsInlineMediaPlayback;
- _allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute = !_allowsInlineMediaPlayback;
_allowsInlineMediaPlaybackAfterFullscreen = !_allowsInlineMediaPlayback;
_mediaDataLoadsAutomatically = NO;
if (linkedOnOrAfter(WebKit::LibraryVersion::FirstWithMediaTypesRequiringUserActionForPlayback))
@@ -293,8 +289,6 @@
configuration->_allowsInlineMediaPlayback = self->_allowsInlineMediaPlayback;
configuration->_allowsInlineMediaPlaybackAfterFullscreen = self->_allowsInlineMediaPlaybackAfterFullscreen;
configuration->_inlineMediaPlaybackRequiresPlaysInlineAttribute = self->_inlineMediaPlaybackRequiresPlaysInlineAttribute;
- configuration->_allowsInlineMediaPlaybackWithPlaysInlineAttribute = self->_allowsInlineMediaPlaybackWithPlaysInlineAttribute;
- configuration->_allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute = self->_allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute;
configuration->_allowsPictureInPictureMediaPlayback = self->_allowsPictureInPictureMediaPlayback;
configuration->_alwaysRunsAtForegroundPriority = _alwaysRunsAtForegroundPriority;
configuration->_selectionGranularity = self->_selectionGranularity;
@@ -584,26 +578,6 @@
_inlineMediaPlaybackRequiresPlaysInlineAttribute = requires;
}
-- (BOOL)_allowsInlineMediaPlaybackWithPlaysInlineAttribute
-{
- return _allowsInlineMediaPlaybackWithPlaysInlineAttribute;
-}
-
-- (void)_setAllowsInlineMediaPlaybackWithPlaysInlineAttribute:(BOOL)requires
-{
- _allowsInlineMediaPlaybackWithPlaysInlineAttribute = requires;
-}
-
-- (BOOL)_allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute
-{
- return _allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute;
-}
-
-- (void)_setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute:(BOOL)requires
-{
- _allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute = requires;
-}
-
- (BOOL)_allowsInlineMediaPlaybackAfterFullscreen
{
return _allowsInlineMediaPlaybackAfterFullscreen;
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h (203854 => 203855)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2016-07-29 02:09:38 UTC (rev 203854)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2016-07-29 03:03:21 UTC (rev 203855)
@@ -60,8 +60,6 @@
#if TARGET_OS_IPHONE
@property (nonatomic, setter=_setAlwaysRunsAtForegroundPriority:) BOOL _alwaysRunsAtForegroundPriority WK_API_AVAILABLE(ios(9_0));
@property (nonatomic, setter=_setInlineMediaPlaybackRequiresPlaysInlineAttribute:) BOOL _inlineMediaPlaybackRequiresPlaysInlineAttribute WK_API_AVAILABLE(ios(WK_IOS_TBA));
-@property (nonatomic, setter=_setAllowsInlineMediaPlaybackWithPlaysInlineAttribute:) BOOL _allowsInlineMediaPlaybackWithPlaysInlineAttribute WK_API_AVAILABLE(ios(WK_IOS_TBA));
-@property (nonatomic, setter=_setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute:) BOOL _allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute WK_API_AVAILABLE(ios(WK_IOS_TBA));
@property (nonatomic, setter=_setAllowsInlineMediaPlaybackAfterFullscreen:) BOOL _allowsInlineMediaPlaybackAfterFullscreen WK_API_AVAILABLE(ios(WK_IOS_TBA));
#else
@property (nonatomic, setter=_setShowsURLsInToolTips:) BOOL _showsURLsInToolTips WK_API_AVAILABLE(macosx(WK_MAC_TBA));
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (203854 => 203855)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-07-29 02:09:38 UTC (rev 203854)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-07-29 03:03:21 UTC (rev 203855)
@@ -2978,8 +2978,6 @@
settings.setAllowsInlineMediaPlayback(store.getBoolValueForKey(WebPreferencesKey::allowsInlineMediaPlaybackKey()));
settings.setAllowsInlineMediaPlaybackAfterFullscreen(store.getBoolValueForKey(WebPreferencesKey::allowsInlineMediaPlaybackAfterFullscreenKey()));
settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(store.getBoolValueForKey(WebPreferencesKey::inlineMediaPlaybackRequiresPlaysInlineAttributeKey()));
- settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(store.getBoolValueForKey(WebPreferencesKey::allowsInlineMediaPlaybackWithPlaysInlineAttributeKey()));
- settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(store.getBoolValueForKey(WebPreferencesKey::allowsInlineMediaPlaybackWithWebKitPlaysInlineAttributeKey()));
settings.setInvisibleAutoplayNotPermitted(store.getBoolValueForKey(WebPreferencesKey::invisibleAutoplayNotPermittedKey()));
settings.setMediaDataLoadsAutomatically(store.getBoolValueForKey(WebPreferencesKey::mediaDataLoadsAutomaticallyKey()));
#if ENABLE(ATTACHMENT_ELEMENT)
Modified: trunk/Tools/ChangeLog (203854 => 203855)
--- trunk/Tools/ChangeLog 2016-07-29 02:09:38 UTC (rev 203854)
+++ trunk/Tools/ChangeLog 2016-07-29 03:03:21 UTC (rev 203855)
@@ -1,3 +1,19 @@
+2016-07-28 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ Remove deprecated SPI for video inline / fullscreen controls
+ https://bugs.webkit.org/show_bug.cgi?id=160318
+
+ Reviewed by Tim Horton.
+
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (setDefaultsToConsistentValuesForTesting): Deleted.
+ * TestWebKitAPI/Tests/WebKit2Cocoa/RequiresUserActionForPlayback.mm:
+ (RequiresUserActionForPlaybackTest::SetUp): Deleted.
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::resetPreferencesToConsistentValues): Deleted.
+ * WebKitTestRunner/cocoa/TestControllerCocoa.mm:
+ (WTR::initializeWebViewConfiguration): Deleted.
+
2016-07-28 Daniel Bates <daba...@apple.com>
[iOS] TestWebKitAPI bundle targets are not code signed
Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (203854 => 203855)
--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2016-07-29 02:09:38 UTC (rev 203854)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2016-07-29 03:03:21 UTC (rev 203855)
@@ -1018,8 +1018,6 @@
WebKitFullScreenEnabledPreferenceKey: @YES,
WebKitAllowsInlineMediaPlaybackPreferenceKey: @YES,
WebKitInlineMediaPlaybackRequiresPlaysInlineAttributeKey: @NO,
- WebKitAllowsInlineMediaPlaybackWithPlaysInlineAttributeKey: @NO,
- WebKitAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttributeKey: @NO,
@"UseWebKitWebInspector": @YES,
#if !PLATFORM(IOS)
@"NSPreferredSpellServerLanguage": @"en_US",
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/RequiresUserActionForPlayback.mm (203854 => 203855)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/RequiresUserActionForPlayback.mm 2016-07-29 02:09:38 UTC (rev 203854)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/RequiresUserActionForPlayback.mm 2016-07-29 03:03:21 UTC (rev 203855)
@@ -77,8 +77,6 @@
#if TARGET_OS_IPHONE
configuration.get().allowsInlineMediaPlayback = YES;
configuration.get()._inlineMediaPlaybackRequiresPlaysInlineAttribute = NO;
- configuration.get()._allowsInlineMediaPlaybackWithPlaysInlineAttribute = NO;
- configuration.get()._allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute = NO;
#endif
}
Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (203854 => 203855)
--- trunk/Tools/WebKitTestRunner/TestController.cpp 2016-07-29 02:09:38 UTC (rev 203854)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2016-07-29 03:03:21 UTC (rev 203855)
@@ -685,8 +685,6 @@
WKPreferencesSetMediaPlaybackAllowsInline(preferences, true);
WKPreferencesSetInlineMediaPlaybackRequiresPlaysInlineAttribute(preferences, false);
- WKPreferencesSetAllowsInlineMediaPlaybackWithPlaysInlineAttribute(preferences, false);
- WKPreferencesSetAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(preferences, false);
WKCookieManagerDeleteAllCookies(WKContextGetCookieManager(m_context.get()));
Modified: trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm (203854 => 203855)
--- trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm 2016-07-29 02:09:38 UTC (rev 203854)
+++ trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm 2016-07-29 03:03:21 UTC (rev 203855)
@@ -62,8 +62,6 @@
#if TARGET_OS_IPHONE
globalWebViewConfiguration.allowsInlineMediaPlayback = YES;
globalWebViewConfiguration._inlineMediaPlaybackRequiresPlaysInlineAttribute = NO;
- globalWebViewConfiguration._allowsInlineMediaPlaybackWithPlaysInlineAttribute = NO;
- globalWebViewConfiguration._allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute = NO;
globalWebViewConfiguration._invisibleAutoplayNotPermitted = NO;
globalWebViewConfiguration._mediaDataLoadsAutomatically = YES;
globalWebViewConfiguration.requiresUserActionForMediaPlayback = NO;
