Changeset 104806 in webkit

Timestamp:

Jan 12, 2012 3:48:43 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL] Move macro checking to functions' definition in ewk_js.cpp.
​https://bugs.webkit.org/show_bug.cgi?id=76037

Patch by Grzegorz Czajkowski <​g.czajkowski@samsung.com> on 2012-01-12
Reviewed by Andreas Kling.

Moves macro checking to functions' definition instead of duplicate them in source depending on macro value.
It's known practice in WebKit and EFL port.
Duplicating functions in the same file whose return value is different may confuse user,
especially if macro isn't included in a patch.

• ewk/ewk_js.cpp:

(ewk_js_object_new):
(ewk_js_object_free):
(ewk_js_object_view_get):
(ewk_js_object_properties_get):
(ewk_js_object_name_get):
(ewk_js_object_invoke):
(ewk_js_object_type_get):
(ewk_js_object_type_set):
(ewk_js_variant_free):
(ewk_js_variant_array_free):

Location:

trunk/Source/WebKit/efl

Files:

• ChangeLog (modified) (1 diff)
• ewk/ewk_js.cpp (modified) (6 diffs)

trunk/Source/WebKit/efl/ChangeLog

@@ +1 @@
+2012-01-12  Grzegorz Czajkowski  <g.czajkowski@samsung.com>
+
+        [EFL] Move macro checking to functions' definition in ewk_js.cpp.
+        https://bugs.webkit.org/show_bug.cgi?id=76037
+
+        Reviewed by Andreas Kling.
+
+        Moves macro checking to functions' definition instead of duplicate them in source depending on macro value.
+        It's known practice in WebKit and EFL port.
+        Duplicating functions in the same file whose return value is different may confuse user,
+        especially if macro isn't included in a patch.
+
+        * ewk/ewk_js.cpp:
+        (ewk_js_object_new):
+        (ewk_js_object_free):
+        (ewk_js_object_view_get):
+        (ewk_js_object_properties_get):
+        (ewk_js_object_name_get):
+        (ewk_js_object_invoke):
+        (ewk_js_object_type_get):
+        (ewk_js_object_type_set):
+        (ewk_js_variant_free):
+        (ewk_js_variant_array_free):
+
 2012-01-12  KwangHyuk Kim  <hyuki.kim@samsung.com>
 

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

