[EFL] Change efl style local variables with WebKit coding Style.
authorgyuyoung.kim@samsung.com <gyuyoung.kim@samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 22 Oct 2011 05:32:12 +0000 (05:32 +0000)
committergyuyoung.kim@samsung.com <gyuyoung.kim@samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 22 Oct 2011 05:32:12 +0000 (05:32 +0000)
https://bugs.webkit.org/show_bug.cgi?id=69988

Reviewed by Antonio Gomes.

Change *sd* variable name with *smartData*. Some variables were changed by Bug 69988.

* ewk/ewk_frame.cpp:
(ewk_frame_view_get):
(ewk_frame_uri_set):
(ewk_frame_uri_get):
(ewk_frame_contents_size_get):
(ewk_frame_load_document_finished):
(ewk_frame_load_error):
(ewk_frame_title_set):
(ewk_frame_uri_changed):
(ewk_frame_editor_client_selection_changed):
(ewk_frame_editor_client_contents_changed):
(EWKPrivate::coreFrame):
* ewk/ewk_view.cpp:
(_ewk_view_smart_pre_render_region):
(_ewk_view_smart_pre_render_relative_radius):
(_ewk_view_smart_pre_render_cancel):
(_ewk_view_smart_disable_render):
(_ewk_view_smart_enable_render):
(EWKPrivate::corePage):
* ewk/ewk_view_single.cpp:
(_ewk_view_single_smart_add):
(_ewk_view_single_smart_resize):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@98190 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/efl/ChangeLog
Source/WebKit/efl/ewk/ewk_frame.cpp
Source/WebKit/efl/ewk/ewk_view.cpp
Source/WebKit/efl/ewk/ewk_view_single.cpp

index 991d50ed238b4d43e2c8e06d9aee1eb90f382edd..a788c51e2840466c90933942a344674bc1e60345 100755 (executable)
@@ -1,3 +1,35 @@
+2011-10-21  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        [EFL] Change efl style local variables with WebKit coding Style.
+        https://bugs.webkit.org/show_bug.cgi?id=69988
+
+        Reviewed by Antonio Gomes.
+
+        Change *sd* variable name with *smartData*. Some variables were changed by Bug 69988.
+
+        * ewk/ewk_frame.cpp:
+        (ewk_frame_view_get):
+        (ewk_frame_uri_set):
+        (ewk_frame_uri_get):
+        (ewk_frame_contents_size_get):
+        (ewk_frame_load_document_finished):
+        (ewk_frame_load_error):
+        (ewk_frame_title_set):
+        (ewk_frame_uri_changed):
+        (ewk_frame_editor_client_selection_changed):
+        (ewk_frame_editor_client_contents_changed):
+        (EWKPrivate::coreFrame):
+        * ewk/ewk_view.cpp:
+        (_ewk_view_smart_pre_render_region):
+        (_ewk_view_smart_pre_render_relative_radius):
+        (_ewk_view_smart_pre_render_cancel):
+        (_ewk_view_smart_disable_render):
+        (_ewk_view_smart_enable_render):
+        (EWKPrivate::corePage):
+        * ewk/ewk_view_single.cpp:
+        (_ewk_view_single_smart_add):
+        (_ewk_view_single_smart_resize):
+
 2011-10-21  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 
         [EFL] Change efl style local variables with WebKit coding Style.
 2011-10-21  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 
         [EFL] Change efl style local variables with WebKit coding Style.
index f0950cc1043ef7b63045cf25aac1f5b17c1db479..919500e20f9cb107fbae41133ad6cbced85b4574 100644 (file)
@@ -278,8 +278,8 @@ static inline Evas_Smart* _ewk_frame_smart_class_new(void)
 
 Evas_Object* ewk_frame_view_get(const Evas_Object* ewkFrame)
 {
 
 Evas_Object* ewk_frame_view_get(const Evas_Object* ewkFrame)
 {
-    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, 0);
-    return sd->view;
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, smartData, 0);
+    return smartData->view;
 }
 
 Eina_Iterator* ewk_frame_children_iterator_new(Evas_Object* ewkFrame)
 }
 
 Eina_Iterator* ewk_frame_children_iterator_new(Evas_Object* ewkFrame)
