Diff
Modified: trunk/Source/WebCore/ChangeLog (204468 => 204469)
--- 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)
@@ -1,3 +1,16 @@
+2016-08-15 Simon Fraser <[email protected]>
+
+ 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:
+
2016-08-15 Alex Christensen <[email protected]>
Fix WinCairo build after r204466.
Modified: trunk/Source/WebCore/page/Settings.in (204468 => 204469)
--- 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)
@@ -273,3 +273,6 @@
springTimingFunctionEnabled initial=false
treatIPAddressAsDomain initial=false
+
+# Runtime-enabled features
+visualViewportEnabled initial=false
Modified: trunk/Source/WebKit/mac/ChangeLog (204468 => 204469)
--- 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)
@@ -1,3 +1,19 @@
+2016-08-15 Simon Fraser <[email protected]>
+
+ 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:
+
2016-08-15 Joseph Pecoraro <[email protected]>
Remove unused includes of wtf headers
Modified: trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (204468 => 204469)
--- 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)
@@ -165,6 +165,7 @@
#define WebKitFetchAPIEnabledPreferenceKey @"WebKitFetchAPIEnabled"
#define WebKitDownloadAttributeEnabledPreferenceKey @"WebKitDownloadAttributeEnabled"
#define WebKitCSSGridLayoutEnabledPreferenceKey @"WebKitCSSGridLayoutEnabled"
+#define WebKitVisualViewportEnabledPreferenceKey @"WebKitVisualViewportEnabled"
#if !TARGET_OS_IPHONE
// These are private both because callers should be using the cover methods and because the
Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (204468 => 204469)
--- 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)
@@ -622,6 +622,7 @@
#if ENABLE(CSS_GRID_LAYOUT)
[NSNumber numberWithBool:YES], WebKitCSSGridLayoutEnabledPreferenceKey,
#endif
+ [NSNumber numberWithBool:NO], WebKitVisualViewportEnabledPreferenceKey,
nil];
#if !PLATFORM(IOS)
@@ -2762,6 +2763,16 @@
[self _setBoolValue:flag forKey:WebKitCSSGridLayoutEnabledPreferenceKey];
}
+- (BOOL)visualViewportEnabled
+{
+ return [self _boolValueForKey:WebKitVisualViewportEnabledPreferenceKey];
+}
+
+- (void)setVisualViewportEnabled:(BOOL)flag
+{
+ [self _setBoolValue:flag forKey:WebKitVisualViewportEnabledPreferenceKey];
+}
+
@end
@implementation WebPreferences (WebInternal)
Modified: trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (204468 => 204469)
--- 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)
@@ -493,6 +493,7 @@
- (void)setCSSGridLayoutEnabled:(BOOL)flag;
- (BOOL)isCSSGridLayoutEnabled;
+@property (nonatomic) BOOL visualViewportEnabled;
@property (nonatomic) BOOL _javascript_MarkupEnabled;
@property (nonatomic) BOOL mediaDataLoadsAutomatically;
@property (nonatomic) BOOL attachmentElementEnabled;
Modified: trunk/Source/WebKit2/ChangeLog (204468 => 204469)
--- 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)
@@ -1,3 +1,22 @@
+2016-08-15 Simon Fraser <[email protected]>
+
+ 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):
+
2016-08-15 Joseph Pecoraro <[email protected]>
Remove unused includes of wtf headers
Modified: trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (204468 => 204469)
--- 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)
@@ -290,6 +290,7 @@
macro(GamepadsEnabled, gamepadsEnabled, Bool, bool, false, "Gamepads", "Web Gamepad API support") \
macro(SpringTimingFunctionEnabled, springTimingFunctionEnabled, Bool, bool, true, "CSS Spring Animations", "CSS Spring Animation prototype") \
macro(WebGL2Enabled, webGL2Enabled, Bool, bool, true, "WebGL 2.0", "WebGL 2 prototype") \
+ macro(VisualViewportEnabled, visualViewportEnabled, Bool, bool, false, "Visual Viewport", "Use Visual Viewport for fixed elements when zooming") \
\
#if PLATFORM(COCOA)
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm (204468 => 204469)
--- 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)
@@ -303,6 +303,16 @@
_preferences->setDisplayListDrawingEnabled(displayListDrawingEnabled);
}
+- (BOOL)_visualViewportEnabled
+{
+ return _preferences->visualViewportEnabled();
+}
+
+- (void)_setVisualViewportEnabled:(BOOL)_visualViewportEnabled
+{
+ _preferences->setVisualViewportEnabled(_visualViewportEnabled);
+}
+
- (BOOL)_textAutosizingEnabled
{
return _preferences->textAutosizingEnabled();
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h (204468 => 204469)
--- 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)
@@ -62,6 +62,7 @@
@property (nonatomic, setter=_setSimpleLineLayoutDebugBordersEnabled:) BOOL _simpleLineLayoutDebugBordersEnabled WK_API_AVAILABLE(macosx(10.11), ios(9.0));
@property (nonatomic, setter=_setAcceleratedDrawingEnabled:) BOOL _acceleratedDrawingEnabled WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
@property (nonatomic, setter=_setDisplayListDrawingEnabled:) BOOL _displayListDrawingEnabled WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
+@property (nonatomic, setter=_setVisualViewportEnabled:) BOOL _visualViewportEnabled WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
@property (nonatomic, setter=_setTextAutosizingEnabled:) BOOL _textAutosizingEnabled WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
@property (nonatomic, setter=_setDeveloperExtrasEnabled:) BOOL _developerExtrasEnabled WK_API_AVAILABLE(macosx(10.11), ios(9.0));
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (204468 => 204469)
--- 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)
@@ -231,7 +231,8 @@
macro(WebKitEnableCaretBrowsing, CaretBrowsingEnabled, caretBrowsingEnabled) \
macro(WebKitDisplayImagesKey, LoadsImagesAutomatically, loadsImagesAutomatically) \
macro(WebKitMediaStreamEnabled, MediaStreamEnabled, mediaStreamEnabled) \
- macro(WebKitHTTPEquivEnabled, HttpEquivEnabled, httpEquivEnabled)
+ macro(WebKitHTTPEquivEnabled, HttpEquivEnabled, httpEquivEnabled) \
+ macro(WebKitVisualViewportEnabled, VisualViewportEnabled, visualViewportEnabled)
#define OVERRIDE_PREFERENCE_AND_SET_IN_EXISTING_PAGES(TestRunnerName, SettingsName, WebPreferencesName) \
if (preference == #TestRunnerName) { \
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (204468 => 204469)
--- 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)
@@ -3179,6 +3179,8 @@
settings.setSpringTimingFunctionEnabled(store.getBoolValueForKey(WebPreferencesKey::springTimingFunctionEnabledKey()));
+ settings.setVisualViewportEnabled(store.getBoolValueForKey(WebPreferencesKey::visualViewportEnabledKey()));
+
bool processSuppressionEnabled = store.getBoolValueForKey(WebPreferencesKey::pageVisibilityBasedProcessSuppressionEnabledKey());
if (m_processSuppressionEnabled != processSuppressionEnabled) {
m_processSuppressionEnabled = processSuppressionEnabled;
Modified: trunk/Tools/ChangeLog (204468 => 204469)
--- trunk/Tools/ChangeLog 2016-08-15 17:53:26 UTC (rev 204468)
+++ trunk/Tools/ChangeLog 2016-08-15 18:16:36 UTC (rev 204469)
@@ -1,3 +1,23 @@
+2016-08-15 Simon Fraser <[email protected]>
+
+ 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]):
+
2016-08-15 Konstantin Tokarev <[email protected]>
Allow using make-dist with non-GTK ports
Modified: trunk/Tools/MiniBrowser/mac/SettingsController.h (204468 => 204469)
--- 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)
@@ -49,6 +49,8 @@
@property (nonatomic, readonly) BOOL acceleratedDrawingEnabled;
@property (nonatomic, readonly) BOOL displayListDrawingEnabled;
@property (nonatomic, readonly) BOOL resourceLoadStatisticsEnabled;
+@property (nonatomic, readonly) BOOL visualViewportEnabled;
+
@property (nonatomic, readonly) NSString *defaultURL;
@end
Modified: trunk/Tools/MiniBrowser/mac/SettingsController.m (204468 => 204469)
--- 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)
@@ -53,6 +53,8 @@
static NSString * const UsePaginatedModePreferenceKey = @"UsePaginatedMode";
static NSString * const EnableSubPixelCSSOMMetricsPreferenceKey = @"EnableSubPixelCSSOMMetrics";
+static NSString * const VisualViewportEnabledPreferenceKey = @"VisualViewportEnabled";
+
// This default name intentionally overlaps with the key that WebKit2 checks when creating a view.
static NSString * const UseRemoteLayerTreeDrawingAreaPreferenceKey = @"WebKit2UseRemoteLayerTreeDrawingArea";
@@ -121,6 +123,7 @@
[self _addItemWithTitle:@"Suppress Incremental Rendering in New Windows" action:@selector(toggleIncrementalRenderingSuppressed:) indented:NO];
[self _addItemWithTitle:@"Enable Accelerated Drawing" action:@selector(toggleAcceleratedDrawingEnabled:) indented:NO];
[self _addItemWithTitle:@"Enable Display List Drawing" action:@selector(toggleDisplayListDrawingEnabled:) indented:NO];
+ [self _addItemWithTitle:@"Enable Visual Viewport" action:@selector(toggleVisualViewportEnabled:) indented:NO];
[self _addItemWithTitle:@"Enable Resource Load Statistics" action:@selector(toggleResourceLoadStatisticsEnabled:) indented:NO];
[self _addHeaderWithTitle:@"WebKit2-only Settings"];
@@ -194,6 +197,8 @@
[menuItem setState:[self displayListDrawingEnabled] ? NSOnState : NSOffState];
else if (action == @selector(toggleResourceLoadStatisticsEnabled:))
[menuItem setState:[self resourceLoadStatisticsEnabled] ? NSOnState : NSOffState];
+ else if (action == @selector(toggleVisualViewportEnabled:))
+ [menuItem setState:[self visualViewportEnabled] ? NSOnState : NSOffState];
else if (action == @selector(toggleShowTiledScrollingIndicator:))
[menuItem setState:[self tiledScrollingIndicatorVisible] ? NSOnState : NSOffState];
else if (action == @selector(toggleShowResourceUsageOverlay:))
@@ -360,6 +365,16 @@
[self _toggleBooleanDefault:ResourceLoadStatisticsEnabledPreferenceKey];
}
+- (BOOL)visualViewportEnabled
+{
+ return [[NSUserDefaults standardUserDefaults] boolForKey:VisualViewportEnabledPreferenceKey];
+}
+
+- (void)toggleVisualViewportEnabled:(id)sender
+{
+ [self _toggleBooleanDefault:VisualViewportEnabledPreferenceKey];
+}
+
- (BOOL)resourceLoadStatisticsEnabled
{
return [[NSUserDefaults standardUserDefaults] boolForKey:ResourceLoadStatisticsEnabledPreferenceKey];
Modified: trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m (204468 => 204469)
--- 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)
@@ -266,6 +266,7 @@
[[WebPreferences standardPreferences] setSuppressesIncrementalRendering:settings.incrementalRenderingSuppressed];
[[WebPreferences standardPreferences] setAcceleratedDrawingEnabled:settings.acceleratedDrawingEnabled];
[[WebPreferences standardPreferences] setResourceLoadStatisticsEnabled:settings.resourceLoadStatisticsEnabled];
+ [[WebPreferences standardPreferences] setVisualViewportEnabled:settings.visualViewportEnabled];
BOOL useTransparentWindows = settings.useTransparentWindows;
if (useTransparentWindows != !self.window.isOpaque) {
Modified: trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m (204468 => 204469)
--- 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)
@@ -352,6 +352,7 @@
preferences._acceleratedDrawingEnabled = settings.acceleratedDrawingEnabled;
preferences._resourceUsageOverlayVisible = settings.resourceUsageOverlayVisible;
preferences._displayListDrawingEnabled = settings.displayListDrawingEnabled;
+ preferences._visualViewportEnabled = settings.visualViewportEnabled;
_webView.configuration.websiteDataStore._resourceLoadStatisticsEnabled = settings.resourceLoadStatisticsEnabled;
