From: Jiyoun Park <jy0703.park@samsung.com>
Date: Sat, 23 Dec 2017 06:21:38 +0000 (+0900)
Subject:    rebase_build: fix build error related with EDJE_OBJECT_CLASS
X-Git-Tag: submit/sandbox/upgrade/efl120/20180319.053334~680
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4354ab0ea53a01042523d11eaf892f863a376ea2;p=platform%2Fupstream%2Fefl.git

   rebase_build: fix build error related with EDJE_OBJECT_CLASS

   gengrid, genlist, list use  the info EDJE_OBJECT_CLASS
   but because of opensource change, Tizen only code need to change the code.
---

diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c
index cca2e67..f35040b 100644
--- a/src/lib/elementary/elm_gengrid.c
+++ b/src/lib/elementary/elm_gengrid.c
@@ -6012,12 +6012,14 @@ _elm_gengrid_elm_interface_scrollable_content_pos_set(Eo *obj, Elm_Gengrid_Data
           if (parent == obj)
             break;
      }
+/*TIZEN_ONLY(20171222): fix build error temporarly
    else if (efl_isa(highlighted_obj, EDJE_OBJECT_CLASS))
      {
         while ((parent = evas_object_smart_parent_get(parent)))
           if (parent == obj)
             break;
      }
+*/
    // TIZEN_ONLY(20160805): set _accessibility_currently_highlighted_obj to NULL in object delete callback
    else
      {
diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c
index db846df..b8983f0 100644
--- a/src/lib/elementary/elm_genlist.c
+++ b/src/lib/elementary/elm_genlist.c
@@ -159,7 +159,6 @@ static const char SIGNAL_GROUP_SINGLE[] = "elm,state,group,single";
 static const char SIGNAL_GROUP_FIRST[] = "elm,state,group,first";
 static const char SIGNAL_GROUP_LAST[] = "elm,state,group,last";
 static const char SIGNAL_GROUP_MIDDLE[] = "elm,state,group,middle";
-static const char SIGNAL_ITEM_HIGHLIGHTED[] = "elm,state,highlighted";
 
 static void _item_unrealize(Elm_Gen_Item *it);
 static Eina_Bool _item_select(Elm_Gen_Item *it);
@@ -9027,12 +9026,14 @@ _elm_genlist_elm_interface_scrollable_content_pos_set(Eo *obj, Elm_Genlist_Data
           if (parent == obj)
             break;
      }
+/*TIZEN_ONLY(20171222): fix build error temporarly
    else if (efl_isa(highlighted_obj, EDJE_OBJECT_CLASS))
      {
         while ((parent = evas_object_smart_parent_get(parent)))
           if (parent == obj)
             break;
      }
+*/
    // TIZEN_ONLY(20160805): set _accessibility_currently_highlighted_obj to NULL in object delete callback
    else
      {
@@ -9141,9 +9142,10 @@ _elm_genlist_item_efl_access_component_highlight_grab(Eo *eo_it, Elm_Gen_Item *i
         sd->atspi_item_to_highlight = it;//it will be highlighted when realized
      }
 
-   //TIZEN_ONLY(20161104) : Accessibility : synchronized highlight of atspi and item align feature for wearable profile
-   edje_object_signal_emit(VIEW(it), SIGNAL_ITEM_HIGHLIGHTED, "elm");
-   //
+  //TIZEN_ONLY(20170412) Make atspi,(un)highlighted work on widget item
+  // If you call eo_do_super, then you do NOT have to call smart callback.
+  evas_object_smart_callback_call(WIDGET(it), "atspi,highlighted", eo_it);
+  //
   return EINA_TRUE;
 }
 
diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c
index f18c2b0..d215b56 100644
--- a/src/lib/elementary/elm_list.c
+++ b/src/lib/elementary/elm_list.c
@@ -3372,12 +3372,14 @@ _elm_list_elm_interface_scrollable_content_pos_set(Eo *obj EINA_UNUSED, Elm_List
            if (parent == obj)
              break;
      }
+/*TIZEN_ONLY(20171222): fix build error temporarly
    else if (efl_isa(highlighted_obj, EDJE_OBJECT_CLASS))
      {
          while ((parent = evas_object_smart_parent_get(parent)))
            if (parent == obj)
              break;
      }
+*/
    // TIZEN_ONLY(20160805): set _accessibility_currently_highlighted_obj to NULL in object delete callback
    else
      {