From a8d93c60e97f13b9450a806b05f36c597414121b Mon Sep 17 00:00:00 2001 From: jiangyuwei Date: Tue, 28 Feb 2023 11:14:01 +0800 Subject: [PATCH] [M108 Migration] Add an ewk api logs for debugging Important and frequently used ewk api logs are lacking, add logs for debugging. Reference: https://review.tizen.org/gerrit/#/c/283987/ Change-Id: I661b4cf68f037a96b5b60cf2e72567815f100ea4 Signed-off-by: jiangyuwei --- .../ewk/efl_integration/public/ewk_context.cc | 18 ++++++++- tizen_src/ewk/efl_integration/public/ewk_view.cc | 45 ++++++++++++++++++++-- 2 files changed, 58 insertions(+), 5 deletions(-) diff --git a/tizen_src/ewk/efl_integration/public/ewk_context.cc b/tizen_src/ewk/efl_integration/public/ewk_context.cc index 64da8fa..2eee282 100644 --- a/tizen_src/ewk/efl_integration/public/ewk_context.cc +++ b/tizen_src/ewk/efl_integration/public/ewk_context.cc @@ -101,6 +101,7 @@ Ewk_Context* ewk_context_new() Ewk_Context *ewk_context_new_with_injected_bundle_path(const char *path) { EINA_SAFETY_ON_NULL_RETURN_VAL(path, NULL); + LOG(INFO) << "path: " << path; // To create new Ewk_Context with default incognito = false. return Ewk_Context::Create(false,std::string(path)); } @@ -202,6 +203,7 @@ Evas_Object* ewk_context_icon_database_icon_object_add(Ewk_Context* context, con Eina_Bool ewk_context_local_file_system_all_delete(Ewk_Context *context) { EINA_SAFETY_ON_NULL_RETURN_VAL(context, EINA_FALSE); + LOG(INFO) << "context: " << context; context->FileSystemDelete(GURL("")); return true; } @@ -210,6 +212,7 @@ Eina_Bool ewk_context_local_file_system_delete(Ewk_Context *context, Ewk_Securit { EINA_SAFETY_ON_NULL_RETURN_VAL(origin, EINA_FALSE); EINA_SAFETY_ON_NULL_RETURN_VAL(context, EINA_FALSE); + LOG(INFO) << "context: " << context; std::ostringstream ss; ss << ewk_security_origin_protocol_get(origin) << "://" << ewk_security_origin_host_get(origin); @@ -229,6 +232,7 @@ Eina_Bool ewk_context_local_file_system_origins_get(const Ewk_Context *context, Eina_Bool ewk_context_web_database_delete_all(Ewk_Context* context) { EINA_SAFETY_ON_NULL_RETURN_VAL(context, EINA_FALSE); + LOG(INFO) << "context: " << context; context->WebDBDelete(GURL()); return true; } @@ -237,6 +241,7 @@ Eina_Bool ewk_context_web_database_delete(Ewk_Context* context, Ewk_Security_Ori { EINA_SAFETY_ON_NULL_RETURN_VAL(origin, EINA_FALSE); EINA_SAFETY_ON_NULL_RETURN_VAL(context, EINA_FALSE); + LOG(INFO) << "context: " << context; std::ostringstream ss; ss << ewk_security_origin_protocol_get(origin) << "://" << ewk_security_origin_host_get(origin); @@ -269,6 +274,7 @@ Eina_Bool ewk_context_web_database_quota_for_origin_set(Ewk_Context* context, Ew Eina_Bool ewk_context_web_indexed_database_delete_all(Ewk_Context* context) { EINA_SAFETY_ON_NULL_RETURN_VAL(context, EINA_FALSE); + LOG(INFO) << "context: " << context; context->IndexedDBDelete(); return true; } @@ -276,6 +282,7 @@ Eina_Bool ewk_context_web_indexed_database_delete_all(Ewk_Context* context) Eina_Bool ewk_context_web_storage_delete_all(Ewk_Context* context) { EINA_SAFETY_ON_NULL_RETURN_VAL(context, EINA_FALSE); + LOG(INFO) << "context: " << context; context->WebStorageDelete(); return true; } @@ -284,7 +291,7 @@ Eina_Bool ewk_context_web_storage_origin_delete(Ewk_Context* context, Ewk_Securi { EINA_SAFETY_ON_NULL_RETURN_VAL(context, EINA_FALSE); EINA_SAFETY_ON_NULL_RETURN_VAL(origin, EINA_FALSE); - + LOG(INFO) << "context: " << context; context->WebStorageDelete(origin->GetURL()); return EINA_TRUE; } @@ -338,6 +345,7 @@ Ewk_Cache_Model ewk_context_cache_model_get(const Ewk_Context* context) Eina_Bool ewk_context_cache_disabled_set(Ewk_Context* context, Eina_Bool cacheDisabled) { EINA_SAFETY_ON_NULL_RETURN_VAL(context, EINA_FALSE); + LOG(INFO) << "context: " << context << ", cacheDisabled:" << (bool)cacheDisabled; context->SetNetworkCacheEnable(!cacheDisabled); return true; } @@ -352,6 +360,7 @@ Eina_Bool ewk_context_certificate_file_set(Ewk_Context* context, const char* certificate_path) { EINA_SAFETY_ON_NULL_RETURN_VAL(context, EINA_FALSE); EINA_SAFETY_ON_NULL_RETURN_VAL(certificate_path, EINA_FALSE); + LOG(INFO) << "context: " << context << ", certificate_path:" << certificate_path; context->SetCertificatePath(certificate_path); return true; } @@ -365,6 +374,7 @@ const char* ewk_context_certificate_file_get(const Ewk_Context* context) Eina_Bool ewk_context_cache_clear(Ewk_Context* context) { EINA_SAFETY_ON_NULL_RETURN_VAL(context, EINA_FALSE); + LOG(INFO) << "context: " << context; context->ClearNetworkCache(); context->ClearWebkitCache(); return EINA_TRUE; @@ -582,6 +592,7 @@ int ewk_context_pixmap_get(Ewk_Context *context) unsigned int ewk_context_inspector_server_start(Ewk_Context* ewkContext, unsigned int port) { EINA_SAFETY_ON_NULL_RETURN_VAL(ewkContext, 0); + LOG(INFO) << "context: " << ewkContext; return ewkContext->InspectorServerStart(port); } @@ -607,7 +618,7 @@ void ewk_context_tizen_app_id_set(Ewk_Context* context, const char* tizen_app_id) { EINA_SAFETY_ON_NULL_RETURN(context); EINA_SAFETY_ON_NULL_RETURN(tizen_app_id); - LOG(INFO) << "tizen_app_id:" << tizen_app_id; + LOG(INFO) << "context: " << context << ", tizen_app_id:" << tizen_app_id; context->SetTizenAppId(tizen_app_id); } @@ -634,6 +645,7 @@ Ewk_Favicon_Database* ewk_context_favicon_database_get(const Ewk_Context* ewkCon void ewk_context_resource_cache_clear(Ewk_Context* ewkContext) { EINA_SAFETY_ON_NULL_RETURN(ewkContext); + LOG(INFO) << "context: " << ewkContext; ewkContext->ClearNetworkCache(); ewkContext->ClearWebkitCache(); } @@ -707,6 +719,7 @@ void ewk_context_intercept_request_callback_set( Ewk_Context_Intercept_Request_Callback callback, void* user_data) { EINA_SAFETY_ON_NULL_RETURN(context); + LOG(INFO) << "context: " << context; context->SetContextInterceptRequestCallback(callback, user_data); } @@ -1067,6 +1080,7 @@ void ewk_context_timezone_offset_set(Ewk_Context* context, void ewk_context_default_zoom_factor_set(Ewk_Context* context, double zoom_factor) { EINA_SAFETY_ON_NULL_RETURN(context); + LOG(INFO) << "context: " << context << ", zoom_factor:" << zoom_factor; context->SetDefaultZoomFactor(zoom_factor); } diff --git a/tizen_src/ewk/efl_integration/public/ewk_view.cc b/tizen_src/ewk/efl_integration/public/ewk_view.cc index 84d42d0..58518f7 100644 --- a/tizen_src/ewk/efl_integration/public/ewk_view.cc +++ b/tizen_src/ewk/efl_integration/public/ewk_view.cc @@ -100,7 +100,7 @@ Evas_Object* ewk_view_add_with_context(Evas* e, Ewk_Context* context) { EINA_SAFETY_ON_NULL_RETURN_VAL(context, 0); Evas_Object* ewk_view = CreateWebViewAsEvasObject(context, e); - + LOG(INFO) << "evas: " << e << ", context: " << context << ", ewk_view:" << ewk_view; if (ewk_view) { #if !BUILDFLAG(IS_TIZEN_TV) ewk_view_user_media_permission_callback_set(ewk_view, @@ -125,6 +125,7 @@ Evas_Object* ewk_view_add(Evas* e) // default web context. It won't be released by destroyed eweb_view because // ewk_context_default_get does AddRef Ewk_Context* context = ewk_context_default_get(); + LOG(INFO) << "evas: " << e << ", context: " << context; return ewk_view_add_with_context(e, context); } @@ -132,6 +133,7 @@ Evas_Object* ewk_view_add_in_incognito_mode(Evas* e) { EINA_SAFETY_ON_NULL_RETURN_VAL(e, nullptr); Ewk_Context* context = Ewk_Context::IncognitoContext(); + LOG(INFO) << "evas: " << e << ", context: " << context; EINA_SAFETY_ON_NULL_RETURN_VAL(context, nullptr); return ewk_view_add_with_context(e, context); } @@ -145,6 +147,7 @@ Ewk_Context *ewk_view_context_get(const Evas_Object *view) Eina_Bool ewk_view_url_set(Evas_Object* view, const char* url_string) { TTRACE_WEB("ewk_view_url_set url: %s", url_string); + LOG(INFO) << "view: " << view << ", url: " << url_string; EWK_VIEW_IMPL_GET_OR_RETURN(view, impl, false); EINA_SAFETY_ON_NULL_RETURN_VAL(url_string, false); GURL url(url_string); @@ -167,6 +170,7 @@ const char* ewk_view_original_url_get(const Evas_Object* view) Eina_Bool ewk_view_reload(Evas_Object *view) { EWK_VIEW_IMPL_GET_OR_RETURN(view, impl, false); + LOG(INFO) << "view: " << view; impl->Reload(); return true; } @@ -210,6 +214,7 @@ Eina_Bool ewk_view_scale_set(Evas_Object* view, double scale_factor, int x, int EWK_VIEW_IMPL_GET_OR_RETURN(view, impl, EINA_FALSE); impl->SetScale(scale_factor); impl->SetScroll(x, y); + LOG(INFO) << "view: " << view << ", scale_factor: " << scale_factor << ", x:" << x << ", y:" << y; return EINA_TRUE; } @@ -230,12 +235,14 @@ double ewk_view_scale_get(const Evas_Object *view) Eina_Bool ewk_view_back(Evas_Object *view) { EWK_VIEW_IMPL_GET_OR_RETURN(view, impl, false); + LOG(INFO) << "view: " << view; return impl->GoBack(); } Eina_Bool ewk_view_forward(Evas_Object *view) { EWK_VIEW_IMPL_GET_OR_RETURN(view, impl, false); + LOG(INFO) << "view: " << view; return impl->GoForward(); } @@ -261,6 +268,7 @@ Eina_Bool ewk_view_html_string_load(Evas_Object* view, const char* html, const c { EWK_VIEW_IMPL_GET_OR_RETURN(view, impl, EINA_FALSE); EINA_SAFETY_ON_NULL_RETURN_VAL(html, EINA_FALSE); + LOG(INFO) << "view: " << view; impl->LoadHTMLString(html, base_uri, unreachable_uri); return EINA_TRUE; } @@ -321,6 +329,7 @@ void ewk_view_scale_range_get(Evas_Object* view, double* min_scale, double* max_ void ewk_view_suspend(Evas_Object* ewkView) { EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl); + LOG(INFO) << "view: " << ewkView; impl->Suspend(); } @@ -384,7 +393,7 @@ Eina_Bool ewk_view_page_visibility_state_set(Evas_Object* ewkView, Ewk_Page_Visi Eina_Bool ewk_view_user_agent_set(Evas_Object* ewkView, const char* user_agent) { EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, false); - + LOG(INFO) << "view: " << ewkView << ", user_agent: " << user_agent; return impl->SetUserAgent(user_agent); } @@ -436,6 +445,7 @@ Eina_Bool ewk_view_custom_header_clear(const Evas_Object* ewkView) Eina_Bool ewk_view_visibility_set(Evas_Object* view, Eina_Bool enable) { EWK_VIEW_IMPL_GET_OR_RETURN(view, impl, EINA_FALSE); + LOG(INFO) << "view: " << view << ", enable:" << (bool)enable; return impl->SetVisibility(enable); } @@ -443,6 +453,7 @@ Evas_Object* ewk_view_screenshot_contents_get(const Evas_Object* view, Eina_Rect { EINA_SAFETY_ON_NULL_RETURN_VAL(canvas, NULL); EWK_VIEW_IMPL_GET_OR_RETURN(view, impl, NULL); + LOG(INFO) << "view: " << view; return impl->GetSnapshot(view_area, scale_factor); } @@ -451,6 +462,7 @@ Eina_Bool ewk_view_screenshot_contents_get_async(const Evas_Object* view, Eina_R { EINA_SAFETY_ON_NULL_RETURN_VAL(callback, EINA_FALSE); EWK_VIEW_IMPL_GET_OR_RETURN(view, impl, EINA_FALSE); + LOG(INFO) << "view: " << view; return impl->GetSnapshotAsync(view_area, callback, user_data, scale_factor) ? EINA_TRUE : EINA_FALSE; @@ -459,12 +471,14 @@ Eina_Bool ewk_view_screenshot_contents_get_async(const Evas_Object* view, Eina_R unsigned int ewk_view_inspector_server_start(Evas_Object* ewkView, unsigned int port) { EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, false); + LOG(INFO) << "view: " << ewkView << ", port:" << port; return impl->StartInspectorServer(port); } Eina_Bool ewk_view_inspector_server_stop(Evas_Object* ewkView) { EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, false); + LOG(INFO) << "view: " << ewkView; return impl->StopInspectorServer(); } @@ -477,7 +491,7 @@ Eina_Bool ewk_view_cache_image_get(const Evas_Object* o, const char* image_url, void ewk_view_scroll_by(Evas_Object* ewkView, int deltaX, int deltaY) { int x, y; - + LOG(INFO) << "view: " << ewkView << ", deltaX:" << deltaX << ", deltaY:" << deltaY; if (EINA_TRUE == ewk_view_scroll_pos_get(ewkView, &x, &y)) { ewk_view_scroll_set(ewkView, x + deltaX, y + deltaY); } @@ -492,6 +506,7 @@ Eina_Bool ewk_view_scroll_pos_get(Evas_Object* ewkView, int* x, int* y) Eina_Bool ewk_view_scroll_set(Evas_Object* view, int x, int y) { EWK_VIEW_IMPL_GET_OR_RETURN(view, impl, EINA_FALSE); + LOG(INFO) << "view: " << view << ", x:" << x << ", y:" << y; impl->SetScroll(x, y); return EINA_TRUE; @@ -526,6 +541,7 @@ void ewk_view_password_confirm_popup_reply(Evas_Object* ewkView, Ewk_Password_Po void ewk_view_javascript_alert_callback_set(Evas_Object* view, Ewk_View_JavaScript_Alert_Callback callback, void* user_data) { EWK_VIEW_IMPL_GET_OR_RETURN(view, impl); + LOG(INFO) << "view: " << view; if (callback) impl->SetJavaScriptAlertCallback(callback, user_data); } @@ -533,12 +549,14 @@ void ewk_view_javascript_alert_callback_set(Evas_Object* view, Ewk_View_JavaScri void ewk_view_javascript_alert_reply(Evas_Object* view) { EWK_VIEW_IMPL_GET_OR_RETURN(view, impl); + LOG(INFO) << "view: " << view; impl->JavaScriptAlertReply(); } void ewk_view_javascript_confirm_callback_set(Evas_Object* view, Ewk_View_JavaScript_Confirm_Callback callback, void* user_data) { EWK_VIEW_IMPL_GET_OR_RETURN(view, impl); + LOG(INFO) << "view: " << view; if (callback) impl->SetJavaScriptConfirmCallback(callback, user_data); } @@ -546,12 +564,14 @@ void ewk_view_javascript_confirm_callback_set(Evas_Object* view, Ewk_View_JavaSc void ewk_view_javascript_confirm_reply(Evas_Object* view, Eina_Bool result) { EWK_VIEW_IMPL_GET_OR_RETURN(view, impl); + LOG(INFO) << "view: " << view; impl->JavaScriptConfirmReply(result); } void ewk_view_javascript_prompt_callback_set(Evas_Object* view, Ewk_View_JavaScript_Prompt_Callback callback, void* user_data) { EWK_VIEW_IMPL_GET_OR_RETURN(view, impl); + LOG(INFO) << "view: " << view; if (callback) impl->SetJavaScriptPromptCallback(callback, user_data); } @@ -559,6 +579,7 @@ void ewk_view_javascript_prompt_callback_set(Evas_Object* view, Ewk_View_JavaScr void ewk_view_javascript_prompt_reply(Evas_Object* view, const char* result) { EWK_VIEW_IMPL_GET_OR_RETURN(view, impl); + LOG(INFO) << "view: " << view; impl->JavaScriptPromptReply(result); } @@ -633,6 +654,7 @@ Eina_Bool ewk_view_script_execute(Evas_Object* ewkView, const char* script, Ewk_ { EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, false); EINA_SAFETY_ON_NULL_RETURN_VAL(script, false); + LOG(INFO) << "view: " << ewkView; // callback can be null, so do not test it for null if (0 != strcmp(script, "")) //check for empty string return impl->ExecuteJavaScript(script, callback, user_data); @@ -693,6 +715,7 @@ Eina_Bool ewk_view_popup_menu_multiple_select(Evas_Object* ewkView, Eina_Inarray void ewk_view_orientation_send(Evas_Object* ewkView, int orientation) { EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl); + LOG(INFO) << "view: " << ewkView << ", orientation:" << orientation; impl->SetOrientation(orientation); } @@ -997,6 +1020,7 @@ char* ewk_view_get_cookies_for_url(Evas_Object* view, const char* url) Eina_Bool ewk_view_fullscreen_exit(Evas_Object* view) { EWK_VIEW_IMPL_GET_OR_RETURN(view, impl, EINA_FALSE); + LOG(INFO) << "view: " << view; impl->ExitFullscreen(); return EINA_TRUE; } @@ -1115,6 +1139,7 @@ Eina_Bool ewk_view_page_zoom_set(Evas_Object* ewkView, double zoomFactor) Evas_Object* ewk_view_smart_add(Evas* canvas, Evas_Smart* smart, Ewk_Context* context, Ewk_Page_Group* pageGroup) { EINA_SAFETY_ON_NULL_RETURN_VAL(context, 0); + LOG(INFO) << "evas: " << canvas << ", context:" << context; return CreateWebViewAsEvasObject(context, canvas, smart); } @@ -1143,6 +1168,7 @@ void ewk_view_quota_permission_request_cancel(const Ewk_Quota_Permission_Request Eina_Bool ewk_view_focus_set(const Evas_Object* view, Eina_Bool focused) { EWK_VIEW_IMPL_GET_OR_RETURN(view, impl, EINA_FALSE); + LOG(INFO) << "view: " << view << ", focused:" << (bool)focused; impl->SetFocus(focused); return EINA_TRUE; } @@ -1430,7 +1456,11 @@ Eina_Bool ewk_view_bg_color_get(Evas_Object* view, } void ewk_view_clear_all_tiles_resources(Evas_Object* ewkView) { +#if BUILDFLAG(IS_TIZEN_TV) + LOG(INFO) << "view: " << ewkView; +#else LOG_EWK_API_MOCKUP(); +#endif } Eina_Bool ewk_view_edge_scroll_by(Evas_Object *ewkView, int dx, int dy) @@ -1446,6 +1476,7 @@ Eina_Bool ewk_view_set_support_video_hole(Evas_Object* ewkView, LOG_EWK_API_MOCKUP(); #if defined(TIZEN_VIDEO_HOLE) EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, EINA_FALSE); + LOG(INFO) << "view: " << ewkView << ", enable:" << (bool)enable; impl->SetVideoHoleSupport(enable); media::VideoPlaneController::SetSharedVideoWindowHandle( window, @@ -1583,7 +1614,11 @@ void ewk_view_360video_set_current_time(Evas_Object* ewkView, double current_tim Eina_Bool ewk_view_script_execute_all_frames(Evas_Object *o, const char *script, Ewk_View_Script_Execute_Cb callback, void *user_data) { +#if BUILDFLAG(IS_TIZEN_TV) + LOG(INFO) << ", view: " << o; +#else LOG_EWK_API_MOCKUP(); +#endif return EINA_FALSE; } @@ -1610,7 +1645,11 @@ void ewk_view_voicemanager_labels_clear(Evas_Object* view) { void ewk_view_floating_window_state_changed(const Evas_Object *o, Eina_Bool status) { +#if BUILDFLAG(IS_TIZEN_TV) + EWK_VIEW_IMPL_GET_OR_RETURN(o, impl); +#else LOG_EWK_API_MOCKUP(); +#endif } void ewk_view_feed_mouse_down(Evas_Object* view, -- 2.7.4