<!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>[186083] 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/186083">186083</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2015-06-29 13:53:59 -0700 (Mon, 29 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.
Source/WebCore:
* 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.
Source/WebKit/mac:
* 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:]):
Source/WebKit2:
* 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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSettingscpp">trunk/Source/WebCore/page/Settings.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSettingsin">trunk/Source/WebCore/page/Settings.in</a></li>
<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="#trunkSourceWebKitmacWebViewWebPreferencesmm">trunk/Source/WebKit/mac/WebView/WebPreferences.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferencesPrivateh">trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h</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="#trunkSourceWebKit2SharedWebPreferencesDefinitionsh">trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPreferencescpp">trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPreferencesRefPrivateh">trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (186082 => 186083)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-06-29 Dean Jackson <dino@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.
+
</ins><span class="cx"> 2015-06-29 Adam Bergkvist <adam.bergkvist@ericsson.com>
</span><span class="cx">
</span><span class="cx"> WebRTC: Update the MediaStream API
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (186082 => 186083)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -6190,6 +6190,14 @@
</span><span class="cx"> void HTMLMediaElement::setMediaControlsDependOnPageScaleFactor(bool dependsOnPageScale)
</span><span class="cx"> {
</span><span class="cx"> LOG(Media, "MediaElement::setMediaControlsDependPageScaleFactor(%p) = %s", this, boolString(dependsOnPageScale));
</span><ins>+
+ Settings* settings = document().settings();
+ if (settings && settings->mediaControlsScaleWithPageZoom()) {
+ LOG(Media, "MediaElement::setMediaControlsDependPageScaleFactor(%p) forced to false by Settings value", this);
+ m_mediaControlsDependOnPageScaleFactor = false;
+ return;
+ }
+
</ins><span class="cx"> if (m_mediaControlsDependOnPageScaleFactor == dependsOnPageScale)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.cpp (186082 => 186083)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -127,6 +127,7 @@
</span><span class="cx"> static const bool defaultShouldRespectImageOrientation = true;
</span><span class="cx"> static const bool defaultImageSubsamplingEnabled = true;
</span><span class="cx"> static const bool defaultScrollingTreeIncludesFrames = true;
</span><ins>+static const bool defaultMediaControlsScaleWithPageZoom = true;
</ins><span class="cx"> #else
</span><span class="cx"> static const bool defaultFixedPositionCreatesStackingContext = false;
</span><span class="cx"> static const bool defaultFixedBackgroundsPaintRelativeToDocument = false;
</span><span class="lines">@@ -137,6 +138,7 @@
</span><span class="cx"> static const bool defaultShouldRespectImageOrientation = false;
</span><span class="cx"> static const bool defaultImageSubsamplingEnabled = false;
</span><span class="cx"> static const bool defaultScrollingTreeIncludesFrames = false;
</span><ins>+static const bool defaultMediaControlsScaleWithPageZoom = true;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> static const bool defaultAllowsPictureInPictureMediaPlayback = true;
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.in (186082 => 186083)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -129,6 +129,7 @@
</span><span class="cx"> audioPlaybackRequiresUserGesture initial=defaultAudioPlaybackRequiresUserGesture
</span><span class="cx"> allowsInlineMediaPlayback initial=defaultAllowsInlineMediaPlayback
</span><span class="cx"> allowsPictureInPictureMediaPlayback initial=defaultAllowsPictureInPictureMediaPlayback
</span><ins>+mediaControlsScaleWithPageZoom initial=defaultMediaControlsScaleWithPageZoom
</ins><span class="cx"> passwordEchoEnabled initial=false
</span><span class="cx"> suppressesIncrementalRendering initial=false
</span><span class="cx"> incrementalRenderingSuppressionTimeoutInSeconds type=double, initial=defaultIncrementalRenderingSuppressionTimeoutInSeconds
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (186082 => 186083)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-06-29 Dean Jackson <dino@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:]):
+
</ins><span class="cx"> 2015-06-29 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Use DISPATCH_SOURCE_TYPE_MEMORYPRESSURE instead of DISPATCH_SOURCE_TYPE_MEMORYSTATUS
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferenceKeysPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (186082 => 186083)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -123,6 +123,7 @@
</span><span class="cx"> #define WebKitAllowsInlineMediaPlaybackPreferenceKey @"WebKitMediaPlaybackAllowsInline"
</span><span class="cx"> #define WebKitAllowsPictureInPictureMediaPlaybackPreferenceKey @"WebKitAllowsPictureInPictureMediaPlayback"
</span><span class="cx"> #define WebKitAllowsAirPlayForMediaPlaybackPreferenceKey @"WebKitMediaPlaybackAllowsAirPlay"
</span><ins>+#define WebKitMediaControlsScaleWithPageZoomPreferenceKey @"WebKitMediaControlsScaleWithPageZoom"
</ins><span class="cx"> #define WebKitMockScrollbarsEnabledPreferenceKey @"WebKitMockScrollbarsEnabled"
</span><span class="cx"> #define WebKitShouldDisplaySubtitlesPreferenceKey @"WebKitShouldDisplaySubtitles"
</span><span class="cx"> #define WebKitShouldDisplayCaptionsPreferenceKey @"WebKitShouldDisplayCaptions"
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (186082 => 186083)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -518,6 +518,7 @@
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitRequiresUserGestureForMediaPlaybackPreferenceKey,
</span><span class="cx"> [NSNumber numberWithBool:YES], WebKitAllowsInlineMediaPlaybackPreferenceKey,
</span><ins>+ [NSNumber numberWithBool:YES], WebKitMediaControlsScaleWithPageZoomPreferenceKey,
</ins><span class="cx"> [NSNumber numberWithBool:NO], WebKitWebAudioEnabledPreferenceKey,
</span><span class="cx"> [NSNumber numberWithBool:YES], WebKitBackspaceKeyNavigationEnabledKey,
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitShouldDisplaySubtitlesPreferenceKey,
</span><span class="lines">@@ -528,6 +529,7 @@
</span><span class="cx"> #else
</span><span class="cx"> [NSNumber numberWithBool:YES], WebKitRequiresUserGestureForMediaPlaybackPreferenceKey,
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitAllowsInlineMediaPlaybackPreferenceKey,
</span><ins>+ [NSNumber numberWithBool:NO], WebKitMediaControlsScaleWithPageZoomPreferenceKey,
</ins><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">@@ -2195,6 +2197,16 @@
</span><span class="cx"> [self _setBoolValue:flag forKey:WebKitAllowsInlineMediaPlaybackPreferenceKey];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)mediaControlsScaleWithPageZoom
+{
+ return [self _boolValueForKey:WebKitMediaControlsScaleWithPageZoomPreferenceKey];
+}
+
+- (void)setMediaControlsScaleWithPageZoom:(BOOL)flag
+{
+ [self _setBoolValue:flag forKey:WebKitMediaControlsScaleWithPageZoomPreferenceKey];
+}
+
</ins><span class="cx"> - (BOOL)allowsAlternateFullscreen
</span><span class="cx"> {
</span><span class="cx"> return [self allowsPictureInPictureMediaPlayback];
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (186082 => 186083)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -250,6 +250,9 @@
</span><span class="cx"> - (void)setMediaPlaybackAllowsInline:(BOOL)flag;
</span><span class="cx"> - (BOOL)mediaPlaybackAllowsInline;
</span><span class="cx">
</span><ins>+- (void)setMediaControlsScaleWithPageZoom:(BOOL)flag;
+- (BOOL)mediaControlsScaleWithPageZoom;
+
</ins><span class="cx"> - (void)setAllowsAlternateFullscreen:(BOOL)flag;
</span><span class="cx"> - (BOOL)allowsAlternateFullscreen;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (186082 => 186083)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -2294,6 +2294,7 @@
</span><span class="cx"> settings.setRequiresUserGestureForMediaPlayback([preferences mediaPlaybackRequiresUserGesture]);
</span><span class="cx"> settings.setAllowsInlineMediaPlayback([preferences mediaPlaybackAllowsInline]);
</span><span class="cx"> settings.setAllowsPictureInPictureMediaPlayback([preferences allowsPictureInPictureMediaPlayback] && shouldAllowPictureInPictureMediaPlayback());
</span><ins>+ settings.setMediaControlsScaleWithPageZoom([preferences mediaControlsScaleWithPageZoom]);
</ins><span class="cx"> settings.setSuppressesIncrementalRendering([preferences suppressesIncrementalRendering]);
</span><span class="cx"> settings.setBackspaceKeyNavigationEnabled([preferences backspaceKeyNavigationEnabled]);
</span><span class="cx"> settings.setWantsBalancedSetDefersLoadingBehavior([preferences wantsBalancedSetDefersLoadingBehavior]);
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (186082 => 186083)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-06-29 Dean Jackson <dino@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):
+
</ins><span class="cx"> 2015-06-29 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK2][iOS] Swipe gesture snapshot stays up for 3 seconds when swiping back after top-hit navigation
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPreferencesDefinitionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (186082 => 186083)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -58,6 +58,7 @@
</span><span class="cx"> #define DEFAULT_PASSWORD_ECHO_ENABLED true
</span><span class="cx"> #define DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK false
</span><span class="cx"> #define DEFAULT_REQUIRES_USER_GESTURE_FOR_MEDIA_PLAYBACK true
</span><ins>+#define DEFAULT_MEDIA_CONTROLS_SCALE_WITH_PAGE_ZOOM false
</ins><span class="cx"> #define DEFAULT_TEMPORARY_TILE_COHORT_RETENTION_ENABLED false
</span><span class="cx"> #else
</span><span class="cx"> #define DEFAULT_FRAME_FLATTENING_ENABLED false
</span><span class="lines">@@ -69,6 +70,7 @@
</span><span class="cx"> #define DEFAULT_PASSWORD_ECHO_ENABLED false
</span><span class="cx"> #define DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK true
</span><span class="cx"> #define DEFAULT_REQUIRES_USER_GESTURE_FOR_MEDIA_PLAYBACK false
</span><ins>+#define DEFAULT_MEDIA_CONTROLS_SCALE_WITH_PAGE_ZOOM true
</ins><span class="cx"> #define DEFAULT_TEMPORARY_TILE_COHORT_RETENTION_ENABLED true
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -132,6 +134,7 @@
</span><span class="cx"> macro(AllowsInlineMediaPlayback, allowsInlineMediaPlayback, Bool, bool, DEFAULT_ALLOWS_INLINE_MEDIA_PLAYBACK) \
</span><span class="cx"> macro(AllowsPictureInPictureMediaPlayback, allowsPictureInPictureMediaPlayback, Bool, bool, true) \
</span><span class="cx"> macro(AllowsAirPlayForMediaPlayback, allowsAirPlayForMediaPlayback, Bool, bool, true) \
</span><ins>+ macro(MediaControlsScaleWithPageZoom, mediaControlsScaleWithPageZoom, Bool, bool, DEFAULT_MEDIA_CONTROLS_SCALE_WITH_PAGE_ZOOM) \
</ins><span class="cx"> macro(InspectorStartsAttached, inspectorStartsAttached, Bool, bool, true) \
</span><span class="cx"> macro(ShowsToolTipOverTruncatedText, showsToolTipOverTruncatedText, Bool, bool, false) \
</span><span class="cx"> macro(MockScrollbarsEnabled, mockScrollbarsEnabled, Bool, bool, false) \
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPreferencescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (186082 => 186083)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -748,6 +748,16 @@
</span><span class="cx"> return toImpl(preferencesRef)->allowsInlineMediaPlayback();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WKPreferencesSetMediaControlsScaleWithPageZoom(WKPreferencesRef preferencesRef, bool flag)
+{
+ toImpl(preferencesRef)->setMediaControlsScaleWithPageZoom(flag);
+}
+
+bool WKPreferencesGetMediaControlsScaleWithPageZoom(WKPreferencesRef preferencesRef)
+{
+ return toImpl(preferencesRef)->mediaControlsScaleWithPageZoom();
+}
+
</ins><span class="cx"> void WKPreferencesSetShowsToolTipOverTruncatedText(WKPreferencesRef preferencesRef, bool flag)
</span><span class="cx"> {
</span><span class="cx"> toImpl(preferencesRef)->setShowsToolTipOverTruncatedText(flag);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPreferencesRefPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h (186082 => 186083)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -179,6 +179,10 @@
</span><span class="cx"> WK_EXPORT void WKPreferencesSetMediaPlaybackAllowsInline(WKPreferencesRef preferencesRef, bool flag);
</span><span class="cx"> WK_EXPORT bool WKPreferencesGetMediaPlaybackAllowsInline(WKPreferencesRef preferencesRef);
</span><span class="cx">
</span><ins>+// Defaults to false on iOS, true elsewhere.
+WK_EXPORT void WKPreferencesSetMediaControlsScaleWithPageZoom(WKPreferencesRef preferencesRef, bool flag);
+WK_EXPORT bool WKPreferencesGetMediaControlsScaleWithPageZoom(WKPreferencesRef preferencesRef);
+
</ins><span class="cx"> // Defaults to false.
</span><span class="cx"> WK_EXPORT void WKPreferencesSetShowsToolTipOverTruncatedText(WKPreferencesRef preferencesRef, bool flag);
</span><span class="cx"> WK_EXPORT bool WKPreferencesGetShowsToolTipOverTruncatedText(WKPreferencesRef preferencesRef);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (186082 => 186083)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -2773,6 +2773,7 @@
</span><span class="cx"> settings.setRequiresUserGestureForMediaPlayback(store.getBoolValueForKey(WebPreferencesKey::requiresUserGestureForMediaPlaybackKey()));
</span><span class="cx"> settings.setAllowsInlineMediaPlayback(store.getBoolValueForKey(WebPreferencesKey::allowsInlineMediaPlaybackKey()));
</span><span class="cx"> settings.setAllowsPictureInPictureMediaPlayback(store.getBoolValueForKey(WebPreferencesKey::allowsPictureInPictureMediaPlaybackKey()));
</span><ins>+ settings.setMediaControlsScaleWithPageZoom(store.getBoolValueForKey(WebPreferencesKey::mediaControlsScaleWithPageZoomKey()));
</ins><span class="cx"> settings.setMockScrollbarsEnabled(store.getBoolValueForKey(WebPreferencesKey::mockScrollbarsEnabledKey()));
</span><span class="cx"> settings.setHyperlinkAuditingEnabled(store.getBoolValueForKey(WebPreferencesKey::hyperlinkAuditingEnabledKey()));
</span><span class="cx"> settings.setRequestAnimationFrameEnabled(store.getBoolValueForKey(WebPreferencesKey::requestAnimationFrameEnabledKey()));
</span></span></pre>
</div>
</div>
</body>
</html>