Changeset 96382 in webkit


Ignore:
Timestamp:
Sep 29, 2011 7:18:01 PM (13 years ago)
Author:
gyuyoung.kim@samsung.com
Message:

[EFL] Use C++ type cast instead of C style type cast
​https://bugs.webkit.org/show_bug.cgi?id=68321

Reviewed by Martin Robinson.

This is a second step in order to be more compliant with WebKit coding style.
The second step is to change C-type casting with C++-type casting in .cpp files.

In addition, remained efl style '*' pointer placements are moved to the right place as well.

  • ewk/ewk_auth_soup.cpp:
  • ewk/ewk_contextmenu.cpp:
  • ewk/ewk_frame.cpp:
  • ewk/ewk_history.cpp:
  • ewk/ewk_view.cpp:
  • ewk/ewk_view_single.cpp:
  • ewk/ewk_view_tiled.cpp:
Location:
trunk/Source/WebKit/efl
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/efl/ChangeLog

    r96362 r96382  
     12011-09-29  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
     2
     3        [EFL] Use C++ type cast instead of C style type cast
     4        https://bugs.webkit.org/show_bug.cgi?id=68321
     5
     6        Reviewed by Martin Robinson.
     7
     8        This is a second step in order to be more compliant with WebKit coding style.
     9        The second step is to change C-type casting with C++-type casting in .cpp files.
     10
     11        In addition, remained efl style '*' pointer placements are moved to the right place as well.
     12
     13        * ewk/ewk_auth_soup.cpp:
     14        * ewk/ewk_contextmenu.cpp:
     15        * ewk/ewk_frame.cpp:
     16        * ewk/ewk_history.cpp:
     17        * ewk/ewk_view.cpp:
     18        * ewk/ewk_view_single.cpp:
     19        * ewk/ewk_view_tiled.cpp:
     20
    1212011-09-29  Raphael Kubo da Costa  <kubo@profusion.mobi>
    222

  • trunk/Source/WebKit/efl/ewk/ewk_auth_soup.cpp

    r95901 r96382  
    8080        return;
    8181
    82     Ewk_Auth_Data* auth_data = (Ewk_Auth_Data*)data;
     82    Ewk_Auth_Data* auth_data = static_cast<Ewk_Auth_Data*>(data);
    8383    soup_auth_authenticate(auth_data->auth, username, password);
    8484    soup_session_unpause_message(auth_data->session, auth_data->msg);
    … …  
    9595        return;
    9696
    97     auth_data = (Ewk_Auth_Data*)calloc(1, sizeof(Ewk_Auth_Data));
     97    auth_data = static_cast<Ewk_Auth_Data*>(calloc(1, sizeof(Ewk_Auth_Data)));
    9898
    9999    if (!auth_data) {

  • trunk/Source/WebKit/efl/ewk/ewk_contextmenu.cpp

    r95901 r96382  
    104104                                                 const char* title, Eina_Bool checked, Eina_Bool enabled)
    105105{
    106     Ewk_Context_Menu_Item* item = (Ewk_Context_Menu_Item*) malloc(sizeof(*item));
     106    Ewk_Context_Menu_Item* item = static_cast<Ewk_Context_Menu_Item*>(malloc(sizeof(*item)));
    107107    if (!item)
    108108        return 0;

  • trunk/Source/WebKit/efl/ewk/ewk_frame.cpp

    r96362 r96382  
    102102
    103103#define EWK_FRAME_SD_GET(o, ptr)                                \
    104     Ewk_Frame_Smart_Data *ptr = (Ewk_Frame_Smart_Data*)evas_object_smart_data_get(o)
     104    Ewk_Frame_Smart_Data* ptr = static_cast<Ewk_Frame_Smart_Data*>(evas_object_smart_data_get(o))
    105105
    106106#define EWK_FRAME_SD_GET_OR_RETURN(o, ptr, ...)         \
    … …  
    182182
    183183    if (!sd) {
    184         sd = (Ewk_Frame_Smart_Data*)calloc(1, sizeof(Ewk_Frame_Smart_Data));
     184        sd = static_cast<Ewk_Frame_Smart_Data*>(calloc(1, sizeof(Ewk_Frame_Smart_Data)));
    185185        if (!sd) {
    186186            CRITICAL("could not allocate Ewk_Frame_Smart_Data");
    … …  
    234234}
    235235
    236 static void _ewk_frame_smart_del(Evas_Object *o)
     236static void _ewk_frame_smart_del(Evas_Object* o)
    237237{
    238238    WRN("o=%p", o); // XXX REMOVE ME LATER
    … …  
    241241    if (sd) {
    242242        if (sd->frame) {
    243             WebCore::FrameLoaderClientEfl *flc = _ewk_frame_loader_efl_get(sd->frame);
     243            WebCore::FrameLoaderClientEfl* flc = _ewk_frame_loader_efl_get(sd->frame);
    244244            flc->setWebFrame(0);
    245245            sd->frame->loader()->detachFromParent();
    … …  
    302302{
    303303    EWK_FRAME_SD_GET_OR_RETURN(o, sd, 0);
    304     Eina_Iterator_Ewk_Frame* it = (Eina_Iterator_Ewk_Frame*)
    305                                   calloc(1, sizeof(Eina_Iterator_Ewk_Frame));
     304    Eina_Iterator_Ewk_Frame* it = static_cast<Eina_Iterator_Ewk_Frame*>
     305                                  (calloc(1, sizeof(Eina_Iterator_Ewk_Frame)));
    306306    if (!it)
    307307        return 0;
    … …  
    687687        return 0;
    688688
    689     Ewk_Hit_Test* hit_test = (Ewk_Hit_Test*)calloc(1, sizeof(Ewk_Hit_Test));
     689    Ewk_Hit_Test* hit_test = static_cast<Ewk_Hit_Test*>(calloc(1, sizeof(Ewk_Hit_Test)));
    690690    if (!hit_test) {
    691691        CRITICAL("Could not allocate memory for hit test.");

  • trunk/Source/WebKit/efl/ewk/ewk_history.cpp

    r95901 r96382  
    8484    }
    8585
    86     item = (Ewk_History_Item*)calloc(1, sizeof(Ewk_History_Item));
     86    item = static_cast<Ewk_History_Item*>(calloc(1, sizeof(Ewk_History_Item)));
    8787    if (!item) {
    8888        CRITICAL("Could not allocate item memory.");
    … …  
    272272    EWK_HISTORY_ITEM_CORE_GET_OR_RETURN(item, core, 0);
    273273    // hide the following optimzation from outside
    274     Ewk_History_Item* i = (Ewk_History_Item*)item;
     274    Ewk_History_Item* i = const_cast<Ewk_History_Item*>(item);
    275275    eina_stringshare_replace(&i->title, core->title().utf8().data());
    276276    return i->title;
    … …  
    281281    EWK_HISTORY_ITEM_CORE_GET_OR_RETURN(item, core, 0);
    282282    // hide the following optimzation from outside
    283     Ewk_History_Item* i = (Ewk_History_Item*)item;
     283    Ewk_History_Item* i = const_cast<Ewk_History_Item*>(item);
    284284    eina_stringshare_replace(&i->alternate_title,
    285285                             core->alternateTitle().utf8().data());
    … …  
    299299    EWK_HISTORY_ITEM_CORE_GET_OR_RETURN(item, core, 0);
    300300    // hide the following optimzation from outside
    301     Ewk_History_Item* i = (Ewk_History_Item*)item;
     301    Ewk_History_Item* i = const_cast<Ewk_History_Item*>((item));
    302302    eina_stringshare_replace(&i->uri, core->urlString().utf8().data());
    303303    return i->uri;
    … …  
    308308    EWK_HISTORY_ITEM_CORE_GET_OR_RETURN(item, core, 0);
    309309    // hide the following optimzation from outside
    310     Ewk_History_Item* i = (Ewk_History_Item*)item;
     310    Ewk_History_Item* i = const_cast<Ewk_History_Item*>(item);
    311311    eina_stringshare_replace(&i->original_uri,
    312312                             core->originalURLString().utf8().data());
    … …  
    384384    DBG("core=%p", core);
    385385
    386     history = (Ewk_History*)malloc(sizeof(Ewk_History));
     386    history = static_cast<Ewk_History*>(malloc(sizeof(Ewk_History)));
    387387    if (!history) {
    388388        CRITICAL("Could not allocate history memory.");

  • trunk/Source/WebKit/efl/ewk/ewk_view.cpp

    r96202 r96382  
    208208
    209209#define EWK_VIEW_SD_GET(o, ptr)                                 \
    210     Ewk_View_Smart_Data *ptr = (Ewk_View_Smart_Data*)evas_object_smart_data_get(o)
     210    Ewk_View_Smart_Data* ptr = static_cast<Ewk_View_Smart_Data*>(evas_object_smart_data_get(o))
    211211
    212212#define EWK_VIEW_SD_GET_OR_RETURN(o, ptr, ...)          \
    … …  
    246246    }
    247247    priv->repaints.allocated = size;
    248     priv->repaints.array = (Eina_Rectangle*)tmp;
     248    priv->repaints.array = static_cast<Eina_Rectangle*>(tmp);
    249249    return EINA_TRUE;
    250250}
    … …  
    292292    }
    293293    priv->scrolls.allocated = size;
    294     priv->scrolls.array = (Ewk_Scroll_Request*)tmp;
     294    priv->scrolls.array = static_cast<Ewk_Scroll_Request*>(tmp);
    295295    return EINA_TRUE;
    296296}
    … …  
    471471static void _ewk_view_on_focus_in(void* data, Evas* e, Evas_Object* o, void* event_info)
    472472{
    473     Ewk_View_Smart_Data* sd = (Ewk_View_Smart_Data*)data;
     473    Ewk_View_Smart_Data* sd = static_cast<Ewk_View_Smart_Data*>(data);
    474474    EINA_SAFETY_ON_NULL_RETURN(sd->api);
    475475    EINA_SAFETY_ON_NULL_RETURN(sd->api->focus_in);
    … …  
    479479static void _ewk_view_on_focus_out(void* data, Evas* e, Evas_Object* o, void* event_info)
    480480{
    481     Ewk_View_Smart_Data* sd = (Ewk_View_Smart_Data*)data;
     481    Ewk_View_Smart_Data* sd = static_cast<Ewk_View_Smart_Data*>(data);
    482482    EINA_SAFETY_ON_NULL_RETURN(sd->api);
    483483    EINA_SAFETY_ON_NULL_RETURN(sd->api->focus_out);
    … …  
    487487static void _ewk_view_on_mouse_wheel(void* data, Evas* e, Evas_Object* o, void* event_info)
    488488{
    489     Evas_Event_Mouse_Wheel* ev = (Evas_Event_Mouse_Wheel*)event_info;
    490     Ewk_View_Smart_Data* sd = (Ewk_View_Smart_Data*)data;
     489    Evas_Event_Mouse_Wheel* ev = static_cast<Evas_Event_Mouse_Wheel*>(event_info);
     490    Ewk_View_Smart_Data* sd = static_cast<Ewk_View_Smart_Data*>(data);
    491491    EINA_SAFETY_ON_NULL_RETURN(sd->api);
    492492    EINA_SAFETY_ON_NULL_RETURN(sd->api->mouse_wheel);
    … …  
    496496static void _ewk_view_on_mouse_down(void* data, Evas* e, Evas_Object* o, void* event_info)
    497497{
    498     Evas_Event_Mouse_Down* ev = (Evas_Event_Mouse_Down*)event_info;
    499     Ewk_View_Smart_Data* sd = (Ewk_View_Smart_Data*)data;
     498    Evas_Event_Mouse_Down* ev = static_cast<Evas_Event_Mouse_Down*>(event_info);
     499    Ewk_View_Smart_Data* sd = static_cast<Ewk_View_Smart_Data*>(data);
    500500    EINA_SAFETY_ON_NULL_RETURN(sd->api);
    501501    EINA_SAFETY_ON_NULL_RETURN(sd->api->mouse_down);
    … …  
    505505static void _ewk_view_on_mouse_up(void* data, Evas* e, Evas_Object* o, void* event_info)
    506506{
    507     Evas_Event_Mouse_Up* ev = (Evas_Event_Mouse_Up*)event_info;
    508     Ewk_View_Smart_Data* sd = (Ewk_View_Smart_Data*)data;
     507    Evas_Event_Mouse_Up* ev = static_cast<Evas_Event_Mouse_Up*>(event_info);
     508    Ewk_View_Smart_Data* sd = static_cast<Ewk_View_Smart_Data*>(data);
    509509    EINA_SAFETY_ON_NULL_RETURN(sd->api);
    510510    EINA_SAFETY_ON_NULL_RETURN(sd->api->mouse_up);
    … …  
    514514static void _ewk_view_on_mouse_move(void* data, Evas* e, Evas_Object* o, void* event_info)
    515515{
    516     Evas_Event_Mouse_Move* ev = (Evas_Event_Mouse_Move*)event_info;
    517     Ewk_View_Smart_Data* sd = (Ewk_View_Smart_Data*)data;
     516    Evas_Event_Mouse_Move* ev = static_cast<Evas_Event_Mouse_Move*>(event_info);
     517    Ewk_View_Smart_Data* sd = static_cast<Ewk_View_Smart_Data*>(data);
    518518    EINA_SAFETY_ON_NULL_RETURN(sd->api);
    519519    EINA_SAFETY_ON_NULL_RETURN(sd->api->mouse_move);
    … …  
    523523static void _ewk_view_on_key_down(void* data, Evas* e, Evas_Object* o, void* event_info)
    524524{
    525     Evas_Event_Key_Down* ev = (Evas_Event_Key_Down*)event_info;
    526     Ewk_View_Smart_Data* sd = (Ewk_View_Smart_Data*)data;
     525    Evas_Event_Key_Down* ev = static_cast<Evas_Event_Key_Down*>(event_info);
     526    Ewk_View_Smart_Data* sd = static_cast<Ewk_View_Smart_Data*>(data);
    527527    EINA_SAFETY_ON_NULL_RETURN(sd->api);
    528528    EINA_SAFETY_ON_NULL_RETURN(sd->api->key_down);
    … …  
    532532static void _ewk_view_on_key_up(void* data, Evas* e, Evas_Object* o, void* event_info)
    533533{
    534     Evas_Event_Key_Up* ev = (Evas_Event_Key_Up*)event_info;
    535     Ewk_View_Smart_Data* sd = (Ewk_View_Smart_Data*)data;
     534    Evas_Event_Key_Up* ev = static_cast<Evas_Event_Key_Up*>(event_info);
     535    Ewk_View_Smart_Data* sd = static_cast<Ewk_View_Smart_Data*>(data);
    536536    EINA_SAFETY_ON_NULL_RETURN(sd->api);
    537537    EINA_SAFETY_ON_NULL_RETURN(sd->api->key_up);
    … …  
    556556{
    557557    Ewk_View_Private_Data* priv =
    558         (Ewk_View_Private_Data*)calloc(1, sizeof(Ewk_View_Private_Data));
     558        static_cast<Ewk_View_Private_Data*>(calloc(1, sizeof(Ewk_View_Private_Data)));
    559559    AtomicString s;
    560560    WebCore::KURL url;
    … …  
    725725    const Evas_Smart* smart = evas_object_smart_smart_get(o);
    726726    const Evas_Smart_Class* sc = evas_smart_class_get(smart);
    727     const Ewk_View_Smart_Class* api = (const Ewk_View_Smart_Class*)sc;
     727    const Ewk_View_Smart_Class* api = reinterpret_cast<const Ewk_View_Smart_Class*>(sc);
    728728    EINA_SAFETY_ON_NULL_RETURN(api->backing_store_add);
    729729    EWK_VIEW_SD_GET(o, sd);
    730730
    731731    if (!sd) {
    732         sd = (Ewk_View_Smart_Data*)calloc(1, sizeof(Ewk_View_Smart_Data));
     732        sd = static_cast<Ewk_View_Smart_Data*>(calloc(1, sizeof(Ewk_View_Smart_Data)));
    733733        if (!sd) {
    734734            CRITICAL("could not allocate Ewk_View_Smart_Data");
    … …  
    927927
    928928    if (w + sd->view.w > 0)
    929         px = (double)(x + cx) / (w + sd->view.w);
     929        px = static_cast<double>(x + cx) / (w + sd->view.w);
    930930    else
    931931        px = 0.0;
    932932
    933933    if (h + sd->view.h > 0)
    934         py = (double)(y + cy) / (h + sd->view.h);
     934        py = static_cast<double>(y + cy) / (h + sd->view.h);
    935935    else
    936936        py = 0.0;
    … …  
    10051005static Eina_Bool _ewk_view_zoom_animator_cb(void* data)
    10061006{
    1007     Ewk_View_Smart_Data* sd = (Ewk_View_Smart_Data*)data;
     1007    Ewk_View_Smart_Data* sd = static_cast<Ewk_View_Smart_Data*>(data);
    10081008    Evas_Coord cx, cy;
    10091009    EWK_VIEW_PRIV_GET(sd, priv);
    … …  
    10491049    int device_dpi = ewk_util_dpi_get();
    10501050
    1051     int available_width = (int) priv->page->chrome()->client()->pageRect().width();
    1052     int available_height = (int) priv->page->chrome()->client()->pageRect().height();
    1053 
    1054     int device_width = (int) priv->page->chrome()->client()->windowRect().width();
    1055     int device_height = (int) priv->page->chrome()->client()->windowRect().height();
    1056 
    1057     WebCore::IntSize available_size = WebCore::IntSize(available_width, available_height);
    1058     WebCore::ViewportAttributes attributes = WebCore::computeViewportAttributes(priv->viewport_arguments, desktop_width, device_width, device_height, device_dpi, available_size);
     1051    WebCore::IntRect available_rect = enclosingIntRect(priv->page->chrome()->client()->pageRect());
     1052    WebCore::IntRect device_rect = enclosingIntRect(priv->page->chrome()->client()->windowRect());
     1053
     1054    WebCore::ViewportAttributes attributes = WebCore::computeViewportAttributes(priv->viewport_arguments, desktop_width, device_rect.width(), device_rect.height(), device_dpi, available_rect.size());
    10591055
    10601056    return attributes;
    … …  
    15621558
    15631559    if (zoom < priv->settings.zoom_range.min_scale) {
    1564         WRN("zoom level is < %f : %f", (double)priv->settings.zoom_range.min_scale, (double)zoom);
     1560        WRN("zoom level is < %f : %f", priv->settings.zoom_range.min_scale, zoom);
    15651561        return EINA_FALSE;
    15661562    }
    15671563    if (zoom > priv->settings.zoom_range.max_scale) {
    1568         WRN("zoom level is > %f : %f", (double)priv->settings.zoom_range.max_scale, (double)zoom);
     1564        WRN("zoom level is > %f : %f", priv->settings.zoom_range.max_scale, zoom);
    15691565        return EINA_FALSE;
    15701566    }
    … …  
    16061602
    16071603    if (zoom < priv->settings.zoom_range.min_scale) {
    1608         WRN("zoom level is < %f : %f", (double)priv->settings.zoom_range.min_scale, (double)zoom);
     1604        WRN("zoom level is < %f : %f", priv->settings.zoom_range.min_scale, zoom);
    16091605        return EINA_FALSE;
    16101606    }
    16111607    if (zoom > priv->settings.zoom_range.max_scale) {
    1612         WRN("zoom level is > %f : %f", (double)priv->settings.zoom_range.max_scale, (double)zoom);
     1608        WRN("zoom level is > %f : %f", priv->settings.zoom_range.max_scale, zoom);
    16131609        return EINA_FALSE;
    16141610    }
    … …  
    16621658
    16631659    if (zoom < priv->settings.zoom_range.min_scale) {
    1664         WRN("zoom level is < %f : %f", (double)priv->settings.zoom_range.min_scale, (double)zoom);
     1660        WRN("zoom level is < %f : %f", priv->settings.zoom_range.min_scale, zoom);
    16651661        return EINA_FALSE;
    16661662    }
    16671663    if (zoom > priv->settings.zoom_range.max_scale) {
    1668         WRN("zoom level is > %f : %f", (double)priv->settings.zoom_range.max_scale, (double)zoom);
     1664        WRN("zoom level is > %f : %f", priv->settings.zoom_range.max_scale, zoom);
    16691665        return EINA_FALSE;
    16701666    }
    … …  
    24902486    WebCore::FrameView* view = priv->main_frame->view();
    24912487    EINA_SAFETY_ON_NULL_RETURN_VAL(view, 0);
    2492     Ewk_View_Paint_Context* ctxt = (Ewk_View_Paint_Context*)malloc(sizeof(*ctxt));
     2488    Ewk_View_Paint_Context* ctxt = static_cast<Ewk_View_Paint_Context*>(malloc(sizeof(*ctxt)));
    24932489    EINA_SAFETY_ON_NULL_RETURN_VAL(ctxt, 0);
    24942490
    … …  
    33653361    const int size = client->listSize();
    33663362    for (int i = 0; i < size; ++i) {
    3367         Ewk_Menu_Item* item = (Ewk_Menu_Item*) malloc(sizeof(*item));
     3363        Ewk_Menu_Item* item = static_cast<Ewk_Menu_Item*>(malloc(sizeof(*item)));
    33683364        if (client->itemIsSeparator(i))
    33693365            item->type = EWK_MENU_SEPARATOR;
    … …  
    33973393    void* itemv;
    33983394    EINA_LIST_FREE(priv->popup.menu.items, itemv) {
    3399         Ewk_Menu_Item* item = (Ewk_Menu_Item*)itemv;
     3395        Ewk_Menu_Item* item = static_cast<Ewk_Menu_Item*>(itemv);
    34003396        eina_stringshare_del(item->text);
    34013397        free(item);

  • trunk/Source/WebKit/efl/ewk/ewk_view_single.cpp

    r95901 r96382  
    4444    _parent_sc.sc.add(o);
    4545
    46     sd = (Ewk_View_Smart_Data*)evas_object_smart_data_get(o);
     46    sd = static_cast<Ewk_View_Smart_Data*>(evas_object_smart_data_get(o));
    4747    if (!sd)
    4848        return;
    … …  
    6868static void _ewk_view_single_smart_resize(Evas_Object* o, Evas_Coord w, Evas_Coord h)
    6969{
    70     Ewk_View_Smart_Data* sd = (Ewk_View_Smart_Data*)evas_object_smart_data_get(o);
     70    Ewk_View_Smart_Data* sd = static_cast<Ewk_View_Smart_Data*>(evas_object_smart_data_get(o));
    7171    _parent_sc.sc.resize(o, w, h);
    7272
    … …  
    252252
    253253            _ewk_view_4b_move_region_up
    254                 ((uint32_t*)pixels, -sr->dy, sx, sy, sw, sh, ow);
     254                (static_cast<uint32_t*>(pixels), -sr->dy, sx, sy, sw, sh, ow);
    255255            evas_object_image_data_update_add
    256256                (sd->backing_store, sx, sy, sw, sh + sr->dy);
    … …  
    264264
    265265            _ewk_view_4b_move_region_down
    266                 ((uint32_t*)pixels, sr->dy, sx, sy, sw, sh, ow);
     266                (static_cast<uint32_t*>(pixels), sr->dy, sx, sy, sw, sh, ow);
    267267            evas_object_image_data_update_add
    268268                (sd->backing_store, sx, sy + sr->dy, sw, sh - sr->dy);
    … …  
    278278
    279279            _ewk_view_4b_move_region_left
    280                 ((uint32_t*)pixels, -sr->dx, sx, sy, sw, sh, ow);
     280                (static_cast<uint32_t*>(pixels), -sr->dx, sx, sy, sw, sh, ow);
    281281            evas_object_image_data_update_add
    282282                (sd->backing_store, sx, sy, sw + sr->dx, sh);
    … …  
    290290
    291291            _ewk_view_4b_move_region_right
    292                 ((uint32_t*)pixels, sr->dx, sx, sy, sw, sh, ow);
     292                (static_cast<uint32_t*>(pixels), sr->dx, sx, sy, sw, sh, ow);
    293293            evas_object_image_data_update_add
    294294                (sd->backing_store, sx + sr->dx, sy, sw - sr->dx, sh);
    … …  
    333333
    334334        _ewk_view_4b_move_region
    335             ((uint32_t*)pixels, sr->dx, sr->dy, sx, sy, sw, sh, ow);
     335            (static_cast<uint32_t*>(pixels), sr->dx, sr->dy, sx, sy, sw, sh, ow);
    336336
    337337        evas_object_image_data_update_add(sd->backing_store, mx, my, mw, mh);
    … …  
    401401
    402402    surface = cairo_image_surface_create_for_data
    403                   ((unsigned char*)pixels, format, ow, oh, ow * 4);
     403                  (static_cast<unsigned char*>(pixels), format, ow, oh, ow * 4);
    404404    status = cairo_surface_status(surface);
    405405    if (status != CAIRO_STATUS_SUCCESS) {

  • trunk/Source/WebKit/efl/ewk/ewk_view_tiled.cpp

    r95901 r96382  
    3333static Eina_Bool _ewk_view_tiled_render_cb(void* data, Ewk_Tile* t, const Eina_Rectangle* area)
    3434{
    35     Ewk_View_Private_Data* priv = (Ewk_View_Private_Data*)data;
     35    Ewk_View_Private_Data* priv = static_cast<Ewk_View_Private_Data*>(data);
    3636    Eina_Rectangle r = {area->x + t->x, area->y + t->y, area->w, area->h};
    3737
    … …  
    4141static void* _ewk_view_tiled_updates_process_pre(void* data, Evas_Object* o)
    4242{
    43     Ewk_View_Private_Data* priv = (Ewk_View_Private_Data*)data;
     43    Ewk_View_Private_Data* priv = static_cast<Ewk_View_Private_Data*>(data);
    4444    ewk_view_layout_if_needed_recursive(priv);
    4545    return 0;
    … …  
    5959_ewk_view_tiled_contents_size_changed_cb(void* data, Evas_Object* o, void* event_info)
    6060{
    61     Evas_Coord* size = (Evas_Coord*)event_info;
    62     Ewk_View_Smart_Data* sd = (Ewk_View_Smart_Data*)data;
     61    Evas_Coord* size = static_cast<Evas_Coord*>(event_info);
     62    Ewk_View_Smart_Data* sd = static_cast<Ewk_View_Smart_Data*>(data);
    6363
    6464    ewk_tiled_backing_store_contents_resize
    … …  
    7272    _parent_sc.sc.add(o);
    7373
    74     sd = (Ewk_View_Smart_Data*)evas_object_smart_data_get(o);
     74    sd = static_cast<Ewk_View_Smart_Data*>(evas_object_smart_data_get(o));
    7575    if (!sd)
    7676        return;
Note: See TracChangeset for help on using the changeset viewer.