<!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>[204469] trunk</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/204469">204469</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-08-15 11:16:36 -0700 (Mon, 15 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add a setting and preferences to enable visual viewport mode
https://bugs.webkit.org/show_bug.cgi?id=160843
Reviewed by Sam Weinig.
Source/WebCore:
Add a visualViewportEnabled setting, in the start of a group at the bottom
of the file which is intended as the future home for all runtime-enabled
settings.
* page/Settings.in:
Source/WebKit/mac:
Hook up the visualViewportEnabled setting for WebKit1.
* WebView/WebPreferenceKeysPrivate.h:
* WebView/WebPreferences.mm:
(+[WebPreferences initialize]):
(-[WebPreferences visualViewportEnabled]):
(-[WebPreferences setVisualViewportEnabled:]):
* WebView/WebPreferencesPrivate.h:
Source/WebKit2:
Hook up the visualViewportEnabled setting for WebKit2.
* Shared/WebPreferencesDefinitions.h:
* UIProcess/API/Cocoa/WKPreferences.mm:
(-[WKPreferences _visualViewportEnabled]):
(-[WKPreferences _setVisualViewportEnabled:]):
* UIProcess/API/Cocoa/WKPreferencesPrivate.h:
* WebProcess/InjectedBundle/InjectedBundle.cpp:
(WebKit::InjectedBundle::overrideBoolPreferenceForTestRunner):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences):
Tools:
Pref and a menu item to toggle visualViewportEnabled for WebKits 1 and 2.
* MiniBrowser/mac/SettingsController.h:
* MiniBrowser/mac/SettingsController.m:
(-[SettingsController _populateMenu]):
(-[SettingsController validateMenuItem:]):
(-[SettingsController visualViewportEnabled]):
(-[SettingsController toggleVisualViewportEnabled:]):
* MiniBrowser/mac/WK1BrowserWindowController.m:
(-[WK1BrowserWindowController didChangeSettings]):
* MiniBrowser/mac/WK2BrowserWindowController.m:
(-[WK2BrowserWindowController didChangeSettings]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPreferencesDefinitionsh">trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKPreferencesmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKPreferencesPrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlecpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsMiniBrowsermacSettingsControllerh">trunk/Tools/MiniBrowser/mac/SettingsController.h</a></li>
<li><a href="#trunkToolsMiniBrowsermacSettingsControllerm">trunk/Tools/MiniBrowser/mac/SettingsController.m</a></li>
<li><a href="#trunkToolsMiniBrowsermacWK1BrowserWindowControllerm">trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m</a></li>
<li><a href="#trunkToolsMiniBrowsermacWK2BrowserWindowControllerm">trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (204468 => 204469)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-08-15 17:53:26 UTC (rev 204468)
+++ trunk/Source/WebCore/ChangeLog        2016-08-15 18:16:36 UTC (rev 204469)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-08-15 Simon Fraser <simon.fraser@apple.com>
+
+ Add a setting and preferences to enable visual viewport mode
+ https://bugs.webkit.org/show_bug.cgi?id=160843
+
+ Reviewed by Sam Weinig.
+
+ Add a visualViewportEnabled setting, in the start of a group at the bottom
+ of the file which is intended as the future home for all runtime-enabled
+ settings.
+
+ * page/Settings.in:
+
</ins><span class="cx"> 2016-08-15 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix WinCairo build after r204466.
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.in (204468 => 204469)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.in        2016-08-15 17:53:26 UTC (rev 204468)
+++ trunk/Source/WebCore/page/Settings.in        2016-08-15 18:16:36 UTC (rev 204469)
</span><span class="lines">@@ -273,3 +273,6 @@
</span><span class="cx"> springTimingFunctionEnabled initial=false
</span><span class="cx">
</span><span class="cx"> treatIPAddressAsDomain initial=false
</span><ins>+
+# Runtime-enabled features
+visualViewportEnabled initial=false
</ins></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (204468 => 204469)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog        2016-08-15 17:53:26 UTC (rev 204468)
+++ trunk/Source/WebKit/mac/ChangeLog        2016-08-15 18:16:36 UTC (rev 204469)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-08-15 Simon Fraser <simon.fraser@apple.com>
+
+ Add a setting and preferences to enable visual viewport mode
+ https://bugs.webkit.org/show_bug.cgi?id=160843
+
+ Reviewed by Sam Weinig.
+
+ Hook up the visualViewportEnabled setting for WebKit1.
+
+ * WebView/WebPreferenceKeysPrivate.h:
+ * WebView/WebPreferences.mm:
+ (+[WebPreferences initialize]):
+ (-[WebPreferences visualViewportEnabled]):
+ (-[WebPreferences setVisualViewportEnabled:]):
+ * WebView/WebPreferencesPrivate.h:
+
</ins><span class="cx"> 2016-08-15 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove unused includes of wtf headers
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferenceKeysPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (204468 => 204469)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h        2016-08-15 17:53:26 UTC (rev 204468)
+++ trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h        2016-08-15 18:16:36 UTC (rev 204469)
</span><span class="lines">@@ -165,6 +165,7 @@
</span><span class="cx"> #define WebKitFetchAPIEnabledPreferenceKey @"WebKitFetchAPIEnabled"
</span><span class="cx"> #define WebKitDownloadAttributeEnabledPreferenceKey @"WebKitDownloadAttributeEnabled"
</span><span class="cx"> #define WebKitCSSGridLayoutEnabledPreferenceKey @"WebKitCSSGridLayoutEnabled"
</span><ins>+#define WebKitVisualViewportEnabledPreferenceKey @"WebKitVisualViewportEnabled"
</ins><span class="cx">
</span><span class="cx"> #if !TARGET_OS_IPHONE
</span><span class="cx"> // These are private both because callers should be using the cover methods and because the
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (204468 => 204469)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm        2016-08-15 17:53:26 UTC (rev 204468)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm        2016-08-15 18:16:36 UTC (rev 204469)
</span><span class="lines">@@ -622,6 +622,7 @@
</span><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx"> [NSNumber numberWithBool:YES], WebKitCSSGridLayoutEnabledPreferenceKey,
</span><span class="cx"> #endif
</span><ins>+ [NSNumber numberWithBool:NO], WebKitVisualViewportEnabledPreferenceKey,
</ins><span class="cx"> nil];
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="lines">@@ -2762,6 +2763,16 @@
</span><span class="cx"> [self _setBoolValue:flag forKey:WebKitCSSGridLayoutEnabledPreferenceKey];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)visualViewportEnabled
+{
+ return [self _boolValueForKey:WebKitVisualViewportEnabledPreferenceKey];
+}
+
+- (void)setVisualViewportEnabled:(BOOL)flag
+{
+ [self _setBoolValue:flag forKey:WebKitVisualViewportEnabledPreferenceKey];
+}
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @implementation WebPreferences (WebInternal)
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (204468 => 204469)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h        2016-08-15 17:53:26 UTC (rev 204468)
+++ trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h        2016-08-15 18:16:36 UTC (rev 204469)
</span><span class="lines">@@ -493,6 +493,7 @@
</span><span class="cx"> - (void)setCSSGridLayoutEnabled:(BOOL)flag;
</span><span class="cx"> - (BOOL)isCSSGridLayoutEnabled;
</span><span class="cx">
</span><ins>+@property (nonatomic) BOOL visualViewportEnabled;
</ins><span class="cx"> @property (nonatomic) BOOL javaScriptMarkupEnabled;
</span><span class="cx"> @property (nonatomic) BOOL mediaDataLoadsAutomatically;
</span><span class="cx"> @property (nonatomic) BOOL attachmentElementEnabled;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (204468 => 204469)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2016-08-15 17:53:26 UTC (rev 204468)
+++ trunk/Source/WebKit2/ChangeLog        2016-08-15 18:16:36 UTC (rev 204469)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-08-15 Simon Fraser <simon.fraser@apple.com>
+
+ Add a setting and preferences to enable visual viewport mode
+ https://bugs.webkit.org/show_bug.cgi?id=160843
+
+ Reviewed by Sam Weinig.
+
+ Hook up the visualViewportEnabled setting for WebKit2.
+
+ * Shared/WebPreferencesDefinitions.h:
+ * UIProcess/API/Cocoa/WKPreferences.mm:
+ (-[WKPreferences _visualViewportEnabled]):
+ (-[WKPreferences _setVisualViewportEnabled:]):
+ * UIProcess/API/Cocoa/WKPreferencesPrivate.h:
+ * WebProcess/InjectedBundle/InjectedBundle.cpp:
+ (WebKit::InjectedBundle::overrideBoolPreferenceForTestRunner):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences):
+
</ins><span class="cx"> 2016-08-15 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove unused includes of wtf headers
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPreferencesDefinitionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (204468 => 204469)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h        2016-08-15 17:53:26 UTC (rev 204468)
+++ trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h        2016-08-15 18:16:36 UTC (rev 204469)
</span><span class="lines">@@ -290,6 +290,7 @@
</span><span class="cx"> macro(GamepadsEnabled, gamepadsEnabled, Bool, bool, false, "Gamepads", "Web Gamepad API support") \
</span><span class="cx"> macro(SpringTimingFunctionEnabled, springTimingFunctionEnabled, Bool, bool, true, "CSS Spring Animations", "CSS Spring Animation prototype") \
</span><span class="cx"> macro(WebGL2Enabled, webGL2Enabled, Bool, bool, true, "WebGL 2.0", "WebGL 2 prototype") \
</span><ins>+ macro(VisualViewportEnabled, visualViewportEnabled, Bool, bool, false, "Visual Viewport", "Use Visual Viewport for fixed elements when zooming") \
</ins><span class="cx"> \
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKPreferencesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm (204468 => 204469)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm        2016-08-15 17:53:26 UTC (rev 204468)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm        2016-08-15 18:16:36 UTC (rev 204469)
</span><span class="lines">@@ -303,6 +303,16 @@
</span><span class="cx"> _preferences->setDisplayListDrawingEnabled(displayListDrawingEnabled);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)_visualViewportEnabled
+{
+ return _preferences->visualViewportEnabled();
+}
+
+- (void)_setVisualViewportEnabled:(BOOL)_visualViewportEnabled
+{
+ _preferences->setVisualViewportEnabled(_visualViewportEnabled);
+}
+
</ins><span class="cx"> - (BOOL)_textAutosizingEnabled
</span><span class="cx"> {
</span><span class="cx"> return _preferences->textAutosizingEnabled();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKPreferencesPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h (204468 => 204469)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h        2016-08-15 17:53:26 UTC (rev 204468)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h        2016-08-15 18:16:36 UTC (rev 204469)
</span><span class="lines">@@ -62,6 +62,7 @@
</span><span class="cx"> @property (nonatomic, setter=_setSimpleLineLayoutDebugBordersEnabled:) BOOL _simpleLineLayoutDebugBordersEnabled WK_API_AVAILABLE(macosx(10.11), ios(9.0));
</span><span class="cx"> @property (nonatomic, setter=_setAcceleratedDrawingEnabled:) BOOL _acceleratedDrawingEnabled WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
</span><span class="cx"> @property (nonatomic, setter=_setDisplayListDrawingEnabled:) BOOL _displayListDrawingEnabled WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
</span><ins>+@property (nonatomic, setter=_setVisualViewportEnabled:) BOOL _visualViewportEnabled WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
</ins><span class="cx"> @property (nonatomic, setter=_setTextAutosizingEnabled:) BOOL _textAutosizingEnabled WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
</span><span class="cx">
</span><span class="cx"> @property (nonatomic, setter=_setDeveloperExtrasEnabled:) BOOL _developerExtrasEnabled WK_API_AVAILABLE(macosx(10.11), ios(9.0));
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (204468 => 204469)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp        2016-08-15 17:53:26 UTC (rev 204468)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp        2016-08-15 18:16:36 UTC (rev 204469)
</span><span class="lines">@@ -231,7 +231,8 @@
</span><span class="cx"> macro(WebKitEnableCaretBrowsing, CaretBrowsingEnabled, caretBrowsingEnabled) \
</span><span class="cx"> macro(WebKitDisplayImagesKey, LoadsImagesAutomatically, loadsImagesAutomatically) \
</span><span class="cx"> macro(WebKitMediaStreamEnabled, MediaStreamEnabled, mediaStreamEnabled) \
</span><del>- macro(WebKitHTTPEquivEnabled, HttpEquivEnabled, httpEquivEnabled)
</del><ins>+ macro(WebKitHTTPEquivEnabled, HttpEquivEnabled, httpEquivEnabled) \
+ macro(WebKitVisualViewportEnabled, VisualViewportEnabled, visualViewportEnabled)
</ins><span class="cx">
</span><span class="cx"> #define OVERRIDE_PREFERENCE_AND_SET_IN_EXISTING_PAGES(TestRunnerName, SettingsName, WebPreferencesName) \
</span><span class="cx"> if (preference == #TestRunnerName) { \
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (204468 => 204469)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp        2016-08-15 17:53:26 UTC (rev 204468)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp        2016-08-15 18:16:36 UTC (rev 204469)
</span><span class="lines">@@ -3179,6 +3179,8 @@
</span><span class="cx">
</span><span class="cx"> settings.setSpringTimingFunctionEnabled(store.getBoolValueForKey(WebPreferencesKey::springTimingFunctionEnabledKey()));
</span><span class="cx">
</span><ins>+ settings.setVisualViewportEnabled(store.getBoolValueForKey(WebPreferencesKey::visualViewportEnabledKey()));
+
</ins><span class="cx"> bool processSuppressionEnabled = store.getBoolValueForKey(WebPreferencesKey::pageVisibilityBasedProcessSuppressionEnabledKey());
</span><span class="cx"> if (m_processSuppressionEnabled != processSuppressionEnabled) {
</span><span class="cx"> m_processSuppressionEnabled = processSuppressionEnabled;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (204468 => 204469)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2016-08-15 17:53:26 UTC (rev 204468)
+++ trunk/Tools/ChangeLog        2016-08-15 18:16:36 UTC (rev 204469)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-08-15 Simon Fraser <simon.fraser@apple.com>
+
+ Add a setting and preferences to enable visual viewport mode
+ https://bugs.webkit.org/show_bug.cgi?id=160843
+
+ Reviewed by Sam Weinig.
+
+ Pref and a menu item to toggle visualViewportEnabled for WebKits 1 and 2.
+
+ * MiniBrowser/mac/SettingsController.h:
+ * MiniBrowser/mac/SettingsController.m:
+ (-[SettingsController _populateMenu]):
+ (-[SettingsController validateMenuItem:]):
+ (-[SettingsController visualViewportEnabled]):
+ (-[SettingsController toggleVisualViewportEnabled:]):
+ * MiniBrowser/mac/WK1BrowserWindowController.m:
+ (-[WK1BrowserWindowController didChangeSettings]):
+ * MiniBrowser/mac/WK2BrowserWindowController.m:
+ (-[WK2BrowserWindowController didChangeSettings]):
+
</ins><span class="cx"> 2016-08-15 Konstantin Tokarev <annulen@yandex.ru>
</span><span class="cx">
</span><span class="cx"> Allow using make-dist with non-GTK ports
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacSettingsControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/SettingsController.h (204468 => 204469)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/SettingsController.h        2016-08-15 17:53:26 UTC (rev 204468)
+++ trunk/Tools/MiniBrowser/mac/SettingsController.h        2016-08-15 18:16:36 UTC (rev 204469)
</span><span class="lines">@@ -49,6 +49,8 @@
</span><span class="cx"> @property (nonatomic, readonly) BOOL acceleratedDrawingEnabled;
</span><span class="cx"> @property (nonatomic, readonly) BOOL displayListDrawingEnabled;
</span><span class="cx"> @property (nonatomic, readonly) BOOL resourceLoadStatisticsEnabled;
</span><ins>+@property (nonatomic, readonly) BOOL visualViewportEnabled;
+
</ins><span class="cx"> @property (nonatomic, readonly) NSString *defaultURL;
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacSettingsControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/SettingsController.m (204468 => 204469)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/SettingsController.m        2016-08-15 17:53:26 UTC (rev 204468)
+++ trunk/Tools/MiniBrowser/mac/SettingsController.m        2016-08-15 18:16:36 UTC (rev 204469)
</span><span class="lines">@@ -53,6 +53,8 @@
</span><span class="cx"> static NSString * const UsePaginatedModePreferenceKey = @"UsePaginatedMode";
</span><span class="cx"> static NSString * const EnableSubPixelCSSOMMetricsPreferenceKey = @"EnableSubPixelCSSOMMetrics";
</span><span class="cx">
</span><ins>+static NSString * const VisualViewportEnabledPreferenceKey = @"VisualViewportEnabled";
+
</ins><span class="cx"> // This default name intentionally overlaps with the key that WebKit2 checks when creating a view.
</span><span class="cx"> static NSString * const UseRemoteLayerTreeDrawingAreaPreferenceKey = @"WebKit2UseRemoteLayerTreeDrawingArea";
</span><span class="cx">
</span><span class="lines">@@ -121,6 +123,7 @@
</span><span class="cx"> [self _addItemWithTitle:@"Suppress Incremental Rendering in New Windows" action:@selector(toggleIncrementalRenderingSuppressed:) indented:NO];
</span><span class="cx"> [self _addItemWithTitle:@"Enable Accelerated Drawing" action:@selector(toggleAcceleratedDrawingEnabled:) indented:NO];
</span><span class="cx"> [self _addItemWithTitle:@"Enable Display List Drawing" action:@selector(toggleDisplayListDrawingEnabled:) indented:NO];
</span><ins>+ [self _addItemWithTitle:@"Enable Visual Viewport" action:@selector(toggleVisualViewportEnabled:) indented:NO];
</ins><span class="cx"> [self _addItemWithTitle:@"Enable Resource Load Statistics" action:@selector(toggleResourceLoadStatisticsEnabled:) indented:NO];
</span><span class="cx">
</span><span class="cx"> [self _addHeaderWithTitle:@"WebKit2-only Settings"];
</span><span class="lines">@@ -194,6 +197,8 @@
</span><span class="cx"> [menuItem setState:[self displayListDrawingEnabled] ? NSOnState : NSOffState];
</span><span class="cx"> else if (action == @selector(toggleResourceLoadStatisticsEnabled:))
</span><span class="cx"> [menuItem setState:[self resourceLoadStatisticsEnabled] ? NSOnState : NSOffState];
</span><ins>+ else if (action == @selector(toggleVisualViewportEnabled:))
+ [menuItem setState:[self visualViewportEnabled] ? NSOnState : NSOffState];
</ins><span class="cx"> else if (action == @selector(toggleShowTiledScrollingIndicator:))
</span><span class="cx"> [menuItem setState:[self tiledScrollingIndicatorVisible] ? NSOnState : NSOffState];
</span><span class="cx"> else if (action == @selector(toggleShowResourceUsageOverlay:))
</span><span class="lines">@@ -360,6 +365,16 @@
</span><span class="cx"> [self _toggleBooleanDefault:ResourceLoadStatisticsEnabledPreferenceKey];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)visualViewportEnabled
+{
+ return [[NSUserDefaults standardUserDefaults] boolForKey:VisualViewportEnabledPreferenceKey];
+}
+
+- (void)toggleVisualViewportEnabled:(id)sender
+{
+ [self _toggleBooleanDefault:VisualViewportEnabledPreferenceKey];
+}
+
</ins><span class="cx"> - (BOOL)resourceLoadStatisticsEnabled
</span><span class="cx"> {
</span><span class="cx"> return [[NSUserDefaults standardUserDefaults] boolForKey:ResourceLoadStatisticsEnabledPreferenceKey];
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacWK1BrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m (204468 => 204469)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m        2016-08-15 17:53:26 UTC (rev 204468)
+++ trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m        2016-08-15 18:16:36 UTC (rev 204469)
</span><span class="lines">@@ -266,6 +266,7 @@
</span><span class="cx"> [[WebPreferences standardPreferences] setSuppressesIncrementalRendering:settings.incrementalRenderingSuppressed];
</span><span class="cx"> [[WebPreferences standardPreferences] setAcceleratedDrawingEnabled:settings.acceleratedDrawingEnabled];
</span><span class="cx"> [[WebPreferences standardPreferences] setResourceLoadStatisticsEnabled:settings.resourceLoadStatisticsEnabled];
</span><ins>+ [[WebPreferences standardPreferences] setVisualViewportEnabled:settings.visualViewportEnabled];
</ins><span class="cx">
</span><span class="cx"> BOOL useTransparentWindows = settings.useTransparentWindows;
</span><span class="cx"> if (useTransparentWindows != !self.window.isOpaque) {
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacWK2BrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m (204468 => 204469)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m        2016-08-15 17:53:26 UTC (rev 204468)
+++ trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m        2016-08-15 18:16:36 UTC (rev 204469)
</span><span class="lines">@@ -352,6 +352,7 @@
</span><span class="cx"> preferences._acceleratedDrawingEnabled = settings.acceleratedDrawingEnabled;
</span><span class="cx"> preferences._resourceUsageOverlayVisible = settings.resourceUsageOverlayVisible;
</span><span class="cx"> preferences._displayListDrawingEnabled = settings.displayListDrawingEnabled;
</span><ins>+ preferences._visualViewportEnabled = settings.visualViewportEnabled;
</ins><span class="cx">
</span><span class="cx"> _webView.configuration.websiteDataStore._resourceLoadStatisticsEnabled = settings.resourceLoadStatisticsEnabled;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>