Title: [91659] trunk/Source/WebKit/efl
- Revision
- 91659
- Author
- [email protected]
- Date
- 2011-07-25 00:10:45 -0700 (Mon, 25 Jul 2011)
Log Message
[EFL] Move macro checking inside ewk_view_context_menu_forward_event
https://bugs.webkit.org/show_bug.cgi?id=64682
When CONTEXT_MENUS macro is disabled method ewk_view_context_menu_forward_event just
returns EINA_FALSE and it avoid undefined reference during building.
Patch by Grzegorz Czajkowski <[email protected]> on 2011-07-25
Reviewed by Kent Tamura.
* ewk/ewk_view.cpp:
(ewk_view_context_menu_forward_event):
Modified Paths
Diff
Modified: trunk/Source/WebKit/efl/ChangeLog (91658 => 91659)
--- trunk/Source/WebKit/efl/ChangeLog 2011-07-25 07:09:36 UTC (rev 91658)
+++ trunk/Source/WebKit/efl/ChangeLog 2011-07-25 07:10:45 UTC (rev 91659)
@@ -1,5 +1,18 @@
2011-07-25 Grzegorz Czajkowski <[email protected]>
+ [EFL] Move macro checking inside ewk_view_context_menu_forward_event
+ https://bugs.webkit.org/show_bug.cgi?id=64682
+
+ When CONTEXT_MENUS macro is disabled method ewk_view_context_menu_forward_event just
+ returns EINA_FALSE and it avoid undefined reference during building.
+
+ Reviewed by Kent Tamura.
+
+ * ewk/ewk_view.cpp:
+ (ewk_view_context_menu_forward_event):
+
+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
Modified: trunk/Source/WebKit/efl/ewk/ewk_view.cpp (91658 => 91659)
--- trunk/Source/WebKit/efl/ewk/ewk_view.cpp 2011-07-25 07:09:36 UTC (rev 91658)
+++ trunk/Source/WebKit/efl/ewk/ewk_view.cpp 2011-07-25 07:10:45 UTC (rev 91659)
@@ -1589,8 +1589,6 @@
}
}
-#if ENABLE(CONTEXT_MENUS)
-
/**
* Forwards a request of new Context Menu to WebCore.
*
@@ -1601,6 +1599,7 @@
*/
Eina_Bool ewk_view_context_menu_forward_event(Evas_Object* o, const Evas_Event_Mouse_Down* ev)
{
+#if ENABLE(CONTEXT_MENUS)
EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
Eina_Bool mouse_press_handled = EINA_FALSE;
@@ -1629,10 +1628,11 @@
}
return EINA_TRUE;
+#else
+ return EINA_FALSE;
+#endif
}
-#endif
-
/**
* Get current load progress estimate from 0.0 to 1.0.
*
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
