Changeset 80324 in webkit


Ignore:
Timestamp:
Mar 3, 2011 9:50:44 PM (13 years ago)
Author:
gyuyoung.kim@samsung.com
Message:

2011-03-03 Gyuyoung Kim <​gyuyoung.kim@samsung.com>

Reviewed by Eric Seidel.

[EFL] Adjust functions of RenderThemeEfl.cpp to WebKit parameter style
​https://bugs.webkit.org/show_bug.cgi?id=54392

Functions of RenderThemeEfl.cpp adhere efl coding style instead of WebKit coding style.
WebCore's functions should adhere WebKit coding style.

  • platform/efl/RenderThemeEfl.cpp: (WebCore::RenderThemeEfl::themePartCacheEntryReset): (WebCore::RenderThemeEfl::themePartCacheEntrySurfaceCreate): (WebCore::RenderThemeEfl::cacheThemePartNew): (WebCore::RenderThemeEfl::cacheThemePartReset): (WebCore::RenderThemeEfl::cacheThemePartResizeAndReset): (WebCore::RenderThemeEfl::cacheThemePartGet): (WebCore::RenderThemeEfl::cacheThemePartFlush): (WebCore::RenderThemeEfl::applyEdjeStateFromForm): (WebCore::RenderThemeEfl::paintThemePart): (WebCore::renderThemeEflColorClassSelectionActive): (WebCore::renderThemeEflColorClassSelectionInactive): (WebCore::renderThemeEflColorClassFocusRing): (WebCore::renderThemeEflColorClassButtonText): (WebCore::renderThemeEflColorClassComboText): (WebCore::renderThemeEflColorClassEntryText): (WebCore::renderThemeEflColorClassSearchText): (WebCore::RenderThemeEfl::applyPartDescription): (WebCore::RenderThemeEfl::applyPartDescriptions): (WebCore::RenderThemeEfl::controlSupportsTints): (WebCore::RenderThemeEfl::baselinePosition): (WebCore::RenderThemeEfl::paintSliderTrack): (WebCore::RenderThemeEfl::adjustSliderTrackStyle): (WebCore::RenderThemeEfl::adjustSliderThumbStyle): (WebCore::RenderThemeEfl::paintSliderThumb): (WebCore::RenderThemeEfl::adjustCheckboxStyle): (WebCore::RenderThemeEfl::paintCheckbox): (WebCore::RenderThemeEfl::adjustRadioStyle): (WebCore::RenderThemeEfl::paintRadio): (WebCore::RenderThemeEfl::adjustButtonStyle): (WebCore::RenderThemeEfl::paintButton): (WebCore::RenderThemeEfl::adjustMenuListStyle): (WebCore::RenderThemeEfl::paintMenuList): (WebCore::RenderThemeEfl::adjustTextFieldStyle): (WebCore::RenderThemeEfl::paintTextField): (WebCore::RenderThemeEfl::adjustTextAreaStyle): (WebCore::RenderThemeEfl::paintTextArea): (WebCore::RenderThemeEfl::adjustSearchFieldDecorationStyle): (WebCore::RenderThemeEfl::paintSearchFieldDecoration): (WebCore::RenderThemeEfl::adjustSearchFieldResultsButtonStyle): (WebCore::RenderThemeEfl::paintSearchFieldResultsButton): (WebCore::RenderThemeEfl::adjustSearchFieldResultsDecorationStyle): (WebCore::RenderThemeEfl::paintSearchFieldResultsDecoration): (WebCore::RenderThemeEfl::adjustSearchFieldCancelButtonStyle): (WebCore::RenderThemeEfl::paintSearchFieldCancelButton): (WebCore::RenderThemeEfl::adjustSearchFieldStyle): (WebCore::RenderThemeEfl::paintSearchField): (WebCore::RenderThemeEfl::adjustProgressBarStyle): (WebCore::RenderThemeEfl::paintProgressBar): (WebCore::RenderThemeEfl::paintMediaFullscreenButton): (WebCore::RenderThemeEfl::paintMediaMuteButton): (WebCore::RenderThemeEfl::paintMediaPlayButton): (WebCore::RenderThemeEfl::paintMediaSeekBackButton): (WebCore::RenderThemeEfl::paintMediaSeekForwardButton): (WebCore::RenderThemeEfl::paintMediaSliderTrack): (WebCore::RenderThemeEfl::paintMediaSliderThumb): (WebCore::RenderThemeEfl::paintMediaVolumeSliderContainer): (WebCore::RenderThemeEfl::paintMediaVolumeSliderTrack): (WebCore::RenderThemeEfl::paintMediaVolumeSliderThumb): (WebCore::RenderThemeEfl::paintMediaCurrentTime):
