Title: [143200] trunk/Source/WebKit/efl
- Revision
- 143200
- Author
- [email protected]
- Date
- 2013-02-18 05:20:38 -0800 (Mon, 18 Feb 2013)
Log Message
[EFL] Fix build when CONTEXT_MENUS flag is turned off
https://bugs.webkit.org/show_bug.cgi?id=109924
Patch by Michał Pakuła vel Rutka <[email protected]> on 2013-02-18
Reviewed by Gyuyoung Kim.
* WebCoreSupport/ContextMenuClientEfl.cpp:
* WebCoreSupport/ContextMenuClientEfl.h:
* ewk/ewk_view.cpp:
(_Ewk_View_Private_Data):
(_ewk_view_priv_new):
(_ewk_view_priv_del):
(ewk_view_context_menu_get):
Modified Paths
Diff
Modified: trunk/Source/WebKit/efl/ChangeLog (143199 => 143200)
--- trunk/Source/WebKit/efl/ChangeLog 2013-02-18 13:12:41 UTC (rev 143199)
+++ trunk/Source/WebKit/efl/ChangeLog 2013-02-18 13:20:38 UTC (rev 143200)
@@ -1,3 +1,18 @@
+2013-02-18 Michał Pakuła vel Rutka <[email protected]>
+
+ [EFL] Fix build when CONTEXT_MENUS flag is turned off
+ https://bugs.webkit.org/show_bug.cgi?id=109924
+
+ Reviewed by Gyuyoung Kim.
+
+ * WebCoreSupport/ContextMenuClientEfl.cpp:
+ * WebCoreSupport/ContextMenuClientEfl.h:
+ * ewk/ewk_view.cpp:
+ (_Ewk_View_Private_Data):
+ (_ewk_view_priv_new):
+ (_ewk_view_priv_del):
+ (ewk_view_context_menu_get):
+
2013-02-18 Grzegorz Czajkowski <[email protected]>
[WK2][EFL] Unified text checker implementation
Modified: trunk/Source/WebKit/efl/WebCoreSupport/ContextMenuClientEfl.cpp (143199 => 143200)
--- trunk/Source/WebKit/efl/WebCoreSupport/ContextMenuClientEfl.cpp 2013-02-18 13:12:41 UTC (rev 143199)
+++ trunk/Source/WebKit/efl/WebCoreSupport/ContextMenuClientEfl.cpp 2013-02-18 13:20:38 UTC (rev 143200)
@@ -29,6 +29,8 @@
#include "config.h"
#include "ContextMenuClientEfl.h"
+#if ENABLE(CONTEXT_MENUS)
+
#include "ContextMenu.h"
#include "HitTestResult.h"
#include "KURL.h"
@@ -85,3 +87,5 @@
}
}
+
+#endif // ENABLE(CONTEXT_MENUS)
Modified: trunk/Source/WebKit/efl/WebCoreSupport/ContextMenuClientEfl.h (143199 => 143200)
--- trunk/Source/WebKit/efl/WebCoreSupport/ContextMenuClientEfl.h 2013-02-18 13:12:41 UTC (rev 143199)
+++ trunk/Source/WebKit/efl/WebCoreSupport/ContextMenuClientEfl.h 2013-02-18 13:20:38 UTC (rev 143200)
@@ -29,6 +29,8 @@
#ifndef ContextMenuClientEfl_h
#define ContextMenuClientEfl_h
+#if ENABLE(CONTEXT_MENUS)
+
#include "ContextMenuClient.h"
#include <wtf/RefCounted.h>
@@ -52,4 +54,5 @@
};
}
+#endif // ENABLE(CONTEXT_MENUS)
#endif
Modified: trunk/Source/WebKit/efl/ewk/ewk_view.cpp (143199 => 143200)
--- trunk/Source/WebKit/efl/ewk/ewk_view.cpp 2013-02-18 13:12:41 UTC (rev 143199)
+++ trunk/Source/WebKit/efl/ewk/ewk_view.cpp 2013-02-18 13:20:38 UTC (rev 143200)
@@ -379,7 +379,9 @@
#ifdef HAVE_ECORE_X
bool isUsingEcoreX;
#endif
+#if ENABLE(CONTEXT_MENUS)
Ewk_Context_Menu* contextMenu;
+#endif
};
#ifndef EWK_TYPE_CHECK
@@ -761,7 +763,9 @@
WebCore::Page::PageClients pageClients;
pageClients.chromeClient = new WebCore::ChromeClientEfl(smartData->self);
+#if ENABLE(CONTEXT_MENUS)
pageClients.contextMenuClient = new WebCore::ContextMenuClientEfl;
+#endif
pageClients.editorClient = new WebCore::EditorClientEfl(smartData->self);
pageClients.dragClient = new WebCore::DragClientEfl;
#if ENABLE(INSPECTOR)
@@ -935,7 +939,9 @@
priv->isUsingEcoreX = WebCore::isUsingEcoreX(smartData->base.evas);
#endif
+#if ENABLE(CONTEXT_MENUS)
priv->contextMenu = 0;
+#endif
#if USE(ACCELERATED_COMPOSITING)
priv->isCompositingActive = false;
@@ -974,8 +980,10 @@
if (priv->cursorObject)
evas_object_del(priv->cursorObject);
+#if ENABLE(CONTEXT_MENUS)
if (priv->contextMenu)
ewk_context_menu_free(priv->contextMenu);
+#endif
#if USE(ACCELERATED_COMPOSITING)
priv->acceleratedCompositingContext = nullptr;
@@ -4781,10 +4789,15 @@
Ewk_Context_Menu* ewk_view_context_menu_get(const Evas_Object* ewkView)
{
+#if ENABLE(CONTEXT_MENUS)
EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData, 0);
EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, 0);
return priv->contextMenu;
+#else
+ UNUSED_PARAM(ewkView);
+ return 0;
+#endif
}
Eina_Bool ewk_view_setting_tiled_backing_store_enabled_set(Evas_Object* ewkView, Eina_Bool enable)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
