Changeset 98769 in webkit

Timestamp:

Oct 28, 2011, 3:07:16 PM (15 years ago)

Author:

sullivan@apple.com

Message:

Source/WebCore: WebCore part of:
​https://bugs.webkit.org/show_bug.cgi?id=71142
Whether backspace goes Back should be configurable

Reviewed by Sam Weinig.

• page/EventHandler.cpp:

(WebCore::EventHandler::defaultBackspaceEventHandler):
Bail out if backspace navigation is not enabled.

• page/Settings.cpp:

(WebCore::Settings::Settings):
Initialize m_backspaceKeyNavigationEnabled to true to match current behavior.

• page/Settings.h:

Declared m_backspaceKeyNavigationEnabled.
(WebCore::Settings::setBackspaceKeyNavigationEnabled):
New function, simple setter.
(WebCore::Settings::backspaceKeyNavigationEnabled):
New function, simple getter.

Source/WebKit/mac: WebKit part of:
​https://bugs.webkit.org/show_bug.cgi?id=71142
Whether backspace goes Back should be configurable

Reviewed by Sam Weinig.

• WebView/WebFrameView.mm:

(-[WebFrameView keyDown:]):
Honor the new preference.

• WebView/WebPreferenceKeysPrivate.h:

Added #define for WebKitBackspaceKeyNavigationEnabledKey

• WebView/WebPreferences.mm:

(+[WebPreferences initialize]):
Initialize new pref to YES, to match current behavior.
(-[WebPreferences setBackspaceKeyNavigationEnabled:]):
New method, standard prefs setter.
(-[WebPreferences backspaceKeyNavigationEnabled]):
New method, standard prefs getter.

• WebView/WebPreferencesPrivate.h:

Declared new methods.

• WebView/WebView.mm:

(-[WebView _preferencesChanged:]):
Updates WebCore settings from WebKit prefs.

Source/WebKit2: WebKit2 part of:
​https://bugs.webkit.org/show_bug.cgi?id=71142
Whether backspace goes Back should be configurable

Reviewed by Sam Weinig.

• Shared/WebPreferencesStore.h:

Declared backspaceKeyNavigationEnabled property using macro. This initializes
it to true, to match current behavior.

• UIProcess/API/C/WKPreferences.cpp:

(WKPreferencesSetBackspaceKeyNavigationEnabled):
New function, pass value to impl.
(WKPreferencesGetBackspaceKeyNavigationEnabled):
New function, returns result from impl.

• UIProcess/API/C/WKPreferences.h:

Declared API functions for new preference.

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::updatePreferences):
Updates WebCore settings from WebKit2 prefs.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/EventHandler.cpp (modified) (1 diff)
• WebCore/page/Settings.cpp (modified) (1 diff)
• WebCore/page/Settings.h (modified) (2 diffs)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/WebView/WebFrameView.mm (modified) (1 diff)
• WebKit/mac/WebView/WebPreferenceKeysPrivate.h (modified) (1 diff)
• WebKit/mac/WebView/WebPreferences.mm (modified) (2 diffs)
• WebKit/mac/WebView/WebPreferencesPrivate.h (modified) (1 diff)
• WebKit/mac/WebView/WebView.mm (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/Shared/WebPreferencesStore.h (modified) (1 diff)
• WebKit2/UIProcess/API/C/WKPreferences.cpp (modified) (1 diff)
• WebKit2/UIProcess/API/C/WKPreferences.h (modified) (1 diff)
• WebKit2/WebProcess/WebPage/WebPage.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-10-28  John Sullivan  <sullivan@apple.com>
+
+        WebCore part of:
+        https://bugs.webkit.org/show_bug.cgi?id=71142
+        Whether backspace goes Back should be configurable
+
+        Reviewed by Sam Weinig.
+
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::defaultBackspaceEventHandler):
+        Bail out if backspace navigation is not enabled.
+
+        * page/Settings.cpp:
+        (WebCore::Settings::Settings):
+        Initialize m_backspaceKeyNavigationEnabled to true to match current behavior.
+
+        * page/Settings.h:
+        Declared m_backspaceKeyNavigationEnabled.
+        (WebCore::Settings::setBackspaceKeyNavigationEnabled):
+        New function, simple setter.
+        (WebCore::Settings::backspaceKeyNavigationEnabled):
+        New function, simple getter.
+
 2011-10-28  Emil A Eklund  <eae@chromium.org>
 