Location:
trunk/Source/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r80320 r80324  
     12011-03-03  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
     2
     3        Reviewed by Eric Seidel.
     4
     5        [EFL] Adjust functions of RenderThemeEfl.cpp to WebKit parameter style
     6        https://bugs.webkit.org/show_bug.cgi?id=54392
     7
     8        Functions of RenderThemeEfl.cpp adhere efl coding style instead of WebKit coding style.
     9        WebCore's functions should adhere WebKit coding style.
     10
     11        * platform/efl/RenderThemeEfl.cpp:
     12        (WebCore::RenderThemeEfl::themePartCacheEntryReset):
     13        (WebCore::RenderThemeEfl::themePartCacheEntrySurfaceCreate):
     14        (WebCore::RenderThemeEfl::cacheThemePartNew):
     15        (WebCore::RenderThemeEfl::cacheThemePartReset):
     16        (WebCore::RenderThemeEfl::cacheThemePartResizeAndReset):
     17        (WebCore::RenderThemeEfl::cacheThemePartGet):
     18        (WebCore::RenderThemeEfl::cacheThemePartFlush):
     19        (WebCore::RenderThemeEfl::applyEdjeStateFromForm):
     20        (WebCore::RenderThemeEfl::paintThemePart):
     21        (WebCore::renderThemeEflColorClassSelectionActive):
     22        (WebCore::renderThemeEflColorClassSelectionInactive):
     23        (WebCore::renderThemeEflColorClassFocusRing):
     24        (WebCore::renderThemeEflColorClassButtonText):
     25        (WebCore::renderThemeEflColorClassComboText):
     26        (WebCore::renderThemeEflColorClassEntryText):
     27        (WebCore::renderThemeEflColorClassSearchText):
     28        (WebCore::RenderThemeEfl::applyPartDescription):
     29        (WebCore::RenderThemeEfl::applyPartDescriptions):
     30        (WebCore::RenderThemeEfl::controlSupportsTints):
     31        (WebCore::RenderThemeEfl::baselinePosition):
     32        (WebCore::RenderThemeEfl::paintSliderTrack):
     33        (WebCore::RenderThemeEfl::adjustSliderTrackStyle):
     34        (WebCore::RenderThemeEfl::adjustSliderThumbStyle):
     35        (WebCore::RenderThemeEfl::paintSliderThumb):
     36        (WebCore::RenderThemeEfl::adjustCheckboxStyle):
     37        (WebCore::RenderThemeEfl::paintCheckbox):
     38        (WebCore::RenderThemeEfl::adjustRadioStyle):
     39        (WebCore::RenderThemeEfl::paintRadio):
     40        (WebCore::RenderThemeEfl::adjustButtonStyle):
     41        (WebCore::RenderThemeEfl::paintButton):
     42        (WebCore::RenderThemeEfl::adjustMenuListStyle):
     43        (WebCore::RenderThemeEfl::paintMenuList):
     44        (WebCore::RenderThemeEfl::adjustTextFieldStyle):
     45        (WebCore::RenderThemeEfl::paintTextField):
     46        (WebCore::RenderThemeEfl::adjustTextAreaStyle):
     47        (WebCore::RenderThemeEfl::paintTextArea):
     48        (WebCore::RenderThemeEfl::adjustSearchFieldDecorationStyle):
     49        (WebCore::RenderThemeEfl::paintSearchFieldDecoration):
     50        (WebCore::RenderThemeEfl::adjustSearchFieldResultsButtonStyle):
     51        (WebCore::RenderThemeEfl::paintSearchFieldResultsButton):
     52        (WebCore::RenderThemeEfl::adjustSearchFieldResultsDecorationStyle):
     53        (WebCore::RenderThemeEfl::paintSearchFieldResultsDecoration):
     54        (WebCore::RenderThemeEfl::adjustSearchFieldCancelButtonStyle):
     55        (WebCore::RenderThemeEfl::paintSearchFieldCancelButton):
     56        (WebCore::RenderThemeEfl::adjustSearchFieldStyle):
     57        (WebCore::RenderThemeEfl::paintSearchField):
     58        (WebCore::RenderThemeEfl::adjustProgressBarStyle):
     59        (WebCore::RenderThemeEfl::paintProgressBar):
     60        (WebCore::RenderThemeEfl::paintMediaFullscreenButton):
     61        (WebCore::RenderThemeEfl::paintMediaMuteButton):
     62        (WebCore::RenderThemeEfl::paintMediaPlayButton):
     63        (WebCore::RenderThemeEfl::paintMediaSeekBackButton):
     64        (WebCore::RenderThemeEfl::paintMediaSeekForwardButton):
     65        (WebCore::RenderThemeEfl::paintMediaSliderTrack):
     66        (WebCore::RenderThemeEfl::paintMediaSliderThumb):
     67        (WebCore::RenderThemeEfl::paintMediaVolumeSliderContainer):
     68        (WebCore::RenderThemeEfl::paintMediaVolumeSliderTrack):
     69        (WebCore::RenderThemeEfl::paintMediaVolumeSliderThumb):
     70        (WebCore::RenderThemeEfl::paintMediaCurrentTime):
     71
    1722011-03-03  Andy Estes  <aestes@apple.com>
    273

  • trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp

    r78041 r80324  
    55 * Copyright (C) 2008 INdT - Instituto Nokia de Tecnologia
    66 * Copyright (C) 2009-2010 ProFUSION embedded systems
    7  * Copyright (C) 2009-2010 Samsung Electronics
     7 * Copyright (C) 2009-2011 Samsung Electronics
    88 *
    99 * This library is free software; you can redistribute it and/or
    … …  
    6969}
    7070
    71 bool RenderThemeEfl::themePartCacheEntryReset(struct ThemePartCacheEntry* ce, FormType type)
     71bool RenderThemeEfl::themePartCacheEntryReset(struct ThemePartCacheEntry* entry, FormType type)
    7272{
    7373    const char *file, *group;
    7474
    75     ASSERT(ce);
     75    ASSERT(entry);
    7676
    7777    edje_object_file_get(m_edje, &file, 0);
    … …  
    8080    ASSERT(group);
    8181
    82     if (!edje_object_file_set(ce->o, file, group)) {
    83         Edje_Load_Error err = edje_object_load_error_get(ce->o);
     82    if (!edje_object_file_set(entry->o, file, group)) {
     83        Edje_Load_Error err = edje_object_load_error_get(entry->o);
    8484        const char *errmsg = edje_load_error_str(err);
    8585        EINA_LOG_ERR("Could not load '%s' from theme %s: %s",
    … …  
    9090}
    9191
    92 bool RenderThemeEfl::themePartCacheEntrySurfaceCreate(struct ThemePartCacheEntry* ce)
     92bool RenderThemeEfl::themePartCacheEntrySurfaceCreate(struct ThemePartCacheEntry* entry)
    9393{
    9494    int w, h;
    … …  
    9696
    9797    ASSERT(ce);
    98     ASSERT(ce->ee);
    99 
    100     ecore_evas_geometry_get(ce->ee, 0, 0, &w, &h);
     98    ASSERT(entry->ee);
     99
     100    ecore_evas_geometry_get(entry->ee, 0, 0, &w, &h);
    101101    ASSERT(w > 0);
    102102    ASSERT(h > 0);
    103103
    104     ce->surface = cairo_image_surface_create_for_data((unsigned char *)ecore_evas_buffer_pixels_get(ce->ee),
     104    entry->surface = cairo_image_surface_create_for_data((unsigned char *)ecore_evas_buffer_pixels_get(entry->ee),
    105105                                                      CAIRO_FORMAT_ARGB32, w, h, w * 4);
    106     status = cairo_surface_status(ce->surface);
     106    status = cairo_surface_status(entry->surface);
    107107    if (status != CAIRO_STATUS_SUCCESS) {
    108108        EINA_LOG_ERR("Could not create cairo surface: %s",
    … …  
    117117struct RenderThemeEfl::ThemePartCacheEntry* RenderThemeEfl::cacheThemePartNew(FormType type, const IntSize& size)
    118118{
    119     struct ThemePartCacheEntry *ce = new struct ThemePartCacheEntry;
    120 
    121     if (!ce) {
     119    struct ThemePartCacheEntry *entry = new struct ThemePartCacheEntry;
     120
     121    if (!entry) {
    122122        EINA_LOG_ERR("could not allocate ThemePartCacheEntry.");
    123123        return 0;
    124124    }
    125125
    126     ce->ee = ecore_evas_buffer_new(size.width(), size.height());
    127     if (!ce->ee) {
     126    entry->ee = ecore_evas_buffer_new(size.width(), size.height());
     127    if (!entry->ee) {
    128128        EINA_LOG_ERR("ecore_evas_buffer_new(%d, %d) failed.",
    129129                     size.width(), size.height());
    130         delete ce;
     130        delete entry;
    131131        return 0;
    132132    }
    133133
    134     ce->o = edje_object_add(ecore_evas_get(ce->ee));
    135     ASSERT(ce->o);
    136     if (!themePartCacheEntryReset(ce, type)) {
    137         evas_object_del(ce->o);
    138         ecore_evas_free(ce->ee);
    139         delete ce;
     134    entry->o = edje_object_add(ecore_evas_get(entry->ee));
     135    ASSERT(entry->o);
     136    if (!themePartCacheEntryReset(entry, type)) {
     137        evas_object_del(entry->o);
     138        ecore_evas_free(entry->ee);
     139        delete entry;
    140140        return 0;
    141141    }
    142142
    143     if (!themePartCacheEntrySurfaceCreate(ce)) {
    144         evas_object_del(ce->o);
    145         ecore_evas_free(ce->ee);
    146         delete ce;
     143    if (!themePartCacheEntrySurfaceCreate(entry)) {
     144        evas_object_del(entry->o);
     145        ecore_evas_free(entry->ee);
     146        delete entry;
    147147        return 0;
    148148    }
    149149
    150     evas_object_resize(ce->o, size.width(), size.height());
    151     evas_object_show(ce->o);
    152 
    153     ce->type = type;
    154     ce->size = size;
    155 
    156     m_partCache.prepend(ce);
    157     return ce;
     150    evas_object_resize(entry->o, size.width(), size.height());
     151    evas_object_show(entry->o);
     152
     153    entry->type = type;
     154    entry->size = size;
     155
     156    m_partCache.prepend(entry);
     157    return entry;
    158158}
    159159
    160160// just change the edje group and return the same entry
    161 struct RenderThemeEfl::ThemePartCacheEntry* RenderThemeEfl::cacheThemePartReset(FormType type, struct RenderThemeEfl::ThemePartCacheEntry* ce)
    162 {
    163     if (!themePartCacheEntryReset(ce, type)) {
    164         ce->type = FormTypeLast; // invalidate
    165         m_partCache.append(ce);
     161struct RenderThemeEfl::ThemePartCacheEntry* RenderThemeEfl::cacheThemePartReset(FormType type, struct RenderThemeEfl::ThemePartCacheEntry* entry)
     162{
     163    if (!themePartCacheEntryReset(entry, type)) {
     164        entry->type = FormTypeLast; // invalidate
     165        m_partCache.append(entry);
    166166        return 0;
    167167    }
    168     ce->type = type;
    169     m_partCache.prepend(ce);
    170     return ce;
     168    entry->type = type;
     169    m_partCache.prepend(entry);
     170    return entry;
    171171}
    172172
    173173// resize entry and reset it
    174 struct RenderThemeEfl::ThemePartCacheEntry* RenderThemeEfl::cacheThemePartResizeAndReset(FormType type, const IntSize& size, struct RenderThemeEfl::ThemePartCacheEntry* ce)
    175 {
    176     cairo_surface_finish(ce->surface);
    177     ecore_evas_resize(ce->ee, size.width(), size.height());
    178     evas_object_resize(ce->o, size.width(), size.height());
    179 
    180     if (!themePartCacheEntrySurfaceCreate(ce)) {
    181         evas_object_del(ce->o);
    182         ecore_evas_free(ce->ee);
    183         delete ce;
     174struct RenderThemeEfl::ThemePartCacheEntry* RenderThemeEfl::cacheThemePartResizeAndReset(FormType type, const IntSize& size, struct RenderThemeEfl::ThemePartCacheEntry* entry)
     175{
     176    cairo_surface_finish(entry->surface);
     177    ecore_evas_resize(entry->ee, size.width(), size.height());
     178    evas_object_resize(entry->o, size.width(), size.height());
     179
     180    if (!themePartCacheEntrySurfaceCreate(entry)) {
     181        evas_object_del(entry->o);
     182        ecore_evas_free(entry->ee);
     183        delete entry;
    184184        return 0;
    185185    }
    186186
    187     return cacheThemePartReset(type, ce);
     187    return cacheThemePartReset(type, entry);
    188188}
    189189
    … …  
    198198    end = m_partCache.end();
    199199    for (i = 0; itr != end; i++, itr++) {
    200         struct ThemePartCacheEntry *ce = *itr;
    201         if (ce->size == size) {
    202             if (ce->type == type)
    203                 return ce;
    204             ce_last_size = ce;
     200        struct ThemePartCacheEntry *entry = *itr;
     201        if (entry->size == size) {
     202            if (entry->type == type)
     203                return entry;
     204            ce_last_size = entry;
    205205            idxLastSize = i;
    206206        }
    … …  
    215215    }
    216216
    217     ThemePartCacheEntry* ce = m_partCache.last();
     217    ThemePartCacheEntry* entry = m_partCache.last();
    218218    m_partCache.removeLast();
    219     return cacheThemePartResizeAndReset(type, size, ce);
     219    return cacheThemePartResizeAndReset(type, size, entry);
    220220}
    221221
    … …  
    227227    end = m_partCache.end();
    228228    for (; itr != end; itr++) {
    229         struct ThemePartCacheEntry *ce = *itr;
    230         cairo_surface_finish(ce->surface);
    231         evas_object_del(ce->o);
    232         ecore_evas_free(ce->ee);
    233         delete ce;
     229        struct ThemePartCacheEntry *entry = *itr;
     230        cairo_surface_finish(entry->surface);
     231        evas_object_del(entry->o);
     232        ecore_evas_free(entry->ee);
     233        delete entry;
    234234    }
    235235    m_partCache.clear();
    236236}
    237237
    238 void RenderThemeEfl::applyEdjeStateFromForm(Evas_Object* o, ControlStates states)
     238void RenderThemeEfl::applyEdjeStateFromForm(Evas_Object* object, ControlStates states)
    239239{
    240240    const char *signals[] = { // keep in sync with WebCore/platform/ThemeTypes.h
    … …  
    250250    };
    251251
    252     edje_object_signal_emit(o, "reset", "");
     252    edje_object_signal_emit(object, "reset", "");
    253253
    254254    for (size_t i = 0; i < WTF_ARRAY_LENGTH(signals); ++i) {
    255255        if (states & (1 << i))
    256             edje_object_signal_emit(o, signals[i], "");
    257     }
    258 }
    259 
    260 bool RenderThemeEfl::paintThemePart(RenderObject* o, FormType type, const PaintInfo& i, const IntRect& rect)
    261 {
    262     ThemePartCacheEntry* ce;
     256            edje_object_signal_emit(object, signals[i], "");
     257    }
     258}
     259
     260bool RenderThemeEfl::paintThemePart(RenderObject* object, FormType type, const PaintInfo& info, const IntRect& rect)
     261{
     262    ThemePartCacheEntry* entry;
    263263    Eina_List* updates;
    264264    cairo_t* cairo;
    … …  
    267267    ASSERT(m_edje);
    268268
    269     ce = cacheThemePartGet(type, rect.size());
    270     ASSERT(ce);
    271     if (!ce)
     269    entry = cacheThemePartGet(type, rect.size());
     270    ASSERT(entry);
     271    if (!entry)
    272272        return false;
    273273
    274     applyEdjeStateFromForm(ce->o, controlStatesForRenderer(o));
    275 
    276     cairo = i.context->platformContext();
     274    applyEdjeStateFromForm(entry->o, controlStatesForRenderer(object));
     275
     276    cairo = info.context->platformContext();
    277277    ASSERT(cairo);
    278278
    … …  
    280280    // treatment, move them to special functions.
    281281    if (type == SliderVertical || type == SliderHorizontal) {
    282         RenderSlider* renderSlider = toRenderSlider(o);
     282        RenderSlider* renderSlider = toRenderSlider(object);
    283283        Edje_Message_Float_Set* msg;
    284284        int max, value;
    … …  
    297297        msg->val[0] = static_cast<float>(value) / static_cast<float>(max);
    298298        msg->val[1] = 0.1;
    299         edje_object_message_send(ce->o, EDJE_MESSAGE_FLOAT_SET, 0, msg);
     299        edje_object_message_send(entry->o, EDJE_MESSAGE_FLOAT_SET, 0, msg);
    300300#if ENABLE(PROGRESS_TAG)
    301301    } else if (type == ProgressBar) {
    … …  
    315315            msg->val[0] = 0;
    316316        msg->val[1] = value;
    317         edje_object_message_send(ce->o, EDJE_MESSAGE_FLOAT_SET, 0, msg);
     317        edje_object_message_send(entry->o, EDJE_MESSAGE_FLOAT_SET, 0, msg);
    318318#endif
    319319    }
    320320
    321     edje_object_calc_force(ce->o);
    322     edje_object_message_signal_process(ce->o);
    323     updates = evas_render_updates(ecore_evas_get(ce->ee));
     321    edje_object_calc_force(entry->o);
     322    edje_object_message_signal_process(entry->o);
     323    updates = evas_render_updates(ecore_evas_get(entry->ee));
    324324    evas_render_updates_free(updates);
    325325
    326326    cairo_save(cairo);
    327     cairo_set_source_surface(cairo, ce->surface, rect.x(), rect.y());
     327    cairo_set_source_surface(cairo, entry->surface, rect.x(), rect.y());
    328328    cairo_paint_with_alpha(cairo, 1.0);
    329329    cairo_restore(cairo);
    … …  
    346346}
    347347
    348 static void renderThemeEflColorClassSelectionActive(void* data, Evas_Object* o, const char* signal, const char* source)
     348static void renderThemeEflColorClassSelectionActive(void* data, Evas_Object* object, const char* signal, const char* source)
    349349{
    350350    RenderThemeEfl* that = static_cast<RenderThemeEfl *>(data);
    351351    int fr, fg, fb, fa, br, bg, bb, ba;
    352352
    353     if (!edje_object_color_class_get(o, source, &fr, &fg, &fb, &fa, &br, &bg, &bb, &ba, 0, 0, 0, 0))
     353    if (!edje_object_color_class_get(object, source, &fr, &fg, &fb, &fa, &br, &bg, &bb, &ba, 0, 0, 0, 0))
    354354        return;
    355355
    … …  
    357357}
    358358
    359 static void renderThemeEflColorClassSelectionInactive(void* data, Evas_Object* o, const char* signal, const char* source)
     359static void renderThemeEflColorClassSelectionInactive(void* data, Evas_Object* object, const char* signal, const char* source)
    360360{
    361361    RenderThemeEfl* that = static_cast<RenderThemeEfl *>(data);
    362362    int fr, fg, fb, fa, br, bg, bb, ba;
    363363
    364     if (!edje_object_color_class_get(o, source, &fr, &fg, &fb, &fa, &br, &bg, &bb, &ba, 0, 0, 0, 0))
     364    if (!edje_object_color_class_get(object, source, &fr, &fg, &fb, &fa, &br, &bg, &bb, &ba, 0, 0, 0, 0))
    365365        return;
    366366
    … …  
    368368}
    369369
    370 static void renderThemeEflColorClassFocusRing(void* data, Evas_Object* o, const char* signal, const char* source)
     370static void renderThemeEflColorClassFocusRing(void* data, Evas_Object* object, const char* signal, const char* source)
    371371{
    372372    RenderThemeEfl* that = static_cast<RenderThemeEfl *>(data);
    373373    int fr, fg, fb, fa;
    374374
    375     if (!edje_object_color_class_get(o, source, &fr, &fg, &fb, &fa, 0, 0, 0, 0, 0, 0, 0, 0))
     375    if (!edje_object_color_class_get(object, source, &fr, &fg, &fb, &fa, 0, 0, 0, 0, 0, 0, 0, 0))
    376376        return;
    377377
    … …  
    379379}
    380380
    381 static void renderThemeEflColorClassButtonText(void* data, Evas_Object* o, const char* signal, const char* source)
     381static void renderThemeEflColorClassButtonText(void* data, Evas_Object* object, const char* signal, const char* source)
    382382{
    383383    RenderThemeEfl* that = static_cast<RenderThemeEfl *>(data);
    384384    int fr, fg, fb, fa, br, bg, bb, ba;
    385385
    386     if (!edje_object_color_class_get(o, source, &fr, &fg, &fb, &fa, &br, &bg, &bb, &ba, 0, 0, 0, 0))
     386    if (!edje_object_color_class_get(object, source, &fr, &fg, &fb, &fa, &br, &bg, &bb, &ba, 0, 0, 0, 0))
    387387        return;
    388388
    … …  
    390390}
    391391
    392 static void renderThemeEflColorClassComboText(void* data, Evas_Object* o, const char* signal, const char* source)
     392static void renderThemeEflColorClassComboText(void* data, Evas_Object* object, const char* signal, const char* source)
    393393{
    394394    RenderThemeEfl* that = static_cast<RenderThemeEfl *>(data);
    395395    int fr, fg, fb, fa, br, bg, bb, ba;
    396396
    397     if (!edje_object_color_class_get(o, source, &fr, &fg, &fb, &fa, &br, &bg, &bb, &ba, 0, 0, 0, 0))
     397    if (!edje_object_color_class_get(object, source, &fr, &fg, &fb, &fa, &br, &bg, &bb, &ba, 0, 0, 0, 0))
    398398        return;
    399399
    … …  
    401401}
    402402
    403 static void renderThemeEflColorClassEntryText(void* data, Evas_Object* o, const char* signal, const char* source)
     403static void renderThemeEflColorClassEntryText(void* data, Evas_Object* object, const char* signal, const char* source)
    404404{
    405405    RenderThemeEfl* that = static_cast<RenderThemeEfl *>(data);
    406406    int fr, fg, fb, fa, br, bg, bb, ba;
    407407
    408     if (!edje_object_color_class_get(o, source, &fr, &fg, &fb, &fa, &br, &bg, &bb, &ba, 0, 0, 0, 0))
     408    if (!edje_object_color_class_get(object, source, &fr, &fg, &fb, &fa, &br, &bg, &bb, &ba, 0, 0, 0, 0))
    409409        return;
    410410
    … …  
    412412}
    413413
    414 static void renderThemeEflColorClassSearchText(void* data, Evas_Object* o, const char* signal, const char* source)
     414static void renderThemeEflColorClassSearchText(void* data, Evas_Object* object, const char* signal, const char* source)
    415415{
    416416    RenderThemeEfl* that = static_cast<RenderThemeEfl *>(data);
    417417    int fr, fg, fb, fa, br, bg, bb, ba;
    418     if (!edje_object_color_class_get(o, source, &fr, &fg, &fb, &fa, &br, &bg, &bb, &ba, 0, 0, 0, 0))
     418    if (!edje_object_color_class_get(object, source, &fr, &fg, &fb, &fa, &br, &bg, &bb, &ba, 0, 0, 0, 0))
    419419        return;
    420420
    … …  
    523523}
    524524
    525 void RenderThemeEfl::applyPartDescription(Evas_Object* o, struct ThemePartDesc* desc)
     525void RenderThemeEfl::applyPartDescription(Evas_Object* object, struct ThemePartDesc* desc)
    526526{
    527527    Evas_Coord minw, minh, maxw, maxh;
    528528
    529     edje_object_size_min_get(o, &minw, &minh);
     529    edje_object_size_min_get(object, &minw, &minh);
    530530    if (!minw && !minh)
    531         edje_object_size_min_calc(o, &minw, &minh);
     531        edje_object_size_min_calc(object, &minw, &minh);
    532532
    533533    desc->min.setWidth(Length(minw, Fixed));
    534534    desc->min.setHeight(Length(minh, Fixed));
    535535
    536     edje_object_size_max_get(o, &maxw, &maxh);
     536    edje_object_size_max_get(object, &maxw, &maxh);
    537537    desc->max.setWidth(Length(maxw, Fixed));
    538538    desc->max.setHeight(Length(maxh, Fixed));
    539539
    540     if (!edje_object_part_exists(o, "text_confinement"))
     540    if (!edje_object_part_exists(object, "text_confinement"))
    541541        desc->padding = LengthBox(0, 0, 0, 0);
    542542    else {
    … …  
    558558            oh = maxh;
    559559
    560         evas_object_move(o, ox, oy);
    561         evas_object_resize(o, ow, oh);
    562         edje_object_calc_force(o);
    563         edje_object_message_signal_process(o);
    564         edje_object_part_geometry_get(o, "text_confinement", &px, &py, &pw, &ph);
     560        evas_object_move(object, ox, oy);
     561        evas_object_resize(object, ow, oh);
     562        edje_object_calc_force(object);
     563        edje_object_message_signal_process(object);
     564        edje_object_part_geometry_get(object, "text_confinement", &px, &py, &pw, &ph);
    565565
    566566        t = py - oy;
    … …  
    603603void RenderThemeEfl::applyPartDescriptions()
    604604{
    605     Evas_Object* o;
     605    Evas_Object* object;
    606606    unsigned int i;
    607607    const char* file;
    … …  
    613613    ASSERT(file);
    614614
    615     o = edje_object_add(ecore_evas_get(m_canvas));
    616     if (!o) {
     615    object = edje_object_add(ecore_evas_get(m_canvas));
     616    if (!object) {
    617617        EINA_LOG_ERR("Could not create Edje object.");
    618618        return;
    … …  
    623623        const char* group = edjeGroupFromFormType(type);
    624624        m_partDescs[i].type = type;
    625         if (!edje_object_file_set(o, file, group)) {
    626             Edje_Load_Error err = edje_object_load_error_get(o);
     625        if (!edje_object_file_set(object, file, group)) {
     626            Edje_Load_Error err = edje_object_load_error_get(object);
    627627            const char* errmsg = edje_load_error_str(err);
    628628            EINA_LOG_ERR("Could not set theme group '%s' of file '%s': %s",
    … …  
    631631            applyPartDescriptionFallback(m_partDescs + i);
    632632        } else
    633             applyPartDescription(o, m_partDescs + i);
    634     }
    635     evas_object_del(o);
     633            applyPartDescription(object, m_partDescs + i);
     634    }
     635    evas_object_del(object);
    636636}
    637637
    … …  
    768768}
    769769
    770 bool RenderThemeEfl::controlSupportsTints(const RenderObject* o) const
    771 {
    772     return isEnabled(o);
    773 }
    774 
    775 int RenderThemeEfl::baselinePosition(const RenderObject* o) const
    776 {
    777     if (!o->isBox())
     770bool RenderThemeEfl::controlSupportsTints(const RenderObject* object) const
     771{
     772    return isEnabled(object);
     773}
     774
     775int RenderThemeEfl::baselinePosition(const RenderObject* object) const
     776{
     777    if (!object->isBox())
    778778        return 0;
    779779
    780     if (o->style()->appearance() == CheckboxPart
    781     ||  o->style()->appearance() == RadioPart)
    782         return toRenderBox(o)->marginTop() + toRenderBox(o)->height() - 3;
    783 
    784     return RenderTheme::baselinePosition(o);
    785 }
    786 
    787 bool RenderThemeEfl::paintSliderTrack(RenderObject* o, const PaintInfo& i, const IntRect& rect)
    788 {
    789     if (o->style()->appearance() == SliderHorizontalPart)
    790         return paintThemePart(o, SliderHorizontal, i, rect);
    791     return paintThemePart(o, SliderVertical, i, rect);
    792 }
    793 
    794 void RenderThemeEfl::adjustSliderTrackStyle(CSSStyleSelector* selector, RenderStyle* style, Element* e) const
    795 {
    796     if (!m_page && e && e->document()->page()) {
    797         static_cast<RenderThemeEfl*>(e->document()->page()->theme())->adjustSliderTrackStyle(selector, style, e);
     780    if (object->style()->appearance() == CheckboxPart
     781    ||  object->style()->appearance() == RadioPart)
     782        return toRenderBox(object)->marginTop() + toRenderBox(object)->height() - 3;
     783
     784    return RenderTheme::baselinePosition(object);
     785}
     786
     787bool RenderThemeEfl::paintSliderTrack(RenderObject* object, const PaintInfo& info, const IntRect& rect)
     788{
     789    if (object->style()->appearance() == SliderHorizontalPart)
     790        return paintThemePart(object, SliderHorizontal, info, rect);
     791    return paintThemePart(object, SliderVertical, info, rect);
     792}
     793
     794void RenderThemeEfl::adjustSliderTrackStyle(CSSStyleSelector* selector, RenderStyle* style, Element* element) const
     795{
     796    if (!m_page && element && element->document()->page()) {
     797        static_cast<RenderThemeEfl*>(element->document()->page()->theme())->adjustSliderTrackStyle(selector, style, element);
    798798        return;
    799799    }
    … …  
    809809}
    810810
    811 void RenderThemeEfl::adjustSliderThumbStyle(CSSStyleSelector* selector, RenderStyle* style, Element* e) const
    812 {
    813     adjustSliderTrackStyle(selector, style, e);
    814 }
    815 
    816 bool RenderThemeEfl::paintSliderThumb(RenderObject* o, const PaintInfo& i, const IntRect& rect)
    817 {
    818     return paintSliderTrack(o, i, rect);
    819 }
    820 
    821 void RenderThemeEfl::adjustCheckboxStyle(CSSStyleSelector* selector, RenderStyle* style, Element* e) const
    822 {
    823     if (!m_page && e && e->document()->page()) {
    824         static_cast<RenderThemeEfl*>(e->document()->page()->theme())->adjustCheckboxStyle(selector, style, e);
     811void RenderThemeEfl::adjustSliderThumbStyle(CSSStyleSelector* selector, RenderStyle* style, Element* element) const
     812{
     813    adjustSliderTrackStyle(selector, style, element);
     814}
     815
     816bool RenderThemeEfl::paintSliderThumb(RenderObject* object, const PaintInfo& info, const IntRect& rect)
     817{
     818    return paintSliderTrack(object, info, rect);
     819}
     820
     821void RenderThemeEfl::adjustCheckboxStyle(CSSStyleSelector* selector, RenderStyle* style, Element* element) const
     822{
     823    if (!m_page && element && element->document()->page()) {
     824        static_cast<RenderThemeEfl*>(element->document()->page()->theme())->adjustCheckboxStyle(selector, style, element);
    825825        return;
    826826    }
    … …  
    835835}
    836836
    837 bool RenderThemeEfl::paintCheckbox(RenderObject* o, const PaintInfo& i, const IntRect& rect)
    838 {
    839     return paintThemePart(o, CheckBox, i, rect);
    840 }
    841 
    842 void RenderThemeEfl::adjustRadioStyle(CSSStyleSelector* selector, RenderStyle* style, Element* e) const
    843 {
    844     if (!m_page && e && e->document()->page()) {
    845         static_cast<RenderThemeEfl*>(e->document()->page()->theme())->adjustRadioStyle(selector, style, e);
     837bool RenderThemeEfl::paintCheckbox(RenderObject* object, const PaintInfo& info, const IntRect& rect)
     838{
     839    return paintThemePart(object, CheckBox, info, rect);
     840}
     841
     842void RenderThemeEfl::adjustRadioStyle(CSSStyleSelector* selector, RenderStyle* style, Element* element) const
     843{
     844    if (!m_page && element && element->document()->page()) {
     845        static_cast<RenderThemeEfl*>(element->document()->page()->theme())->adjustRadioStyle(selector, style, element);
    846846        return;
    847847    }
    … …  
    856856}
    857857
    858 bool RenderThemeEfl::paintRadio(RenderObject* o, const PaintInfo& i, const IntRect& rect)
    859 {
    860     return paintThemePart(o, RadioButton, i, rect);
    861 }
    862 
    863 void RenderThemeEfl::adjustButtonStyle(CSSStyleSelector* selector, RenderStyle* style, Element* e) const
    864 {
    865     if (!m_page && e && e->document()->page()) {
    866         static_cast<RenderThemeEfl*>(e->document()->page()->theme())->adjustButtonStyle(selector, style, e);
     858bool RenderThemeEfl::paintRadio(RenderObject* object, const PaintInfo& info, const IntRect& rect)
     859{
     860    return paintThemePart(object, RadioButton, info, rect);
     861}
     862
     863void RenderThemeEfl::adjustButtonStyle(CSSStyleSelector* selector, RenderStyle* style, Element* element) const
     864{
     865    if (!m_page && element && element->document()->page()) {
     866        static_cast<RenderThemeEfl*>(element->document()->page()->theme())->adjustButtonStyle(selector, style, element);
    867867        return;
    868868    }
    … …  
    879879}
    880880
    881 bool RenderThemeEfl::paintButton(RenderObject* o, const PaintInfo& i, const IntRect& rect)
    882 {
    883     return paintThemePart(o, Button, i, rect);
    884 }
    885 
    886 void RenderThemeEfl::adjustMenuListStyle(CSSStyleSelector* selector, RenderStyle* style, Element* e) const
    887 {
    888     if (!m_page && e && e->document()->page()) {
    889         static_cast<RenderThemeEfl*>(e->document()->page()->theme())->adjustMenuListStyle(selector, style, e);
     881bool RenderThemeEfl::paintButton(RenderObject* object, const PaintInfo& info, const IntRect& rect)
     882{
     883    return paintThemePart(object, Button, info, rect);
     884}
     885
     886void RenderThemeEfl::adjustMenuListStyle(CSSStyleSelector* selector, RenderStyle* style, Element* element) const
     887{
     888    if (!m_page && element && element->document()->page()) {
     889        static_cast<RenderThemeEfl*>(element->document()->page()->theme())->adjustMenuListStyle(selector, style, element);
    890890        return;
    891891    }
    … …  
    897897}
    898898
    899 bool RenderThemeEfl::paintMenuList(RenderObject* o, const PaintInfo& i, const IntRect& rect)
    900 {
    901     return paintThemePart(o, ComboBox, i, rect);
    902 }
    903 
    904 void RenderThemeEfl::adjustTextFieldStyle(CSSStyleSelector* selector, RenderStyle* style, Element* e) const
    905 {
    906     if (!m_page && e && e->document()->page()) {
    907         static_cast<RenderThemeEfl*>(e->document()->page()->theme())->adjustTextFieldStyle(selector, style, e);
     899bool RenderThemeEfl::paintMenuList(RenderObject* object, const PaintInfo& info, const IntRect& rect)
     900{
     901    return paintThemePart(object, ComboBox, info, rect);
     902}
     903
     904void RenderThemeEfl::adjustTextFieldStyle(CSSStyleSelector* selector, RenderStyle* style, Element* element) const
     905{
     906    if (!m_page && element && element->document()->page()) {
     907        static_cast<RenderThemeEfl*>(element->document()->page()->theme())->adjustTextFieldStyle(selector, style, element);
    908908        return;
    909909    }
    … …  
    915915}
    916916
    917 bool RenderThemeEfl::paintTextField(RenderObject* o, const PaintInfo& i, const IntRect& rect)
    918 {
    919     return paintThemePart(o, TextField, i, rect);
    920 }
    921 
    922 void RenderThemeEfl::adjustTextAreaStyle(CSSStyleSelector* selector, RenderStyle* style, Element* e) const
    923 {
    924     adjustTextFieldStyle(selector, style, e);
    925 }
    926 
    927 bool RenderThemeEfl::paintTextArea(RenderObject* o, const PaintInfo& i, const IntRect& r)
    928 {
    929     return paintTextField(o, i, r);
    930 }
    931 
    932 void RenderThemeEfl::adjustSearchFieldDecorationStyle(CSSStyleSelector* selector, RenderStyle* style, Element* e) const
    933 {
    934     if (!m_page && e && e->document()->page()) {
    935         static_cast<RenderThemeEfl*>(e->document()->page()->theme())->adjustSearchFieldDecorationStyle(selector, style, e);
     917bool RenderThemeEfl::paintTextField(RenderObject* object, const PaintInfo& info, const IntRect& rect)
     918{
     919    return paintThemePart(object, TextField, info, rect);
     920}
     921
     922void RenderThemeEfl::adjustTextAreaStyle(CSSStyleSelector* selector, RenderStyle* style, Element* element) const
     923{
     924    adjustTextFieldStyle(selector, style, element);
     925}
     926
     927bool RenderThemeEfl::paintTextArea(RenderObject* object, const PaintInfo& info, const IntRect& rect)
     928{
     929    return paintTextField(object, info, rect);
     930}
     931
     932void RenderThemeEfl::adjustSearchFieldDecorationStyle(CSSStyleSelector* selector, RenderStyle* style, Element* element) const
     933{
     934    if (!m_page && element && element->document()->page()) {
     935        static_cast<RenderThemeEfl*>(element->document()->page()->theme())->adjustSearchFieldDecorationStyle(selector, style, element);
    936936        return;
    937937    }
    … …  
    941941}
    942942
    943 bool RenderThemeEfl::paintSearchFieldDecoration(RenderObject* o, const PaintInfo& i, const IntRect& rect)
    944 {
    945     return paintThemePart(o, SearchFieldDecoration, i, rect);
    946 }
    947 
    948 void RenderThemeEfl::adjustSearchFieldResultsButtonStyle(CSSStyleSelector* selector, RenderStyle* style, Element* e) const
    949 {
    950     if (!m_page && e && e->document()->page()) {
    951         static_cast<RenderThemeEfl*>(e->document()->page()->theme())->adjustSearchFieldResultsButtonStyle(selector, style, e);
     943bool RenderThemeEfl::paintSearchFieldDecoration(RenderObject* object, const PaintInfo& info, const IntRect& rect)
     944{
     945    return paintThemePart(object, SearchFieldDecoration, info, rect);
     946}
     947
     948void RenderThemeEfl::adjustSearchFieldResultsButtonStyle(CSSStyleSelector* selector, RenderStyle* style, Element* element) const
     949{
     950    if (!m_page && element && element->document()->page()) {
     951        static_cast<RenderThemeEfl*>(element->document()->page()->theme())->adjustSearchFieldResultsButtonStyle(selector, style, element);
    952952        return;
    953953    }
    … …  
    957957}
    958958
    959 bool RenderThemeEfl::paintSearchFieldResultsButton(RenderObject* o, const PaintInfo& i, const IntRect& rect)
    960 {
    961     return paintThemePart(o, SearchFieldResultsButton, i, rect);
    962 }
    963 
    964 void RenderThemeEfl::adjustSearchFieldResultsDecorationStyle(CSSStyleSelector* selector, RenderStyle* style, Element* e) const
    965 {
    966     if (!m_page && e && e->document()->page()) {
    967         static_cast<RenderThemeEfl*>(e->document()->page()->theme())->adjustSearchFieldResultsDecorationStyle(selector, style, e);
     959bool RenderThemeEfl::paintSearchFieldResultsButton(RenderObject* object, const PaintInfo& info, const IntRect& rect)
     960{
     961    return paintThemePart(object, SearchFieldResultsButton, info, rect);
     962}
     963
     964void RenderThemeEfl::adjustSearchFieldResultsDecorationStyle(CSSStyleSelector* selector, RenderStyle* style, Element* element) const
     965{
     966    if (!m_page && element && element->document()->page()) {
     967        static_cast<RenderThemeEfl*>(element->document()->page()->theme())->adjustSearchFieldResultsDecorationStyle(selector, style, element);
    968968        return;
    969969    }
    … …  
    973973}
    974974
    975 bool RenderThemeEfl::paintSearchFieldResultsDecoration(RenderObject* o, const PaintInfo& i, const IntRect& rect)
    976 {
    977     return paintThemePart(o, SearchFieldResultsDecoration, i, rect);
    978 }
    979 
    980 void RenderThemeEfl::adjustSearchFieldCancelButtonStyle(CSSStyleSelector* selector, RenderStyle* style, Element* e) const
    981 {
    982     if (!m_page && e && e->document()->page()) {
    983         static_cast<RenderThemeEfl*>(e->document()->page()->theme())->adjustSearchFieldCancelButtonStyle(selector, style, e);
     975bool RenderThemeEfl::paintSearchFieldResultsDecoration(RenderObject* object, const PaintInfo& info, const IntRect& rect)
     976{
     977    return paintThemePart(object, SearchFieldResultsDecoration, info, rect);
     978}
     979
     980void RenderThemeEfl::adjustSearchFieldCancelButtonStyle(CSSStyleSelector* selector, RenderStyle* style, Element* element) const
     981{
     982    if (!m_page && element && element->document()->page()) {
     983        static_cast<RenderThemeEfl*>(element->document()->page()->theme())->adjustSearchFieldCancelButtonStyle(selector, style, element);
    984984        return;
    985985    }
    … …  
    989989}
    990990
    991 bool RenderThemeEfl::paintSearchFieldCancelButton(RenderObject* o, const PaintInfo& i, const IntRect& rect)
    992 {
    993     return paintThemePart(o, SearchFieldCancelButton, i, rect);
    994 }
    995 
    996 void RenderThemeEfl::adjustSearchFieldStyle(CSSStyleSelector* selector, RenderStyle* style, Element* e) const
    997 {
    998     if (!m_page && e && e->document()->page()) {
    999         static_cast<RenderThemeEfl*>(e->document()->page()->theme())->adjustSearchFieldStyle(selector, style, e);
     991bool RenderThemeEfl::paintSearchFieldCancelButton(RenderObject* object, const PaintInfo& info, const IntRect& rect)
     992{
     993    return paintThemePart(object, SearchFieldCancelButton, info, rect);
     994}
     995
     996void RenderThemeEfl::adjustSearchFieldStyle(CSSStyleSelector* selector, RenderStyle* style, Element* element) const
     997{
     998    if (!m_page && element && element->document()->page()) {
     999        static_cast<RenderThemeEfl*>(element->document()->page()->theme())->adjustSearchFieldStyle(selector, style, element);
    10001000        return;
    10011001    }
    … …  
    10071007}
    10081008
    1009 bool RenderThemeEfl::paintSearchField(RenderObject* o, const PaintInfo& i, const IntRect& rect)
    1010 {
    1011     return paintThemePart(o, SearchField, i, rect);
     1009bool RenderThemeEfl::paintSearchField(RenderObject* object, const PaintInfo& info, const IntRect& rect)
     1010{
     1011    return paintThemePart(object, SearchField, info, rect);
    10121012}
    10131013
    … …  
    10331033
    10341034#if ENABLE(PROGRESS_TAG)
    1035 void RenderThemeEfl::adjustProgressBarStyle(CSSStyleSelector*, RenderStyle* style, Element*) const
     1035void RenderThemeEfl::adjustProgressBarStyle(CSSStyleSelector* selector, RenderStyle* style, Element* element) const
    10361036{
    10371037    style->setBoxShadow(0);
    10381038}
    10391039
    1040 bool RenderThemeEfl::paintProgressBar(RenderObject* o, const PaintInfo& i, const IntRect& rect)
    1041 {
    1042     return paintThemePart(o, ProgressBar, i, rect);
     1040bool RenderThemeEfl::paintProgressBar(RenderObject* object, const PaintInfo& info, const IntRect& rect)
     1041{
     1042    return paintThemePart(object, ProgressBar, info, rect);
    10431043}
    10441044#endif
    … …  
    10571057}
    10581058
    1059 bool RenderThemeEfl::paintMediaFullscreenButton(RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect)
     1059bool RenderThemeEfl::paintMediaFullscreenButton(RenderObject* object, const PaintInfo& info, const IntRect& rect)
    10601060{
    10611061    notImplemented();
    … …  
    10631063}
    10641064
    1065 bool RenderThemeEfl::paintMediaMuteButton(RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect)
     1065bool RenderThemeEfl::paintMediaMuteButton(RenderObject* object, const PaintInfo& info, const IntRect& rect)
    10661066{
    10671067    notImplemented();
    … …  
    10691069}
    10701070
    1071 bool RenderThemeEfl::paintMediaPlayButton(RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect)
     1071bool RenderThemeEfl::paintMediaPlayButton(RenderObject* object, const PaintInfo& info, const IntRect& rect)
    10721072{
    10731073    notImplemented();
    … …  
    10751075}
    10761076
    1077 bool RenderThemeEfl::paintMediaSeekBackButton(RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect)
     1077bool RenderThemeEfl::paintMediaSeekBackButton(RenderObject* object, const PaintInfo& info, const IntRect& rect)
    10781078{
    10791079    notImplemented();
    … …  
    10811081}
    10821082
    1083 bool RenderThemeEfl::paintMediaSeekForwardButton(RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect)
     1083bool RenderThemeEfl::paintMediaSeekForwardButton(RenderObject* object, const PaintInfo& info, const IntRect& rect)
    10841084{
    10851085    notImplemented();
    … …  
    10871087}
    10881088
    1089 bool RenderThemeEfl::paintMediaSliderTrack(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
     1089bool RenderThemeEfl::paintMediaSliderTrack(RenderObject* object, const PaintInfo& info, const IntRect& rect)
    10901090{
    10911091    notImplemented();
    … …  
    10931093}
    10941094
    1095 bool RenderThemeEfl::paintMediaSliderThumb(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
     1095bool RenderThemeEfl::paintMediaSliderThumb(RenderObject* object, const PaintInfo& info, const IntRect& rect)
    10961096{
    10971097    notImplemented();
    … …  
    10991099}
    11001100
    1101 bool RenderThemeEfl::paintMediaVolumeSliderContainer(RenderObject*, const PaintInfo& paintInfo, const IntRect& rect)
     1101bool RenderThemeEfl::paintMediaVolumeSliderContainer(RenderObject*, const PaintInfo& info, const IntRect& rect)
    11021102{
    11031103    notImplemented();
    … …  
    11051105}
    11061106
    1107 bool RenderThemeEfl::paintMediaVolumeSliderTrack(RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect)
     1107bool RenderThemeEfl::paintMediaVolumeSliderTrack(RenderObject* object, const PaintInfo& info, const IntRect& rect)
    11081108{
    11091109    notImplemented();
    … …  
    11111111}
    11121112
    1113 bool RenderThemeEfl::paintMediaVolumeSliderThumb(RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect)
     1113bool RenderThemeEfl::paintMediaVolumeSliderThumb(RenderObject* object, const PaintInfo& info, const IntRect& rect)
    11141114{
    11151115    notImplemented();
    … …  
    11171117}
    11181118
    1119 bool RenderThemeEfl::paintMediaCurrentTime(RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect)
     1119bool RenderThemeEfl::paintMediaCurrentTime(RenderObject* object, const PaintInfo& info, const IntRect& rect)
    11201120{
    11211121    notImplemented();
Note: See TracChangeset for help on using the changeset viewer.