Changeset 161758 in webkit


Ignore:
Timestamp:
Jan 11, 2014 12:52:01 AM (10 years ago)
Author:
jinwoo7.song@samsung.com
Message:

[EFL][WK2] Use nullptr instead of 0 in EFL API layer
https://bugs.webkit.org/show_bug.cgi?id=126806

Reviewed by Anders Carlsson.

  • UIProcess/API/efl/EwkView.cpp:

(EwkView::create):

  • UIProcess/API/efl/ewk_auth_request.cpp:

(ewk_auth_request_suggested_username_get):
(ewk_auth_request_realm_get):
(ewk_auth_request_host_get):

  • UIProcess/API/efl/ewk_back_forward_list.cpp:

(ewk_back_forward_list_current_item_get):
(ewk_back_forward_list_previous_item_get):
(ewk_back_forward_list_next_item_get):
(ewk_back_forward_list_item_at_index_get):
(ewk_back_forward_list_n_back_items_copy):
(ewk_back_forward_list_n_forward_items_copy):

  • UIProcess/API/efl/ewk_back_forward_list_item.cpp:

(ewk_back_forward_list_item_url_get):
(ewk_back_forward_list_item_title_get):
(ewk_back_forward_list_item_original_url_get):

  • UIProcess/API/efl/ewk_context.cpp:

(ewk_context_cookie_manager_get):
(ewk_context_database_manager_get):
(ewk_context_favicon_database_get):
(ewk_context_storage_manager_get):
(ewk_context_new_with_injected_bundle_path):

  • UIProcess/API/efl/ewk_context_menu.cpp:

(ewk_context_menu_items_get):

  • UIProcess/API/efl/ewk_context_menu_item.cpp:

(ewk_context_menu_item_new_with_submenu):
(ewk_context_menu_item_title_get):
(ewk_context_menu_item_parent_menu_get):
(ewk_context_menu_item_submenu_get):

  • UIProcess/API/efl/ewk_download_job.cpp:

(ewk_download_job_request_get):
(ewk_download_job_response_get):
(ewk_download_job_destination_get):
(ewk_download_job_suggested_filename_get):

  • UIProcess/API/efl/ewk_error.cpp:

(ewk_error_url_get):
(ewk_error_description_get):

  • UIProcess/API/efl/ewk_file_chooser_request.cpp:

(ewk_file_chooser_request_accepted_mimetypes_get):

  • UIProcess/API/efl/ewk_form_submission_request.cpp:

(ewk_form_submission_request_field_names_get):
(ewk_form_submission_request_field_value_get):

  • UIProcess/API/efl/ewk_navigation_data.cpp:

(ewk_navigation_data_title_get):
(ewk_navigation_data_original_request_get):
(ewk_navigation_data_url_get):

  • UIProcess/API/efl/ewk_navigation_policy_decision.cpp:

(ewk_navigation_policy_frame_name_get):
(ewk_navigation_policy_request_get):

  • UIProcess/API/efl/ewk_object.cpp:

(ewk_object_ref):

  • UIProcess/API/efl/ewk_popup_menu.cpp:

(ewk_popup_menu_items_get):

  • UIProcess/API/efl/ewk_popup_menu_item.cpp:

(ewk_popup_menu_item_text_get):
(ewk_popup_menu_item_tooltip_get):
(ewk_popup_menu_item_accessibility_text_get):

  • UIProcess/API/efl/ewk_security_origin.cpp:

(ewk_security_origin_host_get):
(ewk_security_origin_protocol_get):

  • UIProcess/API/efl/ewk_settings.cpp:

(ewk_settings_default_text_encoding_name_get):

  • UIProcess/API/efl/ewk_url_request.cpp:

(ewk_url_request_url_get):
(ewk_request_cookies_first_party_get):
(ewk_url_request_http_method_get):

  • UIProcess/API/efl/ewk_url_response.cpp:

(ewk_url_response_url_get):
(ewk_url_response_mime_type_get):

  • UIProcess/API/efl/ewk_url_scheme_request.cpp:

(ewk_url_scheme_request_scheme_get):
(ewk_url_scheme_request_url_get):
(ewk_url_scheme_request_path_get):

  • UIProcess/API/efl/ewk_view.cpp:

(toEwkViewChecked):
(EWKViewGetWKView):
(ewk_view_smart_add):
(ewk_view_add_with_context):
(ewk_view_context_get):
(ewk_view_page_group_get):
(ewk_view_url_get):
(ewk_view_favicon_get):
(ewk_view_settings_get):
(ewk_view_title_get):
(ewk_view_theme_get):
(ewk_view_back_forward_list_get):
(ewk_view_custom_encoding_get):
(ewk_view_user_agent_get):

