[EFL] Define the names of view smart class

https://bugs.webkit.org/show_bug.cgi?id=76370

Patch by Eunsol Park <eunsol47.park@samsung.com> on 2012-01-30
Reviewed by Andreas Kling.

Strings of ewk_tiled_view's name were defined differently,
so the definitions were modified to make users not confused.

* ewk/ewk_private.h:
* ewk/ewk_view.cpp:
* ewk/ewk_view_single.cpp:
(_ewk_view_single_smart_class_new):
* ewk/ewk_view_tiled.cpp:
(ewk_view_tiled_smart_set):
(_ewk_view_tiled_smart_class_new):

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

diff --git a/Source/WebKit/efl/ChangeLog b/Source/WebKit/efl/ChangeLog
index 88d3ae9..b75b160 100644 (file)
--- a/Source/WebKit/efl/ChangeLog
+++ b/Source/WebKit/efl/ChangeLog
@@ -1,3 +1,21 @@
+2012-01-30  Eunsol Park  <eunsol47.park@samsung.com>
+
+        [EFL] Define the names of view smart class
+        https://bugs.webkit.org/show_bug.cgi?id=76370
+
+        Reviewed by Andreas Kling.
+
+        Strings of ewk_tiled_view's name were defined differently,
+        so the definitions were modified to make users not confused.
+
+        * ewk/ewk_private.h:
+        * ewk/ewk_view.cpp:
+        * ewk/ewk_view_single.cpp:
+        (_ewk_view_single_smart_class_new):
+        * ewk/ewk_view_tiled.cpp:
+        (ewk_view_tiled_smart_set):
+        (_ewk_view_tiled_smart_class_new):
+
 2012-01-26  Tomasz Morawski  <t.morawski@samsung.com>
 
         [EFL] Added missing NETSCAPE_PLUGIN_API macro.

diff --git a/Source/WebKit/efl/ewk/ewk_private.h b/Source/WebKit/efl/ewk/ewk_private.h
index b1c6030..bbff734 100644 (file)
--- a/Source/WebKit/efl/ewk/ewk_private.h
+++ b/Source/WebKit/efl/ewk/ewk_private.h
@@ -58,6 +58,10 @@ struct _Ewk_JS_Object {
 };
 #endif // ENABLE(NETSCAPE_PLUGIN_API)
 
+// Defines the names for initializing ewk_view_smart_class
+const char ewkViewTiledName[] = "Ewk_View_Tiled";
+const char ewkViewSingleName[] = "Ewk_View_Single";
+
 // forward declarations
 namespace WebCore {
 struct PopupMenuClient;

diff --git a/Source/WebKit/efl/ewk/ewk_view.cpp b/Source/WebKit/efl/ewk/ewk_view.cpp
index a68bbab..853b342 100644 (file)
--- a/Source/WebKit/efl/ewk/ewk_view.cpp
+++ b/Source/WebKit/efl/ewk/ewk_view.cpp
@@ -267,8 +267,8 @@ struct _Ewk_View_Private_Data {
     }
 
 #define EWK_VIEW_TILED_TYPE_CHECK_OR_RETURN(ewkView, ...) \
-    if (!evas_object_smart_type_check(ewkView, "Ewk_View_Tiled")) { \
-        INF("object is not a instance of Ewk_View_Tiled"); \
+    if (!evas_object_smart_type_check(ewkView, ewkViewTiledName)) { \
+        INF("object isn't an instance of %s", ewkViewTiledName); \
         return __VA_ARGS__; \
     }
 

diff --git a/Source/WebKit/efl/ewk/ewk_view_single.cpp b/Source/WebKit/efl/ewk/ewk_view_single.cpp
index ed72633..e5e8eef 100644 (file)
--- a/Source/WebKit/efl/ewk/ewk_view_single.cpp
+++ b/Source/WebKit/efl/ewk/ewk_view_single.cpp
@@ -396,7 +396,7 @@ Eina_Bool ewk_view_single_smart_set(Ewk_View_Smart_Class* api)
 
 static inline Evas_Smart* _ewk_view_single_smart_class_new(void)
 {
-    static Ewk_View_Smart_Class api = EWK_VIEW_SMART_CLASS_INIT_NAME_VERSION("Ewk_View_Single");
+    static Ewk_View_Smart_Class api = EWK_VIEW_SMART_CLASS_INIT_NAME_VERSION(ewkViewSingleName);
     static Evas_Smart* smart = 0;
 
     if (EINA_UNLIKELY(!smart)) {

diff --git a/Source/WebKit/efl/ewk/ewk_view_tiled.cpp b/Source/WebKit/efl/ewk/ewk_view_tiled.cpp
index b72d6ae..e5b8263 100644 (file)
--- a/Source/WebKit/efl/ewk/ewk_view_tiled.cpp
+++ b/Source/WebKit/efl/ewk/ewk_view_tiled.cpp
@@ -347,7 +347,7 @@ Eina_Bool ewk_view_tiled_smart_set(Ewk_View_Smart_Class* api)
         return false;
 
     if (EINA_UNLIKELY(!_parent_sc.sc.add)) {
-        _parent_sc.sc.name =  "Ewk_View_Tiled";
+        _parent_sc.sc.name = ewkViewTiledName;
         ewk_view_base_smart_set(&_parent_sc);
         api->sc.parent = reinterpret_cast<Evas_Smart_Class*>(&_parent_sc);
     }
@@ -374,7 +374,7 @@ Eina_Bool ewk_view_tiled_smart_set(Ewk_View_Smart_Class* api)
 
 static inline Evas_Smart* _ewk_view_tiled_smart_class_new(void)
 {
-    static Ewk_View_Smart_Class api = EWK_VIEW_SMART_CLASS_INIT_NAME_VERSION("EWK_View_Tiled");
+    static Ewk_View_Smart_Class api = EWK_VIEW_SMART_CLASS_INIT_NAME_VERSION(ewkViewTiledName);
     static Evas_Smart* smart = 0;
 
     if (EINA_UNLIKELY(!smart)) {