Changeset 142477 in webkit

Timestamp:

Feb 11, 2013 8:06:58 AM (11 years ago)

Author:

Christophe Dumez

Message:

[EFL][WKTR] Regression(r141836) fast/dom/Window/mozilla-focus-blur.html started failing
​https://bugs.webkit.org/show_bug.cgi?id=109438

Reviewed by Kenneth Rohde Christiansen.

Some refactoring in r141836 caused the view not to get focus if the focused
frame is not the main one. The idea of the code was to remove focus from the
view if the focused frame was not the main one, and then focus the view again.
However, after the refactoring, the second step never happened: Focus was
removed but not given again.

• WebKitTestRunner/efl/PlatformWebViewEfl.cpp:

(WTR::PlatformWebView::focus):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• WebKitTestRunner/efl/PlatformWebViewEfl.cpp (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-02-11  Christophe Dumez  <ch.dumez@sisa.samsung.com>
+
+        [EFL][WKTR] Regression(r141836) fast/dom/Window/mozilla-focus-blur.html started failing
+        https://bugs.webkit.org/show_bug.cgi?id=109438
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Some refactoring in r141836 caused the view not to get focus if the focused
+        frame is not the main one. The idea of the code was to remove focus from the
+        view if the focused frame was not the main one, and then focus the view again.
+        However, after the refactoring, the second step never happened: Focus was
+        removed but not given again.
+
+        * WebKitTestRunner/efl/PlatformWebViewEfl.cpp:
+        (WTR::PlatformWebView::focus):
+
 2013-02-11  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Tools/WebKitTestRunner/efl/PlatformWebViewEfl.cpp

@@ -103 +103 @@
     // (WebCoreSupport::focusedFrameChanged() does not emit any notification). We then manually remove the
     // focus from the view to make the call give focus to evas_object_focus_set(..., true) to be effectful.
-    evas_object_focus_set(WKViewGetEvasObject(m_view), WKPageGetFocusedFrame(page()) == WKPageGetMainFrame(page()));
+    if (WKPageGetFocusedFrame(page()) != WKPageGetMainFrame(page()))
+        evas_object_focus_set(evasObject, false);
+    evas_object_focus_set(evasObject, true);
 }