@@ -310,18 +310,18 @@ Evas_Object* ewk_frame_child_find(Evas_Object* ewkFrame, const char* name)
 
 Eina_Bool ewk_frame_uri_set(Evas_Object* ewkFrame, const char* uri)
 {
 
 Eina_Bool ewk_frame_uri_set(Evas_Object* ewkFrame, const char* uri)
 {
-    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, EINA_FALSE);
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, smartData, EINA_FALSE);
     WebCore::KURL kurl(WebCore::KURL(), WTF::String::fromUTF8(uri));
     WebCore::ResourceRequest req(kurl);
     WebCore::KURL kurl(WebCore::KURL(), WTF::String::fromUTF8(uri));
     WebCore::ResourceRequest req(kurl);
-    WebCore::FrameLoader* loader = sd->frame->loader();
+    WebCore::FrameLoader* loader = smartData->frame->loader();
     loader->load(req, false);
     return EINA_TRUE;
 }
 
 const char* ewk_frame_uri_get(const Evas_Object* ewkFrame)
 {
     loader->load(req, false);
     return EINA_TRUE;
 }
 
 const char* ewk_frame_uri_get(const Evas_Object* ewkFrame)
 {
-    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, 0);
-    return sd->uri;
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, smartData, 0);
+    return smartData->uri;
 }
 
 const char* ewk_frame_title_get(const Evas_Object* ewkFrame)
 }
 
 const char* ewk_frame_title_get(const Evas_Object* ewkFrame)
@@ -355,13 +355,13 @@ Eina_Bool ewk_frame_contents_size_get(const Evas_Object* ewkFrame, Evas_Coord* w
         *width = 0;
     if (height)
         *height = 0;
         *width = 0;
     if (height)
         *height = 0;
-    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, EINA_FALSE);
-    if (!sd->frame || !sd->frame->view())
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, smartData, EINA_FALSE);
+    if (!smartData->frame || !smartData->frame->view())
         return EINA_FALSE;
     if (width)
         return EINA_FALSE;
     if (width)
-        *width = sd->frame->view()->contentsWidth();
+        *width = smartData->frame->view()->contentsWidth();
     if (height)
     if (height)
-        *height = sd->frame->view()->contentsHeight();
+        *height = smartData->frame->view()->contentsHeight();
     return EINA_TRUE;
 }
 
     return EINA_TRUE;
 }
 
@@ -1298,8 +1298,8 @@ void ewk_frame_load_firstlayout_nonempty_finished(Evas_Object* ewkFrame)
 void ewk_frame_load_document_finished(Evas_Object* ewkFrame)
 {
     evas_object_smart_callback_call(ewkFrame, "load,document,finished", 0);
 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);
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, smartData);
+    ewk_view_load_document_finished(smartData->view, ewkFrame);
 }
 
 /**
 }
 
 /**
@@ -1359,8 +1359,8 @@ void ewk_frame_load_error(Evas_Object* ewkFrame, const char* errorDomain, int er
     error.failing_url = failingUrl;
     error.frame = ewkFrame;
     evas_object_smart_callback_call(ewkFrame, "load,error", &error);
     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);
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, smartData);
+    ewk_view_load_error(smartData->view, &error);
 }
 
 /**
 }
 
 /**
@@ -1403,10 +1403,10 @@ void ewk_frame_contents_size_changed(Evas_Object* ewkFrame, Evas_Coord width, Ev
 void ewk_frame_title_set(Evas_Object* ewkFrame, const char* title)
 {
     DBG("ewkFrame=%p, title=%s", ewkFrame, title ? title : "(null)");
 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))
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, smartData);
+    if (!eina_stringshare_replace(&smartData->title, title))
         return;
         return;
-    evas_object_smart_callback_call(ewkFrame, "title,changed", (void*)sd->title);
+    evas_object_smart_callback_call(ewkFrame, "title,changed", (void*)smartData->title);
 }
 
 /**
 }
 
 /**
@@ -1562,9 +1562,9 @@ char* ewk_frame_plain_text_get(const Evas_Object* ewkFrame)
  */
 Eina_Bool ewk_frame_uri_changed(Evas_Object* ewkFrame)
 {
  */
 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());
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, smartData, EINA_FALSE);
+    EINA_SAFETY_ON_NULL_RETURN_VAL(smartData->frame, EINA_FALSE);
+    WTF::CString uri(smartData->frame->document()->url().string().utf8());
 
     INF("uri=%s", uri.data());
     if (!uri.data()) {
 
     INF("uri=%s", uri.data());
     if (!uri.data()) {
@@ -1572,8 +1572,8 @@ Eina_Bool ewk_frame_uri_changed(Evas_Object* ewkFrame)
         return EINA_FALSE;
     }
 
         return EINA_FALSE;
     }
 
