Changeset 97329 in webkit

Timestamp:

Oct 12, 2011 6:23:06 PM (13 years ago)

Author:

gyuyoung.kim@samsung.com

Message:

[EFL] Change efl style parameter variables with WebKit coding Style
​https://bugs.webkit.org/show_bug.cgi?id=69073

Reviewed by Antonio Gomes.

This is a third step in order to be more compliant with WebKit coding style.
We have used one-letter| two-letter parameter according to efl style. However, it's more difficult
for other reviewers to review EFL patches. So, this patch changes efl style parameters
with meaningful one.

Majors changes are listed below,

• Use ewkFrame instead of o parameter in ewk_frame.cpp.
• Use ewkView instead of o parameter in ewk_view.cpp.
• Use menu and item instead of o parameter in ewk_contextmenu.cpp.
• Use ewkTile instead of o parameter in ewk_tile_xxx.cpp.
• Use tile parameter name instead of t parameter in ewk_tile_xxx.cpp.
• Use smartData instead of sd parameter for Ewk_XXXX_Smart_Data struct.
• Use width, height instead of w, h parameter.
• Use xxxEvent instead of ev parameter for event. (e.g. downEvent, upEvent, wheelEvent)
• Use scrollX, scrollY, scrollWidth, scrollHeight, centerX, centerY, deltaX, deltaY instead of sx, xy, sw,

sh, cx, cy, dx, dy.

• Use tileUnusedCache instead of tuc parameter in tiled backing store.
• Use red, green, blue and alpha instead of r,g,b,a.
• Remove "_" from parameter variable.
• Run demarchi's coding style script for ewk_tile_xxx.cpp files.
• Remove *void* parameter in ewk_tile_xxx.cpp's internal functions.

• ewk/ewk_auth_soup.cpp:
• ewk/ewk_contextmenu.cpp:
• ewk/ewk_cookies.cpp:
• ewk/ewk_frame.cpp:
• ewk/ewk_history.cpp:
• ewk/ewk_js.cpp:
• ewk/ewk_protocol_handler_soup.cpp:
• ewk/ewk_settings.cpp:
• ewk/ewk_tiled_backing_store.cpp:
• ewk/ewk_tiled_backing_store.h:
• ewk/ewk_tiled_matrix.cpp:
• ewk/ewk_tiled_matrix.h:
• ewk/ewk_tiled_model.cpp:
• ewk/ewk_tiled_model.h:
• ewk/ewk_view.cpp:
• ewk/ewk_view_single.cpp:
• ewk/ewk_view_tiled.cpp:
• ewk/ewk_window_features.cpp:

Location:

trunk/Source/WebKit/efl

Files:

• ChangeLog (modified) (2 diffs)
• ewk/ewk_auth_soup.cpp (modified) (1 diff)
• ewk/ewk_contextmenu.cpp (modified) (7 diffs)
• ewk/ewk_cookies.cpp (modified) (2 diffs)
• ewk/ewk_frame.cpp (modified) (77 diffs)
• ewk/ewk_history.cpp (modified) (1 diff)
• ewk/ewk_js.cpp (modified) (26 diffs)
• ewk/ewk_protocol_handler_soup.cpp (modified) (1 diff)
• ewk/ewk_settings.cpp (modified) (3 diffs)
• ewk/ewk_tiled_backing_store.cpp (modified) (93 diffs)
• ewk/ewk_tiled_backing_store.h (modified) (2 diffs)
• ewk/ewk_tiled_matrix.cpp (modified) (32 diffs)
• ewk/ewk_tiled_matrix.h (modified) (1 diff)
• ewk/ewk_tiled_model.cpp (modified) (36 diffs)
• ewk/ewk_tiled_model.h (modified) (1 diff)
• ewk/ewk_view.cpp (modified) (171 diffs)
• ewk/ewk_view_single.cpp (modified) (20 diffs)
• ewk/ewk_view_tiled.cpp (modified) (10 diffs)
• ewk/ewk_window_features.cpp (modified) (1 diff)

trunk/Source/WebKit/efl/ChangeLog

@@ +1 @@
+2011-10-12  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        [EFL] Change efl style parameter variables with WebKit coding Style
+        https://bugs.webkit.org/show_bug.cgi?id=69073
+
+        Reviewed by Antonio Gomes.
+
+        This is a third step in order to be more compliant with WebKit coding style.
+        We have used one-letter| two-letter parameter according to efl style. However, it's more difficult
+        for other reviewers to review EFL patches. So, this patch changes efl style parameters
+        with meaningful one.
+
+        Majors changes are listed below,
+
+        - Use ewkFrame instead of o parameter in ewk_frame.cpp.
+        - Use ewkView instead of o parameter in ewk_view.cpp.
+        - Use menu and item instead of o parameter in ewk_contextmenu.cpp.
+        - Use ewkTile instead of o parameter in ewk_tile_xxx.cpp.
+        - Use tile parameter name instead of t parameter in ewk_tile_xxx.cpp.
+        - Use smartData instead of sd parameter for Ewk_XXXX_Smart_Data struct.
+        - Use width, height instead of w, h parameter.
+        - Use xxxEvent instead of ev parameter for event. (e.g. downEvent, upEvent, wheelEvent)
+        - Use scrollX, scrollY, scrollWidth, scrollHeight, centerX, centerY, deltaX, deltaY instead of sx, xy, sw,
+        sh, cx, cy, dx, dy.
+        - Use tileUnusedCache instead of tuc parameter in tiled backing store.
+        - Use red, green, blue and alpha instead of r,g,b,a.
+        - Remove "_" from parameter variable.
+        - Run demarchi's coding style script for ewk_tile_xxx.cpp files.
+        - Remove *void* parameter in ewk_tile_xxx.cpp's internal functions.
+
+        * ewk/ewk_auth_soup.cpp:
+        * ewk/ewk_contextmenu.cpp:
+        * ewk/ewk_cookies.cpp:
+        * ewk/ewk_frame.cpp:
+        * ewk/ewk_history.cpp:
+        * ewk/ewk_js.cpp:
+        * ewk/ewk_protocol_handler_soup.cpp:
+        * ewk/ewk_settings.cpp:
+        * ewk/ewk_tiled_backing_store.cpp:
+        * ewk/ewk_tiled_backing_store.h:
+        * ewk/ewk_tiled_matrix.cpp:
+        * ewk/ewk_tiled_matrix.h:
+        * ewk/ewk_tiled_model.cpp:
+        * ewk/ewk_tiled_model.h:
+        * ewk/ewk_view.cpp:
+        * ewk/ewk_view_single.cpp:
+        * ewk/ewk_view_tiled.cpp:
+        * ewk/ewk_window_features.cpp:
+
 2011-10-10  Raphael Kubo da Costa  <kubo@profusion.mobi>
 
@@ -2058 +2107 @@
         * ewk/ewk_view.cpp:
         (ewk_view_run_open_panel):
-        * ewk/ewk_view.h
+        * ewk/ewk_view.h:
 
 2011-06-27  Gyuyoung Kim  <gyuyoung.kim@samsung.com>

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

@@ -64 +64 @@
 }
 
-static void ewk_auth_soup_dialog_session_feature_init(SoupSessionFeatureInterface* feature_interface, gpointer interface_data)
+static void ewk_auth_soup_dialog_session_feature_init(SoupSessionFeatureInterface* featureInterface, gpointer interfaceData)
 {
-    feature_interface->attach = attach;
-    feature_interface->detach = detach;
+    featureInterface->attach = attach;
+    featureInterface->detach = detach;
 }
 

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

@@ -93 +93 @@
 }
 
-const Eina_List* ewk_context_menu_item_list_get(const Ewk_Context_Menu* o)
-{
-    EINA_SAFETY_ON_NULL_RETURN_VAL(o, 0);
-
-    return o->items;
+const Eina_List* ewk_context_menu_item_list_get(const Ewk_Context_Menu* menu)
+{
+    EINA_SAFETY_ON_NULL_RETURN_VAL(menu, 0);
+
+    return menu->items;
 }
 
@@ -143 +143 @@
 }
 
-Ewk_Context_Menu_Item_Type ewk_context_menu_item_type_get(const Ewk_Context_Menu_Item* o)
-{
-    EINA_SAFETY_ON_NULL_RETURN_VAL(o, EWK_ACTION_TYPE);
-    return o->type;
-}
-
-Eina_Bool ewk_context_menu_item_type_set(Ewk_Context_Menu_Item* o, Ewk_Context_Menu_Item_Type type)
-{
-    EINA_SAFETY_ON_NULL_RETURN_VAL(o, EINA_FALSE);
-    o->type = type;
-    return EINA_TRUE;
-}
-
-Ewk_Context_Menu_Action ewk_context_menu_item_action_get(const Ewk_Context_Menu_Item* o)
-{
-    EINA_SAFETY_ON_NULL_RETURN_VAL(o, EWK_CONTEXT_MENU_ITEM_TAG_NO_ACTION);
-    return o->action;
-}
-
-Eina_Bool ewk_context_menu_item_action_set(Ewk_Context_Menu_Item* o, Ewk_Context_Menu_Action action)
-{
-    EINA_SAFETY_ON_NULL_RETURN_VAL(o, EINA_FALSE);
-    o->action = action;
-    return EINA_TRUE;
-}
-
-const char* ewk_context_menu_item_title_get(const Ewk_Context_Menu_Item* o)
-{
-    EINA_SAFETY_ON_NULL_RETURN_VAL(o, 0);
-    return o->title;
-}
-
-const char* ewk_context_menu_item_title_set(Ewk_Context_Menu_Item* o, const char* title)
-{
-    EINA_SAFETY_ON_NULL_RETURN_VAL(o, 0);
-    eina_stringshare_replace(&o->title, title);
-    return o->title;
-}
-
-Eina_Bool ewk_context_menu_item_checked_get(const Ewk_Context_Menu_Item* o)
-{
-    EINA_SAFETY_ON_NULL_RETURN_VAL(o, EINA_FALSE);
-    return o->checked;
-}
-
-Eina_Bool ewk_context_menu_item_checked_set(Ewk_Context_Menu_Item* o, Eina_Bool checked)
-{
-    EINA_SAFETY_ON_NULL_RETURN_VAL(o, EINA_FALSE);
-    o->checked = checked;
-    return EINA_TRUE;
-}
-
-Eina_Bool ewk_context_menu_item_enabled_get(const Ewk_Context_Menu_Item* o)
-{
-    EINA_SAFETY_ON_NULL_RETURN_VAL(o, EINA_FALSE);
-    return o->enabled;
-}
-
-Eina_Bool ewk_context_menu_item_enabled_set(Ewk_Context_Menu_Item* o, Eina_Bool enabled)
-{
-    EINA_SAFETY_ON_NULL_RETURN_VAL(o, EINA_FALSE);
-    o->enabled = enabled;
+Ewk_Context_Menu_Item_Type ewk_context_menu_item_type_get(const Ewk_Context_Menu_Item* item)
+{
+    EINA_SAFETY_ON_NULL_RETURN_VAL(item, EWK_ACTION_TYPE);
+    return item->type;
+}
+
+Eina_Bool ewk_context_menu_item_type_set(Ewk_Context_Menu_Item* item, Ewk_Context_Menu_Item_Type type)
+{
+    EINA_SAFETY_ON_NULL_RETURN_VAL(item, EINA_FALSE);
+    item->type = type;
+    return EINA_TRUE;
+}
+
+Ewk_Context_Menu_Action ewk_context_menu_item_action_get(const Ewk_Context_Menu_Item* item)
+{
+    EINA_SAFETY_ON_NULL_RETURN_VAL(item, EWK_CONTEXT_MENU_ITEM_TAG_NO_ACTION);
+    return item->action;
+}
+
+Eina_Bool ewk_context_menu_item_action_set(Ewk_Context_Menu_Item* item, Ewk_Context_Menu_Action action)
+{
+    EINA_SAFETY_ON_NULL_RETURN_VAL(item, EINA_FALSE);
+    item->action = action;
+    return EINA_TRUE;
+}
+
+const char* ewk_context_menu_item_title_get(const Ewk_Context_Menu_Item* item)
+{
+    EINA_SAFETY_ON_NULL_RETURN_VAL(item, 0);
+    return item->title;
+}
+
+const char* ewk_context_menu_item_title_set(Ewk_Context_Menu_Item* item, const char* title)
+{
+    EINA_SAFETY_ON_NULL_RETURN_VAL(item, 0);
+    eina_stringshare_replace(&item->title, title);
+    return item->title;
+}
+
+Eina_Bool ewk_context_menu_item_checked_get(const Ewk_Context_Menu_Item* item)
+{
+    EINA_SAFETY_ON_NULL_RETURN_VAL(item, EINA_FALSE);
+    return item->checked;
+}
+
+Eina_Bool ewk_context_menu_item_checked_set(Ewk_Context_Menu_Item* item, Eina_Bool checked)
+{
+    EINA_SAFETY_ON_NULL_RETURN_VAL(item, EINA_FALSE);
+    item->checked = checked;
+    return EINA_TRUE;
+}
+
+Eina_Bool ewk_context_menu_item_enabled_get(const Ewk_Context_Menu_Item* item)
+{
+    EINA_SAFETY_ON_NULL_RETURN_VAL(item, EINA_FALSE);
+    return item->enabled;
+}
+
+Eina_Bool ewk_context_menu_item_enabled_set(Ewk_Context_Menu_Item* item, Eina_Bool enabled)
+{
+    EINA_SAFETY_ON_NULL_RETURN_VAL(item, EINA_FALSE);
+    item->enabled = enabled;
     return EINA_TRUE;
 }
@@ -257 +257 @@
  * @see ewk_context_menu_destroy
  */
-Eina_Bool ewk_context_menu_free(Ewk_Context_Menu* o)
-{
-    EINA_SAFETY_ON_NULL_RETURN_VAL(o, EINA_FALSE);
-    evas_object_smart_callback_call(o->view, "contextmenu,free", o);
-    ewk_context_menu_unref(o);
+Eina_Bool ewk_context_menu_free(Ewk_Context_Menu* menu)
+{
+    EINA_SAFETY_ON_NULL_RETURN_VAL(menu, EINA_FALSE);
+    evas_object_smart_callback_call(menu->view, "contextmenu,free", menu);
+    ewk_context_menu_unref(menu);
     return EINA_TRUE;
 }
@@ -276 +276 @@
  * @see ewk_context_menu_item_new
  */
-void ewk_context_menu_item_append(Ewk_Context_Menu* o, WebCore::ContextMenuItem& core)
+void ewk_context_menu_item_append(Ewk_Context_Menu* menu, WebCore::ContextMenuItem& core)
 {
     Ewk_Context_Menu_Item_Type type = static_cast<Ewk_Context_Menu_Item_Type>(core.type());
@@ -286 +286 @@
     EINA_SAFETY_ON_NULL_RETURN(menu_item);
 
-    o->items = eina_list_append(o->items, menu_item);
-    evas_object_smart_callback_call(o->view, "contextmenu,item,appended", o);
+    menu->items = eina_list_append(menu->items, menu_item);
+    evas_object_smart_callback_call(menu->view, "contextmenu,item,appended", menu);
 }
 
@@ -302 +302 @@
  * @see ewk_context_menu_item_list_get
  */
-Ewk_Context_Menu* ewk_context_menu_custom_get(const Ewk_Context_Menu* o)
-{
-    EINA_SAFETY_ON_NULL_RETURN_VAL(o, 0);
-
-    evas_object_smart_callback_call(o->view, "contextmenu,customize", o->items);
-    return o;
+Ewk_Context_Menu* ewk_context_menu_custom_get(const Ewk_Context_Menu* menu)
+{
+    EINA_SAFETY_ON_NULL_RETURN_VAL(menu, 0);
+
+    evas_object_smart_callback_call(menu->view, "contextmenu,customize", menu->items);
+    return menu;
 }
 
@@ -317 +317 @@
  * @param o the context menu object
  */
-void ewk_context_menu_show(const Ewk_Context_Menu* o)
-{
-    EINA_SAFETY_ON_NULL_RETURN(o);
-
-    evas_object_smart_callback_call(o->view, "contextmenu,show", o);
+void ewk_context_menu_show(const Ewk_Context_Menu* menu)
+{
+    EINA_SAFETY_ON_NULL_RETURN(menu);
+
+    evas_object_smart_callback_call(menu->view, "contextmenu,show", menu);
 }
 

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

@@ -143 +143 @@
 }
 
-void ewk_cookies_policy_set(Ewk_Cookie_Policy p)
+void ewk_cookies_policy_set(Ewk_Cookie_Policy cookiePolicy)
 {
 #if USE(SOUP)
@@ -150 +150 @@
 
     policy = SOUP_COOKIE_JAR_ACCEPT_ALWAYS;
-    switch (p) {
+    switch (cookiePolicy) {
     case EWK_COOKIE_JAR_ACCEPT_NEVER:
         policy = SOUP_COOKIE_JAR_ACCEPT_NEVER;

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

@@ -83 +83 @@
 
 #ifndef EWK_TYPE_CHECK
-#define EWK_FRAME_TYPE_CHECK(o, ...) do { } while (0)
+#define EWK_FRAME_TYPE_CHECK(ewkFrame, ...) do { } while (0)
 #else
-#define EWK_FRAME_TYPE_CHECK(o, ...)                                    \
+#define EWK_FRAME_TYPE_CHECK(ewkFrame, ...)                                    \
     do {                                                                \
-        const char* _tmp_otype = evas_object_type_get(o);               \
+        const char* _tmp_otype = evas_object_type_get(ewkFrame);               \
         if (EINA_UNLIKELY(_tmp_otype != EWK_FRAME_TYPE_STR)) {          \
             EINA_LOG_CRIT                                               \
-                ("%p (%s) is not of an ewk_frame!", o,                  \
+                ("%p (%s) is not of an ewk_frame!", ewkFrame,                  \
                 _tmp_otype ? _tmp_otype : "(null)");                    \
             return __VA_ARGS__;                                         \
@@ -97 +97 @@
 #endif
 
-#define EWK_FRAME_SD_GET(o, ptr)                                \
-    Ewk_Frame_Smart_Data* ptr = static_cast<Ewk_Frame_Smart_Data*>(evas_object_smart_data_get(o))
-
-#define EWK_FRAME_SD_GET_OR_RETURN(o, ptr, ...)         \
-    EWK_FRAME_TYPE_CHECK(o, __VA_ARGS__);               \
-    EWK_FRAME_SD_GET(o, ptr);                           \
+#define EWK_FRAME_SD_GET(ewkFrame, ptr)                                \
+    Ewk_Frame_Smart_Data* ptr = static_cast<Ewk_Frame_Smart_Data*>(evas_object_smart_data_get(ewkFrame))
+
+#define EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, ptr, ...)         \
+    EWK_FRAME_TYPE_CHECK(ewkFrame, __VA_ARGS__);               \
+    EWK_FRAME_SD_GET(ewkFrame, ptr);                           \
     if (!ptr) {                                         \
         CRITICAL("no smart data for object %p (%s)",    \
-                 o, evas_object_type_get(o));           \
+                 ewkFrame, evas_object_type_get(ewkFrame));           \
         return __VA_ARGS__;                             \
     }
@@ -112 +112 @@
 
 #ifdef EWK_FRAME_DEBUG
-static inline void _ewk_frame_debug(Evas_Object* o)
+static inline void _ewk_frame_debug(Evas_Object* ewkFrame)
 {
     Evas_Object* clip, * parent;
@@ -118 +118 @@
     int r, g, b, a, cr, cg, cb, ca;
 
-    evas_object_color_get(o, &r, &g, &b, &a);
-    evas_object_geometry_get(o, &x, &y, &w, &h);
-
-    clip = evas_object_clip_get(o);
+    evas_object_color_get(ewkFrame, &r, &g, &b, &a);
+    evas_object_geometry_get(ewkFrame, &x, &y, &w, &h);
+
+    clip = evas_object_clip_get(ewkFrame);
     evas_object_color_get(clip, &cr, &cg, &cb, &ca);
     evas_object_geometry_get(clip, &cx, &cy, &cw, &ch);
 
     fprintf(stderr, "%p: type=%s name=%s, visible=%d, color=%02x%02x%02x%02x, %d,%d+%dx%d, clipper=%p (%d, %02x%02x%02x%02x, %d,%d+%dx%d)\n",
-            o, evas_object_type_get(o), evas_object_name_get(o), evas_object_visible_get(o),
+            ewkFrame, evas_object_type_get(ewkFrame), evas_object_name_get(ewkFrame), evas_object_visible_get(ewkFrame),
             r, g, b, a, x, y, w, h,
             clip, evas_object_visible_get(clip), cr, cg, cb, ca, cx, cy, cw, ch);
-    parent = evas_object_smart_parent_get(o);
+    parent = evas_object_smart_parent_get(ewkFrame);
     if (!parent)
         fprintf(stderr, "\n");
@@ -168 +168 @@
 }
 
-static Evas_Object* _ewk_frame_children_iterator_get_container(Eina_Iterator_Ewk_Frame* it)
-{
-    return it->obj;
-}
-
-static void _ewk_frame_smart_add(Evas_Object* o)
-{
-    EWK_FRAME_SD_GET(o, sd);
+static Evas_Object* _ewk_frame_children_iterator_get_container(Eina_Iterator_Ewk_Frame* iterator)
+{
+    return iterator->obj;
+}
+
+static void _ewk_frame_smart_add(Evas_Object* ewkFrame)
+{
+    EWK_FRAME_SD_GET(ewkFrame, sd);
 
     if (!sd) {
@@ -183 +183 @@
             return;
         }
-        evas_object_smart_data_set(o, sd);
-    }
-
-    sd->self = o;
-
-    _parent_sc.add(o);
+        evas_object_smart_data_set(ewkFrame, sd);
+    }
+
+    sd->self = ewkFrame;
+
+    _parent_sc.add(ewkFrame);
     evas_object_static_clip_set(sd->base.clipper, EINA_FALSE);
     evas_object_move(sd->base.clipper, 0, 0);
@@ -225 +225 @@
         i = 0;
 
-    evas_object_smart_member_add(sd->region, o);
+    evas_object_smart_member_add(sd->region, ewkFrame);
     evas_object_hide(sd->region);
 #endif
 }
 
-static void _ewk_frame_smart_del(Evas_Object* o)
-{
-    WRN("o=%p", o); // XXX REMOVE ME LATER
-    EWK_FRAME_SD_GET(o, sd);
+static void _ewk_frame_smart_del(Evas_Object* ewkFrame)
+{
+    WRN("ewkFrame=%p", ewkFrame); // XXX REMOVE ME LATER
+    EWK_FRAME_SD_GET(ewkFrame, sd);
 
     if (sd) {
@@ -249 +249 @@
     }
 
-    _parent_sc.del(o);
-}
-
-static void _ewk_frame_smart_resize(Evas_Object* o, Evas_Coord w, Evas_Coord h)
-{
-    EWK_FRAME_SD_GET(o, sd);
-    evas_object_resize(sd->base.clipper, w, h);
+    _parent_sc.del(ewkFrame);
+}
+
+static void _ewk_frame_smart_resize(Evas_Object* ewkFrame, Evas_Coord width, Evas_Coord height)
+{
+    EWK_FRAME_SD_GET(ewkFrame, sd);
+    evas_object_resize(sd->base.clipper, width, height);
 
 #ifdef EWK_FRAME_DEBUG
-    evas_object_resize(sd->region, w, h);
+    evas_object_resize(sd->region, width, height);
     Evas_Coord x, y;
-    evas_object_geometry_get(sd->region, &x, &y, &w, &h);
+    evas_object_geometry_get(sd->region, &x, &y, &width, &height);
     INF("region=%p, visible=%d, geo=%d,%d + %dx%d",
-        sd->region, evas_object_visible_get(sd->region), x, y, w, h);
-    _ewk_frame_debug(o);
+        sd->region, evas_object_visible_get(sd->region), x, y, width, height);
+    _ewk_frame_debug(ewkFrame);
 #endif
 }
@@ -289 +289 @@
 }
 
-Evas_Object* ewk_frame_view_get(const Evas_Object* o)
-{
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd, 0);
+Evas_Object* ewk_frame_view_get(const Evas_Object* ewkFrame)
+{
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, 0);
     return sd->view;
 }
 
-Eina_Iterator* ewk_frame_children_iterator_new(Evas_Object* o)
-{
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd, 0);
+Eina_Iterator* ewk_frame_children_iterator_new(Evas_Object* ewkFrame)
+{
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, 0);
     Eina_Iterator_Ewk_Frame* it = static_cast<Eina_Iterator_Ewk_Frame*>
                                   (calloc(1, sizeof(Eina_Iterator_Ewk_Frame)));
@@ -307 +307 @@
     it->base.get_container = FUNC_ITERATOR_GET_CONTAINER(_ewk_frame_children_iterator_get_container);
     it->base.free = FUNC_ITERATOR_FREE(free);
-    it->obj = o;
+    it->obj = ewkFrame;
     it->currentIndex = 0;
     return &it->base;
 }
 
-Evas_Object* ewk_frame_child_find(Evas_Object* o, const char* name)
-{
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd, 0);
+Evas_Object* ewk_frame_child_find(Evas_Object* ewkFrame, const char* name)
+{
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, 0);
     EINA_SAFETY_ON_NULL_RETURN_VAL(name, 0);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, 0);
@@ -321 +321 @@
 }
 
-Eina_Bool ewk_frame_uri_set(Evas_Object* o, const char* uri)
-{
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_frame_uri_set(Evas_Object* ewkFrame, const char* uri)
+{
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, EINA_FALSE);
     WebCore::KURL kurl(WebCore::KURL(), WTF::String::fromUTF8(uri));
     WebCore::ResourceRequest req(kurl);
@@ -331 +331 @@
 }
 
-const char* ewk_frame_uri_get(const Evas_Object* o)
-{
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd, 0);
+const char* ewk_frame_uri_get(const Evas_Object* ewkFrame)
+{
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, 0);
     return sd->uri;
 }
 
-const char* ewk_frame_title_get(const Evas_Object* o)
-{
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd, 0);
+const char* ewk_frame_title_get(const Evas_Object* ewkFrame)
+{
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, 0);
     return sd->title;
 }
 
-const char* ewk_frame_name_get(const Evas_Object* o)
-{
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd, 0);
+const char* ewk_frame_name_get(const Evas_Object* ewkFrame)
+{
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, 0);
 
     if (!sd->frame) {
@@ -362 +362 @@
 }
 
-Eina_Bool ewk_frame_contents_size_get(const Evas_Object* o, Evas_Coord* w, Evas_Coord* h)
-{
-    if (w)
-        *w = 0;
-    if (h)
-        *h = 0;
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
-    if (!sd->frame || !sd->frame->view())
-        return EINA_FALSE;
-    if (w)
-        *w = sd->frame->view()->contentsWidth();
-    if (h)
-        *h = sd->frame->view()->contentsHeight();
-    return EINA_TRUE;
-}
-
-static Eina_Bool _ewk_frame_contents_set_internal(Ewk_Frame_Smart_Data* sd, const char* contents, size_t contents_size, const char* mime_type, const char* encoding, const char* base_uri, const char* unreachable_uri)
+Eina_Bool ewk_frame_contents_size_get(const Evas_Object* ewkFrame, Evas_Coord* width, Evas_Coord* height)
+{
+    if (width)
+        *width = 0;
+    if (height)
+        *height = 0;
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, EINA_FALSE);
+    if (width)
+        *width = sd->frame->view()->contentsWidth();
+    if (height)
+        *height = sd->frame->view()->contentsHeight();
+    return EINA_TRUE;
+}
+
+static Eina_Bool _ewk_frame_contents_set_internal(Ewk_Frame_Smart_Data* smartData, const char* contents, size_t contentsSize, const char* mimeType, const char* encoding, const char* baseUri, const char* unreachableUri)
 {
     size_t len = strlen(contents);
-    if (contents_size < 1 || contents_size > len)
-        contents_size = len;
-    if (!mime_type)
-        mime_type = "text/html";
+    if (contentsSize < 1 || contentsSize > len)
+        contentsSize = len;
+    if (!mimeType)
+        mimeType = "text/html";
     if (!encoding)
         encoding = "UTF-8";
-    if (!base_uri)
-        base_uri = "about:blank";
-
-    WebCore::KURL baseKURL(WebCore::KURL(), WTF::String::fromUTF8(base_uri));
+    if (!baseUri)
+        baseUri = "about:blank";
+
+    WebCore::KURL baseKURL(WebCore::KURL(), WTF::String::fromUTF8(baseUri));
     WebCore::KURL unreachableKURL;
-    if (unreachable_uri)
-        unreachableKURL = WebCore::KURL(WebCore::KURL(), WTF::String::fromUTF8(unreachable_uri));
+    if (unreachableUri)
+        unreachableKURL = WebCore::KURL(WebCore::KURL(), WTF::String::fromUTF8(unreachableUri));
     else
         unreachableKURL = WebCore::KURL();
 
-    WTF::RefPtr<WebCore::SharedBuffer> buffer = WebCore::SharedBuffer::create(contents, contents_size);
+    WTF::RefPtr<WebCore::SharedBuffer> buffer = WebCore::SharedBuffer::create(contents, contentsSize);
     WebCore::SubstituteData substituteData
         (buffer.release(),
-        WTF::String::fromUTF8(mime_type),
+        WTF::String::fromUTF8(mimeType),
         WTF::String::fromUTF8(encoding),
         baseKURL, unreachableKURL);
     WebCore::ResourceRequest request(baseKURL);
 
-    sd->frame->loader()->load(request, substituteData, false);
-    return EINA_TRUE;
-}
-
-Eina_Bool ewk_frame_contents_set(Evas_Object* o, const char* contents, size_t contents_size, const char* mime_type, const char* encoding, const char* base_uri)
-{
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+    smartData->frame->loader()->load(request, substituteData, false);
+    return EINA_TRUE;
+}
+
+Eina_Bool ewk_frame_contents_set(Evas_Object* ewkFrame, const char* contents, size_t contentsSize, const char* mimeType, const char* encoding, const char* baseUri)
+{
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, EINA_FALSE);
     EINA_SAFETY_ON_FALSE_RETURN_VAL(sd->frame, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(contents, EINA_FALSE);
     return _ewk_frame_contents_set_internal
-               (sd, contents, contents_size, mime_type, encoding, base_uri, 0);
-}
-
-Eina_Bool ewk_frame_contents_alternate_set(Evas_Object* o, const char* contents, size_t contents_size, const char* mime_type, const char* encoding, const char* base_uri, const char* unreachable_uri)
-{
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+               (sd, contents, contentsSize, mimeType, encoding, baseUri, 0);
+}
+
+Eina_Bool ewk_frame_contents_alternate_set(Evas_Object* ewkFrame, const char* contents, size_t contentsSize, const char* mimeType, const char* encoding, const char* baseUri, const char* unreachableUri)
+{
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, EINA_FALSE);
     EINA_SAFETY_ON_FALSE_RETURN_VAL(sd->frame, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(contents, EINA_FALSE);
-    EINA_SAFETY_ON_NULL_RETURN_VAL(unreachable_uri, EINA_FALSE);
+    EINA_SAFETY_ON_NULL_RETURN_VAL(unreachableUri, EINA_FALSE);
     return _ewk_frame_contents_set_internal
-               (sd, contents, contents_size, mime_type, encoding, base_uri,
-               unreachable_uri);
-}
-
-Eina_Bool ewk_frame_script_execute(Evas_Object* o, const char* script)
-{
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+               (sd, contents, contentsSize, mimeType, encoding, baseUri,
+               unreachableUri);
+}
+
+Eina_Bool ewk_frame_script_execute(Evas_Object* ewkFrame, const char* script)
+{
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, EINA_FALSE);
     EINA_SAFETY_ON_FALSE_RETURN_VAL(sd->frame, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(script, EINA_FALSE);
@@ -438 +436 @@
 }
 
-Eina_Bool ewk_frame_editable_get(const Evas_Object* o)
-{
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_frame_editable_get(const Evas_Object* ewkFrame)
+{
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, EINA_FALSE);
     return sd->editable;
 }
 
-Eina_Bool ewk_frame_editable_set(Evas_Object* o, Eina_Bool editable)
-{
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_frame_editable_set(Evas_Object* ewkFrame, Eina_Bool editable)
+{
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, EINA_FALSE);
     editable = !!editable;
@@ -457 +455 @@
 }
 
-char* ewk_frame_selection_get(const Evas_Object* o)
-{
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd, 0);
+char* ewk_frame_selection_get(const Evas_Object* ewkFrame)
+{
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, 0);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, 0);
     WTF::CString s = sd->frame->editor()->selectedText().utf8();
@@ -467 +465 @@
 }
 
-Eina_Bool ewk_frame_text_search(const Evas_Object* o, const char* string, Eina_Bool case_sensitive, Eina_Bool forward, Eina_Bool wrap)
-{
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
-    EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, EINA_FALSE);
-    EINA_SAFETY_ON_NULL_RETURN_VAL(string, EINA_FALSE);
-
-    return sd->frame->editor()->findString(WTF::String::fromUTF8(string), forward, case_sensitive, wrap, true);
-}
-
-unsigned int ewk_frame_text_matches_mark(Evas_Object* o, const char* string, Eina_Bool case_sensitive, Eina_Bool highlight, unsigned int limit)
-{
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd, 0);
+Eina_Bool ewk_frame_text_search(const Evas_Object* ewkFrame, const char* text, Eina_Bool caseSensitive, Eina_Bool forward, Eina_Bool wrap)
+{
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, EINA_FALSE);
+    EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, EINA_FALSE);
+    EINA_SAFETY_ON_NULL_RETURN_VAL(text, EINA_FALSE);
+
+    return sd->frame->editor()->findString(WTF::String::fromUTF8(text), forward, caseSensitive, wrap, true);
+}
+
+unsigned int ewk_frame_text_matches_mark(Evas_Object* ewkFrame, const char* string, Eina_Bool caseSensitive, Eina_Bool highlight, unsigned int limit)
+{
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, 0);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(string, 0);
 
     sd->frame->editor()->setMarkedTextMatchesAreHighlighted(highlight);
-    return sd->frame->editor()->countMatchesForText(WTF::String::fromUTF8(string), case_sensitive, limit, true);
-}
-
-Eina_Bool ewk_frame_text_matches_unmark_all(Evas_Object* o)
-{
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+    return sd->frame->editor()->countMatchesForText(WTF::String::fromUTF8(string), caseSensitive, limit, true);
+}
+
+Eina_Bool ewk_frame_text_matches_unmark_all(Evas_Object* ewkFrame)
+{
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, EINA_FALSE);
 
@@ -495 +493 @@
 }
 
-Eina_Bool ewk_frame_text_matches_highlight_set(Evas_Object* o, Eina_Bool highlight)
-{
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_frame_text_matches_highlight_set(Evas_Object* ewkFrame, Eina_Bool highlight)
+{
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, EINA_FALSE);
     sd->frame->editor()->setMarkedTextMatchesAreHighlighted(highlight);
@@ -503 +501 @@
 }
 
-Eina_Bool ewk_frame_text_matches_highlight_get(const Evas_Object* o)
-{
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_frame_text_matches_highlight_get(const Evas_Object* ewkFrame)
+{
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, EINA_FALSE);
     return sd->frame->editor()->markedTextMatchesAreHighlighted();
@@ -513 +511 @@
  * Comparison function used by ewk_frame_text_matches_nth_pos_get
  */
-static bool _ewk_frame_rect_cmp_less_than(const WebCore::IntRect& i, const WebCore::IntRect& j)
-{
-    return (i.y() < j.y() || (i.y() == j.y() && i.x() < j.x()));
+static bool _ewk_frame_rect_cmp_less_than(const WebCore::IntRect& begin, const WebCore::IntRect& end)
+{
+    return (begin.y() < end.y() || (begin.y() == end.y() && begin.x() < end.x()));
 }
 
@@ -521 +519 @@
  * Predicate used by ewk_frame_text_matches_nth_pos_get
  */
-static bool _ewk_frame_rect_is_negative_value(const WebCore::IntRect& i)
-{
-    return (i.x() < 0 || i.y() < 0);
-}
-
-Eina_Bool ewk_frame_text_matches_nth_pos_get(const Evas_Object* o, size_t n, int* x, int* y)
-{
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+static bool _ewk_frame_rect_is_negative_value(const WebCore::IntRect& rect)
+{
+    return (rect.x() < 0 || rect.y() < 0);
+}
+
+Eina_Bool ewk_frame_text_matches_nth_pos_get(const Evas_Object* ewkFrame, size_t number, int* x, int* y)
+{
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, EINA_FALSE);
 
@@ -536 +534 @@
     std::remove_if(intRects.begin(), intRects.end(), _ewk_frame_rect_is_negative_value);
 
-    if (intRects.isEmpty() || n > intRects.size())
+    if (intRects.isEmpty() || number > intRects.size())
         return EINA_FALSE;
 
@@ -542 +540 @@
 
     if (x)
-        *x = intRects[n - 1].x();
+        *x = intRects[number - 1].x();
     if (y)
-        *y = intRects[n - 1].y();
-    return EINA_TRUE;
-}
-
-Eina_Bool ewk_frame_stop(Evas_Object* o)
-{
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+        *y = intRects[number - 1].y();
+    return EINA_TRUE;
+}
+
+Eina_Bool ewk_frame_stop(Evas_Object* ewkFrame)
+{
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, EINA_FALSE);
     sd->frame->loader()->stopAllLoaders();
@@ -556 +554 @@
 }
 
-Eina_Bool ewk_frame_reload(Evas_Object* o)
-{
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_frame_reload(Evas_Object* ewkFrame)
+{
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, EINA_FALSE);
     sd->frame->loader()->reload();
@@ -564 +562 @@
 }
 
-Eina_Bool ewk_frame_reload_full(Evas_Object* o)
-{
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_frame_reload_full(Evas_Object* ewkFrame)
+{
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, EINA_FALSE);
     sd->frame->loader()->reload(true);
@@ -572 +570 @@
 }
 
-Eina_Bool ewk_frame_back(Evas_Object* o)
-{
-    return ewk_frame_navigate(o, -1);
-}
-
-Eina_Bool ewk_frame_forward(Evas_Object* o)
-{
-    return ewk_frame_navigate(o, 1);
-}
-
-Eina_Bool ewk_frame_navigate(Evas_Object* o, int steps)
-{
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_frame_back(Evas_Object* ewkFrame)
+{
+    return ewk_frame_navigate(ewkFrame, -1);
+}
+
+Eina_Bool ewk_frame_forward(Evas_Object* ewkFrame)
+{
+    return ewk_frame_navigate(ewkFrame, 1);
+}
+
+Eina_Bool ewk_frame_navigate(Evas_Object* ewkFrame, int steps)
+{
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, EINA_FALSE);
     WebCore::Page* page = sd->frame->page();
@@ -593 +591 @@
 }
 
-Eina_Bool ewk_frame_back_possible(Evas_Object* o)
-{
-    return ewk_frame_navigate_possible(o, -1);
-}
-
-Eina_Bool ewk_frame_forward_possible(Evas_Object* o)
-{
-    return ewk_frame_navigate_possible(o, 1);
-}
-
-Eina_Bool ewk_frame_navigate_possible(Evas_Object* o, int steps)
-{
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_frame_back_possible(Evas_Object* ewkFrame)
+{
+    return ewk_frame_navigate_possible(ewkFrame, -1);
+}
+
+Eina_Bool ewk_frame_forward_possible(Evas_Object* ewkFrame)
+{
+    return ewk_frame_navigate_possible(ewkFrame, 1);
+}
+
+Eina_Bool ewk_frame_navigate_possible(Evas_Object* ewkFrame, int steps)
+{
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, EINA_FALSE);
     WebCore::Page* page = sd->frame->page();
@@ -641 +639 @@
 }
 
-void ewk_frame_hit_test_free(Ewk_Hit_Test* hit_test)
-{
-    EINA_SAFETY_ON_NULL_RETURN(hit_test);
-    eina_stringshare_del(hit_test->title);
-    eina_stringshare_del(hit_test->alternate_text);
-    eina_stringshare_del(hit_test->link.text);
-    eina_stringshare_del(hit_test->link.url);
-    eina_stringshare_del(hit_test->link.title);
-    eina_stringshare_del(hit_test->image_uri);
-    eina_stringshare_del(hit_test->media_uri);
-    free(hit_test);
-}
-
-Ewk_Hit_Test* ewk_frame_hit_test_new(const Evas_Object* o, int x, int y)
-{
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd, 0);
+void ewk_frame_hit_test_free(Ewk_Hit_Test* hitTest)
+{
+    EINA_SAFETY_ON_NULL_RETURN(hitTest);
+    eina_stringshare_del(hitTest->title);
+    eina_stringshare_del(hitTest->alternate_text);
+    eina_stringshare_del(hitTest->link.text);
+    eina_stringshare_del(hitTest->link.url);
+    eina_stringshare_del(hitTest->link.title);
+    eina_stringshare_del(hitTest->image_uri);
+    eina_stringshare_del(hitTest->media_uri);
+    free(hitTest);
+}
+
+Ewk_Hit_Test* ewk_frame_hit_test_new(const Evas_Object* ewkFrame, int x, int y)
+{
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, 0);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, 0);
 
@@ -727 +725 @@
 
 Eina_Bool
-ewk_frame_scroll_add(Evas_Object* o, int dx, int dy)
-{
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+ewk_frame_scroll_add(Evas_Object* ewkFrame, int deltaX, int deltaY)
+{
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame->view(), EINA_FALSE);
-    sd->frame->view()->scrollBy(WebCore::IntSize(dx, dy));
+    sd->frame->view()->scrollBy(WebCore::IntSize(deltaX, deltaY));
     return EINA_TRUE;
 }
 
 Eina_Bool
-ewk_frame_scroll_set(Evas_Object* o, int x, int y)
-{
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+ewk_frame_scroll_set(Evas_Object* ewkFrame, int x, int y)
+{
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame->view(), EINA_FALSE);
@@ -747 +745 @@
 
 Eina_Bool
-ewk_frame_scroll_size_get(const Evas_Object* o, int* w, int* h)
-{
-    if (w)
-        *w = 0;
-    if (h)
-        *h = 0;
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+ewk_frame_scroll_size_get(const Evas_Object* ewkFrame, int* width, int* height)
+{
+    if (width)
+        *width = 0;
+    if (height)
+        *height = 0;
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame->view(), EINA_FALSE);
     WebCore::IntPoint point = sd->frame->view()->maximumScrollPosition();
-    if (w)
-        *w = point.x();
-    if (h)
-        *h = point.y();
+    if (width)
+        *width = point.x();
+    if (height)
+        *height = point.y();
     return EINA_TRUE;
 }
 
 Eina_Bool
-ewk_frame_scroll_pos_get(const Evas_Object* o, int* x, int* y)
+ewk_frame_scroll_pos_get(const Evas_Object* ewkFrame, int* x, int* y)
 {
     if (x)
@@ -771 +769 @@
     if (y)
         *y = 0;
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame->view(), EINA_FALSE);
@@ -782 +780 @@
 }
 
-Eina_Bool ewk_frame_visible_content_geometry_get(const Evas_Object* o, Eina_Bool include_scrollbars, int* x, int* y, int* w, int* h)
+Eina_Bool ewk_frame_visible_content_geometry_get(const Evas_Object* ewkFrame, Eina_Bool includeScrollbars, int* x, int* y, int* width, int* height)
 {
     if (x)
@@ -788 +786 @@
     if (y)
         *y = 0;
-    if (w)
-        *w = 0;
-    if (h)
-        *h = 0;
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+    if (width)
+        *width = 0;
+    if (height)
+        *height = 0;
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame->view(), EINA_FALSE);
-    WebCore::IntRect rect = sd->frame->view()->visibleContentRect(include_scrollbars);
+    WebCore::IntRect rect = sd->frame->view()->visibleContentRect(includeScrollbars);
     if (x)
         *x = rect.x();
     if (y)
         *y = rect.y();
-    if (w)
-        *w = rect.width();
-    if (h)
-        *h = rect.height();
-    return EINA_TRUE;
-}
-
-Eina_Bool ewk_frame_paint_full_get(const Evas_Object* o)
-{
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+    if (width)
+        *width = rect.width();
+    if (height)
+        *height = rect.height();
+    return EINA_TRUE;
+}
+
+Eina_Bool ewk_frame_paint_full_get(const Evas_Object* ewkFrame)
+{
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame->view(), EINA_FALSE);
@@ -815 +813 @@
 }
 
-void ewk_frame_paint_full_set(Evas_Object* o, Eina_Bool flag)
-{
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd);
+void ewk_frame_paint_full_set(Evas_Object* ewkFrame, Eina_Bool flag)
+{
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd);
     EINA_SAFETY_ON_NULL_RETURN(sd->frame);
     EINA_SAFETY_ON_NULL_RETURN(sd->frame->view());
@@ -823 +821 @@
 }
 
-Eina_Bool ewk_frame_feed_focus_in(Evas_Object* o)
-{
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_frame_feed_focus_in(Evas_Object* ewkFrame)
+{
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, EINA_FALSE);
     WebCore::FocusController* c = sd->frame->page()->focusController();
@@ -832 +830 @@
 }
 
-Eina_Bool ewk_frame_feed_focus_out(Evas_Object* o)
+Eina_Bool ewk_frame_feed_focus_out(Evas_Object* ewkFrame)
 {
     // TODO: what to do on focus out?
@@ -839 +837 @@
 }
 
-Eina_Bool ewk_frame_feed_mouse_wheel(Evas_Object* o, const Evas_Event_Mouse_Wheel* ev)
-{
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
-    EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, EINA_FALSE);
-    EINA_SAFETY_ON_NULL_RETURN_VAL(ev, EINA_FALSE);
+Eina_Bool ewk_frame_feed_mouse_wheel(Evas_Object* ewkFrame, const Evas_Event_Mouse_Wheel* wheelEvent)
+{
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, EINA_FALSE);
+    EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, EINA_FALSE);
+    EINA_SAFETY_ON_NULL_RETURN_VAL(wheelEvent, EINA_FALSE);
 
     WebCore::FrameView* view = sd->frame->view();
-    DBG("o=%p, view=%p, direction=%d, z=%d, pos=%d,%d",
-        o, view, ev->direction, ev->z, ev->canvas.x, ev->canvas.y);
+    DBG("ewkFrame=%p, view=%p, direction=%d, z=%d, pos=%d,%d",
+        ewkFrame, view, wheelEvent->direction, wheelEvent->z, wheelEvent->canvas.x, wheelEvent->canvas.y);
     EINA_SAFETY_ON_NULL_RETURN_VAL(view, EINA_FALSE);
 
-    WebCore::PlatformWheelEvent event(ev);
+    WebCore::PlatformWheelEvent event(wheelEvent);
     return sd->frame->eventHandler()->handleWheelEvent(event);
 }
 
-Eina_Bool ewk_frame_feed_mouse_down(Evas_Object* o, const Evas_Event_Mouse_Down* ev)
-{
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
-    EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, EINA_FALSE);
-    EINA_SAFETY_ON_NULL_RETURN_VAL(ev, EINA_FALSE);
+Eina_Bool ewk_frame_feed_mouse_down(Evas_Object* ewkFrame, const Evas_Event_Mouse_Down* downEvent)
+{
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, EINA_FALSE);
+    EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, EINA_FALSE);
+    EINA_SAFETY_ON_NULL_RETURN_VAL(downEvent, EINA_FALSE);
 
     WebCore::FrameView* view = sd->frame->view();
-    DBG("o=%p, view=%p, button=%d, pos=%d,%d",
-        o, view, ev->button, ev->canvas.x, ev->canvas.y);
+    DBG("ewkFrame=%p, view=%p, button=%d, pos=%d,%d",
+        ewkFrame, view, downEvent->button, downEvent->canvas.x, downEvent->canvas.y);
     EINA_SAFETY_ON_NULL_RETURN_VAL(view, EINA_FALSE);
 
@@ -868 +866 @@
     evas_object_geometry_get(sd->view, &x, &y, 0, 0);
 
-    WebCore::PlatformMouseEvent event(ev, WebCore::IntPoint(x, y));
+    WebCore::PlatformMouseEvent event(downEvent, WebCore::IntPoint(x, y));
     return sd->frame->eventHandler()->handleMousePressEvent(event);
 }
 
-Eina_Bool ewk_frame_feed_mouse_up(Evas_Object* o, const Evas_Event_Mouse_Up* ev)
-{
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
-    EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, EINA_FALSE);
-    EINA_SAFETY_ON_NULL_RETURN_VAL(ev, EINA_FALSE);
+Eina_Bool ewk_frame_feed_mouse_up(Evas_Object* ewkFrame, const Evas_Event_Mouse_Up* upEvent)
+{
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, EINA_FALSE);
+    EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, EINA_FALSE);
+    EINA_SAFETY_ON_NULL_RETURN_VAL(upEvent, EINA_FALSE);
 
     WebCore::FrameView* view = sd->frame->view();
-    DBG("o=%p, view=%p, button=%d, pos=%d,%d",
-        o, view, ev->button, ev->canvas.x, ev->canvas.y);
+    DBG("ewkFrame=%p, view=%p, button=%d, pos=%d,%d",
+        ewkFrame, view, upEvent->button, upEvent->canvas.x, upEvent->canvas.y);
     EINA_SAFETY_ON_NULL_RETURN_VAL(view, EINA_FALSE);
 
@@ -886 +884 @@
     evas_object_geometry_get(sd->view, &x, &y, 0, 0);
 
-    WebCore::PlatformMouseEvent event(ev, WebCore::IntPoint(x, y));
+    WebCore::PlatformMouseEvent event(upEvent, WebCore::IntPoint(x, y));
     return sd->frame->eventHandler()->handleMouseReleaseEvent(event);
 }
 
-Eina_Bool ewk_frame_feed_mouse_move(Evas_Object* o, const Evas_Event_Mouse_Move* ev)
-{
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
-    EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, EINA_FALSE);
-    EINA_SAFETY_ON_NULL_RETURN_VAL(ev, EINA_FALSE);
+Eina_Bool ewk_frame_feed_mouse_move(Evas_Object* ewkFrame, const Evas_Event_Mouse_Move* moveEvent)
+{
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, EINA_FALSE);
+    EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, EINA_FALSE);
+    EINA_SAFETY_ON_NULL_RETURN_VAL(moveEvent, EINA_FALSE);
 
     WebCore::FrameView* view = sd->frame->view();
-    DBG("o=%p, view=%p, pos: old=%d,%d, new=%d,%d, buttons=%d",
-        o, view, ev->cur.canvas.x, ev->cur.canvas.y,
-        ev->prev.canvas.x, ev->prev.canvas.y, ev->buttons);
+    DBG("ewkFrame=%p, view=%p, pos: old=%d,%d, new=%d,%d, buttons=%d",
+        ewkFrame, view, moveEvent->cur.canvas.x, moveEvent->cur.canvas.y,
+        moveEvent->prev.canvas.x, moveEvent->prev.canvas.y, moveEvent->buttons);
     EINA_SAFETY_ON_NULL_RETURN_VAL(view, EINA_FALSE);
 
@@ -905 +903 @@
     evas_object_geometry_get(sd->view, &x, &y, 0, 0);
 
-    WebCore::PlatformMouseEvent event(ev, WebCore::IntPoint(x, y));
+    WebCore::PlatformMouseEvent event(moveEvent, WebCore::IntPoint(x, y));
     return sd->frame->eventHandler()->mouseMoved(event);
 }
 
-Eina_Bool ewk_frame_feed_touch_event(Evas_Object* o, Ewk_Touch_Event_Type action, Eina_List* points, int metaState)
+Eina_Bool ewk_frame_feed_touch_event(Evas_Object* ewkFrame, Ewk_Touch_Event_Type action, Eina_List* points, int metaState)
 {
     Eina_Bool ret = EINA_FALSE;
@@ -915 +913 @@
 #if ENABLE(TOUCH_EVENTS)
     EINA_SAFETY_ON_NULL_RETURN_VAL(points, EINA_FALSE);
-    EWK_FRAME_SD_GET(o, sd);
+    EWK_FRAME_SD_GET(ewkFrame, sd);
 
     if (!sd || !sd->frame || !ewk_view_need_touch_events_get(sd->view))
@@ -947 +945 @@
 }
 
-static inline Eina_Bool _ewk_frame_handle_key_scrolling(WebCore::Frame* frame, const WebCore::PlatformKeyboardEvent& event)
+static inline Eina_Bool _ewk_frame_handle_key_scrolling(WebCore::Frame* frame, const WebCore::PlatformKeyboardEvent& keyEvent)
 {
     WebCore::ScrollDirection direction;
     WebCore::ScrollGranularity granularity;
 
-    int keyCode = event.windowsVirtualKeyCode();
+    int keyCode = keyEvent.windowsVirtualKeyCode();
 
     switch (keyCode) {
     case VK_SPACE:
         granularity = WebCore::ScrollByPage;
-        if (event.shiftKey())
+        if (keyEvent.shiftKey())
             direction = WebCore::ScrollUp;
         else
@@ -988 +986 @@
     case VK_UP:
         direction = WebCore::ScrollUp;
-        if (event.ctrlKey())
+        if (keyEvent.ctrlKey())
             granularity = WebCore::ScrollByDocument;
         else
@@ -995 +993 @@
     case VK_DOWN:
         direction = WebCore::ScrollDown;
-        if (event.ctrlKey())
+        if (keyEvent.ctrlKey())
             granularity = WebCore::ScrollByDocument;
         else
@@ -1011 +1009 @@
 }
 
-Eina_Bool ewk_frame_feed_key_down(Evas_Object* o, const Evas_Event_Key_Down* ev)
-{
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
-    EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, EINA_FALSE);
-    EINA_SAFETY_ON_NULL_RETURN_VAL(ev, EINA_FALSE);
-
-    DBG("o=%p keyname=%s (key=%s, string=%s)",
-        o, ev->keyname, ev->key ? ev->key : "", ev->string ? ev->string : "");
-
-    WebCore::PlatformKeyboardEvent event(ev);
+Eina_Bool ewk_frame_feed_key_down(Evas_Object* ewkFrame, const Evas_Event_Key_Down* downEvent)
+{
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, EINA_FALSE);
+    EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, EINA_FALSE);
+    EINA_SAFETY_ON_NULL_RETURN_VAL(downEvent, EINA_FALSE);
+
+    DBG("ewkFrame=%p keyname=%s (key=%s, string=%s)",
+        ewkFrame, downEvent->keyname, downEvent->key ? downEvent->key : "", downEvent->string ? downEvent->string : "");
+
+    WebCore::PlatformKeyboardEvent event(downEvent);
     if (sd->frame->eventHandler()->keyEvent(event))
         return EINA_TRUE;
@@ -1027 +1025 @@
 }
 
-Eina_Bool ewk_frame_feed_key_up(Evas_Object* o, const Evas_Event_Key_Up* ev)
-{
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
-    EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, EINA_FALSE);
-    EINA_SAFETY_ON_NULL_RETURN_VAL(ev, EINA_FALSE);
-
-    DBG("o=%p keyname=%s (key=%s, string=%s)",
-        o, ev->keyname, ev->key ? ev->key : "", ev->string ? ev->string : "");
-
-    WebCore::PlatformKeyboardEvent event(ev);
+Eina_Bool ewk_frame_feed_key_up(Evas_Object* ewkFrame, const Evas_Event_Key_Up* upEvent)
+{
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, EINA_FALSE);
+    EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, EINA_FALSE);
+    EINA_SAFETY_ON_NULL_RETURN_VAL(upEvent, EINA_FALSE);
+
+    DBG("ewkFrame=%p keyname=%s (key=%s, string=%s)",
+        ewkFrame, upEvent->keyname, upEvent->key ? upEvent->key : "", upEvent->string ? upEvent->string : "");
+
+    WebCore::PlatformKeyboardEvent event(upEvent);
     return sd->frame->eventHandler()->keyEvent(event);
 }
 
-Ewk_Text_Selection_Type ewk_frame_text_selection_type_get(const Evas_Object* o)
-{
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EWK_TEXT_SELECTION_NONE);
+Ewk_Text_Selection_Type ewk_frame_text_selection_type_get(const Evas_Object* ewkFrame)
+{
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, EWK_TEXT_SELECTION_NONE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, EWK_TEXT_SELECTION_NONE);
 
@@ -1070 +1068 @@
  * frame.
  *
- * @param e canvas where to create the frame object
+ * @param canvas canvas where to create the frame object
  *
  * @return a new frame object or @c 0 on failure
  */
-Evas_Object* ewk_frame_add(Evas* e)
-{
-    return evas_object_smart_add(e, _ewk_frame_smart_class_new());
+Evas_Object* ewk_frame_add(Evas* canvas)
+{
+    return evas_object_smart_add(canvas, _ewk_frame_smart_class_new());
 }
 
@@ -1086 +1084 @@
  * This is internal and should never be called by external users.
  */
-Eina_Bool ewk_frame_init(Evas_Object* o, Evas_Object* view, WebCore::Frame* frame)
-{
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_frame_init(Evas_Object* ewkFrame, Evas_Object* view, WebCore::Frame* frame)
+{
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, EINA_FALSE);
     if (!sd->frame) {
         WebCore::FrameLoaderClientEfl* flc = _ewk_frame_loader_efl_get(frame);
-        flc->setWebFrame(o);
+        flc->setWebFrame(ewkFrame);
         sd->frame = frame;
         sd->view = view;
@@ -1099 +1097 @@
 
     ERR("frame %p already set for %p, ignored new %p",
-        sd->frame, o, frame);
+        sd->frame, ewkFrame, frame);
     return EINA_FALSE;
 }
@@ -1108 +1106 @@
  * Adds child to the frame.
  */
-Eina_Bool ewk_frame_child_add(Evas_Object* o, WTF::PassRefPtr<WebCore::Frame> child, const WTF::String& name, const WebCore::KURL& url, const WTF::String& referrer)
-{
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd, 0);
+Eina_Bool ewk_frame_child_add(Evas_Object* ewkFrame, WTF::PassRefPtr<WebCore::Frame> child, const WTF::String& name, const WebCore::KURL& url, const WTF::String& referrer)
+{
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, 0);
     char buf[256];
     Evas_Object* frame;
@@ -1134 +1132 @@
     snprintf(buf, sizeof(buf), "EWK_Frame:child/%s", name.utf8().data());
     evas_object_name_set(frame, buf);
-    evas_object_smart_member_add(frame, o);
+    evas_object_smart_member_add(frame, ewkFrame);
     evas_object_show(frame);
 
@@ -1163 +1161 @@
  * @param newParent The new view that will be set as the parent of the frame.
  */
-void ewk_frame_view_set(Evas_Object* o, Evas_Object* newParent)
-{
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd);
-
-    evas_object_smart_member_del(o);
-    evas_object_smart_member_add(o, newParent);
+void ewk_frame_view_set(Evas_Object* ewkFrame, Evas_Object* newParent)
+{
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd);
+
+    evas_object_smart_member_del(ewkFrame);
+    evas_object_smart_member_add(ewkFrame, newParent);
 
     sd->view = newParent;
@@ -1177 +1175 @@
  * Frame was destroyed by loader, remove internal reference.
  */
-void ewk_frame_core_gone(Evas_Object* o)
-{
-    DBG("o=%p", o);
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd);
+void ewk_frame_core_gone(Evas_Object* ewkFrame)
+{
+    DBG("ewkFrame=%p", ewkFrame);
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd);
     sd->frame = 0;
 }
@@ -1191 +1189 @@
  * actions instead.
  */
-WebCore::Frame* ewk_frame_core_get(const Evas_Object* o)
-{
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd, 0);
+WebCore::Frame* ewk_frame_core_get(const Evas_Object* ewkFrame)
+{
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, 0);
     return sd->frame;
 }
@@ -1210 +1208 @@
  * Emits signal: "resource,request,willsend"
  */
-void ewk_frame_request_will_send(Evas_Object* o, Ewk_Frame_Resource_Request* request)
-{
-    evas_object_smart_callback_call(o, "resource,request,willsend", request);
+void ewk_frame_request_will_send(Evas_Object* ewkFrame, Ewk_Frame_Resource_Request* request)
+{
+    evas_object_smart_callback_call(ewkFrame, "resource,request,willsend", request);
 }
 
@@ -1224 +1222 @@
  * Emits signal: "resource,request,new"
  */
-void ewk_frame_request_assign_identifier(Evas_Object* o, const Ewk_Frame_Resource_Request* request)
-{
-    evas_object_smart_callback_call(o, "resource,request,new", (void*)request);
+void ewk_frame_request_assign_identifier(Evas_Object* ewkFrame, const Ewk_Frame_Resource_Request* request)
+{
+    evas_object_smart_callback_call(ewkFrame, "resource,request,new", (void*)request);
 }
 
@@ -1237 +1235 @@
  * Emits signal: "navigation,first"
  */
-void ewk_frame_did_perform_first_navigation(Evas_Object* o)
-{
-    evas_object_smart_callback_call(o, "navigation,first", 0);
+void ewk_frame_did_perform_first_navigation(Evas_Object* ewkFrame)
+{
+    evas_object_smart_callback_call(ewkFrame, "navigation,first", 0);
 }
 
@@ -1251 +1249 @@
  * Emits signal: "state,save"
  */
-void ewk_frame_view_state_save(Evas_Object* o, WebCore::HistoryItem* item)
-{
-    evas_object_smart_callback_call(o, "state,save", 0);
+void ewk_frame_view_state_save(Evas_Object* ewkFrame, WebCore::HistoryItem* item)
+{
+    evas_object_smart_callback_call(ewkFrame, "state,save", 0);
 }
 
@@ -1262 +1260 @@
  * Emits signal: "load,started" with no parameters.
  */
-void ewk_frame_load_started(Evas_Object* o)
+void ewk_frame_load_started(Evas_Object* ewkFrame)
 {
     Evas_Object* main_frame;
-    DBG("o=%p", o);
-    evas_object_smart_callback_call(o, "load,started", 0);
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd);
+    DBG("ewkFrame=%p", ewkFrame);
+    evas_object_smart_callback_call(ewkFrame, "load,started", 0);
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd);
     ewk_view_load_started(sd->view);
 
     main_frame = ewk_view_frame_main_get(sd->view);
-    if (main_frame == o)
+    if (main_frame == ewkFrame)
         ewk_view_frame_main_load_started(sd->view);
 }
@@ -1283 +1281 @@
  * Emits signal: "load,provisional" with no parameters.
  */
-void ewk_frame_load_provisional(Evas_Object* o)
-{
-    evas_object_smart_callback_call(o, "load,provisional", 0);
+void ewk_frame_load_provisional(Evas_Object* ewkFrame)
+{
+    evas_object_smart_callback_call(ewkFrame, "load,provisional", 0);
 }
 
@@ -1296 +1294 @@
  * Emits signal: "load,firstlayout,finished" with no parameters.
  */
-void ewk_frame_load_firstlayout_finished(Evas_Object* o)
-{
-    evas_object_smart_callback_call(o, "load,firstlayout,finished", 0);
+void ewk_frame_load_firstlayout_finished(Evas_Object* ewkFrame)
+{
+    evas_object_smart_callback_call(ewkFrame, "load,firstlayout,finished", 0);
 }
 
@@ -1309 +1307 @@
  * Emits signal: "load,nonemptylayout,finished" with no parameters.
  */
-void ewk_frame_load_firstlayout_nonempty_finished(Evas_Object* o)
-{
-    evas_object_smart_callback_call(o, "load,nonemptylayout,finished", 0);
+void ewk_frame_load_firstlayout_nonempty_finished(Evas_Object* ewkFrame)
+{
+    evas_object_smart_callback_call(ewkFrame, "load,nonemptylayout,finished", 0);
 }
 
@@ -1322 +1320 @@
  * Emits signal: "load,document,finished" with no parameters.
  */
-void ewk_frame_load_document_finished(Evas_Object* o)
-{
-    evas_object_smart_callback_call(o, "load,document,finished", 0);
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd);
-    ewk_view_load_document_finished(sd->view, o);
+void ewk_frame_load_document_finished(Evas_Object* ewkFrame)
+{
+    evas_object_smart_callback_call(ewkFrame, "load,document,finished", 0);
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd);
+    ewk_view_load_document_finished(sd->view, ewkFrame);
 }
 
@@ -1339 +1337 @@
  *       compatible with previous WebKit.
  */
-void ewk_frame_load_finished(Evas_Object* o, const char* error_domain, int error_code, Eina_Bool is_cancellation, const char* error_description, const char* failing_url)
-{
-    Ewk_Frame_Load_Error buf, * error;
-    if (!error_domain) {
-        DBG("o=%p, success.", o);
+void ewk_frame_load_finished(Evas_Object* ewkFrame, const char* errorDomain, int errorCode, Eina_Bool isCancellation, const char* errorDescription, const char* failingUrl)
+{
+    Ewk_Frame_Load_Error buf, *error;
+    if (!errorDomain) {
+        DBG("ewkFrame=%p, success.", ewkFrame);
         error = 0;
     } else {
-        DBG("o=%p, error=%s (%d, cancellation=%hhu) \"%s\", url=%s",
-            o, error_domain, error_code, is_cancellation,
-            error_description, failing_url);
-
-        buf.domain = error_domain;
-        buf.code = error_code;
-        buf.is_cancellation = is_cancellation;
-        buf.description = error_description;
-        buf.failing_url = failing_url;
-        buf.frame = o;
+        DBG("ewkFrame=%p, error=%s (%d, cancellation=%hhu) \"%s\", url=%s",
+            ewkFrame, errorDomain, errorCode, isCancellation,
+            errorDescription, failingUrl);
+
+        buf.domain = errorDomain;
+        buf.code = errorCode;
+        buf.is_cancellation = isCancellation;
+        buf.description = errorDescription;
+        buf.failing_url = failingUrl;
+        buf.frame = ewkFrame;
         error = &buf;
     }
-    evas_object_smart_callback_call(o, "load,finished", error);
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd);
+    evas_object_smart_callback_call(ewkFrame, "load,finished", error);
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd);
     ewk_view_load_finished(sd->view, error);
 }
@@ -1369 +1367 @@
  * Emits signal: "load,error" with pointer to Ewk_Frame_Load_Error.
  */
-void ewk_frame_load_error(Evas_Object* o, const char* error_domain, int error_code, Eina_Bool is_cancellation, const char* error_description, const char* failing_url)
+void ewk_frame_load_error(Evas_Object* ewkFrame, const char* errorDomain, int errorCode, Eina_Bool isCancellation, const char* errorDescription, const char* failingUrl)
 {
     Ewk_Frame_Load_Error error;
 
-    DBG("o=%p, error=%s (%d, cancellation=%hhu) \"%s\", url=%s",
-        o, error_domain, error_code, is_cancellation,
-        error_description, failing_url);
-
-    EINA_SAFETY_ON_NULL_RETURN(error_domain);
-
-    error.code = error_code;
-    error.is_cancellation = is_cancellation;
-    error.domain = error_domain;
-    error.description = error_description;
-    error.failing_url = failing_url;
-    error.frame = o;
-    evas_object_smart_callback_call(o, "load,error", &error);
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd);
+    DBG("ewkFrame=%p, error=%s (%d, cancellation=%hhu) \"%s\", url=%s",
+        ewkFrame, errorDomain, errorCode, isCancellation,
+        errorDescription, failingUrl);
+
+    EINA_SAFETY_ON_NULL_RETURN(errorDomain);
+
+    error.code = errorCode;
+    error.is_cancellation = isCancellation;
+    error.domain = errorDomain;
+    error.description = errorDescription;
+    error.failing_url = failingUrl;
+    error.frame = ewkFrame;
+    evas_object_smart_callback_call(ewkFrame, "load,error", &error);
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd);
     ewk_view_load_error(sd->view, &error);
 }
@@ -1396 +1394 @@
  * Emits signal: "load,progress" with pointer to a double from 0.0 to 1.0.
  */
-void ewk_frame_load_progress_changed(Evas_Object* o)
-{
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd);
+void ewk_frame_load_progress_changed(Evas_Object* ewkFrame)
+{
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd);
     EINA_SAFETY_ON_NULL_RETURN(sd->frame);
 
@@ -1404 +1402 @@
     double progress = sd->frame->page()->progress()->estimatedProgress();
 
-    DBG("o=%p (p=%0.3f)", o, progress);
-
-    evas_object_smart_callback_call(o, "load,progress", &progress);
+    DBG("ewkFrame=%p (p=%0.3f)", ewkFrame, progress);
+
+    evas_object_smart_callback_call(ewkFrame, "load,progress", &progress);
     ewk_view_load_progress_changed(sd->view);
 }
@@ -1416 +1414 @@
  * Reports contents size changed.
  */
-void ewk_frame_contents_size_changed(Evas_Object* o, Evas_Coord w, Evas_Coord h)
-{
-    Evas_Coord size[2] = {w, h};
-    evas_object_smart_callback_call(o, "contents,size,changed", size);
+void ewk_frame_contents_size_changed(Evas_Object* ewkFrame, Evas_Coord width, Evas_Coord height)
+{
+    Evas_Coord size[2] = {width, height};
+    evas_object_smart_callback_call(ewkFrame, "contents,size,changed", size);
 }
 
@@ -1427 +1425 @@
  * Reports title changed.
  */
-void ewk_frame_title_set(Evas_Object* o, const char* title)
-{
-    DBG("o=%p, title=%s", o, title ? title : "(null)");
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd);
+void ewk_frame_title_set(Evas_Object* ewkFrame, const char* title)
+{
+    DBG("ewkFrame=%p, title=%s", ewkFrame, title ? title : "(null)");
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd);
     if (!eina_stringshare_replace(&sd->title, title))
         return;
-    evas_object_smart_callback_call(o, "title,changed", (void*)sd->title);
+    evas_object_smart_callback_call(ewkFrame, "title,changed", (void*)sd->title);
 }
 
@@ -1441 +1439 @@
  * Creates a view.
  */
-void ewk_frame_view_create_for_view(Evas_Object* o, Evas_Object* view)
-{
-    DBG("o=%p, view=%p", o, view);
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd);
+void ewk_frame_view_create_for_view(Evas_Object* ewkFrame, Evas_Object* view)
+{
+    DBG("ewkFrame=%p, view=%p", ewkFrame, view);
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd);
     EINA_SAFETY_ON_NULL_RETURN(sd->frame);
     Evas_Coord w, h;
@@ -1468 +1466 @@
     const char* theme = ewk_view_theme_get(view);
     sd->frame->view()->setEdjeTheme(theme);
-    sd->frame->view()->setEvasObject(o);
-}
-
-ssize_t ewk_frame_source_get(const Evas_Object* o, char** frame_source)
-{
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd, -1);
+    sd->frame->view()->setEvasObject(ewkFrame);
+}
+
+ssize_t ewk_frame_source_get(const Evas_Object* ewkFrame, char** frameSource)
+{
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, -1);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, -1);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame->document(), -1);
-    EINA_SAFETY_ON_NULL_RETURN_VAL(frame_source, -1);
+    EINA_SAFETY_ON_NULL_RETURN_VAL(frameSource, -1);
 
     WTF::String source;
-    *frame_source = 0; // Saves 0 to pointer until it's not allocated.
+    *frameSource = 0; // Saves 0 to pointer until it's not allocated.
 
     if (!sd->frame->document()->isHTMLDocument()) {
@@ -1509 +1507 @@
 
     size_t source_length = strlen(source.utf8().data());
-    *frame_source = static_cast<char*>(malloc(source_length + 1));
-    if (!*frame_source) {
+    *frameSource = static_cast<char*>(malloc(source_length + 1));
+    if (!*frameSource) {
         CRITICAL("Could not allocate memory.");
         return -1;
     }
 
-    strncpy(*frame_source, source.utf8().data(), source_length);
-    (*frame_source)[source_length] = '\0';
+    strncpy(*frameSource, source.utf8().data(), source_length);
+    (*frameSource)[source_length] = '\0';
 
     return source_length;
 }
 
-Eina_List* ewk_frame_resources_location_get(const Evas_Object* o)
-{
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd, 0);
+Eina_List* ewk_frame_resources_location_get(const Evas_Object* ewkFrame)
+{
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, 0);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, 0);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame->document(), 0);
@@ -1587 +1585 @@
  * Emits signal: "uri,changed" with new uri as parameter.
  */
-Eina_Bool ewk_frame_uri_changed(Evas_Object* o)
-{
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_frame_uri_changed(Evas_Object* ewkFrame)
+{
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, EINA_FALSE);
     WTF::CString uri(sd->frame->document()->url().string().utf8());
@@ -1600 +1598 @@
 
     eina_stringshare_replace(&sd->uri, uri.data());
-    evas_object_smart_callback_call(o, "uri,changed", (void*)sd->uri);
+    evas_object_smart_callback_call(ewkFrame, "uri,changed", (void*)sd->uri);
     return EINA_TRUE;
 }
@@ -1609 +1607 @@
  * Forces layout for frame.
  */
-void ewk_frame_force_layout(Evas_Object* o)
-{
-    DBG("o=%p", o);
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd);
+void ewk_frame_force_layout(Evas_Object* ewkFrame)
+{
+    DBG("ewkFrame=%p", ewkFrame);
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd);
     EINA_SAFETY_ON_NULL_RETURN(sd->frame);
     WebCore::FrameView* view = sd->frame->view();
@@ -1624 +1622 @@
  * Creates plugin.
  */
-WTF::PassRefPtr<WebCore::Widget> ewk_frame_plugin_create(Evas_Object* o, const WebCore::IntSize& pluginSize, WebCore::HTMLPlugInElement* element, const WebCore::KURL& url, const WTF::Vector<WTF::String>& paramNames, const WTF::Vector<WTF::String>& paramValues, const WTF::String& mimeType, bool loadManually)
+WTF::PassRefPtr<WebCore::Widget> ewk_frame_plugin_create(Evas_Object* ewkFrame, const WebCore::IntSize& pluginSize, WebCore::HTMLPlugInElement* element, const WebCore::KURL& url, const WTF::Vector<WTF::String>& paramNames, const WTF::Vector<WTF::String>& paramValues, const WTF::String& mimeType, bool loadManually)
 {
     return 0;
@@ -1637 +1635 @@
  * Emits signal: "editorclientselection,changed" with no parameters.
  */
-void ewk_frame_editor_client_selection_changed(Evas_Object* o)
-{
-    evas_object_smart_callback_call(o, "editorclient,selection,changed", 0);
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd);
+void ewk_frame_editor_client_selection_changed(Evas_Object* ewkFrame)
+{
+    evas_object_smart_callback_call(ewkFrame, "editorclient,selection,changed", 0);
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd);
     ewk_view_editor_client_selection_changed(sd->view);
 }
@@ -1652 +1650 @@
  * Emits signal: "editorclient,contents,changed" with no parameters.
  */
-void ewk_frame_editor_client_contents_changed(Evas_Object* o)
-{
-    evas_object_smart_callback_call(o, "editorclient,contents,changed", 0);
-    EWK_FRAME_SD_GET_OR_RETURN(o, sd);
+void ewk_frame_editor_client_contents_changed(Evas_Object* ewkFrame)
+{
+    evas_object_smart_callback_call(ewkFrame, "editorclient,contents,changed", 0);
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd);
     ewk_view_editor_client_contents_changed(sd->view);
 }

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

@@ -96 +96 @@
 }
 
-static inline Eina_List* _ewk_history_item_list_get(const WebCore::HistoryItemVector& core_items)
+static inline Eina_List* _ewk_history_item_list_get(const WebCore::HistoryItemVector& coreItems)
 {
     Eina_List* ret = 0;
     unsigned int i, size;
 
-    size = core_items.size();
+    size = coreItems.size();
     for (i = 0; i < size; i++) {
-        Ewk_History_Item* item = _ewk_history_item_new(core_items[i].get());
+        Ewk_History_Item* item = _ewk_history_item_new(coreItems[i].get());
         if (item)
             ret = eina_list_append(ret, item);

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

@@ -84 +84 @@
 
 // These methods are used by NPAI, thats the reason to use bool instead of Eina_Bool.
-static bool ewk_js_property_has(NPObject* np_obj, NPIdentifier name)
-{
-    Ewk_JS_Object* obj = reinterpret_cast<Ewk_JS_Object*>(np_obj);
-
-    EINA_SAFETY_ON_NULL_RETURN_VAL(np_obj, false);
+static bool ewk_js_property_has(NPObject* npObject, NPIdentifier name)
+{
+    Ewk_JS_Object* obj = reinterpret_cast<Ewk_JS_Object*>(npObject);
+
+    EINA_SAFETY_ON_NULL_RETURN_VAL(npObject, false);
     EINA_MAGIC_CHECK_OR_RETURN(obj, false);
 
@@ -103 +103 @@
 }
 
-static bool ewk_js_property_get(NPObject* np_obj, NPIdentifier name, NPVariant* result)
-{
-    Ewk_JS_Object* obj = reinterpret_cast<Ewk_JS_Object*>(np_obj);
+static bool ewk_js_property_get(NPObject* npObject, NPIdentifier name, NPVariant* result)
+{
+    Ewk_JS_Object* obj = reinterpret_cast<Ewk_JS_Object*>(npObject);
     Ewk_JS_Variant* value;
     Ewk_JS_Property* prop;
     bool fail = false;
 
-    EINA_SAFETY_ON_NULL_RETURN_VAL(np_obj, false);
+    EINA_SAFETY_ON_NULL_RETURN_VAL(npObject, false);
     EINA_MAGIC_CHECK_OR_RETURN(obj, false);
 
@@ -146 +146 @@
 }
 
-static bool ewk_js_property_set(NPObject* np_obj, NPIdentifier name, const NPVariant* np_value)
-{
-    Ewk_JS_Object* obj = reinterpret_cast<Ewk_JS_Object*>(np_obj);
+static bool ewk_js_property_set(NPObject* npObject, NPIdentifier name, const NPVariant* npValue)
+{
+    Ewk_JS_Object* obj = reinterpret_cast<Ewk_JS_Object*>(npObject);
     Ewk_JS_Variant* value;
     Ewk_JS_Property* prop;
     bool fail = false;
 
-    EINA_SAFETY_ON_NULL_RETURN_VAL(np_obj, false);
+    EINA_SAFETY_ON_NULL_RETURN_VAL(npObj, false);
     EINA_MAGIC_CHECK_OR_RETURN(obj, false);
 
@@ -167 +167 @@
     }
 
-    ewk_js_npvariant_to_variant(value, np_value);
+    ewk_js_npvariant_to_variant(value, npValue);
     char* prop_name = _NPN_UTF8FromIdentifier(name);
     prop = static_cast<Ewk_JS_Property*>(eina_hash_find(obj->cls->properties, prop_name));
@@ -184 +184 @@
 }
 
-static bool ewk_js_property_remove(NPObject* np_obj, NPIdentifier name)
-{
-    Ewk_JS_Object* obj = reinterpret_cast<Ewk_JS_Object*>(np_obj);
+static bool ewk_js_property_remove(NPObject* npObject, NPIdentifier name)
+{
+    Ewk_JS_Object* obj = reinterpret_cast<Ewk_JS_Object*>(npObject);
     Ewk_JS_Property* prop;
     bool fail = false;
 
-    EINA_SAFETY_ON_NULL_RETURN_VAL(np_obj, false);
+    EINA_SAFETY_ON_NULL_RETURN_VAL(npObject, false);
     EINA_MAGIC_CHECK_OR_RETURN(obj, false);
 
@@ -211 +211 @@
 }
 
-static bool ewk_js_properties_enumerate(NPObject* np_obj, NPIdentifier** value, uint32_t* count)
-{
-    Ewk_JS_Object* obj = reinterpret_cast<Ewk_JS_Object*>(np_obj);
+static bool ewk_js_properties_enumerate(NPObject* npObject, NPIdentifier** value, uint32_t* count)
+{
+    Ewk_JS_Object* obj = reinterpret_cast<Ewk_JS_Object*>(npObject);
     Eina_Iterator* it;
     char* key;
     int i = 0;
 
-    EINA_SAFETY_ON_NULL_RETURN_VAL(np_obj, false);
+    EINA_SAFETY_ON_NULL_RETURN_VAL(npObject, false);
     EINA_MAGIC_CHECK_OR_RETURN(obj, false);
 
@@ -236 +236 @@
 }
 
-static bool ewk_js_method_has(NPObject* np_obj, NPIdentifier name)
-{
-    Ewk_JS_Object* obj = reinterpret_cast<Ewk_JS_Object*>(np_obj);
-
-    EINA_SAFETY_ON_NULL_RETURN_VAL(np_obj, false);
+static bool ewk_js_method_has(NPObject* npObject, NPIdentifier name)
+{
+    Ewk_JS_Object* obj = reinterpret_cast<Ewk_JS_Object*>(npObject);
+
+    EINA_SAFETY_ON_NULL_RETURN_VAL(npObject, false);
     EINA_MAGIC_CHECK_OR_RETURN(obj, false);
 
@@ -250 +250 @@
 }
 
-static bool ewk_js_method_invoke(NPObject* np_obj, NPIdentifier name, const NPVariant* np_args, uint32_t np_arg_count, NPVariant* result)
-{
-    Ewk_JS_Object* obj = reinterpret_cast<Ewk_JS_Object*>(np_obj);
+static bool ewk_js_method_invoke(NPObject* npObject, NPIdentifier name, const NPVariant* npArgs, uint32_t npArgCount, NPVariant* result)
+{
+    Ewk_JS_Object* obj = reinterpret_cast<Ewk_JS_Object*>(npObject);
     Ewk_JS_Method* method;
     Ewk_JS_Variant* args;
     Ewk_JS_Variant* ret_val;
 
-    EINA_SAFETY_ON_NULL_RETURN_VAL(np_obj, false);
+    EINA_SAFETY_ON_NULL_RETURN_VAL(npObject, false);
     EINA_MAGIC_CHECK_OR_RETURN(obj, false);
 
@@ -269 +269 @@
         return false;
 
-    args = static_cast<Ewk_JS_Variant*>(malloc(sizeof(Ewk_JS_Variant)  *np_arg_count));
+    args = static_cast<Ewk_JS_Variant*>(malloc(sizeof(Ewk_JS_Variant)  *npArgCount));
     if (!args) {
         ERR("Could not allocate memory for ewk_js_variant");
@@ -275 +275 @@
     }
 
-    for (uint32_t i = 0; i < np_arg_count; i++)
-        ewk_js_npvariant_to_variant(&args[i], &np_args[i]);
-    ret_val = method->invoke(obj, args, np_arg_count);
+    for (uint32_t i = 0; i < npArgCount; i++)
+        ewk_js_npvariant_to_variant(&args[i], &npArgs[i]);
+    ret_val = method->invoke(obj, args, npArgCount);
     ewk_js_variant_to_npvariant(ret_val, result);
 
@@ -285 +285 @@
 }
 
-static Eina_Bool ewk_js_npobject_property_get(Ewk_JS_Object* obj, const char* name, Ewk_JS_Variant* value)
+static Eina_Bool ewk_js_npobject_property_get(Ewk_JS_Object* jsObject, const char* name, Ewk_JS_Variant* value)
 {
     NPIdentifier id = _NPN_GetStringIdentifier(name);
     NPVariant var;
-    bool fail = _NPN_GetProperty(0, reinterpret_cast<NPObject*>(obj), id, &var);
+    bool fail = _NPN_GetProperty(0, reinterpret_cast<NPObject*>(jsObject), id, &var);
     if (!fail)
         fail = ewk_js_npvariant_to_variant(value, &var);
@@ -295 +295 @@
 }
 
-static Eina_Bool ewk_js_npobject_property_set(Ewk_JS_Object* obj, const char* name, const Ewk_JS_Variant* value)
+static Eina_Bool ewk_js_npobject_property_set(Ewk_JS_Object* jsObject, const char* name, const Ewk_JS_Variant* value)
 {
     NPIdentifier id = _NPN_GetStringIdentifier(name);
@@ -301 +301 @@
     bool fail = ewk_js_variant_to_npvariant(value, &var);
     if (fail)
-        fail = _NPN_SetProperty(0, reinterpret_cast<NPObject*>(obj), id, &var);
+        fail = _NPN_SetProperty(0, reinterpret_cast<NPObject*>(jsObject), id, &var);
     return fail;
 }
 
-static Eina_Bool ewk_js_npobject_property_del(Ewk_JS_Object* obj, const char* name)
+static Eina_Bool ewk_js_npobject_property_del(Ewk_JS_Object* jsObject, const char* name)
 {
     NPIdentifier id = _NPN_GetStringIdentifier(name);
-    return _NPN_RemoveProperty(0, reinterpret_cast<NPObject*>(obj), id);
+    return _NPN_RemoveProperty(0, reinterpret_cast<NPObject*>(jsObject), id);
 }
 
@@ -328 +328 @@
  * @return The Ewk_JS_Class created.
  */
-Ewk_JS_Class* ewk_js_class_new(const Ewk_JS_Class_Meta* meta)
+Ewk_JS_Class* ewk_js_class_new(const Ewk_JS_Class_Meta* jsMetaClass)
 {
     Ewk_JS_Class* cls;
 
-    EINA_SAFETY_ON_NULL_RETURN_VAL(meta, 0);
+    EINA_SAFETY_ON_NULL_RETURN_VAL(jsMetaClass, 0);
 
     cls = static_cast<Ewk_JS_Class*>(malloc(sizeof(Ewk_JS_Class)));
@@ -340 +340 @@
     }
 
-    cls->meta = meta;
+    cls->meta = jsMetaClass;
     cls->default_prop = meta->default_prop;
 
@@ -365 +365 @@
  * @param cls @a Ewk_JS_Class to be released.
  */
-void ewk_js_class_free(Ewk_JS_Class* cls)
-{
-    EINA_SAFETY_ON_NULL_RETURN(cls);
-    eina_hash_free(cls->methods);
-    eina_hash_free(cls->properties);
-    free(cls);
+void ewk_js_class_free(Ewk_JS_Class* jsClass)
+{
+    EINA_SAFETY_ON_NULL_RETURN(jsClass);
+    eina_hash_free(jsClass->methods);
+    eina_hash_free(jsClass->properties);
+    free(jsClass);
 }
 
@@ -389 +389 @@
 };
 
-static Ewk_JS_Object* ewk_js_npobject_to_object(NPObject* np_obj)
+static Ewk_JS_Object* ewk_js_npobject_to_object(NPObject* npObject)
 {
     NPIdentifier* values;
@@ -399 +399 @@
     JavaScriptObject* jso;
 
-    if (EINA_MAGIC_CHECK(reinterpret_cast<Ewk_JS_Object*>(np_obj), EWK_JS_OBJECT_MAGIC))
-        return reinterpret_cast<Ewk_JS_Object*>(np_obj);
+    if (EINA_MAGIC_CHECK(reinterpret_cast<Ewk_JS_Object*>(npObject), EWK_JS_OBJECT_MAGIC))
+        return reinterpret_cast<Ewk_JS_Object*>(npObject);
 
     if (!_NPN_Enumerate(0, np_obj, &values, &np_props_count))
@@ -449 +449 @@
     obj->view = 0;
 
-    jso = reinterpret_cast<JavaScriptObject*>(np_obj);
+    jso = reinterpret_cast<JavaScriptObject*>(npObject);
     if (!strcmp("Array", jso->imp->className().ascii().data()))
         obj->type = EWK_JS_OBJECT_ARRAY;
@@ -470 +470 @@
 
     eina_iterator_free(it);
-    obj->base = *reinterpret_cast<JavaScriptObject*>(np_obj);
+    obj->base = *reinterpret_cast<JavaScriptObject*>(npObject);
 
     return obj;
@@ -526 +526 @@
 }
 
-Ewk_JS_Object* ewk_js_object_new(const Ewk_JS_Class_Meta* meta_cls)
+Ewk_JS_Object* ewk_js_object_new(const Ewk_JS_Class_Meta* jsMetaClass)
 {
     Ewk_JS_Object* obj;
@@ -539 +539 @@
 
     EINA_MAGIC_SET(obj, EWK_JS_OBJECT_MAGIC);
-    obj->cls = ewk_js_class_new(meta_cls);
+    obj->cls = ewk_js_class_new(jsMetaClass);
     obj->view = 0;
     obj->name = 0;
@@ -595 +595 @@
 }
 
-void ewk_js_object_free(Ewk_JS_Object* obj)
-{
-    EINA_SAFETY_ON_NULL_RETURN(obj);
-    EINA_MAGIC_CHECK_OR_RETURN(obj);
-    Eina_Bool script_obj = !obj->cls->meta;
-
-    eina_hash_free(obj->properties);
-    eina_stringshare_del(obj->name);
-
-    ewk_js_class_free(const_cast<Ewk_JS_Class*>(obj->cls));
-
-    EINA_MAGIC_SET(obj, EINA_MAGIC_NONE);
+void ewk_js_object_free(Ewk_JS_Object* jsObject)
+{
+    EINA_SAFETY_ON_NULL_RETURN(jsObject);
+    EINA_MAGIC_CHECK_OR_RETURN(jsObject);
+    Eina_Bool script_obj = !jsObject->cls->meta;
+
+    eina_hash_free(jsObject->properties);
+    eina_stringshare_del(jsObject->name);
+
+    ewk_js_class_free(const_cast<Ewk_JS_Class*>(jsObject->cls));
+
+    EINA_MAGIC_SET(jsObject, EINA_MAGIC_NONE);
 
     if (script_obj)
-        free(obj);
-}
-
-Eina_Hash* ewk_js_object_properties_get(const Ewk_JS_Object* obj)
-{
-    EINA_SAFETY_ON_NULL_RETURN_VAL(obj, 0);
-    EINA_MAGIC_CHECK_OR_RETURN(obj, 0);
-    return obj->properties;
-}
-
-const char* ewk_js_object_name_get(const Ewk_JS_Object* obj)
-{
-    EINA_SAFETY_ON_NULL_RETURN_VAL(obj, 0);
-    EINA_MAGIC_CHECK_OR_RETURN(obj, 0);
-    return obj->name;
-}
-
-Eina_Bool ewk_js_object_invoke(Ewk_JS_Object* obj, Ewk_JS_Variant* args, int arg_count, Ewk_JS_Variant* result)
+        free(jsObject);
+}
+
+Eina_Hash* ewk_js_object_properties_get(const Ewk_JS_Object* jsObject)
+{
+    EINA_SAFETY_ON_NULL_RETURN_VAL(jsObject, 0);
+    EINA_MAGIC_CHECK_OR_RETURN(jsObject, 0);
+    return jsObject->properties;
+}
+
+const char* ewk_js_object_name_get(const Ewk_JS_Object* jsObject)
+{
+    EINA_SAFETY_ON_NULL_RETURN_VAL(jsObject, 0);
+    EINA_MAGIC_CHECK_OR_RETURN(jsObject, 0);
+    return jsObject->name;
+}
+
+Eina_Bool ewk_js_object_invoke(Ewk_JS_Object* jsObject, Ewk_JS_Variant* args, int argCount, Ewk_JS_Variant* result)
 {
     NPVariant* np_args;
@@ -632 +632 @@
     bool fail = EINA_FALSE;
 
-    EINA_MAGIC_CHECK_OR_RETURN(obj, EINA_FALSE);
-    if (ewk_js_object_type_get(obj) != EWK_JS_OBJECT_FUNCTION)
+    EINA_MAGIC_CHECK_OR_RETURN(jsObject, EINA_FALSE);
+    if (ewk_js_object_type_get(jsObject) != EWK_JS_OBJECT_FUNCTION)
         return EINA_FALSE;
-    if (arg_count)
+    if (argCount)
         EINA_SAFETY_ON_NULL_RETURN_VAL(args, EINA_FALSE);
 
@@ -644 +644 @@
     }
 
-    for (int i = 0; i < arg_count; i++)
+    for (int i = 0; i < argCount; i++)
         if (!ewk_js_variant_to_npvariant(&args[i], &np_args[i]))
             goto end;
 
-    if (!(fail = _NPN_InvokeDefault(0, reinterpret_cast<NPObject*>(obj), np_args, arg_count, &np_result)))
+    if (!(fail = _NPN_InvokeDefault(0, reinterpret_cast<NPObject*>(jsObject), np_args, argCount, &np_result)))
         goto end;
     if (result)
@@ -658 +658 @@
 }
 
-Ewk_JS_Object_Type ewk_js_object_type_get(Ewk_JS_Object* obj)
-{
-    EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EWK_JS_OBJECT_OBJECT);
-    EINA_MAGIC_CHECK_OR_RETURN(obj, EWK_JS_OBJECT_OBJECT);
+Ewk_JS_Object_Type ewk_js_object_type_get(Ewk_JS_Object* jsObject)
+{
+    EINA_SAFETY_ON_NULL_RETURN_VAL(jsObject, EWK_JS_OBJECT_OBJECT);
+    EINA_MAGIC_CHECK_OR_RETURN(jsOobject, EWK_JS_OBJECT_OBJECT);
 
     return obj->type;
 }
 
-void ewk_js_object_type_set(Ewk_JS_Object* obj, Ewk_JS_Object_Type type)
-{
-    EINA_SAFETY_ON_NULL_RETURN(obj);
-    EINA_MAGIC_CHECK_OR_RETURN(obj);
-
-    obj->type = type;
-}
-
-void ewk_js_variant_free(Ewk_JS_Variant* var)
-{
-    EINA_SAFETY_ON_NULL_RETURN(var);
-    if (var->type == EWK_JS_VARIANT_STRING)
-        free(var->value.s);
-    else if (var->type == EWK_JS_VARIANT_OBJECT)
-        ewk_js_object_free(var->value.o);
-    free(var);
-}
-
-void ewk_js_variant_array_free(Ewk_JS_Variant* var, int count)
-{
-    EINA_SAFETY_ON_NULL_RETURN(var);
+void ewk_js_object_type_set(Ewk_JS_Object* jsObject, Ewk_JS_Object_Type type)
+{
+    EINA_SAFETY_ON_NULL_RETURN(jsObject);
+    EINA_MAGIC_CHECK_OR_RETURN(jsObject);
+
+    object->type = type;
+}
+
+void ewk_js_variant_free(Ewk_JS_Variant* jsVariant)
+{
+    EINA_SAFETY_ON_NULL_RETURN(jsVariant);
+    if (variant->type == EWK_JS_VARIANT_STRING)
+        free(jsVariant->value.s);
+    else if (jsVariant->type == EWK_JS_VARIANT_OBJECT)
+        ewk_js_object_free(jsVariant->value.o);
+    free(jsVariant);
+}
+
+void ewk_js_variant_array_free(Ewk_JS_Variant* jsVariant, int count)
+{
+    EINA_SAFETY_ON_NULL_RETURN(jsVariant);
     for (int i = 0; i < count; i++) {
-        if (var[i].type == EWK_JS_VARIANT_STRING)
-            free(var[i].value.s);
-        else if (var[i].type == EWK_JS_VARIANT_OBJECT)
-            ewk_js_object_free(var[i].value.o);
-    }
-    free(var);
+        if (jsVariant[i].type == EWK_JS_VARIANT_STRING)
+            free(jsVariant[i].value.s);
+        else if (jsVariant[i].type == EWK_JS_VARIANT_OBJECT)
+            ewk_js_object_free(jsVariant[i].value.o);
+    }
+    free(jsVariant);
 }
 
 #else
 
-Eina_Hash* ewk_js_object_properties_get(const Ewk_JS_Object* obj)
+Eina_Hash* ewk_js_object_properties_get(const Ewk_JS_Object* jsObject)
 {
     return 0;
 }
 
-const char* ewk_js_object_name_get(const Ewk_JS_Object* obj)
+const char* ewk_js_object_name_get(const Ewk_JS_Object* jsObject)
 {
     return 0;
 }
 
-void ewk_js_variant_free(Ewk_JS_Variant* var)
-{
-}
-
-void ewk_js_variant_array_free(Ewk_JS_Variant* var, int count)
-{
-}
-
-Ewk_JS_Object* ewk_js_object_new(const Ewk_JS_Class_Meta* meta_cls)
+void ewk_js_variant_free(Ewk_JS_Variant* jsVariant)
+{
+}
+
+void ewk_js_variant_array_free(Ewk_JS_Variant* jsVariant, int count)
+{
+}
+
+Ewk_JS_Object* ewk_js_object_new(const Ewk_JS_Class_Meta* jsMetaClass)
 {
     return 0;
 }
 
-void ewk_js_object_free(Ewk_JS_Object* obj)
-{
-}
-
-Eina_Bool ewk_js_object_invoke(Ewk_JS_Object* obj, Ewk_JS_Variant* args, int arg_count, Ewk_JS_Variant* result)
+void ewk_js_object_free(Ewk_JS_Object* jsObject)
+{
+}
+
+Eina_Bool ewk_js_object_invoke(Ewk_JS_Object* jsObject, Ewk_JS_Variant* args, int argCount, Ewk_JS_Variant* result)
 {
     return EINA_FALSE;
 }
 
-Ewk_JS_Object_Type ewk_js_object_type_get(Ewk_JS_Object* obj)
+Ewk_JS_Object_Type ewk_js_object_type_get(Ewk_JS_Object* jsObject)
 {
     return EWK_JS_OBJECT_INVALID;
 }
 
-void ewk_js_object_type_set(Ewk_JS_Object* obj, Ewk_JS_Object_Type type)
+void ewk_js_object_type_set(Ewk_JS_Object* jsObject, Ewk_JS_Object_Type type)
 {
 }

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

@@ -52 +52 @@
 }
 
-static void ewk_custom_protocol_handler_finalize(GObject* obj)
+static void ewk_custom_protocol_handler_finalize(GObject* object)
 {
-    EwkProtocolHandlerPrivate* priv  = G_TYPE_INSTANCE_GET_PRIVATE(obj, EWK_TYPE_CUSTOM_PROTOCOL_HANDLER,
+    EwkProtocolHandlerPrivate* priv  = G_TYPE_INSTANCE_GET_PRIVATE(object, EWK_TYPE_CUSTOM_PROTOCOL_HANDLER,
                                                                    EwkProtocolHandlerPrivate);
     if (priv)
         free(priv->mime);
 
-    G_OBJECT_CLASS(ewk_custom_protocol_handler_parent_class)->finalize(obj);
+    G_OBJECT_CLASS(ewk_custom_protocol_handler_parent_class)->finalize(object);
 }
 

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

@@ -32 +32 @@
 #include "KURL.h"
 #include "MemoryCache.h"
+// FIXME: Why is there a directory in this include?
+#include "appcache/ApplicationCacheStorage.h"
 #include "ewk_private.h"
 
@@ -44 +46 @@
 #include <wtf/text/CString.h>
 #include <wtf/text/StringConcatenate.h>
-
-// FIXME: Why is there a directory in this include?
-#include "appcache/ApplicationCacheStorage.h"
 
 static const char* _ewk_cache_directory_path = 0;
@@ -230 +229 @@
 }
 
-void ewk_settings_repaint_throttling_set(double deferred_repaint_delay, double initial_deferred_repaint_delay_during_loading, double max_deferred_repaint_delay_during_loading, double deferred_repaint_delay_increment_during_loading)
-{
-    WebCore::FrameView::setRepaintThrottlingDeferredRepaintDelay(deferred_repaint_delay);
-    WebCore::FrameView::setRepaintThrottlingnInitialDeferredRepaintDelayDuringLoading(initial_deferred_repaint_delay_during_loading);
-    WebCore::FrameView::setRepaintThrottlingMaxDeferredRepaintDelayDuringLoading(max_deferred_repaint_delay_during_loading);
-    WebCore::FrameView::setRepaintThrottlingDeferredRepaintDelayIncrementDuringLoading(deferred_repaint_delay_increment_during_loading);
+void ewk_settings_repaint_throttling_set(double deferredRepaintDelay, double initialDeferredRepaintDelayDuringLoading, double maxDeferredRepaintDelayDuringLoading, double deferredRepaintDelayIncrementDuringLoading)
+{
+    WebCore::FrameView::setRepaintThrottlingDeferredRepaintDelay(deferredRepaintDelay);
+    WebCore::FrameView::setRepaintThrottlingnInitialDeferredRepaintDelayDuringLoading(initialDeferredRepaintDelayDuringLoading);
+    WebCore::FrameView::setRepaintThrottlingMaxDeferredRepaintDelayDuringLoading(maxDeferredRepaintDelayDuringLoading);
+    WebCore::FrameView::setRepaintThrottlingDeferredRepaintDelayIncrementDuringLoading(deferredRepaintDelayIncrementDuringLoading);
 }
 

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

@@ -47 +47 @@
 struct _Ewk_Tiled_Backing_Store_Item {
     EINA_INLIST;
-    Ewk_Tile *tile;
+    Ewk_Tile* tile;
     struct {
-        Evas_Coord x, y, w, h;
+        Evas_Coord x, y, width, height;
     } geometry;
     Eina_Bool smooth_scale;
@@ -62 +62 @@
 struct _Ewk_Tiled_Backing_Store_Data {
     Evas_Object_Smart_Clipped_Data base;
-    Evas_Object *self;
-    Evas_Object *contents_clipper;
+    Evas_Object* self;
+    Evas_Object* contents_clipper;
     struct {
-        Eina_Inlist **items;
-        Evas_Coord x, y, w, h;
+        Eina_Inlist** items;
+        Evas_Coord x, y, width, height;
         long cols, rows;
         struct {
-            Evas_Coord w, h;
+            Evas_Coord width, height;
             float zoom;
-            Eina_Bool zoom_weak_smooth_scale:1;
+            Eina_Bool zoom_weak_smooth_scale : 1;
         } tile;
         struct {
@@ -81 +81 @@
     Evas_Colorspace cspace;
     struct {
-        Ewk_Tile_Matrix *matrix;
+        Ewk_Tile_Matrix* matrix;
         struct {
             unsigned long col, row;
@@ -91 +91 @@
     } model;
     struct {
-        Eina_Bool (*cb)(void *data, Ewk_Tile *t, const Eina_Rectangle *area);
-        void *data;
-        Eina_Inlist *pre_render_requests;
-        Ecore_Idler *idler;
+        Eina_Bool (*cb)(void* data, Ewk_Tile* tile, const Eina_Rectangle* area);
+        void* data;
+        Eina_Inlist* pre_render_requests;
+        Ecore_Idler* idler;
         Eina_Bool disabled;
-        Eina_Bool suspend:1;
+        Eina_Bool suspend : 1;
     } render;
     struct {
-        void *(*pre_cb)(void *data, Evas_Object *o);
-        void *pre_data;
-        void *(*post_cb)(void *data, void *pre_data, Evas_Object *o);
-        void *post_data;
+        void* (*pre_cb)(void* data, Evas_Object* ewkTile);
+        void* pre_data;
+        void* (*post_cb)(void* data, void* pre_data, Evas_Object* ewkTile);
+        void* post_data;
     } process;
     struct {
-        Eina_Bool any:1;
-        Eina_Bool pos:1;
-        Eina_Bool size:1;
-        Eina_Bool model:1;
-        Eina_Bool offset:1;
+        Eina_Bool any : 1;
+        Eina_Bool pos : 1;
+        Eina_Bool size : 1;
+        Eina_Bool model : 1;
+        Eina_Bool offset : 1;
     } changed;
 #ifdef DEBUG_MEM_LEAKS
-    Ecore_Event_Handler *sig_usr;
+    Ecore_Event_Handler* sig_usr;
 #endif
 };
@@ -126 +126 @@
     }
 
-static void _ewk_tiled_backing_store_fill_renderers(Ewk_Tiled_Backing_Store_Data *priv);
-static inline void _ewk_tiled_backing_store_view_dbg(const Ewk_Tiled_Backing_Store_Data *priv);
-static inline void _ewk_tiled_backing_store_changed(Ewk_Tiled_Backing_Store_Data *priv);
-
-static inline void _ewk_tiled_backing_store_updates_process(Ewk_Tiled_Backing_Store_Data *priv)
-{
-    void *data = 0;
+static void _ewk_tiled_backing_store_fill_renderers(Ewk_Tiled_Backing_Store_Data* priv);
+static inline void _ewk_tiled_backing_store_view_dbg(const Ewk_Tiled_Backing_Store_Data* priv);
+static inline void _ewk_tiled_backing_store_changed(Ewk_Tiled_Backing_Store_Data* priv);
+
+static inline void _ewk_tiled_backing_store_updates_process(Ewk_Tiled_Backing_Store_Data* priv)
+{
+    void* data = 0;
 
     /* Do not process updates. Note that we still want to get updates requests
@@ -150 +150 @@
 }
 
-static int _ewk_tiled_backing_store_flush(void *data)
+static int _ewk_tiled_backing_store_flush(void* data)
 {
     Ewk_Tiled_Backing_Store_Data* priv = static_cast<Ewk_Tiled_Backing_Store_Data*>(data);
-    Ewk_Tile_Unused_Cache *tuc = ewk_tile_matrix_unused_cache_get(priv->model.matrix);
+    Ewk_Tile_Unused_Cache* tuc = ewk_tile_matrix_unused_cache_get(priv->model.matrix);
 
     if (tuc) {
@@ -164 +164 @@
 }
 
-static Ewk_Tile *_ewk_tiled_backing_store_tile_new(Ewk_Tiled_Backing_Store_Data *priv, unsigned long col, unsigned long row, float zoom)
-{
-    Ewk_Tile *t;
-    Evas *evas = evas_object_evas_get(priv->self);
+static Ewk_Tile* _ewk_tiled_backing_store_tile_new(Ewk_Tiled_Backing_Store_Data* priv, unsigned long column, unsigned long row, float zoom)
+{
+    Ewk_Tile* tile;
+    Evas* evas = evas_object_evas_get(priv->self);
     if (!evas) {
         CRITICAL("evas_object_evas_get failed!");
@@ -173 +173 @@
     }
 
-    t = ewk_tile_matrix_tile_new
-        (priv->model.matrix, evas, col, row, zoom);
-
-    if (!t) {
+    tile = ewk_tile_matrix_tile_new
+               (priv->model.matrix, evas, column, row, zoom);
+
+    if (!tile) {
         CRITICAL("ewk_tile_matrix_tile_new failed!");
         return 0;
     }
 
-    return t;
-}
-
-static void _ewk_tiled_backing_store_item_move(Ewk_Tiled_Backing_Store_Item *it, Evas_Coord x, Evas_Coord y)
-{
-    it->geometry.x = x;
-    it->geometry.y = y;
-
-    if (it->tile)
-        evas_object_move(it->tile->image, x, y);
-}
-
-static void _ewk_tiled_backing_store_item_resize(Ewk_Tiled_Backing_Store_Item *it, Evas_Coord w, Evas_Coord h)
-{
-    it->geometry.w = w;
-    it->geometry.h = h;
-
-    if (it->tile) {
-        evas_object_resize(it->tile->image, w, h);
-        evas_object_image_fill_set(it->tile->image, 0, 0, w, h);
-    }
-}
-
-static void _ewk_tiled_backing_store_tile_associate(Ewk_Tiled_Backing_Store_Data *priv, Ewk_Tile *t, Ewk_Tiled_Backing_Store_Item *it)
-{
-    if (it->tile)
-        CRITICAL("it->tile=%p, but it should be 0!", it->tile);
-    it->tile = t;
-    evas_object_move(it->tile->image, it->geometry.x, it->geometry.y);
-    evas_object_resize(it->tile->image, it->geometry.w, it->geometry.h);
+    return tile;
+}
+
+static void _ewk_tiled_backing_store_item_move(Ewk_Tiled_Backing_Store_Item* item, Evas_Coord x, Evas_Coord y)
+{
+    item->geometry.x = x;
+    item->geometry.y = y;
+
+    if (item->tile)
+        evas_object_move(item->tile->image, x, y);
+}
+
+static void _ewk_tiled_backing_store_item_resize(Ewk_Tiled_Backing_Store_Item* item, Evas_Coord width, Evas_Coord height)
+{
+    item->geometry.width = width;
+    item->geometry.height = height;
+
+    if (item->tile) {
+        evas_object_resize(item->tile->image, width, height);
+        evas_object_image_fill_set(item->tile->image, 0, 0, width, height);
+    }
+}
+
+static void _ewk_tiled_backing_store_tile_associate(Ewk_Tiled_Backing_Store_Data* priv, Ewk_Tile* tile, Ewk_Tiled_Backing_Store_Item* item)
+{
+    if (item->tile)
+        CRITICAL("it->tile=%p, but it should be 0!", item->tile);
+    item->tile = tile;
+    evas_object_move(item->tile->image, item->geometry.x, item->geometry.y);
+    evas_object_resize(item->tile->image, item->geometry.width, item->geometry.height);
     evas_object_image_fill_set
-        (it->tile->image, 0, 0, it->geometry.w, it->geometry.h);
-    evas_object_image_smooth_scale_set(it->tile->image, it->smooth_scale);
-
-    if (!ewk_tile_visible_get(t))
-        evas_object_smart_member_add(t->image, priv->self);
-
-    ewk_tile_show(t);
-}
-
-static void _ewk_tiled_backing_store_tile_dissociate(Ewk_Tiled_Backing_Store_Data *priv, Ewk_Tiled_Backing_Store_Item *it, double last_used)
-{
-    Ewk_Tile_Unused_Cache *tuc;
-    ewk_tile_hide(it->tile);
-    if (!ewk_tile_visible_get(it->tile))
-        evas_object_smart_member_del(it->tile->image);
-    ewk_tile_matrix_tile_put(priv->model.matrix, it->tile, last_used);
+        (item->tile->image, 0, 0, item->geometry.width, item->geometry.height);
+    evas_object_image_smooth_scale_set(item->tile->image, item->smooth_scale);
+
+    if (!ewk_tile_visible_get(tile))
+        evas_object_smart_member_add(tile->image, priv->self);
+
+    ewk_tile_show(tile);
+}
+
+static void _ewk_tiled_backing_store_tile_dissociate(Ewk_Tiled_Backing_Store_Data* priv, Ewk_Tiled_Backing_Store_Item* item, double lastUsed)
+{
+    Ewk_Tile_Unused_Cache* tuc;
+    ewk_tile_hide(item->tile);
+    if (!ewk_tile_visible_get(item->tile))
+        evas_object_smart_member_del(item->tile->image);
+    ewk_tile_matrix_tile_put(priv->model.matrix, item->tile, lastUsed);
     tuc = ewk_tile_matrix_unused_cache_get(priv->model.matrix);
     ewk_tile_unused_cache_auto_flush(tuc);
 
-    it->tile = 0;
-}
-
-static void _ewk_tiled_backing_store_tile_dissociate_all(Ewk_Tiled_Backing_Store_Data *priv)
-{
-    Eina_Inlist *it;
-    Ewk_Tiled_Backing_Store_Item *item;
+    item->tile = 0;
+}
+
+static void _ewk_tiled_backing_store_tile_dissociate_all(Ewk_Tiled_Backing_Store_Data* priv)
+{
+    Eina_Inlist* it;
+    Ewk_Tiled_Backing_Store_Item* item;
     int i;
     double last_used = ecore_loop_time_get();
@@ -249 +249 @@
 }
 
-static inline Eina_Bool _ewk_tiled_backing_store_pre_render_request_add(Ewk_Tiled_Backing_Store_Data *priv, unsigned long col, unsigned long row, float zoom, Ewk_Tiled_Backing_Store_Pre_Render_Priority priority)
-{
-    Ewk_Tiled_Backing_Store_Pre_Render_Request *r;
+static inline Eina_Bool _ewk_tiled_backing_store_pre_render_request_add(Ewk_Tiled_Backing_Store_Data* priv, unsigned long column, unsigned long row, float zoom, Ewk_Tiled_Backing_Store_Pre_Render_Priority priority)
+{
+    Ewk_Tiled_Backing_Store_Pre_Render_Request* r;
 
     r = static_cast<Ewk_Tiled_Backing_Store_Pre_Render_Request*>(malloc(sizeof(*r)));
@@ -259 +259 @@
     if (priority == PRE_RENDER_PRIORITY_HIGH)
         priv->render.pre_render_requests = eina_inlist_prepend
-            (priv->render.pre_render_requests, EINA_INLIST_GET(r));
+                                               (priv->render.pre_render_requests, EINA_INLIST_GET(r));
     else
         priv->render.pre_render_requests = eina_inlist_append
-            (priv->render.pre_render_requests, EINA_INLIST_GET(r));
-
-    r->col = col;
+                                               (priv->render.pre_render_requests, EINA_INLIST_GET(r));
+
+    r->col = column;
     r->row = row;
     r->zoom = zoom;
@@ -271 +271 @@
 }
 
-static inline void _ewk_tiled_backing_store_pre_render_request_del(Ewk_Tiled_Backing_Store_Data *priv, Ewk_Tiled_Backing_Store_Pre_Render_Request *r)
+static inline void _ewk_tiled_backing_store_pre_render_request_del(Ewk_Tiled_Backing_Store_Data* priv, Ewk_Tiled_Backing_Store_Pre_Render_Request* request)
 {
     priv->render.pre_render_requests = eina_inlist_remove
-        (priv->render.pre_render_requests, EINA_INLIST_GET(r));
-    free(r);
-}
-
-static inline Ewk_Tiled_Backing_Store_Pre_Render_Request *_ewk_tiled_backing_store_pre_render_request_first(const Ewk_Tiled_Backing_Store_Data *priv)
+                                           (priv->render.pre_render_requests, EINA_INLIST_GET(request));
+    free(request);
+}
+
+static inline Ewk_Tiled_Backing_Store_Pre_Render_Request* _ewk_tiled_backing_store_pre_render_request_first(const Ewk_Tiled_Backing_Store_Data* priv)
 {
     return EINA_INLIST_CONTAINER_GET(
-        priv->render.pre_render_requests,
-        Ewk_Tiled_Backing_Store_Pre_Render_Request);
-}
-
-static void _ewk_tiled_backing_store_pre_render_request_flush(Ewk_Tiled_Backing_Store_Data *priv)
-{
-    Eina_Inlist **pl = &priv->render.pre_render_requests;
+               priv->render.pre_render_requests,
+               Ewk_Tiled_Backing_Store_Pre_Render_Request);
+}
+
+static void _ewk_tiled_backing_store_pre_render_request_flush(Ewk_Tiled_Backing_Store_Data* priv)
+{
+    Eina_Inlist** pl = &priv->render.pre_render_requests;
     while (*pl) {
-        Ewk_Tiled_Backing_Store_Pre_Render_Request *r;
+        Ewk_Tiled_Backing_Store_Pre_Render_Request* r;
         r = _ewk_tiled_backing_store_pre_render_request_first(priv);
         *pl = eina_inlist_remove(*pl, *pl);
@@ -296 +296 @@
 }
 
-static void _ewk_tiled_backing_store_pre_render_request_clear(Ewk_Tiled_Backing_Store_Data *priv)
-{
-    Eina_Inlist **pl = &priv->render.pre_render_requests;
-    Eina_Inlist *iter = *pl, *tmp;
+static void _ewk_tiled_backing_store_pre_render_request_clear(Ewk_Tiled_Backing_Store_Data* priv)
+{
+    Eina_Inlist** pl = &priv->render.pre_render_requests;
+    Eina_Inlist* iter = *pl, * tmp;
     while (iter) {
-        Ewk_Tiled_Backing_Store_Pre_Render_Request *r =
+        Ewk_Tiled_Backing_Store_Pre_Render_Request* r =
             EINA_INLIST_CONTAINER_GET(
                 iter, Ewk_Tiled_Backing_Store_Pre_Render_Request);
@@ -312 +312 @@
 
 /* assumes priv->process.pre_cb was called if required! */
-static void _ewk_tiled_backing_store_pre_render_request_process_single(Ewk_Tiled_Backing_Store_Data *priv)
-{
-    Ewk_Tiled_Backing_Store_Pre_Render_Request *req;
+static void _ewk_tiled_backing_store_pre_render_request_process_single(Ewk_Tiled_Backing_Store_Data* priv)
+{
+    Ewk_Tiled_Backing_Store_Pre_Render_Request* req;
     Eina_Rectangle area;
-    Ewk_Tile_Matrix *tm = priv->model.matrix;
-    Ewk_Tile *t;
-    Ewk_Tile_Unused_Cache *tuc;
+    Ewk_Tile_Matrix* tm = priv->model.matrix;
+    Ewk_Tile* tile;
+    Ewk_Tile_Unused_Cache* tuc;
     unsigned long col, row;
     float zoom;
@@ -336 +336 @@
     }
 
-    t = _ewk_tiled_backing_store_tile_new(priv, col, row, zoom);
-    if (!t)
+    tile = _ewk_tiled_backing_store_tile_new(priv, col, row, zoom);
+    if (!tile)
         goto end;
 
     area.x = 0;
     area.y = 0;
-    area.w = priv->view.tile.w;
-    area.h = priv->view.tile.h;
-
-    priv->render.cb(priv->render.data, t, &area);
+    area.w = priv->view.tile.width;
+    area.h = priv->view.tile.height;
+
+    priv->render.cb(priv->render.data, tile, &area);
     evas_object_image_data_update_add(
-        t->image,
+        tile->image,
         area.x, area.y, area.w, area.h);
-    ewk_tile_matrix_tile_updates_clear(tm, t);
-
-    ewk_tile_matrix_tile_put(tm, t, last_used);
+    ewk_tile_matrix_tile_updates_clear(tm, tile);
+
+    ewk_tile_matrix_tile_put(tm, tile, last_used);
 
 end:
@@ -359 +359 @@
 }
 
-static Eina_Bool _ewk_tiled_backing_store_item_process_idler_cb(void *data)
+static Eina_Bool _ewk_tiled_backing_store_item_process_idler_cb(void* data)
 {
     Ewk_Tiled_Backing_Store_Data* priv = static_cast<Ewk_Tiled_Backing_Store_Data*>(data);
@@ -379 +379 @@
 }
 
-static inline void _ewk_tiled_backing_store_item_process_idler_stop(Ewk_Tiled_Backing_Store_Data *priv)
+static inline void _ewk_tiled_backing_store_item_process_idler_stop(Ewk_Tiled_Backing_Store_Data* priv)
 {
     if (!priv->render.idler)
@@ -388 +388 @@
 }
 
-static inline void _ewk_tiled_backing_store_item_process_idler_start(Ewk_Tiled_Backing_Store_Data *priv)
+static inline void _ewk_tiled_backing_store_item_process_idler_start(Ewk_Tiled_Backing_Store_Data* priv)
 {
     if (priv->render.idler)
@@ -396 +396 @@
 }
 
-static Eina_Bool _ewk_tiled_backing_store_disable_render(Ewk_Tiled_Backing_Store_Data *priv)
+static Eina_Bool _ewk_tiled_backing_store_disable_render(Ewk_Tiled_Backing_Store_Data* priv)
 {
     if (priv->render.suspend)
@@ -406 +406 @@
 }
 
-static Eina_Bool _ewk_tiled_backing_store_enable_render(Ewk_Tiled_Backing_Store_Data *priv)
+static Eina_Bool _ewk_tiled_backing_store_enable_render(Ewk_Tiled_Backing_Store_Data* priv)
 {
     if (!priv->render.suspend)
@@ -419 +419 @@
 }
 
-static inline Eina_Bool _ewk_tiled_backing_store_item_fill(Ewk_Tiled_Backing_Store_Data *priv, Ewk_Tiled_Backing_Store_Item *it, unsigned long col, unsigned long row)
-{
-    unsigned long m_col = priv->model.base.col + col;
+static inline Eina_Bool _ewk_tiled_backing_store_item_fill(Ewk_Tiled_Backing_Store_Data* priv, Ewk_Tiled_Backing_Store_Item* item, unsigned long column, unsigned long row)
+{
+    unsigned long m_col = priv->model.base.col + column;
     unsigned long m_row = priv->model.base.row + row;
     double last_used = ecore_loop_time_get();
 
     if (m_col >= priv->model.cur.cols || m_row >= priv->model.cur.rows) {
-        if (it->tile)
-            _ewk_tiled_backing_store_tile_dissociate(priv, it, last_used);
+        if (item->tile)
+            _ewk_tiled_backing_store_tile_dissociate(priv, item, last_used);
     } else {
-        Ewk_Tile *t;
+        Ewk_Tile* tile;
         const float zoom = priv->view.tile.zoom;
 
-        if (it->tile) {
-            Ewk_Tile *old = it->tile;
+        if (item->tile) {
+            Ewk_Tile* old = item->tile;
             if (old->row != m_row || old->col != m_col || old->zoom != zoom)
-                _ewk_tiled_backing_store_tile_dissociate(priv, it, last_used);
+                _ewk_tiled_backing_store_tile_dissociate(priv, item, last_used);
             else if (old->row == m_row && old->col == m_col && old->zoom == zoom)
                 goto end;
         }
 
-        t = ewk_tile_matrix_tile_exact_get(priv->model.matrix, m_col, m_row, zoom);
-
-        if (!t) {
+        tile = ewk_tile_matrix_tile_exact_get(priv->model.matrix, m_col, m_row, zoom);
+
+        if (!tile) {
             /* NOTE: it never returns 0 if it->tile was set! */
-            if (it->tile) {
-                CRITICAL("it->tile=%p, but it should be 0!", it->tile);
-                _ewk_tiled_backing_store_tile_dissociate(priv, it,
+            if (item->tile) {
+                CRITICAL("it->tile=%p, but it should be 0!", item->tile);
+                _ewk_tiled_backing_store_tile_dissociate(priv, item,
                                                          last_used);
             }
@@ -452 +452 @@
             /* Do not add new requests to the render queue */
             if (!priv->render.suspend) {
-                t = _ewk_tiled_backing_store_tile_new(priv, m_col, m_row, zoom);
-                if (!t)
+                tile = _ewk_tiled_backing_store_tile_new(priv, m_col, m_row, zoom);
+                if (!tile)
                     return EINA_FALSE;
-                _ewk_tiled_backing_store_tile_associate(priv, t, it);
+                _ewk_tiled_backing_store_tile_associate(priv, tile, item);
             }
-        } else if (t != it->tile) {
-            if (it->tile)
+        } else if (tile != item->tile) {
+            if (item->tile)
                 _ewk_tiled_backing_store_tile_dissociate(priv,
-                                                             it, last_used);
-            _ewk_tiled_backing_store_tile_associate(priv, t, it);
+                                                         item, last_used);
+            _ewk_tiled_backing_store_tile_associate(priv, tile, item);
         }
 
-      end:
+end:
 
         return EINA_TRUE;
@@ -472 +472 @@
 }
 
-static Ewk_Tiled_Backing_Store_Item *_ewk_tiled_backing_store_item_add(Ewk_Tiled_Backing_Store_Data *priv, unsigned long col, unsigned long row)
-{
-    Ewk_Tiled_Backing_Store_Item *it;
+static Ewk_Tiled_Backing_Store_Item* _ewk_tiled_backing_store_item_add(Ewk_Tiled_Backing_Store_Data* priv, unsigned long column, unsigned long row)
+{
+    Ewk_Tiled_Backing_Store_Item* it;
     Evas_Coord x, y, tw, th;
 
@@ -483 +483 @@
         return 0;
 
-    tw = priv->view.tile.w;
-    th = priv->view.tile.h;
-    x = priv->view.offset.base.x + priv->view.x + tw  *col;
+    tw = priv->view.tile.width;
+    th = priv->view.tile.height;
+    x = priv->view.offset.base.x + priv->view.x + tw  *column;
     y = priv->view.offset.base.y + priv->view.y + th  *row;
 
@@ -493 +493 @@
     _ewk_tiled_backing_store_item_move(it, x, y);
     _ewk_tiled_backing_store_item_resize(it, tw, th);
-    if (!_ewk_tiled_backing_store_item_fill(priv, it, col, row)) {
+    if (!_ewk_tiled_backing_store_item_fill(priv, it, column, row)) {
         free(it);
         return 0;
@@ -501 +501 @@
 }
 
-static void _ewk_tiled_backing_store_item_del(Ewk_Tiled_Backing_Store_Data *priv, Ewk_Tiled_Backing_Store_Item *it)
-{
-    if (it->tile) {
+static void _ewk_tiled_backing_store_item_del(Ewk_Tiled_Backing_Store_Data* priv, Ewk_Tiled_Backing_Store_Item* item)
+{
+    if (item->tile) {
         double last_used = ecore_loop_time_get();
-        _ewk_tiled_backing_store_tile_dissociate(priv, it, last_used);
-    }
-
-    free(it);
-}
-
-static void _ewk_tiled_backing_store_item_smooth_scale_set(Ewk_Tiled_Backing_Store_Item *it, Eina_Bool smooth_scale)
-{
-    if (it->smooth_scale == smooth_scale)
-        return;
-
-    if (it->tile)
-        evas_object_image_smooth_scale_set(it->tile->image, smooth_scale);
-}
-
-static inline void _ewk_tiled_backing_store_changed(Ewk_Tiled_Backing_Store_Data *priv)
+        _ewk_tiled_backing_store_tile_dissociate(priv, item, last_used);
+    }
+
+    free(item);
+}
+
+static void _ewk_tiled_backing_store_item_smooth_scale_set(Ewk_Tiled_Backing_Store_Item* item, Eina_Bool smoothScale)
+{
+    if (item->smooth_scale == smoothScale)
+        return;
+
+    if (item->tile)
+        evas_object_image_smooth_scale_set(item->tile->image, smoothScale);
+}
+
+static inline void _ewk_tiled_backing_store_changed(Ewk_Tiled_Backing_Store_Data* priv)
 {
     if (priv->changed.any)
@@ -528 +528 @@
 }
 
-static void _ewk_tiled_backing_store_view_cols_end_del(Ewk_Tiled_Backing_Store_Data *priv, Eina_Inlist **p_row, unsigned int count)
-{
-    Eina_Inlist *n;
+static void _ewk_tiled_backing_store_view_cols_end_del(Ewk_Tiled_Backing_Store_Data* priv, Eina_Inlist** p_row, unsigned int count)
+{
+    Eina_Inlist* n;
     unsigned int i;
 
@@ -539 +539 @@
 
     for (i = 0; i < count; i++) {
-        Ewk_Tiled_Backing_Store_Item *it;
+        Ewk_Tiled_Backing_Store_Item* it;
         it = EINA_INLIST_CONTAINER_GET(n, Ewk_Tiled_Backing_Store_Item);
         n = n->prev;
@@ -547 +547 @@
 }
 
-static Eina_Bool _ewk_tiled_backing_store_view_cols_end_add(Ewk_Tiled_Backing_Store_Data *priv, Eina_Inlist **p_row, unsigned int base_col, unsigned int count)
+static Eina_Bool _ewk_tiled_backing_store_view_cols_end_add(Ewk_Tiled_Backing_Store_Data* priv, Eina_Inlist** p_row, unsigned int base_column, unsigned int count)
 {
     unsigned int i, r = p_row - priv->view.items;
 
-    for (i = 0; i < count; i++, base_col++) {
-        Ewk_Tiled_Backing_Store_Item *it;
-
-        it = _ewk_tiled_backing_store_item_add(priv, base_col, r);
+    for (i = 0; i < count; i++, base_column++) {
+        Ewk_Tiled_Backing_Store_Item* it;
+
+        it = _ewk_tiled_backing_store_item_add(priv, base_column, r);
         if (!it) {
             CRITICAL("failed to add column %u of %u in row %u.", i, count, r);
@@ -566 +566 @@
 }
 
-static void _ewk_tiled_backing_store_view_row_del(Ewk_Tiled_Backing_Store_Data *priv, Eina_Inlist *row)
+static void _ewk_tiled_backing_store_view_row_del(Ewk_Tiled_Backing_Store_Data* priv, Eina_Inlist* row)
 {
     while (row) {
-        Ewk_Tiled_Backing_Store_Item *it;
+        Ewk_Tiled_Backing_Store_Item* it;
         it = EINA_INLIST_CONTAINER_GET(row, Ewk_Tiled_Backing_Store_Item);
         row = row->next;
@@ -576 +576 @@
 }
 
-static void _ewk_tiled_backing_store_view_rows_range_del(Ewk_Tiled_Backing_Store_Data *priv, Eina_Inlist **start, Eina_Inlist **end)
+static void _ewk_tiled_backing_store_view_rows_range_del(Ewk_Tiled_Backing_Store_Data* priv, Eina_Inlist** start, Eina_Inlist** end)
 {
     for (; start < end; start++) {
@@ -584 +584 @@
 }
 
-static void _ewk_tiled_backing_store_view_rows_all_del(Ewk_Tiled_Backing_Store_Data *priv)
-{
-    Eina_Inlist **start;
-    Eina_Inlist **end;
+static void _ewk_tiled_backing_store_view_rows_all_del(Ewk_Tiled_Backing_Store_Data* priv)
+{
+    Eina_Inlist** start;
+    Eina_Inlist** end;
 
     start = priv->view.items;
@@ -599 +599 @@
 }
 
-static void _ewk_tiled_backing_store_render(void *data, Ewk_Tile *t, const Eina_Rectangle *area)
+static void _ewk_tiled_backing_store_render(void* data, Ewk_Tile* tile, const Eina_Rectangle* area)
 {
     Ewk_Tiled_Backing_Store_Data* priv = static_cast<Ewk_Tiled_Backing_Store_Data*>(data);
 
     INF("TODO %p (visible? %d) [%lu,%lu] %d,%d + %dx%d",
-        t, t->visible, t->col, t->row, area->x, area->y, area->w, area->h);
-
-    if (!t->visible)
-        return;
-
-    if (priv->view.tile.w != t->w || priv->view.tile.h != t->h)
+        tile, tile->visible, tile->col, tile->row, area->x, area->y, area->w, area->h);
+
+    if (!tile->visible)
+        return;
+
+    if (priv->view.tile.width != tile->width || priv->view.tile.height != tile->height)
         return; // todo: remove me later, don't even flag as dirty!
 
     EINA_SAFETY_ON_NULL_RETURN(priv->render.cb);
-    if (!priv->render.cb(priv->render.data, t, area))
-        return;
-
-    evas_object_image_data_update_add(t->image, area->x, area->y, area->w, area->h);
-}
-
-static inline void _ewk_tiled_backing_store_model_matrix_create(Ewk_Tiled_Backing_Store_Data *priv, Ewk_Tile_Unused_Cache *tuc)
+    if (!priv->render.cb(priv->render.data, tile, area))
+        return;
+
+    evas_object_image_data_update_add(tile->image, area->x, area->y, area->w, area->h);
+}
+
+static inline void _ewk_tiled_backing_store_model_matrix_create(Ewk_Tiled_Backing_Store_Data* priv, Ewk_Tile_Unused_Cache* tileUnusedCache)
 {
     if (priv->model.matrix) {
@@ -630 +630 @@
     }
 
-    priv->model.matrix = ewk_tile_matrix_new(tuc, priv->model.cur.cols, priv->model.cur.rows, priv->cspace, _ewk_tiled_backing_store_render, priv);
-}
-
-static void _ewk_tiled_backing_store_smart_member_del(Evas_Object *o, Evas_Object *member)
-{
-    PRIV_DATA_GET_OR_RETURN(o, priv);
+    priv->model.matrix = ewk_tile_matrix_new(tileUnusedCache, priv->model.cur.cols, priv->model.cur.rows, priv->cspace, _ewk_tiled_backing_store_render, priv);
+}
+
+static void _ewk_tiled_backing_store_smart_member_del(Evas_Object* ewkTile, Evas_Object* member)
+{
+    PRIV_DATA_GET_OR_RETURN(ewkTile, priv);
     if (!priv->contents_clipper)
         return;
@@ -643 +643 @@
 }
 
-static void _ewk_tiled_backing_store_smart_member_add(Evas_Object *o, Evas_Object *member)
-{
-    PRIV_DATA_GET_OR_RETURN(o, priv);
+static void _ewk_tiled_backing_store_smart_member_add(Evas_Object* ewkTile, Evas_Object* member)
+{
+    PRIV_DATA_GET_OR_RETURN(ewkTile, priv);
     if (!priv->contents_clipper)
         return;
     evas_object_clip_set(member, priv->contents_clipper);
-    if (evas_object_visible_get(o))
+    if (evas_object_visible_get(ewkTile))
         evas_object_show(priv->contents_clipper);
 }
 
 #ifdef DEBUG_MEM_LEAKS
-static void _ewk_tiled_backing_store_mem_dbg(Ewk_Tiled_Backing_Store_Data *priv)
+static void _ewk_tiled_backing_store_mem_dbg(Ewk_Tiled_Backing_Store_Data* priv)
 {
     static int run = 0;
@@ -671 +671 @@
 }
 
-static Eina_Bool _ewk_tiled_backing_store_sig_usr(void *data, int type, void *event)
-{
-    Ecore_Event_Signal_User *sig = (Ecore_Event_Signal_User*)event;
-    Ewk_Tiled_Backing_Store_Data *priv = (Ewk_Tiled_Backing_Store_Data*)data;
+static Eina_Bool _ewk_tiled_backing_store_sig_usr(void* data, int type, void* event)
+{
+    Ecore_Event_Signal_User* sig = (Ecore_Event_Signal_User*)event;
+    Ewk_Tiled_Backing_Store_Data* priv = (Ewk_Tiled_Backing_Store_Data*)data;
 
     if (sig->number == 2) {
-        Ewk_Tile_Unused_Cache *tuc;
+        Ewk_Tile_Unused_Cache* tuc;
         tuc = ewk_tile_matrix_unused_cache_get(priv->model.matrix);
         ewk_tile_unused_cache_auto_flush(tuc);
@@ -688 +688 @@
 #endif
 
-static void _ewk_tiled_backing_store_smart_add(Evas_Object *o)
-{
-    Ewk_Tiled_Backing_Store_Data *priv;
-
-    DBG("o=%p", o);
+static void _ewk_tiled_backing_store_smart_add(Evas_Object* ewkTile)
+{
+    Ewk_Tiled_Backing_Store_Data* priv;
+
+    DBG("o=%p", ewkTile);
 
     priv = static_cast<Ewk_Tiled_Backing_Store_Data*>(calloc(1, sizeof(*priv)));
@@ -698 +698 @@
         return;
 
-    priv->self = o;
+    priv->self = ewkTile;
     priv->view.tile.zoom = 1.0;
-    priv->view.tile.w = DEFAULT_TILE_W;
-    priv->view.tile.h = DEFAULT_TILE_H;
+    priv->view.tile.width = DEFAULT_TILE_W;
+    priv->view.tile.height = DEFAULT_TILE_H;
     priv->view.offset.cur.x = 0;
     priv->view.offset.cur.y = 0;
@@ -720 +720 @@
     priv->cspace = EVAS_COLORSPACE_ARGB8888; // TODO: detect it.
 
-    evas_object_smart_data_set(o, priv);
-    _parent_sc.add(o);
+    evas_object_smart_data_set(ewkTile, priv);
+    _parent_sc.add(ewkTile);
 
     priv->contents_clipper = evas_object_rectangle_add(
-        evas_object_evas_get(o));
+        evas_object_evas_get(ewkTile));
     evas_object_move(priv->contents_clipper, 0, 0);
     evas_object_resize(priv->contents_clipper,
@@ -730 +730 @@
     evas_object_color_set(priv->contents_clipper, 255, 255, 255, 255);
     evas_object_show(priv->contents_clipper);
-    evas_object_smart_member_add(priv->contents_clipper, o);
+    evas_object_smart_member_add(priv->contents_clipper, ewkTile);
 
     _ewk_tiled_backing_store_model_matrix_create(priv, 0);
@@ -739 +739 @@
 #ifdef DEBUG_MEM_LEAKS
     priv->sig_usr = ecore_event_handler_add
-        (ECORE_EVENT_SIGNAL_USER, _ewk_tiled_backing_store_sig_usr, priv);
+                        (ECORE_EVENT_SIGNAL_USER, _ewk_tiled_backing_store_sig_usr, priv);
 #endif
 }
 
-static void _ewk_tiled_backing_store_smart_del(Evas_Object *o)
-{
-    PRIV_DATA_GET_OR_RETURN(o, priv);
-    DBG("o=%p", o);
-    Ewk_Tile_Unused_Cache *tuc;
+static void _ewk_tiled_backing_store_smart_del(Evas_Object* ewkTile)
+{
+    PRIV_DATA_GET_OR_RETURN(ewkTile, priv);
+    DBG("o=%p", ewkTile);
+    Ewk_Tile_Unused_Cache* tuc;
 
     tuc = ewk_tile_matrix_unused_cache_get(priv->model.matrix);
@@ -768 +768 @@
     evas_object_del(priv->contents_clipper);
 
-    _parent_sc.del(o);
+    _parent_sc.del(ewkTile);
 
 #ifdef DEBUG_MEM_LEAKS
@@ -776 +776 @@
 }
 
-static void _ewk_tiled_backing_store_smart_move(Evas_Object *o, Evas_Coord x, Evas_Coord y)
-{
-    DBG("o=%p, new pos: %dx%d", o, x, y);
-
-    PRIV_DATA_GET_OR_RETURN(o, priv);
+static void _ewk_tiled_backing_store_smart_move(Evas_Object* ewkTile, Evas_Coord x, Evas_Coord y)
+{
+    DBG("o=%p, new pos: %dx%d", ewkTile, x, y);
+
+    PRIV_DATA_GET_OR_RETURN(ewkTile, priv);
 
     if (priv->changed.pos)
@@ -792 +792 @@
 }
 
-static void _ewk_tiled_backing_store_smart_resize(Evas_Object *o, Evas_Coord w, Evas_Coord h)
-{
-    DBG("o=%p, new size: %dx%d", o, w, h);
-
-    PRIV_DATA_GET_OR_RETURN(o, priv);
+static void _ewk_tiled_backing_store_smart_resize(Evas_Object* ewkTile, Evas_Coord width, Evas_Coord height)
+{
+    DBG("o=%p, new size: %dx%d", ewkTile, width, height);
+
+    PRIV_DATA_GET_OR_RETURN(ewkTile, priv);
 
     if (priv->changed.size)
         return;
 
-    if (priv->view.w == w && priv->view.h == h)
+    if (priv->view.width == width && priv->view.height == height)
         return;
 
@@ -808 +808 @@
 }
 
-static void _ewk_tiled_backing_store_recalc_renderers(Ewk_Tiled_Backing_Store_Data *priv, Evas_Coord w, Evas_Coord h, Evas_Coord tw, Evas_Coord th)
+static void _ewk_tiled_backing_store_recalc_renderers(Ewk_Tiled_Backing_Store_Data* priv, Evas_Coord width, Evas_Coord height, Evas_Coord tileWidth, Evas_Coord tileHeight)
 {
     long cols, rows, old_rows, old_cols;
-    INF("o=%p, new size: %dx%d", priv->self, w, h);
-
-    cols = 1 + (int)ceil((float)w / (float)tw);
-    rows = 1 + (int)ceil((float)h / (float)th);
+    INF("o=%p, new size: %dx%d", priv->self, width, height);
+
+    cols = 1 + static_cast<int>(ceil(static_cast<float>(width / tileWidth)));
+    rows = 1 + static_cast<int>(ceil(static_cast<float>(height / tileHeight)));
 
     INF("o=%p new grid size cols: %ld, rows: %ld, was %ld, %ld",
@@ -826 +826 @@
 
     if (rows < old_rows) {
-        Eina_Inlist **start, **end;
+        Eina_Inlist** start, **end;
         start = priv->view.items + rows;
         end = priv->view.items + old_rows;
@@ -840 +840 @@
     priv->view.cols = cols;
     if (rows > old_rows) {
-        Eina_Inlist **start, **end;
-        start = priv->view.items + old_rows;
-        end = priv->view.items + rows;
+        Eina_Inlist** start = priv->view.items + old_rows;
+        Eina_Inlist** end = priv->view.items + rows;
         for (; start < end; start++) {
-            Eina_Bool r;
             *start = 0;
-            r = _ewk_tiled_backing_store_view_cols_end_add
-                (priv, start, 0, cols);
+            Eina_Bool r = _ewk_tiled_backing_store_view_cols_end_add(priv, start, 0, cols);
             if (!r) {
                 CRITICAL("failed to allocate %ld columns", cols);
-                _ewk_tiled_backing_store_view_rows_range_del
-                    (priv, priv->view.items + old_rows, start);
+                _ewk_tiled_backing_store_view_rows_range_del(priv, priv->view.items + old_rows, start);
                 priv->view.rows = old_rows;
                 return;
@@ -859 +855 @@
 
     if (cols != old_cols) {
-        Eina_Inlist **start, **end;
         int todo = cols - old_cols;
-        start = priv->view.items;
-        end = start + std::min(old_rows, rows);
+        Eina_Inlist** start = priv->view.items;
+        Eina_Inlist** end = start + std::min(old_rows, rows);
         if (todo > 0) {
             for (; start < end; start++) {
-                Eina_Bool r;
-                r = _ewk_tiled_backing_store_view_cols_end_add
-                    (priv, start, old_cols, todo);
+                Eina_Bool r = _ewk_tiled_backing_store_view_cols_end_add(priv, start, old_cols, todo);
                 if (!r) {
                     CRITICAL("failed to allocate %d columns!", todo);
@@ -892 +885 @@
 }
 
-static void _ewk_tiled_backing_store_smart_calculate_size(Ewk_Tiled_Backing_Store_Data *priv, Evas_Coord w, Evas_Coord h)
-{
-    evas_object_resize(priv->base.clipper, w, h);
-
-    priv->view.w = w;
-    priv->view.h = h;
+static void _ewk_tiled_backing_store_smart_calculate_size(Ewk_Tiled_Backing_Store_Data* priv, Evas_Coord width, Evas_Coord height)
+{
+    evas_object_resize(priv->base.clipper, width, height);
+
+    priv->view.width = width;
+    priv->view.height = height;
 
     _ewk_tiled_backing_store_recalc_renderers(
-        priv, w, h, priv->view.tile.w, priv->view.tile.h);
+        priv, width, height, priv->view.tile.width, priv->view.tile.height);
 }
 
 // TODO: remove me later.
-static inline void _ewk_tiled_backing_store_view_dbg(const Ewk_Tiled_Backing_Store_Data *priv)
-{
-    Eina_Inlist **start, **end;
+static inline void _ewk_tiled_backing_store_view_dbg(const Ewk_Tiled_Backing_Store_Data* priv)
+{
+    Eina_Inlist** start, **end;
     printf("tiles=%2ld,%2ld  model=%2ld,%2ld [%dx%d] base=%+3ld,%+4ld offset=%+4d,%+4d old=%+4d,%+4d base=%+3d,%+3d\n",
            priv->view.cols, priv->view.rows,
@@ -919 +912 @@
     end = priv->view.items + priv->view.rows;
     for (; start < end; start++) {
-        const Ewk_Tiled_Backing_Store_Item *it;
+        const Ewk_Tiled_Backing_Store_Item* it;
 
         EINA_INLIST_FOREACH(*start, it) {
@@ -947 +940 @@
  * @param count the number of times to repeat the process.
  */
-static void _ewk_tiled_backing_store_view_wrap_up(Ewk_Tiled_Backing_Store_Data *priv, Evas_Coord x, Evas_Coord y, unsigned int count)
+static void _ewk_tiled_backing_store_view_wrap_up(Ewk_Tiled_Backing_Store_Data* priv, Evas_Coord x, Evas_Coord y, unsigned int count)
 {
     unsigned int last_row = priv->view.rows - 1;
-    Evas_Coord tw = priv->view.tile.w;
-    Evas_Coord th = priv->view.tile.h;
+    Evas_Coord tw = priv->view.tile.width;
+    Evas_Coord th = priv->view.tile.height;
     Evas_Coord off_y = priv->view.offset.base.y + count * th;
     Evas_Coord oy = y + (last_row - count + 1) * th + off_y;
-    Eina_Inlist **itr_start, **itr_end;
+    Eina_Inlist** itr_start, **itr_end;
 
     itr_start = priv->view.items;
@@ -960 +953 @@
 
     for (; count > 0; count--) {
-        Eina_Inlist **itr;
-        Eina_Inlist *tmp = *itr_start;
-        Ewk_Tiled_Backing_Store_Item *it;
+        Eina_Inlist** itr;
+        Eina_Inlist* tmp = *itr_start;
+        Ewk_Tiled_Backing_Store_Item* it;
         Evas_Coord ox = x + priv->view.offset.base.x;
         int c = 0;
@@ -995 +988 @@
  * @param count the number of times to repeat the process.
  */
-static void _ewk_tiled_backing_store_view_wrap_down(Ewk_Tiled_Backing_Store_Data *priv, Evas_Coord x, Evas_Coord y, unsigned int count)
-{
-    Evas_Coord tw = priv->view.tile.w;
-    Evas_Coord th = priv->view.tile.h;
+static void _ewk_tiled_backing_store_view_wrap_down(Ewk_Tiled_Backing_Store_Data* priv, Evas_Coord x, Evas_Coord y, unsigned int count)
+{
+    Evas_Coord tw = priv->view.tile.width;
+    Evas_Coord th = priv->view.tile.height;
     Evas_Coord off_y = priv->view.offset.base.y - count * th;
     Evas_Coord oy = y + off_y + (count - 1) * th;
-    Eina_Inlist **itr_start, **itr_end;
+    Eina_Inlist** itr_start, **itr_end;
 
     itr_start = priv->view.items + priv->view.rows - 1;
@@ -1007 +1000 @@
 
     for (; count > 0; count--) {
-        Eina_Inlist **itr;
-        Eina_Inlist *tmp = *itr_start;
-        Ewk_Tiled_Backing_Store_Item *it;
+        Eina_Inlist** itr;
+        Eina_Inlist* tmp = *itr_start;
+        Ewk_Tiled_Backing_Store_Item* it;
         Evas_Coord ox = x + priv->view.offset.base.x;
         int c = 0;
@@ -1042 +1035 @@
  * @param count the number of times to repeat the process.
  */
-static void _ewk_tiled_backing_store_view_wrap_left(Ewk_Tiled_Backing_Store_Data *priv, Evas_Coord x, Evas_Coord y, unsigned int count)
+static void _ewk_tiled_backing_store_view_wrap_left(Ewk_Tiled_Backing_Store_Data* priv, Evas_Coord x, Evas_Coord y, unsigned int count)
 {
     unsigned int r, last_col = priv->view.cols - 1;
-    Evas_Coord tw = priv->view.tile.w;
-    Evas_Coord th = priv->view.tile.h;
+    Evas_Coord tw = priv->view.tile.width;
+    Evas_Coord th = priv->view.tile.height;
     Evas_Coord off_x = priv->view.offset.base.x + count * tw;
     Evas_Coord oy = y + priv->view.offset.base.y;
-    Eina_Inlist **itr;
-    Eina_Inlist **itr_end;
+    Eina_Inlist** itr;
+    Eina_Inlist** itr_end;
 
     itr = priv->view.items;
@@ -1063 +1056 @@
 
         for (i = 0; i < count; i++, c++, ox += tw) {
-            Ewk_Tiled_Backing_Store_Item *it;
+            Ewk_Tiled_Backing_Store_Item* it;
             it = EINA_INLIST_CONTAINER_GET(*itr, Ewk_Tiled_Backing_Store_Item);
             *itr = eina_inlist_demote(*itr, *itr);
@@ -1089 +1082 @@
  * @param count the number of times to repeat the process.
  */
-static void _ewk_tiled_backing_store_view_wrap_right(Ewk_Tiled_Backing_Store_Data *priv, Evas_Coord x, Evas_Coord y, unsigned int count)
+static void _ewk_tiled_backing_store_view_wrap_right(Ewk_Tiled_Backing_Store_Data* priv, Evas_Coord x, Evas_Coord y, unsigned int count)
 {
     unsigned int r;
-    Evas_Coord tw = priv->view.tile.w;
-    Evas_Coord th = priv->view.tile.h;
+    Evas_Coord tw = priv->view.tile.width;
+    Evas_Coord th = priv->view.tile.height;
     Evas_Coord off_x = priv->view.offset.base.x - count * tw;
     Evas_Coord oy = y + priv->view.offset.base.y;
-    Eina_Inlist **itr, **itr_end;
+    Eina_Inlist** itr, ** itr_end;
 
     itr = priv->view.items;
@@ -1109 +1102 @@
 
         for (i = 0; i < count; i++, c--, ox -= tw) {
-            Ewk_Tiled_Backing_Store_Item *it;
+            Ewk_Tiled_Backing_Store_Item* it;
             it = EINA_INLIST_CONTAINER_GET((*itr)->last, Ewk_Tiled_Backing_Store_Item);
             *itr = eina_inlist_promote(*itr, (*itr)->last);
@@ -1122 +1115 @@
 }
 
-static void _ewk_tiled_backing_store_view_refill(Ewk_Tiled_Backing_Store_Data *priv, Evas_Coord x, Evas_Coord y, int step_x, int step_y)
-{
-    Eina_Inlist **itr, **itr_end;
+static void _ewk_tiled_backing_store_view_refill(Ewk_Tiled_Backing_Store_Data* priv, Evas_Coord x, Evas_Coord y, int stepX, int stepY)
+{
+    Eina_Inlist** itr, **itr_end;
     Evas_Coord base_ox, oy, tw, th;
     unsigned int r;
@@ -1130 +1123 @@
     evas_object_move(priv->base.clipper, x, y);
 
-    tw = priv->view.tile.w;
-    th = priv->view.tile.h;
+    tw = priv->view.tile.width;
+    th = priv->view.tile.height;
 
     base_ox = x + priv->view.offset.base.x;
@@ -1140 +1133 @@
     r = 0;
 
-    priv->model.base.col -= step_x;
-    priv->model.base.row -= step_y;
+    priv->model.base.col -= stepX;
+    priv->model.base.row -= stepY;
 
     for (; itr < itr_end; itr++, r++) {
-        Ewk_Tiled_Backing_Store_Item *it;
+        Ewk_Tiled_Backing_Store_Item* it;
         Evas_Coord ox = base_ox;
         unsigned int c = 0;
@@ -1157 +1150 @@
 }
 
-static void _ewk_tiled_backing_store_view_pos_apply(Ewk_Tiled_Backing_Store_Data *priv, Evas_Coord x, Evas_Coord y)
-{
-    Eina_Inlist **itr, **itr_end;
+static void _ewk_tiled_backing_store_view_pos_apply(Ewk_Tiled_Backing_Store_Data* priv, Evas_Coord x, Evas_Coord y)
+{
+    Eina_Inlist** itr, **itr_end;
     Evas_Coord base_ox, oy, tw, th;
 
     evas_object_move(priv->base.clipper, x, y);
 
-    tw = priv->view.tile.w;
-    th = priv->view.tile.h;
+    tw = priv->view.tile.width;
+    th = priv->view.tile.height;
 
     base_ox = x + priv->view.offset.base.x;
@@ -1173 +1166 @@
     itr_end = itr + priv->view.rows;
     for (; itr < itr_end; itr++) {
-        Ewk_Tiled_Backing_Store_Item *it;
+        Ewk_Tiled_Backing_Store_Item* it;
         Evas_Coord ox = base_ox;
         EINA_INLIST_FOREACH(*itr, it) {
@@ -1183 +1176 @@
 }
 
-static void _ewk_tiled_backing_store_smart_calculate_offset_force(Ewk_Tiled_Backing_Store_Data *priv)
+static void _ewk_tiled_backing_store_smart_calculate_offset_force(Ewk_Tiled_Backing_Store_Data* priv)
 {
     Evas_Coord dx = priv->view.offset.cur.x - priv->view.offset.old.x;
@@ -1193 +1186 @@
         priv->self, dx, dy, priv->view.offset.cur.x, priv->view.offset.cur.y);
 
-    tw = priv->view.tile.w;
-    th = priv->view.tile.h;
+    tw = priv->view.tile.width;
+    th = priv->view.tile.height;
 
     long new_col = -priv->view.offset.cur.x / tw;
@@ -1215 +1208 @@
 }
 
-static void _ewk_tiled_backing_store_smart_calculate_offset(Ewk_Tiled_Backing_Store_Data *priv, Evas_Coord x, Evas_Coord y)
+static void _ewk_tiled_backing_store_smart_calculate_offset(Ewk_Tiled_Backing_Store_Data* priv, Evas_Coord x, Evas_Coord y)
 {
     Evas_Coord dx = priv->view.offset.cur.x - priv->view.offset.old.x;
@@ -1228 +1221 @@
         return;
 
-    tw = priv->view.tile.w;
-    th = priv->view.tile.h;
+    tw = priv->view.tile.width;
+    th = priv->view.tile.height;
 
     long new_col = -priv->view.offset.cur.x / tw;
@@ -1272 +1265 @@
 }
 
-static void _ewk_tiled_backing_store_smart_calculate_pos(Ewk_Tiled_Backing_Store_Data *priv, Evas_Coord x, Evas_Coord y)
+static void _ewk_tiled_backing_store_smart_calculate_pos(Ewk_Tiled_Backing_Store_Data* priv, Evas_Coord x, Evas_Coord y)
 {
     _ewk_tiled_backing_store_view_pos_apply(priv, x, y);
@@ -1283 +1276 @@
 }
 
-static void _ewk_tiled_backing_store_fill_renderers(Ewk_Tiled_Backing_Store_Data *priv)
-{
-    Eina_Inlist *it;
-    Ewk_Tiled_Backing_Store_Item *item;
+static void _ewk_tiled_backing_store_fill_renderers(Ewk_Tiled_Backing_Store_Data* priv)
+{
+    Eina_Inlist* it;
+    Ewk_Tiled_Backing_Store_Item* item;
     int i, j;
 
@@ -1297 +1290 @@
 }
 
-static void _ewk_tiled_backing_store_smart_calculate(Evas_Object *o)
+static void _ewk_tiled_backing_store_smart_calculate(Evas_Object* ewkTile)
 {
     Evas_Coord x, y, w, h;
 
-    evas_object_geometry_get(o, &x, &y, &w, &h);
-    DBG("o=%p at %d,%d + %dx%d", o, x, y, w, h);
-
-    PRIV_DATA_GET_OR_RETURN(o, priv);
+    evas_object_geometry_get(ewkTile, &x, &y, &w, &h);
+    DBG("o=%p at %d,%d + %dx%d", ewkTile, x, y, w, h);
+
+    PRIV_DATA_GET_OR_RETURN(ewkTile, priv);
 
     priv->changed.any = EINA_FALSE;
@@ -1313 +1306 @@
         unsigned long cols, rows;
 
-        cols = priv->model.width / priv->view.tile.w + 1;
-        rows = priv->model.height / priv->view.tile.h + 1;
+        cols = priv->model.width / priv->view.tile.width + 1;
+        rows = priv->model.height / priv->view.tile.height + 1;
 
         priv->model.old.cols = priv->model.cur.cols;
@@ -1349 +1342 @@
         _ewk_tiled_backing_store_fill_renderers(priv);
         ewk_tile_matrix_resize(priv->model.matrix,
-                           priv->model.cur.cols,
-                           priv->model.cur.rows);
+                               priv->model.cur.cols,
+                               priv->model.cur.rows);
         priv->changed.model = EINA_FALSE;
         evas_object_resize(priv->contents_clipper, priv->model.width, priv->model.height);
@@ -1358 +1351 @@
          * repainting the whole viewport */
         const Eina_Rectangle r =
-            { 0, 0, priv->model.width, priv->model.height };
+        { 0, 0, priv->model.width, priv->model.height };
         ewk_tile_matrix_update(priv->model.matrix, &r,
                                priv->view.tile.zoom);
@@ -1368 +1361 @@
 
     if (priv->view.offset.base.x > 0
-        || priv->view.offset.base.x <= - priv->view.tile.w
+        || priv->view.offset.base.x <= - priv->view.tile.width
         || priv->view.offset.base.y > 0
-        || priv->view.offset.base.y <= - priv->view.tile.h)
+        || priv->view.offset.base.y <= - priv->view.tile.height)
         ERR("incorrect base offset %+4d,%+4d, tile=%dx%d, cur=%+4d,%+4d\n",
             priv->view.offset.base.x, priv->view.offset.base.y,
-            priv->view.tile.w, priv->view.tile.h,
+            priv->view.tile.width, priv->view.tile.height,
             priv->view.offset.cur.x, priv->view.offset.cur.y);
 
 }
 
-Evas_Object *ewk_tiled_backing_store_add(Evas *e)
-{
-    static Evas_Smart *smart = 0;
+Evas_Object* ewk_tiled_backing_store_add(Evas* canvas)
+{
+    static Evas_Smart* smart = 0;
 
     if (_ewk_tiled_log_dom < 0)
@@ -1403 +1396 @@
     }
 
-    return evas_object_smart_add(e, smart);
-}
-
-void ewk_tiled_backing_store_render_cb_set(Evas_Object *o, Eina_Bool (*cb)(void *data, Ewk_Tile *t, const Eina_Rectangle *area), const void *data)
-{
-    EINA_SAFETY_ON_NULL_RETURN(cb);
-    PRIV_DATA_GET_OR_RETURN(o, priv);
-    priv->render.cb = cb;
+    return evas_object_smart_add(canvas, smart);
+}
+
+void ewk_tiled_backing_store_render_cb_set(Evas_Object* ewkTile, Eina_Bool (*callback)(void* data, Ewk_Tile* tile, const Eina_Rectangle* area), const void* data)
+{
+    EINA_SAFETY_ON_NULL_RETURN(callback);
+    PRIV_DATA_GET_OR_RETURN(ewkTile, priv);
+    priv->render.cb = callback;
     priv->render.data = (void*)data;
 }
 
-Ewk_Tile_Unused_Cache *ewk_tiled_backing_store_tile_unused_cache_get(const Evas_Object *o)
-{
-    PRIV_DATA_GET_OR_RETURN(o, priv, 0);
+Ewk_Tile_Unused_Cache* ewk_tiled_backing_store_tile_unused_cache_get(const Evas_Object* ewkTile)
+{
+    PRIV_DATA_GET_OR_RETURN(ewkTile, priv, 0);
     return ewk_tile_matrix_unused_cache_get(priv->model.matrix);
 }
 
-void ewk_tiled_backing_store_tile_unused_cache_set(Evas_Object *o, Ewk_Tile_Unused_Cache *tuc)
-{
-    PRIV_DATA_GET_OR_RETURN(o, priv);
-
-    if (ewk_tile_matrix_unused_cache_get(priv->model.matrix) == tuc)
-        return;
-
-    _ewk_tiled_backing_store_model_matrix_create(priv, tuc);
-}
-
-static Eina_Bool _ewk_tiled_backing_store_scroll_full_offset_set_internal(Ewk_Tiled_Backing_Store_Data *priv, Evas_Coord x, Evas_Coord y)
+void ewk_tiled_backing_store_tile_unused_cache_set(Evas_Object* ewkTile, Ewk_Tile_Unused_Cache* tileUnusedCache)
+{
+    PRIV_DATA_GET_OR_RETURN(ewkTile, priv);
+
+    if (ewk_tile_matrix_unused_cache_get(priv->model.matrix) == tileUnusedCache)
+        return;
+
+    _ewk_tiled_backing_store_model_matrix_create(priv, tileUnusedCache);
+}
+
+static Eina_Bool _ewk_tiled_backing_store_scroll_full_offset_set_internal(Ewk_Tiled_Backing_Store_Data* priv, Evas_Coord x, Evas_Coord y)
 {
     /* TODO: check offset go out of bounds, clamp */
@@ -1445 +1438 @@
 }
 
-Eina_Bool ewk_tiled_backing_store_scroll_full_offset_set(Evas_Object *o, Evas_Coord x, Evas_Coord y)
-{
-    DBG("o=%p, x=%d, y=%d", o, x, y);
-
-    PRIV_DATA_GET_OR_RETURN(o, priv, EINA_FALSE);
+Eina_Bool ewk_tiled_backing_store_scroll_full_offset_set(Evas_Object* ewkTile, Evas_Coord x, Evas_Coord y)
+{
+    DBG("o=%p, x=%d, y=%d", ewkTile, x, y);
+
+    PRIV_DATA_GET_OR_RETURN(ewkTile, priv, EINA_FALSE);
     if (x == priv->view.offset.cur.x && y == priv->view.offset.cur.y)
         return EINA_TRUE;
@@ -1456 +1449 @@
 }
 
-Eina_Bool ewk_tiled_backing_store_scroll_full_offset_add(Evas_Object *o, Evas_Coord dx, Evas_Coord dy)
-{
-    DBG("o=%p, dx=%d, dy=%d", o, dx, dy);
-
-    PRIV_DATA_GET_OR_RETURN(o, priv, EINA_FALSE);
+Eina_Bool ewk_tiled_backing_store_scroll_full_offset_add(Evas_Object* ewkTile, Evas_Coord dx, Evas_Coord dy)
+{
+    DBG("o=%p, dx=%d, dy=%d", ewkTile, dx, dy);
+
+    PRIV_DATA_GET_OR_RETURN(ewkTile, priv, EINA_FALSE);
     if (!dx && !dy)
         return EINA_TRUE;
 
     return _ewk_tiled_backing_store_scroll_full_offset_set_internal
-        (priv, priv->view.offset.cur.x + dx, priv->view.offset.cur.y + dy);
-}
-
-static Eina_Bool _ewk_tiled_backing_store_zoom_set_internal(Ewk_Tiled_Backing_Store_Data *priv, float *zoom, Evas_Coord cx, Evas_Coord cy, Evas_Coord *offx, Evas_Coord *offy)
-{
-    *offx = priv->view.offset.cur.x;
-    *offy = priv->view.offset.cur.y;
+               (priv, priv->view.offset.cur.x + dx, priv->view.offset.cur.y + dy);
+}
+
+static Eina_Bool _ewk_tiled_backing_store_zoom_set_internal(Ewk_Tiled_Backing_Store_Data* priv, float* zoom, Evas_Coord currentX, Evas_Coord currentY, Evas_Coord* offsetX, Evas_Coord* offsetY)
+{
+    *offsetX = priv->view.offset.cur.x;
+    *offsetY = priv->view.offset.cur.y;
 
     if (fabsf(priv->view.tile.zoom - *zoom) < ZOOM_STEP_MIN) {
@@ -1482 +1475 @@
     Evas_Coord tw, th;
 
-    *zoom = ROUNDED_ZOOM(priv->view.tile.w, *zoom);
-
-    tw = priv->view.tile.w;
-    th = priv->view.tile.h;
+    *zoom = ROUNDED_ZOOM(priv->view.tile.width, *zoom);
+
+    tw = priv->view.tile.width;
+    th = priv->view.tile.height;
 
     float scale = *zoom / priv->view.tile.zoom;
 
     priv->view.tile.zoom = *zoom;
-    // todo: check cx [0, w]...
-    priv->view.offset.zoom_center.x = cx;
-    priv->view.offset.zoom_center.y = cy;
-
-
-    if (!priv->view.w || !priv->view.h) {
+    // todo: check currentX [0, w]...
+    priv->view.offset.zoom_center.x = currentX;
+    priv->view.offset.zoom_center.y = currentY;
+
+
+    if (!priv->view.width || !priv->view.height) {
         priv->view.offset.base.x = 0;
         priv->view.offset.base.y = 0;
         return EINA_TRUE;
     }
-    Eina_Inlist **itr, **itr_end;
-    Ewk_Tiled_Backing_Store_Item *it;
-
-    Evas_Coord new_x = cx + (priv->view.offset.cur.x - cx) * scale;
-    Evas_Coord new_y = cy + (priv->view.offset.cur.y - cy) * scale;
-
-    Evas_Coord model_width = priv->model.width * scale;
-    Evas_Coord model_height = priv->model.height * scale;
-
-    if (model_width < priv->view.w || new_x >= 0)
+    Eina_Inlist** itr, **itr_end;
+    Ewk_Tiled_Backing_Store_Item* it;
+
+    Evas_Coord new_x = currentX + (priv->view.offset.cur.x - currentX) * scale;
+    Evas_Coord new_y = currentY + (priv->view.offset.cur.y - currentY) * scale;
+
+    Evas_Coord model_w = priv->model.width * scale;
+    Evas_Coord model_h = priv->model.height * scale;
+
+    if (model_w < priv->view.width || new_x >= 0)
         new_x = 0;
-    else if (-new_x + priv->view.w >= model_width)
-        new_x = -model_width + priv->view.w;
-
-    if (model_height < priv->view.h || new_y >= 0)
+    else if (-new_x + priv->view.width >= model_w)
+        new_x = -model_w + priv->view.width;
+
+    if (model_h < priv->view.height || new_y >= 0)
         new_y = 0;
-    else if (-new_y + priv->view.h >= model_height)
-        new_y = -model_height + priv->view.h;
+    else if (-new_y + priv->view.height >= model_h)
+        new_y = -model_h + priv->view.height;
 
     Evas_Coord bx = new_x % tw;
@@ -1535 +1528 @@
     priv->view.offset.old.x = priv->view.offset.cur.x;
     priv->view.offset.old.y = priv->view.offset.cur.y;
-    *offx = priv->view.offset.cur.x;
-    *offy = priv->view.offset.cur.y;
+    *offsetX = priv->view.offset.cur.x;
+    *offsetY = priv->view.offset.cur.y;
 
     evas_object_move(
@@ -1553 +1546 @@
     for (; itr < itr_end; itr++) {
         Evas_Coord ox = base_ox;
-        Eina_Inlist *lst = *itr;
+        Eina_Inlist* lst = *itr;
 
         EINA_INLIST_FOREACH(lst, it) {
@@ -1566 +1559 @@
 }
 
-Eina_Bool ewk_tiled_backing_store_zoom_set(Evas_Object *o, float *zoom, Evas_Coord cx, Evas_Coord cy, Evas_Coord *offx, Evas_Coord *offy)
-{
-    DBG("o=%p, zoom=%f", o, (double)*zoom);
-
-    PRIV_DATA_GET_OR_RETURN(o, priv, EINA_FALSE);
-
-    return _ewk_tiled_backing_store_zoom_set_internal(priv, zoom, cx, cy, offx, offy);
-}
-
-Eina_Bool ewk_tiled_backing_store_zoom_weak_set(Evas_Object *o, float zoom, Evas_Coord cx, Evas_Coord cy)
-{
-    DBG("o=%p, zoom=%f", o, (double)zoom);
-    PRIV_DATA_GET_OR_RETURN(o, priv, EINA_FALSE);
-    if (!priv->view.w || !priv->view.h)
+Eina_Bool ewk_tiled_backing_store_zoom_set(Evas_Object* ewkTile, float* zoom, Evas_Coord currentX, Evas_Coord currentY, Evas_Coord* offsetX, Evas_Coord* offsetY)
+{
+    DBG("o=%p, zoom=%f", ewkTile, *zoom);
+
+    PRIV_DATA_GET_OR_RETURN(ewkTile, priv, EINA_FALSE);
+
+    return _ewk_tiled_backing_store_zoom_set_internal(priv, zoom, currentX, currentY, offsetX, offsetY);
+}
+
+Eina_Bool ewk_tiled_backing_store_zoom_weak_set(Evas_Object* ewkTile, float zoom, Evas_Coord currentX, Evas_Coord currentY)
+{
+    DBG("o=%p, zoom=%f", ewkTile, zoom);
+    PRIV_DATA_GET_OR_RETURN(ewkTile, priv, EINA_FALSE);
+    if (!priv->view.width || !priv->view.height)
         return EINA_FALSE;
-    Eina_Inlist **itr, **itr_end;
-    Ewk_Tiled_Backing_Store_Item *it;
+    Eina_Inlist** itr, ** itr_end;
+    Ewk_Tiled_Backing_Store_Item* it;
     Evas_Coord tw, th;
     Eina_Bool recalc = EINA_FALSE;
@@ -1588 +1581 @@
     float scale = zoom / priv->view.tile.zoom;
 
-    tw = TILE_SIZE_AT_ZOOM(priv->view.tile.w, scale);
-    scale = TILE_ZOOM_AT_SIZE(tw, priv->view.tile.w);
-    th = TILE_SIZE_AT_ZOOM(priv->view.tile.h, scale);
+    tw = TILE_SIZE_AT_ZOOM(priv->view.tile.width, scale);
+    scale = TILE_ZOOM_AT_SIZE(tw, priv->view.tile.width);
+    th = TILE_SIZE_AT_ZOOM(priv->view.tile.height, scale);
     zoom = scale * priv->view.tile.zoom;
 
-    Evas_Coord model_width = priv->model.width * scale;
-    Evas_Coord model_height = priv->model.height * scale;
-
-    evas_object_resize(priv->contents_clipper, model_width, model_height);
-
-    int vrows = ceil((float)priv->view.h / (float)th) + 1;
-    int vcols = ceil((float)priv->view.w / (float)tw) + 1;
-    Evas_Coord new_x = cx + (priv->view.offset.cur.x - cx) * scale;
-    Evas_Coord new_y = cy + (priv->view.offset.cur.y - cy) * scale;
+    Evas_Coord model_w = priv->model.width * scale;
+    Evas_Coord model_h = priv->model.height * scale;
+
+    evas_object_resize(priv->contents_clipper, model_w, model_h);
+
+    int vrows = static_cast<int>(ceil(static_cast<float>(priv->view.height / th)) + 1);
+    int vcols = static_cast<int>(ceil(static_cast<float>(priv->view.width / tw)) + 1);
+    Evas_Coord new_x = currentX + (priv->view.offset.cur.x - currentX) * scale;
+    Evas_Coord new_y = currentY + (priv->view.offset.cur.y - currentY) * scale;
     Evas_Coord bx = new_x % tw;
     Evas_Coord by = new_y % th;
@@ -1617 +1610 @@
 
     if (recalc) {
-        Evas_Coord w, h;
-        evas_object_geometry_get(o, 0, 0, &w, &h);
-        _ewk_tiled_backing_store_recalc_renderers(priv, w, h, tw, th);
+        Evas_Coord width, height;
+        evas_object_geometry_get(ewkTile, 0, 0, &width, &height);
+        _ewk_tiled_backing_store_recalc_renderers(priv, width, height, tw, th);
         _ewk_tiled_backing_store_fill_renderers(priv);
         _ewk_tiled_backing_store_updates_process(priv);
@@ -1636 +1629 @@
     for (; itr < itr_end; itr++) {
         Evas_Coord ox = base_ox;
-        Eina_Inlist *lst = *itr;
+        Eina_Inlist* lst = *itr;
 
         EINA_INLIST_FOREACH(lst, it) {
@@ -1649 +1642 @@
 }
 
-void ewk_tiled_backing_store_fix_offsets(Evas_Object *o, Evas_Coord w, Evas_Coord h)
-{
-    PRIV_DATA_GET_OR_RETURN(o, priv);
-    Eina_Inlist **itr, **itr_end;
-    Ewk_Tiled_Backing_Store_Item *it;
+void ewk_tiled_backing_store_fix_offsets(Evas_Object* ewkTile, Evas_Coord width, Evas_Coord height)
+{
+    PRIV_DATA_GET_OR_RETURN(ewkTile, priv);
+    Eina_Inlist** itr, **itr_end;
+    Ewk_Tiled_Backing_Store_Item* it;
     Evas_Coord new_x = priv->view.offset.cur.x;
     Evas_Coord new_y = priv->view.offset.cur.y;
     Evas_Coord bx = priv->view.offset.base.x;
     Evas_Coord by = priv->view.offset.base.y;
-    Evas_Coord tw = priv->view.tile.w;
-    Evas_Coord th = priv->view.tile.h;
-
-    if (-new_x > w) {
-        new_x = -w;
+    Evas_Coord tw = priv->view.tile.width;
+    Evas_Coord th = priv->view.tile.height;
+
+    if (-new_x > width) {
+        new_x = -width;
         bx = new_x % tw;
         priv->model.base.col = -new_x / tw;
     }
 
-    if (-new_y > h) {
-        new_y = -h;
+    if (-new_y > height) {
+        new_y = -height;
         by = new_y % th;
         priv->model.base.row = -new_y / th;
     }
 
-    if (bx >= 0 || bx <= -2 * priv->view.tile.w) {
+    if (bx >= 0 || bx <= -2 * priv->view.tile.width) {
         bx = new_x % tw;
         priv->model.base.col = -new_x / tw;
     }
 
-    if (by >= 0 || by <= -2 * priv->view.tile.h) {
+    if (by >= 0 || by <= -2 * priv->view.tile.height) {
         by = new_y % th;
         priv->model.base.row = -new_y / th;
@@ -1701 +1694 @@
     for (; itr < itr_end; itr++) {
         Evas_Coord ox = base_ox;
-        Eina_Inlist *lst = *itr;
+        Eina_Inlist* lst = *itr;
 
         EINA_INLIST_FOREACH(lst, it) {
@@ -1712 +1705 @@
 }
 
-void ewk_tiled_backing_store_zoom_weak_smooth_scale_set(Evas_Object *o, Eina_Bool smooth_scale)
-{
-    PRIV_DATA_GET_OR_RETURN(o, priv);
-    Eina_Inlist **itr, **itr_end;
+void ewk_tiled_backing_store_zoom_weak_smooth_scale_set(Evas_Object* ewkTile, Eina_Bool smoothScale)
+{
+    PRIV_DATA_GET_OR_RETURN(ewkTile, priv);
+    Eina_Inlist** itr, **itr_end;
 
     itr = priv->view.items;
     itr_end = itr + priv->view.rows;
-    priv->view.tile.zoom_weak_smooth_scale = smooth_scale;
+    priv->view.tile.zoom_weak_smooth_scale = smoothScale;
 
     for (; itr< itr_end; itr++) {
-        Ewk_Tiled_Backing_Store_Item *it;
+        Ewk_Tiled_Backing_Store_Item* it;
         EINA_INLIST_FOREACH(*itr, it)
             if (it->tile)
                 _ewk_tiled_backing_store_item_smooth_scale_set
-                    (it, smooth_scale);
-    }
-}
-
-Eina_Bool ewk_tiled_backing_store_update(Evas_Object *o, const Eina_Rectangle *update)
-{
-    PRIV_DATA_GET_OR_RETURN(o, priv, EINA_FALSE);
+                    (it, smoothScale);
+    }
+}
+
+Eina_Bool ewk_tiled_backing_store_update(Evas_Object* ewkTile, const Eina_Rectangle* update)
+{
+    PRIV_DATA_GET_OR_RETURN(ewkTile, priv, EINA_FALSE);
 
     if (priv->render.disabled)
@@ -1741 +1734 @@
 }
 
-void ewk_tiled_backing_store_updates_process_pre_set(Evas_Object *o, void *(*cb)(void *data, Evas_Object *o), const void *data)
-{
-    PRIV_DATA_GET_OR_RETURN(o, priv);
-    priv->process.pre_cb = cb;
+void ewk_tiled_backing_store_updates_process_pre_set(Evas_Object* ewkTile, void* (*callback)(void* data, Evas_Object *ewkTile), const void* data)
+{
+    PRIV_DATA_GET_OR_RETURN(ewkTile, priv);
+    priv->process.pre_cb = callback;
     priv->process.pre_data = (void*)data;
 }
 
-void ewk_tiled_backing_store_updates_process_post_set(Evas_Object *o, void *(*cb)(void *data, void *pre_data, Evas_Object *o), const void *data)
-{
-    PRIV_DATA_GET_OR_RETURN(o, priv);
-    priv->process.post_cb = cb;
+void ewk_tiled_backing_store_updates_process_post_set(Evas_Object* ewkTile, void* (*callback)(void* data, void* pre_data, Evas_Object *ewkTile), const void* data)
+{
+    PRIV_DATA_GET_OR_RETURN(ewkTile, priv);
+    priv->process.post_cb = callback;
     priv->process.post_data = (void*)data;
 }
 
-void ewk_tiled_backing_store_updates_process(Evas_Object *o)
-{
-    PRIV_DATA_GET_OR_RETURN(o, priv);
+void ewk_tiled_backing_store_updates_process(Evas_Object* ewkTile)
+{
+    PRIV_DATA_GET_OR_RETURN(ewkTile, priv);
     _ewk_tiled_backing_store_updates_process(priv);
 }
 
-void ewk_tiled_backing_store_updates_clear(Evas_Object *o)
-{
-    PRIV_DATA_GET_OR_RETURN(o, priv);
+void ewk_tiled_backing_store_updates_clear(Evas_Object* ewkTile)
+{
+    PRIV_DATA_GET_OR_RETURN(ewkTile, priv);
 
     ewk_tile_matrix_updates_clear(priv->model.matrix);
 }
 
-void ewk_tiled_backing_store_contents_resize(Evas_Object *o, Evas_Coord width, Evas_Coord height)
-{
-    PRIV_DATA_GET_OR_RETURN(o, priv);
+void ewk_tiled_backing_store_contents_resize(Evas_Object* ewkTile, Evas_Coord width, Evas_Coord height)
+{
+    PRIV_DATA_GET_OR_RETURN(ewkTile, priv);
 
     if (width == priv->model.width && height == priv->model.height)
@@ -1779 +1772 @@
     priv->changed.model = EINA_TRUE;
 
-    DBG("width,height=%d, %d", width, height);
+    DBG("w,h=%d, %d", width, height);
     _ewk_tiled_backing_store_changed(priv);
 }
 
-void ewk_tiled_backing_store_disabled_update_set(Evas_Object *o, Eina_Bool value)
-{
-    PRIV_DATA_GET_OR_RETURN(o, priv);
+void ewk_tiled_backing_store_disabled_update_set(Evas_Object* ewkTile, Eina_Bool value)
+{
+    PRIV_DATA_GET_OR_RETURN(ewkTile, priv);
 
     if (value != priv->render.disabled)
@@ -1791 +1784 @@
 }
 
-void ewk_tiled_backing_store_flush(Evas_Object *o)
-{
-    PRIV_DATA_GET_OR_RETURN(o, priv);
-    Ewk_Tile_Unused_Cache *tuc = 0;
+void ewk_tiled_backing_store_flush(Evas_Object* ewkTile)
+{
+    PRIV_DATA_GET_OR_RETURN(ewkTile, priv);
+    Ewk_Tile_Unused_Cache* tuc = 0;
 
     priv->view.offset.cur.x = 0;
@@ -1826 +1819 @@
 }
 
-Eina_Bool ewk_tiled_backing_store_pre_render_region(Evas_Object *o, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, float zoom)
-{
-    PRIV_DATA_GET_OR_RETURN(o, priv, EINA_FALSE);
+Eina_Bool ewk_tiled_backing_store_pre_render_region(Evas_Object* ewkTile, Evas_Coord x, Evas_Coord y, Evas_Coord width, Evas_Coord height, float zoom)
+{
+    PRIV_DATA_GET_OR_RETURN(ewkTile, priv, EINA_FALSE);
     Eina_Tile_Grid_Slicer slicer;
-    const Eina_Tile_Grid_Info *info;
+    const Eina_Tile_Grid_Info* info;
     Evas_Coord tw, th;
-    Ewk_Tile_Unused_Cache *tuc;
-
-    tw = priv->view.tile.w;
-    th = priv->view.tile.h;
-    zoom = ROUNDED_ZOOM(priv->view.tile.w, zoom);
-
-    if (!eina_tile_grid_slicer_setup(&slicer, x, y, w, h, tw, th)) {
+    Ewk_Tile_Unused_Cache* tuc;
+
+    tw = priv->view.tile.width;
+    th = priv->view.tile.height;
+    zoom = ROUNDED_ZOOM(priv->view.tile.width, zoom);
+
+    if (!eina_tile_grid_slicer_setup(&slicer, x, y, width, height, tw, th)) {
         ERR("could not setup grid slicer for %d,%d+%dx%d tile=%dx%d",
-            x, y, w, h, tw, th);
+            x, y, width, height, tw, th);
         return EINA_FALSE;
     }
@@ -1854 +1847 @@
 
     tuc = ewk_tile_matrix_unused_cache_get(priv->model.matrix);
-    ewk_tile_unused_cache_lock_area(tuc, x, y, w, h, zoom);
+    ewk_tile_unused_cache_lock_area(tuc, x, y, width, height, zoom);
     return EINA_TRUE;
 }
 
-Eina_Bool ewk_tiled_backing_store_pre_render_relative_radius(Evas_Object *o, unsigned int n, float zoom)
-{
-    PRIV_DATA_GET_OR_RETURN(o, priv, EINA_FALSE);
-    unsigned long start_row, end_row, start_col, end_col, i, j, w, h;
-    Ewk_Tile_Unused_Cache *tuc;
+Eina_Bool ewk_tiled_backing_store_pre_render_relative_radius(Evas_Object* ewkTile, unsigned int n, float zoom)
+{
+    PRIV_DATA_GET_OR_RETURN(ewkTile, priv, EINA_FALSE);
+    unsigned long start_row, end_row, start_col, end_col, i, j, width, height;
+    Ewk_Tile_Unused_Cache* tuc;
 
     INF("priv->model.base.row =%ld, n=%u priv->view.rows=%lu",
-            priv->model.base.row, n, priv->view.rows);
+        priv->model.base.row, n, priv->view.rows);
     start_row = (long)priv->model.base.row - n;
     start_col = (long)priv->model.base.col - n;
     end_row = std::min(priv->model.cur.rows - 1,
-                  priv->model.base.row + priv->view.rows + n - 1);
+                       priv->model.base.row + priv->view.rows + n - 1);
     end_col = std::min(priv->model.cur.cols - 1,
-                  priv->model.base.col + priv->view.cols + n - 1);
+                       priv->model.base.col + priv->view.cols + n - 1);
 
     INF("start_row=%lu, end_row=%lu, start_col=%lu, end_col=%lu",
-         start_row, end_row, start_col, end_col);
-
-    zoom = ROUNDED_ZOOM(priv->view.tile.w, zoom);
+        start_row, end_row, start_col, end_col);
+
+    zoom = ROUNDED_ZOOM(priv->view.tile.width, zoom);
 
     for (i = start_row; i <= end_row; i++)
@@ -1887 +1880 @@
 
     tuc = ewk_tile_matrix_unused_cache_get(priv->model.matrix);
-    h = (end_row - start_row + 1) * TILE_SIZE_AT_ZOOM(priv->view.tile.h, zoom);
-    w = (end_col - start_col + 1) * TILE_SIZE_AT_ZOOM(priv->view.tile.w, zoom);
+    height = (end_row - start_row + 1) * TILE_SIZE_AT_ZOOM(priv->view.tile.height, zoom);
+    width = (end_col - start_col + 1) * TILE_SIZE_AT_ZOOM(priv->view.tile.width, zoom);
     ewk_tile_unused_cache_lock_area(tuc,
-            start_col * TILE_SIZE_AT_ZOOM(priv->view.tile.w, zoom),
-            start_row * TILE_SIZE_AT_ZOOM(priv->view.tile.h, zoom), w, h, zoom);
+                                    start_col * TILE_SIZE_AT_ZOOM(priv->view.tile.width, zoom),
+                                    start_row * TILE_SIZE_AT_ZOOM(priv->view.tile.height, zoom), width, height, zoom);
 
     return EINA_TRUE;
 }
 
-void ewk_tiled_backing_store_pre_render_cancel(Evas_Object *o)
-{
-    PRIV_DATA_GET_OR_RETURN(o, priv);
-    Ewk_Tile_Unused_Cache *tuc;
+void ewk_tiled_backing_store_pre_render_cancel(Evas_Object* ewkTile)
+{
+    PRIV_DATA_GET_OR_RETURN(ewkTile, priv);
+    Ewk_Tile_Unused_Cache* tuc;
 
     _ewk_tiled_backing_store_pre_render_request_clear(priv);
@@ -1907 +1900 @@
 }
 
-Eina_Bool ewk_tiled_backing_store_disable_render(Evas_Object *o)
-{
-    PRIV_DATA_GET_OR_RETURN(o, priv, EINA_FALSE);
+Eina_Bool ewk_tiled_backing_store_disable_render(Evas_Object* ewkTile)
+{
+    PRIV_DATA_GET_OR_RETURN(ewkTile, priv, EINA_FALSE);
     return _ewk_tiled_backing_store_disable_render(priv);
 }
 
-Eina_Bool ewk_tiled_backing_store_enable_render(Evas_Object *o)
-{
-    PRIV_DATA_GET_OR_RETURN(o, priv, EINA_FALSE);
+Eina_Bool ewk_tiled_backing_store_enable_render(Evas_Object* ewkTile)
+{
+    PRIV_DATA_GET_OR_RETURN(ewkTile, priv, EINA_FALSE);
     _ewk_tiled_backing_store_changed(priv);
     return _ewk_tiled_backing_store_enable_render(priv);

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

@@ -73 +73 @@
 
     /** Never ever change those after tile is created (respect const!) */
-    const Evas_Coord w, h;        /**< tile size (see TILE_SIZE_AT_ZOOM()) */
+    const Evas_Coord width, height;        /**< tile size (see TILE_SIZE_AT_ZOOM()) */
     const Evas_Colorspace cspace; /**< colorspace */
     const float zoom;             /**< zoom level contents were rendered at */
@@ -91 +91 @@
 Evas_Object* ewk_tiled_backing_store_add(Evas* e);
 
-void ewk_tiled_backing_store_render_cb_set(Evas_Object *o, Eina_Bool (* cb)(void* data, Ewk_Tile* t, const Eina_Rectangle* area), const void* data);
+void ewk_tiled_backing_store_render_cb_set(Evas_Object *o, Eina_Bool (*cb)(void* data, Ewk_Tile* t, const Eina_Rectangle* area), const void* data);
 
 Eina_Bool ewk_tiled_backing_store_scroll_full_offset_set(Evas_Object* o, Evas_Coord x, Evas_Coord y);

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

@@ -33 +33 @@
 
 struct _Ewk_Tile_Matrix {
-    Eina_Matrixsparse *matrix;
-    Ewk_Tile_Unused_Cache *tuc;
+    Eina_Matrixsparse* matrix;
+    Ewk_Tile_Unused_Cache* tuc;
     Evas_Colorspace cspace;
     struct {
-        void (*cb)(void *data, Ewk_Tile *t, const Eina_Rectangle *update);
-        void *data;
+        void (*cb)(void* data, Ewk_Tile* tile, const Eina_Rectangle* update);
+        void* data;
     } render;
     unsigned int frozen;
-    Eina_List *updates;
+    Eina_List* updates;
     struct {
-        Evas_Coord w, h;
+        Evas_Coord width, height;
     } tile;
 #ifdef DEBUG_MEM_LEAKS
@@ -60 +60 @@
 
 /* called when matrixsparse is resized or freed */
-static void _ewk_tile_matrix_cell_free(void *user_data, void *cell_data)
-{
-    Ewk_Tile_Matrix* tm = static_cast<Ewk_Tile_Matrix*>(user_data);
-    Ewk_Tile* t = static_cast<Ewk_Tile*>(cell_data);
-
-    if (!t)
+static void _ewk_tile_matrix_cell_free(void* userData, void* cellData)
+{
+    Ewk_Tile_Matrix* tm = static_cast<Ewk_Tile_Matrix*>(userData);
+    Ewk_Tile* tile = static_cast<Ewk_Tile*>(cellData);
+
+    if (!tile)
         return;
 
     ewk_tile_unused_cache_freeze(tm->tuc);
 
-    if (t->updates || t->stats.full_update)
-        tm->updates = eina_list_remove(tm->updates, t);
-
-    if (t->visible)
-        ERR("freeing cell that is visible, leaking tile %p", t);
+    if (tile->updates || tile->stats.full_update)
+        tm->updates = eina_list_remove(tm->updates, tile);
+
+    if (tile->visible)
+        ERR("freeing cell that is visible, leaking tile %p", tile);
     else {
-        if (!ewk_tile_unused_cache_tile_get(tm->tuc, t))
-            ERR("tile %p was not in cache %p? leaking...", t, tm->tuc);
+        if (!ewk_tile_unused_cache_tile_get(tm->tuc, tile))
+            ERR("tile %p was not in cache %p? leaking...", tile, tm->tuc);
         else {
-            DBG("tile cell does not exist anymore, free it %p", t);
-#ifdef DEBUG_MEM_LEAKS
-            tm->stats.bytes.freed += t->bytes;
+            DBG("tile cell does not exist anymore, free it %p", tile);
+#ifdef DEBUG_MEM_LEAKS
+            tm->stats.bytes.freed += tile->bytes;
             tm->stats.tiles.freed++;
 #endif
-            ewk_tile_free(t);
+            ewk_tile_free(tile);
         }
     }
@@ -92 +92 @@
 
 /* called when cache of unused tile is flushed */
-static void _ewk_tile_matrix_tile_free(void *data, Ewk_Tile *t)
+static void _ewk_tile_matrix_tile_free(void* data, Ewk_Tile* tile)
 {
     Ewk_Tile_Matrix* tm = static_cast<Ewk_Tile_Matrix*>(data);
-    Eina_Matrixsparse_Cell *cell;
- 
-    if (!eina_matrixsparse_cell_idx_get(tm->matrix, t->row, t->col, &cell)) {
-        ERR("removing tile %p that was not in the matrix? Leaking...", t);
+    Eina_Matrixsparse_Cell* cell;
+
+    if (!eina_matrixsparse_cell_idx_get(tm->matrix, tile->row, tile->col, &cell)) {
+        ERR("removing tile %p that was not in the matrix? Leaking...", tile);
         return;
     }
 
     if (!cell) {
-        ERR("removing tile %p that was not in the matrix? Leaking...", t);
+        ERR("removing tile %p that was not in the matrix? Leaking...", tile);
         return;
     }
 
-    if (t->updates || t->stats.full_update)
-        tm->updates = eina_list_remove(tm->updates, t);
+    if (tile->updates || tile->stats.full_update)
+        tm->updates = eina_list_remove(tm->updates, tile);
 
     /* set to null to avoid double free */
@@ -114 +114 @@
     eina_matrixsparse_cell_clear(cell);
 
-    if (EINA_UNLIKELY(!!t->visible)) {
+    if (EINA_UNLIKELY(!!tile->visible)) {
         ERR("cache of unused tiles requesting deletion of used tile %p? "
-            "Leaking...", t);
+            "Leaking...", tile);
         return;
     }
 
 #ifdef DEBUG_MEM_LEAKS
-    tm->stats.bytes.freed += t->bytes;
+    tm->stats.bytes.freed += tile->bytes;
     tm->stats.tiles.freed++;
 #endif
 
-    ewk_tile_free(t);
+    ewk_tile_free(tile);
 }
 
@@ -138 +138 @@
  * @param tuc cache of unused tiles or @c 0 to create one
  *        automatically.
- * @param cols number of columns in the matrix.
+ * @param columns number of columns in the matrix.
  * @param rows number of rows in the matrix.
  * @param cspace the color space used to create tiles in this matrix.
@@ -146 +146 @@
  * @return newly allocated instance on success, @c 0 on failure.
  */
-Ewk_Tile_Matrix *ewk_tile_matrix_new(Ewk_Tile_Unused_Cache *tuc, unsigned long cols, unsigned long rows, Evas_Colorspace cspace, void (*render_cb)(void *data, Ewk_Tile *t, const Eina_Rectangle *update), const void *render_data)
+Ewk_Tile_Matrix* ewk_tile_matrix_new(Ewk_Tile_Unused_Cache* tileUnusedCache, unsigned long columns, unsigned long rows, Evas_Colorspace colorSpace, void (*render_callback)(void* data, Ewk_Tile* tile, const Eina_Rectangle* update), const void* renderData)
 {
     Ewk_Tile_Matrix* tm = static_cast<Ewk_Tile_Matrix*>(calloc(1, sizeof(Ewk_Tile_Matrix)));
@@ -152 +152 @@
         return 0;
 
-    tm->matrix = eina_matrixsparse_new(rows, cols, _ewk_tile_matrix_cell_free, tm);
+    tm->matrix = eina_matrixsparse_new(rows, columns, _ewk_tile_matrix_cell_free, tm);
     if (!tm->matrix) {
         ERR("could not create sparse matrix.");
@@ -159 +159 @@
     }
 
-    if (tuc)
-        tm->tuc = ewk_tile_unused_cache_ref(tuc);
+    if (tileUnusedCache)
+        tm->tuc = ewk_tile_unused_cache_ref(tileUnusedCache);
     else {
         tm->tuc = ewk_tile_unused_cache_new(40960000);
@@ -171 +171 @@
     }
 
-    tm->cspace = cspace;
-    tm->render.cb = render_cb;
-    tm->render.data = (void *)render_data;
-    tm->tile.w = DEFAULT_TILE_W;
-    tm->tile.h = DEFAULT_TILE_H;
+    tm->cspace = colorSpace;
+    tm->render.cb = render_callback;
+    tm->render.data = (void*)renderData;
+    tm->tile.width = DEFAULT_TILE_W;
+    tm->tile.height = DEFAULT_TILE_H;
 
     return tm;
@@ -185 +185 @@
  * The cache instance is unreferenced, possibly freeing it.
  */
-void ewk_tile_matrix_free(Ewk_Tile_Matrix *tm)
+void ewk_tile_matrix_free(Ewk_Tile_Matrix* tileMatrix)
 {
 #ifdef DEBUG_MEM_LEAKS
@@ -191 +191 @@
 #endif
 
-    EINA_SAFETY_ON_NULL_RETURN(tm);
-    ewk_tile_unused_cache_freeze(tm->tuc);
-
-    eina_matrixsparse_free(tm->matrix);
-
-    ewk_tile_unused_cache_thaw(tm->tuc);
-    ewk_tile_unused_cache_unref(tm->tuc);
-
-#ifdef DEBUG_MEM_LEAKS
-    tiles = tm->stats.tiles.allocated - tm->stats.tiles.freed;
-    bytes = tm->stats.bytes.allocated - tm->stats.bytes.freed;
+    EINA_SAFETY_ON_NULL_RETURN(tileMatrix);
+    ewk_tile_unused_cache_freeze(tileMatrix->tuc);
+
+    eina_matrixsparse_free(tileMatrix->matrix);
+
+    ewk_tile_unused_cache_thaw(tileMatrix->tuc);
+    ewk_tile_unused_cache_unref(tileMatrix->tuc);
+
+#ifdef DEBUG_MEM_LEAKS
+    tiles = tileMatrix->stats.tiles.allocated - tileMatrix->stats.tiles.freed;
+    bytes = tileMatrix->stats.bytes.allocated - tileMatrix->stats.bytes.freed;
 
     tiles_leaked += tiles;
@@ -207 +207 @@
 
     if (tiles || bytes)
-        ERR("tiled matrix leaked: tiles[+%"PRIu64",-%"PRIu64":%"PRIu64"] "
-           "bytes[+%"PRIu64",-%"PRIu64":%"PRIu64"]",
-            tm->stats.tiles.allocated, tm->stats.tiles.freed, tiles,
-            tm->stats.bytes.allocated, tm->stats.bytes.freed, bytes);
+        ERR("tiled matrix leaked: tiles[+%" PRIu64 ",-%" PRIu64 ":%" PRIu64 "] "
+            "bytes[+%" PRIu64 ",-%" PRIu64 ":%" PRIu64 "]",
+            tileMatrix->stats.tiles.allocated, tileMatrix->stats.tiles.freed, tiles,
+            tileMatrix->stats.bytes.allocated, tileMatrix->stats.bytes.freed, bytes);
     else if (tiles_leaked || bytes_leaked)
-        WRN("tiled matrix had no leaks: tiles[+%"PRIu64",-%"PRIu64"] "
-           "bytes[+%"PRIu64",-%"PRIu64"], but some other leaked "
-            "%"PRIu64" tiles (%"PRIu64" bytes)",
-            tm->stats.tiles.allocated, tm->stats.tiles.freed,
-            tm->stats.bytes.allocated, tm->stats.bytes.freed,
+        WRN("tiled matrix had no leaks: tiles[+%" PRIu64 ",-%" PRIu64 "] "
+            "bytes[+%" PRIu64 ",-%" PRIu64 "], but some other leaked "
+            "%" PRIu64 " tiles (%" PRIu64 " bytes)",
+            tileMatrix->stats.tiles.allocated, tileMatrix->stats.tiles.freed,
+            tileMatrix->stats.bytes.allocated, tileMatrixm->stats.bytes.freed,
             tiles_leaked, bytes_leaked);
     else
-        INF("tiled matrix had no leaks: tiles[+%"PRIu64",-%"PRIu64"] "
-           "bytes[+%"PRIu64",-%"PRIu64"]",
-            tm->stats.tiles.allocated, tm->stats.tiles.freed,
-            tm->stats.bytes.allocated, tm->stats.bytes.freed);
-#endif
-
-    free(tm);
+        INF("tiled matrix had no leaks: tiles[+%" PRIu64 ",-%" PRIu64 "] "
+            "bytes[+%" PRIu64 ",-%" PRIu64 "]",
+            tileMatrix->stats.tiles.allocated, tileMatrix->stats.tiles.freed,
+            tileMatrix->stats.bytes.allocated, tileMatrix->stats.bytes.freed);
+#endif
+
+    free(tileMatrix);
 }
 
@@ -231 +231 @@
  * Resize matrix to given number of rows and columns.
  */
-void ewk_tile_matrix_resize(Ewk_Tile_Matrix *tm, unsigned long cols, unsigned long rows)
-{
-    EINA_SAFETY_ON_NULL_RETURN(tm);
-    eina_matrixsparse_size_set(tm->matrix, rows, cols);
+void ewk_tile_matrix_resize(Ewk_Tile_Matrix* tileMatrix, unsigned long cols, unsigned long rows)
+{
+    EINA_SAFETY_ON_NULL_RETURN(tileMatrix);
+    eina_matrixsparse_size_set(tileMatrix->matrix, rows, cols);
 }
 
@@ -242 +242 @@
  * No reference is taken to the cache.
  */
-Ewk_Tile_Unused_Cache *ewk_tile_matrix_unused_cache_get(const Ewk_Tile_Matrix *tm)
-{
-    EINA_SAFETY_ON_NULL_RETURN_VAL(tm, 0);
-    return tm->tuc;
+Ewk_Tile_Unused_Cache* ewk_tile_matrix_unused_cache_get(const Ewk_Tile_Matrix* tileMatrix)
+{
+    EINA_SAFETY_ON_NULL_RETURN_VAL(tileMatrix, 0);
+    return tileMatrix->tuc;
 }
 
@@ -251 +251 @@
  * Get the exact tile for the given position and zoom.
  *
- * If the tile was unused then it's removed from the cache.
+ * If the tile.widthas unused then it's removed from the cache.
  *
  * After usage, please give it back using
@@ -257 +257 @@
  * then use ewk_tile_matrix_tile_exact_exists().
  *
- * @param tm the tile matrix to get tile from.
- * @param col the column number.
+ * @param tileMatrix the tile matrix to get tile from.
+ * @param column the column number.
  * @param row the row number.
  * @param zoom the exact zoom to use.
@@ -269 +269 @@
  * @see ewk_tile_matrix_tile_exact_get()
  */
-Ewk_Tile *ewk_tile_matrix_tile_exact_get(Ewk_Tile_Matrix *tm, unsigned long col, unsigned long row, float zoom)
-{
-    Ewk_Tile* t = static_cast<Ewk_Tile*>(eina_matrixsparse_data_idx_get(tm->matrix, row, col));
-    if (!t)
+Ewk_Tile* ewk_tile_matrix_tile_exact_get(Ewk_Tile_Matrix* tileMatrix, unsigned long column, unsigned long row, float zoom)
+{
+    Ewk_Tile* tile = static_cast<Ewk_Tile*>(eina_matrixsparse_data_idx_get(tileMatrix->matrix, row, column));
+    if (!tile)
         return 0;
 
-    if (t->zoom == zoom)
+    if (tile->zoom == zoom)
         goto end;
 
-  end:
-    if (!t->visible) {
-        if (!ewk_tile_unused_cache_tile_get(tm->tuc, t))
+end:
+    if (!tile->visible) {
+        if (!ewk_tile_unused_cache_tile_get(tileMatrix->tuc, tile))
             WRN("Ewk_Tile was unused but not in cache? bug!");
     }
 
-    return t;
+    return tile;
 }
 
@@ -290 +290 @@
  * Checks if tile of given zoom exists in matrix.
  *
- * @param tm the tile matrix to check tile existence.
- * @param col the column number.
+ * @param tileMatrix the tile matrix to check tile existence.
+ * @param column the column number.
  * @param row the row number.
  * @param zoom the exact zoom to query.
@@ -299 +299 @@
  * @see ewk_tile_matrix_tile_exact_get()
  */
-Eina_Bool ewk_tile_matrix_tile_exact_exists(Ewk_Tile_Matrix *tm, unsigned long col, unsigned long row, float zoom)
-{
-    if (!eina_matrixsparse_data_idx_get(tm->matrix, row, col))
+Eina_Bool ewk_tile_matrix_tile_exact_exists(Ewk_Tile_Matrix* tileMatrix, unsigned long column, unsigned long row, float zoom)
+{
+    if (!eina_matrixsparse_data_idx_get(tileMatrix->matrix, row, column))
         return EINA_FALSE;
 
@@ -314 +314 @@
  * ewk_tile_matrix_tile_put() to give it back to matrix.
  *
- * @param tm the tile matrix to create tile on.
- * @param col the column number.
+ * @param tileMatrix the tile matrix to create tile on.
+ * @param column the column number.
  * @param row the row number.
  * @param zoom the level to create tile, used to determine tile size.
  */
-Ewk_Tile *ewk_tile_matrix_tile_new(Ewk_Tile_Matrix *tm, Evas *evas, unsigned long col, unsigned long row, float zoom)
+Ewk_Tile* ewk_tile_matrix_tile_new(Ewk_Tile_Matrix* tileMatrix, Evas* canvas, unsigned long column, unsigned long row, float zoom)
 {
     Evas_Coord tw, th;
-    Ewk_Tile *t;
-
-    EINA_SAFETY_ON_NULL_RETURN_VAL(tm, 0);
+    Ewk_Tile* tile;
+
+    EINA_SAFETY_ON_NULL_RETURN_VAL(tileMatrix, 0);
     EINA_SAFETY_ON_FALSE_RETURN_VAL(zoom > 0.0, 0);
 
-    tw = tm->tile.w;
-    th = tm->tile.h;
-
-    t = ewk_tile_new(evas, tw, th, zoom, tm->cspace);
-    if (!t) {
-        ERR("could not create tile %dx%d at %f, cspace=%d", tw, th, (double)zoom, tm->cspace);
+    tw = tileMatrix->tile.width;
+    th = tileMatrix->tile.height;
+
+    tile = ewk_tile_new(canvas, tw, th, zoom, tileMatrix->cspace);
+    if (!tile) {
+        ERR("could not create tile %dx%d at %f, cspace=%d", tw, th, (double)zoom, tileMatrix->cspace);
         return 0;
     }
 
-    if (!eina_matrixsparse_data_idx_set(tm->matrix, row, col, t)) {
+    if (!eina_matrixsparse_data_idx_set(tileMatrix->matrix, row, column, tile)) {
         ERR("could not set matrix cell, row/col outside matrix dimensions!");
-        ewk_tile_free(t);
+        ewk_tile_free(tile);
         return 0;
     }
 
-    t->col = col;
-    t->row = row;
-    t->x = col * tw;
-    t->y = row * th;
-
-    cairo_translate(t->cairo, -t->x, -t->y);
-
-    t->stats.full_update = EINA_TRUE;
-    tm->updates = eina_list_append(tm->updates, t);
-
-#ifdef DEBUG_MEM_LEAKS
-    tm->stats.bytes.allocated += t->bytes;
-    tm->stats.tiles.allocated++;
-#endif
-
-    return t;
+    tile->col = column;
+    tile->row = row;
+    tile->x = column * tw;
+    tile->y = row * th;
+
+    cairo_translate(tile->cairo, -tile->x, -tile->y);
+
+    tile->stats.full_update = EINA_TRUE;
+    tileMatrix->updates = eina_list_append(tileMatrix->updates, tile);
+
+#ifdef DEBUG_MEM_LEAKS
+    tileMatrix->stats.bytes.allocated += tile->bytes;
+    tileMatrix->stats.tiles.allocated++;
+#endif
+
+    return tile;
 }
 
@@ -367 +367 @@
  *
  * Any previous reference to tile should be released
- * (ewk_tile_hide()) before calling this function, so it will
+ * (ewk_tile.heightide()) before calling this function, so it will
  * be known if it is not visibile anymore and thus can be put into the
  * unused cache.
  *
- * @param tm the tile matrix to return tile to.
+ * @param tileMatrix the tile matrix to return tile to.
  * @param t the tile instance to return, must @b not be @c 0.
- * @param last_used time in which tile was last used.
+ * @param last_used time in which tile.widthas last used.
  *
  * @return #EINA_TRUE on success or #EINA_FALSE on failure.
  */
-Eina_Bool ewk_tile_matrix_tile_put(Ewk_Tile_Matrix *tm, Ewk_Tile *t, double last_used)
-{
-    EINA_SAFETY_ON_NULL_RETURN_VAL(tm, EINA_FALSE);
-    EINA_SAFETY_ON_NULL_RETURN_VAL(t, EINA_FALSE);
-
-    if (t->visible)
+Eina_Bool ewk_tile_matrix_tile_put(Ewk_Tile_Matrix* tileMatrix, Ewk_Tile* tile, double lastUsed)
+{
+    EINA_SAFETY_ON_NULL_RETURN_VAL(tileMatrix, EINA_FALSE);
+    EINA_SAFETY_ON_NULL_RETURN_VAL(tile, EINA_FALSE);
+
+    if (tile->visible)
         return EINA_TRUE;
 
-    t->stats.last_used = last_used;
-    return ewk_tile_unused_cache_tile_put(tm->tuc, t, _ewk_tile_matrix_tile_free, tm);
-}
-
-Eina_Bool ewk_tile_matrix_tile_update(Ewk_Tile_Matrix *tm, unsigned long col, unsigned long row, const Eina_Rectangle *update)
+    tile->stats.last_used = lastUsed;
+    return ewk_tile_unused_cache_tile_put(tileMatrix->tuc, tile, _ewk_tile_matrix_tile_free, tileMatrix);
+}
+
+Eina_Bool ewk_tile_matrix_tile_update(Ewk_Tile_Matrix* tileMatrix, unsigned long col, unsigned long row, const Eina_Rectangle* update)
 {
     Eina_Rectangle new_update;
-    EINA_SAFETY_ON_NULL_RETURN_VAL(tm, EINA_FALSE);
+    EINA_SAFETY_ON_NULL_RETURN_VAL(tileMatrix, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(update, EINA_FALSE);
 
@@ -402 +402 @@
     }
 
-    if (update->x + update->w - 1 >= tm->tile.w)
-        new_update.w = tm->tile.w - update->x;
-    if (update->y + update->h - 1 >= tm->tile.h)
-        new_update.h = tm->tile.h - update->y;
-
-    Ewk_Tile* t = static_cast<Ewk_Tile*>(eina_matrixsparse_data_idx_get(tm->matrix, row, col));
-    if (!t)
+    if (update->x + update->w - 1 >= tileMatrix->tile.width)
+        new_update.w = tileMatrix->tile.width - update->x;
+    if (update->y + update->h - 1 >= tileMatrix->tile.height)
+        new_update.h = tileMatrix->tile.height - update->y;
+
+    Ewk_Tile* tile = static_cast<Ewk_Tile*>(eina_matrixsparse_data_idx_get(tileMatrix->matrix, row, col));
+    if (!tile)
         return EINA_TRUE;
 
-    if (!t->updates && !t->stats.full_update)
-        tm->updates = eina_list_append(tm->updates, t);
-    ewk_tile_update_area(t, &new_update);
+    if (!tile->updates && !tile->stats.full_update)
+        tileMatrix->updates = eina_list_append(tileMatrix->updates, tile);
+    ewk_tile_update_area(tile, &new_update);
 
     return EINA_TRUE;
 }
 
-Eina_Bool ewk_tile_matrix_tile_update_full(Ewk_Tile_Matrix *tm, unsigned long col, unsigned long row)
-{
-    Eina_Matrixsparse_Cell *cell;
-    EINA_SAFETY_ON_NULL_RETURN_VAL(tm, EINA_FALSE);
-
-    if (!eina_matrixsparse_cell_idx_get(tm->matrix, row, col, &cell))
+Eina_Bool ewk_tile_matrix_tile_update_full(Ewk_Tile_Matrix* tileMatrix, unsigned long column, unsigned long row)
+{
+    Eina_Matrixsparse_Cell* cell;
+    EINA_SAFETY_ON_NULL_RETURN_VAL(tileMatrix, EINA_FALSE);
+
+    if (!eina_matrixsparse_cell_idx_get(tileMatrix->matrix, row, column, &cell))
         return EINA_FALSE;
 
@@ -429 +429 @@
         return EINA_TRUE;
 
-    Ewk_Tile* t = static_cast<Ewk_Tile*>(eina_matrixsparse_cell_data_get(cell));
-    if (!t) {
+    Ewk_Tile* tile = static_cast<Ewk_Tile*>(eina_matrixsparse_cell_data_get(cell));
+    if (!tile) {
         CRITICAL("matrix cell with no tile!");
         return EINA_TRUE;
     }
 
-    if (!t->updates && !t->stats.full_update)
-        tm->updates = eina_list_append(tm->updates, t);
-    ewk_tile_update_full(t);
+    if (!tile->updates && !tile->stats.full_update)
+        tileMatrix->updates = eina_list_append(tileMatrix->updates, tile);
+    ewk_tile_update_full(tile);
 
     return EINA_TRUE;
 }
 
-void ewk_tile_matrix_tile_updates_clear(Ewk_Tile_Matrix *tm, Ewk_Tile *t)
-{
-    EINA_SAFETY_ON_NULL_RETURN(tm);
-    if (!t->updates && !t->stats.full_update)
+void ewk_tile_matrix_tile_updates_clear(Ewk_Tile_Matrix* tileMatrix, Ewk_Tile* tile)
+{
+    EINA_SAFETY_ON_NULL_RETURN(tileMatrix);
+    if (!tile->updates && !tile->stats.full_update)
         return;
-    ewk_tile_updates_clear(t);
-    tm->updates = eina_list_remove(tm->updates, t);
-}
-
-static Eina_Bool _ewk_tile_matrix_slicer_setup(Ewk_Tile_Matrix *tm, const Eina_Rectangle *area, float zoom, Eina_Tile_Grid_Slicer *slicer)
+    ewk_tile_updates_clear(tile);
+    tileMatrix->updates = eina_list_remove(tileMatrix->updates, tile);
+}
+
+static Eina_Bool _ewk_tile_matrix_slicer_setup(Ewk_Tile_Matrix* tileMatrix, const Eina_Rectangle* area, float zoom, Eina_Tile_Grid_Slicer* slicer)
 {
     unsigned long rows, cols;
-    Evas_Coord x, y, w, h, tw, th;
+    Evas_Coord x, y, width, height, tw, th;
 
     if (area->w <= 0 || area->h <= 0) {
@@ -464 +464 @@
     x = area->x;
     y = area->y;
-    w = area->w;
-    h = area->h;
-
-    tw = tm->tile.w;
-    th = tm->tile.h;
+    width = area->w;
+    height = area->h;
+
+    tw = tileMatrix->tile.width;
+    th = tileMatrix->tile.height;
 
     // cropping area region to fit matrix
-    eina_matrixsparse_size_get(tm->matrix, &rows, &cols);
+    eina_matrixsparse_size_get(tileMatrix->matrix, &rows, &cols);
     if (x < 0) {
-        w += x;
+        width += x;
         x = 0;
     }
     if (y < 0) {
-        h += y;
+        height += y;
         y = 0;
     }
 
-    if (y + h - 1 > (long)(rows * th))
-        h = rows * th - y;
-    if (x + w - 1 > (long)(cols * tw))
-        w = cols * tw - x;
-
-    return eina_tile_grid_slicer_setup(slicer, x, y, w, h, tw, th);
-}
-
-
-Eina_Bool ewk_tile_matrix_update(Ewk_Tile_Matrix *tm, const Eina_Rectangle *update, float zoom)
-{
-    const Eina_Tile_Grid_Info *info;
+    if (y + height - 1 > (long)(rows * th))
+        height = rows * th - y;
+    if (x + width - 1 > (long)(cols * tw))
+        width = cols * tw - x;
+
+    return eina_tile_grid_slicer_setup(slicer, x, y, width, height, tw, th);
+}
+
+
+Eina_Bool ewk_tile_matrix_update(Ewk_Tile_Matrix* tileMatrix, const Eina_Rectangle* update, float zoom)
+{
+    const Eina_Tile_Grid_Info* info;
     Eina_Tile_Grid_Slicer slicer;
-    EINA_SAFETY_ON_NULL_RETURN_VAL(tm, EINA_FALSE);
+    EINA_SAFETY_ON_NULL_RETURN_VAL(tileMatrix, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(update, EINA_FALSE);
 
@@ -503 +503 @@
     }
 
-    if (!_ewk_tile_matrix_slicer_setup(tm, update, zoom, &slicer)) {
+    if (!_ewk_tile_matrix_slicer_setup(tileMatrix, update, zoom, &slicer)) {
         ERR("Could not setup slicer for update %d,%d+%dx%d at zoom %f",
             update->x, update->y, update->w, update->h, zoom);
@@ -514 +514 @@
         row = info->row;
 
-        Ewk_Tile* t = static_cast<Ewk_Tile*>(eina_matrixsparse_data_idx_get(tm->matrix, row, col));
-        if (!t)
+        Ewk_Tile* tile = static_cast<Ewk_Tile*>(eina_matrixsparse_data_idx_get(tileMatrix->matrix, row, col));
+        if (!tile)
             continue;
 
-        if (!t->updates && !t->stats.full_update)
-            tm->updates = eina_list_append(tm->updates, t);
+        if (!tile->updates && !tile->stats.full_update)
+            tileMatrix->updates = eina_list_append(tileMatrix->updates, tile);
         if (info->full)
-            ewk_tile_update_full(t);
+            ewk_tile_update_full(tile);
         else
-            ewk_tile_update_area(t, &info->rect);
+            ewk_tile_update_area(tile, &info->rect);
     }
 
@@ -530 +530 @@
 }
 
-void ewk_tile_matrix_updates_process(Ewk_Tile_Matrix *tm)
-{
-    Eina_List *l, *l_next;
+void ewk_tile_matrix_updates_process(Ewk_Tile_Matrix* tileMatrix)
+{
+    Eina_List* l, * l_next;
     void* item;
-    EINA_SAFETY_ON_NULL_RETURN(tm);
+    EINA_SAFETY_ON_NULL_RETURN(tileMatrix);
 
     // process updates, unflag tiles
-    EINA_LIST_FOREACH_SAFE(tm->updates, l, l_next, item) {
+    EINA_LIST_FOREACH_SAFE(tileMatrix->updates, l, l_next, item) {
         Ewk_Tile* tile = static_cast<Ewk_Tile*>(item);
-        ewk_tile_updates_process(tile, tm->render.cb, tm->render.data);
+        ewk_tile_updates_process(tile, tileMatrix->render.cb, tileMatrix->render.data);
         if (tile->visible) {
             ewk_tile_updates_clear(tile);
-            tm->updates = eina_list_remove_list(tm->updates, l);
+            tileMatrix->updates = eina_list_remove_list(tileMatrix->updates, l);
         }
     }
 }
 
-void ewk_tile_matrix_updates_clear(Ewk_Tile_Matrix *tm)
+void ewk_tile_matrix_updates_clear(Ewk_Tile_Matrix* tileMatrix)
 {
     void* item;
-    EINA_SAFETY_ON_NULL_RETURN(tm);
-
-    EINA_LIST_FREE(tm->updates, item)
+    EINA_SAFETY_ON_NULL_RETURN(tileMatrix);
+
+    EINA_LIST_FREE(tileMatrix->updates, item)
         ewk_tile_updates_clear(static_cast<Ewk_Tile*>(item));
-    tm->updates = 0;
+    tileMatrix->updates = 0;
 }
 
 // remove me later!
-void ewk_tile_matrix_dbg(const Ewk_Tile_Matrix *tm)
-{
-    Eina_Iterator *it = eina_matrixsparse_iterator_complete_new(tm->matrix);
-    Eina_Matrixsparse_Cell *cell;
+void ewk_tile_matrix_dbg(const Ewk_Tile_Matrix* tileMatrix)
+{
+    Eina_Iterator* it = eina_matrixsparse_iterator_complete_new(tileMatrix->matrix);
+    Eina_Matrixsparse_Cell* cell;
     Eina_Bool last_empty = EINA_FALSE;
 
 #ifdef DEBUG_MEM_LEAKS
-    printf("Ewk_Tile Matrix: tiles[+%"PRIu64",-%"PRIu64":%"PRIu64"] "
-           "bytes[+%"PRIu64",-%"PRIu64":%"PRIu64"]\n",
+    printf("Ewk_Tile Matrix: tiles[+%" PRIu64 ",-%" PRIu64 ":%" PRIu64 "] "
+           "bytes[+%" PRIu64 ",-%" PRIu64 ":%" PRIu64 "]\n",
            tm->stats.tiles.allocated, tm->stats.tiles.freed,
            tm->stats.tiles.allocated - tm->stats.tiles.freed,
@@ -579 +579 @@
         eina_matrixsparse_cell_position_get(cell, &row, &col);
 
-        Ewk_Tile* t = static_cast<Ewk_Tile*>(eina_matrixsparse_cell_data_get(cell));
-        if (!t) {
+        Ewk_Tile* tile = static_cast<Ewk_Tile*>(eina_matrixsparse_cell_data_get(cell));
+        if (!tile) {
             if (!last_empty) {
                 last_empty = EINA_TRUE;
@@ -591 +591 @@
                 printf("\n");
             }
-            printf("%3lu,%3lu %10p:", col, row, t);
-            printf(" [%3lu,%3lu + %dx%d @ %0.3f]%c", t->col, t->row, t->w, t->h, t->zoom, t->visible ? '*': ' ');
+            printf("%3lu,%3lu %10p:", col, row, tile);
+            printf(" [%3lu,%3lu + %dx%d @ %0.3f]%c", tile->col, tile->row, tile->width, tile->height, tile->zoom, tile->visible ? '*' : ' ');
             printf("\n");
         }
@@ -600 +600 @@
     eina_iterator_free(it);
 
-    ewk_tile_unused_cache_dbg(tm->tuc);
+    ewk_tile_unused_cache_dbg(tileMatrix->tuc);
 }
 
@@ -612 +612 @@
  * @see ewk_tile_matrix_thaw()
  */
-void ewk_tile_matrix_freeze(Ewk_Tile_Matrix *tm)
-{
-    EINA_SAFETY_ON_NULL_RETURN(tm);
-    if (!tm->frozen)
-        ewk_tile_unused_cache_freeze(tm->tuc);
-    tm->frozen++;
+void ewk_tile_matrix_freeze(Ewk_Tile_Matrix* tileMatrix)
+{
+    EINA_SAFETY_ON_NULL_RETURN(tileMatrix);
+    if (!tileMatrix->frozen)
+        ewk_tile_unused_cache_freeze(tileMatrix->tuc);
+    tileMatrix->frozen++;
 }
 
@@ -626 +626 @@
  * will run immediately.
  */
-void ewk_tile_matrix_thaw(Ewk_Tile_Matrix *tm)
-{
-    EINA_SAFETY_ON_NULL_RETURN(tm);
-    if (!tm->frozen) {
+void ewk_tile_matrix_thaw(Ewk_Tile_Matrix* tileMatrix)
+{
+    EINA_SAFETY_ON_NULL_RETURN(tileMatrix);
+    if (!tileMatrix->frozen) {
         ERR("thawing more than freezing!");
         return;
     }
 
-    tm->frozen--;
-    if (!tm->frozen)
-        ewk_tile_unused_cache_thaw(tm->tuc);
-}
+    tileMatrix->frozen--;
+    if (!tileMatrix->frozen)
+        ewk_tile_unused_cache_thaw(tileMatrix->tuc);
+}

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

@@ -53 +53 @@
 void ewk_tile_matrix_dbg(const Ewk_Tile_Matrix* tm);
 void ewk_tile_unused_cache_dbg(const Ewk_Tile_Unused_Cache* tuc);
-void ewk_tile_accounting_dbg(void);
+void ewk_tile_accounting_dbg();
 
 

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

@@ -37 +37 @@
 #endif
 
-#define IDX(col, row, rowspan) (col + (row * rowspan))
+#define IDX(col, row, rowspan) (col + (rowidth * rowspan))
 
 #ifdef DEBUG_MEM_LEAKS
@@ -54 +54 @@
 
 static size_t accounting_len = 0;
-static struct tile_account *accounting = 0;
-
-static inline struct tile_account *_ewk_tile_account_get(const Ewk_Tile *t)
-{
-    struct tile_account *acc;
+static struct tile_account* accounting = 0;
+
+static inline struct tile_account* _ewk_tile_account_get(const Ewk_Tile* tile)
+{
+    struct tile_account* acc;
     size_t i;
 
     for (i = 0; i < accounting_len; i++) {
-        if (accounting[i].size == t->w)
+        if (accounting[i].size == tile->width)
             return accounting + i;
     }
@@ -70 +70 @@
 
     acc = accounting + accounting_len;
-    acc->size = t->w;
+    acc->size = tile->width;
     acc->tiles.allocated = 0;
     acc->tiles.freed = 0;
@@ -81 +81 @@
 }
 
-static inline void _ewk_tile_account_allocated(const Ewk_Tile *t)
-{
-    struct tile_account *acc = _ewk_tile_account_get(t);
+static inline void _ewk_tile_account_allocated(const Ewk_Tile* tile)
+{
+    struct tile_account* acc = _ewk_tile_account_get(tile);
     if (!acc)
         return;
-    acc->bytes.allocated += t->bytes;
+    acc->bytes.allocated += tile->bytes;
     acc->tiles.allocated++;
 
-    bytes_allocated += t->bytes;
+    bytes_allocated += tile->bytes;
     tiles_allocated++;
 }
 
-static inline void _ewk_tile_account_freed(const Ewk_Tile *t)
-{
-    struct tile_account *acc = _ewk_tile_account_get(t);
+static inline void _ewk_tile_account_freed(const Ewk_Tile* tile)
+{
+    struct tile_account* acc = _ewk_tile_account_get(tile);
     if (!acc)
         return;
 
-    acc->bytes.freed += t->bytes;
+    acc->bytes.freed += tile->bytes;
     acc->tiles.freed++;
 
-    bytes_freed += t->bytes;
+    bytes_freed += tile->bytes;
     tiles_freed++;
 }
 
-void ewk_tile_accounting_dbg(void)
-{
-    struct tile_account *acc;
-    struct tile_account *acc_end;
-
-    printf("TILE BALANCE: tiles[+%"PRIu64",-%"PRIu64":%"PRIu64"] "
-           "bytes[+%"PRIu64",-%"PRIu64":%"PRIu64"]\n",
-            tiles_allocated, tiles_freed, tiles_allocated - tiles_freed,
-            bytes_allocated, bytes_freed, bytes_allocated - bytes_freed);
+void ewk_tile_accounting_dbg()
+{
+    struct tile_account* acc;
+    struct tile_account* acc_end;
+
+    printf("TILE BALANCE: tiles[+%" PRIu64 ",-%" PRIu64 ":%" PRIu64 "] "
+           "bytes[+%" PRIu64 ",-%" PRIu64 ":%" PRIu64 "]\n",
+           tiles_allocated, tiles_freed, tiles_allocated - tiles_freed,
+           bytes_allocated, bytes_freed, bytes_allocated - bytes_freed);
 
     if (!accounting_len)
@@ -128 +128 @@
         bytes = acc->bytes.allocated - acc->bytes.freed;
 
-        printf("   %4d: tiles[+%4"PRIu64",-%4"PRIu64":%4"PRIu64"] "
-               "bytes[+%8"PRIu64",-%8"PRIu64":%8"PRIu64"]%s\n",
+        printf("   %4d: tiles[+%4" PRIu64 ",-%4" PRIu64 ":%4" PRIu64 "] "
+               "bytes[+%8" PRIu64 ",-%8" PRIu64 ":%8" PRIu64 "]%s\n",
                acc->size,
                acc->tiles.allocated, acc->tiles.freed, tiles,
@@ -139 +139 @@
 #else
 
-static inline void _ewk_tile_account_allocated(const Ewk_Tile *t) { }
-static inline void _ewk_tile_account_freed(const Ewk_Tile *t) { }
-
-void ewk_tile_accounting_dbg(void)
+static inline void _ewk_tile_account_allocated(const Ewk_Tile* tile) { }
+static inline void _ewk_tile_account_freed(const Ewk_Tile* tile) { }
+
+void ewk_tile_accounting_dbg()
 {
     printf("compile webkit with DEBUG_MEM_LEAKS defined!\n");
@@ -148 +148 @@
 #endif
 
-static inline void _ewk_tile_paint_rgb888(Ewk_Tile *t, uint8_t r, uint8_t g, uint8_t b)
-{
-    uint32_t *dst32, *dst32_end, c1;
-    uint64_t *dst64, *dst64_end, c2;
-
-    c1 = 0xff000000 | ((uint32_t)r << 16) | ((uint32_t)g << 8) | b;
-    c2 = ((uint64_t)c1 << 32) | c1;
-
-    dst64 = (uint64_t *)t->pixels;
-    dst64_end = dst64 + ((t->bytes / 8) & ~7);
+static inline void _ewk_tile_paint_rgb888(Ewk_Tile* tile, uint8_t red, uint8_t green, uint8_t blue)
+{
+    uint32_t c1 = 0xff000000 | ((uint32_t)red << 16) | ((uint32_t)green << 8) | blue;
+    uint32_t c2 = ((uint64_t)c1 << 32) | c1;
+
+    uint64_t* dst64 = (uint64_t*)tile->pixels;
+    uint64_t* dst64_end = dst64 + ((tile->bytes / 8) & ~7);
     for (; dst64 < dst64_end; dst64 += 8) {
         /* TODO: ARM add pld or NEON instructions */
@@ -170 +167 @@
     }
 
-    dst32 = (uint32_t *)dst64_end;
-    dst32_end = (uint32_t *)(t->pixels + t->bytes);
+    uint32_t* dst32 = (uint32_t*)dst64_end;
+    uint32_t* dst32_end = (uint32_t*)(tile->pixels + tile->bytes);
     for (; dst32 < dst32_end; dst32++)
         *dst32 = c1;
 }
 
-static inline void _ewk_tile_paint_rgb565(Ewk_Tile *t, uint8_t r, uint8_t g, uint8_t b)
-{
-    uint16_t *dst16, *dst16_end, c1;
-    uint64_t *dst64, *dst64_end, c2;
-
-    c1 = ((((r >> 3) & 0x1f) << 11) |
-          (((g >> 2) & 0x3f) << 5) |
-          ((b >> 3) & 0x1f));
+static inline void _ewk_tile_paint_rgb565(Ewk_Tile* tile, uint8_t red, uint8_t green, uint8_t blue)
+{
+    uint16_t* dst16, * dst16_end, c1;
+    uint64_t* dst64, * dst64_end, c2;
+
+    c1 = ((((red >> 3) & 0x1f) << 11) |
+          (((green >> 2) & 0x3f) << 5) |
+          ((blue >> 3) & 0x1f));
 
     c2 = (((uint64_t)c1 << 48) | ((uint64_t)c1 << 32) |
           ((uint64_t)c1 << 16) | c1);
 
-    dst64 = (uint64_t *)t->pixels;
-    dst64_end = dst64 + ((t->bytes / 8) & ~7);
+    dst64 = (uint64_t*)tile->pixels;
+    dst64_end = dst64 + ((tile->bytes / 8) & ~7);
     for (; dst64 < dst64_end; dst64 += 8) {
         /* TODO: ARM add pld or NEON instructions */
@@ -202 +199 @@
     }
 
-    dst16 = (uint16_t *)dst16_end;
-    dst16_end = (uint16_t *)(t->pixels + t->bytes);
+    dst16 = (uint16_t*)dst16_end;
+    dst16_end = (uint16_t*)(tile->pixels + tile->bytes);
     for (; dst16 < dst16_end; dst16++)
         *dst16 = c1;
 }
 
-static inline void _ewk_tile_paint(Ewk_Tile *t, uint8_t r, uint8_t g, uint8_t b)
-{
-    if (t->cspace == EVAS_COLORSPACE_ARGB8888)
-        _ewk_tile_paint_rgb888(t, r, g, b);
-    else if (t->cspace == EVAS_COLORSPACE_RGB565_A5P)
-        _ewk_tile_paint_rgb565(t, r, g, b);
+static inline void _ewk_tile_paint(Ewk_Tile* tile, uint8_t red, uint8_t green, uint8_t blue)
+{
+    if (tile->cspace == EVAS_COLORSPACE_ARGB8888)
+        _ewk_tile_paint_rgb888(tile, red, green, blue);
+    else if (tile->cspace == EVAS_COLORSPACE_RGB565_A5P)
+        _ewk_tile_paint_rgb565(tile, red, green, blue);
     else
-        ERR("unknown color space: %d", t->cspace);
+        ERR("unknown color space: %d", tile->cspace);
 }
 
@@ -233 +230 @@
  * @c stats.full_update and @c updates.
  */
-Ewk_Tile *ewk_tile_new(Evas *evas, Evas_Coord w, Evas_Coord h, float zoom, Evas_Colorspace cspace)
-{
-    Evas_Coord *ec;
-    Evas_Colorspace *ecs;
-    float *f;
-    size_t *s;
-    Ewk_Tile *t;
+Ewk_Tile* ewk_tile_new(Evas* evas, Evas_Coord width, Evas_Coord height, float zoom, Evas_Colorspace colorSpace)
+{
+    Evas_Coord* ec;
+    Evas_Colorspace* ecs;
+    float* f;
+    size_t* s;
+    Ewk_Tile* tile;
     unsigned int area;
     size_t bytes;
@@ -245 +242 @@
     cairo_status_t status;
     int stride;
-    Ecore_Evas *ee;
-    const char *engine;
-
-    area = w * h;
-
-    if (cspace == EVAS_COLORSPACE_ARGB8888) {
+    Ecore_Evas* ee;
+    const char* engine;
+
+    area = width * height;
+
+    if (colorSpace == EVAS_COLORSPACE_ARGB8888) {
         bytes = area * 4;
-        stride = w * 4;
+        stride = width * 4;
         format = CAIRO_FORMAT_ARGB32;
-    } else if (cspace == EVAS_COLORSPACE_RGB565_A5P) {
+    } else if (colorSpace == EVAS_COLORSPACE_RGB565_A5P) {
         bytes = area * 2;
-        stride = w * 2;
+        stride = width * 2;
         format = CAIRO_FORMAT_RGB16_565;
     } else {
-        ERR("unknown color space: %d", cspace);
+        ERR("unknown color space: %d", colorSpace);
         return 0;
     }
 
-    DBG("size: %dx%d (%d), zoom: %f, cspace=%d", w, h, area, (double)zoom, cspace);
-
-    t = static_cast<Ewk_Tile*>(malloc(sizeof(Ewk_Tile)));
-    if (!t)
+    DBG("size: %dx%d (%d), zoom: %f, cspace=%d", width, height, area, (double)zoom, colorSpace);
+
+    tile = static_cast<Ewk_Tile*>(malloc(sizeof(Ewk_Tile)));
+    if (!tile)
         return 0;
 
-    t->image = evas_object_image_add(evas);
+    tile->image = evas_object_image_add(evas);
 
     ee = ecore_evas_ecore_evas_get(evas);
     engine = ecore_evas_engine_name_get(ee);
     if (engine && !strcmp(engine, "opengl_x11"))
-        evas_object_image_content_hint_set(t->image, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
-
-    t->visible = 0;
-    t->updates = 0;
-
-    memset(&t->stats, 0, sizeof(Ewk_Tile_Stats));
-    t->stats.area = area;
+        evas_object_image_content_hint_set(tile->image, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
+
+    tile->visible = 0;
+    tile->updates = 0;
+
+    memset(&tile->stats, 0, sizeof(Ewk_Tile_Stats));
+    tile->stats.area = area;
 
     /* ugly, but let's avoid at all costs having users to modify those */
-    ec = (Evas_Coord *)&t->w;
-    *ec = w;
-
-    ec = (Evas_Coord *)&t->h;
-    *ec = h;
-
-    ecs = (Evas_Colorspace *)&t->cspace;
-    *ecs = cspace;
-
-    f = (float *)&t->zoom;
+    ec = (Evas_Coord*)&tile->width;
+    *ec = width;
+
+    ec = (Evas_Coord*)&tile->height;
+    *ec = height;
+
+    ecs = (Evas_Colorspace*)&tile->cspace;
+    *ecs = colorSpace;
+
+    f = (float*)&tile->zoom;
     *f = zoom;
 
-    s = (size_t *)&t->bytes;
+    s = (size_t*)&tile->bytes;
     *s = bytes;
 
-    evas_object_image_size_set(t->image, t->w, t->h);
-    evas_object_image_colorspace_set(t->image, t->cspace);
-    t->pixels = static_cast<uint8_t*>(evas_object_image_data_get(t->image, EINA_TRUE));
-    t->surface = cairo_image_surface_create_for_data(t->pixels, format, w, h, stride);
-    status = cairo_surface_status(t->surface);
+    evas_object_image_size_set(tile->image, tile->width, tile->height);
+    evas_object_image_colorspace_set(tile->image, tile->cspace);
+    tile->pixels = static_cast<uint8_t*>(evas_object_image_data_get(tile->image, EINA_TRUE));
+    tile->surface = cairo_image_surface_create_for_data(tile->pixels, format, width, height, stride);
+    status = cairo_surface_status(tile->surface);
     if (status != CAIRO_STATUS_SUCCESS) {
         ERR("failed to create cairo surface: %s",
             cairo_status_to_string(status));
-        free(t);
+        free(tile);
         return 0;
     }
 
-    t->cairo = cairo_create(t->surface);
-    status = cairo_status(t->cairo);
+    tile->cairo = cairo_create(tile->surface);
+    status = cairo_status(tile->cairo);
     if (status != CAIRO_STATUS_SUCCESS) {
         ERR("failed to create cairo: %s", cairo_status_to_string(status));
-        cairo_surface_destroy(t->surface);
-        evas_object_del(t->image);
-        free(t);
+        cairo_surface_destroy(tile->surface);
+        evas_object_del(tile->image);
+        free(tile);
         return 0;
     }
 
-    _ewk_tile_account_allocated(t);
-
-    return t;
+    _ewk_tile_account_allocated(tile);
+
+    return tile;
 }
 
@@ -328 +325 @@
  * Free tile memory.
  */
-void ewk_tile_free(Ewk_Tile *t)
-{
-    _ewk_tile_account_freed(t);
-
-    if (t->updates)
-        eina_tiler_free(t->updates);
-
-    cairo_surface_destroy(t->surface);
-    cairo_destroy(t->cairo);
-    evas_object_del(t->image);
-    free(t);
+void ewk_tile_free(Ewk_Tile* tile)
+{
+    _ewk_tile_account_freed(tile);
+
+    if (tile->updates)
+        eina_tiler_free(tile->updates);
+
+    cairo_surface_destroy(tile->surface);
+    cairo_destroy(tile->cairo);
+    evas_object_del(tile->image);
+    free(tile);
 }
 
@@ -344 +341 @@
  * Make the tile visible, incrementing its counter.
  */
-void ewk_tile_show(Ewk_Tile *t)
-{
-    t->visible++;
-    evas_object_show(t->image);
+void ewk_tile_show(Ewk_Tile* tile)
+{
+    tile->visible++;
+    evas_object_show(tile->image);
 }
 
@@ -353 +350 @@
  * Decrement the visibility counter, making it invisible if necessary.
  */
-void ewk_tile_hide(Ewk_Tile *t)
-{
-    t->visible--;
-    if (!t->visible)
-        evas_object_hide(t->image);
+void ewk_tile_hide(Ewk_Tile* tile)
+{
+    tile->visible--;
+    if (!tile->visible)
+        evas_object_hide(tile->image);
 }
 
@@ -363 +360 @@
  * Returns EINA_TRUE if the tile is visible, EINA_FALSE otherwise.
  */
-Eina_Bool ewk_tile_visible_get(Ewk_Tile *t)
-{
-    return !!t->visible;
+Eina_Bool ewk_tile_visible_get(Ewk_Tile* tile)
+{
+    return !!tile->visible;
 }
 
@@ -371 +368 @@
  * Mark whole tile as dirty and requiring update.
  */
-void ewk_tile_update_full(Ewk_Tile *t)
+void ewk_tile_update_full(Ewk_Tile* tile)
 {
     /* TODO: list of tiles pending updates? */
-    t->stats.misses++;
-
-    if (!t->stats.full_update) {
-        t->stats.full_update = EINA_TRUE;
-        if (t->updates) {
-            eina_tiler_free(t->updates);
-            t->updates = 0;
+    tile->stats.misses++;
+
+    if (!tile->stats.full_update) {
+        tile->stats.full_update = EINA_TRUE;
+        if (tile->updates) {
+            eina_tiler_free(tile->updates);
+            tile->updates = 0;
         }
     }
@@ -388 +385 @@
  * Mark the specific subarea as dirty and requiring update.
  */
-void ewk_tile_update_area(Ewk_Tile *t, const Eina_Rectangle *r)
+void ewk_tile_update_area(Ewk_Tile* tile, const Eina_Rectangle* rect)
 {
     /* TODO: list of tiles pending updates? */
-    t->stats.misses++;
-
-    if (t->stats.full_update)
+    tile->stats.misses++;
+
+    if (tile->stats.full_update)
         return;
 
-    if (!r->x && !r->y && r->w == t->w && r->h == t->h) {
-        t->stats.full_update = EINA_TRUE;
-        if (t->updates) {
-            eina_tiler_free(t->updates);
-            t->updates = 0;
+    if (!rect->x && !rect->y && rect->w == tile->width && rect->h == tile->height) {
+        tile->stats.full_update = EINA_TRUE;
+        if (tile->updates) {
+            eina_tiler_free(tile->updates);
+            tile->updates = 0;
         }
         return;
     }
 
-    if (!t->updates) {
-        t->updates = eina_tiler_new(t->w, t->h);
-        if (!t->updates) {
-            CRITICAL("could not create eina_tiler %dx%d.", t->w, t->h);
+    if (!tile->updates) {
+        tile->updates = eina_tiler_new(tile->width, tile->height);
+        if (!tile->updates) {
+            CRITICAL("could not create eina_tiler %dx%d.", tile->width, tile->height);
             return;
         }
     }
 
-    eina_tiler_rect_add(t->updates, r);
+    eina_tiler_rect_add(tile->updates, rect);
 }
 
@@ -422 +419 @@
  * updates, use ewk_tile_updates_clear() for that.
  */
-void ewk_tile_updates_process(Ewk_Tile *t, void (*cb)(void *data, Ewk_Tile *t, const Eina_Rectangle *update), const void *data)
-{
-    if (t->stats.full_update) {
-        Eina_Rectangle r;
-        r.x = 0;
-        r.y = 0;
-        r.w = t->w;
-        r.h = t->h;
+void ewk_tile_updates_process(Ewk_Tile* tile, void (*callback)(void* data, Ewk_Tile* tile, const Eina_Rectangle* update), const void* data)
+{
+    if (tile->stats.full_update) {
+        Eina_Rectangle rect;
+        rect.x = 0;
+        rect.y = 0;
+        rect.w = tile->width;
+        rect.h = tile->height;
 #ifdef TILE_STATS_ACCOUNT_RENDER_TIME
         struct timeval timev;
         double render_start;
         gettimeofday(&timev, 0);
-        render_start = (double)timev.tv_sec +
-            (((double)timev.tv_usec) / 1000000);
+        render_startile = (double)timev.tv_sec +
+                       (((double)timev.tv_usec) / 1000000);
 #endif
-        cb((void *)data, t, &r);
+        callback((void*)data, tile, &rect);
 #ifdef TILE_STATS_ACCOUNT_RENDER_TIME
         gettimeofday(&timev, 0);
-        t->stats.render_time = (double)timev.tv_sec +
-            (((double)timev.tv_usec) / 1000000) - render_start;
+        tile->stats.render_time = (double)timev.tv_sec +
+                               (((double)timev.tv_usec) / 1000000) - render_start;
 #endif
-    } else if (t->updates) {
-        Eina_Iterator *itr = eina_tiler_iterator_new(t->updates);
-        Eina_Rectangle *r;
+    } else if (tile->updates) {
+        Eina_Iterator* itr = eina_tiler_iterator_new(tile->updates);
+        Eina_Rectangle* rect;
         if (!itr) {
             CRITICAL("could not create tiler iterator!");
             return;
         }
-        EINA_ITERATOR_FOREACH(itr, r)
-            cb((void *)data, t, r);
+        EINA_ITERATOR_FOREACH(itr, rect)
+            callback((void*)data, tile, rect);
         eina_iterator_free(itr);
     }
@@ -460 +457 @@
  *
  * This will change the tile statistics, specially zero stat.misses
- * and unset stats.full_update. If t->updates existed, then it will be
+ * and unset stats.full_update. If tile->updates existed, then it will be
  * destroyed.
  *
@@ -466 +463 @@
  * called.
  */
-void ewk_tile_updates_clear(Ewk_Tile *t)
+void ewk_tile_updates_clear(Ewk_Tile* tile)
 {
     /* TODO: remove from list of pending updates? */
-    t->stats.misses = 0;
-
-    if (t->stats.full_update)
-        t->stats.full_update = 0;
-    else if (t->updates) {
-        eina_tiler_free(t->updates);
-        t->updates = 0;
+    tile->stats.misses = 0;
+
+    if (tile->stats.full_update)
+        tile->stats.full_update = 0;
+    else if (tile->updates) {
+        eina_tiler_free(tile->updates);
+        tile->updates = 0;
     }
 }
@@ -481 +478 @@
 typedef struct _Ewk_Tile_Unused_Cache_Entry Ewk_Tile_Unused_Cache_Entry;
 struct _Ewk_Tile_Unused_Cache_Entry {
-    Ewk_Tile *tile;
+    Ewk_Tile* tile;
     int weight;
     struct {
-        void (*cb)(void *data, Ewk_Tile *t);
-        void *data;
+        void (*cb)(void* data, Ewk_Tile* tile);
+        void* data;
     } tile_free;
 };
@@ -491 +488 @@
 struct _Ewk_Tile_Unused_Cache {
     struct {
-        Eina_List *list;
+        Eina_List* list;
         size_t count;
         size_t allocated;
@@ -523 +520 @@
  *         possible to allocate memory, @c 0 is returned.
  */
-Ewk_Tile_Unused_Cache *ewk_tile_unused_cache_new(size_t max)
-{
-    Ewk_Tile_Unused_Cache *tuc;
-
-    tuc = static_cast<Ewk_Tile_Unused_Cache*>(calloc(1, sizeof(Ewk_Tile_Unused_Cache)));
-    if (!tuc)
+Ewk_Tile_Unused_Cache* ewk_tile_unused_cache_new(size_t max)
+{
+    Ewk_Tile_Unused_Cache* tileUnusedCache;
+
+    tileUnusedCache = static_cast<Ewk_Tile_Unused_Cache*>(calloc(1, sizeof(Ewk_Tile_Unused_Cache)));
+    if (!tileUnusedCache)
         return 0;
 
-    DBG("tuc=%p", tuc);
-    tuc->memory.max = max;
-    tuc->references = 1;
-    return tuc;
-}
-
-void ewk_tile_unused_cache_lock_area(Ewk_Tile_Unused_Cache *tuc, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, float zoom)
-{
-    EINA_SAFETY_ON_NULL_RETURN(tuc);
-
-    tuc->locked.locked = EINA_TRUE;
-    tuc->locked.x = x;
-    tuc->locked.y = y;
-    tuc->locked.w = w;
-    tuc->locked.h = h;
-    tuc->locked.zoom = zoom;
-}
-
-void ewk_tile_unused_cache_unlock_area(Ewk_Tile_Unused_Cache *tuc)
-{
-    EINA_SAFETY_ON_NULL_RETURN(tuc);
-
-    tuc->locked.locked = EINA_FALSE;
+    DBG("tileUnusedCache=%p", tileUnusedCache);
+    tileUnusedCache->memory.max = max;
+    tileUnusedCache->references = 1;
+    return tileUnusedCache;
+}
+
+void ewk_tile_unused_cache_lock_area(Ewk_Tile_Unused_Cache* tileUnusedCache, Evas_Coord x, Evas_Coord y, Evas_Coord width, Evas_Coord height, float zoom)
+{
+    EINA_SAFETY_ON_NULL_RETURN(tileUnusedCache);
+
+    tileUnusedCache->locked.locked = EINA_TRUE;
+    tileUnusedCache->locked.x = x;
+    tileUnusedCache->locked.y = y;
+    tileUnusedCache->locked.w = width;
+    tileUnusedCache->locked.h = height;
+    tileUnusedCache->locked.zoom = zoom;
+}
+
+void ewk_tile_unused_cache_unlock_area(Ewk_Tile_Unused_Cache* tileUnusedCache)
+{
+    EINA_SAFETY_ON_NULL_RETURN(tileUnusedCache);
+
+    tileUnusedCache->locked.locked = EINA_FALSE;
 }
 
@@ -568 +565 @@
  * @see ewk_tile_unused_cache_unref()
  */
-static void _ewk_tile_unused_cache_free(Ewk_Tile_Unused_Cache *tuc)
-{
-    EINA_SAFETY_ON_NULL_RETURN(tuc);
-
-    DBG("tuc=%p, "
+static void _ewk_tile_unused_cache_free(Ewk_Tile_Unused_Cache* tileUnusedCache)
+{
+    EINA_SAFETY_ON_NULL_RETURN(tileUnusedCache);
+
+    DBG("tileUnusedCache=%p, "
         "entries=(count:%zd, allocated:%zd), "
         "memory=(max:%zd, used:%zd)",
-        tuc, tuc->entries.count, tuc->entries.allocated,
-        tuc->memory.max, tuc->memory.used);
-
-    ewk_tile_unused_cache_clear(tuc);
-    free(tuc);
+        tileUnusedCache, tileUnusedCache->entries.count, tileUnusedCache->entries.allocated,
+        tileUnusedCache->memory.max, tileUnusedCache->memory.used);
+
+    ewk_tile_unused_cache_clear(tileUnusedCache);
+    free(tileUnusedCache);
 }
 
@@ -588 +585 @@
  * kept are those that aren't in the cache (i.e. that are visible).
  */
-void ewk_tile_unused_cache_clear(Ewk_Tile_Unused_Cache *tuc)
-{
-    EINA_SAFETY_ON_NULL_RETURN(tuc);
-
-    if (!tuc->entries.count)
+void ewk_tile_unused_cache_clear(Ewk_Tile_Unused_Cache* tileUnusedCache)
+{
+    EINA_SAFETY_ON_NULL_RETURN(tileUnusedCache);
+
+    if (!tileUnusedCache->entries.count)
         return;
 
     void* item;
-    EINA_LIST_FREE(tuc->entries.list, item) {
+    EINA_LIST_FREE(tileUnusedCache->entries.list, item) {
         Ewk_Tile_Unused_Cache_Entry* itr = static_cast<Ewk_Tile_Unused_Cache_Entry*>(item);
         itr->tile_free.cb(itr->tile_free.data, itr->tile);
@@ -602 +599 @@
     }
 
-    tuc->memory.used = 0;
-    tuc->entries.count = 0;
-}
-
-/**
- * Hold reference to cache.
+    tileUnusedCache->memory.used = 0;
+    tileUnusedCache->entries.count = 0;
+}
+
+/**
+ * heightold reference to cache.
  *
  * @return same pointer as taken.
@@ -613 +610 @@
  * @see ewk_tile_unused_cache_unref()
  */
-Ewk_Tile_Unused_Cache *ewk_tile_unused_cache_ref(Ewk_Tile_Unused_Cache *tuc)
-{
-    EINA_SAFETY_ON_NULL_RETURN_VAL(tuc, 0);
-    tuc->references++;
-    return tuc;
+Ewk_Tile_Unused_Cache* ewk_tile_unused_cache_ref(Ewk_Tile_Unused_Cache* tileUnusedCache)
+{
+    EINA_SAFETY_ON_NULL_RETURN_VAL(tileUnusedCache, 0);
+    tileUnusedCache->references++;
+    return tileUnusedCache;
 }
 
@@ -626 +623 @@
  * @see ewk_tile_unused_cache_free()
  */
-void ewk_tile_unused_cache_unref(Ewk_Tile_Unused_Cache *tuc)
-{
-    EINA_SAFETY_ON_NULL_RETURN(tuc);
-    tuc->references--;
-    if (!tuc->references)
-        _ewk_tile_unused_cache_free(tuc);
-}
-
-void ewk_tile_unused_cache_max_set(Ewk_Tile_Unused_Cache *tuc, size_t max)
-{
-    EINA_SAFETY_ON_NULL_RETURN(tuc);
-    tuc->memory.max = max;
-}
-
-size_t ewk_tile_unused_cache_max_get(const Ewk_Tile_Unused_Cache *tuc)
-{
-    EINA_SAFETY_ON_NULL_RETURN_VAL(tuc, 0);
-    return tuc->memory.max;
-}
-
-size_t ewk_tile_unused_cache_used_get(const Ewk_Tile_Unused_Cache *tuc)
-{
-    EINA_SAFETY_ON_NULL_RETURN_VAL(tuc, 0);
-    return tuc->memory.used;
-}
-
-size_t ewk_tile_unused_cache_flush(Ewk_Tile_Unused_Cache *tuc, size_t bytes)
-{
-    Eina_List *l, *l_next;
-    EINA_SAFETY_ON_NULL_RETURN_VAL(tuc, 0);
+void ewk_tile_unused_cache_unref(Ewk_Tile_Unused_Cache* tileUnusedCache)
+{
+    EINA_SAFETY_ON_NULL_RETURN(tileUnusedCache);
+    tileUnusedCache->references--;
+    if (!tileUnusedCache->references)
+        _ewk_tile_unused_cache_free(tileUnusedCache);
+}
+
+void ewk_tile_unused_cache_max_set(Ewk_Tile_Unused_Cache* tileUnusedCache, size_t max)
+{
+    EINA_SAFETY_ON_NULL_RETURN(tileUnusedCache);
+    tileUnusedCache->memory.max = max;
+}
+
+size_t ewk_tile_unused_cache_max_get(const Ewk_Tile_Unused_Cache* tileUnusedCache)
+{
+    EINA_SAFETY_ON_NULL_RETURN_VAL(tileUnusedCache, 0);
+    return tileUnusedCache->memory.max;
+}
+
+size_t ewk_tile_unused_cache_used_get(const Ewk_Tile_Unused_Cache* tileUnusedCache)
+{
+    EINA_SAFETY_ON_NULL_RETURN_VAL(tileUnusedCache, 0);
+    return tileUnusedCache->memory.used;
+}
+
+size_t ewk_tile_unused_cache_flush(Ewk_Tile_Unused_Cache* tileUnusedCache, size_t bytes)
+{
+    Eina_List* l, * l_next;
+    EINA_SAFETY_ON_NULL_RETURN_VAL(tileUnusedCache, 0);
     size_t done;
     unsigned int count;
 
-    if (!tuc->entries.count)
+    if (!tileUnusedCache->entries.count)
         return 0;
     if (bytes < 1)
@@ -672 +669 @@
     done = 0;
     count = 0;
-    EINA_LIST_FOREACH_SAFE(tuc->entries.list, l, l_next, item) {
+    EINA_LIST_FOREACH_SAFE(tileUnusedCache->entries.list, l, l_next, item) {
         Ewk_Tile_Unused_Cache_Entry* itr = static_cast<Ewk_Tile_Unused_Cache_Entry*>(item);
-        Ewk_Tile *t = itr->tile;
+        Ewk_Tile* tile = itr->tile;
         if (done > bytes)
             break;
-        if (tuc->locked.locked
-            && t->x + t->w > tuc->locked.x
-            && t->y + t->h > tuc->locked.y
-            && t->x < tuc->locked.x + tuc->locked.w
-            && t->y < tuc->locked.y + tuc->locked.h
-            && t->zoom == tuc->locked.zoom) {
+        if (tileUnusedCache->locked.locked
+            && tile->x + tile->width > tileUnusedCache->locked.x
+            && tile->y + tile->height > tileUnusedCache->locked.y
+            && tile->x < tileUnusedCache->locked.x + tileUnusedCache->locked.w
+            && tile->y < tileUnusedCache->locked.y + tileUnusedCache->locked.h
+            && tile->zoom == tileUnusedCache->locked.zoom) {
             continue;
         }
         done += sizeof(Ewk_Tile) + itr->tile->bytes;
         itr->tile_free.cb(itr->tile_free.data, itr->tile);
-        tuc->entries.list = eina_list_remove_list(tuc->entries.list, l);
+        tileUnusedCache->entries.list = eina_list_remove_list(tileUnusedCache->entries.list, l);
         free(itr);
         count++;
     }
 
-    tuc->memory.used -= done;
-    tuc->entries.count -= count;
+    tileUnusedCache->memory.used -= done;
+    tileUnusedCache->entries.count -= count;
 
     return done;
 }
 
-void ewk_tile_unused_cache_auto_flush(Ewk_Tile_Unused_Cache *tuc)
-{
-    EINA_SAFETY_ON_NULL_RETURN(tuc);
-    if (tuc->memory.used <= tuc->memory.max)
+void ewk_tile_unused_cache_auto_flush(Ewk_Tile_Unused_Cache* tileUnusedCache)
+{
+    EINA_SAFETY_ON_NULL_RETURN(tileUnusedCache);
+    if (tileUnusedCache->memory.used <= tileUnusedCache->memory.max)
         return;
-    ewk_tile_unused_cache_flush(tuc, tuc->memory.used - tuc->memory.max);
-    if (tuc->memory.used > tuc->memory.max)
+    ewk_tile_unused_cache_flush(tileUnusedCache, tileUnusedCache->memory.used - tileUnusedCache->memory.max);
+    if (tileUnusedCache->memory.used > tileUnusedCache->memory.max)
         CRITICAL("Cache still using too much memory: %zd KB; max: %zd KB",
-                 tuc->memory.used, tuc->memory.max);
+                 tileUnusedCache->memory.used, tileUnusedCache->memory.max);
 }
 
@@ -713 +710 @@
  *
  * Maintenance tasks optimize cache usage, but maybe we know we should
- * hold on them until we do the last operation, in this case we freeze
+ * heightold on them until we do the last operation, in this case we freeze
  * while operating and then thaw when we're done.
  *
  * @see ewk_tile_unused_cache_thaw()
  */
-void ewk_tile_unused_cache_freeze(Ewk_Tile_Unused_Cache *tuc)
-{
-    tuc->frozen++;
+void ewk_tile_unused_cache_freeze(Ewk_Tile_Unused_Cache* tileUnusedCache)
+{
+    tileUnusedCache->frozen++;
 }
 
@@ -729 +726 @@
  * will run immediately.
  */
-void ewk_tile_unused_cache_thaw(Ewk_Tile_Unused_Cache *tuc)
-{
-    if (!tuc->frozen) {
+void ewk_tile_unused_cache_thaw(Ewk_Tile_Unused_Cache* tileUnusedCache)
+{
+    if (!tileUnusedCache->frozen) {
         ERR("thawing more than freezing!");
         return;
     }
 
-    tuc->frozen--;
+    tileUnusedCache->frozen--;
 }
 
@@ -746 +743 @@
  * ewk_tile_unused_cache_tile_put().
  *
- * @param tuc cache of unused tiles
+ * @param tileUnusedCache cache of unused tiles
  * @param t the tile to be removed from Ewk_Tile_Unused_Cache.
  *
  * @return #EINA_TRUE on success, #EINA_FALSE otherwise.
  */
-Eina_Bool ewk_tile_unused_cache_tile_get(Ewk_Tile_Unused_Cache *tuc, Ewk_Tile *t)
-{
-    Eina_List *e, *l;
+Eina_Bool ewk_tile_unused_cache_tile_get(Ewk_Tile_Unused_Cache* tileUnusedCache, Ewk_Tile* tile)
+{
+    Eina_List* e, * l;
 
     void* item;
     e = 0;
-    EINA_LIST_FOREACH(tuc->entries.list, l, item) {
+    EINA_LIST_FOREACH(tileUnusedCache->entries.list, l, item) {
         Ewk_Tile_Unused_Cache_Entry* entry = static_cast<Ewk_Tile_Unused_Cache_Entry*>(item);
-        if (entry->tile == t) {
+        if (entry->tile == tile) {
             e = l;
             break;
@@ -765 +762 @@
     }
     if (!e) {
-        ERR("tile %p not found in cache %p", t, tuc);
+        ERR("tile %p not found in cache %p", tile, tileUnusedCache);
         return EINA_FALSE;
     }
 
-    tuc->entries.count--;
-    tuc->memory.used -= sizeof(Ewk_Tile) + t->bytes;
-    tuc->entries.list = eina_list_remove_list(tuc->entries.list, e);
+    tileUnusedCache->entries.count--;
+    tileUnusedCache->memory.used -= sizeof(Ewk_Tile) + tile->bytes;
+    tileUnusedCache->entries.list = eina_list_remove_list(tileUnusedCache->entries.list, e);
     free(item);
 
@@ -780 +777 @@
  * Put tile into cache of unused tiles, adding it to the cache.
  *
- * This should be called when @c t->visible is @c 0 and no objects are
+ * This should be called when @c tile->visible is @c 0 and no objects are
  * using the tile anymore, making it available to be expired and have
  * its memory replaced.
@@ -789 +786 @@
  * because usually we want a lazy operation for better performance.
  *
- * @param tuc cache of unused tiles
+ * @param tileUnusedCache cache of unused tiles
  * @param t tile to be added to cache.
  * @param tile_free_cb function used to free tiles.
  * @param data context to give back to @a tile_free_cb as first argument.
  *
- * @return #EINA_TRUE on success, #EINA_FALSE otherwise. If @c t->visible
+ * @return #EINA_TRUE on success, #EINA_FALSE otherwise. If @c tile->visible
  *         is not #EINA_FALSE, then it will return #EINA_FALSE.
  *
  * @see ewk_tile_unused_cache_auto_flush()
  */
-Eina_Bool ewk_tile_unused_cache_tile_put(Ewk_Tile_Unused_Cache *tuc, Ewk_Tile *t, void (*tile_free_cb)(void *data, Ewk_Tile *t), const void *data)
-{
-    Ewk_Tile_Unused_Cache_Entry *e;
-
-    if (t->visible) {
-        ERR("tile=%p is not unused (visible=%d)", t, t->visible);
+Eina_Bool ewk_tile_unused_cache_tile_put(Ewk_Tile_Unused_Cache* tileUnusedCache, Ewk_Tile* tile, void (* tile_free_cb)(void* data, Ewk_Tile* tile), const void* data)
+{
+    Ewk_Tile_Unused_Cache_Entry* uce;
+
+    if (tile->visible) {
+        ERR("tile=%p is not unused (visible=%d)", tile, tile->visible);
         return EINA_FALSE;
     }
 
-    e = static_cast<Ewk_Tile_Unused_Cache_Entry*>(malloc(sizeof(Ewk_Tile_Unused_Cache_Entry)));
-    if (!e)
+    uce = static_cast<Ewk_Tile_Unused_Cache_Entry*>(malloc(sizeof(Ewk_Tile_Unused_Cache_Entry)));
+    if (!uce)
         return EINA_FALSE;
 
-    tuc->entries.list = eina_list_append(tuc->entries.list, e);
+    tileUnusedCache->entries.list = eina_list_append(tileUnusedCache->entries.list, uce);
     if (eina_error_get()) {
         ERR("List allocation failed");
@@ -818 +815 @@
     }
 
-    e->tile = t;
-    e->weight = 0; /* calculated just before sort */
-    e->tile_free.cb = tile_free_cb;
-    e->tile_free.data = (void *)data;
-
-    tuc->entries.count++;
-    tuc->memory.used += sizeof(Ewk_Tile) + t->bytes;
+    uce->tile = tile;
+    uce->weight = 0; /* calculated just before sort */
+    uce->tile_free.cb = tile_free_cb;
+    uce->tile_free.data = (void*)data;
+
+    tileUnusedCache->entries.count++;
+    tileUnusedCache->memory.used += sizeof(Ewk_Tile) + tile->bytes;
 
     return EINA_TRUE;
 }
 
-void ewk_tile_unused_cache_dbg(const Ewk_Tile_Unused_Cache *tuc)
+void ewk_tile_unused_cache_dbg(const Ewk_Tile_Unused_Cache* tileUnusedCache)
 {
     void* item;
-    Eina_List *l;
+    Eina_List* l;
     int count = 0;
     printf("Cache of unused tiles: entries: %zu/%zu, memory: %zu/%zu\n",
-           tuc->entries.count, tuc->entries.allocated,
-           tuc->memory.used, tuc->memory.max);
-
-    EINA_LIST_FOREACH(tuc->entries.list, l, item) {
-        const Ewk_Tile *t = static_cast<Ewk_Tile_Unused_Cache_Entry*>(item)->tile;
+           tileUnusedCache->entries.count, tileUnusedCache->entries.allocated,
+           tileUnusedCache->memory.used, tileUnusedCache->memory.max);
+
+    EINA_LIST_FOREACH(tileUnusedCache->entries.list, l, item) {
+        const Ewk_Tile* tile = static_cast<Ewk_Tile_Unused_Cache_Entry*>(item)->tile;
         printf(" [%3lu,%3lu + %dx%d @ %0.3f]%c",
-               t->col, t->row, t->w, t->h, t->zoom,
-               t->visible ? '*': ' ');
+               tile->col, tile->row, tile->width, tile->height, tile->zoom,
+               tile->visible ? '*' : ' ');
 
         if (!(count % 4))

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

@@ -35 +35 @@
 void ewk_tile_update_full(Ewk_Tile* t);
 void ewk_tile_update_area(Ewk_Tile* t, const Eina_Rectangle* r);
-void ewk_tile_updates_process(Ewk_Tile* t, void (* cb)(void* data, Ewk_Tile* t, const Eina_Rectangle* update), const void* data);
+void ewk_tile_updates_process(Ewk_Tile* t, void (*cb)(void* data, Ewk_Tile* t, const Eina_Rectangle* update), const void* data);
 void ewk_tile_updates_clear(Ewk_Tile* t);
 

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

@@ -179 +179 @@
 
 #ifndef EWK_TYPE_CHECK
-#define EWK_VIEW_TYPE_CHECK(o, ...) do { } while (0)
+#define EWK_VIEW_TYPE_CHECK(ewkView, ...) do { } while (0)
 #else
-#define EWK_VIEW_TYPE_CHECK(o, ...)                                     \
+#define EWK_VIEW_TYPE_CHECK(ewkView, ...)                                     \
     do {                                                                \
-        const char* _tmp_otype = evas_object_type_get(o);               \
-        const Evas_Smart* _tmp_s = evas_object_smart_smart_get(o);      \
+        const char* _tmp_otype = evas_object_type_get(ewkView);               \
+        const Evas_Smart* _tmp_s = evas_object_smart_smart_get(ewkView);      \
         if (EINA_UNLIKELY(!_tmp_s)) {                                   \
             EINA_LOG_CRIT                                               \
-                ("%p (%s) is not a smart object!", o,                   \
+                ("%p (%s) is not a smart object!", ewkView,                   \
                 _tmp_otype ? _tmp_otype : "(null)");                   \
             return __VA_ARGS__;                                         \
@@ -194 +194 @@
         if (EINA_UNLIKELY(!_tmp_sc)) {                                  \
             EINA_LOG_CRIT                                               \
-                ("%p (%s) is not a smart object!", o,                   \
+                ("%p (%s) is not a smart object!", ewkView,                   \
                 _tmp_otype ? _tmp_otype : "(null)");                   \
             return __VA_ARGS__;                                         \
@@ -201 +201 @@
             EINA_LOG_CRIT                                               \
                 ("%p (%s) is not of an ewk_view (need %p, got %p)!",    \
-                o, _tmp_otype ? _tmp_otype : "(null)",                 \
+                ewkView, _tmp_otype ? _tmp_otype : "(null)",                 \
                 EWK_VIEW_TYPE_STR, _tmp_sc->data);                     \
             return __VA_ARGS__;                                         \
@@ -208 +208 @@
 #endif
 
-#define EWK_VIEW_SD_GET(o, ptr)                                 \
-    Ewk_View_Smart_Data* ptr = static_cast<Ewk_View_Smart_Data*>(evas_object_smart_data_get(o))
-
-#define EWK_VIEW_SD_GET_OR_RETURN(o, ptr, ...)          \
-    EWK_VIEW_TYPE_CHECK(o, __VA_ARGS__);                \
-    EWK_VIEW_SD_GET(o, ptr);                            \
+#define EWK_VIEW_SD_GET(ewkView, ptr)                                 \
+    Ewk_View_Smart_Data* ptr = static_cast<Ewk_View_Smart_Data*>(evas_object_smart_data_get(ewkView))
+
+#define EWK_VIEW_SD_GET_OR_RETURN(ewkView, ptr, ...)          \
+    EWK_VIEW_TYPE_CHECK(ewkView, __VA_ARGS__);                \
+    EWK_VIEW_SD_GET(ewkView, ptr);                            \
     if (!ptr) {                                         \
         CRITICAL("no smart data for object %p (%s)",    \
-                 o, evas_object_type_get(o));           \
+                 ewkView, evas_object_type_get(ewkView));           \
         return __VA_ARGS__;                             \
     }
@@ -231 +231 @@
     }
 
-static void _ewk_view_smart_changed(Ewk_View_Smart_Data* sd)
-{
-    if (sd->changed.any)
+static void _ewk_view_smart_changed(Ewk_View_Smart_Data* smartData)
+{
+    if (smartData->changed.any)
         return;
-    sd->changed.any = EINA_TRUE;
-    evas_object_smart_changed(sd->self);
+    smartData->changed.any = EINA_TRUE;
+    evas_object_smart_changed(smartData->self);
 }
 
@@ -251 +251 @@
 }
 
-static void _ewk_view_repaint_add(Ewk_View_Private_Data* priv, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h)
+static void _ewk_view_repaint_add(Ewk_View_Private_Data* priv, Evas_Coord x, Evas_Coord y, Evas_Coord width, Evas_Coord height)
 {
     Eina_Rectangle* r;
@@ -271 +271 @@
     r->x = x;
     r->y = y;
-    r->w = w;
-    r->h = h;
-
-    DBG("add repaint %d, %d+%dx%d", x, y, w, h);
+    r->w = width;
+    r->h = height;
+
+    DBG("add repaint %d, %d+%dx%d", x, y, width, height);
 }
 
@@ -297 +297 @@
 }
 
-static void _ewk_view_scroll_add(Ewk_View_Private_Data* priv, Evas_Coord dx, Evas_Coord dy, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, Eina_Bool main_scroll)
+static void _ewk_view_scroll_add(Ewk_View_Private_Data* priv, Evas_Coord dx, Evas_Coord dy, Evas_Coord x, Evas_Coord y, Evas_Coord width, Evas_Coord height, Eina_Bool mainScroll)
 {
     Ewk_Scroll_Request* r;
     Ewk_Scroll_Request* r_end;
-    Evas_Coord x2 = x + w, y2 = y + h;
+    Evas_Coord x2 = x + width, y2 = y + height;
 
     r = priv->scrolls.array;
     r_end = r + priv->scrolls.count;
     for (; r < r_end; r++) {
-        if (r->x == x && r->y == y && r->w == w && r->h == h) {
+        if (r->x == x && r->y == y && r->w == width && r->h == height) {
             DBG("region already scrolled %d,%d+%dx%d %+03d,%+03d add "
                 "%+03d,%+03d",
@@ -338 +338 @@
     r->x = x;
     r->y = y;
-    r->w = w;
-    r->h = h;
+    r->w = width;
+    r->h = height;
     r->x2 = x2;
     r->y2 = y2;
     r->dx = dx;
     r->dy = dy;
-    r->main_scroll = main_scroll;
-    DBG("add scroll in region: %d, %d+%dx%d %+03d, %+03d", x, y, w, h, dx, dy);
+    r->main_scroll = mainScroll;
+    DBG("add scroll in region: %d, %d+%dx%d %+03d, %+03d", x, y, width, height, dx, dy);
 
     Eina_Rectangle* pr;
@@ -368 +368 @@
 
 // Default Event Handling //////////////////////////////////////////////
-static Eina_Bool _ewk_view_smart_focus_in(Ewk_View_Smart_Data* sd)
-{
-    EWK_VIEW_PRIV_GET(sd, priv);
+static Eina_Bool _ewk_view_smart_focus_in(Ewk_View_Smart_Data* smartData)
+{
+    EWK_VIEW_PRIV_GET(smartData, priv);
     WebCore::FocusController* fc = priv->page->focusController();
-    DBG("o=%p, fc=%p", sd->self, fc);
+    DBG("ewkView=%p, fc=%p", smartData->self, fc);
     EINA_SAFETY_ON_NULL_RETURN_VAL(fc, EINA_FALSE);
 
@@ -380 +380 @@
 }
 
-static Eina_Bool _ewk_view_smart_focus_out(Ewk_View_Smart_Data* sd)
-{
-    EWK_VIEW_PRIV_GET(sd, priv);
+static Eina_Bool _ewk_view_smart_focus_out(Ewk_View_Smart_Data* smartData)
+{
+    EWK_VIEW_PRIV_GET(smartData, priv);
     WebCore::FocusController* fc = priv->page->focusController();
-    DBG("o=%p, fc=%p", sd->self, fc);
+    DBG("ewkView=%p, fc=%p", smartData->self, fc);
     EINA_SAFETY_ON_NULL_RETURN_VAL(fc, EINA_FALSE);
 
@@ -392 +392 @@
 }
 
-static Eina_Bool _ewk_view_smart_mouse_wheel(Ewk_View_Smart_Data* sd, const Evas_Event_Mouse_Wheel* ev)
-{
-    return ewk_frame_feed_mouse_wheel(sd->main_frame, ev);
-}
-
-static Eina_Bool _ewk_view_smart_mouse_down(Ewk_View_Smart_Data* sd, const Evas_Event_Mouse_Down* ev)
-{
-    return ewk_frame_feed_mouse_down(sd->main_frame, ev);
-}
-
-static Eina_Bool _ewk_view_smart_mouse_up(Ewk_View_Smart_Data* sd, const Evas_Event_Mouse_Up* ev)
-{
-    return ewk_frame_feed_mouse_up(sd->main_frame, ev);
-}
-
-static Eina_Bool _ewk_view_smart_mouse_move(Ewk_View_Smart_Data* sd, const Evas_Event_Mouse_Move* ev)
-{
-    return ewk_frame_feed_mouse_move(sd->main_frame, ev);
-}
-
-static Eina_Bool _ewk_view_smart_key_down(Ewk_View_Smart_Data* sd, const Evas_Event_Key_Down* ev)
-{
-    Evas_Object* frame = ewk_view_frame_focused_get(sd->self);
+static Eina_Bool _ewk_view_smart_mouse_wheel(Ewk_View_Smart_Data* smartData, const Evas_Event_Mouse_Wheel* wheelEvent)
+{
+    return ewk_frame_feed_mouse_wheel(smartData->main_frame, wheelEvent);
+}
+
+static Eina_Bool _ewk_view_smart_mouse_down(Ewk_View_Smart_Data* smartData, const Evas_Event_Mouse_Down* downEvent)
+{
+    return ewk_frame_feed_mouse_down(smartData->main_frame, downEvent);
+}
+
+static Eina_Bool _ewk_view_smart_mouse_up(Ewk_View_Smart_Data* smartData, const Evas_Event_Mouse_Up* upEvent)
+{
+    return ewk_frame_feed_mouse_up(smartData->main_frame, upEvent);
+}
+
+static Eina_Bool _ewk_view_smart_mouse_move(Ewk_View_Smart_Data* smartData, const Evas_Event_Mouse_Move* moveEvent)
+{
+    return ewk_frame_feed_mouse_move(smartData->main_frame, moveEvent);
+}
+
+static Eina_Bool _ewk_view_smart_key_down(Ewk_View_Smart_Data* smartData, const Evas_Event_Key_Down* downEvent)
+{
+    Evas_Object* frame = ewk_view_frame_focused_get(smartData->self);
 
     if (!frame)
-        frame = sd->main_frame;
-
-    return ewk_frame_feed_key_down(frame, ev);
-}
-
-static Eina_Bool _ewk_view_smart_key_up(Ewk_View_Smart_Data* sd, const Evas_Event_Key_Up* ev)
-{
-    Evas_Object* frame = ewk_view_frame_focused_get(sd->self);
+        frame = smartData->main_frame;
+
+    return ewk_frame_feed_key_down(frame, downEvent);
+}
+
+static Eina_Bool _ewk_view_smart_key_up(Ewk_View_Smart_Data* smartData, const Evas_Event_Key_Up* upEvent)
+{
+    Evas_Object* frame = ewk_view_frame_focused_get(smartData->self);
 
     if (!frame)
-        frame = sd->main_frame;
-
-    return ewk_frame_feed_key_up(frame, ev);
-}
-
-static void _ewk_view_smart_add_console_message(Ewk_View_Smart_Data* sd, const char* message, unsigned int lineNumber, const char* sourceID)
+        frame = smartData->main_frame;
+
+    return ewk_frame_feed_key_up(frame, upEvent);
+}
+
+static void _ewk_view_smart_add_console_message(Ewk_View_Smart_Data* smartData, const char* message, unsigned int lineNumber, const char* sourceID)
 {
     INF("console message: %s @%d: %s\n", sourceID, lineNumber, message);
 }
 
-static void _ewk_view_smart_run_javascript_alert(Ewk_View_Smart_Data* sd, Evas_Object* frame, const char* message)
+static void _ewk_view_smart_run_javascript_alert(Ewk_View_Smart_Data* smartData, Evas_Object* frame, const char* message)
 {
     INF("javascript alert: %s\n", message);
 }
 
-static Eina_Bool _ewk_view_smart_run_javascript_confirm(Ewk_View_Smart_Data* sd, Evas_Object* frame, const char* message)
+static Eina_Bool _ewk_view_smart_run_javascript_confirm(Ewk_View_Smart_Data* smartData, Evas_Object* frame, const char* message)
 {
     INF("javascript confirm: %s", message);
@@ -449 +449 @@
 }
 
-static Eina_Bool _ewk_view_smart_should_interrupt_javascript(Ewk_View_Smart_Data* sd)
+static Eina_Bool _ewk_view_smart_should_interrupt_javascript(Ewk_View_Smart_Data* smartData)
 {
     INF("should interrupt javascript?\n"
@@ -456 +456 @@
 }
 
-static Eina_Bool _ewk_view_smart_run_javascript_prompt(Ewk_View_Smart_Data* sd, Evas_Object* frame, const char* message, const char* defaultValue, char** value)
+static Eina_Bool _ewk_view_smart_run_javascript_prompt(Ewk_View_Smart_Data* smartData, Evas_Object* frame, const char* message, const char* defaultValue, char** value)
 {
     *value = strdup("test");
@@ -470 +470 @@
 
 // Event Handling //////////////////////////////////////////////////////
-static void _ewk_view_on_focus_in(void* data, Evas* e, Evas_Object* o, void* event_info)
+static void _ewk_view_on_focus_in(void* data, Evas* eventType, Evas_Object* callback, void* eventInfo)
 {
     Ewk_View_Smart_Data* sd = static_cast<Ewk_View_Smart_Data*>(data);
@@ -478 +478 @@
 }
 
-static void _ewk_view_on_focus_out(void* data, Evas* e, Evas_Object* o, void* event_info)
+static void _ewk_view_on_focus_out(void* data, Evas* eventType, Evas_Object* callback, void* eventInfo)
 {
     Ewk_View_Smart_Data* sd = static_cast<Ewk_View_Smart_Data*>(data);
@@ -486 +486 @@
 }
 
-static void _ewk_view_on_mouse_wheel(void* data, Evas* e, Evas_Object* o, void* event_info)
-{
-    Evas_Event_Mouse_Wheel* ev = static_cast<Evas_Event_Mouse_Wheel*>(event_info);
+static void _ewk_view_on_mouse_wheel(void* data, Evas* eventType, Evas_Object* callback, void* eventInfo)
+{
+    Evas_Event_Mouse_Wheel* ev = static_cast<Evas_Event_Mouse_Wheel*>(eventInfo);
     Ewk_View_Smart_Data* sd = static_cast<Ewk_View_Smart_Data*>(data);
     EINA_SAFETY_ON_NULL_RETURN(sd->api);
@@ -495 +495 @@
 }
 
-static void _ewk_view_on_mouse_down(void* data, Evas* e, Evas_Object* o, void* event_info)
-{
-    Evas_Event_Mouse_Down* ev = static_cast<Evas_Event_Mouse_Down*>(event_info);
+static void _ewk_view_on_mouse_down(void* data, Evas* eventType, Evas_Object* callback, void* eventInfo)
+{
+    Evas_Event_Mouse_Down* ev = static_cast<Evas_Event_Mouse_Down*>(eventInfo);
     Ewk_View_Smart_Data* sd = static_cast<Ewk_View_Smart_Data*>(data);
     EINA_SAFETY_ON_NULL_RETURN(sd->api);
@@ -504 +504 @@
 }
 
-static void _ewk_view_on_mouse_up(void* data, Evas* e, Evas_Object* o, void* event_info)
-{
-    Evas_Event_Mouse_Up* ev = static_cast<Evas_Event_Mouse_Up*>(event_info);
+static void _ewk_view_on_mouse_up(void* data, Evas* eventType, Evas_Object* callback, void* eventInfo)
+{
+    Evas_Event_Mouse_Up* ev = static_cast<Evas_Event_Mouse_Up*>(eventInfo);
     Ewk_View_Smart_Data* sd = static_cast<Ewk_View_Smart_Data*>(data);
     EINA_SAFETY_ON_NULL_RETURN(sd->api);
@@ -513 +513 @@
 }
 
-static void _ewk_view_on_mouse_move(void* data, Evas* e, Evas_Object* o, void* event_info)
-{
-    Evas_Event_Mouse_Move* ev = static_cast<Evas_Event_Mouse_Move*>(event_info);
+static void _ewk_view_on_mouse_move(void* data, Evas* eventType, Evas_Object* callback, void* eventInfo)
+{
+    Evas_Event_Mouse_Move* ev = static_cast<Evas_Event_Mouse_Move*>(eventInfo);
     Ewk_View_Smart_Data* sd = static_cast<Ewk_View_Smart_Data*>(data);
     EINA_SAFETY_ON_NULL_RETURN(sd->api);
@@ -522 +522 @@
 }
 
-static void _ewk_view_on_key_down(void* data, Evas* e, Evas_Object* o, void* event_info)
-{
-    Evas_Event_Key_Down* ev = static_cast<Evas_Event_Key_Down*>(event_info);
+static void _ewk_view_on_key_down(void* data, Evas* eventType, Evas_Object* callback, void* eventInfo)
+{
+    Evas_Event_Key_Down* ev = static_cast<Evas_Event_Key_Down*>(eventInfo);
     Ewk_View_Smart_Data* sd = static_cast<Ewk_View_Smart_Data*>(data);
     EINA_SAFETY_ON_NULL_RETURN(sd->api);
@@ -531 +531 @@
 }
 
-static void _ewk_view_on_key_up(void* data, Evas* e, Evas_Object* o, void* event_info)
-{
-    Evas_Event_Key_Up* ev = static_cast<Evas_Event_Key_Up*>(event_info);
+static void _ewk_view_on_key_up(void* data, Evas* eventType, Evas_Object* callback, void* eventInfo)
+{
+    Evas_Event_Key_Up* ev = static_cast<Evas_Event_Key_Up*>(eventInfo);
     Ewk_View_Smart_Data* sd = static_cast<Ewk_View_Smart_Data*>(data);
     EINA_SAFETY_ON_NULL_RETURN(sd->api);
@@ -540 +540 @@
 }
 
-static WTF::PassRefPtr<WebCore::Frame> _ewk_view_core_frame_new(Ewk_View_Smart_Data* sd, Ewk_View_Private_Data* priv, WebCore::HTMLFrameOwnerElement* owner)
-{
-    WebCore::FrameLoaderClientEfl* flc = new WebCore::FrameLoaderClientEfl(sd->self);
+static WTF::PassRefPtr<WebCore::Frame> _ewk_view_core_frame_new(Ewk_View_Smart_Data* smartData, Ewk_View_Private_Data* priv, WebCore::HTMLFrameOwnerElement* owner)
+{
+    WebCore::FrameLoaderClientEfl* flc = new WebCore::FrameLoaderClientEfl(smartData->self);
     if (!flc) {
         CRITICAL("Could not create frame loader client.");
@@ -554 +554 @@
 static Evas_Smart_Class _parent_sc = EVAS_SMART_CLASS_INIT_NULL;
 
-static Ewk_View_Private_Data* _ewk_view_priv_new(Ewk_View_Smart_Data* sd)
+static Ewk_View_Private_Data* _ewk_view_priv_new(Ewk_View_Smart_Data* smartData)
 {
     Ewk_View_Private_Data* priv =
@@ -567 +567 @@
 
     WebCore::Page::PageClients pageClients;
-    pageClients.chromeClient = static_cast<WebCore::ChromeClient*>(new WebCore::ChromeClientEfl(sd->self));
-    pageClients.editorClient = static_cast<WebCore::EditorClient*>(new WebCore::EditorClientEfl(sd->self));
+    pageClients.chromeClient = static_cast<WebCore::ChromeClient*>(new WebCore::ChromeClientEfl(smartData->self));
+    pageClients.editorClient = static_cast<WebCore::EditorClient*>(new WebCore::EditorClientEfl(smartData->self));
     pageClients.dragClient = static_cast<WebCore::DragClient*>(new WebCore::DragClientEfl);
     pageClients.inspectorClient = static_cast<WebCore::InspectorClient*>(new WebCore::InspectorClientEfl);
@@ -596 +596 @@
 
     priv->page_settings->setLoadsImagesAutomatically(true);
-    priv->page_settings->setDefaultFixedFontSize(12);
-    priv->page_settings->setDefaultFontSize(16);
+    priv->page_settings->setDefaultFixedFontSize(10);
+    priv->page_settings->setDefaultFontSize(13);
     priv->page_settings->setSerifFontFamily("serif");
     priv->page_settings->setFixedFontFamily("monotype");
@@ -667 +667 @@
     priv->settings.dom_timer_interval = priv->page_settings->defaultMinDOMTimerInterval();
 
-    priv->main_frame = _ewk_view_core_frame_new(sd, priv, 0).get();
+    priv->main_frame = _ewk_view_core_frame_new(smartData, priv, 0).get();
     if (!priv->main_frame) {
         CRITICAL("Could not create main frame.");
@@ -722 +722 @@
 }
 
-static void _ewk_view_smart_add(Evas_Object* o)
-{
-    const Evas_Smart* smart = evas_object_smart_smart_get(o);
+static void _ewk_view_smart_add(Evas_Object* ewkView)
+{
+    const Evas_Smart* smart = evas_object_smart_smart_get(ewkView);
     const Evas_Smart_Class* sc = evas_smart_class_get(smart);
     const Ewk_View_Smart_Class* api = reinterpret_cast<const Ewk_View_Smart_Class*>(sc);
     EINA_SAFETY_ON_NULL_RETURN(api->backing_store_add);
-    EWK_VIEW_SD_GET(o, sd);
+    EWK_VIEW_SD_GET(ewkView, sd);
 
     if (!sd) {
@@ -736 +736 @@
             return;
         }
-        evas_object_smart_data_set(o, sd);
+        evas_object_smart_data_set(ewkView, sd);
     }
 
@@ -744 +744 @@
     sd->bg_color.a = 255;
 
-    sd->self = o;
+    sd->self = ewkView;
     sd->_priv = _ewk_view_priv_new(sd);
     sd->api = api;
 
-    _parent_sc.add(o);
+    _parent_sc.add(ewkView);
 
     if (!sd->_priv)
@@ -761 +761 @@
     }
 
-    evas_object_smart_member_add(sd->backing_store, o);
+    evas_object_smart_member_add(sd->backing_store, ewkView);
     evas_object_show(sd->backing_store);
     evas_object_pass_events_set(sd->backing_store, EINA_TRUE);
@@ -767 +767 @@
     sd->events_rect = evas_object_rectangle_add(sd->base.evas);
     evas_object_color_set(sd->events_rect, 0, 0, 0, 0);
-    evas_object_smart_member_add(sd->events_rect, o);
+    evas_object_smart_member_add(sd->events_rect, ewkView);
     evas_object_show(sd->events_rect);
 
@@ -776 +776 @@
     }
 
-    if (!ewk_frame_init(sd->main_frame, o, priv->main_frame)) {
+    if (!ewk_frame_init(sd->main_frame, ewkView, priv->main_frame)) {
         ERR("Could not initialize main frme object.");
         evas_object_del(sd->main_frame);
@@ -787 +787 @@
 
     evas_object_name_set(sd->main_frame, "EWK_Frame:main");
-    evas_object_smart_member_add(sd->main_frame, o);
+    evas_object_smart_member_add(sd->main_frame, ewkView);
     evas_object_show(sd->main_frame);
 
-#define CONNECT(s, c) evas_object_event_callback_add(o, s, c, sd)
+#define CONNECT(s, c) evas_object_event_callback_add(ewkView, s, c, sd)
     CONNECT(EVAS_CALLBACK_FOCUS_IN, _ewk_view_on_focus_in);
     CONNECT(EVAS_CALLBACK_FOCUS_OUT, _ewk_view_on_focus_out);
@@ -802 +802 @@
 }
 
-static void _ewk_view_smart_del(Evas_Object* o)
-{
-    EWK_VIEW_SD_GET(o, sd);
+static void _ewk_view_smart_del(Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET(ewkView, sd);
     Ewk_View_Private_Data* priv = sd ? sd->_priv : 0;
 
-    ewk_view_stop(o);
-    _parent_sc.del(o);
+    ewk_view_stop(ewkView);
+    _parent_sc.del(ewkView);
     _ewk_view_priv_del(priv);
 }
 
-static void _ewk_view_smart_resize(Evas_Object* o, Evas_Coord w, Evas_Coord h)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd);
+static void _ewk_view_smart_resize(Evas_Object* ewkView, Evas_Coord w, Evas_Coord h)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd);
 
     // these should be queued and processed in calculate as well!
@@ -823 +823 @@
 }
 
-static void _ewk_view_smart_move(Evas_Object* o, Evas_Coord x, Evas_Coord y)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd);
+static void _ewk_view_smart_move(Evas_Object* ewkView, Evas_Coord x, Evas_Coord y)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd);
     sd->changed.position = EINA_TRUE;
     _ewk_view_smart_changed(sd);
 }
 
-static void _ewk_view_smart_calculate(Evas_Object* o)
-{
-    EWK_VIEW_SD_GET(o, sd);
+static void _ewk_view_smart_calculate(Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET(ewkView, sd);
     EWK_VIEW_PRIV_GET(sd, priv);
     EINA_SAFETY_ON_NULL_RETURN(sd->api->contents_resize);
@@ -844 +844 @@
         return;
 
-    evas_object_geometry_get(o, &x, &y, &w, &h);
-
-    DBG("o=%p geo=[%d, %d + %dx%d], changed: size=%hhu, "
+    evas_object_geometry_get(ewkView, &x, &y, &w, &h);
+
+    DBG("ewkView=%p geo=[%d, %d + %dx%d], changed: size=%hhu, "
         "scrolls=%zu, repaints=%zu",
-        o, x, y, w, h, sd->changed.size,
+        ewkView, x, y, w, h, sd->changed.size,
         priv->scrolls.count, priv->repaints.count);
 
@@ -867 +867 @@
 
         // This callback is a good place e.g. to change fixed layout size (ewk_view_fixed_layout_size_set).
-        evas_object_smart_callback_call(o, "view,resized", 0);
+        evas_object_smart_callback_call(ewkView, "view,resized", 0);
     }
     sd->changed.size = EINA_FALSE;
@@ -896 +896 @@
 }
 
-static void _ewk_view_smart_show(Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd);
+static void _ewk_view_smart_show(Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd);
 
     if (evas_object_clipees_get(sd->base.clipper))
@@ -905 +905 @@
 }
 
-static void _ewk_view_smart_hide(Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd);
+static void _ewk_view_smart_hide(Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd);
 
     evas_object_hide(sd->base.clipper);
@@ -913 +913 @@
 }
 
-static Eina_Bool _ewk_view_smart_contents_resize(Ewk_View_Smart_Data* sd, int w, int h)
-{
-    return EINA_TRUE;
-}
-
-static Eina_Bool _ewk_view_smart_zoom_set(Ewk_View_Smart_Data* sd, float zoom, Evas_Coord cx, Evas_Coord cy)
+static Eina_Bool _ewk_view_smart_contents_resize(Ewk_View_Smart_Data* smartData, int width, int height)
+{
+    return EINA_TRUE;
+}
+
+static Eina_Bool _ewk_view_smart_zoom_set(Ewk_View_Smart_Data* smartData, float zoom, Evas_Coord centerX, Evas_Coord centerY)
 {
     double px, py;
@@ -924 +924 @@
     Eina_Bool ret;
 
-    ewk_frame_scroll_size_get(sd->main_frame, &w, &h);
-    ewk_frame_scroll_pos_get(sd->main_frame, &x, &y);
-
-    if (w + sd->view.w > 0)
-        px = static_cast<double>(x + cx) / (w + sd->view.w);
+    ewk_frame_scroll_size_get(smartData->main_frame, &w, &h);
+    ewk_frame_scroll_pos_get(smartData->main_frame, &x, &y);
+
+    if (w + smartData->view.w > 0)
+        px = static_cast<double>(x + centerX) / (w + smartData->view.w);
     else
         px = 0.0;
 
-    if (h + sd->view.h > 0)
-        py = static_cast<double>(y + cy) / (h + sd->view.h);
+    if (h + smartData->view.h > 0)
+        py = static_cast<double>(y + centerY) / (h + smartData->view.h);
     else
         py = 0.0;
 
-    ret = ewk_frame_page_zoom_set(sd->main_frame, zoom);
-
-    ewk_frame_scroll_size_get(sd->main_frame, &w, &h);
-    x = (w + sd->view.w) * px - cx;
-    y = (h + sd->view.h) * py - cy;
-    ewk_frame_scroll_set(sd->main_frame, x, y);
+    ret = ewk_frame_page_zoom_set(smartData->main_frame, zoom);
+
+    ewk_frame_scroll_size_get(smartData->main_frame, &w, &h);
+    x = (w + smartData->view.w) * px - centerX;
+    y = (h + smartData->view.h) * py - centerY;
+    ewk_frame_scroll_set(smartData->main_frame, x, y);
     return ret;
 }
 
-static void _ewk_view_smart_flush(Ewk_View_Smart_Data* sd)
-{
-    EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv);
+static void _ewk_view_smart_flush(Ewk_View_Smart_Data* smartData)
+{
+    EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv);
     _ewk_view_repaints_flush(priv);
     _ewk_view_scrolls_flush(priv);
 }
 
-static Eina_Bool _ewk_view_smart_pre_render_region(Ewk_View_Smart_Data* sd, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, float zoom)
+static Eina_Bool _ewk_view_smart_pre_render_region(Ewk_View_Smart_Data* smartData, Evas_Coord x, Evas_Coord y, Evas_Coord width, Evas_Coord height, float zoom)
 {
     WRN("not supported by engine. sd=%p area=%d,%d+%dx%d, zoom=%f",
-        sd, x, y, w, h, zoom);
+        smartData, x, y, width, height, zoom);
     return EINA_FALSE;
 }
 
-static Eina_Bool _ewk_view_smart_pre_render_relative_radius(Ewk_View_Smart_Data* sd, unsigned int n, float zoom)
+static Eina_Bool _ewk_view_smart_pre_render_relative_radius(Ewk_View_Smart_Data* smartData, unsigned int number, float zoom)
 {
     WRN("not supported by engine. sd=%p, n=%u zoom=%f",
-        sd, n, zoom);
+        smartData, number, zoom);
     return EINA_FALSE;
 }
 
-static void _ewk_view_smart_pre_render_cancel(Ewk_View_Smart_Data* sd)
-{
-    WRN("not supported by engine. sd=%p", sd);
-}
-
-static void _ewk_view_zoom_animated_mark_stop(Ewk_View_Smart_Data* sd)
-{
-    sd->animated_zoom.zoom.start = 0.0;
-    sd->animated_zoom.zoom.end = 0.0;
-    sd->animated_zoom.zoom.current = 0.0;
-}
-
-static void _ewk_view_zoom_animated_finish(Ewk_View_Smart_Data* sd)
-{
-    EWK_VIEW_PRIV_GET(sd, priv);
+static void _ewk_view_smart_pre_render_cancel(Ewk_View_Smart_Data* smartData)
+{
+    WRN("not supported by engine. sd=%p", smartData);
+}
+
+static void _ewk_view_zoom_animated_mark_stop(Ewk_View_Smart_Data* smartData)
+{
+    smartData->animated_zoom.zoom.start = 0.0;
+    smartData->animated_zoom.zoom.end = 0.0;
+    smartData->animated_zoom.zoom.current = 0.0;
+}
+
+static void _ewk_view_zoom_animated_finish(Ewk_View_Smart_Data* smartData)
+{
+    EWK_VIEW_PRIV_GET(smartData, priv);
     ecore_animator_del(priv->animated_zoom.animator);
     priv->animated_zoom.animator = 0;
-    _ewk_view_zoom_animated_mark_stop(sd);
-    evas_object_smart_callback_call(sd->self, "zoom,animated,end", 0);
+    _ewk_view_zoom_animated_mark_stop(smartData);
+    evas_object_smart_callback_call(smartData->self, "zoom,animated,end", 0);
 }
 
@@ -1033 +1033 @@
 }
 
-static void _ewk_view_zoom_animation_start(Ewk_View_Smart_Data* sd)
-{
-    EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv);
+static void _ewk_view_zoom_animation_start(Ewk_View_Smart_Data* smartData)
+{
+    EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv);
     if (priv->animated_zoom.animator)
         return;
     priv->animated_zoom.animator = ecore_animator_add
-                                       (_ewk_view_zoom_animator_cb, sd);
-}
-
-static WebCore::ViewportAttributes _ewk_view_viewport_attributes_compute(const Evas_Object* o)
-{
-    EWK_VIEW_SD_GET(o, sd);
+                                       (_ewk_view_zoom_animator_cb, smartData);
+}
+
+static WebCore::ViewportAttributes _ewk_view_viewport_attributes_compute(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET(ewkView, sd);
     EWK_VIEW_PRIV_GET(sd, priv);
 
@@ -1058 +1058 @@
 }
 
-static Eina_Bool _ewk_view_smart_disable_render(Ewk_View_Smart_Data* sd)
-{
-    WRN("not supported by engine. sd=%p", sd);
+static Eina_Bool _ewk_view_smart_disable_render(Ewk_View_Smart_Data* smartData)
+{
+    WRN("not supported by engine. sd=%p", smartData);
     return EINA_FALSE;
 }
 
-static Eina_Bool _ewk_view_smart_enable_render(Ewk_View_Smart_Data* sd)
-{
-    WRN("not supported by engine. sd=%p", sd);
+static Eina_Bool _ewk_view_smart_enable_render(Ewk_View_Smart_Data* smartData)
+{
+    WRN("not supported by engine. sd=%p", smartData);
     return EINA_FALSE;
 }
@@ -1121 +1121 @@
 }
 
-void ewk_view_fixed_layout_size_set(Evas_Object* o, Evas_Coord w, Evas_Coord h)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd);
+void ewk_view_fixed_layout_size_set(Evas_Object* ewkView, Evas_Coord width, Evas_Coord height)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv);
 
     WebCore::FrameView* view = priv->main_frame->view();
-    if (w <= 0 && h <= 0) {
+    if (width <= 0 && height <= 0) {
         if (!view->useFixedLayout())
             return;
@@ -1133 +1133 @@
     } else {
         WebCore::IntSize size = view->fixedLayoutSize();
-        if (size.width() == w && size.height() == h)
+        if (size.width() == width && size.height() == height)
             return;
         if (view)
-            view->setFixedLayoutSize(WebCore::IntSize(w, h));
+            view->setFixedLayoutSize(WebCore::IntSize(width, height));
     }
 
@@ -1145 +1145 @@
 }
 
-void ewk_view_fixed_layout_size_get(const Evas_Object* o, Evas_Coord* w, Evas_Coord* h)
-{
-    if (w)
-        *w = 0;
-    if (h)
-        *h = 0;
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd);
+void ewk_view_fixed_layout_size_get(const Evas_Object* ewkView, Evas_Coord* width, Evas_Coord* height)
+{
+    if (width)
+        *width = 0;
+    if (height)
+        *height = 0;
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv);
     WebCore::FrameView* view = priv->main_frame->view();
     if (view->useFixedLayout()) {
         WebCore::IntSize size = view->fixedLayoutSize();
-        if (w)
-            *w = size.width();
-        if (h)
-            *h = size.height();
-    }
-}
-
-void ewk_view_theme_set(Evas_Object* o, const char* path)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd);
+        if (width)
+            *width = size.width();
+        if (height)
+            *height = size.height();
+    }
+}
+
+void ewk_view_theme_set(Evas_Object* ewkView, const char* path)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv);
     if (!eina_stringshare_replace(&priv->settings.theme, path))
@@ -1178 +1178 @@
 }
 
-const char* ewk_view_theme_get(const Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
+const char* ewk_view_theme_get(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, 0);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, 0);
     return priv->settings.theme;
 }
 
-Evas_Object* ewk_view_frame_main_get(const Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
+Evas_Object* ewk_view_frame_main_get(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, 0);
     return sd->main_frame;
 }
 
-Evas_Object* ewk_view_frame_focused_get(const Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
+Evas_Object* ewk_view_frame_focused_get(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, 0);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, 0);
 
@@ -1206 +1206 @@
 }
 
-Eina_Bool ewk_view_uri_set(Evas_Object* o, const char* uri)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_uri_set(Evas_Object* ewkView, const char* uri)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     return ewk_frame_uri_set(sd->main_frame, uri);
 }
 
-const char* ewk_view_uri_get(const Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
+const char* ewk_view_uri_get(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, 0);
     return ewk_frame_uri_get(sd->main_frame);
 }
 
-const char* ewk_view_title_get(const Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
+const char* ewk_view_title_get(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, 0);
     return ewk_frame_title_get(sd->main_frame);
 }
 
-Eina_Bool ewk_view_editable_get(const Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_editable_get(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     return ewk_frame_editable_get(sd->main_frame);
 }
 
-void ewk_view_bg_color_set(Evas_Object* o, int r, int g, int b, int a)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd);
+void ewk_view_bg_color_set(Evas_Object* ewkView, int red, int green, int blue, int alpha)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd);
     EINA_SAFETY_ON_NULL_RETURN(sd->api);
     EINA_SAFETY_ON_NULL_RETURN(sd->api->bg_color_set);
 
-    if (a < 0) {
-        WRN("Alpha less than zero (%d).", a);
-        a = 0;
-    } else if (a > 255) {
-        WRN("Alpha is larger than 255 (%d).", a);
-        a = 255;
+    if (alpha < 0) {
+        WRN("Alpha less than zero (%d).", alpha);
+        alpha = 0;
+    } else if (alpha > 255) {
+        WRN("Alpha is larger than 255 (%d).", alpha);
+        alpha = 255;
     }
 
@@ -1253 +1253 @@
         c = a;                                                          \
     }
-    CHECK_PREMUL_COLOR(r, a);
-    CHECK_PREMUL_COLOR(g, a);
-    CHECK_PREMUL_COLOR(b, a);
+    CHECK_PREMUL_COLOR(red, alpha);
+    CHECK_PREMUL_COLOR(green, alpha);
+    CHECK_PREMUL_COLOR(blue, alpha);
 #undef CHECK_PREMUL_COLOR
 
-    sd->bg_color.r = r;
-    sd->bg_color.g = g;
-    sd->bg_color.b = b;
-    sd->bg_color.a = a;
-
-    sd->api->bg_color_set(sd, r, g, b, a);
+    sd->bg_color.r = red;
+    sd->bg_color.g = green;
+    sd->bg_color.b = blue;
+    sd->bg_color.a = alpha;
+
+    sd->api->bg_color_set(sd, red, green, blue, alpha);
 
     WebCore::FrameView* view = sd->_priv->main_frame->view();
@@ -1269 +1269 @@
         WebCore::Color color;
 
-        if (!a)
+        if (!alpha)
             color = WebCore::Color(0, 0, 0, 0);
-        else if (a == 255)
-            color = WebCore::Color(r, g, b, a);
+        else if (alpha == 255)
+            color = WebCore::Color(red, green, blue, alpha);
         else
-            color = WebCore::Color(r * 255 / a, g * 255 / a, b * 255 / a, a);
-
-        view->updateBackgroundRecursively(color, !a);
-    }
-}
-
-void ewk_view_bg_color_get(const Evas_Object* o, int* r, int* g, int* b, int* a)
-{
-    if (r)
-        *r = 0;
-    if (g)
-        *g = 0;
-    if (b)
-        *b = 0;
-    if (a)
-        *a = 0;
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd);
-    if (r)
-        *r = sd->bg_color.r;
-    if (g)
-        *g = sd->bg_color.g;
-    if (b)
-        *b = sd->bg_color.b;
-    if (a)
-        *a = sd->bg_color.a;
-}
-
-Eina_Bool ewk_view_text_search(const Evas_Object* o, const char* string, Eina_Bool case_sensitive, Eina_Bool forward, Eina_Bool wrap)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+            color = WebCore::Color(red * 255 / alpha, green * 255 / alpha, blue * 255 / alpha, alpha);
+
+        view->updateBackgroundRecursively(color, !alpha);
+    }
+}
+
+void ewk_view_bg_color_get(const Evas_Object* ewkView, int* red, int* green, int* blue, int* alpha)
+{
+    if (red)
+        *red = 0;
+    if (green)
+        *green = 0;
+    if (blue)
+        *blue = 0;
+    if (alpha)
+        *alpha = 0;
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd);
+    if (red)
+        *red = sd->bg_color.r;
+    if (green)
+        *green = sd->bg_color.g;
+    if (blue)
+        *blue = sd->bg_color.b;
+    if (alpha)
+        *alpha = sd->bg_color.a;
+}
+
+Eina_Bool ewk_view_text_search(const Evas_Object* ewkView, const char* string, Eina_Bool caseSensitive, Eina_Bool forward, Eina_Bool wrap)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(string, EINA_FALSE);
@@ -1309 +1309 @@
     WebCore::FindDirection direction;
 
-    if (case_sensitive)
+    if (caseSensitive)
         sensitive = WTF::TextCaseSensitive;
     else
@@ -1327 +1327 @@
  * @param o view object where to search text.
  * @param string reference string to match.
- * @param case_sensitive if match should be case sensitive or not.
+ * @param caseSensitive if match should be case sensitive or not.
  * @param highlight if matches should be highlighted.
  * @param limit maximum amount of matches, or zero to unlimited.
@@ -1333 +1333 @@
  * @return number of matches.
  */
-unsigned int ewk_view_text_matches_mark(Evas_Object* o, const char* string, Eina_Bool case_sensitive, Eina_Bool highlight, unsigned int limit)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
+unsigned int ewk_view_text_matches_mark(Evas_Object* ewkView, const char* string, Eina_Bool caseSensitive, Eina_Bool highlight, unsigned int limit)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, 0);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, 0);
     EINA_SAFETY_ON_NULL_RETURN_VAL(string, 0);
     WTF::TextCaseSensitivity sensitive;
 
-    if (case_sensitive)
+    if (caseSensitive)
         sensitive = WTF::TextCaseSensitive;
     else
@@ -1348 +1348 @@
 }
 
-Eina_Bool ewk_view_text_matches_unmark_all(Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_text_matches_unmark_all(Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     priv->page->unmarkAllTextMatches();
@@ -1356 +1356 @@
 }
 
-Eina_Bool ewk_view_text_matches_highlight_set(Evas_Object* o, Eina_Bool highlight)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_text_matches_highlight_set(Evas_Object* ewkView, Eina_Bool highlight)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     return ewk_frame_text_matches_highlight_set(sd->main_frame, highlight);
 }
 
-Eina_Bool ewk_view_text_matches_highlight_get(const Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_text_matches_highlight_get(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     return ewk_frame_text_matches_highlight_get(sd->main_frame);
 }
 
-Eina_Bool ewk_view_editable_set(Evas_Object* o, Eina_Bool editable)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_editable_set(Evas_Object* ewkView, Eina_Bool editable)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     return ewk_frame_editable_set(sd->main_frame, editable);
 }
 
-char* ewk_view_selection_get(const Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
+char* ewk_view_selection_get(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, 0);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, 0);
     CString s = priv->page->focusController()->focusedOrMainFrame()->editor()->selectedText().utf8();
@@ -1389 +1389 @@
 }
 
-Eina_Bool ewk_view_execute_editor_command(Evas_Object* o, const Ewk_Editor_Command command, const char* value)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_execute_editor_command(Evas_Object* ewkView, const Ewk_Editor_Command command, const char* value)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
 
@@ -1416 +1416 @@
 }
 
-Eina_Bool ewk_view_context_menu_forward_event(Evas_Object* o, const Evas_Event_Mouse_Down* ev)
+Eina_Bool ewk_view_context_menu_forward_event(Evas_Object* ewkView, const Evas_Event_Mouse_Down* downEvent)
 {
 #if ENABLE(CONTEXT_MENUS)
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     Eina_Bool mouse_press_handled = EINA_FALSE;
@@ -1428 +1428 @@
     evas_object_geometry_get(sd->self, &x, &y, 0, 0);
 
-    WebCore::PlatformMouseEvent event(ev, WebCore::IntPoint(x, y));
+    WebCore::PlatformMouseEvent event(downEvent, WebCore::IntPoint(x, y));
 
     if (main_frame->view()) {
@@ -1452 +1452 @@
 }
 
-double ewk_view_load_progress_get(const Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, -1.0);
+double ewk_view_load_progress_get(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, -1.0);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, -1.0);
     return priv->page->progress()->estimatedProgress();
 }
 
-Eina_Bool ewk_view_stop(Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_stop(Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     return ewk_frame_stop(sd->main_frame);
 }
 
-Eina_Bool ewk_view_reload(Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_reload(Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     return ewk_frame_reload(sd->main_frame);
 }
 
-Eina_Bool ewk_view_reload_full(Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_reload_full(Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     return ewk_frame_reload_full(sd->main_frame);
 }
 
-Eina_Bool ewk_view_back(Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_back(Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     return ewk_frame_back(sd->main_frame);
 }
 
-Eina_Bool ewk_view_forward(Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_forward(Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     return ewk_frame_forward(sd->main_frame);
 }
 
-Eina_Bool ewk_view_navigate(Evas_Object* o, int steps)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_navigate(Evas_Object* ewkView, int steps)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     return ewk_frame_navigate(sd->main_frame, steps);
 }
 
-Eina_Bool ewk_view_back_possible(Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_back_possible(Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     return ewk_frame_back_possible(sd->main_frame);
 }
 
-Eina_Bool ewk_view_forward_possible(Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_forward_possible(Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     return ewk_frame_forward_possible(sd->main_frame);
 }
 
-Eina_Bool ewk_view_navigate_possible(Evas_Object* o, int steps)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_navigate_possible(Evas_Object* ewkView, int steps)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     return ewk_frame_navigate_possible(sd->main_frame, steps);
 }
 
-Eina_Bool ewk_view_history_enable_get(const Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_history_enable_get(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     return static_cast<WebCore::BackForwardListImpl*>(priv->page->backForwardList())->enabled();
 }
 
-Eina_Bool ewk_view_history_enable_set(Evas_Object* o, Eina_Bool enable)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_history_enable_set(Evas_Object* ewkView, Eina_Bool enable)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     static_cast<WebCore::BackForwardListImpl*>(priv->page->backForwardList())->setEnabled(enable);
@@ -1528 +1528 @@
 }
 
-Ewk_History* ewk_view_history_get(const Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
+Ewk_History* ewk_view_history_get(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, 0);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, 0);
     if (!static_cast<WebCore::BackForwardListImpl*>(priv->page->backForwardList())->enabled()) {
@@ -1545 +1545 @@
 }
 
-Eina_Bool ewk_view_zoom_set(Evas_Object* o, float zoom, Evas_Coord cx, Evas_Coord cy)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_zoom_set(Evas_Object* ewkView, float zoom, Evas_Coord cx, Evas_Coord cy)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET(sd, priv);
 
@@ -1620 +1620 @@
 }
 
-Eina_Bool ewk_view_zoom_weak_smooth_scale_get(const Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_zoom_weak_smooth_scale_get(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     return sd->zoom_weak_smooth_scale;
 }
 
-void ewk_view_zoom_weak_smooth_scale_set(Evas_Object* o, Eina_Bool smooth_scale)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd);
-    smooth_scale = !!smooth_scale;
-    if (sd->zoom_weak_smooth_scale == smooth_scale)
+void ewk_view_zoom_weak_smooth_scale_set(Evas_Object* ewkView, Eina_Bool smoothScale)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd);
+    smoothScale = !!smoothScale;
+    if (sd->zoom_weak_smooth_scale == smoothScale)
         return;
-    sd->zoom_weak_smooth_scale = smooth_scale;
+    sd->zoom_weak_smooth_scale = smoothScale;
     EINA_SAFETY_ON_NULL_RETURN(sd->api);
     EINA_SAFETY_ON_NULL_RETURN(sd->api->zoom_weak_smooth_scale_set);
-    sd->api->zoom_weak_smooth_scale_set(sd, smooth_scale);
-}
-
-Eina_Bool ewk_view_zoom_weak_set(Evas_Object* o, float zoom, Evas_Coord cx, Evas_Coord cy)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+    sd->api->zoom_weak_smooth_scale_set(sd, smoothScale);
+}
+
+Eina_Bool ewk_view_zoom_weak_set(Evas_Object* ewkView, float zoom, Evas_Coord centerX, Evas_Coord centerY)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET(sd, priv);
 
@@ -1663 +1663 @@
     sd->animated_zoom.zoom.end = zoom;
     sd->animated_zoom.zoom.current = zoom;
-    return sd->api->zoom_weak_set(sd, zoom, cx, cy);
-}
-
-Eina_Bool ewk_view_zoom_animated_mark_start(Evas_Object* o, float zoom)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+    return sd->api->zoom_weak_set(sd, zoom, centerX, centerY);
+}
+
+Eina_Bool ewk_view_zoom_animated_mark_start(Evas_Object* ewkView, float zoom)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     sd->animated_zoom.zoom.start = zoom;
     return EINA_TRUE;
 }
 
-Eina_Bool ewk_view_zoom_animated_mark_end(Evas_Object* o, float zoom)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_zoom_animated_mark_end(Evas_Object* ewkView, float zoom)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     sd->animated_zoom.zoom.end = zoom;
     return EINA_TRUE;
 }
 
-Eina_Bool ewk_view_zoom_animated_mark_current(Evas_Object* o, float zoom)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_zoom_animated_mark_current(Evas_Object* ewkView, float zoom)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     sd->animated_zoom.zoom.current = zoom;
     return EINA_TRUE;
 }
 
-Eina_Bool ewk_view_zoom_animated_mark_stop(Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_zoom_animated_mark_stop(Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     _ewk_view_zoom_animated_mark_stop(sd);
     return EINA_TRUE;
 }
 
-Eina_Bool ewk_view_zoom_animated_set(Evas_Object* o, float zoom, float duration, Evas_Coord cx, Evas_Coord cy)
+Eina_Bool ewk_view_zoom_animated_set(Evas_Object* ewkView, float zoom, float duration, Evas_Coord centerX, Evas_Coord centerY)
 {
     double now;
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->api, EINA_FALSE);
@@ -1723 +1723 @@
     }
 
-    if (cx < 0)
-        cx = 0;
-    if (cy < 0)
-        cy = 0;
+    if (centerX < 0)
+        centerX = 0;
+    if (centerY < 0)
+        centerY = 0;
 
     now = ecore_loop_time_get();
@@ -1734 +1734 @@
     priv->animated_zoom.zoom.end = zoom;
     priv->animated_zoom.zoom.range = (priv->animated_zoom.zoom.end - priv->animated_zoom.zoom.start);
-    priv->animated_zoom.center.x = cx;
-    priv->animated_zoom.center.y = cy;
+    priv->animated_zoom.center.x = centerX;
+    priv->animated_zoom.center.y = centerY;
     sd->animated_zoom.zoom.current = priv->animated_zoom.zoom.start;
     sd->animated_zoom.zoom.start = priv->animated_zoom.zoom.start;
@@ -1743 +1743 @@
 }
 
-Eina_Bool ewk_view_pre_render_region(Evas_Object* o, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, float zoom)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_pre_render_region(Evas_Object* ewkView, Evas_Coord x, Evas_Coord y, Evas_Coord width, Evas_Coord height, float zoom)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->api->pre_render_region, EINA_FALSE);
@@ -1766 +1766 @@
     cw *= zoom / cur_zoom;
     ch *= zoom / cur_zoom;
-    DBG("region %d,%d+%dx%d @ %f contents=%dx%d", x, y, w, h, zoom, cw, ch);
-
-    if (x + w > cw)
-        w = cw - x;
-
-    if (y + h > ch)
-        h = ch - y;
+    DBG("region %d,%d+%dx%d @ %f contents=%dx%d", x, y, width, height, zoom, cw, ch);
+
+    if (x + width > cw)
+        width = cw - x;
+
+    if (y + height > ch)
+        height = ch - y;
 
     if (x < 0) {
-        w += x;
+        width += x;
         x = 0;
     }
     if (y < 0) {
-        h += y;
+        height += y;
         y = 0;
     }
 
-    return sd->api->pre_render_region(sd, x, y, w, h, zoom);
-}
-
-Eina_Bool ewk_view_pre_render_relative_radius(Evas_Object* o, unsigned int n)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+    return sd->api->pre_render_region(sd, x, y, width, height, zoom);
+}
+
+Eina_Bool ewk_view_pre_render_relative_radius(Evas_Object* ewkView, unsigned int number)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->api->pre_render_relative_radius, EINA_FALSE);
@@ -1797 +1797 @@
 
     cur_zoom = ewk_frame_page_zoom_get(sd->main_frame);
-    return sd->api->pre_render_relative_radius(sd, n, cur_zoom);
-}
-
-unsigned int ewk_view_imh_get(const Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
+    return sd->api->pre_render_relative_radius(sd, number, cur_zoom);
+}
+
+unsigned int ewk_view_imh_get(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, 0);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, 0);
     return priv->imh;
 }
 
-void ewk_view_pre_render_cancel(Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd);
+void ewk_view_pre_render_cancel(Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd);
     EINA_SAFETY_ON_NULL_RETURN(sd->api->pre_render_cancel);
     sd->api->pre_render_cancel(sd);
 }
 
-Eina_Bool ewk_view_enable_render(const Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_enable_render(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->api->enable_render, EINA_FALSE);
     return sd->api->enable_render(sd);
 }
 
-Eina_Bool ewk_view_disable_render(const Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_disable_render(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->api->disable_render, EINA_FALSE);
     return sd->api->disable_render(sd);
 }
 
-const char* ewk_view_setting_user_agent_get(const Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
+const char* ewk_view_setting_user_agent_get(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, 0);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, 0);
     return priv->settings.user_agent;
 }
 
-Eina_Bool ewk_view_setting_user_agent_set(Evas_Object* o, const char* user_agent)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
-    EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
-    if (eina_stringshare_replace(&priv->settings.user_agent, user_agent)) {
+Eina_Bool ewk_view_setting_user_agent_set(Evas_Object* ewkView, const char* userAgent)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
+    EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
+    if (eina_stringshare_replace(&priv->settings.user_agent, userAgent)) {
         WebCore::FrameLoaderClientEfl* client = static_cast<WebCore::FrameLoaderClientEfl*>(priv->main_frame->loader()->client());
-        client->setCustomUserAgent(String::fromUTF8(user_agent));
-    }
-    return EINA_TRUE;
-}
-
-const char* ewk_view_setting_user_stylesheet_get(const Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
+        client->setCustomUserAgent(String::fromUTF8(userAgent));
+    }
+    return EINA_TRUE;
+}
+
+const char* ewk_view_setting_user_stylesheet_get(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, 0);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, 0);
     return priv->settings.user_stylesheet;
 }
 
-Eina_Bool ewk_view_setting_user_stylesheet_set(Evas_Object* o, const char* uri)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_setting_user_stylesheet_set(Evas_Object* ewkView, const char* uri)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     if (eina_stringshare_replace(&priv->settings.user_stylesheet, uri)) {
@@ -1864 +1864 @@
 }
 
-Eina_Bool ewk_view_setting_auto_load_images_get(const Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_setting_auto_load_images_get(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     return priv->settings.auto_load_images;
 }
 
-Eina_Bool ewk_view_setting_auto_load_images_set(Evas_Object* o, Eina_Bool automatic)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_setting_auto_load_images_set(Evas_Object* ewkView, Eina_Bool automatic)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     automatic = !!automatic;
@@ -1883 +1883 @@
 }
 
-Eina_Bool ewk_view_setting_auto_shrink_images_get(const Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_setting_auto_shrink_images_get(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     return priv->settings.auto_shrink_images;
 }
 
-Eina_Bool ewk_view_setting_auto_shrink_images_set(Evas_Object* o, Eina_Bool automatic)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_setting_auto_shrink_images_set(Evas_Object* ewkView, Eina_Bool automatic)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     automatic = !!automatic;
@@ -1902 +1902 @@
 }
 
-Eina_Bool ewk_view_setting_enable_auto_resize_window_get(const Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_setting_enable_auto_resize_window_get(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     return priv->settings.enable_auto_resize_window;
 }
 
-Eina_Bool ewk_view_setting_enable_auto_resize_window_set(Evas_Object* o, Eina_Bool resizable)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_setting_enable_auto_resize_window_set(Evas_Object* ewkView, Eina_Bool resizable)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     priv->settings.enable_auto_resize_window = resizable;
@@ -1917 +1917 @@
 }
 
-Eina_Bool ewk_view_setting_enable_scripts_get(const Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_setting_enable_scripts_get(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     return priv->settings.enable_scripts;
 }
 
-Eina_Bool ewk_view_setting_enable_scripts_set(Evas_Object* o, Eina_Bool enable)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_setting_enable_scripts_set(Evas_Object* ewkView, Eina_Bool enable)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     enable = !!enable;
@@ -1936 +1936 @@
 }
 
-Eina_Bool ewk_view_setting_enable_plugins_get(const Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_setting_enable_plugins_get(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     return priv->settings.enable_plugins;
 }
 
-Eina_Bool ewk_view_setting_enable_plugins_set(Evas_Object* o, Eina_Bool enable)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_setting_enable_plugins_set(Evas_Object* ewkView, Eina_Bool enable)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     enable = !!enable;
@@ -1955 +1955 @@
 }
 
-Eina_Bool ewk_view_setting_enable_frame_flattening_get(const Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_setting_enable_frame_flattening_get(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     return priv->settings.enable_frame_flattening;
 }
 
-Eina_Bool ewk_view_setting_enable_frame_flattening_set(Evas_Object* o, Eina_Bool enable)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_setting_enable_frame_flattening_set(Evas_Object* ewkView, Eina_Bool enable)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     enable = !!enable;
@@ -1974 +1974 @@
 }
 
-Eina_Bool ewk_view_setting_scripts_window_open_get(const Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_setting_scripts_window_open_get(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     return priv->settings.scripts_window_open;
 }
 
-Eina_Bool ewk_view_setting_scripts_window_open_set(Evas_Object* o, Eina_Bool allow)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_setting_scripts_window_open_set(Evas_Object* ewkView, Eina_Bool allow)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     allow = !!allow;
@@ -1993 +1993 @@
 }
 
-Eina_Bool ewk_view_setting_scripts_can_close_windows_get(const Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_setting_scripts_can_close_windows_get(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     return priv->settings.scripts_can_close_windows;
 }
 
-Eina_Bool ewk_view_setting_scripts_can_close_windows_set(Evas_Object* o, Eina_Bool allow)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_setting_scripts_can_close_windows_set(Evas_Object* ewkView, Eina_Bool allow)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     allow = !!allow;
@@ -2012 +2012 @@
 }
 
-Eina_Bool ewk_view_setting_resizable_textareas_get(const Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_setting_resizable_textareas_get(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     return priv->settings.resizable_textareas;
 }
 
-Eina_Bool ewk_view_setting_resizable_textareas_set(Evas_Object* o, Eina_Bool enable)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_setting_resizable_textareas_set(Evas_Object* ewkView, Eina_Bool enable)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     enable = !!enable;
@@ -2031 +2031 @@
 }
 
-Eina_Bool ewk_view_setting_private_browsing_get(const Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_setting_private_browsing_get(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     return priv->settings.private_browsing;
 }
 
-Eina_Bool ewk_view_setting_private_browsing_set(Evas_Object* o, Eina_Bool enable)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_setting_private_browsing_set(Evas_Object* ewkView, Eina_Bool enable)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     enable = !!enable;
@@ -2050 +2050 @@
 }
 
-Eina_Bool ewk_view_setting_offline_app_cache_get(const Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_setting_offline_app_cache_get(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     return priv->settings.offline_app_cache;
 }
 
-Eina_Bool ewk_view_setting_offline_app_cache_set(Evas_Object* o, Eina_Bool enable)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_setting_offline_app_cache_set(Evas_Object* ewkView, Eina_Bool enable)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     enable = !!enable;
@@ -2070 +2070 @@
 
 
-Eina_Bool ewk_view_setting_caret_browsing_get(const Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_setting_caret_browsing_get(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     return priv->settings.caret_browsing;
 }
 
-Eina_Bool ewk_view_setting_caret_browsing_set(Evas_Object* o, Eina_Bool enable)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_setting_caret_browsing_set(Evas_Object* ewkView, Eina_Bool enable)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     enable = !!enable;
@@ -2089 +2089 @@
 }
 
-const char* ewk_view_setting_encoding_custom_get(const Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
+const char* ewk_view_setting_encoding_custom_get(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, 0);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, 0);
-    Evas_Object* main_frame = ewk_view_frame_main_get(o);
+    Evas_Object* main_frame = ewk_view_frame_main_get(ewkView);
     WebCore::Frame* core_frame = ewk_frame_core_get(main_frame);
 
@@ -2105 +2105 @@
 }
 
-Eina_Bool ewk_view_setting_encoding_custom_set(Evas_Object* o, const char* encoding)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
-    EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
-    Evas_Object* main_frame = ewk_view_frame_main_get(o);
+Eina_Bool ewk_view_setting_encoding_custom_set(Evas_Object* ewkView, const char* encoding)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
+    EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
+    Evas_Object* main_frame = ewk_view_frame_main_get(ewkView);
     WebCore::Frame* core_frame = ewk_frame_core_get(main_frame);
     DBG("%s", encoding);
@@ -2117 +2117 @@
 }
 
-const char* ewk_view_setting_encoding_default_get(const Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
+const char* ewk_view_setting_encoding_default_get(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, 0);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, 0);
     return priv->settings.encoding_default;
 }
 
-Eina_Bool ewk_view_setting_encoding_default_set(Evas_Object* o, const char* encoding)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_setting_encoding_default_set(Evas_Object* ewkView, const char* encoding)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     if (eina_stringshare_replace(&priv->settings.encoding_default, encoding))
@@ -2133 +2133 @@
 }
 
-Eina_Bool ewk_view_setting_encoding_detector_set(Evas_Object* o, Eina_Bool enable)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_setting_encoding_detector_set(Evas_Object* ewkView, Eina_Bool enable)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     enable = !!enable;
@@ -2145 +2145 @@
 }
 
-Eina_Bool ewk_view_setting_encoding_detector_get(const Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_setting_encoding_detector_get(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     return priv->settings.encoding_detector;
 }
 
-Eina_Bool ewk_view_setting_enable_developer_extras_get(const Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_setting_enable_developer_extras_get(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     return priv->settings.enable_developer_extras;
 }
 
-Eina_Bool ewk_view_setting_enable_developer_extras_set(Evas_Object* o, Eina_Bool enable)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_setting_enable_developer_extras_set(Evas_Object* ewkView, Eina_Bool enable)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     enable = !!enable;
@@ -2171 +2171 @@
 }
 
-int ewk_view_setting_font_minimum_size_get(const Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
+int ewk_view_setting_font_minimum_size_get(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, 0);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, 0);
     return priv->settings.font_minimum_size;
 }
 
-Eina_Bool ewk_view_setting_font_minimum_size_set(Evas_Object* o, int size)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_setting_font_minimum_size_set(Evas_Object* ewkView, int size)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     if (priv->settings.font_minimum_size != size) {
@@ -2189 +2189 @@
 }
 
-int ewk_view_setting_font_minimum_logical_size_get(const Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
+int ewk_view_setting_font_minimum_logical_size_get(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, 0);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, 0);
     return priv->settings.font_minimum_logical_size;
 }
 
-Eina_Bool ewk_view_setting_font_minimum_logical_size_set(Evas_Object* o, int size)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_setting_font_minimum_logical_size_set(Evas_Object* ewkView, int size)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     if (priv->settings.font_minimum_logical_size != size) {
@@ -2207 +2207 @@
 }
 
-int ewk_view_setting_font_default_size_get(const Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
+int ewk_view_setting_font_default_size_get(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, 0);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, 0);
     return priv->settings.font_default_size;
 }
 
-Eina_Bool ewk_view_setting_font_default_size_set(Evas_Object* o, int size)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_setting_font_default_size_set(Evas_Object* ewkView, int size)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     if (priv->settings.font_default_size != size) {
@@ -2225 +2225 @@
 }
 
-int ewk_view_setting_font_monospace_size_get(const Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
+int ewk_view_setting_font_monospace_size_get(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, 0);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, 0);
     return priv->settings.font_monospace_size;
 }
 
-Eina_Bool ewk_view_setting_font_monospace_size_set(Evas_Object* o, int size)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_setting_font_monospace_size_set(Evas_Object* ewkView, int size)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     if (priv->settings.font_monospace_size != size) {
@@ -2243 +2243 @@
 }
 
-const char* ewk_view_font_family_name_get(const Evas_Object* o, Ewk_Font_Family font_family)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
+const char* ewk_view_font_family_name_get(const Evas_Object* ewkView, Ewk_Font_Family fontFamily)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, 0);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, 0);
 
-    switch (font_family) {
+    switch (fontFamily) {
     case EWK_FONT_FAMILY_STANDARD:
         return priv->settings.font_standard;
@@ -2265 +2265 @@
 }
 
-Eina_Bool ewk_view_font_family_name_set(Evas_Object* o, Ewk_Font_Family font_family, const char* name)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
-    EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
-
-    switch (font_family) {
+Eina_Bool ewk_view_font_family_name_set(Evas_Object* ewkView, Ewk_Font_Family fontFamily, const char* name)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
+    EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
+
+    switch (fontFamily) {
     case EWK_FONT_FAMILY_STANDARD:
         if (eina_stringshare_replace(&priv->settings.font_standard, name))
@@ -2302 +2302 @@
 }
 
-Eina_Bool ewk_view_setting_spatial_navigation_get(const Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_setting_spatial_navigation_get(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     return priv->settings.spatial_navigation;
 }
 
-Eina_Bool ewk_view_setting_spatial_navigation_set(Evas_Object* o, Eina_Bool enable)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_setting_spatial_navigation_set(Evas_Object* ewkView, Eina_Bool enable)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     enable = !!enable;
@@ -2321 +2321 @@
 }
 
-Eina_Bool ewk_view_setting_local_storage_get(const Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_setting_local_storage_get(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     return priv->settings.local_storage;
 }
 
-Eina_Bool ewk_view_setting_local_storage_set(Evas_Object* o, Eina_Bool enable)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_setting_local_storage_set(Evas_Object* ewkView, Eina_Bool enable)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     enable = !!enable;
@@ -2340 +2340 @@
 }
 
-Eina_Bool ewk_view_setting_page_cache_get(const Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_setting_page_cache_get(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     return priv->settings.page_cache;
 }
 
-Eina_Bool ewk_view_setting_page_cache_set(Evas_Object* o, Eina_Bool enable)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_setting_page_cache_set(Evas_Object* ewkView, Eina_Bool enable)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     enable = !!enable;
@@ -2359 +2359 @@
 }
 
-const char* ewk_view_setting_local_storage_database_path_get(const Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
+const char* ewk_view_setting_local_storage_database_path_get(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, 0);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, 0);
     return priv->settings.local_storage_database_path;
 }
 
-Eina_Bool ewk_view_setting_local_storage_database_path_set(Evas_Object* o, const char* path)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_setting_local_storage_database_path_set(Evas_Object* ewkView, const char* path)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     if (eina_stringshare_replace(&priv->settings.local_storage_database_path, path))
@@ -2375 +2375 @@
 }
 
-Eina_Bool ewk_view_setting_minimum_timer_interval_set(Evas_Object* o, double interval)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_setting_minimum_timer_interval_set(Evas_Object* ewkView, double interval)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     if (fabs(priv->settings.dom_timer_interval - interval) >= std::numeric_limits<double>::epsilon()) {
@@ -2386 +2386 @@
 }
 
-double ewk_view_setting_minimum_timer_interval_get(const Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+double ewk_view_setting_minimum_timer_interval_get(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     return priv->settings.dom_timer_interval;
 }
 
-Ewk_View_Smart_Data* ewk_view_smart_data_get(const Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
+Ewk_View_Smart_Data* ewk_view_smart_data_get(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, 0);
     return sd;
 }
@@ -2467 +2467 @@
  *       to define their own backing store.
  */
-void ewk_view_repaint_add(Ewk_View_Private_Data* priv, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h)
+void ewk_view_repaint_add(Ewk_View_Private_Data* priv, Evas_Coord x, Evas_Coord y, Evas_Coord width, Evas_Coord height)
 {
     EINA_SAFETY_ON_NULL_RETURN(priv);
-    _ewk_view_repaint_add(priv, x, y, w, h);
+    _ewk_view_repaint_add(priv, x, y, width, height);
 }
 
@@ -2493 +2493 @@
 }
 
-void ewk_view_scrolls_process(Ewk_View_Smart_Data* sd)
-{
-    EINA_SAFETY_ON_NULL_RETURN(sd);
-    EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv);
-    if (!sd->api->scrolls_process(sd))
+void ewk_view_scrolls_process(Ewk_View_Smart_Data* smartData)
+{
+    EINA_SAFETY_ON_NULL_RETURN(smartData);
+    EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv);
+    if (!smartData->api->scrolls_process(smartData))
         ERR("failed to process scrolls.");
     _ewk_view_scrolls_flush(priv);
@@ -2536 +2536 @@
 }
 
-void ewk_view_paint_context_free(Ewk_View_Paint_Context* ctxt)
-{
-    EINA_SAFETY_ON_NULL_RETURN(ctxt);
-    delete ctxt->gc;
-    cairo_destroy(ctxt->cr);
-    free(ctxt);
-}
-
-void ewk_view_paint_context_save(Ewk_View_Paint_Context* ctxt)
-{
-    EINA_SAFETY_ON_NULL_RETURN(ctxt);
-    cairo_save(ctxt->cr);
-    ctxt->gc->save();
-}
-
-void ewk_view_paint_context_restore(Ewk_View_Paint_Context* ctxt)
-{
-    EINA_SAFETY_ON_NULL_RETURN(ctxt);
-    ctxt->gc->restore();
-    cairo_restore(ctxt->cr);
-}
-
-void ewk_view_paint_context_clip(Ewk_View_Paint_Context* ctxt, const Eina_Rectangle* area)
-{
-    EINA_SAFETY_ON_NULL_RETURN(ctxt);
+void ewk_view_paint_context_free(Ewk_View_Paint_Context* context)
+{
+    EINA_SAFETY_ON_NULL_RETURN(context);
+    delete context->gc;
+    cairo_destroy(context->cr);
+    free(context);
+}
+
+void ewk_view_paint_context_save(Ewk_View_Paint_Context* context)
+{
+    EINA_SAFETY_ON_NULL_RETURN(context);
+    cairo_save(context->cr);
+    context->gc->save();
+}
+
+void ewk_view_paint_context_restore(Ewk_View_Paint_Context* context)
+{
+    EINA_SAFETY_ON_NULL_RETURN(context);
+    context->gc->restore();
+    cairo_restore(context->cr);
+}
+
+void ewk_view_paint_context_clip(Ewk_View_Paint_Context* context, const Eina_Rectangle* area)
+{
+    EINA_SAFETY_ON_NULL_RETURN(context);
     EINA_SAFETY_ON_NULL_RETURN(area);
-    ctxt->gc->clip(WebCore::IntRect(area->x, area->y, area->w, area->h));
-}
-
-void ewk_view_paint_context_paint(Ewk_View_Paint_Context* ctxt, const Eina_Rectangle* area)
-{
-    EINA_SAFETY_ON_NULL_RETURN(ctxt);
+    context->gc->clip(WebCore::IntRect(area->x, area->y, area->w, area->h));
+}
+
+void ewk_view_paint_context_paint(Ewk_View_Paint_Context* context, const Eina_Rectangle* area)
+{
+    EINA_SAFETY_ON_NULL_RETURN(context);
     EINA_SAFETY_ON_NULL_RETURN(area);
 
     WebCore::IntRect rect(area->x, area->y, area->w, area->h);
 
-    if (ctxt->view->isTransparent())
-        ctxt->gc->clearRect(rect);
-    ctxt->view->paint(ctxt->gc, rect);
-}
-
-void ewk_view_paint_context_paint_contents(Ewk_View_Paint_Context* ctxt, const Eina_Rectangle* area)
-{
-    EINA_SAFETY_ON_NULL_RETURN(ctxt);
+    if (context->view->isTransparent())
+        context->gc->clearRect(rect);
+    context->view->paint(context->gc, rect);
+}
+
+void ewk_view_paint_context_paint_contents(Ewk_View_Paint_Context* context, const Eina_Rectangle* area)
+{
+    EINA_SAFETY_ON_NULL_RETURN(context);
     EINA_SAFETY_ON_NULL_RETURN(area);
 
     WebCore::IntRect rect(area->x, area->y, area->w, area->h);
 
-    if (ctxt->view->isTransparent())
-        ctxt->gc->clearRect(rect);
-
-    ctxt->view->paintContents(ctxt->gc, rect);
-}
-
-void ewk_view_paint_context_scale(Ewk_View_Paint_Context* ctxt, float scale_x, float scale_y)
-{
-    EINA_SAFETY_ON_NULL_RETURN(ctxt);
-
-    ctxt->gc->scale(WebCore::FloatSize(scale_x, scale_y));
-}
-
-void ewk_view_paint_context_translate(Ewk_View_Paint_Context* ctxt, float x, float y)
-{
-    EINA_SAFETY_ON_NULL_RETURN(ctxt);
-
-    ctxt->gc->translate(x, y);
+    if (context->view->isTransparent())
+        context->gc->clearRect(rect);
+
+    context->view->paintContents(context->gc, rect);
+}
+
+void ewk_view_paint_context_scale(Ewk_View_Paint_Context* context, float scaleX, float scaleY)
+{
+    EINA_SAFETY_ON_NULL_RETURN(context);
+
+    context->gc->scale(WebCore::FloatSize(scaleX, scaleY));
+}
+
+void ewk_view_paint_context_translate(Ewk_View_Paint_Context* context, float x, float y)
+{
+    EINA_SAFETY_ON_NULL_RETURN(context);
+
+    context->gc->translate(x, y);
 }
 
@@ -2660 +2660 @@
  * Emits signal: "ready" with no parameters.
  */
-void ewk_view_ready(Evas_Object* o)
-{
-    DBG("o=%p", o);
-    evas_object_smart_callback_call(o, "ready", 0);
+void ewk_view_ready(Evas_Object* ewkView)
+{
+    DBG("ewkView=%p", ewkView);
+    evas_object_smart_callback_call(ewkView, "ready", 0);
 }
 
@@ -2674 +2674 @@
  * enabled or not.
  */
-void ewk_view_input_method_state_set(Evas_Object* o, Eina_Bool active)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd);
+void ewk_view_input_method_state_set(Evas_Object* ewkView, Eina_Bool active)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd);
     EWK_VIEW_PRIV_GET(sd, priv);
     WebCore::Frame* focusedFrame = priv->page->focusController()->focusedOrMainFrame();
@@ -2703 +2703 @@
     }
 
-    evas_object_smart_callback_call(o, "inputmethod,changed", (void*)active);
+    evas_object_smart_callback_call(ewkView, "inputmethod,changed", (void*)active);
 }
 
@@ -2712 +2712 @@
  * Emits signal: "title,changed" with pointer to new title string.
  */
-void ewk_view_title_set(Evas_Object* o, const char* title)
-{
-    DBG("o=%p, title=%s", o, title ? title : "(null)");
-    evas_object_smart_callback_call(o, "title,changed", (void*)title);
+void ewk_view_title_set(Evas_Object* ewkView, const char* title)
+{
+    DBG("ewkView=%p, title=%s", ewkView, title ? title : "(null)");
+    evas_object_smart_callback_call(ewkView, "title,changed", (void*)title);
 }
 
@@ -2724 +2724 @@
  * Emits signal: "uri,changed" with pointer to the new uri string.
  */
-void ewk_view_uri_changed(Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd);
+void ewk_view_uri_changed(Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd);
     const char* uri = ewk_frame_uri_get(sd->main_frame);
-    DBG("o=%p, uri=%s", o, uri ? uri : "(null)");
-    evas_object_smart_callback_call(o, "uri,changed", (void*)uri);
+    DBG("ewkView=%p, uri=%s", ewkView, uri ? uri : "(null)");
+    evas_object_smart_callback_call(ewkView, "uri,changed", (void*)uri);
 }
 
@@ -2741 +2741 @@
  * Emits signal: "load,document,finished" with @p frame as the parameter.
  */
-void ewk_view_load_document_finished(Evas_Object* o, Evas_Object* frame)
-{
-    evas_object_smart_callback_call(o, "load,document,finished", frame);
+void ewk_view_load_document_finished(Evas_Object* ewkView, Evas_Object* frame)
+{
+    evas_object_smart_callback_call(ewkView, "load,document,finished", frame);
 }
 
@@ -2754 +2754 @@
  * Emits signal: "load,started" with no parameters.
  */
-void ewk_view_load_started(Evas_Object* o)
-{
-    DBG("o=%p", o);
-    evas_object_smart_callback_call(o, "load,started", 0);
+void ewk_view_load_started(Evas_Object* ewkView)
+{
+    DBG("ewkView=%p", ewkView);
+    evas_object_smart_callback_call(ewkView, "load,started", 0);
 }
 
@@ -2767 +2767 @@
  * Emits signal: "load,started" on main frame with no parameters.
  */
-void ewk_view_frame_main_load_started(Evas_Object* o)
-{
-    DBG("o=%p", o);
-    Evas_Object* frame = ewk_view_frame_main_get(o);
+void ewk_view_frame_main_load_started(Evas_Object* ewkView)
+{
+    DBG("ewkView=%p", ewkView);
+    Evas_Object* frame = ewk_view_frame_main_get(ewkView);
     evas_object_smart_callback_call(frame, "load,started", 0);
 }
@@ -2782 +2782 @@
  * Emits signal: "load,provisional" on View with no parameters.
  */
-void ewk_view_load_provisional(Evas_Object* o)
-{
-    DBG("o=%p", o);
-    evas_object_smart_callback_call(o, "load,provisional", 0);
+void ewk_view_load_provisional(Evas_Object* ewkView)
+{
+    DBG("ewkView=%p", ewkView);
+    evas_object_smart_callback_call(ewkView, "load,provisional", 0);
 }
 
@@ -2796 +2796 @@
  * Emits signal: "load,newwindow,show" on view with no parameters.
  */
-void ewk_view_load_show(Evas_Object* o)
-{
-    DBG("o=%p", o);
-    evas_object_smart_callback_call(o, "load,newwindow,show", 0);
+void ewk_view_load_show(Evas_Object* ewkView)
+{
+    DBG("ewkView=%p", ewkView);
+    evas_object_smart_callback_call(ewkView, "load,newwindow,show", 0);
 }
 
@@ -2809 +2809 @@
  * @param o View.
  */
-void ewk_view_frame_main_cleared(Evas_Object* o)
-{
-    DBG("o=%p", o);
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd);
+void ewk_view_frame_main_cleared(Evas_Object* ewkView)
+{
+    DBG("ewkView=%p", ewkView);
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd);
     EINA_SAFETY_ON_NULL_RETURN(sd->api->flush);
     sd->api->flush(sd);
@@ -2825 +2825 @@
  * Emits signal: "icon,received" with no parameters.
  */
-void ewk_view_frame_main_icon_received(Evas_Object* o)
-{
-    DBG("o=%p", o);
-    Evas_Object* frame = ewk_view_frame_main_get(o);
+void ewk_view_frame_main_icon_received(Evas_Object* ewkView)
+{
+    DBG("ewkView=%p", ewkView);
+    Evas_Object* frame = ewk_view_frame_main_get(ewkView);
     evas_object_smart_callback_call(frame, "icon,received", 0);
 }
@@ -2842 +2842 @@
  *       compatible with previous WebKit.
  */
-void ewk_view_load_finished(Evas_Object* o, const Ewk_Frame_Load_Error* error)
-{
-    DBG("o=%p, error=%p", o, error);
-    evas_object_smart_callback_call(o, "load,finished", (void*)error);
+void ewk_view_load_finished(Evas_Object* ewkView, const Ewk_Frame_Load_Error* error)
+{
+    DBG("ewkView=%p, error=%p", ewkView, error);
+    evas_object_smart_callback_call(ewkView, "load,finished", (void*)error);
 }
 
@@ -2854 +2854 @@
  * Emits signal: "load,error" with pointer to Ewk_Frame_Load_Error.
  */
-void ewk_view_load_error(Evas_Object* o, const Ewk_Frame_Load_Error* error)
-{
-    DBG("o=%p, error=%p", o, error);
-    evas_object_smart_callback_call(o, "load,error", (void*)error);
+void ewk_view_load_error(Evas_Object* ewkView, const Ewk_Frame_Load_Error* error)
+{
+    DBG("ewkView=%p, error=%p", ewkView, error);
+    evas_object_smart_callback_call(ewkView, "load,error", (void*)error);
 }
 
@@ -2866 +2866 @@
  * Emits signal: "load,progress" with pointer to a double from 0.0 to 1.0.
  */
-void ewk_view_load_progress_changed(Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd);
+void ewk_view_load_progress_changed(Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv);
 
@@ -2874 +2874 @@
     double progress = priv->page->progress()->estimatedProgress();
 
-    DBG("o=%p (p=%0.3f)", o, progress);
-
-    evas_object_smart_callback_call(o, "load,progress", &progress);
+    DBG("ewkView=%p (p=%0.3f)", ewkView, progress);
+
+    evas_object_smart_callback_call(ewkView, "load,progress", &progress);
 }
 
@@ -2888 +2888 @@
  * Emits signal: "restore" with frame.
  */
-void ewk_view_restore_state(Evas_Object* o, Evas_Object* frame)
-{
-    evas_object_smart_callback_call(o, "restore", frame);
+void ewk_view_restore_state(Evas_Object* ewkView, Evas_Object* frame)
+{
+    evas_object_smart_callback_call(ewkView, "restore", frame);
 }
 
@@ -2914 +2914 @@
  * @see ewk_window_features_ref().
  */
-Evas_Object* ewk_view_window_create(Evas_Object* o, Eina_Bool javascript, const WebCore::WindowFeatures* coreFeatures)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
+Evas_Object* ewk_view_window_create(Evas_Object* ewkView, Eina_Bool javascript, const WebCore::WindowFeatures* coreFeatures)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, 0);
 
     if (!sd->api->window_create)
-        return o;
+        return ewkView;
 
     Ewk_Window_Features* window_features = ewk_window_features_new_from_core(coreFeatures);
@@ -2942 +2942 @@
  * @param o View to be closed.
  */
-void ewk_view_window_close(Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd);
-
-    ewk_view_stop(o);
+void ewk_view_window_close(Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd);
+
+    ewk_view_stop(ewkView);
     if (!sd->api->window_close)
         return;
@@ -2958 +2958 @@
  * Emits signal: "link,hover,in"
  */
-void ewk_view_mouse_link_hover_in(Evas_Object* o, void* data)
-{
-    evas_object_smart_callback_call(o, "link,hover,in", data);
+void ewk_view_mouse_link_hover_in(Evas_Object* ewkView, void* data)
+{
+    evas_object_smart_callback_call(ewkView, "link,hover,in", data);
 }
 
@@ -2969 +2969 @@
  * Emits signal: "link,hover,out"
  */
-void ewk_view_mouse_link_hover_out(Evas_Object* o)
-{
-    evas_object_smart_callback_call(o, "link,hover,out", 0);
+void ewk_view_mouse_link_hover_out(Evas_Object* ewkView)
+{
+    evas_object_smart_callback_call(ewkView, "link,hover,out", 0);
 }
 
@@ -2980 +2980 @@
  * Emits signal: "toolbars,visible,set" with a pointer to a boolean.
  */
-void ewk_view_toolbars_visible_set(Evas_Object* o, Eina_Bool visible)
-{
-    DBG("o=%p (visible=%d)", o, !!visible);
-    evas_object_smart_callback_call(o, "toolbars,visible,set", &visible);
+void ewk_view_toolbars_visible_set(Evas_Object* ewkView, Eina_Bool visible)
+{
+    DBG("ewkView=%p (visible=%d)", ewkView, !!visible);
+    evas_object_smart_callback_call(ewkView, "toolbars,visible,set", &visible);
 }
 
@@ -2997 +2997 @@
  * Emits signal: "toolbars,visible,get" with a pointer to a boolean.
  */
-void ewk_view_toolbars_visible_get(Evas_Object* o, Eina_Bool* visible)
-{
-    DBG("%s, o=%p", __func__, o);
+void ewk_view_toolbars_visible_get(Evas_Object* ewkView, Eina_Bool* visible)
+{
+    DBG("%s, o=%p", __func__, ewkView);
     *visible = EINA_FALSE;
-    evas_object_smart_callback_call(o, "toolbars,visible,get", visible);
+    evas_object_smart_callback_call(ewkView, "toolbars,visible,get", visible);
 }
 
@@ -3013 +3013 @@
  * Emits signal: "statusbar,visible,set" with a pointer to a boolean.
  */
-void ewk_view_statusbar_visible_set(Evas_Object* o, Eina_Bool visible)
-{
-    DBG("o=%p (visible=%d)", o, !!visible);
-    evas_object_smart_callback_call(o, "statusbar,visible,set", &visible);
+void ewk_view_statusbar_visible_set(Evas_Object* ewkView, Eina_Bool visible)
+{
+    DBG("ewkView=%p (visible=%d)", ewkView, !!visible);
+    evas_object_smart_callback_call(ewkView, "statusbar,visible,set", &visible);
 }
 
@@ -3030 +3030 @@
  * Emits signal: "statusbar,visible,get" with a pointer to a boolean.
  */
-void ewk_view_statusbar_visible_get(Evas_Object* o, Eina_Bool* visible)
-{
-    DBG("%s, o=%p", __func__, o);
+void ewk_view_statusbar_visible_get(Evas_Object* ewkView, Eina_Bool* visible)
+{
+    DBG("%s, o=%p", __func__, ewkView);
     *visible = EINA_FALSE;
-    evas_object_smart_callback_call(o, "statusbar,visible,get", visible);
+    evas_object_smart_callback_call(ewkView, "statusbar,visible,get", visible);
 }
 
@@ -3046 +3046 @@
  * Emits signal: "statusbar,text,set" with a string.
  */
-void ewk_view_statusbar_text_set(Evas_Object* o, const char* text)
-{
-    DBG("o=%p (text=%s)", o, text);
+void ewk_view_statusbar_text_set(Evas_Object* ewkView, const char* text)
+{
+    DBG("ewkView=%p (text=%s)", ewkView, text);
     INF("status bar text set: %s", text);
-    evas_object_smart_callback_call(o, "statusbar,text,set", (void*)text);
+    evas_object_smart_callback_call(ewkView, "statusbar,text,set", (void*)text);
 }
 
@@ -3062 +3062 @@
  * Emits signal: "scrollbars,visible,set" with a pointer to a boolean.
  */
-void ewk_view_scrollbars_visible_set(Evas_Object* o, Eina_Bool visible)
-{
-    DBG("o=%p (visible=%d)", o, !!visible);
-    evas_object_smart_callback_call(o, "scrollbars,visible,set", &visible);
+void ewk_view_scrollbars_visible_set(Evas_Object* ewkView, Eina_Bool visible)
+{
+    DBG("ewkView=%p (visible=%d)", ewkView, !!visible);
+    evas_object_smart_callback_call(ewkView, "scrollbars,visible,set", &visible);
 }
 
@@ -3079 +3079 @@
  * Emits signal: "scrollbars,visible,get" with a pointer to a boolean.
  */
-void ewk_view_scrollbars_visible_get(Evas_Object* o, Eina_Bool* visible)
-{
-    DBG("%s, o=%p", __func__, o);
+void ewk_view_scrollbars_visible_get(Evas_Object* ewkView, Eina_Bool* visible)
+{
+    DBG("%s, o=%p", __func__, ewkView);
     *visible = EINA_FALSE;
-    evas_object_smart_callback_call(o, "scrollbars,visible,get", visible);
+    evas_object_smart_callback_call(ewkView, "scrollbars,visible,get", visible);
 }
 
@@ -3095 +3095 @@
  * Emits signal: "menubar,visible,set" with a pointer to a boolean.
  */
-void ewk_view_menubar_visible_set(Evas_Object* o, Eina_Bool visible)
-{
-    DBG("o=%p (visible=%d)", o, !!visible);
-    evas_object_smart_callback_call(o, "menubar,visible,set", &visible);
+void ewk_view_menubar_visible_set(Evas_Object* ewkView, Eina_Bool visible)
+{
+    DBG("ewkView=%p (visible=%d)", ewkView, !!visible);
+    evas_object_smart_callback_call(ewkView, "menubar,visible,set", &visible);
 }
 
@@ -3112 +3112 @@
  * Emits signal: "menubar,visible,get" with a pointer to a boolean.
  */
-void ewk_view_menubar_visible_get(Evas_Object* o, Eina_Bool* visible)
-{
-    DBG("%s, o=%p", __func__, o);
+void ewk_view_menubar_visible_get(Evas_Object* ewkView, Eina_Bool* visible)
+{
+    DBG("%s, o=%p", __func__, ewkView);
     *visible = EINA_FALSE;
-    evas_object_smart_callback_call(o, "menubar,visible,get", visible);
+    evas_object_smart_callback_call(ewkView, "menubar,visible,get", visible);
 }
 
@@ -3129 +3129 @@
  * removed, text will be 0 or '\0'
  */
-void ewk_view_tooltip_text_set(Evas_Object* o, const char* text)
-{
-    DBG("o=%p text=%s", o, text);
-    evas_object_smart_callback_call(o, "tooltip,text,set", (void*)text);
+void ewk_view_tooltip_text_set(Evas_Object* ewkView, const char* text)
+{
+    DBG("ewkView=%p text=%s", ewkView, text);
+    evas_object_smart_callback_call(ewkView, "tooltip,text,set", (void*)text);
 }
 
@@ -3144 +3144 @@
  *
  */
-void ewk_view_add_console_message(Evas_Object* o, const char* message, unsigned int lineNumber, const char* sourceID)
-{
-    DBG("o=%p message=%s lineNumber=%u sourceID=%s", o, message, lineNumber, sourceID);
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd);
+void ewk_view_add_console_message(Evas_Object* ewkView, const char* message, unsigned int lineNumber, const char* sourceID)
+{
+    DBG("ewkView=%p message=%s lineNumber=%u sourceID=%s", ewkView, message, lineNumber, sourceID);
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd);
     EINA_SAFETY_ON_NULL_RETURN(sd->api);
     EINA_SAFETY_ON_NULL_RETURN(sd->api->add_console_message);
@@ -3153 +3153 @@
 }
 
-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);
+bool ewk_view_focus_can_cycle(Evas_Object* ewkView, Ewk_Focus_Direction direction)
+{
+    DBG("ewkView=%p direction=%d", ewkView, direction);
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, false);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->api, false);
 
@@ -3165 +3165 @@
 }
 
-void ewk_view_run_javascript_alert(Evas_Object* o, Evas_Object* frame, const char* message)
-{
-    DBG("o=%p frame=%p message=%s", o, frame, message);
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd);
+void ewk_view_run_javascript_alert(Evas_Object* ewkView, Evas_Object* frame, const char* message)
+{
+    DBG("ewkView=%p frame=%p message=%s", ewkView, frame, message);
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd);
     EINA_SAFETY_ON_NULL_RETURN(sd->api);
 
@@ -3177 +3177 @@
 }
 
-Eina_Bool ewk_view_run_javascript_confirm(Evas_Object* o, Evas_Object* frame, const char* message)
-{
-    DBG("o=%p frame=%p message=%s", o, frame, message);
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_run_javascript_confirm(Evas_Object* ewkView, Evas_Object* frame, const char* message)
+{
+    DBG("ewkView=%p frame=%p message=%s", ewkView, frame, message);
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->api, EINA_FALSE);
 
@@ -3189 +3189 @@
 }
 
-Eina_Bool ewk_view_run_javascript_prompt(Evas_Object* o, Evas_Object* frame, const char* message, const char* defaultValue, char** value)
-{
-    DBG("o=%p frame=%p message=%s", o, frame, message);
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_run_javascript_prompt(Evas_Object* ewkView, Evas_Object* frame, const char* message, const char* defaultValue, char** value)
+{
+    DBG("ewkView=%p frame=%p message=%s", ewkView, frame, message);
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->api, EINA_FALSE);
 
@@ -3212 +3212 @@
  * @return @c EINA_TRUE if script should be stopped; @c EINA_FALSE otherwise
  */
-Eina_Bool ewk_view_should_interrupt_javascript(Evas_Object* o)
-{
-    DBG("o=%p", o);
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_should_interrupt_javascript(Evas_Object* ewkView)
+{
+    DBG("ewkView=%p", ewkView);
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->api, EINA_FALSE);
 
@@ -3238 +3238 @@
  * site's requirement.
  */
-uint64_t ewk_view_exceeded_database_quota(Evas_Object* o, Evas_Object* frame, const char* databaseName, uint64_t current_size, uint64_t expected_size)
-{
-    DBG("o=%p", o);
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
+uint64_t ewk_view_exceeded_database_quota(Evas_Object* ewkView, Evas_Object* frame, const char* databaseName, uint64_t currentSize, uint64_t expectedSize)
+{
+    DBG("ewkView=%p", ewkView);
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, 0);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->api, 0);
     if (!sd->api->exceeded_database_quota)
         return 0;
 
-    INF("current_size=%" PRIu64 " expected_size=%" PRIu64, current_size, expected_size);
-    return sd->api->exceeded_database_quota(sd, frame, databaseName, current_size, expected_size);
+    INF("current_size=%" PRIu64 " expected_size=%" PRIu64, currentSize, expectedSize);
+    return sd->api->exceeded_database_quota(sd, frame, databaseName, currentSize, expectedSize);
 }
 
@@ -3263 +3263 @@
  * @return @EINA_FALSE if user canceled file selection; @EINA_TRUE if confirmed.
  */
-Eina_Bool ewk_view_run_open_panel(Evas_Object* o, Evas_Object* frame, Eina_Bool allows_multiple_files, const char* accept_types, Eina_List** selected_filenames)
-{
-    DBG("o=%p frame=%p allows_multiple_files=%d", o, frame, allows_multiple_files);
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_run_open_panel(Evas_Object* ewkView, Evas_Object* frame, Eina_Bool allowsMultipleFiles, const char* acceptTypes, Eina_List** selectedFilenames)
+{
+    DBG("ewkView=%p frame=%p allows_multiple_files=%d", ewkView, frame, allowsMultipleFiles);
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->api, EINA_FALSE);
     Eina_Bool confirm;
@@ -3273 +3273 @@
         return EINA_FALSE;
 
-    *selected_filenames = 0;
-
-    confirm = sd->api->run_open_panel(sd, frame, allows_multiple_files, accept_types, selected_filenames);
-    if (!confirm && *selected_filenames)
+    *selectedFilenames = 0;
+
+    confirm = sd->api->run_open_panel(sd, frame, allowsMultipleFiles, acceptTypes, selectedFilenames);
+    if (!confirm && *selectedFilenames)
         ERR("Canceled file selection, but selected filenames != 0. Free names before return.");
     return confirm;
 }
 
-void ewk_view_repaint(Evas_Object* o, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h)
-{
-    DBG("o=%p, region=%d,%d + %dx%d", o, x, y, w, h);
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd);
+void ewk_view_repaint(Evas_Object* ewkView, Evas_Coord x, Evas_Coord y, Evas_Coord width, Evas_Coord height)
+{
+    DBG("ewkView=%p, region=%d,%d + %dx%d", ewkView, x, y, width, height);
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv);
 
@@ -3292 +3292 @@
     }
 
-    _ewk_view_repaint_add(priv, x, y, w, h);
+    _ewk_view_repaint_add(priv, x, y, width, height);
     _ewk_view_smart_changed(sd);
 }
 
-void ewk_view_scroll(Evas_Object* o, Evas_Coord dx, Evas_Coord dy, Evas_Coord sx, Evas_Coord sy, Evas_Coord sw, Evas_Coord sh, Evas_Coord cx, Evas_Coord cy, Evas_Coord cw, Evas_Coord ch, Eina_Bool main_frame)
-{
-    DBG("o=%p, delta: %d,%d, scroll: %d,%d+%dx%d, clip: %d,%d+%dx%d",
-        o, dx, dy, sx, sy, sw, sh, cx, cy, cw, ch);
-
-    if ((sx != cx) || (sy != cy) || (sw != cw) || (sh != ch))
+void ewk_view_scroll(Evas_Object* ewkView, Evas_Coord dx, Evas_Coord dy, Evas_Coord scrollX, Evas_Coord scrollY, Evas_Coord scrollWidth, Evas_Coord scrollHeight, Evas_Coord centerX, Evas_Coord centerY, Evas_Coord centerWidth, Evas_Coord centerHeight, Eina_Bool mainFrame)
+{
+    DBG("ewkView=%p, delta: %d,%d, scroll: %d,%d+%dx%d, clip: %d,%d+%dx%d",
+        ewkView, dx, dy, scrollX, scrollY, scrollWidth, scrollHeight, centerX, centerY, centerWidth, centerHeight);
+
+    if ((scrollX != centerX) || (scrollY != centerY) || (scrollWidth != centerWidth) || (scrollHeight != centerHeight))
         WRN("scroll region and clip are different! %d,%d+%dx%d and %d,%d+%dx%d",
-            sx, sy, sw, sh, cx, cy, cw, ch);
-
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd);
+            scrollX, scrollY, scrollWidth, scrollHeight, centerX, centerY, centerWidth, centerHeight);
+
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv);
     EINA_SAFETY_ON_TRUE_RETURN(!dx && !dy);
 
-    _ewk_view_scroll_add(priv, dx, dy, sx, sy, sw, sh, main_frame);
+    _ewk_view_scroll_add(priv, dx, dy, scrollX, scrollY, scrollWidth, scrollHeight, mainFrame);
 
     _ewk_view_smart_changed(sd);
 }
 
-WebCore::Page* ewk_view_core_page_get(const Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
+WebCore::Page* ewk_view_core_page_get(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, 0);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, 0);
     return priv->page;
@@ -3326 +3326 @@
  * Emits "frame,created" with the new frame object on success.
  */
-WTF::PassRefPtr<WebCore::Frame> ewk_view_frame_create(Evas_Object* o, Evas_Object* frame, const WTF::String& name, WebCore::HTMLFrameOwnerElement* ownerElement, const WebCore::KURL& url, const WTF::String& referrer)
-{
-    DBG("o=%p, frame=%p, name=%s, ownerElement=%p, url=%s, referrer=%s",
-        o, frame, name.utf8().data(), ownerElement,
+WTF::PassRefPtr<WebCore::Frame> ewk_view_frame_create(Evas_Object* ewkView, Evas_Object* frame, const WTF::String& name, WebCore::HTMLFrameOwnerElement* ownerElement, const WebCore::KURL& url, const WTF::String& referrer)
+{
+    DBG("ewkView=%p, frame=%p, name=%s, ownerElement=%p, url=%s, referrer=%s",
+        ewkView, frame, name.utf8().data(), ownerElement,
         url.string().utf8().data(), referrer.utf8().data());
 
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, 0);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, 0);
 
@@ -3354 +3354 @@
     _ewk_view_smart_changed(sd);
 
-    evas_object_smart_callback_call(o, "frame,created", frame);
+    evas_object_smart_callback_call(ewkView, "frame,created", frame);
     return cf.release();
 }
 
-WTF::PassRefPtr<WebCore::Widget> ewk_view_plugin_create(Evas_Object* o, Evas_Object* frame, const WebCore::IntSize& pluginSize, WebCore::HTMLPlugInElement* element, const WebCore::KURL& url, const WTF::Vector<WTF::String>& paramNames, const WTF::Vector<WTF::String>& paramValues, const WTF::String& mimeType, bool loadManually)
-{
-    DBG("o=%p, frame=%p, size=%dx%d, element=%p, url=%s, mimeType=%s",
-        o, frame, pluginSize.width(), pluginSize.height(), element,
+WTF::PassRefPtr<WebCore::Widget> ewk_view_plugin_create(Evas_Object* ewkView, Evas_Object* frame, const WebCore::IntSize& pluginSize, WebCore::HTMLPlugInElement* element, const WebCore::KURL& url, const WTF::Vector<WTF::String>& paramNames, const WTF::Vector<WTF::String>& paramValues, const WTF::String& mimeType, bool loadManually)
+{
+    DBG("ewkView=%p, frame=%p, size=%dx%d, element=%p, url=%s, mimeType=%s",
+        ewkView, frame, pluginSize.width(), pluginSize.height(), element,
         url.string().utf8().data(), mimeType.utf8().data());
 
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, 0);
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, 0);
     sd->changed.frame_rect = EINA_TRUE;
     _ewk_view_smart_changed(sd);
@@ -3384 +3384 @@
  * Emits: "popup,create" with a list of Ewk_Menu containing each item's data
  */
-void ewk_view_popup_new(Evas_Object* o, WebCore::PopupMenuClient* client, int selected, const WebCore::IntRect& rect)
-{
-    INF("o=%p", o);
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd);
+void ewk_view_popup_new(Evas_Object* ewkView, WebCore::PopupMenuClient* client, int selected, const WebCore::IntRect& rect)
+{
+    INF("ewkView=%p", ewkView);
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv);
 
     if (priv->popup.menu_client)
-        ewk_view_popup_destroy(o);
+        ewk_view_popup_destroy(ewkView);
 
     priv->popup.menu_client = client;
@@ -3414 +3414 @@
     priv->popup.menu.width = rect.width();
     priv->popup.menu.height = rect.height();
-    evas_object_smart_callback_call(o, "popup,create", &priv->popup.menu);
-}
-
-Eina_Bool ewk_view_popup_destroy(Evas_Object* o)
-{
-    INF("o=%p", o);
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+    evas_object_smart_callback_call(ewkView, "popup,create", &priv->popup.menu);
+}
+
+Eina_Bool ewk_view_popup_destroy(Evas_Object* ewkView)
+{
+    INF("ewkView=%p", ewkView);
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
 
@@ -3426 +3426 @@
         return EINA_FALSE;
 
-    evas_object_smart_callback_call(o, "popup,willdelete", &priv->popup.menu);
+    evas_object_smart_callback_call(ewkView, "popup,willdelete", &priv->popup.menu);
 
     void* itemv;
@@ -3440 +3440 @@
 }
 
-void ewk_view_popup_selected_set(Evas_Object* o, int index)
-{
-    INF("o=%p", o);
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd);
+void ewk_view_popup_selected_set(Evas_Object* ewkView, int index)
+{
+    INF("ewkView=%p", ewkView);
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv);
     EINA_SAFETY_ON_NULL_RETURN(priv->popup.menu_client);
@@ -3460 +3460 @@
  * requested download. The download per se must be handled outside of webkit.
  */
-void ewk_view_download_request(Evas_Object* o, Ewk_Download* download)
-{
-    DBG("view=%p", o);
-    evas_object_smart_callback_call(o, "download,request", download);
+void ewk_view_download_request(Evas_Object* ewkView, Ewk_Download* download)
+{
+    DBG("ewkView=%p", ewkView);
+    evas_object_smart_callback_call(ewkView, "download,request", download);
 }
 
@@ -3473 +3473 @@
  * @param frame the frame.
  */
-void ewk_view_js_window_object_clear(Evas_Object* o, Evas_Object* frame)
-{
-    evas_object_smart_callback_call(o, "js,windowobject,clear", frame);
+void ewk_view_js_window_object_clear(Evas_Object* ewkView, Evas_Object* frame)
+{
+    evas_object_smart_callback_call(ewkView, "js,windowobject,clear", frame);
 }
 
@@ -3486 +3486 @@
  * Emits signal: "viewport,changed" with no parameters.
  */
-void ewk_view_viewport_attributes_set(Evas_Object* o, const WebCore::ViewportArguments& arguments)
-{
-    EWK_VIEW_SD_GET(o, sd);
+void ewk_view_viewport_attributes_set(Evas_Object* ewkView, const WebCore::ViewportArguments& arguments)
+{
+    EWK_VIEW_SD_GET(ewkView, sd);
     EWK_VIEW_PRIV_GET(sd, priv);
 
     priv->viewport_arguments = arguments;
-    evas_object_smart_callback_call(o, "viewport,changed", 0);
-}
-
-void ewk_view_viewport_attributes_get(const Evas_Object* o, int* w, int* h, float* init_scale, float* max_scale, float* min_scale, float* device_pixel_ratio, Eina_Bool* user_scalable)
-{
-    WebCore::ViewportAttributes attributes = _ewk_view_viewport_attributes_compute(o);
-
-    if (w)
-        *w = attributes.layoutSize.width();
-    if (h)
-        *h = attributes.layoutSize.height();
-    if (init_scale)
-        *init_scale = attributes.initialScale;
-    if (max_scale)
-        *max_scale = attributes.maximumScale;
-    if (min_scale)
-        *min_scale = attributes.minimumScale;
-    if (device_pixel_ratio)
-        *device_pixel_ratio = attributes.devicePixelRatio;
-    if (user_scalable)
-        *user_scalable = static_cast<bool>(attributes.userScalable);
-}
-
-Eina_Bool ewk_view_zoom_range_set(Evas_Object* o, float min_scale, float max_scale)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
-    EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
-
-    if (max_scale < min_scale) {
+    evas_object_smart_callback_call(ewkView, "viewport,changed", 0);
+}
+
+void ewk_view_viewport_attributes_get(const Evas_Object* ewkView, int* width, int* height, float* initScale, float* maxScale, float* minScale, float* devicePixelRatio, Eina_Bool* userScalable)
+{
+    WebCore::ViewportAttributes attributes = _ewk_view_viewport_attributes_compute(ewkView);
+
+    if (width)
+        *width = attributes.layoutSize.width();
+    if (height)
+        *height = attributes.layoutSize.height();
+    if (initScale)
+        *initScale = attributes.initialScale;
+    if (maxScale)
+        *maxScale = attributes.maximumScale;
+    if (minScale)
+        *minScale = attributes.minimumScale;
+    if (devicePixelRatio)
+        *devicePixelRatio = attributes.devicePixelRatio;
+    if (userScalable)
+        *userScalable = static_cast<bool>(attributes.userScalable);
+}
+
+Eina_Bool ewk_view_zoom_range_set(Evas_Object* ewkView, float minScale, float maxScale)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
+    EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
+
+    if (maxScale < minScale) {
         WRN("min_scale is larger than max_scale");
         return EINA_FALSE;
     }
 
-    priv->settings.zoom_range.min_scale = min_scale;
-    priv->settings.zoom_range.max_scale = max_scale;
-
-    return EINA_TRUE;
-}
-
-float ewk_view_zoom_range_min_get(const Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, -1.0);
+    priv->settings.zoom_range.min_scale = minScale;
+    priv->settings.zoom_range.max_scale = maxScale;
+
+    return EINA_TRUE;
+}
+
+float ewk_view_zoom_range_min_get(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, -1.0);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, -1.0);
 
@@ -3539 +3539 @@
 }
 
-float ewk_view_zoom_range_max_get(const Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, -1.0);
+float ewk_view_zoom_range_max_get(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, -1.0);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, -1.0);
 
@@ -3547 +3547 @@
 }
 
-Eina_Bool ewk_view_user_scalable_set(Evas_Object* o, Eina_Bool user_scalable)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
-    EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
-
-    priv->settings.zoom_range.user_scalable = user_scalable;
-
-    return EINA_TRUE;
-}
-
-Eina_Bool ewk_view_user_scalable_get(const Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_user_scalable_set(Evas_Object* ewkView, Eina_Bool userScalable)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
+    EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
+
+    priv->settings.zoom_range.user_scalable = userScalable;
+
+    return EINA_TRUE;
+}
+
+Eina_Bool ewk_view_user_scalable_get(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
 
@@ -3565 +3565 @@
 }
 
-float ewk_view_device_pixel_ratio_get(const Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, -1.0);
+float ewk_view_device_pixel_ratio_get(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, -1.0);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, -1.0);
 
@@ -3573 +3573 @@
 }
 
-void ewk_view_did_first_visually_nonempty_layout(Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd);
+void ewk_view_did_first_visually_nonempty_layout(Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv);
     if (!priv->flags.view_cleared) {
-        ewk_view_frame_main_cleared(o);
-        ewk_view_enable_render(o);
+        ewk_view_frame_main_cleared(ewkView);
+        ewk_view_enable_render(ewkView);
         priv->flags.view_cleared = EINA_TRUE;
     }
@@ -3590 +3590 @@
  * @param o view.
  */
-void ewk_view_dispatch_did_finish_loading(Evas_Object* o)
+void ewk_view_dispatch_did_finish_loading(Evas_Object* ewkView)
 {
     /* If we reach this point and rendering is still disabled, WebCore will not
@@ -3596 +3596 @@
      * forcefully re-enable the rendering.
      */
-    ewk_view_did_first_visually_nonempty_layout(o);
-}
-
-void ewk_view_transition_to_commited_for_newpage(Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd);
+    ewk_view_did_first_visually_nonempty_layout(ewkView);
+}
+
+void ewk_view_transition_to_commited_for_newpage(Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv);
 
-    ewk_view_disable_render(o);
+    ewk_view_disable_render(ewkView);
     priv->flags.view_cleared = EINA_FALSE;
 }
@@ -3618 +3618 @@
  * @param request Request which contain url to navigate
  */
-Eina_Bool ewk_view_navigation_policy_decision(Evas_Object* o, Ewk_Frame_Resource_Request* request)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_TRUE);
+Eina_Bool ewk_view_navigation_policy_decision(Evas_Object* ewkView, Ewk_Frame_Resource_Request* request)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_TRUE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->api, EINA_TRUE);
 
@@ -3629 +3629 @@
 }
 
-Eina_Bool ewk_view_js_object_add(Evas_Object* o, Ewk_JS_Object* obj, const char* obj_name)
+Eina_Bool ewk_view_js_object_add(Evas_Object* ewkView, Ewk_JS_Object* object, const char* objectName)
 {
 #if ENABLE(NETSCAPE_PLUGIN_API)
-    if (obj->view) // object has already been added to another ewk_view
+    if (object->view) // object has already been added to another ewk_view
         return EINA_FALSE;
-    obj->name = eina_stringshare_add(obj_name);
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+    object->name = eina_stringshare_add(object_name);
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
 
@@ -3650 +3650 @@
     JSC::ExecState* exec = window->globalExec();
 
-    obj->view = o;
+    obj->view = ewkView;
     JSC::JSObject* runtimeObject = (JSC::JSObject*)JSC::Bindings::CInstance::create((NPObject*)obj, root)->createRuntimeObject(exec);
     JSC::Identifier id = JSC::Identifier(exec, obj_name);
@@ -3662 +3662 @@
 }
 
-Eina_Bool ewk_view_protocol_handler_set(Evas_Object* o, const char** protocols, Ewk_View_Resource_Handler_Cb handler, void* context)
-{
-    EWK_VIEW_SD_GET(o, sd);
+Eina_Bool ewk_view_protocol_handler_set(Evas_Object* ewkView, const char** protocols, Ewk_View_Resource_Handler_Cb handler, void* context)
+{
+    EWK_VIEW_SD_GET(ewkView, sd);
     EWK_VIEW_PRIV_GET(sd, priv);
 
@@ -3676 +3676 @@
 }
 
-Eina_Bool ewk_view_protocol_handler_unset(Evas_Object* o)
-{
-    EWK_VIEW_SD_GET(o, sd);
+Eina_Bool ewk_view_protocol_handler_unset(Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET(ewkView, sd);
     EWK_VIEW_PRIV_GET(sd, priv);
     Eina_Bool ret = ewk_custom_protocol_handler_all_unset();
@@ -3690 +3690 @@
 }
 
-void* ewk_view_protocol_handler_resource_get(Evas_Object* o, size_t* bytesRead, char** mime, const char* file)
-{
-    EWK_VIEW_SD_GET(o, sd);
+void* ewk_view_protocol_handler_resource_get(Evas_Object* ewkView, size_t* bytesRead, char** mime, const char* file)
+{
+    EWK_VIEW_SD_GET(ewkView, sd);
     EWK_VIEW_PRIV_GET(sd, priv);
 
@@ -3711 +3711 @@
  * @param h new content height.
  */
-void ewk_view_contents_size_changed(Evas_Object* o, int w, int h)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd);
+void ewk_view_contents_size_changed(Evas_Object* ewkView, int width, int height)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd);
     EINA_SAFETY_ON_NULL_RETURN(sd->api);
     EINA_SAFETY_ON_NULL_RETURN(sd->api->contents_resize);
 
-    if (!sd->api->contents_resize(sd, w, h))
-        ERR("failed to resize contents to %dx%d", w, h);
+    if (!sd->api->contents_resize(sd, width, height))
+        ERR("failed to resize contents to %dx%d", width, height);
 }
 
@@ -3729 +3729 @@
  * @return page size.
  */
-WebCore::FloatRect ewk_view_page_rect_get(const Evas_Object* o)
-{
-    EWK_VIEW_SD_GET(o, sd);
+WebCore::FloatRect ewk_view_page_rect_get(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET(ewkView, sd);
     EWK_VIEW_PRIV_GET(sd, priv);
 
@@ -3739 +3739 @@
 
 #if ENABLE(TOUCH_EVENTS)
-void ewk_view_need_touch_events_set(Evas_Object* o, bool needed)
-{
-    EWK_VIEW_SD_GET(o, sd);
+void ewk_view_need_touch_events_set(Evas_Object* ewkView, bool needed)
+{
+    EWK_VIEW_SD_GET(ewkView, sd);
     EWK_VIEW_PRIV_GET(sd, priv);
 
@@ -3747 +3747 @@
 }
 
-Eina_Bool ewk_view_need_touch_events_get(const Evas_Object* o)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+Eina_Bool ewk_view_need_touch_events_get(const Evas_Object* ewkView)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     return priv->flags.need_touch_events;
@@ -3755 +3755 @@
 #endif
 
-Eina_Bool ewk_view_mode_set(Evas_Object* o, Ewk_View_Mode view_mode)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
-    EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
-
-    switch (view_mode) {
+Eina_Bool ewk_view_mode_set(Evas_Object* ewkView, Ewk_View_Mode viewMode)
+{
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, EINA_FALSE);
+    EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
+
+    switch (viewMode) {
     case EWK_VIEW_MODE_WINDOWED:
         priv->page->setViewMode(WebCore::Page::ViewModeWindowed);
@@ -3783 +3783 @@
 }
 
-Ewk_View_Mode ewk_view_mode_get(const Evas_Object* o)
+Ewk_View_Mode ewk_view_mode_get(const Evas_Object* ewkView)
 {
     Ewk_View_Mode mode = EWK_VIEW_MODE_WINDOWED;
 
-    EWK_VIEW_SD_GET(o, sd);
+    EWK_VIEW_SD_GET(ewkView, sd);
     if (!sd)
         return mode;
@@ -3822 +3822 @@
  * Emits signal: "editorclientselection,changed" with no parameters.
  */
-void ewk_view_editor_client_selection_changed(Evas_Object* o)
-{
-    evas_object_smart_callback_call(o, "editorclient,selection,changed", 0);
+void ewk_view_editor_client_selection_changed(Evas_Object* ewkView)
+{
+    evas_object_smart_callback_call(ewkView, "editorclient,selection,changed", 0);
 }
 
@@ -3835 +3835 @@
  * Emits signal: "editorclient,contents,changed" with no parameters.
  */
-void ewk_view_editor_client_contents_changed(Evas_Object* o)
-{
-    evas_object_smart_callback_call(o, "editorclient,contents,changed", 0);
-}
+void ewk_view_editor_client_contents_changed(Evas_Object* ewkView)
+{
+    evas_object_smart_callback_call(ewkView, "editorclient,contents,changed", 0);
+}

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

@@ -10 +10 @@
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    MERchANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
@@ -32 +32 @@
 static Ewk_View_Smart_Class _parent_sc = EWK_VIEW_SMART_CLASS_INIT_NULL;
 
-static void _ewk_view_single_on_del(void* data, Evas* e, Evas_Object* o, void* event_info)
+static void _ewk_view_single_on_del(void* data, Evas* eventType, Evas_Object* callback, void* eventInfo)
 {
     Evas_Object* clip = (Evas_Object*)data;
@@ -38 +38 @@
 }
 
-static void _ewk_view_single_smart_add(Evas_Object* o)
+static void _ewk_view_single_smart_add(Evas_Object* ewkSingle)
 {
     Ewk_View_Smart_Data* sd;
 
-    _parent_sc.sc.add(o);
-
-    sd = static_cast<Ewk_View_Smart_Data*>(evas_object_smart_data_get(o));
+    _parent_sc.sc.add(ewkSingle);
+
+    sd = static_cast<Ewk_View_Smart_Data*>(evas_object_smart_data_get(ewkSingle));
     if (!sd)
         return;
 
     Evas_Object* clip = evas_object_rectangle_add(sd->base.evas);
-    evas_object_clip_set(sd->backing_store, clip);
-    evas_object_smart_member_add(clip, o);
     evas_object_show(clip);
 
@@ -57 +55 @@
 }
 
-static Evas_Object* _ewk_view_single_smart_backing_store_add(Ewk_View_Smart_Data* sd)
-{
-    Evas_Object* bs = evas_object_image_add(sd->base.evas);
+static Evas_Object* _ewk_view_single_smart_backing_store_add(Ewk_View_Smart_Data* smartData)
+{
+    Evas_Object* bs = evas_object_image_add(smartData->base.evas);
     evas_object_image_alpha_set(bs, EINA_FALSE);
-    evas_object_image_smooth_scale_set(bs, sd->zoom_weak_smooth_scale);
+    evas_object_image_smooth_scale_set(bs, smartData->zoom_weak_smooth_scale);
 
     return bs;
 }
 
-static void _ewk_view_single_smart_resize(Evas_Object* o, Evas_Coord w, Evas_Coord h)
-{
-    Ewk_View_Smart_Data* sd = static_cast<Ewk_View_Smart_Data*>(evas_object_smart_data_get(o));
-    _parent_sc.sc.resize(o, w, h);
+static void _ewk_view_single_smart_resize(Evas_Object* ewkSingle, Evas_Coord width, Evas_Coord height)
+{
+    Ewk_View_Smart_Data* sd = static_cast<Ewk_View_Smart_Data*>(evas_object_smart_data_get(ewkSingle));
+    _parent_sc.sc.resize(ewkSingle, width, height);
 
     if (!sd)
@@ -75 +73 @@
 
     // these should be queued and processed in calculate as well!
-    evas_object_image_size_set(sd->backing_store, w, h);
+    evas_object_image_size_set(sd->backing_store, width, height);
     if (sd->animated_zoom.zoom.current < 0.00001) {
         Evas_Object* clip = evas_object_clip_get(sd->backing_store);
         Evas_Coord x, y, cw, ch;
-        evas_object_image_fill_set(sd->backing_store, 0, 0, w, h);
+        evas_object_image_fill_set(sd->backing_store, 0, 0, width, height);
         evas_object_geometry_get(sd->backing_store, &x, &y, 0, 0);
         evas_object_move(clip, x, y);
         ewk_frame_contents_size_get(sd->main_frame, &cw, &ch);
-        if (w > cw)
-            w = cw;
-        if (h > ch)
-            h = ch;
-        evas_object_resize(clip, w, h);
-    }
-}
-
-static inline void _ewk_view_4b_move_region_up(uint32_t* image, size_t rows, size_t x, size_t y, size_t w, size_t h, size_t rowsize)
+        if (width > cw)
+            width = cw;
+        if (height > ch)
+            height = ch;
+        evas_object_resize(clip, width, height);
+    }
+}
+
+static inline void _ewk_view_4b_move_region_up(uint32_t* image, size_t rows, size_t x, size_t y, size_t width, size_t height, size_t rowSize)
 {
     uint32_t* src;
     uint32_t* dst;
 
-    dst = image + x + y * rowsize;
-    src = dst + rows * rowsize;
-    h -= rows;
-
-    for (; h > 0; h--, dst += rowsize, src += rowsize)
-        memcpy(dst, src, w * 4);
-}
-
-static inline void _ewk_view_4b_move_region_down(uint32_t* image, size_t rows, size_t x, size_t y, size_t w, size_t h, size_t rowsize)
+    dst = image + x + y * rowSize;
+    src = dst + rows * rowSize;
+    height -= rows;
+
+    for (; height > 0; height--, dst += rowSize, src += rowSize)
+        memcpy(dst, src, width * 4);
+}
+
+static inline void _ewk_view_4b_move_region_down(uint32_t* image, size_t rows, size_t x, size_t y, size_t width, size_t height, size_t rowSize)
 {
     uint32_t* src;
     uint32_t* dst;
 
-    h -= rows;
-    src = image + x + (y + h - 1) * rowsize;
-    dst = src + rows * rowsize;
-
-    for (; h > 0; h--, dst -= rowsize, src -= rowsize)
-        memcpy(dst, src, w * 4);
+    height -= rows;
+    src = image + x + (y + height - 1) * rowSize;
+    dst = src + rows * rowSize;
+
+    for (; height > 0; height--, dst -= rowSize, src -= rowSize)
+        memcpy(dst, src, width * 4);
 }
 
@@ -137 +135 @@
 }
 
-static inline void _ewk_view_4b_move_region_left(uint32_t* image, size_t cols, size_t x, size_t y, size_t w, size_t h, size_t rowsize)
+static inline void _ewk_view_4b_move_region_left(uint32_t* image, size_t cols, size_t x, size_t y, size_t width, size_t height, size_t rowSize)
 {
     uint32_t* src;
     uint32_t* dst;
 
-    dst = image + x + y * rowsize;
+    dst = image + x + y * rowSize;
     src = dst + cols;
-    w -= cols;
-
-    for (; h > 0; h--, dst += rowsize, src += rowsize)
-        _ewk_view_4b_move_line_left(dst, src, w);
-}
-
-static inline void _ewk_view_4b_move_region_right(uint32_t* image, size_t cols, size_t x, size_t y, size_t w, size_t h, size_t rowsize)
+    width -= cols;
+
+    for (; height > 0; height--, dst += rowSize, src += rowSize)
+        _ewk_view_4b_move_line_left(dst, src, width);
+}
+
+static inline void _ewk_view_4b_move_region_right(uint32_t* image, size_t columns, size_t x, size_t y, size_t width, size_t height, size_t rowSize)
 {
     uint32_t* src;
     uint32_t* dst;
 
-    w -= cols;
-    src = image + (x + w - 1) + y * rowsize;
-    dst = src + cols;
-
-    for (; h > 0; h--, dst += rowsize, src += rowsize)
-        _ewk_view_4b_move_line_right(dst, src, w);
+    width -= columns;
+    src = image + (x + width - 1) + y * rowSize;
+    dst = src + columns;
+
+    for (; height > 0; height--, dst += rowSize, src += rowSize)
+        _ewk_view_4b_move_line_right(dst, src, width);
 }
 
 /* catch-all function, not as optimized as the others, but does the work. */
-static inline void _ewk_view_4b_move_region(uint32_t* image, int dx, int dy, size_t x, size_t y, size_t w, size_t h, size_t rowsize)
+static inline void _ewk_view_4b_move_region(uint32_t* image, int deltaX, int deltaY, size_t x, size_t y, size_t width, size_t height, size_t rowSize)
 {
     uint32_t* src;
     uint32_t* dst;
 
-    if (dy < 0) {
-        h += dy;
-        dst = image + x + y * rowsize;
-        src = dst - dy * rowsize;
-        if (dx <= 0) {
-            w += dx;
-            src -= dx;
-            for (; h > 0; h--, dst += rowsize, src += rowsize)
-                _ewk_view_4b_move_line_left(dst, src, w);
+    if (deltaY < 0) {
+        height += deltaY;
+        dst = image + x + y * rowSize;
+        src = dst - deltaY * rowSize;
+        if (deltaX <= 0) {
+            width += deltaX;
+            src -= deltaX;
+            for (; height > 0; height--, dst += rowSize, src += rowSize)
+                _ewk_view_4b_move_line_left(dst, src, width);
         } else {
-            w -= dx;
-            src += w - 1;
-            dst += w + dx -1;
-            for (; h > 0; h--, dst += rowsize, src += rowsize)
-                _ewk_view_4b_move_line_right(dst, src, w);
+            width -= deltaX;
+            src += width - 1;
+            dst += width + deltaX -1;
+            for (; height > 0; height--, dst += rowSize, src += rowSize)
+                _ewk_view_4b_move_line_right(dst, src, width);
         }
     } else {
-        h -= dy;
-        src = image + x + (y + h - 1) * rowsize;
-        dst = src + dy * rowsize;
-        if (dx <= 0) {
-            w += dx;
-            src -= dx;
-            for (; h > 0; h--, dst -= rowsize, src -= rowsize)
-                _ewk_view_4b_move_line_left(dst, src, w);
+        height -= deltaY;
+        src = image + x + (y + height - 1) * rowSize;
+        dst = src + deltaY * rowSize;
+        if (deltaX <= 0) {
+            width += deltaX;
+            src -= deltaX;
+            for (; height > 0; height--, dst -= rowSize, src -= rowSize)
+                _ewk_view_4b_move_line_left(dst, src, width);
         } else {
-            w -= dx;
-            src += w - 1;
-            dst += w + dx - 1;
-            for (; h > 0; h--, dst -= rowsize, src -= rowsize)
-                _ewk_view_4b_move_line_right(dst, src, w);
+            width -= deltaX;
+            src += width - 1;
+            dst += width + deltaX - 1;
+            for (; height > 0; height--, dst -= rowSize, src -= rowSize)
+                _ewk_view_4b_move_line_right(dst, src, width);
         }
     }
 }
 
-static inline void _ewk_view_single_scroll_process_single(Ewk_View_Smart_Data* sd, void* pixels, Evas_Coord ow, Evas_Coord oh, const Ewk_Scroll_Request* sr)
+static inline void _ewk_view_single_scroll_process_single(Ewk_View_Smart_Data* smartData, void* pixels, Evas_Coord width, Evas_Coord height, const Ewk_Scroll_Request* scrollRequest)
 {
     Evas_Coord sx, sy, sw, sh;
 
     DBG("%d,%d + %d,%d %+03d,%+03d, store: %p %dx%d",
-        sr->x, sr->y, sr->w, sr->h, sr->dx, sr->dy, pixels, ow, oh);
-
-    sx = sr->x;
-    sy = sr->y;
-    sw = sr->w;
-    sh = sr->h;
-
-    if (abs(sr->dx) >= sw || abs(sr->dy) >= sh) {
+        scrollRequest->x, scrollRequest->y, scrollRequest->w, scrollRequest->h, scrollRequest->dx, scrollRequest->dy, pixels, width, height);
+
+    sx = scrollRequest->x;
+    sy = scrollRequest->y;
+    sw = scrollRequest->w;
+    sh = scrollRequest->h;
+
+    if (abs(scrollRequest->dx) >= sw || abs(scrollRequest->dy) >= sh) {
         /* doubt webkit would be so stupid... */
         DBG("full page scroll %+03d,%+03d. convert to repaint %d,%d + %dx%d",
-            sr->dx, sr->dy, sx, sy, sw, sh);
-        ewk_view_repaint_add(sd->_priv, sx, sy, sw, sh);
+            scrollRequest->dx, scrollRequest->dy, sx, sy, sw, sh);
+        ewk_view_repaint_add(smartData->_priv, sx, sy, sw, sh);
         return;
     }
@@ -233 +231 @@
     }
 
-    if (sx + sw > ow)
-        sw = ow - sx;
-    if (sy + sh > oh)
-        sh = oh - sy;
+    if (sx + sw > width)
+        sw = width - sx;
+    if (sy + sh > height)
+        sh = height - sy;
 
     if (sw < 0)
@@ -244 +242 @@
 
     EINA_SAFETY_ON_TRUE_RETURN(!sw || !sh);
-    if (!sr->dx) {
-        if (sr->dy < 0) {
+    if (!scrollRequest->dx) {
+        if (scrollRequest->dy < 0) {
             DBG("scroll up: %+03d,%+03d update=%d,%d+%dx%d, "
                 "repaint=%d,%d+%dx%d",
-                sr->dx, sr->dy, sx, sy, sw, sh + sr->dy,
-                sx, sy + sh + sr->dy, sw, -sr->dy);
+                scrollRequest->dx, scrollRequest->dy, sx, sy, sw, sh + scrollRequest->dy,
+                sx, sy + sh + scrollRequest->dy, sw, -scrollRequest->dy);
 
             _ewk_view_4b_move_region_up
-                (static_cast<uint32_t*>(pixels), -sr->dy, sx, sy, sw, sh, ow);
+                (static_cast<uint32_t*>(pixels), -scrollRequest->dy, sx, sy, sw, sh, width);
             evas_object_image_data_update_add
-                (sd->backing_store, sx, sy, sw, sh + sr->dy);
-
-            ewk_view_repaint_add(sd->_priv, sx, sy + sh + sr->dy, sw, -sr->dy);
-        } else if (sr->dy > 0) {
+                (smartData->backing_store, sx, sy, sw, sh + scrollRequest->dy);
+
+            ewk_view_repaint_add(smartData->_priv, sx, sy + sh + scrollRequest->dy, sw, -scrollRequest->dy);
+        } else if (scrollRequest->dy > 0) {
             DBG("scroll down: %+03d,%+03d update=%d,%d+%dx%d, "
                 "repaint=%d,%d+%dx%d",
-                sr->dx, sr->dy, sx, sy + sr->dy, sw, sh - sr->dy,
-                sx, sy, sw, sr->dy);
+                scrollRequest->dx, scrollRequest->dy, sx, sy + scrollRequest->dy, sw, sh - scrollRequest->dy,
+                sx, sy, sw, scrollRequest->dy);
 
             _ewk_view_4b_move_region_down
-                (static_cast<uint32_t*>(pixels), sr->dy, sx, sy, sw, sh, ow);
+                (static_cast<uint32_t*>(pixels), scrollRequest->dy, sx, sy, sw, sh, width);
             evas_object_image_data_update_add
-                (sd->backing_store, sx, sy + sr->dy, sw, sh - sr->dy);
-
-            ewk_view_repaint_add(sd->_priv, sx, sy, sw, sr->dy);
+                (smartData->backing_store, sx, sy + scrollRequest->dy, sw, sh - scrollRequest->dy);
+
+            ewk_view_repaint_add(smartData->_priv, sx, sy, sw, scrollRequest->dy);
         }
-    } else if (!sr->dy) {
-        if (sr->dx < 0) {
+    } else if (!scrollRequest->dy) {
+        if (scrollRequest->dx < 0) {
             DBG("scroll left: %+03d,%+03d update=%d,%d+%dx%d, "
                 "repaint=%d,%d+%dx%d",
-                sr->dx, sr->dy, sx, sy, sw + sr->dx, sh,
-                sx + sw + sr->dx, sy, -sr->dx, sh);
+                scrollRequest->dx, scrollRequest->dy, sx, sy, sw + scrollRequest->dx, sh,
+                sx + sw + scrollRequest->dx, sy, -scrollRequest->dx, sh);
 
             _ewk_view_4b_move_region_left
-                (static_cast<uint32_t*>(pixels), -sr->dx, sx, sy, sw, sh, ow);
+                (static_cast<uint32_t*>(pixels), -scrollRequest->dx, sx, sy, sw, sh, width);
             evas_object_image_data_update_add
-                (sd->backing_store, sx, sy, sw + sr->dx, sh);
-
-            ewk_view_repaint_add(sd->_priv, sx + sw + sr->dx, sy, -sr->dx, sh);
-        } else if (sr->dx > 0) {
+                (smartData->backing_store, sx, sy, sw + scrollRequest->dx, sh);
+
+            ewk_view_repaint_add(smartData->_priv, sx + sw + scrollRequest->dx, sy, -scrollRequest->dx, sh);
+        } else if (scrollRequest->dx > 0) {
             DBG("scroll up: %+03d,%+03d update=%d,%d+%dx%d, "
                 "repaint=%d,%d+%dx%d",
-                sr->dx, sr->dy, sx + sr->dx, sy, sw - sr->dx, sh,
-                sx, sy, sr->dx, sh);
+                scrollRequest->dx, scrollRequest->dy, sx + scrollRequest->dx, sy, sw - scrollRequest->dx, sh,
+                sx, sy, scrollRequest->dx, sh);
 
             _ewk_view_4b_move_region_right
-                (static_cast<uint32_t*>(pixels), sr->dx, sx, sy, sw, sh, ow);
+                (static_cast<uint32_t*>(pixels), scrollRequest->dx, sx, sy, sw, sh, width);
             evas_object_image_data_update_add
-                (sd->backing_store, sx + sr->dx, sy, sw - sr->dx, sh);
-
-            ewk_view_repaint_add(sd->_priv, sx, sy, sr->dx, sh);
+                (smartData->backing_store, sx + scrollRequest->dx, sy, sw - scrollRequest->dx, sh);
+
+            ewk_view_repaint_add(smartData->_priv, sx, sy, scrollRequest->dx, sh);
         }
     } else {
         Evas_Coord mx, my, mw, mh, ax, ay, aw, ah, bx, by, bw, bh;
 
-        if (sr->dx < 0) {
+        if (scrollRequest->dx < 0) {
             mx = sx;
-            mw = sw + sr->dx;
+            mw = sw + scrollRequest->dx;
             ax = mx + mw;
-            aw = -sr->dx;
+            aw = -scrollRequest->dx;
         } else {
             ax = sx;
-            aw = sr->dx;
+            aw = scrollRequest->dx;
             mx = ax + aw;
-            mw = sw - sr->dx;
+            mw = sw - scrollRequest->dx;
         }
 
-        if (sr->dy < 0) {
+        if (scrollRequest->dy < 0) {
             my = sy;
-            mh = sh + sr->dy;
+            mh = sh + scrollRequest->dy;
             by = my + mh;
-            bh = -sr->dy;
+            bh = -scrollRequest->dy;
         } else {
             by = sy;
-            bh = sr->dy;
+            bh = scrollRequest->dy;
             my = by + bh;
-            mh = sh - sr->dy;
+            mh = sh - scrollRequest->dy;
         }
 
@@ -330 +328 @@
         DBG("scroll diagonal: %+03d,%+03d update=%d,%d+%dx%d, "
             "repaints: h=%d,%d+%dx%d v=%d,%d+%dx%d",
-            sr->dx, sr->dy, mx, my, mw, mh, ax, ay, aw, ah, bx, by, bw, bh);
+            scrollRequest->dx, scrollRequest->dy, mx, my, mw, mh, ax, ay, aw, ah, bx, by, bw, bh);
 
         _ewk_view_4b_move_region
-            (static_cast<uint32_t*>(pixels), sr->dx, sr->dy, sx, sy, sw, sh, ow);
-
-        evas_object_image_data_update_add(sd->backing_store, mx, my, mw, mh);
-        ewk_view_repaint_add(sd->_priv, ax, ay, aw, ah);
-        ewk_view_repaint_add(sd->_priv, bx, by, bw, bh);
-    }
-}
-
-static Eina_Bool _ewk_view_single_smart_scrolls_process(Ewk_View_Smart_Data* sd)
+            (static_cast<uint32_t*>(pixels), scrollRequest->dx, scrollRequest->dy, sx, sy, sw, sh, width);
+
+        evas_object_image_data_update_add(smartData->backing_store, mx, my, mw, mh);
+        ewk_view_repaint_add(smartData->_priv, ax, ay, aw, ah);
+        ewk_view_repaint_add(smartData->_priv, bx, by, bw, bh);
+    }
+}
+
+static Eina_Bool _ewk_view_single_smart_scrolls_process(Ewk_View_Smart_Data* smartData)
 {
     const Ewk_Scroll_Request* sr;
@@ -347 +345 @@
     Evas_Coord ow, oh;
     size_t count;
-    void* pixels = evas_object_image_data_get(sd->backing_store, 1);
-    evas_object_image_size_get(sd->backing_store, &ow, &oh);
-
-    sr = ewk_view_scroll_requests_get(sd->_priv, &count);
+    void* pixels = evas_object_image_data_get(smartData->backing_store, 1);
+    evas_object_image_size_get(smartData->backing_store, &ow, &oh);
+
+    sr = ewk_view_scroll_requests_get(smartData->_priv, &count);
     sr_end = sr + count;
     for (; sr < sr_end; sr++)
-        _ewk_view_single_scroll_process_single(sd, pixels, ow, oh, sr);
-
-    evas_object_image_data_set(sd->backing_store, pixels);
+        _ewk_view_single_scroll_process_single(smartData, pixels, ow, oh, sr);
+
+    evas_object_image_data_set(smartData->backing_store, pixels);
 
     return EINA_TRUE;
 }
 
-static Eina_Bool _ewk_view_single_smart_repaints_process(Ewk_View_Smart_Data* sd)
+static Eina_Bool _ewk_view_single_smart_repaints_process(Ewk_View_Smart_Data* smartData)
 {
     Ewk_View_Paint_Context* ctxt;
@@ -377 +375 @@
     Eina_Bool ret = EINA_TRUE;
 
-    if (sd->animated_zoom.zoom.current < 0.00001) {
-        Evas_Object* clip = evas_object_clip_get(sd->backing_store);
+    if (smartData->animated_zoom.zoom.current < 0.00001) {
+        Evas_Object* clip = evas_object_clip_get(smartData->backing_store);
         Evas_Coord w, h, cw, ch;
         // reset effects of zoom_weak_set()
         evas_object_image_fill_set
-            (sd->backing_store, 0, 0, sd->view.w, sd->view.h);
-        evas_object_move(clip, sd->view.x, sd->view.y);
-
-        w = sd->view.w;
-        h = sd->view.h;
-
-        ewk_frame_contents_size_get(sd->main_frame, &cw, &ch);
+            (smartData->backing_store, 0, 0, smartData->view.w, smartData->view.h);
+        evas_object_move(clip, smartData->view.x, smartData->view.y);
+
+        w = smartData->view.w;
+        h = smartData->view.h;
+
+        ewk_frame_contents_size_get(smartData->main_frame, &cw, &ch);
         if (w > cw)
             w = cw;
@@ -396 +394 @@
     }
 
-    pixels = evas_object_image_data_get(sd->backing_store, 1);
-    evas_object_image_size_get(sd->backing_store, &ow, &oh);
+    pixels = evas_object_image_data_get(smartData->backing_store, 1);
+    evas_object_image_size_get(smartData->backing_store, &ow, &oh);
     format = CAIRO_FORMAT_ARGB32;
 
@@ -418 +416 @@
     }
 
-    ctxt = ewk_view_paint_context_new(sd->_priv, cairo);
+    ctxt = ewk_view_paint_context_new(smartData->_priv, cairo);
     if (!ctxt) {
         ERR("could not create paint context");
@@ -432 +430 @@
     }
 
-    pr = ewk_view_repaints_get(sd->_priv, &count);
+    pr = ewk_view_repaints_get(smartData->_priv, &count);
     pr_end = pr + count;
     for (; pr < pr_end; pr++)
@@ -444 +442 @@
     }
 
-    ewk_view_layout_if_needed_recursive(sd->_priv);
+    ewk_view_layout_if_needed_recursive(smartData->_priv);
 
     int sx, sy;
-    ewk_frame_scroll_pos_get(sd->main_frame, &sx, &sy);
+    ewk_frame_scroll_pos_get(smartData->main_frame, &sx, &sy);
 
     EINA_ITERATOR_FOREACH(itr, r) {
@@ -465 +463 @@
         ewk_view_paint_context_restore(ctxt);
         evas_object_image_data_update_add
-            (sd->backing_store, r->x, r->y, r->w, r->h);
+            (smartData->backing_store, r->x, r->y, r->w, r->h);
     }
     eina_iterator_free(itr);
@@ -478 +476 @@
     cairo_surface_destroy(surface);
 error_cairo_surface:
-    evas_object_image_data_set(sd->backing_store, pixels); /* dec refcount */
+    evas_object_image_data_set(smartData->backing_store, pixels); /* dec refcount */
 
     return ret;
 }
 
-static Eina_Bool _ewk_view_single_smart_zoom_weak_set(Ewk_View_Smart_Data* sd, float zoom, Evas_Coord cx, Evas_Coord cy)
+static Eina_Bool _ewk_view_single_smart_zoom_weak_set(Ewk_View_Smart_Data* smartData, float zoom, Evas_Coord centerX, Evas_Coord centerY)
 {
     // TODO: review
-    float scale = zoom / sd->animated_zoom.zoom.start;
-    Evas_Coord w = sd->view.w * scale;
-    Evas_Coord h = sd->view.h * scale;
+    float scale = zoom / smartData->animated_zoom.zoom.start;
+    Evas_Coord w = smartData->view.w * scale;
+    Evas_Coord h = smartData->view.h * scale;
     Evas_Coord dx, dy, cw, ch;
-    Evas_Object* clip = evas_object_clip_get(sd->backing_store);
-
-    ewk_frame_contents_size_get(sd->main_frame, &cw, &ch);
-    if (sd->view.w > 0 && sd->view.h > 0) {
-        dx = (w * (sd->view.w - cx)) / sd->view.w;
-        dy = (h * (sd->view.h - cy)) / sd->view.h;
+    Evas_Object* clip = evas_object_clip_get(smartData->backing_store);
+
+    ewk_frame_contents_size_get(smartData->main_frame, &cw, &ch);
+    if (smartData->view.w > 0 && smartData->view.h > 0) {
+        dx = (w * (smartData->view.w - centerX)) / smartData->view.w;
+        dy = (h * (smartData->view.h - centerY)) / smartData->view.h;
     } else {
         dx = 0;
@@ -501 +499 @@
     }
 
-    evas_object_image_fill_set(sd->backing_store, cx + dx, cy + dy, w, h);
-
-    if (sd->view.w > 0 && sd->view.h > 0) {
-        dx = ((sd->view.w - w) * cx) / sd->view.w;
-        dy = ((sd->view.h - h) * cy) / sd->view.h;
+    evas_object_image_fill_set(smartData->backing_store, centerX + dx, centerY + dy, w, h);
+
+    if (smartData->view.w > 0 && smartData->view.h > 0) {
+        dx = ((smartData->view.w - w) * centerX) / smartData->view.w;
+        dy = ((smartData->view.h - h) * centerY) / smartData->view.h;
     } else {
         dx = 0;
         dy = 0;
     }
-    evas_object_move(clip, sd->view.x + dx, sd->view.y + dy);
-
-    if (cw < sd->view.w)
+    evas_object_move(clip, smartData->view.x + dx, smartData->view.y + dy);
+
+    if (cw < smartData->view.w)
         w = cw * scale;
-    if (ch < sd->view.h)
+    if (ch < smartData->view.h)
         h = ch * scale;
     evas_object_resize(clip, w, h);
@@ -520 +518 @@
 }
 
-static void _ewk_view_single_smart_zoom_weak_smooth_scale_set(Ewk_View_Smart_Data* sd, Eina_Bool smooth_scale)
-{
-    evas_object_image_smooth_scale_set(sd->backing_store, smooth_scale);
-}
-
-static void _ewk_view_single_smart_bg_color_set(Ewk_View_Smart_Data* sd, unsigned char r, unsigned char g, unsigned char b, unsigned char a)
-{
-    evas_object_image_alpha_set(sd->backing_store, a < 255);
+static void _ewk_view_single_smart_zoom_weak_smooth_scale_set(Ewk_View_Smart_Data* smartData, Eina_Bool smooth_scale)
+{
+    evas_object_image_smooth_scale_set(smartData->backing_store, smooth_scale);
+}
+
+static void _ewk_view_single_smart_bg_color_set(Ewk_View_Smart_Data* smartData, unsigned char red, unsigned char green, unsigned char blue, unsigned char alpha)
+{
+    evas_object_image_alpha_set(smartData->backing_store, alpha < 255);
 }
 
@@ -564 +562 @@
 }
 
-Evas_Object* ewk_view_single_add(Evas* e)
-{
-    return evas_object_smart_add(e, _ewk_view_single_smart_class_new());
-}
+Evas_Object* ewk_view_single_add(Evas* canvas)
+{
+    return evas_object_smart_add(canvas, _ewk_view_single_smart_class_new());
+}

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

@@ -31 +31 @@
 static Ewk_View_Smart_Class _parent_sc = EWK_VIEW_SMART_CLASS_INIT_NULL;
 
-static Eina_Bool _ewk_view_tiled_render_cb(void* data, Ewk_Tile* t, const Eina_Rectangle* area)
+static Eina_Bool _ewk_view_tiled_render_cb(void* data, Ewk_Tile* tile, const Eina_Rectangle* area)
 {
     Ewk_View_Private_Data* priv = static_cast<Ewk_View_Private_Data*>(data);
-    Eina_Rectangle r = {area->x + t->x, area->y + t->y, area->w, area->h};
-
-    return ewk_view_paint_contents(priv, t->cairo, &r);
-}
-
-static void* _ewk_view_tiled_updates_process_pre(void* data, Evas_Object* o)
+    Eina_Rectangle rect = {area->x + tile->x, area->y + tile->y, area->w, area->h};
+
+    return ewk_view_paint_contents(priv, tile->cairo, &rect);
+}
+
+static void* _ewk_view_tiled_updates_process_pre(void* data, Evas_Object* ewkTile)
 {
     Ewk_View_Private_Data* priv = static_cast<Ewk_View_Private_Data*>(data);
@@ -46 +46 @@
 }
 
-static Evas_Object* _ewk_view_tiled_smart_backing_store_add(Ewk_View_Smart_Data* sd)
-{
-    Evas_Object* bs = ewk_tiled_backing_store_add(sd->base.evas);
+static Evas_Object* _ewk_view_tiled_smart_backing_store_add(Ewk_View_Smart_Data* smartData)
+{
+    Evas_Object* bs = ewk_tiled_backing_store_add(smartData->base.evas);
     ewk_tiled_backing_store_render_cb_set
-        (bs, _ewk_view_tiled_render_cb, sd->_priv);
+        (bs, _ewk_view_tiled_render_cb, smartData->_priv);
     ewk_tiled_backing_store_updates_process_pre_set
-        (bs, _ewk_view_tiled_updates_process_pre, sd->_priv);
+        (bs, _ewk_view_tiled_updates_process_pre, smartData->_priv);
     return bs;
 }
 
 static void
-_ewk_view_tiled_contents_size_changed_cb(void* data, Evas_Object* o, void* event_info)
-{
-    Evas_Coord* size = static_cast<Evas_Coord*>(event_info);
-    Ewk_View_Smart_Data* sd = static_cast<Ewk_View_Smart_Data*>(data);
+_ewk_view_tiled_contents_size_changed_cb(void* data, Evas_Object* ewkTile, void* eventInfo)
+{
+    Evas_Coord* size = static_cast<Evas_Coord*>(eventInfo);
+    Ewk_View_Smart_Data* smartData = static_cast<Ewk_View_Smart_Data*>(data);
 
     ewk_tiled_backing_store_contents_resize
-        (sd->backing_store, size[0], size[1]);
-}
-
-static void _ewk_view_tiled_smart_add(Evas_Object* o)
+        (smartData->backing_store, size[0], size[1]);
+}
+
+static void _ewk_view_tiled_smart_add(Evas_Object* ewkTile)
 {
     Ewk_View_Smart_Data* sd;
 
-    _parent_sc.sc.add(o);
-
-    sd = static_cast<Ewk_View_Smart_Data*>(evas_object_smart_data_get(o));
+    _parent_sc.sc.add(ewkTile);
+
+    sd = static_cast<Ewk_View_Smart_Data*>(evas_object_smart_data_get(ewkTile));
     if (!sd)
         return;
@@ -82 +82 @@
 }
 
-static Eina_Bool _ewk_view_tiled_smart_scrolls_process(Ewk_View_Smart_Data* sd)
+static Eina_Bool _ewk_view_tiled_smart_scrolls_process(Ewk_View_Smart_Data* smartData)
 {
     const Ewk_Scroll_Request* sr;
@@ -89 +89 @@
     Evas_Coord vw, vh;
 
-    ewk_frame_contents_size_get(sd->main_frame, &vw, &vh);
-
-    sr = ewk_view_scroll_requests_get(sd->_priv, &count);
+    ewk_frame_contents_size_get(smartData->main_frame, &vw, &vh);
+
+    sr = ewk_view_scroll_requests_get(smartData->_priv, &count);
     sr_end = sr + count;
     for (; sr < sr_end; sr++) {
         if (sr->main_scroll)
             ewk_tiled_backing_store_scroll_full_offset_add
-                (sd->backing_store, sr->dx, sr->dy);
+                (smartData->backing_store, sr->dx, sr->dy);
         else {
             Evas_Coord sx, sy, sw, sh;
@@ -109 +109 @@
                 DBG("full page scroll %+03d,%+03d. convert to repaint %d,%d + %dx%d",
                     sr->dx, sr->dy, sx, sy, sw, sh);
-                ewk_view_repaint_add(sd->_priv, sx, sy, sw, sh);
+                ewk_view_repaint_add(smartData->_priv, sx, sy, sw, sh);
                 continue;
             }
@@ -130 +130 @@
             sw += abs(sr->dx);
             sh += abs(sr->dy);
-            ewk_view_repaint_add(sd->_priv, sx, sy, sw, sh);
+            ewk_view_repaint_add(smartData->_priv, sx, sy, sw, sh);
             INF("using repaint for inner frame scolling!");
         }
@@ -138 +138 @@
 }
 
-static Eina_Bool _ewk_view_tiled_smart_repaints_process(Ewk_View_Smart_Data* sd)
+static Eina_Bool _ewk_view_tiled_smart_repaints_process(Ewk_View_Smart_Data* smartData)
 {
     const Eina_Rectangle* pr, * pr_end;
@@ -144 +144 @@
     int sx, sy;
 
-    ewk_frame_scroll_pos_get(sd->main_frame, &sx, &sy);
-
-    pr = ewk_view_repaints_get(sd->_priv, &count);
+    ewk_frame_scroll_pos_get(smartData->main_frame, &sx, &sy);
+
+    pr = ewk_view_repaints_get(smartData->_priv, &count);
     pr_end = pr + count;
     for (; pr < pr_end; pr++) {
@@ -154 +154 @@
         r.w = pr->w;
         r.h = pr->h;
-        ewk_tiled_backing_store_update(sd->backing_store, &r);
+        ewk_tiled_backing_store_update(smartData->backing_store, &r);
     }
-    ewk_tiled_backing_store_updates_process(sd->backing_store);
-
-    return EINA_TRUE;
-}
-
-static Eina_Bool _ewk_view_tiled_smart_contents_resize(Ewk_View_Smart_Data* sd, int w, int h)
-{
-    ewk_tiled_backing_store_contents_resize(sd->backing_store, w, h);
-    return EINA_TRUE;
-}
-
-static Eina_Bool _ewk_view_tiled_smart_zoom_set(Ewk_View_Smart_Data* sd, float zoom, Evas_Coord cx, Evas_Coord cy)
+    ewk_tiled_backing_store_updates_process(smartData->backing_store);
+
+    return EINA_TRUE;
+}
+
+static Eina_Bool _ewk_view_tiled_smart_contents_resize(Ewk_View_Smart_Data* smartData, int width, int height)
+{
+    ewk_tiled_backing_store_contents_resize(smartData->backing_store, width, height);
+    return EINA_TRUE;
+}
+
+static Eina_Bool _ewk_view_tiled_smart_zoom_set(Ewk_View_Smart_Data* smartData, float zoom, Evas_Coord centerX, Evas_Coord centerY)
 {
     Evas_Coord x, y, w, h;
     Eina_Bool r;
-    r = ewk_tiled_backing_store_zoom_set(sd->backing_store,
-                                         &zoom, cx, cy, &x, &y);
+    r = ewk_tiled_backing_store_zoom_set(smartData->backing_store,
+                                         &zoom, centerX, centerY, &x, &y);
     if (!r)
         return r;
-    ewk_tiled_backing_store_disabled_update_set(sd->backing_store, EINA_TRUE);
-    r = _parent_sc.zoom_set(sd, zoom, cx, cy);
-    ewk_frame_scroll_set(sd->main_frame, -x, -y);
-    ewk_frame_scroll_size_get(sd->main_frame, &w, &h);
-    ewk_tiled_backing_store_fix_offsets(sd->backing_store, w, h);
-    ewk_view_scrolls_process(sd);
-    evas_object_smart_calculate(sd->backing_store);
-    evas_object_smart_calculate(sd->self);
-    ewk_tiled_backing_store_disabled_update_set(sd->backing_store, EINA_FALSE);
+    ewk_tiled_backing_store_disabled_update_set(smartData->backing_store, EINA_TRUE);
+    r = _parent_sc.zoom_set(smartData, zoom, centerX, centerY);
+    ewk_frame_scroll_set(smartData->main_frame, -x, -y);
+    ewk_frame_scroll_size_get(smartData->main_frame, &w, &h);
+    ewk_tiled_backing_store_fix_offsets(smartData->backing_store, w, h);
+    ewk_view_scrolls_process(smartData);
+    evas_object_smart_calculate(smartData->backing_store);
+    evas_object_smart_calculate(smartData->self);
+    ewk_tiled_backing_store_disabled_update_set(smartData->backing_store, EINA_FALSE);
     return r;
 }
 
-static Eina_Bool _ewk_view_tiled_smart_zoom_weak_set(Ewk_View_Smart_Data* sd, float zoom, Evas_Coord cx, Evas_Coord cy)
-{
-    return ewk_tiled_backing_store_zoom_weak_set(sd->backing_store, zoom, cx, cy);
-}
-
-static void _ewk_view_tiled_smart_zoom_weak_smooth_scale_set(Ewk_View_Smart_Data* sd, Eina_Bool smooth_scale)
-{
-    ewk_tiled_backing_store_zoom_weak_smooth_scale_set(sd->backing_store, smooth_scale);
-}
-
-static void _ewk_view_tiled_smart_flush(Ewk_View_Smart_Data* sd)
-{
-    ewk_tiled_backing_store_flush(sd->backing_store);
-    _parent_sc.flush(sd);
-}
-
-static Eina_Bool _ewk_view_tiled_smart_pre_render_region(Ewk_View_Smart_Data* sd, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, float zoom)
+static Eina_Bool _ewk_view_tiled_smart_zoom_weak_set(Ewk_View_Smart_Data* smartData, float zoom, Evas_Coord centerX, Evas_Coord centerY)
+{
+    return ewk_tiled_backing_store_zoom_weak_set(smartData->backing_store, zoom, centerX, centerY);
+}
+
+static void _ewk_view_tiled_smart_zoom_weak_smooth_scale_set(Ewk_View_Smart_Data* smartData, Eina_Bool smoothScale)
+{
+    ewk_tiled_backing_store_zoom_weak_smooth_scale_set(smartData->backing_store, smoothScale);
+}
+
+static void _ewk_view_tiled_smart_flush(Ewk_View_Smart_Data* smartData)
+{
+    ewk_tiled_backing_store_flush(smartData->backing_store);
+    _parent_sc.flush(smartData);
+}
+
+static Eina_Bool _ewk_view_tiled_smart_pre_render_region(Ewk_View_Smart_Data* smartData, Evas_Coord x, Evas_Coord y, Evas_Coord width, Evas_Coord height, float zoom)
 {
     return ewk_tiled_backing_store_pre_render_region
-               (sd->backing_store, x, y, w, h, zoom);
-}
-
-static Eina_Bool _ewk_view_tiled_smart_pre_render_relative_radius(Ewk_View_Smart_Data* sd, unsigned int n, float zoom)
+               (smartData->backing_store, x, y, width, height, zoom);
+}
+
+static Eina_Bool _ewk_view_tiled_smart_pre_render_relative_radius(Ewk_View_Smart_Data* smartData, unsigned int n, float zoom)
 {
     return ewk_tiled_backing_store_pre_render_relative_radius
-               (sd->backing_store, n, zoom);
-}
-
-static void _ewk_view_tiled_smart_pre_render_cancel(Ewk_View_Smart_Data* sd)
-{
-    ewk_tiled_backing_store_pre_render_cancel(sd->backing_store);
-}
-
-static Eina_Bool _ewk_view_tiled_smart_disable_render(Ewk_View_Smart_Data* sd)
-{
-    return ewk_tiled_backing_store_disable_render(sd->backing_store);
-}
-
-static Eina_Bool _ewk_view_tiled_smart_enable_render(Ewk_View_Smart_Data* sd)
-{
-    return ewk_tiled_backing_store_enable_render(sd->backing_store);
+               (smartData->backing_store, n, zoom);
+}
+
+static void _ewk_view_tiled_smart_pre_render_cancel(Ewk_View_Smart_Data* smartData)
+{
+    ewk_tiled_backing_store_pre_render_cancel(smartData->backing_store);
+}
+
+static Eina_Bool _ewk_view_tiled_smart_disable_render(Ewk_View_Smart_Data* smartData)
+{
+    return ewk_tiled_backing_store_disable_render(smartData->backing_store);
+}
+
+static Eina_Bool _ewk_view_tiled_smart_enable_render(Ewk_View_Smart_Data* smartData)
+{
+    return ewk_tiled_backing_store_enable_render(smartData->backing_store);
 }
 
@@ -269 +269 @@
 }
 
-Evas_Object* ewk_view_tiled_add(Evas* e)
-{
-    return evas_object_smart_add(e, _ewk_view_tiled_smart_class_new());
-}
-
-Ewk_Tile_Unused_Cache* ewk_view_tiled_unused_cache_get(const Evas_Object* o)
-{
-    Ewk_View_Smart_Data* sd = ewk_view_smart_data_get(o);
+Evas_Object* ewk_view_tiled_add(Evas* canvas)
+{
+    return evas_object_smart_add(canvas, _ewk_view_tiled_smart_class_new());
+}
+
+Ewk_Tile_Unused_Cache* ewk_view_tiled_unused_cache_get(const Evas_Object* ewkTile)
+{
+    Ewk_View_Smart_Data* sd = ewk_view_smart_data_get(ewkTile);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd, 0);
     return ewk_tiled_backing_store_tile_unused_cache_get(sd->backing_store);
 }
 
-void ewk_view_tiled_unused_cache_set(Evas_Object* o, Ewk_Tile_Unused_Cache* cache)
-{
-    Ewk_View_Smart_Data* sd = ewk_view_smart_data_get(o);
+void ewk_view_tiled_unused_cache_set(Evas_Object* ewkTile, Ewk_Tile_Unused_Cache* cache)
+{
+    Ewk_View_Smart_Data* sd = ewk_view_smart_data_get(ewkTile);
     EINA_SAFETY_ON_NULL_RETURN(sd);
     ewk_tiled_backing_store_tile_unused_cache_set(sd->backing_store, cache);

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

@@ -36 +36 @@
 };
 
-void ewk_window_features_unref(Ewk_Window_Features* window_features)
+void ewk_window_features_unref(Ewk_Window_Features* windowFeatures)
 {
-    EINA_SAFETY_ON_NULL_RETURN(window_features);
-    EINA_SAFETY_ON_FALSE_RETURN(window_features->__ref > 0);
+    EINA_SAFETY_ON_NULL_RETURN(windowFeatures);
+    EINA_SAFETY_ON_FALSE_RETURN(windowFeatures->__ref > 0);
 
-    if (--window_features->__ref)
+    if (--windowFeatures->__ref)
         return;
 
-    delete window_features->core;
-    window_features->core = 0;
-    free(window_features);
+    delete windowFeatures->core;
+    windowFeatures->core = 0;
+    free(windowFeatures);
 }
 
-void ewk_window_features_ref(Ewk_Window_Features* window_features)
+void ewk_window_features_ref(Ewk_Window_Features* windowFeatures)
 {
-    EINA_SAFETY_ON_NULL_RETURN(window_features);
-    window_features->__ref++;
+    EINA_SAFETY_ON_NULL_RETURN(windowFeatures);
+    windowFeatures->__ref++;
 }
 
-void ewk_window_features_bool_property_get(const Ewk_Window_Features* window_features, Eina_Bool* toolbar_visible, Eina_Bool* statusbar_visible, Eina_Bool* scrollbars_visible, Eina_Bool* menubar_visible, Eina_Bool* locationbar_visible, Eina_Bool* fullscreen)
+void ewk_window_features_bool_property_get(const Ewk_Window_Features* windowFeatures, Eina_Bool* toolbarVisible, Eina_Bool* statusbarVisible, Eina_Bool* scrollbarsVisible, Eina_Bool* menubarVisible, Eina_Bool* locationbarVisible, Eina_Bool* fullScreen)
 {
-    EINA_SAFETY_ON_NULL_RETURN(window_features);
-    EINA_SAFETY_ON_NULL_RETURN(window_features->core);
+    EINA_SAFETY_ON_NULL_RETURN(windowFeatures);
+    EINA_SAFETY_ON_NULL_RETURN(windowFeatures->core);
 
-    if (toolbar_visible)
-        *toolbar_visible = window_features->core->toolBarVisible;
+    if (toolbarVisible)
+        *toolbarVisible = windowFeatures->core->toolBarVisible;
 
-    if (statusbar_visible)
-        *statusbar_visible = window_features->core->statusBarVisible;
+    if (statusbarVisible)
+        *statusbarVisible = windowFeatures->core->statusBarVisible;
 
-    if (scrollbars_visible)
-        *scrollbars_visible = window_features->core->scrollbarsVisible;
+    if (scrollbarsVisible)
+        *scrollbarsVisible = windowFeatures->core->scrollbarsVisible;
 
-    if (menubar_visible)
-        *menubar_visible = window_features->core->menuBarVisible;
+    if (menubarVisible)
+        *menubarVisible = windowFeatures->core->menuBarVisible;
 
-    if (locationbar_visible)
-        *locationbar_visible = window_features->core->locationBarVisible;
+    if (locationbarVisible)
+        *locationbarVisible = windowFeatures->core->locationBarVisible;
 
-    if (fullscreen)
-        *fullscreen = window_features->core->fullscreen;
+    if (fullScreen)
+        *fullScreen = windowFeatures->core->fullscreen;
 }
 
-void ewk_window_features_int_property_get(const Ewk_Window_Features* window_features, int* x, int* y, int* w, int* h)
+void ewk_window_features_int_property_get(const Ewk_Window_Features* windowFeatures, int* x, int* y, int* width, int* height)
 {
-    EINA_SAFETY_ON_NULL_RETURN(window_features);
-    EINA_SAFETY_ON_NULL_RETURN(window_features->core);
+    EINA_SAFETY_ON_NULL_RETURN(windowFeatures);
+    EINA_SAFETY_ON_NULL_RETURN(windowFeatures->core);
 
     if (x)
-        *x = window_features->core->xSet ? static_cast<int>(window_features->core->x) : -1;
+        *x = windowFeatures->core->xSet ? static_cast<int>(windowFeatures->core->x) : -1;
 
     if (y)
-        *y = window_features->core->ySet ? static_cast<int>(window_features->core->y) : -1;
+        *y = windowFeatures->core->ySet ? static_cast<int>(windowFeatures->core->y) : -1;
 
-    if (w)
-        *w = window_features->core->widthSet ? static_cast<int>(window_features->core->width) : -1;
+    if (width)
+        *width = windowFeatures->core->widthSet ? static_cast<int>(windowFeatures->core->width) : -1;
 
-    if (h)
-        *h = window_features->core->heightSet ? static_cast<int>(window_features->core->height) : -1;
+    if (height)
+        *height = windowFeatures->core->heightSet ? static_cast<int>(windowFeatures->core->height) : -1;
 }