Location:
trunk/Source/WebKit2
Files:
23 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r161751 r161758  
     12014-01-11  Jinwoo Song  <jinwoo7.song@samsung.com>
     2
     3        [EFL][WK2] Use nullptr instead of 0 in EFL API layer
     4        https://bugs.webkit.org/show_bug.cgi?id=126806
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * UIProcess/API/efl/EwkView.cpp:
     9        (EwkView::create):
     10        * UIProcess/API/efl/ewk_auth_request.cpp:
     11        (ewk_auth_request_suggested_username_get):
     12        (ewk_auth_request_realm_get):
     13        (ewk_auth_request_host_get):
     14        * UIProcess/API/efl/ewk_back_forward_list.cpp:
     15        (ewk_back_forward_list_current_item_get):
     16        (ewk_back_forward_list_previous_item_get):
     17        (ewk_back_forward_list_next_item_get):
     18        (ewk_back_forward_list_item_at_index_get):
     19        (ewk_back_forward_list_n_back_items_copy):
     20        (ewk_back_forward_list_n_forward_items_copy):
     21        * UIProcess/API/efl/ewk_back_forward_list_item.cpp:
     22        (ewk_back_forward_list_item_url_get):
     23        (ewk_back_forward_list_item_title_get):
     24        (ewk_back_forward_list_item_original_url_get):
     25        * UIProcess/API/efl/ewk_context.cpp:
     26        (ewk_context_cookie_manager_get):
     27        (ewk_context_database_manager_get):
     28        (ewk_context_favicon_database_get):
     29        (ewk_context_storage_manager_get):
     30        (ewk_context_new_with_injected_bundle_path):
     31        * UIProcess/API/efl/ewk_context_menu.cpp:
     32        (ewk_context_menu_items_get):
     33        * UIProcess/API/efl/ewk_context_menu_item.cpp:
     34        (ewk_context_menu_item_new_with_submenu):
     35        (ewk_context_menu_item_title_get):
     36        (ewk_context_menu_item_parent_menu_get):
     37        (ewk_context_menu_item_submenu_get):
     38        * UIProcess/API/efl/ewk_download_job.cpp:
     39        (ewk_download_job_request_get):
     40        (ewk_download_job_response_get):
     41        (ewk_download_job_destination_get):
     42        (ewk_download_job_suggested_filename_get):
     43        * UIProcess/API/efl/ewk_error.cpp:
     44        (ewk_error_url_get):
     45        (ewk_error_description_get):
     46        * UIProcess/API/efl/ewk_file_chooser_request.cpp:
     47        (ewk_file_chooser_request_accepted_mimetypes_get):
     48        * UIProcess/API/efl/ewk_form_submission_request.cpp:
     49        (ewk_form_submission_request_field_names_get):
     50        (ewk_form_submission_request_field_value_get):
     51        * UIProcess/API/efl/ewk_navigation_data.cpp:
     52        (ewk_navigation_data_title_get):
     53        (ewk_navigation_data_original_request_get):
     54        (ewk_navigation_data_url_get):
     55        * UIProcess/API/efl/ewk_navigation_policy_decision.cpp:
     56        (ewk_navigation_policy_frame_name_get):
     57        (ewk_navigation_policy_request_get):
     58        * UIProcess/API/efl/ewk_object.cpp:
     59        (ewk_object_ref):
     60        * UIProcess/API/efl/ewk_popup_menu.cpp:
     61        (ewk_popup_menu_items_get):
     62        * UIProcess/API/efl/ewk_popup_menu_item.cpp:
     63        (ewk_popup_menu_item_text_get):
     64        (ewk_popup_menu_item_tooltip_get):
     65        (ewk_popup_menu_item_accessibility_text_get):
     66        * UIProcess/API/efl/ewk_security_origin.cpp:
     67        (ewk_security_origin_host_get):
     68        (ewk_security_origin_protocol_get):
     69        * UIProcess/API/efl/ewk_settings.cpp:
     70        (ewk_settings_default_text_encoding_name_get):
     71        * UIProcess/API/efl/ewk_url_request.cpp:
     72        (ewk_url_request_url_get):
     73        (ewk_request_cookies_first_party_get):
     74        (ewk_url_request_http_method_get):
     75        * UIProcess/API/efl/ewk_url_response.cpp:
     76        (ewk_url_response_url_get):
     77        (ewk_url_response_mime_type_get):
     78        * UIProcess/API/efl/ewk_url_scheme_request.cpp:
     79        (ewk_url_scheme_request_scheme_get):
     80        (ewk_url_scheme_request_url_get):
     81        (ewk_url_scheme_request_path_get):
     82        * UIProcess/API/efl/ewk_view.cpp:
     83        (toEwkViewChecked):
     84        (EWKViewGetWKView):
     85        (ewk_view_smart_add):
     86        (ewk_view_add_with_context):
     87        (ewk_view_context_get):
     88        (ewk_view_page_group_get):
     89        (ewk_view_url_get):
     90        (ewk_view_favicon_get):
     91        (ewk_view_settings_get):
     92        (ewk_view_title_get):
     93        (ewk_view_theme_get):
     94        (ewk_view_back_forward_list_get):
     95        (ewk_view_custom_encoding_get):
     96        (ewk_view_user_agent_get):
     97
    1982014-01-10  Anders Carlsson  <andersca@apple.com>
    299
  • trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp

    r160833 r161758  
    343343EwkView* EwkView::create(WKViewRef webView, Evas* canvas, Evas_Smart* smart)
    344344{
    345     EINA_SAFETY_ON_NULL_RETURN_VAL(canvas, 0);
     345    EINA_SAFETY_ON_NULL_RETURN_VAL(canvas, nullptr);
    346346
    347347    Evas_Object* evasObject = evas_object_smart_add(canvas, smart ? smart : defaultSmartClassInstance());
    348     EINA_SAFETY_ON_NULL_RETURN_VAL(evasObject, 0);
     348    EINA_SAFETY_ON_NULL_RETURN_VAL(evasObject, nullptr);
    349349
    350350    Ewk_View_Smart_Data* smartData = toSmartData(evasObject);
  • trunk/Source/WebKit2/UIProcess/API/efl/ewk_auth_request.cpp

    r141581 r161758  
    132132const char* ewk_auth_request_suggested_username_get(const Ewk_Auth_Request* request)
    133133{
    134     EWK_OBJ_GET_IMPL_OR_RETURN(const EwkAuthRequest, request, impl, 0);
     134    EWK_OBJ_GET_IMPL_OR_RETURN(const EwkAuthRequest, request, impl, nullptr);
    135135
    136136    return impl->suggestedUsername();
     
    162162const char* ewk_auth_request_realm_get(const Ewk_Auth_Request* request)
    163163{
    164     EWK_OBJ_GET_IMPL_OR_RETURN(const EwkAuthRequest, request, impl, 0);
     164    EWK_OBJ_GET_IMPL_OR_RETURN(const EwkAuthRequest, request, impl, nullptr);
    165165
    166166    return impl->realm();
     
    169169const char* ewk_auth_request_host_get(const Ewk_Auth_Request* request)
    170170{
    171     EWK_OBJ_GET_IMPL_OR_RETURN(const EwkAuthRequest, request, impl, 0);
     171    EWK_OBJ_GET_IMPL_OR_RETURN(const EwkAuthRequest, request, impl, nullptr);
    172172
    173173    return impl->host();
  • trunk/Source/WebKit2/UIProcess/API/efl/ewk_back_forward_list.cpp

    r157748 r161758  
    134134Ewk_Back_Forward_List_Item* ewk_back_forward_list_current_item_get(const Ewk_Back_Forward_List* list)
    135135{
    136     EINA_SAFETY_ON_NULL_RETURN_VAL(list, 0);
     136    EINA_SAFETY_ON_NULL_RETURN_VAL(list, nullptr);
    137137
    138138    return list->currentItem();
     
    141141Ewk_Back_Forward_List_Item* ewk_back_forward_list_previous_item_get(const Ewk_Back_Forward_List* list)
    142142{
    143     EINA_SAFETY_ON_NULL_RETURN_VAL(list, 0);
     143    EINA_SAFETY_ON_NULL_RETURN_VAL(list, nullptr);
    144144
    145145    return list->previousItem();
     
    148148Ewk_Back_Forward_List_Item* ewk_back_forward_list_next_item_get(const Ewk_Back_Forward_List* list)
    149149{
    150     EINA_SAFETY_ON_NULL_RETURN_VAL(list, 0);
     150    EINA_SAFETY_ON_NULL_RETURN_VAL(list, nullptr);
    151151
    152152    return list->nextItem();
     
    155155Ewk_Back_Forward_List_Item* ewk_back_forward_list_item_at_index_get(const Ewk_Back_Forward_List* list, int index)
    156156{
    157     EINA_SAFETY_ON_NULL_RETURN_VAL(list, 0);
     157    EINA_SAFETY_ON_NULL_RETURN_VAL(list, nullptr);
    158158
    159159    return list->itemAt(index);
     
    169169Eina_List* ewk_back_forward_list_n_back_items_copy(const Ewk_Back_Forward_List* list, int limit)
    170170{
    171     EINA_SAFETY_ON_NULL_RETURN_VAL(list, 0);
    172     EINA_SAFETY_ON_FALSE_RETURN_VAL(limit == -1 || limit > 0, 0);
     171    EINA_SAFETY_ON_NULL_RETURN_VAL(list, nullptr);
     172    EINA_SAFETY_ON_FALSE_RETURN_VAL(limit == -1 || limit > 0, nullptr);
    173173
    174174    WKRetainPtr<WKArrayRef> backList = list->backList(limit);
     
    179179Eina_List* ewk_back_forward_list_n_forward_items_copy(const Ewk_Back_Forward_List* list, int limit)
    180180{
    181     EINA_SAFETY_ON_NULL_RETURN_VAL(list, 0);
    182     EINA_SAFETY_ON_FALSE_RETURN_VAL(limit == -1 || limit > 0, 0);
     181    EINA_SAFETY_ON_NULL_RETURN_VAL(list, nullptr);
     182    EINA_SAFETY_ON_FALSE_RETURN_VAL(limit == -1 || limit > 0, nullptr);
    183183
    184184    WKRetainPtr<WKArrayRef> forwardList = list->forwardList(limit);
  • trunk/Source/WebKit2/UIProcess/API/efl/ewk_back_forward_list_item.cpp

    r157748 r161758  
    6060const char* ewk_back_forward_list_item_url_get(const Ewk_Back_Forward_List_Item* item)
    6161{
    62     EWK_OBJ_GET_IMPL_OR_RETURN(const EwkBackForwardListItem, item, impl, 0);
     62    EWK_OBJ_GET_IMPL_OR_RETURN(const EwkBackForwardListItem, item, impl, nullptr);
    6363
    6464    return impl->url();
     
    6767const char* ewk_back_forward_list_item_title_get(const Ewk_Back_Forward_List_Item* item)
    6868{
    69     EWK_OBJ_GET_IMPL_OR_RETURN(const EwkBackForwardListItem, item, impl, 0);
     69    EWK_OBJ_GET_IMPL_OR_RETURN(const EwkBackForwardListItem, item, impl, nullptr);
    7070
    7171    return impl->title();
     
    7474const char* ewk_back_forward_list_item_original_url_get(const Ewk_Back_Forward_List_Item* item)
    7575{
    76     EWK_OBJ_GET_IMPL_OR_RETURN(const EwkBackForwardListItem, item, impl, 0);
     76    EWK_OBJ_GET_IMPL_OR_RETURN(const EwkBackForwardListItem, item, impl, nullptr);
    7777
    7878    return impl->originalURL();
  • trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp

    r161527 r161758  
    232232Ewk_Cookie_Manager* ewk_context_cookie_manager_get(const Ewk_Context* ewkContext)
    233233{
    234     EWK_OBJ_GET_IMPL_OR_RETURN(const EwkContext, ewkContext, impl, 0);
     234    EWK_OBJ_GET_IMPL_OR_RETURN(const EwkContext, ewkContext, impl, nullptr);
    235235
    236236    return const_cast<EwkContext*>(impl)->cookieManager();
     
    239239Ewk_Database_Manager* ewk_context_database_manager_get(const Ewk_Context* ewkContext)
    240240{
    241     EWK_OBJ_GET_IMPL_OR_RETURN(const EwkContext, ewkContext, impl, 0);
     241    EWK_OBJ_GET_IMPL_OR_RETURN(const EwkContext, ewkContext, impl, nullptr);
    242242
    243243    return const_cast<EwkContext*>(impl)->databaseManager();
     
    253253Ewk_Favicon_Database* ewk_context_favicon_database_get(const Ewk_Context* ewkContext)
    254254{
    255     EWK_OBJ_GET_IMPL_OR_RETURN(const EwkContext, ewkContext, impl, 0);
     255    EWK_OBJ_GET_IMPL_OR_RETURN(const EwkContext, ewkContext, impl, nullptr);
    256256
    257257    return const_cast<EwkContext*>(impl)->faviconDatabase();
     
    260260Ewk_Storage_Manager* ewk_context_storage_manager_get(const Ewk_Context* ewkContext)
    261261{
    262     EWK_OBJ_GET_IMPL_OR_RETURN(const EwkContext, ewkContext, impl, 0);
     262    EWK_OBJ_GET_IMPL_OR_RETURN(const EwkContext, ewkContext, impl, nullptr);
    263263
    264264    return impl->storageManager();
     
    287287Ewk_Context* ewk_context_new_with_injected_bundle_path(const char* path)
    288288{
    289     EINA_SAFETY_ON_NULL_RETURN_VAL(path, 0);
     289    EINA_SAFETY_ON_NULL_RETURN_VAL(path, nullptr);
    290290
    291291    return EwkContext::create(String::fromUTF8(path)).leakRef();
  • trunk/Source/WebKit2/UIProcess/API/efl/ewk_context_menu.cpp

    r159190 r161758  
    148148const Eina_List* ewk_context_menu_items_get(const Ewk_Context_Menu* menu)
    149149{
    150     EWK_OBJ_GET_IMPL_OR_RETURN(const EwkContextMenu, menu, impl, 0);
     150    EWK_OBJ_GET_IMPL_OR_RETURN(const EwkContextMenu, menu, impl, nullptr);
    151151
    152152    return impl->items();
  • trunk/Source/WebKit2/UIProcess/API/efl/ewk_context_menu_item.cpp

    r159190 r161758  
    6969Ewk_Context_Menu_Item* ewk_context_menu_item_new_with_submenu(Ewk_Context_Menu_Item_Action action, const char* title, Eina_Bool enabled, Ewk_Context_Menu* subMenu)
    7070{
    71     EWK_OBJ_GET_IMPL_OR_RETURN(EwkContextMenu, subMenu, subMenuImpl, 0);
     71    EWK_OBJ_GET_IMPL_OR_RETURN(EwkContextMenu, subMenu, subMenuImpl, nullptr);
    7272
    7373    return std::make_unique<Ewk_Context_Menu_Item>(EWK_SUBMENU_TYPE, action, title, false, enabled, subMenuImpl).release();
     
    108108const char* ewk_context_menu_item_title_get(const Ewk_Context_Menu_Item* item)
    109109{
    110     EINA_SAFETY_ON_NULL_RETURN_VAL(item, 0);
     110    EINA_SAFETY_ON_NULL_RETURN_VAL(item, nullptr);
    111111
    112112    return item->title();
     
    156156Ewk_Context_Menu* ewk_context_menu_item_parent_menu_get(const Ewk_Context_Menu_Item* item)
    157157{
    158     EINA_SAFETY_ON_NULL_RETURN_VAL(item, 0);
     158    EINA_SAFETY_ON_NULL_RETURN_VAL(item, nullptr);
    159159
    160160    return item->parentMenu();
     
    163163Ewk_Context_Menu* ewk_context_menu_item_submenu_get(const Ewk_Context_Menu_Item* item)
    164164{
    165     EINA_SAFETY_ON_NULL_RETURN_VAL(item, 0);
     165    EINA_SAFETY_ON_NULL_RETURN_VAL(item, nullptr);
    166166
    167167    return item->subMenu();
  • trunk/Source/WebKit2/UIProcess/API/efl/ewk_download_job.cpp

    r141008 r161758  
    7878Ewk_Url_Request* ewk_download_job_request_get(const Ewk_Download_Job* download)
    7979{
    80     EWK_OBJ_GET_IMPL_OR_RETURN(const EwkDownloadJob, download, impl, 0);
     80    EWK_OBJ_GET_IMPL_OR_RETURN(const EwkDownloadJob, download, impl, nullptr);
    8181
    8282    return impl->request();
     
    9595Ewk_Url_Response* ewk_download_job_response_get(const Ewk_Download_Job* download)
    9696{
    97     EWK_OBJ_GET_IMPL_OR_RETURN(const EwkDownloadJob, download, impl, 0);
     97    EWK_OBJ_GET_IMPL_OR_RETURN(const EwkDownloadJob, download, impl, nullptr);
    9898
    9999    return impl->response();
     
    107107const char* ewk_download_job_destination_get(const Ewk_Download_Job* download)
    108108{
    109     EWK_OBJ_GET_IMPL_OR_RETURN(const EwkDownloadJob, download, impl, 0);
     109    EWK_OBJ_GET_IMPL_OR_RETURN(const EwkDownloadJob, download, impl, nullptr);
    110110
    111111    return impl->destination();
     
    134134const char* ewk_download_job_suggested_filename_get(const Ewk_Download_Job* download)
    135135{
    136     EWK_OBJ_GET_IMPL_OR_RETURN(const EwkDownloadJob, download, impl, 0);
     136    EWK_OBJ_GET_IMPL_OR_RETURN(const EwkDownloadJob, download, impl, nullptr);
    137137
    138138    return impl->suggestedFileName();
  • trunk/Source/WebKit2/UIProcess/API/efl/ewk_error.cpp

    r143297 r161758  
    8888const char* ewk_error_url_get(const Ewk_Error* error)
    8989{
    90     EINA_SAFETY_ON_NULL_RETURN_VAL(error, 0);
     90    EINA_SAFETY_ON_NULL_RETURN_VAL(error, nullptr);
    9191
    9292    return error->url();
     
    102102const char* ewk_error_description_get(const Ewk_Error* error)
    103103{
    104     EINA_SAFETY_ON_NULL_RETURN_VAL(error, 0);
     104    EINA_SAFETY_ON_NULL_RETURN_VAL(error, nullptr);
    105105
    106106    return error->description();
  • trunk/Source/WebKit2/UIProcess/API/efl/ewk_file_chooser_request.cpp

    r156063 r161758  
    8686Eina_List* ewk_file_chooser_request_accepted_mimetypes_get(const Ewk_File_Chooser_Request* request)
    8787{
    88     EWK_OBJ_GET_IMPL_OR_RETURN(const EwkFileChooserRequest, request, impl, 0);
     88    EWK_OBJ_GET_IMPL_OR_RETURN(const EwkFileChooserRequest, request, impl, nullptr);
    8989
    9090    Eina_List* mimeTypeList = 0;
  • trunk/Source/WebKit2/UIProcess/API/efl/ewk_form_submission_request.cpp

    r142794 r161758  
    7070Eina_List* ewk_form_submission_request_field_names_get(Ewk_Form_Submission_Request* request)
    7171{
    72     EWK_OBJ_GET_IMPL_OR_RETURN(EwkFormSubmissionRequest, request, impl, 0);
     72    EWK_OBJ_GET_IMPL_OR_RETURN(EwkFormSubmissionRequest, request, impl, nullptr);
    7373
    7474    Eina_List* fieldNames = 0;
     
    8686const char* ewk_form_submission_request_field_value_get(Ewk_Form_Submission_Request* request, const char* name)
    8787{
    88     EWK_OBJ_GET_IMPL_OR_RETURN(EwkFormSubmissionRequest, request, impl, 0);
    89     EINA_SAFETY_ON_NULL_RETURN_VAL(name, 0);
     88    EWK_OBJ_GET_IMPL_OR_RETURN(EwkFormSubmissionRequest, request, impl, nullptr);
     89    EINA_SAFETY_ON_NULL_RETURN_VAL(name, nullptr);
    9090
    9191    return impl->copyFieldValue(name);
  • trunk/Source/WebKit2/UIProcess/API/efl/ewk_navigation_data.cpp

    r133457 r161758  
    5454const char* ewk_navigation_data_title_get(const Ewk_Navigation_Data* data)
    5555{
    56     EWK_OBJ_GET_IMPL_OR_RETURN(const EwkNavigationData, data, impl, 0);
     56    EWK_OBJ_GET_IMPL_OR_RETURN(const EwkNavigationData, data, impl, nullptr);
    5757
    5858    return impl->title();
     
    6161Ewk_Url_Request* ewk_navigation_data_original_request_get(const Ewk_Navigation_Data* data)
    6262{
    63     EWK_OBJ_GET_IMPL_OR_RETURN(const EwkNavigationData, data, impl, 0);
     63    EWK_OBJ_GET_IMPL_OR_RETURN(const EwkNavigationData, data, impl, nullptr);
    6464
    6565    return impl->originalRequest();
     
    6868const char* ewk_navigation_data_url_get(const Ewk_Navigation_Data* data)
    6969{
    70     EWK_OBJ_GET_IMPL_OR_RETURN(const EwkNavigationData, data, impl, 0);
     70    EWK_OBJ_GET_IMPL_OR_RETURN(const EwkNavigationData, data, impl, nullptr);
    7171
    7272    return impl->url();
  • trunk/Source/WebKit2/UIProcess/API/efl/ewk_navigation_policy_decision.cpp

    r133744 r161758  
    116116const char* ewk_navigation_policy_frame_name_get(const Ewk_Navigation_Policy_Decision* decision)
    117117{
    118     EWK_OBJ_GET_IMPL_OR_RETURN(const EwkNavigationPolicyDecision, decision, impl, 0);
     118    EWK_OBJ_GET_IMPL_OR_RETURN(const EwkNavigationPolicyDecision, decision, impl, nullptr);
    119119
    120120    return impl->frameName();
     
    123123Ewk_Url_Request* ewk_navigation_policy_request_get(const Ewk_Navigation_Policy_Decision* decision)
    124124{
    125     EWK_OBJ_GET_IMPL_OR_RETURN(const EwkNavigationPolicyDecision, decision, impl, 0);
     125    EWK_OBJ_GET_IMPL_OR_RETURN(const EwkNavigationPolicyDecision, decision, impl, nullptr);
    126126
    127127    return impl->request();
  • trunk/Source/WebKit2/UIProcess/API/efl/ewk_object.cpp

    r133278 r161758  
    3131Ewk_Object* ewk_object_ref(Ewk_Object* object)
    3232{
    33     EINA_SAFETY_ON_NULL_RETURN_VAL(object, 0);
     33    EINA_SAFETY_ON_NULL_RETURN_VAL(object, nullptr);
    3434    object->ref();
    3535
  • trunk/Source/WebKit2/UIProcess/API/efl/ewk_popup_menu.cpp

    r159190 r161758  
    113113const Eina_List* ewk_popup_menu_items_get(const Ewk_Popup_Menu* popupMenu)
    114114{
    115     EINA_SAFETY_ON_NULL_RETURN_VAL(popupMenu, 0);
     115    EINA_SAFETY_ON_NULL_RETURN_VAL(popupMenu, nullptr);
    116116
    117117    return popupMenu->items();
  • trunk/Source/WebKit2/UIProcess/API/efl/ewk_popup_menu_item.cpp

    r143444 r161758  
    101101const char* ewk_popup_menu_item_text_get(const Ewk_Popup_Menu_Item* item)
    102102{
    103     EINA_SAFETY_ON_NULL_RETURN_VAL(item, 0);
     103    EINA_SAFETY_ON_NULL_RETURN_VAL(item, nullptr);
    104104
    105105    return item->text();
     
    122122const char* ewk_popup_menu_item_tooltip_get(const Ewk_Popup_Menu_Item* item)
    123123{
    124     EINA_SAFETY_ON_NULL_RETURN_VAL(item, 0);
     124    EINA_SAFETY_ON_NULL_RETURN_VAL(item, nullptr);
    125125
    126126    return item->tooltipText();
     
    129129const char* ewk_popup_menu_item_accessibility_text_get(const Ewk_Popup_Menu_Item* item)
    130130{
    131     EINA_SAFETY_ON_NULL_RETURN_VAL(item, 0);
     131    EINA_SAFETY_ON_NULL_RETURN_VAL(item, nullptr);
    132132
    133133    return item->accessibilityText();
  • trunk/Source/WebKit2/UIProcess/API/efl/ewk_security_origin.cpp

    r150787 r161758  
    6363const char* ewk_security_origin_host_get(const Ewk_Security_Origin* origin)
    6464{
    65     EWK_OBJ_GET_IMPL_OR_RETURN(const EwkSecurityOrigin, origin, impl, 0);
     65    EWK_OBJ_GET_IMPL_OR_RETURN(const EwkSecurityOrigin, origin, impl, nullptr);
    6666
    6767    return impl->host();
     
    7070const char* ewk_security_origin_protocol_get(const Ewk_Security_Origin* origin)
    7171{
    72     EWK_OBJ_GET_IMPL_OR_RETURN(const EwkSecurityOrigin, origin, impl, 0);
     72    EWK_OBJ_GET_IMPL_OR_RETURN(const EwkSecurityOrigin, origin, impl, nullptr);
    7373
    7474    return impl->protocol();
  • trunk/Source/WebKit2/UIProcess/API/efl/ewk_settings.cpp

    r161624 r161758  
    177177const char* ewk_settings_default_text_encoding_name_get(const Ewk_Settings* settings)
    178178{
    179     EINA_SAFETY_ON_NULL_RETURN_VAL(settings, 0);
     179    EINA_SAFETY_ON_NULL_RETURN_VAL(settings, nullptr);
    180180
    181181    WKEinaSharedString name = settings->preferences()->defaultTextEncodingName().utf8().data();
  • trunk/Source/WebKit2/UIProcess/API/efl/ewk_url_request.cpp

    r133457 r161758  
    5454const char* ewk_url_request_url_get(const Ewk_Url_Request* request)
    5555{
    56     EWK_OBJ_GET_IMPL_OR_RETURN(const EwkUrlRequest, request, impl, 0);
     56    EWK_OBJ_GET_IMPL_OR_RETURN(const EwkUrlRequest, request, impl, nullptr);
    5757
    5858    return impl->url();
     
    6161const char* ewk_request_cookies_first_party_get(const Ewk_Url_Request* request)
    6262{
    63     EWK_OBJ_GET_IMPL_OR_RETURN(const EwkUrlRequest, request, impl, 0);
     63    EWK_OBJ_GET_IMPL_OR_RETURN(const EwkUrlRequest, request, impl, nullptr);
    6464
    6565    return impl->firstParty();
     
    6868const char* ewk_url_request_http_method_get(const Ewk_Url_Request* request)
    6969{
    70     EWK_OBJ_GET_IMPL_OR_RETURN(const EwkUrlRequest, request, impl, 0);
     70    EWK_OBJ_GET_IMPL_OR_RETURN(const EwkUrlRequest, request, impl, nullptr);
    7171
    7272    return impl->httpMethod();
  • trunk/Source/WebKit2/UIProcess/API/efl/ewk_url_response.cpp

    r140962 r161758  
    6060const char* ewk_url_response_url_get(const Ewk_Url_Response* response)
    6161{
    62     EWK_OBJ_GET_IMPL_OR_RETURN(const EwkUrlResponse, response, impl, 0);
     62    EWK_OBJ_GET_IMPL_OR_RETURN(const EwkUrlResponse, response, impl, nullptr);
    6363
    6464    return impl->url();
     
    7474const char* ewk_url_response_mime_type_get(const Ewk_Url_Response* response)
    7575{
    76     EWK_OBJ_GET_IMPL_OR_RETURN(const EwkUrlResponse, response, impl, 0);
     76    EWK_OBJ_GET_IMPL_OR_RETURN(const EwkUrlResponse, response, impl, nullptr);
    7777
    7878    return impl->mimeType();
  • trunk/Source/WebKit2/UIProcess/API/efl/ewk_url_scheme_request.cpp

    r141780 r161758  
    7474const char* ewk_url_scheme_request_scheme_get(const Ewk_Url_Scheme_Request* request)
    7575{
    76     EWK_OBJ_GET_IMPL_OR_RETURN(const EwkUrlSchemeRequest, request, impl, 0);
     76    EWK_OBJ_GET_IMPL_OR_RETURN(const EwkUrlSchemeRequest, request, impl, nullptr);
    7777
    7878    return impl->scheme();
     
    8181const char* ewk_url_scheme_request_url_get(const Ewk_Url_Scheme_Request* request)
    8282{
    83     EWK_OBJ_GET_IMPL_OR_RETURN(const EwkUrlSchemeRequest, request, impl, 0);
     83    EWK_OBJ_GET_IMPL_OR_RETURN(const EwkUrlSchemeRequest, request, impl, nullptr);
    8484
    8585    return impl->url();
     
    8888const char* ewk_url_scheme_request_path_get(const Ewk_Url_Scheme_Request* request)
    8989{
    90     EWK_OBJ_GET_IMPL_OR_RETURN(const EwkUrlSchemeRequest, request, impl, 0);
     90    EWK_OBJ_GET_IMPL_OR_RETURN(const EwkUrlSchemeRequest, request, impl, nullptr);
    9191
    9292    return impl->path();
  • trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp

    r161527 r161758  
    6363static inline EwkView* toEwkViewChecked(const Evas_Object* evasObject)
    6464{
    65     EINA_SAFETY_ON_NULL_RETURN_VAL(evasObject, 0);
     65    EINA_SAFETY_ON_NULL_RETURN_VAL(evasObject, nullptr);
    6666    if (!isEwkViewEvasObject(evasObject))
    6767        return 0;
    6868
    6969    Ewk_View_Smart_Data* smartData = static_cast<Ewk_View_Smart_Data*>(evas_object_smart_data_get(evasObject));
    70     EINA_SAFETY_ON_NULL_RETURN_VAL(smartData, 0);
     70    EINA_SAFETY_ON_NULL_RETURN_VAL(smartData, nullptr);
    7171
    7272    return smartData->priv;
     
    102102WKViewRef EWKViewGetWKView(Evas_Object* ewkView)
    103103{
    104     EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, 0);
     104    EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, nullptr);
    105105
    106106    return impl->wkView();
     
    112112    EwkPageGroup* ewkPageGroup = ewk_object_cast<EwkPageGroup*>(pageGroup);
    113113
    114     EINA_SAFETY_ON_NULL_RETURN_VAL(ewkContext, 0);
    115     EINA_SAFETY_ON_NULL_RETURN_VAL(ewkContext->wkContext(), 0);
    116     EINA_SAFETY_ON_NULL_RETURN_VAL(ewkPageGroup, 0);
    117     EINA_SAFETY_ON_NULL_RETURN_VAL(ewkPageGroup->wkPageGroup(), 0);
     114    EINA_SAFETY_ON_NULL_RETURN_VAL(ewkContext, nullptr);
     115    EINA_SAFETY_ON_NULL_RETURN_VAL(ewkContext->wkContext(), nullptr);
     116    EINA_SAFETY_ON_NULL_RETURN_VAL(ewkPageGroup, nullptr);
     117    EINA_SAFETY_ON_NULL_RETURN_VAL(ewkPageGroup->wkPageGroup(), nullptr);
    118118
    119119    return EWKViewCreate(ewkContext->wkContext(), ewkPageGroup->wkPageGroup(), canvas, smart);
     
    128128{
    129129    EwkContext* ewkContext = ewk_object_cast<EwkContext*>(context);
    130     EINA_SAFETY_ON_NULL_RETURN_VAL(ewkContext, 0);
    131     EINA_SAFETY_ON_NULL_RETURN_VAL(ewkContext->wkContext(), 0);
     130    EINA_SAFETY_ON_NULL_RETURN_VAL(ewkContext, nullptr);
     131    EINA_SAFETY_ON_NULL_RETURN_VAL(ewkContext->wkContext(), nullptr);
    132132
    133133    return EWKViewCreate(ewkContext->wkContext(), 0, canvas, 0);
     
    136136Ewk_Context* ewk_view_context_get(const Evas_Object* ewkView)
    137137{
    138     EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, 0);
     138    EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, nullptr);
    139139
    140140    return impl->ewkContext();
     
    143143Ewk_Page_Group* ewk_view_page_group_get(const Evas_Object* ewkView)
    144144{
    145     EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, 0);
     145    EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, nullptr);
    146146
    147147    return impl->ewkPageGroup();
     
    162162const char* ewk_view_url_get(const Evas_Object* ewkView)
    163163{
    164     EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, 0);
     164    EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, nullptr);
    165165
    166166    return impl->url();
     
    169169Evas_Object* ewk_view_favicon_get(const Evas_Object* ewkView)
    170170{
    171     EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, 0);
     171    EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, nullptr);
    172172
    173173    return impl->createFavicon();
     
    205205Ewk_Settings* ewk_view_settings_get(const Evas_Object* ewkView)
    206206{
    207     EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, 0);
     207    EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, nullptr);
    208208
    209209    return impl->settings();
     
    212212const char* ewk_view_title_get(const Evas_Object* ewkView)
    213213{
    214     EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, 0);
     214    EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, nullptr);
    215215
    216216    return impl->title();
     
    264264const char* ewk_view_theme_get(const Evas_Object* ewkView)
    265265{
    266     EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, 0);
     266    EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, nullptr);
    267267
    268268    return impl->themePath();
     
    309309Ewk_Back_Forward_List* ewk_view_back_forward_list_get(const Evas_Object* ewkView)
    310310{
    311     EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, 0);
     311    EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, nullptr);
    312312
    313313    return impl->backForwardList();
     
    345345const char* ewk_view_custom_encoding_get(const Evas_Object* ewkView)
    346346{
    347     EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, 0);
     347    EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, nullptr);
    348348
    349349    return impl->customTextEncodingName();
     
    361361const char* ewk_view_user_agent_get(const Evas_Object* ewkView)
    362362{
    363     EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, 0);
     363    EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, nullptr);
    364364
    365365    return impl->userAgent();
Note: See TracChangeset for help on using the changeset viewer.