Changeset 63666 in webkit
- Timestamp:
- Jul 19, 2010 9:06:13 AM (14 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r63665 r63666 1 2010-07-19 Rafael Antognolli <antognolli@profusion.mobi> 2 3 Reviewed by Antonio Gomes. 4 5 [EFL] Fix some EFL theme issues 6 https://bugs.webkit.org/show_bug.cgi?id=42569 7 8 Keep a pointer to theme filename and check for it correctly. 9 Reduce the scope of some variables. 10 Don't test for platformWidget() since we are not using it. 11 12 No new tests, no new functionality. 13 14 * platform/efl/WidgetEfl.cpp: 15 (WebCore::Widget::applyCursor): 16 (WebCore::Widget::setCursor): 17 1 18 2010-07-19 Rafael Antognolli <antognolli@profusion.mobi> 2 19 -
trunk/WebCore/platform/efl/WidgetEfl.cpp
r63665 r63666 230 230 void Widget::applyCursor() 231 231 { 232 const char *file = 0; 233 Evas_Coord x, y; 234 235 String theme = edjeThemeRecursive(); 236 if (!theme.isNull()) 237 file = edjeThemeRecursive().utf8().data(); 232 CString file = edjeThemeRecursive().utf8(); 238 233 239 234 m_data->m_cursorObject = edje_object_add(evas()); 240 if ( file && !edje_object_file_set(m_data->m_cursorObject, file, m_data->m_cursorGroup.utf8().data())) {235 if (!file.isNull() && !edje_object_file_set(m_data->m_cursorObject, file.data(), m_data->m_cursorGroup.utf8().data())) { 241 236 evas_object_del(m_data->m_cursorObject); 242 237 m_data->m_cursorObject = 0; … … 244 239 applyFallbackCursor(); 245 240 } else { 246 Evas_Coord w, h;241 Evas_Coord x, y, w, h; 247 242 const char *d; 248 243 … … 267 262 void Widget::setCursor(const Cursor& cursor) 268 263 { 269 if (! platformWidget() || !evas())264 if (!evas()) 270 265 return; 271 266
Note: See TracChangeset
for help on using the changeset viewer.