@@ -526 +526 @@
     return true;
 }
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
 
 Ewk_JS_Object* ewk_js_object_new(const Ewk_JS_Class_Meta* jsMetaClass)
 {
+#if ENABLE(NETSCAPE_PLUGIN_API)
     Ewk_JS_Object* object;
 
@@ -594 +596 @@
     ewk_js_object_free(object);
     return 0;
+#else
+    return 0;
+#endif
 }
 
 void ewk_js_object_free(Ewk_JS_Object* jsObject)
 {
+#if ENABLE(NETSCAPE_PLUGIN_API)
     EINA_SAFETY_ON_NULL_RETURN(jsObject);
     EINA_MAGIC_CHECK_OR_RETURN(jsObject);
@@ -611 +617 @@
     if (script_obj)
         free(jsObject);
+#endif
 }
 
 Evas_Object* ewk_js_object_view_get(const Ewk_JS_Object* jsObject)
 {
+#if ENABLE(NETSCAPE_PLUGIN_API)
     EINA_SAFETY_ON_NULL_RETURN_VAL(jsObject, 0);
     EINA_MAGIC_CHECK_OR_RETURN(jsObject, 0);
     return jsObject->view;
+#else
+    return 0;
+#endif
 }
 
 Eina_Hash* ewk_js_object_properties_get(const Ewk_JS_Object* jsObject)
 {
+#if ENABLE(NETSCAPE_PLUGIN_API)
     EINA_SAFETY_ON_NULL_RETURN_VAL(jsObject, 0);
     EINA_MAGIC_CHECK_OR_RETURN(jsObject, 0);
     return jsObject->properties;
+#else
+    return 0;
+#endif
 }
 
 const char* ewk_js_object_name_get(const Ewk_JS_Object* jsObject)
 {
+#if ENABLE(NETSCAPE_PLUGIN_API)
     EINA_SAFETY_ON_NULL_RETURN_VAL(jsObject, 0);
     EINA_MAGIC_CHECK_OR_RETURN(jsObject, 0);
     return jsObject->name;
+#else
+    return 0;
+#endif
 }
 
 Eina_Bool ewk_js_object_invoke(Ewk_JS_Object* jsObject, Ewk_JS_Variant* args, int argCount, Ewk_JS_Variant* result)
 {
+#if ENABLE(NETSCAPE_PLUGIN_API)
     NPVariant* np_args;
     NPVariant np_result;
@@ -664 +684 @@
     free(np_args);
     return fail;
+#else
+    return false;
+#endif
 }
 
 Ewk_JS_Object_Type ewk_js_object_type_get(Ewk_JS_Object* jsObject)
 {
+#if ENABLE(NETSCAPE_PLUGIN_API)
     EINA_SAFETY_ON_NULL_RETURN_VAL(jsObject, EWK_JS_OBJECT_OBJECT);
     EINA_MAGIC_CHECK_OR_RETURN(jsObject, EWK_JS_OBJECT_OBJECT);
 
     return jsObject->type;
+#else
+    return EWK_JS_OBJECT_INVALID;
+#endif
 }
 
 void ewk_js_object_type_set(Ewk_JS_Object* jsObject, Ewk_JS_Object_Type type)
 {
+#if ENABLE(NETSCAPE_PLUGIN_API)
     EINA_SAFETY_ON_NULL_RETURN(jsObject);
     EINA_MAGIC_CHECK_OR_RETURN(jsObject);
 
     jsObject->type = type;
+#endif
 }
 
 void ewk_js_variant_free(Ewk_JS_Variant* jsVariant)
 {
+#if ENABLE(NETSCAPE_PLUGIN_API)
     EINA_SAFETY_ON_NULL_RETURN(jsVariant);
     if (jsVariant->type == EWK_JS_VARIANT_STRING)
@@ -690 +720 @@
         ewk_js_object_free(jsVariant->value.o);
     free(jsVariant);
+#endif
 }
 
 void ewk_js_variant_array_free(Ewk_JS_Variant* jsVariant, int count)
 {
+#if ENABLE(NETSCAPE_PLUGIN_API)
     EINA_SAFETY_ON_NULL_RETURN(jsVariant);
     for (int i = 0; i < count; i++) {
@@ -702 +734 @@
     }
     free(jsVariant);
-}
-
-#else
-
-Eina_Hash* ewk_js_object_properties_get(const Ewk_JS_Object* jsObject)
-{
-    return 0;
-}
-
-const char* ewk_js_object_name_get(const Ewk_JS_Object* jsObject)
-{
-    return 0;
-}
-
-Evas_Object* ewk_js_object_view_get(const Ewk_JS_Object* jsObject)
-{
-    return 0;
-}
-
-void ewk_js_variant_free(Ewk_JS_Variant* jsVariant)
-{
-}
-
-void ewk_js_variant_array_free(Ewk_JS_Variant* jsVariant, int count)
-{
-}
-
-Ewk_JS_Object* ewk_js_object_new(const Ewk_JS_Class_Meta* jsMetaClass)
-{
-    return 0;
-}
-
-void ewk_js_object_free(Ewk_JS_Object* jsObject)
-{
-}
-
-Eina_Bool ewk_js_object_invoke(Ewk_JS_Object* jsObject, Ewk_JS_Variant* args, int argCount, Ewk_JS_Variant* result)
-{
-    return false;
-}
-
-Ewk_JS_Object_Type ewk_js_object_type_get(Ewk_JS_Object* jsObject)
-{
-    return EWK_JS_OBJECT_INVALID;
-}
-
-void ewk_js_object_type_set(Ewk_JS_Object* jsObject, Ewk_JS_Object_Type type)
-{
-}
-
-#endif // ENABLE(NETSCAPE_PLUGIN_API)
+#endif
+}