From 01b54fa439dfb260f9a04e2e0e97d5d4734193c5 Mon Sep 17 00:00:00 2001 From: Bakka Uday Kiran Date: Tue, 17 Jan 2023 10:36:12 +0530 Subject: [PATCH] [M108 Migration] Remove EWK_BRINGUP from EWebView::ExecuteJavaScript This patch removes EWK_BRINGUP from EWebView::ExecuteJavaScript. Reference: https://review.tizen.org/gerrit/c/273504 Change-Id: I602c63a2284edc1681899ba68d511beeefb629ad Signed-off-by: Bakka Uday Kiran --- tizen_src/ewk/efl_integration/eweb_view.cc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tizen_src/ewk/efl_integration/eweb_view.cc b/tizen_src/ewk/efl_integration/eweb_view.cc index 8737a42..2dd7acf 100644 --- a/tizen_src/ewk/efl_integration/eweb_view.cc +++ b/tizen_src/ewk/efl_integration/eweb_view.cc @@ -700,11 +700,11 @@ class JavaScriptCallbackDetails { }; void JavaScriptComplete(JavaScriptCallbackDetails* script_callback_data, - const base::Value* result) { + base::Value result) { if (!script_callback_data->callback_func_) return; - std::string return_string = result->GetString(); + std::string return_string = result.GetString(); script_callback_data->callback_func_(script_callback_data->view_, return_string.c_str(), script_callback_data->user_data_); @@ -734,16 +734,15 @@ bool EWebView::ExecuteJavaScript(const char* script, std::u16string js_script; base::UTF8ToUTF16(script, strlen(script), &js_script); if (callback) { -#if !defined(EWK_BRINGUP) // FIXME: m67 bringup JavaScriptCallbackDetails* script_callback_data = new JavaScriptCallbackDetails(callback, userdata, evas_object_); + RenderFrameHost::JavaScriptResultCallback js_callback = + base::BindOnce(&JavaScriptComplete, base::Owned(script_callback_data)); // In M47, it isn't possible anymore to execute javascript in the generic // case. We need to call ExecuteJavaScriptForTests to keep the behaviour // unchanged @see https://codereview.chromium.org/1123783002 render_frame_host->ExecuteJavaScriptWithUserGestureForTests( - js_script, - base::BindOnce(&JavaScriptComplete, base::Owned(script_callback_data))); -#endif + js_script, std::move(js_callback)); } else { // We use ExecuteJavaScriptWithUserGestureForTests instead of // ExecuteJavaScript because -- 2.7.4