Title: [91658] trunk/Source/WebKit/efl
- Revision
- 91658
- Author
- [email protected]
- Date
- 2011-07-25 00:09:36 -0700 (Mon, 25 Jul 2011)
Log Message
[EFL] Method ewk_context_menu_destroy returns EINA_FALSE if CONTEXT_MENUS macro is disabled
https://bugs.webkit.org/show_bug.cgi?id=64683
Fix returned value and omit NULL checking if CONTEXT_MENUS macro is disabled
in ewk_context_menu_destroy.
Patch by Grzegorz Czajkowski <[email protected]> on 2011-07-25
Reviewed by Kent Tamura.
* ewk/ewk_contextmenu.cpp:
(ewk_context_menu_destroy):
Modified Paths
Diff
Modified: trunk/Source/WebKit/efl/ChangeLog (91657 => 91658)
--- trunk/Source/WebKit/efl/ChangeLog 2011-07-25 05:10:33 UTC (rev 91657)
+++ trunk/Source/WebKit/efl/ChangeLog 2011-07-25 07:09:36 UTC (rev 91658)
@@ -1,3 +1,16 @@
+2011-07-25 Grzegorz Czajkowski <[email protected]>
+
+ [EFL] Method ewk_context_menu_destroy returns EINA_FALSE if CONTEXT_MENUS macro is disabled
+ https://bugs.webkit.org/show_bug.cgi?id=64683
+
+ Fix returned value and omit NULL checking if CONTEXT_MENUS macro is disabled
+ in ewk_context_menu_destroy.
+
+ Reviewed by Kent Tamura.
+
+ * ewk/ewk_contextmenu.cpp:
+ (ewk_context_menu_destroy):
+
2011-07-22 Michal Pakula vel Rutka <[email protected]>
[EFL] ewk_frame_hit_test_new enhancement
Modified: trunk/Source/WebKit/efl/ewk/ewk_contextmenu.cpp (91657 => 91658)
--- trunk/Source/WebKit/efl/ewk/ewk_contextmenu.cpp 2011-07-25 05:10:33 UTC (rev 91657)
+++ trunk/Source/WebKit/efl/ewk/ewk_contextmenu.cpp 2011-07-25 07:09:36 UTC (rev 91658)
@@ -102,14 +102,14 @@
*/
Eina_Bool ewk_context_menu_destroy(Ewk_Context_Menu* menu)
{
+#if ENABLE(CONTEXT_MENUS)
EINA_SAFETY_ON_NULL_RETURN_VAL(menu, EINA_FALSE);
-#if ENABLE(CONTEXT_MENUS)
EINA_SAFETY_ON_NULL_RETURN_VAL(menu->controller, EINA_FALSE);
-
menu->controller->clearContextMenu();
+ return EINA_TRUE;
+#else
+ return EINA_FALSE;
#endif
-
- return EINA_TRUE;
}
/**
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
