Title: [106330] trunk/Source/WebKit/efl
- Revision
- 106330
- Author
- [email protected]
- Date
- 2012-01-30 21:03:02 -0800 (Mon, 30 Jan 2012)
Log Message
[EFL] Define the names of view smart class
https://bugs.webkit.org/show_bug.cgi?id=76370
Patch by Eunsol Park <[email protected]> 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/efl/ChangeLog (106329 => 106330)
--- trunk/Source/WebKit/efl/ChangeLog 2012-01-31 04:59:29 UTC (rev 106329)
+++ trunk/Source/WebKit/efl/ChangeLog 2012-01-31 05:03:02 UTC (rev 106330)
@@ -1,3 +1,21 @@
+2012-01-30 Eunsol Park <[email protected]>
+
+ [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 <[email protected]>
[EFL] Added missing NETSCAPE_PLUGIN_API macro.
Modified: trunk/Source/WebKit/efl/ewk/ewk_private.h (106329 => 106330)
--- trunk/Source/WebKit/efl/ewk/ewk_private.h 2012-01-31 04:59:29 UTC (rev 106329)
+++ trunk/Source/WebKit/efl/ewk/ewk_private.h 2012-01-31 05:03:02 UTC (rev 106330)
@@ -58,6 +58,10 @@
};
#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;
Modified: trunk/Source/WebKit/efl/ewk/ewk_view.cpp (106329 => 106330)
--- trunk/Source/WebKit/efl/ewk/ewk_view.cpp 2012-01-31 04:59:29 UTC (rev 106329)
+++ trunk/Source/WebKit/efl/ewk/ewk_view.cpp 2012-01-31 05:03:02 UTC (rev 106330)
@@ -267,8 +267,8 @@
}
#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__; \
}
Modified: trunk/Source/WebKit/efl/ewk/ewk_view_single.cpp (106329 => 106330)
--- trunk/Source/WebKit/efl/ewk/ewk_view_single.cpp 2012-01-31 04:59:29 UTC (rev 106329)
+++ trunk/Source/WebKit/efl/ewk/ewk_view_single.cpp 2012-01-31 05:03:02 UTC (rev 106330)
@@ -396,7 +396,7 @@
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)) {
Modified: trunk/Source/WebKit/efl/ewk/ewk_view_tiled.cpp (106329 => 106330)
--- trunk/Source/WebKit/efl/ewk/ewk_view_tiled.cpp 2012-01-31 04:59:29 UTC (rev 106329)
+++ trunk/Source/WebKit/efl/ewk/ewk_view_tiled.cpp 2012-01-31 05:03:02 UTC (rev 106330)
@@ -347,7 +347,7 @@
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 @@
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)) {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