-    eina_stringshare_replace(&sd->uri, uri.data());
-    evas_object_smart_callback_call(ewkFrame, "uri,changed", (void*)sd->uri);
+    eina_stringshare_replace(&smartData->uri, uri.data());
+    evas_object_smart_callback_call(ewkFrame, "uri,changed", (void*)smartData->uri);
     return EINA_TRUE;
 }
 
     return EINA_TRUE;
 }
 
@@ -1613,8 +1613,8 @@ WTF::PassRefPtr<WebCore::Widget> ewk_frame_plugin_create(Evas_Object* ewkFrame,
 void ewk_frame_editor_client_selection_changed(Evas_Object* ewkFrame)
 {
     evas_object_smart_callback_call(ewkFrame, "editorclient,selection,changed", 0);
 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);
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, smartData);
+    ewk_view_editor_client_selection_changed(smartData->view);
 }
 
 /**
 }
 
 /**
@@ -1628,16 +1628,16 @@ void ewk_frame_editor_client_selection_changed(Evas_Object* ewkFrame)
 void ewk_frame_editor_client_contents_changed(Evas_Object* ewkFrame)
 {
     evas_object_smart_callback_call(ewkFrame, "editorclient,contents,changed", 0);
 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);
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, smartData);
+    ewk_view_editor_client_contents_changed(smartData->view);
 }
 
 namespace EWKPrivate {
 
 WebCore::Frame *coreFrame(const Evas_Object *ewkFrame)
 {
 }
 
 namespace EWKPrivate {
 
 WebCore::Frame *coreFrame(const Evas_Object *ewkFrame)
 {
-    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, sd, 0);
-    return sd->frame;
+    EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, smartData, 0);
+    return smartData->frame;
 }
 
 Evas_Object* kitFrame(const WebCore::Frame* coreFrame)
 }
 
 Evas_Object* kitFrame(const WebCore::Frame* coreFrame)
index b819d5caf1dcd9b0b3cf911853eaef9ca17e126d..dcbee5529127ecbd6ded3c893dd944cab2577353 100644 (file)
@@ -955,21 +955,21 @@ static void _ewk_view_smart_flush(Ewk_View_Smart_Data* smartData)
 
 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)
 {
 
 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",
+    WRN("not supported by engine. smartDAta=%p area=%d,%d+%dx%d, zoom=%f",
         smartData, x, y, width, height, zoom);
     return EINA_FALSE;
 }
 
 static Eina_Bool _ewk_view_smart_pre_render_relative_radius(Ewk_View_Smart_Data* smartData, unsigned int number, float zoom)
 {
         smartData, x, y, width, height, zoom);
     return EINA_FALSE;
 }
 
 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",
+    WRN("not supported by engine. smartData=%p, n=%u zoom=%f",
         smartData, number, zoom);
     return EINA_FALSE;
 }
 
 static void _ewk_view_smart_pre_render_cancel(Ewk_View_Smart_Data* smartData)
 {
         smartData, number, zoom);
     return EINA_FALSE;
 }
 
 static void _ewk_view_smart_pre_render_cancel(Ewk_View_Smart_Data* smartData)
 {
-    WRN("not supported by engine. sd=%p", smartData);
+    WRN("not supported by engine. smartData=%p", smartData);
 }
 
 static void _ewk_view_zoom_animated_mark_stop(Ewk_View_Smart_Data* smartData)
 }
 
 static void _ewk_view_zoom_animated_mark_stop(Ewk_View_Smart_Data* smartData)
@@ -1060,13 +1060,13 @@ static WebCore::ViewportAttributes _ewk_view_viewport_attributes_compute(const E
 
 static Eina_Bool _ewk_view_smart_disable_render(Ewk_View_Smart_Data* smartData)
 {
 
 static Eina_Bool _ewk_view_smart_disable_render(Ewk_View_Smart_Data* smartData)
 {
-    WRN("not supported by engine. sd=%p", smartData);
+    WRN("not supported by engine. smartData=%p", smartData);
     return EINA_FALSE;
 }
 
 static Eina_Bool _ewk_view_smart_enable_render(Ewk_View_Smart_Data* smartData)
 {
     return EINA_FALSE;
 }
 
 static Eina_Bool _ewk_view_smart_enable_render(Ewk_View_Smart_Data* smartData)
 {
-    WRN("not supported by engine. sd=%p", smartData);
+    WRN("not supported by engine. smartData=%p", smartData);
     return EINA_FALSE;
 }
 
     return EINA_FALSE;
 }
 
@@ -3841,8 +3841,8 @@ namespace EWKPrivate {
 
 WebCore::Page *corePage(const Evas_Object *ewkView)
 {
 
 WebCore::Page *corePage(const Evas_Object *ewkView)
 {
-    EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, 0);
-    EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, 0);
+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData, 0);
+    EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, 0);
     return priv->page;
 }
 
     return priv->page;
 }
 
index 4d35e935839c8945ad47964a7b9b2a3789102ba2..7dcbb2cbbebb226320cb6f0a2fda97aae11b348d 100644 (file)
@@ -39,19 +39,19 @@ static void _ewk_view_single_on_del(void* data, Evas* eventType, Evas_Object* ca
 
 static void _ewk_view_single_smart_add(Evas_Object* ewkSingle)
 {
 
 static void _ewk_view_single_smart_add(Evas_Object* ewkSingle)
 {
-    Ewk_View_Smart_Data* sd;
+    Ewk_View_Smart_Data* smartData;
 
     _parent_sc.sc.add(ewkSingle);
 
 
     _parent_sc.sc.add(ewkSingle);
 
-    sd = static_cast<Ewk_View_Smart_Data*>(evas_object_smart_data_get(ewkSingle));
-    if (!sd)
+    smartData = static_cast<Ewk_View_Smart_Data*>(evas_object_smart_data_get(ewkSingle));
+    if (!smartData)
         return;
 
         return;
 
-    Evas_Object* clip = evas_object_rectangle_add(sd->base.evas);
+    Evas_Object* clip = evas_object_rectangle_add(smartData->base.evas);
     evas_object_show(clip);
 
     evas_object_event_callback_add
     evas_object_show(clip);
 
     evas_object_event_callback_add
-        (sd->backing_store, EVAS_CALLBACK_DEL, _ewk_view_single_on_del, clip);
+        (smartData->backing_store, EVAS_CALLBACK_DEL, _ewk_view_single_on_del, clip);
 }
 
 static Evas_Object* _ewk_view_single_smart_backing_store_add(Ewk_View_Smart_Data* smartData)
 }
 
 static Evas_Object* _ewk_view_single_smart_backing_store_add(Ewk_View_Smart_Data* smartData)
@@ -65,21 +65,21 @@ static Evas_Object* _ewk_view_single_smart_backing_store_add(Ewk_View_Smart_Data
 
 static void _ewk_view_single_smart_resize(Evas_Object* ewkSingle, Evas_Coord width, Evas_Coord height)
 {
 
 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));
+    Ewk_View_Smart_Data* smartData = static_cast<Ewk_View_Smart_Data*>(evas_object_smart_data_get(ewkSingle));
     _parent_sc.sc.resize(ewkSingle, width, height);
 
     _parent_sc.sc.resize(ewkSingle, width, height);
 
-    if (!sd)
+    if (!smartData)
         return;
 
     // these should be queued and processed in calculate as well!
         return;
 
     // these should be queued and processed in calculate as well!
-    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_object_image_size_set(smartData->backing_store, width, height);
+    if (smartData->animated_zoom.zoom.current < 0.00001) {
+        Evas_Object* clip = evas_object_clip_get(smartData->backing_store);
         Evas_Coord x, y, cw, ch;
         Evas_Coord x, y, cw, ch;
-        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_image_fill_set(smartData->backing_store, 0, 0, width, height);
+        evas_object_geometry_get(smartData->backing_store, &x, &y, 0, 0);
         evas_object_move(clip, x, y);
         evas_object_move(clip, x, y);
-        ewk_frame_contents_size_get(sd->main_frame, &cw, &ch);
+        ewk_frame_contents_size_get(smartData->main_frame, &cw, &ch);
         if (width > cw)
             width = cw;
         if (height > ch)
         if (width > cw)
             width = cw;
         if (height > ch)