Changeset 119958 in webkit
- Timestamp:
- Jun 11, 2012 12:41:19 AM (12 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r119957 r119958 1 2012-06-11 Ryuan Choi <ryuan.choi@samsung.com> 2 3 [EFL] Extract CursorMap from WidgetEfl.cpp. 4 https://bugs.webkit.org/show_bug.cgi?id=88633 5 6 Reviewed by Ryosuke Niwa. 7 8 In order to share CursorMap in WebKit/efl and UIProcess of WebKit2/Efl, 9 extract it and expose getEcoreCursor. 10 11 No new tests, refactoring only. 12 13 * platform/efl/EflScreenUtilities.cpp: 14 (WebCore): 15 (CursorMap): 16 (WebCore::CursorMap::cursor): 17 (WebCore::CursorMap::CursorMap): 18 (WebCore::getEcoreCursor): 19 * platform/efl/EflScreenUtilities.h: 20 (WebCore): 21 * platform/efl/WidgetEfl.cpp: 22 (WebCore::Widget::applyFallbackCursor): 23 1 24 2012-06-10 Sheriff Bot <webkit.review.bot@gmail.com> 2 25 -
trunk/Source/WebCore/platform/efl/EflScreenUtilities.cpp
r103891 r119958 22 22 #ifdef HAVE_ECORE_X 23 23 #include <Ecore_X.h> 24 #include <wtf/HashMap.h> 25 #include <wtf/text/StringHash.h> 24 26 #endif 25 27 26 28 namespace WebCore { 29 30 #ifdef HAVE_ECORE_X 31 class CursorMap { 32 private: 33 HashMap<String, unsigned short> m_cursorStringMap; 34 35 public: 36 CursorMap(); 37 int cursor(const String&); 38 }; 39 40 int CursorMap::cursor(const String& cursorGroup) 41 { 42 int ret = m_cursorStringMap.get(cursorGroup); 43 44 if (ret < ECORE_X_CURSOR_X || ret > ECORE_X_CURSOR_XTERM) 45 ret = ECORE_X_CURSOR_LEFT_PTR; 46 47 return ret; 48 } 49 50 CursorMap::CursorMap() 51 { 52 m_cursorStringMap.set("cursor/pointer", ECORE_X_CURSOR_LEFT_PTR); 53 m_cursorStringMap.set("cursor/move", ECORE_X_CURSOR_FLEUR); 54 m_cursorStringMap.set("cursor/cross", ECORE_X_CURSOR_CROSS); 55 m_cursorStringMap.set("cursor/hand", ECORE_X_CURSOR_HAND2); 56 m_cursorStringMap.set("cursor/i_beam", ECORE_X_CURSOR_XTERM); 57 m_cursorStringMap.set("cursor/wait", ECORE_X_CURSOR_WATCH); 58 m_cursorStringMap.set("cursor/help", ECORE_X_CURSOR_QUESTION_ARROW); 59 m_cursorStringMap.set("cursor/east_resize", ECORE_X_CURSOR_RIGHT_SIDE); 60 m_cursorStringMap.set("cursor/north_resize", ECORE_X_CURSOR_TOP_SIDE); 61 m_cursorStringMap.set("cursor/north_east_resize", ECORE_X_CURSOR_TOP_RIGHT_CORNER); 62 m_cursorStringMap.set("cursor/north_west_resize", ECORE_X_CURSOR_TOP_LEFT_CORNER); 63 m_cursorStringMap.set("cursor/south_resize", ECORE_X_CURSOR_BOTTOM_SIDE); 64 m_cursorStringMap.set("cursor/south_east_resize", ECORE_X_CURSOR_BOTTOM_RIGHT_CORNER); 65 m_cursorStringMap.set("cursor/south_west_resize", ECORE_X_CURSOR_BOTTOM_LEFT_CORNER); 66 m_cursorStringMap.set("cursor/west_resize", ECORE_X_CURSOR_LEFT_SIDE); 67 m_cursorStringMap.set("cursor/north_south_resize", ECORE_X_CURSOR_SB_H_DOUBLE_ARROW); 68 m_cursorStringMap.set("cursor/east_west_resize", ECORE_X_CURSOR_SB_V_DOUBLE_ARROW); 69 m_cursorStringMap.set("cursor/north_east_south_west_resize", ECORE_X_CURSOR_SIZING); 70 m_cursorStringMap.set("cursor/north_west_south_east_resize", ECORE_X_CURSOR_SIZING); 71 m_cursorStringMap.set("cursor/column_resize", ECORE_X_CURSOR_SB_V_DOUBLE_ARROW); 72 m_cursorStringMap.set("cursor/row_resize", ECORE_X_CURSOR_SB_H_DOUBLE_ARROW); 73 m_cursorStringMap.set("cursor/middle_panning", ECORE_X_CURSOR_CROSS_REVERSE); 74 m_cursorStringMap.set("cursor/east_panning", ECORE_X_CURSOR_CROSS_REVERSE); 75 m_cursorStringMap.set("cursor/north_panning", ECORE_X_CURSOR_CROSS_REVERSE); 76 m_cursorStringMap.set("cursor/north_east_panning", ECORE_X_CURSOR_CROSS_REVERSE); 77 m_cursorStringMap.set("cursor/north_west_panning", ECORE_X_CURSOR_CROSS_REVERSE); 78 m_cursorStringMap.set("cursor/south_panning", ECORE_X_CURSOR_CROSS_REVERSE); 79 m_cursorStringMap.set("cursor/south_east_panning", ECORE_X_CURSOR_CROSS_REVERSE); 80 m_cursorStringMap.set("cursor/south_west_panning", ECORE_X_CURSOR_CROSS_REVERSE); 81 m_cursorStringMap.set("cursor/west_panning", ECORE_X_CURSOR_CROSS_REVERSE); 82 m_cursorStringMap.set("cursor/vertical_text", ECORE_X_CURSOR_SB_DOWN_ARROW); 83 m_cursorStringMap.set("cursor/cell", ECORE_X_CURSOR_ICON); 84 m_cursorStringMap.set("cursor/context_menu", ECORE_X_CURSOR_HAND2); 85 m_cursorStringMap.set("cursor/no_drop", ECORE_X_CURSOR_DOT_BOX_MASK); 86 m_cursorStringMap.set("cursor/copy", ECORE_X_CURSOR_ICON); 87 m_cursorStringMap.set("cursor/progress", ECORE_X_CURSOR_WATCH); 88 m_cursorStringMap.set("cursor/alias", ECORE_X_CURSOR_MAN); 89 m_cursorStringMap.set("cursor/none", ECORE_X_CURSOR_X); 90 m_cursorStringMap.set("cursor/not_allowed", ECORE_X_CURSOR_X); 91 m_cursorStringMap.set("cursor/zoom_in", ECORE_X_CURSOR_DIAMOND_CROSS); 92 m_cursorStringMap.set("cursor/zoom_out", ECORE_X_CURSOR_DIAMOND_CROSS); 93 m_cursorStringMap.set("cursor/grab", ECORE_X_CURSOR_HAND2); 94 m_cursorStringMap.set("cursor/grabbing", ECORE_X_CURSOR_HAND2); 95 } 96 97 int getEcoreCursor(const String& cursorString) 98 { 99 DEFINE_STATIC_LOCAL(CursorMap, cursorStringMap, ()); 100 101 return cursorStringMap.cursor(cursorString); 102 } 103 #endif 27 104 28 105 int getDPI() -
trunk/Source/WebCore/platform/efl/EflScreenUtilities.h
r103891 r119958 20 20 #define EflScreenUtilities_h 21 21 22 #include <wtf/text/WTFString.h> 23 22 24 namespace WebCore { 25 26 #ifdef HAVE_ECORE_X 27 int getEcoreCursor(const String& cursorString); 28 #endif 23 29 24 30 int getDPI(); -
trunk/Source/WebCore/platform/efl/WidgetEfl.cpp
r95901 r119958 35 35 #include "ChromeClient.h" 36 36 #include "Cursor.h" 37 #include "EflScreenUtilities.h" 37 38 #include "Frame.h" 38 39 #include "FrameView.h" … … 49 50 #ifdef HAVE_ECORE_X 50 51 #include <Ecore_X.h> 51 #include <Ecore_X_Cursor.h> 52 #endif 53 54 #include <wtf/HashMap.h> 55 #include <wtf/text/CString.h> 52 #endif 56 53 57 54 namespace WebCore { 58 59 #ifdef HAVE_ECORE_X60 class CursorMap {61 private:62 HashMap<String, unsigned short> m_cursorStringMap;63 64 public:65 CursorMap();66 unsigned int cursor(String);67 };68 69 unsigned int CursorMap::cursor(String cursorGroup)70 {71 int ret = m_cursorStringMap.get(cursorGroup);72 73 if (ret < ECORE_X_CURSOR_X || ret > ECORE_X_CURSOR_XTERM)74 ret = ECORE_X_CURSOR_LEFT_PTR;75 76 return ret;77 }78 79 CursorMap::CursorMap()80 {81 m_cursorStringMap.set("cursor/pointer", ECORE_X_CURSOR_LEFT_PTR);82 m_cursorStringMap.set("cursor/move", ECORE_X_CURSOR_FLEUR);83 m_cursorStringMap.set("cursor/cross", ECORE_X_CURSOR_CROSS);84 m_cursorStringMap.set("cursor/hand", ECORE_X_CURSOR_HAND2);85 m_cursorStringMap.set("cursor/i_beam", ECORE_X_CURSOR_XTERM);86 m_cursorStringMap.set("cursor/wait", ECORE_X_CURSOR_WATCH);87 m_cursorStringMap.set("cursor/help", ECORE_X_CURSOR_QUESTION_ARROW);88 m_cursorStringMap.set("cursor/east_resize", ECORE_X_CURSOR_RIGHT_SIDE);89 m_cursorStringMap.set("cursor/north_resize", ECORE_X_CURSOR_TOP_SIDE);90 m_cursorStringMap.set("cursor/north_east_resize", ECORE_X_CURSOR_TOP_RIGHT_CORNER);91 m_cursorStringMap.set("cursor/north_west_resize", ECORE_X_CURSOR_TOP_LEFT_CORNER);92 m_cursorStringMap.set("cursor/south_resize", ECORE_X_CURSOR_BOTTOM_SIDE);93 m_cursorStringMap.set("cursor/south_east_resize", ECORE_X_CURSOR_BOTTOM_RIGHT_CORNER);94 m_cursorStringMap.set("cursor/south_west_resize", ECORE_X_CURSOR_BOTTOM_LEFT_CORNER);95 m_cursorStringMap.set("cursor/west_resize", ECORE_X_CURSOR_LEFT_SIDE);96 m_cursorStringMap.set("cursor/north_south_resize", ECORE_X_CURSOR_SB_H_DOUBLE_ARROW);97 m_cursorStringMap.set("cursor/east_west_resize", ECORE_X_CURSOR_SB_V_DOUBLE_ARROW);98 m_cursorStringMap.set("cursor/north_east_south_west_resize", ECORE_X_CURSOR_SIZING);99 m_cursorStringMap.set("cursor/north_west_south_east_resize", ECORE_X_CURSOR_SIZING);100 m_cursorStringMap.set("cursor/column_resize", ECORE_X_CURSOR_SB_V_DOUBLE_ARROW);101 m_cursorStringMap.set("cursor/row_resize", ECORE_X_CURSOR_SB_H_DOUBLE_ARROW);102 m_cursorStringMap.set("cursor/middle_panning", ECORE_X_CURSOR_CROSS_REVERSE);103 m_cursorStringMap.set("cursor/east_panning", ECORE_X_CURSOR_CROSS_REVERSE);104 m_cursorStringMap.set("cursor/north_panning", ECORE_X_CURSOR_CROSS_REVERSE);105 m_cursorStringMap.set("cursor/north_east_panning", ECORE_X_CURSOR_CROSS_REVERSE);106 m_cursorStringMap.set("cursor/north_west_panning", ECORE_X_CURSOR_CROSS_REVERSE);107 m_cursorStringMap.set("cursor/south_panning", ECORE_X_CURSOR_CROSS_REVERSE);108 m_cursorStringMap.set("cursor/south_east_panning", ECORE_X_CURSOR_CROSS_REVERSE);109 m_cursorStringMap.set("cursor/south_west_panning", ECORE_X_CURSOR_CROSS_REVERSE);110 m_cursorStringMap.set("cursor/west_panning", ECORE_X_CURSOR_CROSS_REVERSE);111 m_cursorStringMap.set("cursor/vertical_text", ECORE_X_CURSOR_SB_DOWN_ARROW);112 m_cursorStringMap.set("cursor/cell", ECORE_X_CURSOR_ICON);113 m_cursorStringMap.set("cursor/context_menu", ECORE_X_CURSOR_HAND2);114 m_cursorStringMap.set("cursor/no_drop", ECORE_X_CURSOR_DOT_BOX_MASK);115 m_cursorStringMap.set("cursor/copy", ECORE_X_CURSOR_ICON);116 m_cursorStringMap.set("cursor/progress", ECORE_X_CURSOR_WATCH);117 m_cursorStringMap.set("cursor/alias", ECORE_X_CURSOR_MAN);118 m_cursorStringMap.set("cursor/none", ECORE_X_CURSOR_X);119 m_cursorStringMap.set("cursor/not_allowed", ECORE_X_CURSOR_X);120 m_cursorStringMap.set("cursor/zoom_in", ECORE_X_CURSOR_DIAMOND_CROSS);121 m_cursorStringMap.set("cursor/zoom_out", ECORE_X_CURSOR_DIAMOND_CROSS);122 m_cursorStringMap.set("cursor/grab", ECORE_X_CURSOR_HAND2);123 m_cursorStringMap.set("cursor/grabbing", ECORE_X_CURSOR_HAND2);124 }125 126 static CursorMap cursorStringMap = CursorMap();127 #endif128 55 129 56 class WidgetPrivate { … … 210 137 #ifdef HAVE_ECORE_X 211 138 if (m_data->m_isUsingEcoreX && !m_data->m_cursorGroup.isNull()) { 212 int shape = cursorStringMap.cursor(m_data->m_cursorGroup.utf8().data());139 int shape = getEcoreCursor(m_data->m_cursorGroup); 213 140 214 141 if (shape < ECORE_X_CURSOR_X || shape > ECORE_X_CURSOR_XTERM) {
Note: See TracChangeset
for help on using the changeset viewer.