Changeset 19207 in webkit

Timestamp:

Jan 28, 2007 7:22:10 PM (17 years ago)

Author:

aroben

Message:

Reviewed by Adele.

Fix ​http://bugs.webkit.org/show_bug.cgi?id=12453
REGRESSION(r19197): Tabbing into web page requires two key presses

All layout tests pass.

• page/FocusController.cpp: (WebCore::FocusController::advanceFocus): If there's no focused frame, actually go ahead and find a focusable node instead of just focusing the main frame and quitting. This behavior was a holdover from a previous desired tabbing behavior with respect to frames.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/FocusController.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-01-28  Adam Roben  <aroben@apple.com>
+
+        Reviewed by Adele.
+
+        Fix http://bugs.webkit.org/show_bug.cgi?id=12453
+        REGRESSION(r19197): Tabbing into web page requires two key presses
+
+        All layout tests pass.
+
+        * page/FocusController.cpp:
+        (WebCore::FocusController::advanceFocus): If there's no focused frame,
+        actually go ahead and find a focusable node instead of just focusing
+        the main frame and quitting. This behavior was a holdover from a
+        previous desired tabbing behavior with respect to frames.
+
 2007-01-28  David Kilzer  <ddkilzer@webkit.org>
 

trunk/WebCore/page/FocusController.cpp

@@ -114 +114 @@
     ASSERT(event);
     
-    if (!focusedFrame()) {
-        setFocusedFrame(m_page->mainFrame());
-        if (Document* document = focusedFrame()->document())
-            document->setFocusedNode(0);
-
-        return true;
-    }
-
-    Frame* focusedFrame = this->focusedFrame();
-    Document* document = focusedFrame->document();
+    Frame* frame = focusedOrMainFrame();
+    ASSERT(frame);
+    Document* document = frame->document();
     if (!document)
         return false;
@@ -134 +127 @@
             
     // If there's no focusable node to advance to, move up the frame tree until we find one.
-    Frame* frame = focusedFrame;
     while (!node && frame) {
         Frame* parentFrame = frame->tree()->parent();