Diff
Modified: trunk/Source/WebCore/ChangeLog (203544 => 203545)
--- trunk/Source/WebCore/ChangeLog 2016-07-22 01:01:14 UTC (rev 203544)
+++ trunk/Source/WebCore/ChangeLog 2016-07-22 01:40:22 UTC (rev 203545)
@@ -1,3 +1,27 @@
+2016-07-21 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ Remove support for deprecated SPI inlineMediaPlaybackRequiresPlaysInlineAttribute
+ https://bugs.webkit.org/show_bug.cgi?id=160066
+
+ Reviewed by Dean Jackson.
+
+ r203520 deprecated inlineMediaPlaybackRequiresPlaysInlineAttribute in favor of
+ allowsInlineMediaPlaybackWithPlaysInlineAttribute and
+ allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute. The old
+ inlineMediaPlaybackRequiresPlaysInlineAttribute is SPI and was never released
+ to the public. Therefore, it can be removed safely.
+
+ 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::setInlineMediaPlaybackRequiresPlaysInlineAttribute): Deleted.
+ * testing/InternalSettings.h:
+ * testing/InternalSettings.idl:
+
2016-07-21 Dean Jackson <d...@apple.com>
REGRESSION (r202927): The internal size of the ImageBuffer is scaled twice by the context scaleFactor
Modified: trunk/Source/WebCore/page/Settings.cpp (203544 => 203545)
--- trunk/Source/WebCore/page/Settings.cpp 2016-07-22 01:01:14 UTC (rev 203544)
+++ trunk/Source/WebCore/page/Settings.cpp 2016-07-22 01:40:22 UTC (rev 203545)
@@ -138,7 +138,6 @@
static const bool defaultFixedBackgroundsPaintRelativeToDocument = true;
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;
@@ -153,7 +152,6 @@
static const bool defaultFixedBackgroundsPaintRelativeToDocument = false;
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;
Modified: trunk/Source/WebCore/page/Settings.in (203544 => 203545)
--- trunk/Source/WebCore/page/Settings.in 2016-07-22 01:01:14 UTC (rev 203544)
+++ trunk/Source/WebCore/page/Settings.in 2016-07-22 01:40:22 UTC (rev 203545)
@@ -131,7 +131,6 @@
mainContentUserGestureOverrideEnabled initial=false
allowsInlineMediaPlayback initial=defaultAllowsInlineMediaPlayback
allowsInlineMediaPlaybackAfterFullscreen initial=true
-inlineMediaPlaybackRequiresPlaysInlineAttribute initial=defaultInlineMediaPlaybackRequiresPlaysInlineAttribute
allowsInlineMediaPlaybackWithPlaysInlineAttribute initial=defaultAllowsInlineMediaPlaybackWithPlaysInlineAttribute
allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute initial=defaultAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute
allowsPictureInPictureMediaPlayback initial=defaultAllowsPictureInPictureMediaPlayback
Modified: trunk/Source/WebCore/testing/InternalSettings.cpp (203544 => 203545)
--- trunk/Source/WebCore/testing/InternalSettings.cpp 2016-07-22 01:01:14 UTC (rev 203544)
+++ trunk/Source/WebCore/testing/InternalSettings.cpp 2016-07-22 01:40:22 UTC (rev 203545)
@@ -107,7 +107,6 @@
#endif
, 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)
@@ -185,7 +184,6 @@
#endif
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);
@@ -578,12 +576,6 @@
settings()->setAllowsInlineMediaPlaybackAfterFullscreen(allows);
}
-void InternalSettings::setInlineMediaPlaybackRequiresPlaysInlineAttribute(bool requires, ExceptionCode& ec)
-{
- InternalSettingsGuardForSettings();
- settings()->setInlineMediaPlaybackRequiresPlaysInlineAttribute(requires);
-}
-
void InternalSettings::setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(bool requires, ExceptionCode& ec)
{
InternalSettingsGuardForSettings();
Modified: trunk/Source/WebCore/testing/InternalSettings.h (203544 => 203545)
--- trunk/Source/WebCore/testing/InternalSettings.h 2016-07-22 01:01:14 UTC (rev 203544)
+++ trunk/Source/WebCore/testing/InternalSettings.h 2016-07-22 01:40:22 UTC (rev 203545)
@@ -107,7 +107,6 @@
#endif
bool m_allowsInlineMediaPlayback;
bool m_allowsInlineMediaPlaybackAfterFullscreen;
- bool m_inlineMediaPlaybackRequiresPlaysInlineAttribute;
bool m_allowsInlineMediaPlaybackWithPlaysInlineAttribute;
bool m_allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute;
#if ENABLE(INDEXED_DATABASE_IN_WORKERS)
@@ -164,7 +163,6 @@
void setScrollingTreeIncludesFrames(bool, ExceptionCode&);
void setAllowsInlineMediaPlayback(bool, ExceptionCode&);
void setAllowsInlineMediaPlaybackAfterFullscreen(bool, ExceptionCode&);
- void setInlineMediaPlaybackRequiresPlaysInlineAttribute(bool, ExceptionCode&);
void setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(bool, ExceptionCode&);
void setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(bool, ExceptionCode&);
void setIndexedDBWorkersEnabled(bool, ExceptionCode&);
Modified: trunk/Source/WebCore/testing/InternalSettings.idl (203544 => 203545)
--- trunk/Source/WebCore/testing/InternalSettings.idl 2016-07-22 01:01:14 UTC (rev 203544)
+++ trunk/Source/WebCore/testing/InternalSettings.idl 2016-07-22 01:40:22 UTC (rev 203545)
@@ -77,7 +77,6 @@
[RaisesException] void setMinimumTimerInterval(unrestricted double intervalInSeconds);
[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);
Modified: trunk/Source/WebKit/mac/ChangeLog (203544 => 203545)
--- trunk/Source/WebKit/mac/ChangeLog 2016-07-22 01:01:14 UTC (rev 203544)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-07-22 01:40:22 UTC (rev 203545)
@@ -1,5 +1,21 @@
2016-07-21 Myles C. Maxfield <mmaxfi...@apple.com>
+ Remove support for deprecated SPI inlineMediaPlaybackRequiresPlaysInlineAttribute
+ https://bugs.webkit.org/show_bug.cgi?id=160066
+
+ Reviewed by Dean Jackson.
+
+ * WebView/WebPreferenceKeysPrivate.h:
+ * WebView/WebPreferences.mm:
+ (+[WebPreferences initialize]): Deleted.
+ (-[WebPreferences inlineMediaPlaybackRequiresPlaysInlineAttribute]): Deleted.
+ (-[WebPreferences setInlineMediaPlaybackRequiresPlaysInlineAttribute:]): Deleted.
+ * WebView/WebPreferencesPrivate.h:
+ * WebView/WebView.mm:
+ (-[WebView _preferencesChanged:]): Deleted.
+
+2016-07-21 Myles C. Maxfield <mmaxfi...@apple.com>
+
[iPhone] Playing a video on tudou.com plays only sound, no video
https://bugs.webkit.org/show_bug.cgi?id=159967
<rdar://problem/26964090>
Modified: trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (203544 => 203545)
--- trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2016-07-22 01:01:14 UTC (rev 203544)
+++ trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2016-07-22 01:40:22 UTC (rev 203545)
@@ -126,7 +126,6 @@
#define WebKitMainContentUserGestureOverrideEnabledPreferenceKey @"WebKitMainContentUserGestureOverrideEnabled"
#define WebKitAllowsInlineMediaPlaybackPreferenceKey @"WebKitMediaPlaybackAllowsInline"
#define WebKitAllowsInlineMediaPlaybackAfterFullscreenPreferenceKey @"WebKitAllowsInlineMediaPlaybackAfterFullscreen"
-#define WebKitInlineMediaPlaybackRequiresPlaysInlineAttributeKey @"InlineMediaPlaybackRequiresPlaysInlineAttribute"
#define WebKitAllowsInlineMediaPlaybackWithPlaysInlineAttributeKey @"AllowsInlineMediaPlaybackWithPlaysInlineAttribute"
#define WebKitAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttributeKey @"AllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute"
#define WebKitInvisibleAutoplayNotPermittedKey @"InvisibleAutoplayNotPermitted"
Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (203544 => 203545)
--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2016-07-22 01:01:14 UTC (rev 203544)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2016-07-22 01:40:22 UTC (rev 203545)
@@ -525,7 +525,6 @@
#if !PLATFORM(IOS)
[NSNumber numberWithBool:YES], WebKitAllowsInlineMediaPlaybackPreferenceKey,
[NSNumber numberWithBool:NO], WebKitAllowsInlineMediaPlaybackAfterFullscreenPreferenceKey,
- [NSNumber numberWithBool:NO], WebKitInlineMediaPlaybackRequiresPlaysInlineAttributeKey,
[NSNumber numberWithBool:NO], WebKitAllowsInlineMediaPlaybackWithPlaysInlineAttributeKey,
[NSNumber numberWithBool:NO], WebKitAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttributeKey,
[NSNumber numberWithBool:YES], WebKitMediaControlsScaleWithPageZoomPreferenceKey,
@@ -540,7 +539,6 @@
#else
[NSNumber numberWithBool:allowsInlineMediaPlayback], WebKitAllowsInlineMediaPlaybackPreferenceKey,
[NSNumber numberWithBool:allowsInlineMediaPlaybackAfterFullscreen], WebKitAllowsInlineMediaPlaybackAfterFullscreenPreferenceKey,
- [NSNumber numberWithBool:requiresPlaysInlineAttribute], WebKitInlineMediaPlaybackRequiresPlaysInlineAttributeKey,
[NSNumber numberWithBool:requiresPlaysInlineAttribute], WebKitAllowsInlineMediaPlaybackWithPlaysInlineAttributeKey,
[NSNumber numberWithBool:requiresPlaysInlineAttribute], WebKitAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttributeKey,
[NSNumber numberWithBool:NO], WebKitMediaControlsScaleWithPageZoomPreferenceKey,
@@ -2287,16 +2285,6 @@
[self _setBoolValue:flag forKey:WebKitAllowsInlineMediaPlaybackPreferenceKey];
}
-- (BOOL)inlineMediaPlaybackRequiresPlaysInlineAttribute
-{
- return [self _boolValueForKey:WebKitInlineMediaPlaybackRequiresPlaysInlineAttributeKey];
-}
-
-- (void)setInlineMediaPlaybackRequiresPlaysInlineAttribute:(BOOL)flag
-{
- [self _setBoolValue:flag forKey:WebKitInlineMediaPlaybackRequiresPlaysInlineAttributeKey];
-}
-
- (BOOL)allowsInlineMediaPlaybackWithPlaysInlineAttribute
{
return [self _boolValueForKey:WebKitAllowsInlineMediaPlaybackWithPlaysInlineAttributeKey];
Modified: trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (203544 => 203545)
--- trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2016-07-22 01:01:14 UTC (rev 203544)
+++ trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2016-07-22 01:40:22 UTC (rev 203545)
@@ -262,9 +262,6 @@
- (void)setMediaPlaybackAllowsInline:(BOOL)flag;
- (BOOL)mediaPlaybackAllowsInline;
-- (void)setInlineMediaPlaybackRequiresPlaysInlineAttribute:(BOOL)flag;
-- (BOOL)inlineMediaPlaybackRequiresPlaysInlineAttribute;
-
- (void)setAllowsInlineMediaPlaybackWithPlaysInlineAttribute:(BOOL)flag;
- (BOOL)allowsInlineMediaPlaybackWithPlaysInlineAttribute;
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (203544 => 203545)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2016-07-22 01:01:14 UTC (rev 203544)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2016-07-22 01:40:22 UTC (rev 203545)
@@ -2348,7 +2348,6 @@
settings.setMainContentUserGestureOverrideEnabled([preferences overrideUserGestureRequirementForMainContent]);
settings.setAllowsInlineMediaPlayback([preferences mediaPlaybackAllowsInline]);
settings.setAllowsInlineMediaPlaybackAfterFullscreen([preferences allowsInlineMediaPlaybackAfterFullscreen]);
- settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute([preferences inlineMediaPlaybackRequiresPlaysInlineAttribute]);
settings.setAllowsInlineMediaPlaybackWithPlaysInlineAttribute([preferences allowsInlineMediaPlaybackWithPlaysInlineAttribute]);
settings.setAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute([preferences allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute]);
settings.setInvisibleAutoplayNotPermitted([preferences invisibleAutoplayNotPermitted]);
Modified: trunk/Source/WebKit2/ChangeLog (203544 => 203545)
--- trunk/Source/WebKit2/ChangeLog 2016-07-22 01:01:14 UTC (rev 203544)
+++ trunk/Source/WebKit2/ChangeLog 2016-07-22 01:40:22 UTC (rev 203545)
@@ -1,3 +1,26 @@
+2016-07-21 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ Remove support for deprecated SPI inlineMediaPlaybackRequiresPlaysInlineAttribute
+ https://bugs.webkit.org/show_bug.cgi?id=160066
+
+ Reviewed by Dean Jackson.
+
+ * Shared/WebPreferencesDefinitions.h:
+ * UIProcess/API/C/WKPreferences.cpp:
+ (WKPreferencesSetInlineMediaPlaybackRequiresPlaysInlineAttribute): Deleted.
+ (WKPreferencesGetInlineMediaPlaybackRequiresPlaysInlineAttribute): 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 _inlineMediaPlaybackRequiresPlaysInlineAttribute]): Deleted.
+ (-[WKWebViewConfiguration _setInlineMediaPlaybackRequiresPlaysInlineAttribute:]): Deleted.
+ * UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences): Deleted.
+
2016-07-21 Chelsea Pugh <cp...@apple.com>
[iOS] Apps using WKWebView will crash if they set the scroll view's delegate and don't nil it out later
Modified: trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (203544 => 203545)
--- trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2016-07-22 01:01:14 UTC (rev 203544)
+++ trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2016-07-22 01:40:22 UTC (rev 203545)
@@ -156,7 +156,6 @@
macro(MainContentUserGestureOverrideEnabled, mainContentUserGestureOverrideEnabled, Bool, bool, false, "", "") \
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, "", "") \
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (203544 => 203545)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2016-07-22 01:01:14 UTC (rev 203544)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2016-07-22 01:40:22 UTC (rev 203545)
@@ -793,16 +793,6 @@
return toImpl(preferencesRef)->allowsInlineMediaPlayback();
}
-void WKPreferencesSetInlineMediaPlaybackRequiresPlaysInlineAttribute(WKPreferencesRef preferencesRef, bool flag)
-{
- toImpl(preferencesRef)->setInlineMediaPlaybackRequiresPlaysInlineAttribute(flag);
-}
-
-bool WKPreferencesGetInlineMediaPlaybackRequiresPlaysInlineAttribute(WKPreferencesRef preferencesRef)
-{
- return toImpl(preferencesRef)->inlineMediaPlaybackRequiresPlaysInlineAttribute();
-}
-
void WKPreferencesSetAllowsInlineMediaPlaybackWithPlaysInlineAttribute(WKPreferencesRef preferencesRef, bool flag)
{
toImpl(preferencesRef)->setAllowsInlineMediaPlaybackWithPlaysInlineAttribute(flag);
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h (203544 => 203545)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2016-07-22 01:01:14 UTC (rev 203544)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2016-07-22 01:40:22 UTC (rev 203545)
@@ -191,10 +191,6 @@
WK_EXPORT void WKPreferencesSetMediaPlaybackAllowsInline(WKPreferencesRef preferencesRef, bool flag);
WK_EXPORT bool WKPreferencesGetMediaPlaybackAllowsInline(WKPreferencesRef preferencesRef);
-// Defaults to false.
-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);
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (203544 => 203545)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-07-22 01:01:14 UTC (rev 203544)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-07-22 01:40:22 UTC (rev 203545)
@@ -455,7 +455,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()));
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (203544 => 203545)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2016-07-22 01:01:14 UTC (rev 203544)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2016-07-22 01:40:22 UTC (rev 203545)
@@ -107,7 +107,6 @@
LazyInitialized<RetainPtr<WKWebViewContentProviderRegistry>> _contentProviderRegistry;
BOOL _alwaysRunsAtForegroundPriority;
BOOL _allowsInlineMediaPlayback;
- BOOL _inlineMediaPlaybackRequiresPlaysInlineAttribute;
BOOL _allowsInlineMediaPlaybackWithPlaysInlineAttribute;
BOOL _allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute;
BOOL _allowsInlineMediaPlaybackAfterFullscreen;
@@ -139,7 +138,6 @@
#if PLATFORM(IOS)
_allowsPictureInPictureMediaPlayback = YES;
_allowsInlineMediaPlayback = WebCore::deviceClass() == MGDeviceClassiPad;
- _inlineMediaPlaybackRequiresPlaysInlineAttribute = !_allowsInlineMediaPlayback;
_allowsInlineMediaPlaybackWithPlaysInlineAttribute = !_allowsInlineMediaPlayback;
_allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute = !_allowsInlineMediaPlayback;
_allowsInlineMediaPlaybackAfterFullscreen = !_allowsInlineMediaPlayback;
@@ -292,7 +290,6 @@
#if PLATFORM(IOS)
configuration->_allowsInlineMediaPlayback = self->_allowsInlineMediaPlayback;
configuration->_allowsInlineMediaPlaybackAfterFullscreen = self->_allowsInlineMediaPlaybackAfterFullscreen;
- configuration->_inlineMediaPlaybackRequiresPlaysInlineAttribute = self->_inlineMediaPlaybackRequiresPlaysInlineAttribute;
configuration->_allowsInlineMediaPlaybackWithPlaysInlineAttribute = self->_allowsInlineMediaPlaybackWithPlaysInlineAttribute;
configuration->_allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute = self->_allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute;
configuration->_allowsPictureInPictureMediaPlayback = self->_allowsPictureInPictureMediaPlayback;
@@ -574,16 +571,6 @@
_alwaysRunsAtForegroundPriority = alwaysRunsAtForegroundPriority;
}
-- (BOOL)_inlineMediaPlaybackRequiresPlaysInlineAttribute
-{
- return _inlineMediaPlaybackRequiresPlaysInlineAttribute;
-}
-
-- (void)_setInlineMediaPlaybackRequiresPlaysInlineAttribute:(BOOL)requires
-{
- _inlineMediaPlaybackRequiresPlaysInlineAttribute = requires;
-}
-
- (BOOL)_allowsInlineMediaPlaybackWithPlaysInlineAttribute
{
return _allowsInlineMediaPlaybackWithPlaysInlineAttribute;
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h (203544 => 203545)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2016-07-22 01:01:14 UTC (rev 203544)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2016-07-22 01:40:22 UTC (rev 203545)
@@ -59,7 +59,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));
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (203544 => 203545)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-07-22 01:01:14 UTC (rev 203544)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-07-22 01:40:22 UTC (rev 203545)
@@ -2985,7 +2985,6 @@
settings.setMainContentUserGestureOverrideEnabled(store.getBoolValueForKey(WebPreferencesKey::mainContentUserGestureOverrideEnabledKey()));
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()));
Modified: trunk/Tools/ChangeLog (203544 => 203545)
--- trunk/Tools/ChangeLog 2016-07-22 01:01:14 UTC (rev 203544)
+++ trunk/Tools/ChangeLog 2016-07-22 01:40:22 UTC (rev 203545)
@@ -1,3 +1,19 @@
+2016-07-21 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ Remove support for deprecated SPI inlineMediaPlaybackRequiresPlaysInlineAttribute
+ https://bugs.webkit.org/show_bug.cgi?id=160066
+
+ Reviewed by Dean Jackson.
+
+ * 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-21 Chelsea Pugh <cp...@apple.com>
[iOS] Apps using WKWebView will crash if they set the scroll view's delegate and don't nil it out later
Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (203544 => 203545)
--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2016-07-22 01:01:14 UTC (rev 203544)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2016-07-22 01:40:22 UTC (rev 203545)
@@ -1017,7 +1017,6 @@
WebKitEnableFullDocumentTeardownPreferenceKey: @YES,
WebKitFullScreenEnabledPreferenceKey: @YES,
WebKitAllowsInlineMediaPlaybackPreferenceKey: @YES,
- WebKitInlineMediaPlaybackRequiresPlaysInlineAttributeKey: @NO,
WebKitAllowsInlineMediaPlaybackWithPlaysInlineAttributeKey: @NO,
WebKitAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttributeKey: @NO,
@"UseWebKitWebInspector": @YES,
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/RequiresUserActionForPlayback.mm (203544 => 203545)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/RequiresUserActionForPlayback.mm 2016-07-22 01:01:14 UTC (rev 203544)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/RequiresUserActionForPlayback.mm 2016-07-22 01:40:22 UTC (rev 203545)
@@ -76,7 +76,6 @@
configuration.get()._mediaDataLoadsAutomatically = YES;
#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 (203544 => 203545)
--- trunk/Tools/WebKitTestRunner/TestController.cpp 2016-07-22 01:01:14 UTC (rev 203544)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2016-07-22 01:40:22 UTC (rev 203545)
@@ -684,7 +684,6 @@
WKPreferencesSetStorageBlockingPolicy(preferences, kWKAllowAllStorage);
WKPreferencesSetMediaPlaybackAllowsInline(preferences, true);
- WKPreferencesSetInlineMediaPlaybackRequiresPlaysInlineAttribute(preferences, false);
WKPreferencesSetAllowsInlineMediaPlaybackWithPlaysInlineAttribute(preferences, false);
WKPreferencesSetAllowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute(preferences, false);
Modified: trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm (203544 => 203545)
--- trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm 2016-07-22 01:01:14 UTC (rev 203544)
+++ trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm 2016-07-22 01:40:22 UTC (rev 203545)
@@ -61,7 +61,6 @@
#if TARGET_OS_IPHONE
globalWebViewConfiguration.allowsInlineMediaPlayback = YES;
- globalWebViewConfiguration._inlineMediaPlaybackRequiresPlaysInlineAttribute = NO;
globalWebViewConfiguration._allowsInlineMediaPlaybackWithPlaysInlineAttribute = NO;
globalWebViewConfiguration._allowsInlineMediaPlaybackWithWebKitPlaysInlineAttribute = NO;
globalWebViewConfiguration._invisibleAutoplayNotPermitted = NO;
