Changeset 106330 in webkit

Timestamp:

Jan 30, 2012 9:03:02 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[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):

Location:

trunk/Source/WebKit/efl

Files:

• ChangeLog (modified) (1 diff)
• ewk/ewk_private.h (modified) (1 diff)
• ewk/ewk_view.cpp (modified) (1 diff)
• ewk/ewk_view_single.cpp (modified) (1 diff)
• ewk/ewk_view_tiled.cpp (modified) (2 diffs)

trunk/Source/WebKit/efl/ChangeLog

@@ +1 @@
+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>
 

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

@@ -58 +58 @@
 };
 #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

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

@@ -268 +268 @@
 
 #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__; \
     }

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

@@ -397 +397 @@
 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;
 

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

@@ -348 +348 @@
 
     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);
@@ -375 +375 @@
 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;