diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2015-09-17 19:13:29 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2015-09-18 13:53:23 +0000 |
| commit | e055598dbfebe2fa202adb8697653474018e0798 (patch) | |
| tree | 5838559e8bec3554a5af27fb8f3e0000b0afcfd9 | |
| parent | 330c0ae2dcb9f99f380ceedb37ba02b891507613 (diff) | |
| download | qtwebkit-e055598dbfebe2fa202adb8697653474018e0798.tar.gz | |
Moved SpatialNavigationEnabled preference definition to bool group.
Because of incorrect conflict resolution in patch a7592da preference
SpatialNavigationEnabled was added to FOR_EACH_WEBKIT_UINT32_PREFERENCE
instead of FOR_EACH_WEBKIT_BOOL_PREFERENCE.
(It worked fine as uint32 though)
Change-Id: Ifb805b8f47e6ccf3b7b5dc49825a0e36d44b2889
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| -rw-r--r-- | Source/WebKit2/Shared/WebPreferencesStore.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebKit2/Shared/WebPreferencesStore.h b/Source/WebKit2/Shared/WebPreferencesStore.h index deb1b7a2f..46a5ffab5 100644 --- a/Source/WebKit2/Shared/WebPreferencesStore.h +++ b/Source/WebKit2/Shared/WebPreferencesStore.h @@ -161,6 +161,7 @@ namespace WebKit { macro(HiddenPageDOMTimerThrottlingEnabled, hiddenPageDOMTimerThrottlingEnabled, Bool, bool, DEFAULT_HIDDEN_PAGE_DOM_TIMER_THROTTLING_ENABLED) \ macro(HiddenPageCSSAnimationSuspensionEnabled, hiddenPageCSSAnimationSuspensionEnabled, Bool, bool, DEFAULT_HIDDEN_PAGE_CSS_ANIMATION_SUSPENSION_ENABLED) \ macro(LowPowerVideoAudioBufferSizeEnabled, lowPowerVideoAudioBufferSizeEnabled, Bool, bool, false) \ + macro(SpatialNavigationEnabled, spatialNavigationEnabled, Bool, bool, false) \ \ #define FOR_EACH_WEBKIT_DOUBLE_PREFERENCE(macro) \ @@ -176,7 +177,6 @@ namespace WebKit { macro(MinimumFontSize, minimumFontSize, UInt32, uint32_t, 0) \ macro(MinimumLogicalFontSize, minimumLogicalFontSize, UInt32, uint32_t, 9) \ macro(DefaultFontSize, defaultFontSize, UInt32, uint32_t, 16) \ - macro(SpatialNavigationEnabled, spatialNavigationEnabled, Bool, bool, false) \ macro(DefaultFixedFontSize, defaultFixedFontSize, UInt32, uint32_t, 13) \ macro(LayoutFallbackWidth, layoutFallbackWidth, UInt32, uint32_t, 980) \ macro(DeviceWidth, deviceWidth, UInt32, uint32_t, 0) \ |