trunk/Source/WebCore/page/EventHandler.cpp

@@ -3024 +3024 @@
     if (!m_frame->editor()->behavior().shouldNavigateBackOnBackspace())
         return;
+    
+    if (!m_frame->settings()->backspaceKeyNavigationEnabled())
+        return;
 
     Page* page = m_frame->page();

trunk/Source/WebCore/page/Settings.cpp

@@ -230 +230 @@
 #endif
     , m_suppressIncrementalRendering(false)
+    , m_backspaceKeyNavigationEnabled(true)
     , m_loadsImagesAutomaticallyTimer(this, &Settings::loadsImagesAutomaticallyTimerFired)
 {

trunk/Source/WebCore/page/Settings.h

@@ -470 +470 @@
         void setSuppressIncrementalRendering(bool flag) { m_suppressIncrementalRendering = flag; }
         bool suppressIncrementalRendering() const { return m_suppressIncrementalRendering; }
-
+        
+        void setBackspaceKeyNavigationEnabled(bool flag) { m_backspaceKeyNavigationEnabled = flag; }
+        bool backspaceKeyNavigationEnabled() const { return m_backspaceKeyNavigationEnabled; }
+        
         void setPasswordEchoDurationInSeconds(double durationInSeconds) { m_passwordEchoDurationInSeconds = durationInSeconds; }
         double passwordEchoDurationInSeconds() const { return m_passwordEchoDurationInSeconds; }
@@ -608 +611 @@
         bool m_passwordEchoEnabled : 1;
         bool m_suppressIncrementalRendering : 1;
+        bool m_backspaceKeyNavigationEnabled : 1;
 
         Timer<Settings> m_loadsImagesAutomaticallyTimer;

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2011-10-28  John Sullivan  <sullivan@apple.com>
+
+        WebKit part of:
+        https://bugs.webkit.org/show_bug.cgi?id=71142
+        Whether backspace goes Back should be configurable
+
+        Reviewed by Sam Weinig.
+
+        * WebView/WebFrameView.mm:
+        (-[WebFrameView keyDown:]):
+        Honor the new preference.
+
+        * WebView/WebPreferenceKeysPrivate.h:
+        Added #define for WebKitBackspaceKeyNavigationEnabledKey
+        
+        * WebView/WebPreferences.mm:
+        (+[WebPreferences initialize]):
+        Initialize new pref to YES, to match current behavior.
+        (-[WebPreferences setBackspaceKeyNavigationEnabled:]):
+        New method, standard prefs setter.
+        (-[WebPreferences backspaceKeyNavigationEnabled]):
+        New method, standard prefs getter.
+
+        * WebView/WebPreferencesPrivate.h:
+        Declared new methods.
+        
+        * WebView/WebView.mm:
+        (-[WebView _preferencesChanged:]):
+        Updates WebCore settings from WebKit prefs.
+
 2011-10-28  Jochen Eisinger  <jochen@chromium.org>
 

trunk/Source/WebKit/mac/WebView/WebFrameView.mm

@@ -785 +785 @@
         switch ([characters characterAtIndex:index]) {
             case NSDeleteCharacter:
-                if (!maintainsBackForwardList) {
+                if (!maintainsBackForwardList || ![[[self _webView] preferences] backspaceKeyNavigationEnabled]) {
                     callSuper = YES;
                     break;

trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h

@@ -127 +127 @@
 #define WebKitUsePreHTML5ParserQuirksKey @"WebKitUsePreHTML5ParserQuirks"
 #define WebKitSuppressIncrementalRenderingKey @"WebKitSuppressIncrementalRendering"
+#define WebKitBackspaceKeyNavigationEnabledKey @"WebKitBackspaceKeyNavigationEnabled"
 
 // CoreGraphics deferred updates are disabled if WebKitEnableCoalescedUpdatesPreferenceKey is set

trunk/Source/WebKit/mac/WebView/WebPreferences.mm

@@ -387 +387 @@
         [NSNumber numberWithBool:NO],   WebKitWebAudioEnabledPreferenceKey,
         [NSNumber numberWithBool:NO],   WebKitSuppressIncrementalRenderingKey,
+        [NSNumber numberWithBool:YES],  WebKitBackspaceKeyNavigationEnabledKey,
 
         [NSNumber numberWithLongLong:ApplicationCacheStorage::noQuota()], WebKitApplicationCacheTotalQuota,
@@ -1564 +1565 @@
 }
 
+- (void)setBackspaceKeyNavigationEnabled:(BOOL)flag
+{
+    [self _setBoolValue:flag forKey:WebKitBackspaceKeyNavigationEnabledKey];
+}
+
+- (BOOL)backspaceKeyNavigationEnabled
+{
+    return [self _boolValueForKey:WebKitBackspaceKeyNavigationEnabledKey];
+}
+
 @end
 

trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h

@@ -269 +269 @@
 - (BOOL)suppressIncrementalRendering;
 
+- (void)setBackspaceKeyNavigationEnabled:(BOOL)flag;
+- (BOOL)backspaceKeyNavigationEnabled;
+
 @end

trunk/Source/WebKit/mac/WebView/WebView.mm

@@ -1475 +1475 @@
     settings->setMediaPlaybackAllowsInline([preferences mediaPlaybackAllowsInline]);
     settings->setSuppressIncrementalRendering([preferences suppressIncrementalRendering]);
+    settings->setBackspaceKeyNavigationEnabled([preferences backspaceKeyNavigationEnabled]);
 
     // Application Cache Preferences are stored on the global cache storage manager, not in Settings.

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-10-28  John Sullivan  <sullivan@apple.com>
+
+        WebKit2 part of:
+        https://bugs.webkit.org/show_bug.cgi?id=71142
+        Whether backspace goes Back should be configurable
+
+        Reviewed by Sam Weinig.
+
+        * Shared/WebPreferencesStore.h:
+        Declared backspaceKeyNavigationEnabled property using macro. This initializes
+        it to true, to match current behavior.
+        
+        * UIProcess/API/C/WKPreferences.cpp:
+        (WKPreferencesSetBackspaceKeyNavigationEnabled):
+        New function, pass value to impl.
+        (WKPreferencesGetBackspaceKeyNavigationEnabled):
+        New function, returns result from impl.
+        
+        * UIProcess/API/C/WKPreferences.h:
+        Declared API functions for new preference.
+        
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::updatePreferences):
+        Updates WebCore settings from WebKit2 prefs.
+
 2011-10-28  Timothy Hatcher  <timothy@apple.com>
 

trunk/Source/WebKit2/Shared/WebPreferencesStore.h

@@ -97 +97 @@
     macro(ApplicationChromeModeEnabled, applicationChromeMode, Bool, bool, false) \
     macro(SuppressIncrementalRendering, suppressIncrementalRendering, Bool, bool, false) \
+    macro(BackspaceKeyNavigationEnabled, backspaceKeyNavigationEnabled, Bool, bool, true) \
     \
 

trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp

@@ -652 +652 @@
     return toImpl(preferencesRef)->suppressIncrementalRendering();
 }
+
+void WKPreferencesSetBackspaceKeyNavigationEnabled(WKPreferencesRef preferencesRef, bool enabled)
+{
+    toImpl(preferencesRef)->setBackspaceKeyNavigationEnabled(enabled);
+}
+
+bool WKPreferencesGetBackspaceKeyNavigationEnabled(WKPreferencesRef preferencesRef)
+{
+    return toImpl(preferencesRef)->backspaceKeyNavigationEnabled();
+}

trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.h

@@ -174 +174 @@
 WK_EXPORT bool WKPreferencesGetSuppressIncrementalRendering(WKPreferencesRef preferencesRef);
 
+// Defaults to true
+WK_EXPORT void WKPreferencesSetBackspaceKeyNavigationEnabled(WKPreferencesRef preferencesRef, bool enabled);
+WK_EXPORT bool WKPreferencesGetBackspaceKeyNavigationEnabled(WKPreferencesRef preferencesRef);
+
 #ifdef __cplusplus
 }

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -1749 +1749 @@
     settings->setApplicationChromeMode(store.getBoolValueForKey(WebPreferencesKey::applicationChromeModeKey()));    
     settings->setSuppressIncrementalRendering(store.getBoolValueForKey(WebPreferencesKey::suppressIncrementalRenderingKey()));
+    settings->setBackspaceKeyNavigationEnabled(store.getBoolValueForKey(WebPreferencesKey::backspaceKeyNavigationEnabledKey()));
 
     platformPreferencesDidChange(store);