Changeset 143200 in webkit
- Timestamp:
- Feb 18, 2013 5:20:38 AM (11 years ago)
- Location:
- trunk/Source/WebKit/efl
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/efl/ChangeLog
r143192 r143200 1 2013-02-18 Michał Pakuła vel Rutka <m.pakula@samsung.com> 2 3 [EFL] Fix build when CONTEXT_MENUS flag is turned off 4 https://bugs.webkit.org/show_bug.cgi?id=109924 5 6 Reviewed by Gyuyoung Kim. 7 8 * WebCoreSupport/ContextMenuClientEfl.cpp: 9 * WebCoreSupport/ContextMenuClientEfl.h: 10 * ewk/ewk_view.cpp: 11 (_Ewk_View_Private_Data): 12 (_ewk_view_priv_new): 13 (_ewk_view_priv_del): 14 (ewk_view_context_menu_get): 15 1 16 2013-02-18 Grzegorz Czajkowski <g.czajkowski@samsung.com> 2 17 -
trunk/Source/WebKit/efl/WebCoreSupport/ContextMenuClientEfl.cpp
r127462 r143200 29 29 #include "config.h" 30 30 #include "ContextMenuClientEfl.h" 31 32 #if ENABLE(CONTEXT_MENUS) 31 33 32 34 #include "ContextMenu.h" … … 86 88 87 89 } 90 91 #endif // ENABLE(CONTEXT_MENUS) -
trunk/Source/WebKit/efl/WebCoreSupport/ContextMenuClientEfl.h
r127462 r143200 30 30 #define ContextMenuClientEfl_h 31 31 32 #if ENABLE(CONTEXT_MENUS) 33 32 34 #include "ContextMenuClient.h" 33 35 … … 53 55 } 54 56 57 #endif // ENABLE(CONTEXT_MENUS) 55 58 #endif -
trunk/Source/WebKit/efl/ewk/ewk_view.cpp
r141749 r143200 380 380 bool isUsingEcoreX; 381 381 #endif 382 #if ENABLE(CONTEXT_MENUS) 382 383 Ewk_Context_Menu* contextMenu; 384 #endif 383 385 }; 384 386 … … 762 764 WebCore::Page::PageClients pageClients; 763 765 pageClients.chromeClient = new WebCore::ChromeClientEfl(smartData->self); 766 #if ENABLE(CONTEXT_MENUS) 764 767 pageClients.contextMenuClient = new WebCore::ContextMenuClientEfl; 768 #endif 765 769 pageClients.editorClient = new WebCore::EditorClientEfl(smartData->self); 766 770 pageClients.dragClient = new WebCore::DragClientEfl; … … 936 940 #endif 937 941 942 #if ENABLE(CONTEXT_MENUS) 938 943 priv->contextMenu = 0; 944 #endif 939 945 940 946 #if USE(ACCELERATED_COMPOSITING) … … 975 981 evas_object_del(priv->cursorObject); 976 982 983 #if ENABLE(CONTEXT_MENUS) 977 984 if (priv->contextMenu) 978 985 ewk_context_menu_free(priv->contextMenu); 986 #endif 979 987 980 988 #if USE(ACCELERATED_COMPOSITING) … … 4782 4790 Ewk_Context_Menu* ewk_view_context_menu_get(const Evas_Object* ewkView) 4783 4791 { 4792 #if ENABLE(CONTEXT_MENUS) 4784 4793 EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData, 0); 4785 4794 EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, 0); 4786 4795 4787 4796 return priv->contextMenu; 4797 #else 4798 UNUSED_PARAM(ewkView); 4799 return 0; 4800 #endif 4788 4801 } 4789 4802
Note: See TracChangeset
for help on using the changeset viewer.