Title: [98788] trunk/Source/WebCore
Revision
98788
Author
[email protected]
Date
2011-10-28 17:32:36 -0700 (Fri, 28 Oct 2011)

Log 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.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (98787 => 98788)


--- trunk/Source/WebCore/ChangeLog	2011-10-29 00:30:00 UTC (rev 98787)
+++ trunk/Source/WebCore/ChangeLog	2011-10-29 00:32:36 UTC (rev 98788)
@@ -1,3 +1,16 @@
+2011-10-28  John Sullivan  <[email protected]>
+
+        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  <[email protected]>
 
         Make DOMURL a ContextDestructionObserver

Modified: trunk/Source/WebCore/page/EventHandler.cpp (98787 => 98788)


--- trunk/Source/WebCore/page/EventHandler.cpp	2011-10-29 00:30:00 UTC (rev 98787)
+++ trunk/Source/WebCore/page/EventHandler.cpp	2011-10-29 00:32:36 UTC (rev 98788)
@@ -3024,13 +3024,13 @@
     if (!m_frame->editor()->behavior().shouldNavigateBackOnBackspace())
         return;
     
-    if (!m_frame->settings()->backspaceKeyNavigationEnabled())
-        return;
-
     Page* page = m_frame->page();
     if (!page)
         return;
 
+    if (!m_frame->settings()->backspaceKeyNavigationEnabled())
+        return;
+    
     bool handledEvent = false;
 
     if (event->shiftKey())
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to