Modified: branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog (190470 => 190471)
--- branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-10-02 08:07:40 UTC (rev 190470)
+++ branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-10-02 08:08:33 UTC (rev 190471)
@@ -1,5 +1,20 @@
2015-10-02 Babak Shafiei <[email protected]>
+ Merge r189366.
+
+ 2015-09-04 Dan Bernstein <[email protected]>
+
+ [iOS] Disable backspace key navigation by default
+ https://bugs.webkit.org/show_bug.cgi?id=148808
+
+ Reviewed by Tim Horton.
+
+ * Shared/WebPreferencesDefinitions.h: Defined DEFAULT_BACKSPACE_KEY_NAVIGATION_ENABLED as
+ false on iOS, true elsewhere, and made it the default value of the
+ backspaceKeyNavigationEnabled preference key.
+
+2015-10-02 Babak Shafiei <[email protected]>
+
Merge r188755.
2015-08-21 Chris Dumez <[email protected]>
Modified: branches/safari-601.1.46-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h (190470 => 190471)
--- branches/safari-601.1.46-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2015-10-02 08:07:40 UTC (rev 190470)
+++ branches/safari-601.1.46-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2015-10-02 08:08:33 UTC (rev 190471)
@@ -49,6 +49,7 @@
#endif
#if PLATFORM(IOS)
+#define DEFAULT_BACKSPACE_KEY_NAVIGATION_ENABLED false
#define DEFAULT_FRAME_FLATTENING_ENABLED true
#define DEFAULT_SHOULD_PRINT_BACKGROUNDS true
#define DEFAULT_TEXT_AREAS_ARE_RESIZABLE false
@@ -61,6 +62,7 @@
#define DEFAULT_MEDIA_CONTROLS_SCALE_WITH_PAGE_ZOOM false
#define DEFAULT_TEMPORARY_TILE_COHORT_RETENTION_ENABLED false
#else
+#define DEFAULT_BACKSPACE_KEY_NAVIGATION_ENABLED true
#define DEFAULT_FRAME_FLATTENING_ENABLED false
#define DEFAULT_SHOULD_PRINT_BACKGROUNDS false
#define DEFAULT_TEXT_AREAS_ARE_RESIZABLE true
@@ -140,7 +142,7 @@
macro(MockScrollbarsEnabled, mockScrollbarsEnabled, Bool, bool, false) \
macro(WebAudioEnabled, webAudioEnabled, Bool, bool, true) \
macro(SuppressesIncrementalRendering, suppressesIncrementalRendering, Bool, bool, false) \
- macro(BackspaceKeyNavigationEnabled, backspaceKeyNavigationEnabled, Bool, bool, true) \
+ macro(BackspaceKeyNavigationEnabled, backspaceKeyNavigationEnabled, Bool, bool, DEFAULT_BACKSPACE_KEY_NAVIGATION_ENABLED) \
macro(CaretBrowsingEnabled, caretBrowsingEnabled, Bool, bool, false) \
macro(ShouldDisplaySubtitles, shouldDisplaySubtitles, Bool, bool, false) \
macro(ShouldDisplayCaptions, shouldDisplayCaptions, Bool, bool, false) \
