Changeset 50937 in webkit

Timestamp:

Nov 13, 2009 5:21:34 AM (14 years ago)

Author:

eric@webkit.org

Message:

2009-11-13 Jocelyn Turcotte <​jocelyn.turcotte@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Fix initial QWebView focus behavior.

focusController->setFocused(true) was not always called.
​https://bugs.webkit.org/show_bug.cgi?id=31466

• Api/qwebpage.cpp: (QWebPagePrivate::focusInEvent):

Location:

trunk/WebKit/qt

Files:

• Api/qwebpage.cpp (modified) (1 diff)
• ChangeLog (modified) (1 diff)

trunk/WebKit/qt/Api/qwebpage.cpp

@@ -1063 +1063 @@
 {
     FocusController *focusController = page->focusController();
-    Frame *frame = focusController->focusedFrame();
     focusController->setActive(true);
-    if (frame)
-        focusController->setFocused(true);
-    else
+    focusController->setFocused(true);
+    if (!focusController->focusedFrame())
         focusController->setFocusedFrame(QWebFramePrivate::core(mainFrame));
 }

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2009-11-13  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Fix initial QWebView focus behavior.
+
+        focusController->setFocused(true) was not always called.
+        https://bugs.webkit.org/show_bug.cgi?id=31466
+
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::focusInEvent):
+
 2009-11-13  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>