Diff
Modified: trunk/Source/WebCore/ChangeLog (186082 => 186083)
--- trunk/Source/WebCore/ChangeLog 2015-06-29 19:56:03 UTC (rev 186082)
+++ trunk/Source/WebCore/ChangeLog 2015-06-29 20:53:59 UTC (rev 186083)
@@ -1,3 +1,21 @@
+2015-06-29 Dean Jackson <d...@apple.com>
+
+ Setting to enable/disable media controls sizing on page zoom
+ https://bugs.webkit.org/show_bug.cgi?id=146423
+ <rdar://problem/18379634>
+
+ Reviewed by Eric Carlson.
+
+ Add a new setting "MediaControlsScaleWithPageZoom" that can disable
+ the behaviour we currently implement on iOS, where the media controls
+ attempt to remain at a fixed size independent of page zoom.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::setMediaControlsDependOnPageScaleFactor): Do not
+ set this value to true if the new setting is disabled.
+ * page/Settings.cpp:
+ * page/Settings.in: Add the new setting.
+
2015-06-29 Adam Bergkvist <adam.bergkv...@ericsson.com>
WebRTC: Update the MediaStream API
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (186082 => 186083)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-06-29 19:56:03 UTC (rev 186082)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-06-29 20:53:59 UTC (rev 186083)
@@ -6190,6 +6190,14 @@
void HTMLMediaElement::setMediaControlsDependOnPageScaleFactor(bool dependsOnPageScale)
{
LOG(Media, "MediaElement::setMediaControlsDependPageScaleFactor(%p) = %s", this, boolString(dependsOnPageScale));
+
+ Settings* settings = document().settings();
+ if (settings && settings->mediaControlsScaleWithPageZoom()) {
+ LOG(Media, "MediaElement::setMediaControlsDependPageScaleFactor(%p) forced to false by Settings value", this);
+ m_mediaControlsDependOnPageScaleFactor = false;
+ return;
+ }
+
if (m_mediaControlsDependOnPageScaleFactor == dependsOnPageScale)
return;
Modified: trunk/Source/WebCore/page/Settings.cpp (186082 => 186083)
--- trunk/Source/WebCore/page/Settings.cpp 2015-06-29 19:56:03 UTC (rev 186082)
+++ trunk/Source/WebCore/page/Settings.cpp 2015-06-29 20:53:59 UTC (rev 186083)
@@ -127,6 +127,7 @@
static const bool defaultShouldRespectImageOrientation = true;
static const bool defaultImageSubsamplingEnabled = true;
static const bool defaultScrollingTreeIncludesFrames = true;
+static const bool defaultMediaControlsScaleWithPageZoom = true;
#else
static const bool defaultFixedPositionCreatesStackingContext = false;
static const bool defaultFixedBackgroundsPaintRelativeToDocument = false;
@@ -137,6 +138,7 @@
static const bool defaultShouldRespectImageOrientation = false;
static const bool defaultImageSubsamplingEnabled = false;
static const bool defaultScrollingTreeIncludesFrames = false;
+static const bool defaultMediaControlsScaleWithPageZoom = true;
#endif
static const bool defaultAllowsPictureInPictureMediaPlayback = true;
Modified: trunk/Source/WebCore/page/Settings.in (186082 => 186083)
--- trunk/Source/WebCore/page/Settings.in 2015-06-29 19:56:03 UTC (rev 186082)
+++ trunk/Source/WebCore/page/Settings.in 2015-06-29 20:53:59 UTC (rev 186083)
@@ -129,6 +129,7 @@
audioPlaybackRequiresUserGesture initial=defaultAudioPlaybackRequiresUserGesture
allowsInlineMediaPlayback initial=defaultAllowsInlineMediaPlayback
allowsPictureInPictureMediaPlayback initial=defaultAllowsPictureInPictureMediaPlayback
+mediaControlsScaleWithPageZoom initial=defaultMediaControlsScaleWithPageZoom
passwordEchoEnabled initial=false
suppressesIncrementalRendering initial=false
incrementalRenderingSuppressionTimeoutInSeconds type=double, initial=defaultIncrementalRenderingSuppressionTimeoutInSeconds
Modified: trunk/Source/WebKit/mac/ChangeLog (186082 => 186083)
--- trunk/Source/WebKit/mac/ChangeLog 2015-06-29 19:56:03 UTC (rev 186082)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-06-29 20:53:59 UTC (rev 186083)
@@ -1,3 +1,24 @@
+2015-06-29 Dean Jackson <d...@apple.com>
+
+ Setting to enable/disable media controls sizing on page zoom
+ https://bugs.webkit.org/show_bug.cgi?id=146423
+ <rdar://problem/18379634>
+
+ Reviewed by Eric Carlson.
+
+ Add a new setting "MediaControlsScaleWithPageZoom" that can disable
+ the behaviour we currently implement on iOS, where the media controls
+ attempt to remain at a fixed size independent of page zoom.
+
+ * WebView/WebPreferenceKeysPrivate.h:
+ * WebView/WebPreferences.mm:
+ (+[WebPreferences initialize]): Initialize to false on iOS, true otherwise.
+ (-[WebPreferences mediaControlsScaleWithPageZoom]):
+ (-[WebPreferences setMediaControlsScaleWithPageZoom:]):
+ * WebView/WebPreferencesPrivate.h:
+ * WebView/WebView.mm:
+ (-[WebView _preferencesChanged:]):
+
2015-06-29 Anders Carlsson <ander...@apple.com>
Use DISPATCH_SOURCE_TYPE_MEMORYPRESSURE instead of DISPATCH_SOURCE_TYPE_MEMORYSTATUS
Modified: trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (186082 => 186083)
--- trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2015-06-29 19:56:03 UTC (rev 186082)
+++ trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2015-06-29 20:53:59 UTC (rev 186083)
@@ -123,6 +123,7 @@
#define WebKitAllowsInlineMediaPlaybackPreferenceKey @"WebKitMediaPlaybackAllowsInline"
#define WebKitAllowsPictureInPictureMediaPlaybackPreferenceKey @"WebKitAllowsPictureInPictureMediaPlayback"
#define WebKitAllowsAirPlayForMediaPlaybackPreferenceKey @"WebKitMediaPlaybackAllowsAirPlay"
+#define WebKitMediaControlsScaleWithPageZoomPreferenceKey @"WebKitMediaControlsScaleWithPageZoom"
#define WebKitMockScrollbarsEnabledPreferenceKey @"WebKitMockScrollbarsEnabled"
#define WebKitShouldDisplaySubtitlesPreferenceKey @"WebKitShouldDisplaySubtitles"
#define WebKitShouldDisplayCaptionsPreferenceKey @"WebKitShouldDisplayCaptions"
Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (186082 => 186083)
--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2015-06-29 19:56:03 UTC (rev 186082)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2015-06-29 20:53:59 UTC (rev 186083)
@@ -518,6 +518,7 @@
#if !PLATFORM(IOS)
[NSNumber numberWithBool:NO], WebKitRequiresUserGestureForMediaPlaybackPreferenceKey,
[NSNumber numberWithBool:YES], WebKitAllowsInlineMediaPlaybackPreferenceKey,
+ [NSNumber numberWithBool:YES], WebKitMediaControlsScaleWithPageZoomPreferenceKey,
[NSNumber numberWithBool:NO], WebKitWebAudioEnabledPreferenceKey,
[NSNumber numberWithBool:YES], WebKitBackspaceKeyNavigationEnabledKey,
[NSNumber numberWithBool:NO], WebKitShouldDisplaySubtitlesPreferenceKey,
@@ -528,6 +529,7 @@
#else
[NSNumber numberWithBool:YES], WebKitRequiresUserGestureForMediaPlaybackPreferenceKey,
[NSNumber numberWithBool:NO], WebKitAllowsInlineMediaPlaybackPreferenceKey,
+ [NSNumber numberWithBool:NO], WebKitMediaControlsScaleWithPageZoomPreferenceKey,
[NSNumber numberWithUnsignedInt:AudioSession::None], WebKitAudioSessionCategoryOverride,
#if HAVE(AVKIT)
[NSNumber numberWithBool:YES], WebKitAVKitEnabled,
@@ -2195,6 +2197,16 @@
[self _setBoolValue:flag forKey:WebKitAllowsInlineMediaPlaybackPreferenceKey];
}
+- (BOOL)mediaControlsScaleWithPageZoom
+{
+ return [self _boolValueForKey:WebKitMediaControlsScaleWithPageZoomPreferenceKey];
+}
+
+- (void)setMediaControlsScaleWithPageZoom:(BOOL)flag
+{
+ [self _setBoolValue:flag forKey:WebKitMediaControlsScaleWithPageZoomPreferenceKey];
+}
+
- (BOOL)allowsAlternateFullscreen
{
return [self allowsPictureInPictureMediaPlayback];
Modified: trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (186082 => 186083)
--- trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2015-06-29 19:56:03 UTC (rev 186082)
+++ trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2015-06-29 20:53:59 UTC (rev 186083)
@@ -250,6 +250,9 @@
- (void)setMediaPlaybackAllowsInline:(BOOL)flag;
- (BOOL)mediaPlaybackAllowsInline;
+- (void)setMediaControlsScaleWithPageZoom:(BOOL)flag;
+- (BOOL)mediaControlsScaleWithPageZoom;
+
- (void)setAllowsAlternateFullscreen:(BOOL)flag;
- (BOOL)allowsAlternateFullscreen;
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (186082 => 186083)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2015-06-29 19:56:03 UTC (rev 186082)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2015-06-29 20:53:59 UTC (rev 186083)
@@ -2294,6 +2294,7 @@
settings.setRequiresUserGestureForMediaPlayback([preferences mediaPlaybackRequiresUserGesture]);
settings.setAllowsInlineMediaPlayback([preferences mediaPlaybackAllowsInline]);
settings.setAllowsPictureInPictureMediaPlayback([preferences allowsPictureInPictureMediaPlayback] && shouldAllowPictureInPictureMediaPlayback());
+ settings.setMediaControlsScaleWithPageZoom([preferences mediaControlsScaleWithPageZoom]);
settings.setSuppressesIncrementalRendering([preferences suppressesIncrementalRendering]);
settings.setBackspaceKeyNavigationEnabled([preferences backspaceKeyNavigationEnabled]);
settings.setWantsBalancedSetDefersLoadingBehavior([preferences wantsBalancedSetDefersLoadingBehavior]);
Modified: trunk/Source/WebKit2/ChangeLog (186082 => 186083)
--- trunk/Source/WebKit2/ChangeLog 2015-06-29 19:56:03 UTC (rev 186082)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-29 20:53:59 UTC (rev 186083)
@@ -1,3 +1,23 @@
+2015-06-29 Dean Jackson <d...@apple.com>
+
+ Setting to enable/disable media controls sizing on page zoom
+ https://bugs.webkit.org/show_bug.cgi?id=146423
+ <rdar://problem/18379634>
+
+ Reviewed by Eric Carlson.
+
+ Add a new setting "MediaControlsScaleWithPageZoom" that can disable
+ the behaviour we currently implement on iOS, where the media controls
+ attempt to remain at a fixed size independent of page zoom.
+
+ * Shared/WebPreferencesDefinitions.h: Initialize to false on iOS, true otherwise.
+ * UIProcess/API/C/WKPreferences.cpp:
+ (WKPreferencesSetMediaControlsScaleWithPageZoom):
+ (WKPreferencesGetMediaControlsScaleWithPageZoom):
+ * UIProcess/API/C/WKPreferencesRefPrivate.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences):
+
2015-06-29 Chris Dumez <cdu...@apple.com>
[WK2][iOS] Swipe gesture snapshot stays up for 3 seconds when swiping back after top-hit navigation
Modified: trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (186082 => 186083)
--- trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2015-06-29 19:56:03 UTC (rev 186082)
+++ trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2015-06-29 20:53:59 UTC (rev 186083)
@@ -58,6 +58,7 @@
#define DEFAULT_PASSWORD_ECHO_ENABLED true
#define DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK false
#define DEFAULT_REQUIRES_USER_GESTURE_FOR_MEDIA_PLAYBACK true
+#define DEFAULT_MEDIA_CONTROLS_SCALE_WITH_PAGE_ZOOM false
#define DEFAULT_TEMPORARY_TILE_COHORT_RETENTION_ENABLED false
#else
#define DEFAULT_FRAME_FLATTENING_ENABLED false
@@ -69,6 +70,7 @@
#define DEFAULT_PASSWORD_ECHO_ENABLED false
#define DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK true
#define DEFAULT_REQUIRES_USER_GESTURE_FOR_MEDIA_PLAYBACK false
+#define DEFAULT_MEDIA_CONTROLS_SCALE_WITH_PAGE_ZOOM true
#define DEFAULT_TEMPORARY_TILE_COHORT_RETENTION_ENABLED true
#endif
@@ -132,6 +134,7 @@
macro(AllowsInlineMediaPlayback, allowsInlineMediaPlayback, Bool, bool, DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK) \
macro(AllowsPictureInPictureMediaPlayback, allowsPictureInPictureMediaPlayback, Bool, bool, true) \
macro(AllowsAirPlayForMediaPlayback, allowsAirPlayForMediaPlayback, Bool, bool, true) \
+ macro(MediaControlsScaleWithPageZoom, mediaControlsScaleWithPageZoom, Bool, bool, DEFAULT_MEDIA_CONTROLS_SCALE_WITH_PAGE_ZOOM) \
macro(InspectorStartsAttached, inspectorStartsAttached, Bool, bool, true) \
macro(ShowsToolTipOverTruncatedText, showsToolTipOverTruncatedText, Bool, bool, false) \
macro(MockScrollbarsEnabled, mockScrollbarsEnabled, Bool, bool, false) \
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (186082 => 186083)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2015-06-29 19:56:03 UTC (rev 186082)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2015-06-29 20:53:59 UTC (rev 186083)
@@ -748,6 +748,16 @@
return toImpl(preferencesRef)->allowsInlineMediaPlayback();
}
+void WKPreferencesSetMediaControlsScaleWithPageZoom(WKPreferencesRef preferencesRef, bool flag)
+{
+ toImpl(preferencesRef)->setMediaControlsScaleWithPageZoom(flag);
+}
+
+bool WKPreferencesGetMediaControlsScaleWithPageZoom(WKPreferencesRef preferencesRef)
+{
+ return toImpl(preferencesRef)->mediaControlsScaleWithPageZoom();
+}
+
void WKPreferencesSetShowsToolTipOverTruncatedText(WKPreferencesRef preferencesRef, bool flag)
{
toImpl(preferencesRef)->setShowsToolTipOverTruncatedText(flag);
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h (186082 => 186083)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2015-06-29 19:56:03 UTC (rev 186082)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2015-06-29 20:53:59 UTC (rev 186083)
@@ -179,6 +179,10 @@
WK_EXPORT void WKPreferencesSetMediaPlaybackAllowsInline(WKPreferencesRef preferencesRef, bool flag);
WK_EXPORT bool WKPreferencesGetMediaPlaybackAllowsInline(WKPreferencesRef preferencesRef);
+// Defaults to false on iOS, true elsewhere.
+WK_EXPORT void WKPreferencesSetMediaControlsScaleWithPageZoom(WKPreferencesRef preferencesRef, bool flag);
+WK_EXPORT bool WKPreferencesGetMediaControlsScaleWithPageZoom(WKPreferencesRef preferencesRef);
+
// Defaults to false.
WK_EXPORT void WKPreferencesSetShowsToolTipOverTruncatedText(WKPreferencesRef preferencesRef, bool flag);
WK_EXPORT bool WKPreferencesGetShowsToolTipOverTruncatedText(WKPreferencesRef preferencesRef);
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (186082 => 186083)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-06-29 19:56:03 UTC (rev 186082)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-06-29 20:53:59 UTC (rev 186083)
@@ -2773,6 +2773,7 @@
settings.setRequiresUserGestureForMediaPlayback(store.getBoolValueForKey(WebPreferencesKey::requiresUserGestureForMediaPlaybackKey()));
settings.setAllowsInlineMediaPlayback(store.getBoolValueForKey(WebPreferencesKey::allowsInlineMediaPlaybackKey()));
settings.setAllowsPictureInPictureMediaPlayback(store.getBoolValueForKey(WebPreferencesKey::allowsPictureInPictureMediaPlaybackKey()));
+ settings.setMediaControlsScaleWithPageZoom(store.getBoolValueForKey(WebPreferencesKey::mediaControlsScaleWithPageZoomKey()));
settings.setMockScrollbarsEnabled(store.getBoolValueForKey(WebPreferencesKey::mockScrollbarsEnabledKey()));
settings.setHyperlinkAuditingEnabled(store.getBoolValueForKey(WebPreferencesKey::hyperlinkAuditingEnabledKey()));
settings.setRequestAnimationFrameEnabled(store.getBoolValueForKey(WebPreferencesKey::requestAnimationFrameEnabledKey()));
