Changeset 95983 in webkit

Timestamp:

Sep 26, 2011 12:58:24 PM (13 years ago)

Author:

demarchi@webkit.org

Message:

[EFL] Add virtual method to notify user when wrapping focus
​https://bugs.webkit.org/show_bug.cgi?id=68699

Reviewed by Antonio Gomes.

Add a virtual method to ewk_view, so the Chrome gets notified if we
finished focusing all the items and would start over. This way the
browser can decide to handle the subsequent focus changes among its
widgets.

• WebCoreSupport/ChromeClientEfl.cpp: call ewk_view's virtual method to

give it a chance to grab focus
(WebCore::ChromeClientEfl::canTakeFocus):

• ewk/ewk_private.h:
• ewk/ewk_view.cpp: add virtual method

(ewk_view_focus_can_cycle):

• ewk/ewk_view.h: add focus direction enum and virtual method

Location:

trunk/Source/WebKit/efl

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/ChromeClientEfl.cpp (modified) (1 diff)
• ewk/ewk_private.h (modified) (1 diff)
• ewk/ewk_view.cpp (modified) (1 diff)
• ewk/ewk_view.h (modified) (4 diffs)

trunk/Source/WebKit/efl/ChangeLog

@@ +1 @@
+2011-09-26  Lucas De Marchi  <lucas.demarchi@profusion.mobi>
+
+        [EFL] Add virtual method to notify user when wrapping focus
+        https://bugs.webkit.org/show_bug.cgi?id=68699
+
+        Reviewed by Antonio Gomes.
+
+        Add a virtual method to ewk_view, so the Chrome gets notified if we
+        finished focusing all the items and would start over. This way the
+        browser can decide to handle the subsequent focus changes among its
+        widgets.
+
+        * WebCoreSupport/ChromeClientEfl.cpp: call ewk_view's virtual method to
+        give it a chance to grab focus
+        (WebCore::ChromeClientEfl::canTakeFocus):
+        * ewk/ewk_private.h:
+        * ewk/ewk_view.cpp: add virtual method
+        (ewk_view_focus_can_cycle):
+        * ewk/ewk_view.h: add focus direction enum and virtual method
+
 2011-09-24  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp

@@ -237 +237 @@
 }
 
-bool ChromeClientEfl::canTakeFocus(FocusDirection)
+bool ChromeClientEfl::canTakeFocus(FocusDirection coreDirection)
 {
     // This is called when cycling through links/focusable objects and we
     // reach the last focusable object.
-    return false;
+    ASSERT(coreDirection == FocusDirectionForward || coreDirection == FocusDirectionBackward);
+
+    Ewk_Focus_Direction direction = static_cast<Ewk_Focus_Direction>(coreDirection);
+
+    return !ewk_view_focus_can_cycle(m_view, direction);
 }
 

trunk/Source/WebKit/efl/ewk/ewk_private.h

@@ -140 +140 @@
 void ewk_view_editor_client_selection_changed(Evas_Object* o);
 
+bool ewk_view_focus_can_cycle(Evas_Object *o, Ewk_Focus_Direction direction);
+
 #if ENABLE(NETSCAPE_PLUGIN_API)
 void ewk_view_js_window_object_clear(Evas_Object* o, Evas_Object* frame);

trunk/Source/WebKit/efl/ewk/ewk_view.cpp

@@ -3108 +3108 @@
 }
 
+bool ewk_view_focus_can_cycle(Evas_Object* o, Ewk_Focus_Direction direction)
+{
+    DBG("o=%p direction=%d", o, direction);
+    EWK_VIEW_SD_GET_OR_RETURN(o, sd, false);
+    EINA_SAFETY_ON_NULL_RETURN_VAL(sd->api, false);
+
+    if (!sd->api->focus_can_cycle)
+        return false;
+
+    return sd->api->focus_can_cycle(sd, direction);
+}
+
 void ewk_view_run_javascript_alert(Evas_Object* o, Evas_Object* frame, const char* message)
 {

trunk/Source/WebKit/efl/ewk/ewk_view.h

@@ -105 +105 @@
 /// Creates a type name for @a _Ewk_View_Smart_Class.
 typedef struct _Ewk_View_Smart_Class Ewk_View_Smart_Class;
+
+// Defines the direction of focus change. Keep in sync with
+// WebCore::FocusDirection.
+enum _Ewk_Focus_Direction {
+    EWK_FOCUS_DIRECTION_FORWARD = 1,
+    EWK_FOCUS_DIRECTION_BACKWARD,
+};
+typedef enum _Ewk_Focus_Direction Ewk_Focus_Direction;
+
 /// Ewk view's class, to be overridden by sub-classes.
 struct _Ewk_View_Smart_Class {
@@ -150 +159 @@
 
     Eina_Bool (*navigation_policy_decision)(Ewk_View_Smart_Data *sd, Ewk_Frame_Resource_Request *request);
+    Eina_Bool (*focus_can_cycle)(Ewk_View_Smart_Data *sd, Ewk_Focus_Direction direction);
 };
 
@@ -156 +166 @@
  * in the @a Ewk_View_Smart_Class structure.
  */
-#define EWK_VIEW_SMART_CLASS_VERSION 1UL
+#define EWK_VIEW_SMART_CLASS_VERSION 2UL
 
 /**
@@ -168 +178 @@
  * @see EWK_VIEW_SMART_CLASS_INIT_NAME_VERSION
  */
-#define EWK_VIEW_SMART_CLASS_INIT(smart_class_init) {smart_class_init, EWK_VIEW_SMART_CLASS_VERSION, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+#define EWK_VIEW_SMART_CLASS_INIT(smart_class_init) {smart_class_init, EWK_VIEW_SMART_CLASS_VERSION, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
 
 /**