Changeset 161758 in webkit
- Timestamp:
- Jan 11, 2014 12:52:01 AM (10 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 23 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r161751 r161758 1 2014-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 1 98 2014-01-10 Anders Carlsson <andersca@apple.com> 2 99 -
trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp
r160833 r161758 343 343 EwkView* EwkView::create(WKViewRef webView, Evas* canvas, Evas_Smart* smart) 344 344 { 345 EINA_SAFETY_ON_NULL_RETURN_VAL(canvas, 0);345 EINA_SAFETY_ON_NULL_RETURN_VAL(canvas, nullptr); 346 346 347 347 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); 349 349 350 350 Ewk_View_Smart_Data* smartData = toSmartData(evasObject); -
trunk/Source/WebKit2/UIProcess/API/efl/ewk_auth_request.cpp
r141581 r161758 132 132 const char* ewk_auth_request_suggested_username_get(const Ewk_Auth_Request* request) 133 133 { 134 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkAuthRequest, request, impl, 0);134 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkAuthRequest, request, impl, nullptr); 135 135 136 136 return impl->suggestedUsername(); … … 162 162 const char* ewk_auth_request_realm_get(const Ewk_Auth_Request* request) 163 163 { 164 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkAuthRequest, request, impl, 0);164 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkAuthRequest, request, impl, nullptr); 165 165 166 166 return impl->realm(); … … 169 169 const char* ewk_auth_request_host_get(const Ewk_Auth_Request* request) 170 170 { 171 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkAuthRequest, request, impl, 0);171 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkAuthRequest, request, impl, nullptr); 172 172 173 173 return impl->host(); -
trunk/Source/WebKit2/UIProcess/API/efl/ewk_back_forward_list.cpp
r157748 r161758 134 134 Ewk_Back_Forward_List_Item* ewk_back_forward_list_current_item_get(const Ewk_Back_Forward_List* list) 135 135 { 136 EINA_SAFETY_ON_NULL_RETURN_VAL(list, 0);136 EINA_SAFETY_ON_NULL_RETURN_VAL(list, nullptr); 137 137 138 138 return list->currentItem(); … … 141 141 Ewk_Back_Forward_List_Item* ewk_back_forward_list_previous_item_get(const Ewk_Back_Forward_List* list) 142 142 { 143 EINA_SAFETY_ON_NULL_RETURN_VAL(list, 0);143 EINA_SAFETY_ON_NULL_RETURN_VAL(list, nullptr); 144 144 145 145 return list->previousItem(); … … 148 148 Ewk_Back_Forward_List_Item* ewk_back_forward_list_next_item_get(const Ewk_Back_Forward_List* list) 149 149 { 150 EINA_SAFETY_ON_NULL_RETURN_VAL(list, 0);150 EINA_SAFETY_ON_NULL_RETURN_VAL(list, nullptr); 151 151 152 152 return list->nextItem(); … … 155 155 Ewk_Back_Forward_List_Item* ewk_back_forward_list_item_at_index_get(const Ewk_Back_Forward_List* list, int index) 156 156 { 157 EINA_SAFETY_ON_NULL_RETURN_VAL(list, 0);157 EINA_SAFETY_ON_NULL_RETURN_VAL(list, nullptr); 158 158 159 159 return list->itemAt(index); … … 169 169 Eina_List* ewk_back_forward_list_n_back_items_copy(const Ewk_Back_Forward_List* list, int limit) 170 170 { 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); 173 173 174 174 WKRetainPtr<WKArrayRef> backList = list->backList(limit); … … 179 179 Eina_List* ewk_back_forward_list_n_forward_items_copy(const Ewk_Back_Forward_List* list, int limit) 180 180 { 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); 183 183 184 184 WKRetainPtr<WKArrayRef> forwardList = list->forwardList(limit); -
trunk/Source/WebKit2/UIProcess/API/efl/ewk_back_forward_list_item.cpp
r157748 r161758 60 60 const char* ewk_back_forward_list_item_url_get(const Ewk_Back_Forward_List_Item* item) 61 61 { 62 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkBackForwardListItem, item, impl, 0);62 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkBackForwardListItem, item, impl, nullptr); 63 63 64 64 return impl->url(); … … 67 67 const char* ewk_back_forward_list_item_title_get(const Ewk_Back_Forward_List_Item* item) 68 68 { 69 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkBackForwardListItem, item, impl, 0);69 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkBackForwardListItem, item, impl, nullptr); 70 70 71 71 return impl->title(); … … 74 74 const char* ewk_back_forward_list_item_original_url_get(const Ewk_Back_Forward_List_Item* item) 75 75 { 76 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkBackForwardListItem, item, impl, 0);76 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkBackForwardListItem, item, impl, nullptr); 77 77 78 78 return impl->originalURL(); -
trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp
r161527 r161758 232 232 Ewk_Cookie_Manager* ewk_context_cookie_manager_get(const Ewk_Context* ewkContext) 233 233 { 234 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkContext, ewkContext, impl, 0);234 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkContext, ewkContext, impl, nullptr); 235 235 236 236 return const_cast<EwkContext*>(impl)->cookieManager(); … … 239 239 Ewk_Database_Manager* ewk_context_database_manager_get(const Ewk_Context* ewkContext) 240 240 { 241 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkContext, ewkContext, impl, 0);241 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkContext, ewkContext, impl, nullptr); 242 242 243 243 return const_cast<EwkContext*>(impl)->databaseManager(); … … 253 253 Ewk_Favicon_Database* ewk_context_favicon_database_get(const Ewk_Context* ewkContext) 254 254 { 255 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkContext, ewkContext, impl, 0);255 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkContext, ewkContext, impl, nullptr); 256 256 257 257 return const_cast<EwkContext*>(impl)->faviconDatabase(); … … 260 260 Ewk_Storage_Manager* ewk_context_storage_manager_get(const Ewk_Context* ewkContext) 261 261 { 262 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkContext, ewkContext, impl, 0);262 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkContext, ewkContext, impl, nullptr); 263 263 264 264 return impl->storageManager(); … … 287 287 Ewk_Context* ewk_context_new_with_injected_bundle_path(const char* path) 288 288 { 289 EINA_SAFETY_ON_NULL_RETURN_VAL(path, 0);289 EINA_SAFETY_ON_NULL_RETURN_VAL(path, nullptr); 290 290 291 291 return EwkContext::create(String::fromUTF8(path)).leakRef(); -
trunk/Source/WebKit2/UIProcess/API/efl/ewk_context_menu.cpp
r159190 r161758 148 148 const Eina_List* ewk_context_menu_items_get(const Ewk_Context_Menu* menu) 149 149 { 150 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkContextMenu, menu, impl, 0);150 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkContextMenu, menu, impl, nullptr); 151 151 152 152 return impl->items(); -
trunk/Source/WebKit2/UIProcess/API/efl/ewk_context_menu_item.cpp
r159190 r161758 69 69 Ewk_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) 70 70 { 71 EWK_OBJ_GET_IMPL_OR_RETURN(EwkContextMenu, subMenu, subMenuImpl, 0);71 EWK_OBJ_GET_IMPL_OR_RETURN(EwkContextMenu, subMenu, subMenuImpl, nullptr); 72 72 73 73 return std::make_unique<Ewk_Context_Menu_Item>(EWK_SUBMENU_TYPE, action, title, false, enabled, subMenuImpl).release(); … … 108 108 const char* ewk_context_menu_item_title_get(const Ewk_Context_Menu_Item* item) 109 109 { 110 EINA_SAFETY_ON_NULL_RETURN_VAL(item, 0);110 EINA_SAFETY_ON_NULL_RETURN_VAL(item, nullptr); 111 111 112 112 return item->title(); … … 156 156 Ewk_Context_Menu* ewk_context_menu_item_parent_menu_get(const Ewk_Context_Menu_Item* item) 157 157 { 158 EINA_SAFETY_ON_NULL_RETURN_VAL(item, 0);158 EINA_SAFETY_ON_NULL_RETURN_VAL(item, nullptr); 159 159 160 160 return item->parentMenu(); … … 163 163 Ewk_Context_Menu* ewk_context_menu_item_submenu_get(const Ewk_Context_Menu_Item* item) 164 164 { 165 EINA_SAFETY_ON_NULL_RETURN_VAL(item, 0);165 EINA_SAFETY_ON_NULL_RETURN_VAL(item, nullptr); 166 166 167 167 return item->subMenu(); -
trunk/Source/WebKit2/UIProcess/API/efl/ewk_download_job.cpp
r141008 r161758 78 78 Ewk_Url_Request* ewk_download_job_request_get(const Ewk_Download_Job* download) 79 79 { 80 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkDownloadJob, download, impl, 0);80 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkDownloadJob, download, impl, nullptr); 81 81 82 82 return impl->request(); … … 95 95 Ewk_Url_Response* ewk_download_job_response_get(const Ewk_Download_Job* download) 96 96 { 97 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkDownloadJob, download, impl, 0);97 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkDownloadJob, download, impl, nullptr); 98 98 99 99 return impl->response(); … … 107 107 const char* ewk_download_job_destination_get(const Ewk_Download_Job* download) 108 108 { 109 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkDownloadJob, download, impl, 0);109 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkDownloadJob, download, impl, nullptr); 110 110 111 111 return impl->destination(); … … 134 134 const char* ewk_download_job_suggested_filename_get(const Ewk_Download_Job* download) 135 135 { 136 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkDownloadJob, download, impl, 0);136 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkDownloadJob, download, impl, nullptr); 137 137 138 138 return impl->suggestedFileName(); -
trunk/Source/WebKit2/UIProcess/API/efl/ewk_error.cpp
r143297 r161758 88 88 const char* ewk_error_url_get(const Ewk_Error* error) 89 89 { 90 EINA_SAFETY_ON_NULL_RETURN_VAL(error, 0);90 EINA_SAFETY_ON_NULL_RETURN_VAL(error, nullptr); 91 91 92 92 return error->url(); … … 102 102 const char* ewk_error_description_get(const Ewk_Error* error) 103 103 { 104 EINA_SAFETY_ON_NULL_RETURN_VAL(error, 0);104 EINA_SAFETY_ON_NULL_RETURN_VAL(error, nullptr); 105 105 106 106 return error->description(); -
trunk/Source/WebKit2/UIProcess/API/efl/ewk_file_chooser_request.cpp
r156063 r161758 86 86 Eina_List* ewk_file_chooser_request_accepted_mimetypes_get(const Ewk_File_Chooser_Request* request) 87 87 { 88 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkFileChooserRequest, request, impl, 0);88 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkFileChooserRequest, request, impl, nullptr); 89 89 90 90 Eina_List* mimeTypeList = 0; -
trunk/Source/WebKit2/UIProcess/API/efl/ewk_form_submission_request.cpp
r142794 r161758 70 70 Eina_List* ewk_form_submission_request_field_names_get(Ewk_Form_Submission_Request* request) 71 71 { 72 EWK_OBJ_GET_IMPL_OR_RETURN(EwkFormSubmissionRequest, request, impl, 0);72 EWK_OBJ_GET_IMPL_OR_RETURN(EwkFormSubmissionRequest, request, impl, nullptr); 73 73 74 74 Eina_List* fieldNames = 0; … … 86 86 const char* ewk_form_submission_request_field_value_get(Ewk_Form_Submission_Request* request, const char* name) 87 87 { 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); 90 90 91 91 return impl->copyFieldValue(name); -
trunk/Source/WebKit2/UIProcess/API/efl/ewk_navigation_data.cpp
r133457 r161758 54 54 const char* ewk_navigation_data_title_get(const Ewk_Navigation_Data* data) 55 55 { 56 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkNavigationData, data, impl, 0);56 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkNavigationData, data, impl, nullptr); 57 57 58 58 return impl->title(); … … 61 61 Ewk_Url_Request* ewk_navigation_data_original_request_get(const Ewk_Navigation_Data* data) 62 62 { 63 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkNavigationData, data, impl, 0);63 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkNavigationData, data, impl, nullptr); 64 64 65 65 return impl->originalRequest(); … … 68 68 const char* ewk_navigation_data_url_get(const Ewk_Navigation_Data* data) 69 69 { 70 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkNavigationData, data, impl, 0);70 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkNavigationData, data, impl, nullptr); 71 71 72 72 return impl->url(); -
trunk/Source/WebKit2/UIProcess/API/efl/ewk_navigation_policy_decision.cpp
r133744 r161758 116 116 const char* ewk_navigation_policy_frame_name_get(const Ewk_Navigation_Policy_Decision* decision) 117 117 { 118 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkNavigationPolicyDecision, decision, impl, 0);118 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkNavigationPolicyDecision, decision, impl, nullptr); 119 119 120 120 return impl->frameName(); … … 123 123 Ewk_Url_Request* ewk_navigation_policy_request_get(const Ewk_Navigation_Policy_Decision* decision) 124 124 { 125 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkNavigationPolicyDecision, decision, impl, 0);125 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkNavigationPolicyDecision, decision, impl, nullptr); 126 126 127 127 return impl->request(); -
trunk/Source/WebKit2/UIProcess/API/efl/ewk_object.cpp
r133278 r161758 31 31 Ewk_Object* ewk_object_ref(Ewk_Object* object) 32 32 { 33 EINA_SAFETY_ON_NULL_RETURN_VAL(object, 0);33 EINA_SAFETY_ON_NULL_RETURN_VAL(object, nullptr); 34 34 object->ref(); 35 35 -
trunk/Source/WebKit2/UIProcess/API/efl/ewk_popup_menu.cpp
r159190 r161758 113 113 const Eina_List* ewk_popup_menu_items_get(const Ewk_Popup_Menu* popupMenu) 114 114 { 115 EINA_SAFETY_ON_NULL_RETURN_VAL(popupMenu, 0);115 EINA_SAFETY_ON_NULL_RETURN_VAL(popupMenu, nullptr); 116 116 117 117 return popupMenu->items(); -
trunk/Source/WebKit2/UIProcess/API/efl/ewk_popup_menu_item.cpp
r143444 r161758 101 101 const char* ewk_popup_menu_item_text_get(const Ewk_Popup_Menu_Item* item) 102 102 { 103 EINA_SAFETY_ON_NULL_RETURN_VAL(item, 0);103 EINA_SAFETY_ON_NULL_RETURN_VAL(item, nullptr); 104 104 105 105 return item->text(); … … 122 122 const char* ewk_popup_menu_item_tooltip_get(const Ewk_Popup_Menu_Item* item) 123 123 { 124 EINA_SAFETY_ON_NULL_RETURN_VAL(item, 0);124 EINA_SAFETY_ON_NULL_RETURN_VAL(item, nullptr); 125 125 126 126 return item->tooltipText(); … … 129 129 const char* ewk_popup_menu_item_accessibility_text_get(const Ewk_Popup_Menu_Item* item) 130 130 { 131 EINA_SAFETY_ON_NULL_RETURN_VAL(item, 0);131 EINA_SAFETY_ON_NULL_RETURN_VAL(item, nullptr); 132 132 133 133 return item->accessibilityText(); -
trunk/Source/WebKit2/UIProcess/API/efl/ewk_security_origin.cpp
r150787 r161758 63 63 const char* ewk_security_origin_host_get(const Ewk_Security_Origin* origin) 64 64 { 65 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkSecurityOrigin, origin, impl, 0);65 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkSecurityOrigin, origin, impl, nullptr); 66 66 67 67 return impl->host(); … … 70 70 const char* ewk_security_origin_protocol_get(const Ewk_Security_Origin* origin) 71 71 { 72 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkSecurityOrigin, origin, impl, 0);72 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkSecurityOrigin, origin, impl, nullptr); 73 73 74 74 return impl->protocol(); -
trunk/Source/WebKit2/UIProcess/API/efl/ewk_settings.cpp
r161624 r161758 177 177 const char* ewk_settings_default_text_encoding_name_get(const Ewk_Settings* settings) 178 178 { 179 EINA_SAFETY_ON_NULL_RETURN_VAL(settings, 0);179 EINA_SAFETY_ON_NULL_RETURN_VAL(settings, nullptr); 180 180 181 181 WKEinaSharedString name = settings->preferences()->defaultTextEncodingName().utf8().data(); -
trunk/Source/WebKit2/UIProcess/API/efl/ewk_url_request.cpp
r133457 r161758 54 54 const char* ewk_url_request_url_get(const Ewk_Url_Request* request) 55 55 { 56 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkUrlRequest, request, impl, 0);56 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkUrlRequest, request, impl, nullptr); 57 57 58 58 return impl->url(); … … 61 61 const char* ewk_request_cookies_first_party_get(const Ewk_Url_Request* request) 62 62 { 63 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkUrlRequest, request, impl, 0);63 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkUrlRequest, request, impl, nullptr); 64 64 65 65 return impl->firstParty(); … … 68 68 const char* ewk_url_request_http_method_get(const Ewk_Url_Request* request) 69 69 { 70 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkUrlRequest, request, impl, 0);70 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkUrlRequest, request, impl, nullptr); 71 71 72 72 return impl->httpMethod(); -
trunk/Source/WebKit2/UIProcess/API/efl/ewk_url_response.cpp
r140962 r161758 60 60 const char* ewk_url_response_url_get(const Ewk_Url_Response* response) 61 61 { 62 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkUrlResponse, response, impl, 0);62 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkUrlResponse, response, impl, nullptr); 63 63 64 64 return impl->url(); … … 74 74 const char* ewk_url_response_mime_type_get(const Ewk_Url_Response* response) 75 75 { 76 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkUrlResponse, response, impl, 0);76 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkUrlResponse, response, impl, nullptr); 77 77 78 78 return impl->mimeType(); -
trunk/Source/WebKit2/UIProcess/API/efl/ewk_url_scheme_request.cpp
r141780 r161758 74 74 const char* ewk_url_scheme_request_scheme_get(const Ewk_Url_Scheme_Request* request) 75 75 { 76 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkUrlSchemeRequest, request, impl, 0);76 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkUrlSchemeRequest, request, impl, nullptr); 77 77 78 78 return impl->scheme(); … … 81 81 const char* ewk_url_scheme_request_url_get(const Ewk_Url_Scheme_Request* request) 82 82 { 83 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkUrlSchemeRequest, request, impl, 0);83 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkUrlSchemeRequest, request, impl, nullptr); 84 84 85 85 return impl->url(); … … 88 88 const char* ewk_url_scheme_request_path_get(const Ewk_Url_Scheme_Request* request) 89 89 { 90 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkUrlSchemeRequest, request, impl, 0);90 EWK_OBJ_GET_IMPL_OR_RETURN(const EwkUrlSchemeRequest, request, impl, nullptr); 91 91 92 92 return impl->path(); -
trunk/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp
r161527 r161758 63 63 static inline EwkView* toEwkViewChecked(const Evas_Object* evasObject) 64 64 { 65 EINA_SAFETY_ON_NULL_RETURN_VAL(evasObject, 0);65 EINA_SAFETY_ON_NULL_RETURN_VAL(evasObject, nullptr); 66 66 if (!isEwkViewEvasObject(evasObject)) 67 67 return 0; 68 68 69 69 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); 71 71 72 72 return smartData->priv; … … 102 102 WKViewRef EWKViewGetWKView(Evas_Object* ewkView) 103 103 { 104 EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, 0);104 EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, nullptr); 105 105 106 106 return impl->wkView(); … … 112 112 EwkPageGroup* ewkPageGroup = ewk_object_cast<EwkPageGroup*>(pageGroup); 113 113 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); 118 118 119 119 return EWKViewCreate(ewkContext->wkContext(), ewkPageGroup->wkPageGroup(), canvas, smart); … … 128 128 { 129 129 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); 132 132 133 133 return EWKViewCreate(ewkContext->wkContext(), 0, canvas, 0); … … 136 136 Ewk_Context* ewk_view_context_get(const Evas_Object* ewkView) 137 137 { 138 EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, 0);138 EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, nullptr); 139 139 140 140 return impl->ewkContext(); … … 143 143 Ewk_Page_Group* ewk_view_page_group_get(const Evas_Object* ewkView) 144 144 { 145 EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, 0);145 EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, nullptr); 146 146 147 147 return impl->ewkPageGroup(); … … 162 162 const char* ewk_view_url_get(const Evas_Object* ewkView) 163 163 { 164 EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, 0);164 EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, nullptr); 165 165 166 166 return impl->url(); … … 169 169 Evas_Object* ewk_view_favicon_get(const Evas_Object* ewkView) 170 170 { 171 EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, 0);171 EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, nullptr); 172 172 173 173 return impl->createFavicon(); … … 205 205 Ewk_Settings* ewk_view_settings_get(const Evas_Object* ewkView) 206 206 { 207 EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, 0);207 EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, nullptr); 208 208 209 209 return impl->settings(); … … 212 212 const char* ewk_view_title_get(const Evas_Object* ewkView) 213 213 { 214 EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, 0);214 EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, nullptr); 215 215 216 216 return impl->title(); … … 264 264 const char* ewk_view_theme_get(const Evas_Object* ewkView) 265 265 { 266 EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, 0);266 EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, nullptr); 267 267 268 268 return impl->themePath(); … … 309 309 Ewk_Back_Forward_List* ewk_view_back_forward_list_get(const Evas_Object* ewkView) 310 310 { 311 EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, 0);311 EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, nullptr); 312 312 313 313 return impl->backForwardList(); … … 345 345 const char* ewk_view_custom_encoding_get(const Evas_Object* ewkView) 346 346 { 347 EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, 0);347 EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, nullptr); 348 348 349 349 return impl->customTextEncodingName(); … … 361 361 const char* ewk_view_user_agent_get(const Evas_Object* ewkView) 362 362 { 363 EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, 0);363 EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, nullptr); 364 364 365 365 return impl->userAgent();
Note: See TracChangeset
for help on using the changeset viewer.