Changeset 143200 in webkit

Timestamp:

Feb 18, 2013 5:20:38 AM (11 years ago)

Author:

commit-queue@webkit.org

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 <Michał Pakuła vel Rutka> 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):

Location:

trunk/Source/WebKit/efl

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/ContextMenuClientEfl.cpp (modified) (2 diffs)
• WebCoreSupport/ContextMenuClientEfl.h (modified) (2 diffs)
• ewk/ewk_view.cpp (modified) (5 diffs)

trunk/Source/WebKit/efl/ChangeLog

@@ +1 @@
+2013-02-18  Michał Pakuła vel Rutka  <m.pakula@samsung.com>
+
+        [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  <g.czajkowski@samsung.com>
 

trunk/Source/WebKit/efl/WebCoreSupport/ContextMenuClientEfl.cpp

@@ -29 +29 @@
 #include "config.h"
 #include "ContextMenuClientEfl.h"
+
+#if ENABLE(CONTEXT_MENUS)
 
 #include "ContextMenu.h"
@@ -86 +88 @@
 
 }
+
+#endif // ENABLE(CONTEXT_MENUS)

trunk/Source/WebKit/efl/WebCoreSupport/ContextMenuClientEfl.h

@@ -30 +30 @@
 #define ContextMenuClientEfl_h
 
+#if ENABLE(CONTEXT_MENUS)
+
 #include "ContextMenuClient.h"
 
@@ -53 +55 @@
 }
 
+#endif // ENABLE(CONTEXT_MENUS)
 #endif

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

@@ -380 +380 @@
     bool isUsingEcoreX;
 #endif
+#if ENABLE(CONTEXT_MENUS)
     Ewk_Context_Menu* contextMenu;
+#endif
 };
 
@@ -762 +764 @@
     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;
@@ -936 +940 @@
 #endif
 
+#if ENABLE(CONTEXT_MENUS)
     priv->contextMenu = 0;
+#endif
 
 #if USE(ACCELERATED_COMPOSITING)
@@ -975 +981 @@
         evas_object_del(priv->cursorObject);
 
+#if ENABLE(CONTEXT_MENUS)
     if (priv->contextMenu)
         ewk_context_menu_free(priv->contextMenu);
+#endif
 
 #if USE(ACCELERATED_COMPOSITING)
@@ -4782 +4790 @@
 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
 }