(Part 2) Use proper naming for handles/functions that represent EwkView

Commit [1] cleaned up most of the "evas_object" occurances inside tizen_src (but outside
ewk layer). This commit is follow up of [1], which replaces rest of the occurances with
ewk_view/EwkView inside ewk layer. Read [1]'s commit message for more details.

[1] c65e88bc0c05def7e76e229beb506f2638034024

Also, cleans up unused/redundant functions.

Change-Id: I2f95f491e2dc72ebbb719df2efdccf1e2a229cb7
Signed-off-by: Gajendra N <gajendra.n@samsung.com>

diff --git a/tizen_src/ewk/efl_integration/eweb_view.cc b/tizen_src/ewk/efl_integration/eweb_view.cc
index 3dbb9fe..bb6c8c6 100644 (file)
--- a/tizen_src/ewk/efl_integration/eweb_view.cc
+++ b/tizen_src/ewk/efl_integration/eweb_view.cc
@@ -299,8 +299,8 @@ content::WebViewDelegate::WebContentsCreateCallback
     EWebView::create_new_window_web_contents_cb_ =
         base::BindRepeating(&NullCreateWebContents);
 
-EWebView* EWebView::FromEvasObject(Evas_Object* eo) {
-  return WebViewDelegateEwk::GetInstance().GetWebViewFromEvasObject(eo);
+EWebView* EWebView::FromEwkView(Evas_Object* ewk_view) {
+  return WebViewDelegateEwk::GetInstance().GetEWebViewFromEwkView(ewk_view);
 }
 
 void EWebView::VisibleContentChangedCallback(void* user_data,

diff --git a/tizen_src/ewk/efl_integration/eweb_view.h b/tizen_src/ewk/efl_integration/eweb_view.h
index ccccd8f..2108ae3 100644 (file)
--- a/tizen_src/ewk/efl_integration/eweb_view.h
+++ b/tizen_src/ewk/efl_integration/eweb_view.h
@@ -292,7 +292,7 @@ class PermissionPopupManager;
 
 class EWebView {
  public:
-  static EWebView* FromEvasObject(Evas_Object* eo);
+  static EWebView* FromEwkView(Evas_Object* ewk_view);
 
   EWebView(Ewk_Context*, Evas_Object* smart_object);
   ~EWebView();

diff --git a/tizen_src/ewk/efl_integration/private/ewk_view_private.cc b/tizen_src/ewk/efl_integration/private/ewk_view_private.cc
index 91efa95..c7b547b 100644 (file)
--- a/tizen_src/ewk/efl_integration/private/ewk_view_private.cc
+++ b/tizen_src/ewk/efl_integration/private/ewk_view_private.cc
@@ -51,15 +51,13 @@ void SmartDataChanged(Ewk_View_Smart_Data* d)
 }
 
 // Evas_Smart_Class callback interface:
-void handleEvasObjectAdd(Evas_Object* evas_object)
-{
-  const Evas_Smart* smart = evas_object_smart_smart_get(evas_object);
+void handleEwkViewAdd(Evas_Object* ewk_view) {
+  const Evas_Smart* smart = evas_object_smart_smart_get(ewk_view);
   const Evas_Smart_Class* smart_class = evas_smart_class_get(smart);
   const Ewk_View_Smart_Class* api = reinterpret_cast<const Ewk_View_Smart_Class*>(smart_class);
   assert(api);
 
-  Ewk_View_Smart_Data* smart_data =
-      GetEwkViewSmartDataFromEvasObject(evas_object);
+  Ewk_View_Smart_Data* smart_data = GetSmartDataFromEwkView(ewk_view);
 
   if (!smart_data) {
     // Allocating with 'calloc' as the API contract is that it should be deleted with 'free()'.
@@ -69,31 +67,29 @@ void handleEvasObjectAdd(Evas_Object* evas_object)
       EINA_LOG_ERR("Failed to allocate Smart View Data");
       return;
     }
-    evas_object_smart_data_set(evas_object, smart_data);
+    evas_object_smart_data_set(ewk_view, smart_data);
   }
-  smart_data->self = evas_object;
+  smart_data->self = ewk_view;
   smart_data->api = api;
 
-  parent_smart_class_.add(evas_object);
+  parent_smart_class_.add(ewk_view);
 
   smart_data->priv = 0;  // Will be initialized later.
 }
 
 // Ewk_View_Smart_Class callback interface:
-void handleEvasObjectDelete(Evas_Object* evas_object)
-{
-  Ewk_View_Smart_Data* smart_data = GetEwkViewSmartDataFromEvasObject(evas_object);
+void handleEwkViewDelete(Evas_Object* ewk_view) {
+  Ewk_View_Smart_Data* smart_data = GetSmartDataFromEwkView(ewk_view);
   if (smart_data) {
     delete smart_data->priv;
     smart_data->priv = NULL;
   }
-  parent_smart_class_.del(evas_object);
+  parent_smart_class_.del(ewk_view);
 }
 
-void handleEvasObjectShow(Evas_Object* o)
-{
-  Ewk_View_Smart_Data* d = GetEwkViewSmartDataFromEvasObject(o);
-  EWebView* wv = GetWebViewFromSmartData(d);
+void handleEwkViewShow(Evas_Object* ewk_view) {
+  Ewk_View_Smart_Data* d = GetSmartDataFromEwkView(ewk_view);
+  EWebView* wv = GetEWebViewFromSmartData(d);
   if (!wv) {
     return;
   }
@@ -104,10 +100,9 @@ void handleEvasObjectShow(Evas_Object* o)
   wv->HandleShow();
 }
 
-void handleEvasObjectHide(Evas_Object* o)
-{
-  Ewk_View_Smart_Data* d = GetEwkViewSmartDataFromEvasObject(o);
-  EWebView* wv = GetWebViewFromSmartData(d);
+void handleEwkViewHide(Evas_Object* ewk_view) {
+  Ewk_View_Smart_Data* d = GetSmartDataFromEwkView(ewk_view);
+  EWebView* wv = GetEWebViewFromSmartData(d);
   if (!wv) {
     return;
   }
@@ -122,10 +117,9 @@ void handleEvasObjectHide(Evas_Object* o)
   wv->HandleHide();
 }
 
-void handleEvasObjectMove(Evas_Object* o, Evas_Coord x, Evas_Coord y)
-{
-  Ewk_View_Smart_Data* d = GetEwkViewSmartDataFromEvasObject(o);
-  EWebView* wv = GetWebViewFromSmartData(d);
+void handleEwkViewMove(Evas_Object* ewk_view, Evas_Coord x, Evas_Coord y) {
+  Ewk_View_Smart_Data* d = GetSmartDataFromEwkView(ewk_view);
+  EWebView* wv = GetEWebViewFromSmartData(d);
   if (!wv) {
     return;
   }
@@ -133,10 +127,11 @@ void handleEvasObjectMove(Evas_Object* o, Evas_Coord x, Evas_Coord y)
   SmartDataChanged(d);
 }
 
-void handleEvasObjectResize(Evas_Object* o, Evas_Coord width, Evas_Coord height)
-{
-  Ewk_View_Smart_Data* d = GetEwkViewSmartDataFromEvasObject(o);
-  EWebView* wv = GetWebViewFromSmartData(d);
+void handleEwkViewResize(Evas_Object* ewk_view,
+                         Evas_Coord width,
+                         Evas_Coord height) {
+  Ewk_View_Smart_Data* d = GetSmartDataFromEwkView(ewk_view);
+  EWebView* wv = GetEWebViewFromSmartData(d);
   if (!wv) {
     return;
   }
@@ -148,7 +143,7 @@ void handleEvasObjectResize(Evas_Object* o, Evas_Coord width, Evas_Coord height)
     LOG(ERROR) << "hardcode size as 1920 * 1080 for invalid size";
     width = 1920;
     height = 1080;
-    evas_object_geometry_set(o, 0, 0, width, height);
+    evas_object_geometry_set(ewk_view, 0, 0, width, height);
   }
 #endif
   d->view.w = width;
@@ -157,29 +152,31 @@ void handleEvasObjectResize(Evas_Object* o, Evas_Coord width, Evas_Coord height)
   SmartDataChanged(d);
 }
 
-void handleEvasObjectCalculate(Evas_Object* o)
-{
-  Ewk_View_Smart_Data* d = GetEwkViewSmartDataFromEvasObject(o);
-  EWebView* wv = GetWebViewFromSmartData(d);
+void handleEwkViewCalculate(Evas_Object* ewk_view) {
+  Ewk_View_Smart_Data* d = GetSmartDataFromEwkView(ewk_view);
+  EWebView* wv = GetEWebViewFromSmartData(d);
   if (!wv) {
     return;
   }
   Evas_Coord x, y, width, height;
-  evas_object_geometry_get(o, &x, &y, &width, &height);
+  evas_object_geometry_get(ewk_view, &x, &y, &width, &height);
   d->view.x = x;
   d->view.y = y;
   d->view.w = width;
   d->view.h = height;
 }
 
-void handleEvasObjectColorSet(Evas_Object*, int red, int green, int blue, int alpha)
-{
+void handleEwkViewColorSet(Evas_Object*,
+                           int red,
+                           int green,
+                           int blue,
+                           int alpha) {
   // FIXME: implement.
 }
 
 Eina_Bool handleTextSelectionDown(Ewk_View_Smart_Data* d, int x, int y)
 {
-  EWebView* wv = GetWebViewFromSmartData(d);
+  EWebView* wv = GetEWebViewFromSmartData(d);
   if (!wv)
     return false;
   return wv->HandleTextSelectionDown(x, y);
@@ -187,7 +184,7 @@ Eina_Bool handleTextSelectionDown(Ewk_View_Smart_Data* d, int x, int y)
 
 Eina_Bool handleTextSelectionUp(Ewk_View_Smart_Data* d, int x, int y)
 {
-  EWebView* wv = GetWebViewFromSmartData(d);
+  EWebView* wv = GetEWebViewFromSmartData(d);
   if (!wv)
     return false;
   return wv->HandleTextSelectionUp(x, y);
@@ -205,70 +202,68 @@ unsigned long long handleExceededDatabaseQuota(Ewk_View_Smart_Data *sd, const ch
 
 // --------- public API --------------
 
-bool IsWebViewObject(const Evas_Object* evas_object)
-{
-  if (!evas_object) {
+bool IsSmartWebViewObject(const Evas_Object* ewk_view) {
+  if (!ewk_view) {
     return false;
   }
 
-  const char* object_type = evas_object_type_get(evas_object);
-  const Evas_Smart* evas_smart = evas_object_smart_smart_get(evas_object);
+  const char* object_type = evas_object_type_get(ewk_view);
+  const Evas_Smart* evas_smart = evas_object_smart_smart_get(ewk_view);
   if (!evas_smart) {
-    EINA_LOG_ERR("%p (%s) is not a smart object!", evas_object,
+    EINA_LOG_ERR("%p (%s) is not a smart object!", ewk_view,
                  object_type ? object_type : "(null)");
     return false;
   }
 
   const Evas_Smart_Class* smart_class = evas_smart_class_get(evas_smart);
   if (!smart_class) {
-    EINA_LOG_ERR("%p (%s) is not a smart class object!", evas_object,
+    EINA_LOG_ERR("%p (%s) is not a smart class object!", ewk_view,
                  object_type ? object_type : "(null)");
     return false;
   }
 
   if (smart_class->data != EwkViewSmartClassName) {
-    EINA_LOG_ERR("%p (%s) is not of an ewk_view (need %p, got %p)!",
-                 evas_object, object_type ? object_type : "(null)",
-                 EwkViewSmartClassName, smart_class->data);
+    EINA_LOG_ERR("%p (%s) is not of an ewk_view (need %p, got %p)!", ewk_view,
+                 object_type ? object_type : "(null)", EwkViewSmartClassName,
+                 smart_class->data);
     return false;
   }
   return true;
 }
 
-Ewk_View_Smart_Data* GetEwkViewSmartDataFromEvasObject(const Evas_Object* evas_object)
-{
-  assert(evas_object);
-  assert(IsWebViewObject(evas_object));
-  return static_cast<Ewk_View_Smart_Data*>(evas_object_smart_data_get(evas_object));
+Ewk_View_Smart_Data* GetSmartDataFromEwkView(const Evas_Object* ewk_view) {
+  assert(ewk_view);
+  assert(IsSmartWebViewObject(ewk_view));
+  return static_cast<Ewk_View_Smart_Data*>(
+      evas_object_smart_data_get(ewk_view));
 }
 
-EWebView* GetWebViewFromSmartData(const Ewk_View_Smart_Data* smartData)
-{
-  if (smartData && smartData->priv) {
-    return smartData->priv->GetTizenWebView();
+EWebView* GetEWebViewFromSmartData(const Ewk_View_Smart_Data* smart_data) {
+  if (smart_data && smart_data->priv) {
+    return smart_data->priv->GetTizenWebView();
   }
   return NULL;
 }
 
-EWebView* GetWebViewFromEvasObject(const Evas_Object* eo) {
-  if (!IsWebViewObject(eo)) {
+EWebView* GetEWebViewFromEwkView(const Evas_Object* ewk_view) {
+  if (!IsSmartWebViewObject(ewk_view)) {
     return NULL;
   }
-  Ewk_View_Smart_Data* sd = GetEwkViewSmartDataFromEvasObject(eo);
-  return GetWebViewFromSmartData(sd);
+  Ewk_View_Smart_Data* sd = GetSmartDataFromEwkView(ewk_view);
+  return GetEWebViewFromSmartData(sd);
 }
 
 Evas_Object* CreateWebViewAsEvasObject(Ewk_Context* context,
                                        Evas* canvas,
                                        Evas_Smart* smart /*= 0*/) {
   smart = smart ? smart : DefaultSmartClassInstance();
-  Evas_Object* wv_evas_object = evas_object_smart_add(canvas, smart);
-  EWebView* view = new EWebView(context, wv_evas_object);
+  Evas_Object* ewk_view = evas_object_smart_add(canvas, smart);
+  EWebView* view = new EWebView(context, ewk_view);
   if (!view) {
     return NULL;
   }
-  LOG(INFO) << "EWebView: " << view << ", ewk_view:" << wv_evas_object;
-  Ewk_View_Smart_Data* sd = GetEwkViewSmartDataFromEvasObject(wv_evas_object);
+  LOG(INFO) << "EWebView: " << view << ", ewk_view: " << ewk_view;
+  Ewk_View_Smart_Data* sd = GetSmartDataFromEwkView(ewk_view);
   if (!sd) {
     delete view;
     return NULL;
@@ -276,7 +271,7 @@ Evas_Object* CreateWebViewAsEvasObject(Ewk_Context* context,
   // attach webview as a member of smart data
   sd->priv = new EwkViewImpl(view);
   view->Initialize();
-  return wv_evas_object;
+  return ewk_view;
 }
 
 
@@ -295,14 +290,14 @@ bool InitSmartClassInterface(Ewk_View_Smart_Class& api)
   evas_object_smart_clipped_smart_set(&api.sc);
 
   // Set Evas_Smart_Class callbacks.
-  api.sc.add = &handleEvasObjectAdd;
-  api.sc.del = &handleEvasObjectDelete;
-  api.sc.move = &handleEvasObjectMove;
-  api.sc.resize = &handleEvasObjectResize;
-  api.sc.show = &handleEvasObjectShow;
-  api.sc.hide = &handleEvasObjectHide;
-  api.sc.calculate = &handleEvasObjectCalculate;
-  api.sc.color_set = &handleEvasObjectColorSet;
+  api.sc.add = &handleEwkViewAdd;
+  api.sc.del = &handleEwkViewDelete;
+  api.sc.move = &handleEwkViewMove;
+  api.sc.resize = &handleEwkViewResize;
+  api.sc.show = &handleEwkViewShow;
+  api.sc.hide = &handleEwkViewHide;
+  api.sc.calculate = &handleEwkViewCalculate;
+  api.sc.color_set = &handleEwkViewColorSet;
 
   // Set Ewk_View_Smart_Class callbacks.
   api.text_selection_down = &handleTextSelectionDown;

diff --git a/tizen_src/ewk/efl_integration/private/ewk_view_private.h b/tizen_src/ewk/efl_integration/private/ewk_view_private.h
index f77c09a..8084fb2 100644 (file)
--- a/tizen_src/ewk/efl_integration/private/ewk_view_private.h
+++ b/tizen_src/ewk/efl_integration/private/ewk_view_private.h
@@ -21,10 +21,10 @@ bool InitSmartClassInterface(Ewk_View_Smart_Class& api);
 const char EwkViewSmartClassName[] = "EWebView";
 
 // type conversion utility
-bool IsWebViewObject(const Evas_Object* evas_object);
-Ewk_View_Smart_Data* GetEwkViewSmartDataFromEvasObject(const Evas_Object* evas_object);
-EWebView* GetWebViewFromSmartData(const Ewk_View_Smart_Data* smartData);
-EWebView* GetWebViewFromEvasObject(const Evas_Object* eo);
+bool IsSmartWebViewObject(const Evas_Object* ewk_view);
+Ewk_View_Smart_Data* GetSmartDataFromEwkView(const Evas_Object* ewk_view);
+EWebView* GetEWebViewFromSmartData(const Ewk_View_Smart_Data* smart_data);
+EWebView* GetEWebViewFromEwkView(const Evas_Object* ewk_view);
 
 // permission message request creator
 std::string CreatePermissionMessageRequest(
@@ -33,13 +33,13 @@ std::string CreatePermissionMessageRequest(
 // helper macro
 // TODO: "EINA_LOG_ERR" should be changed to "EINA_LOG_CRIT"
 // (http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=15311)
-#define EWK_VIEW_IMPL_GET_OR_RETURN(evas_object, impl, ...)           \
-  EWebView* impl = GetWebViewFromEvasObject(evas_object);             \
-  do {                                                                \
-    if (!impl) {                                                      \
-      EINA_LOG_ERR("Evas Object %p is not Ewk WebView", evas_object); \
-      return __VA_ARGS__;                                             \
-    }                                                                 \
+#define EWK_VIEW_IMPL_GET_OR_RETURN(ewk_view, impl, ...)           \
+  EWebView* impl = GetEWebViewFromEwkView(ewk_view);               \
+  do {                                                             \
+    if (!impl) {                                                   \
+      EINA_LOG_ERR("Evas Object %p is not Ewk WebView", ewk_view); \
+      return __VA_ARGS__;                                          \
+    }                                                              \
   } while (0)
 
 #endif // ewk_view_private_h

diff --git a/tizen_src/ewk/efl_integration/private/webview_delegate_ewk.cc b/tizen_src/ewk/efl_integration/private/webview_delegate_ewk.cc
index 9aa120e..1332f37 100644 (file)
--- a/tizen_src/ewk/efl_integration/private/webview_delegate_ewk.cc
+++ b/tizen_src/ewk/efl_integration/private/webview_delegate_ewk.cc
@@ -15,28 +15,16 @@ const WebViewDelegateEwk& WebViewDelegateEwk::GetInstance() {
   return instance;
 }
 
-EWebView* WebViewDelegateEwk::GetWebViewFromEvasObject(
-    Evas_Object* evas_object) const {
-  return ::GetWebViewFromEvasObject(evas_object);
-}
-
-bool WebViewDelegateEwk::IsWebViewEvasObject(Evas_Object* evas_object) const {
-  return ::IsWebViewObject(evas_object);
-}
-
-Evas_Object_Smart_Clipped_Data* WebViewDelegateEwk::GetSmartClippedData(
-    Evas_Object* evas_object) {
-  if (!WebViewDelegateEwk::IsWebViewEvasObject(evas_object)) {
-    return NULL;
-  }
-  return &GetEwkViewSmartDataFromEvasObject(evas_object)->base;
+EWebView* WebViewDelegateEwk::GetEWebViewFromEwkView(
+    Evas_Object* ewk_view) const {
+  return ::GetEWebViewFromEwkView(ewk_view);
 }
 
 Eina_Rectangle WebViewDelegateEwk::GetLastUsedViewPortArea(
-    Evas_Object* evas_object) const {
+    Evas_Object* ewk_view) const {
   Eina_Rectangle result = {-1, -1, -1, -1};
-  if (WebViewDelegateEwk::IsWebViewEvasObject(evas_object)) {
-    Ewk_View_Smart_Data* sd = GetEwkViewSmartDataFromEvasObject(evas_object);
+  if (::IsSmartWebViewObject(ewk_view)) {
+    Ewk_View_Smart_Data* sd = GetSmartDataFromEwkView(ewk_view);
     assert(sd);
     result.x = sd->view.x;
     result.y = sd->view.y;
@@ -48,14 +36,14 @@ Eina_Rectangle WebViewDelegateEwk::GetLastUsedViewPortArea(
 
 void WebViewDelegateEwk::RequestHandleOrientationLock(EWebView* wv,
     int orientation) const {
-  Ewk_View_Smart_Data* sd = GetEwkViewSmartDataFromEvasObject(wv->ewk_view());
+  Ewk_View_Smart_Data* sd = GetSmartDataFromEwkView(wv->ewk_view());
   if (sd && sd->api && sd->api->orientation_lock) {
     sd->api->orientation_lock(sd, orientation);
   }
 }
 
 void WebViewDelegateEwk::RequestHandleOrientationUnlock(EWebView* wv) const {
-  Ewk_View_Smart_Data* sd = GetEwkViewSmartDataFromEvasObject(wv->ewk_view());
+  Ewk_View_Smart_Data* sd = GetSmartDataFromEwkView(wv->ewk_view());
   if (sd && sd->api && sd->api->orientation_unlock) {
     sd->api->orientation_unlock(sd);
   }

diff --git a/tizen_src/ewk/efl_integration/private/webview_delegate_ewk.h b/tizen_src/ewk/efl_integration/private/webview_delegate_ewk.h
index f9b622f..29f4d25 100644 (file)
--- a/tizen_src/ewk/efl_integration/private/webview_delegate_ewk.h
+++ b/tizen_src/ewk/efl_integration/private/webview_delegate_ewk.h
@@ -12,10 +12,8 @@ class EWebView;
 struct WebViewDelegateEwk {
  public:
   static const WebViewDelegateEwk& GetInstance();
-  EWebView* GetWebViewFromEvasObject(Evas_Object* evas_object) const;
-  bool IsWebViewEvasObject(Evas_Object* evas_object) const;
-  Evas_Object_Smart_Clipped_Data* GetSmartClippedData(Evas_Object* evas_object);
-  Eina_Rectangle GetLastUsedViewPortArea(Evas_Object* evas_object) const;
+  EWebView* GetEWebViewFromEwkView(Evas_Object* ewk_view) const;
+  Eina_Rectangle GetLastUsedViewPortArea(Evas_Object* ewk_view) const;
 
   void RequestHandleOrientationLock(EWebView* wv, int orientation) const;
   void RequestHandleOrientationUnlock(EWebView* wv) const;

diff --git a/tizen_src/ewk/efl_integration/public/ewk_settings.cc b/tizen_src/ewk/efl_integration/public/ewk_settings.cc
index 1d63b3b..9f6b71b 100644 (file)
--- a/tizen_src/ewk/efl_integration/public/ewk_settings.cc
+++ b/tizen_src/ewk/efl_integration/public/ewk_settings.cc
@@ -37,7 +37,7 @@ namespace {
 
 void ewkUpdateWebkitPreferences(Evas_Object *ewkView)
 {
-  EWebView* impl = EWebView::FromEvasObject(ewkView);
+  EWebView* impl = EWebView::FromEwkView(ewkView);
   assert(impl);
 
   impl->UpdateWebKitPreferences();
@@ -193,7 +193,7 @@ Eina_Bool ewk_settings_private_browsing_enabled_set(Ewk_Settings* settings, Eina
 #elif BUILDFLAG(IS_TIZEN)
   if (IsMobileProfile()) {
     EINA_SAFETY_ON_NULL_RETURN_VAL(settings, EINA_FALSE);
-    EWebView* impl = EWebView::FromEvasObject(settings->ewk_view());
+    EWebView* impl = EWebView::FromEwkView(settings->ewk_view());
     return impl->SetPrivateBrowsing(enable);
   }
 #endif
@@ -776,7 +776,7 @@ Eina_Bool ewk_settings_legacy_font_size_enabled_get(Ewk_Settings* settings)
 Eina_Bool ewk_settings_use_system_font_set(Ewk_Settings* settings, Eina_Bool use)
 {
   if (IsMobileProfile()) {
-    EWebView* impl = EWebView::FromEvasObject(settings->ewk_view());
+    EWebView* impl = EWebView::FromEwkView(settings->ewk_view());
     if (impl) {
       if (use)
         impl->UseSettingsFont();

diff --git a/tizen_src/ewk/efl_integration/public/ewk_view.cc b/tizen_src/ewk/efl_integration/public/ewk_view.cc
index 5b1d807..5d0c309 100644 (file)
--- a/tizen_src/ewk/efl_integration/public/ewk_view.cc
+++ b/tizen_src/ewk/efl_integration/public/ewk_view.cc
@@ -83,7 +83,7 @@ Evas_Object* ewk_view_add_with_session_data(Evas* canvas, const char* data, unsi
 
   Evas_Object* ret = ewk_view_add(canvas);
 
-  EWebView *webView = GetWebViewFromEvasObject(ret);
+  EWebView* webView = GetEWebViewFromEwkView(ret);
 
   if (!webView || !data || !length)
     return ret;
@@ -1057,7 +1057,7 @@ void ewk_view_session_data_get(Evas_Object* ewkView, const char** data, unsigned
   EINA_SAFETY_ON_NULL_RETURN(data);
   EINA_SAFETY_ON_NULL_RETURN(length);
 
-  EWebView* impl = GetWebViewFromEvasObject(ewkView);
+  EWebView* impl = GetEWebViewFromEwkView(ewkView);
   if (!impl) {
     *data = NULL;
     *length = 0;

diff --git a/tizen_src/ewk/efl_integration/web_contents_delegate_efl.cc b/tizen_src/ewk/efl_integration/web_contents_delegate_efl.cc
index 24af37f..98fdf55 100644 (file)
--- a/tizen_src/ewk/efl_integration/web_contents_delegate_efl.cc
+++ b/tizen_src/ewk/efl_integration/web_contents_delegate_efl.cc
@@ -196,7 +196,7 @@ WebContents* WebContentsDelegateEfl::OpenURLFromTab(
       ActivateContents(source);
 
     EWebView* wv =
-        WebViewDelegateEwk::GetInstance().GetWebViewFromEvasObject(new_object);
+        WebViewDelegateEwk::GetInstance().GetEWebViewFromEwkView(new_object);
     DCHECK(wv);
     wv->SetURL(url);
     return NULL;