Changeset 98788 in webkit

Timestamp:

Oct 28, 2011, 5:32:36 PM (15 years ago)

Author:

sullivan@apple.com

Message:

Improvement to the fix for:
​https://bugs.webkit.org/show_bug.cgi?id=71142
Whether backspace goes Back should be configurable

Reviewed by Dan Bernstein.

• page/EventHandler.cpp:

(WebCore::EventHandler::defaultBackspaceEventHandler):
Do the frame->settings() check after the !page check, since
a null page means null settings.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/EventHandler.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-10-28  John Sullivan  <sullivan@apple.com>
+
+        Improvement to the fix for:
+        https://bugs.webkit.org/show_bug.cgi?id=71142
+        Whether backspace goes Back should be configurable
+
+        Reviewed by Dan Bernstein.
+
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::defaultBackspaceEventHandler):
+        Do the frame->settings() check after the !page check, since
+        a null page means null settings.
+
 2011-10-28  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebCore/page/EventHandler.cpp

@@ -3025 +3025 @@
         return;
     
-    if (!m_frame->settings()->backspaceKeyNavigationEnabled())
-        return;
-
     Page* page = m_frame->page();
     if (!page)
         return;
 
+    if (!m_frame->settings()->backspaceKeyNavigationEnabled())
+        return;
+    
     bool handledEvent = false;