Changeset 63666 in webkit


Ignore:
Timestamp:
Jul 19, 2010 9:06:13 AM (14 years ago)
Author:
commit-queue@webkit.org
Message:

2010-07-19 Rafael Antognolli <antognolli@profusion.mobi>

Reviewed by Antonio Gomes.

[EFL] Fix some EFL theme issues
https://bugs.webkit.org/show_bug.cgi?id=42569

Keep a pointer to theme filename and check for it correctly.
Reduce the scope of some variables.
Don't test for platformWidget() since we are not using it.

No new tests, no new functionality.

  • platform/efl/WidgetEfl.cpp: (WebCore::Widget::applyCursor): (WebCore::Widget::setCursor):
Location:
trunk/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r63665 r63666  
     12010-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
    1182010-07-19  Rafael Antognolli  <antognolli@profusion.mobi>
    219
  • trunk/WebCore/platform/efl/WidgetEfl.cpp

    r63665 r63666  
    230230void Widget::applyCursor()
    231231{
    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();
    238233
    239234    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())) {
    241236        evas_object_del(m_data->m_cursorObject);
    242237        m_data->m_cursorObject = 0;
     
    244239        applyFallbackCursor();
    245240    } else {
    246         Evas_Coord w, h;
     241        Evas_Coord x, y, w, h;
    247242        const char *d;
    248243
     
    267262void Widget::setCursor(const Cursor& cursor)
    268263{
    269     if (!platformWidget() || !evas())
     264    if (!evas())
    270265         return;
    271266
Note: See TracChangeset for help on using the changeset viewer.