From beacad5f0576529945284920c25153c82dd75878 Mon Sep 17 00:00:00 2001 From: liwei90727 Date: Wed, 28 Feb 2024 18:14:07 +0800 Subject: [PATCH] [WRTjs] Use BUILDFLAGS(IS_TV) for TV logic checking USE BUILDFLAGS(IS_XXX) for OS checking, will disable some unnecessary logic in compile stage Change-Id: I4bfb553535776b35c1aac919359deecd81c69eb7 Signed-off-by: liwei90727 --- wrt/src/browser/api/wrt_api_web_contents.cc | 20 +++++++++---------- wrt/src/browser/popup.cc | 13 +++++++----- .../browser/wrt_native_window_on_screen.cc | 5 ----- wrt/src/browser/wrt_web_contents.cc | 16 +++++++-------- .../browser/wrt_web_contents_view_delegate.cc | 18 ++++++++--------- 5 files changed, 34 insertions(+), 38 deletions(-) mode change 100755 => 100644 wrt/src/browser/popup.cc diff --git a/wrt/src/browser/api/wrt_api_web_contents.cc b/wrt/src/browser/api/wrt_api_web_contents.cc index 2a9c62ba3128..155203425a9d 100644 --- a/wrt/src/browser/api/wrt_api_web_contents.cc +++ b/wrt/src/browser/api/wrt_api_web_contents.cc @@ -121,19 +121,19 @@ void WebContents::WillDraw(int new_rotation, gfx::Size frame_data_output_size) { } } - if (IsTvProfile()) { - if (frame_output_size_.height() != frame_output_size_.height()) { +#if BUILDFLAG(IS_TIZEN_TV) + if (frame_output_size_.height() != frame_output_size_.height()) { #if !defined(WRT_JS_BRINGUP) - auto rwhva = static_cast( - GetWebContents()->GetRenderWidgetHostView()); - if (rwhva && rwhva->aura_efl_helper() && - rwhva->aura_efl_helper()->GetIMContextEfl()) { - rwhva->aura_efl_helper()->GetIMContextEfl()->RequestHide(); - } -#endif + auto rwhva = static_cast( + GetWebContents()->GetRenderWidgetHostView()); + if (rwhva && rwhva->aura_efl_helper() && + rwhva->aura_efl_helper()->GetIMContextEfl()) { + rwhva->aura_efl_helper()->GetIMContextEfl()->RequestHide(); } - frame_output_size_.set_height(frame_output_size_.height()); +#endif } + frame_output_size_.set_height(frame_output_size_.height()); +#endif } #if BUILDFLAG(IS_TIZEN_TV) diff --git a/wrt/src/browser/popup.cc b/wrt/src/browser/popup.cc old mode 100755 new mode 100644 index 9ea43d10bbef..bcba2348c101 --- a/wrt/src/browser/popup.cc +++ b/wrt/src/browser/popup.cc @@ -134,8 +134,9 @@ Evas_Object* CreateNewWindow(Evas_Object* parent) { // static std::unique_ptr Popup::CreatePopup(Evas_Object* window) { - if (IsTvProfile()) - window = CreateNewWindow(window); +#if BUILDFLAG(IS_TIZEN_TV) + window = CreateNewWindow(window); +#endif Evas_Object* popup = elm_popup_add(window); #if !BUILDFLAG(IS_TIZEN_TV) @@ -401,9 +402,11 @@ void Popup::SetBody(const std::string& id) { elm_entry_utf8_to_markup(id.c_str())); evas_object_size_hint_weight_set(label, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(label, EVAS_HINT_FILL, EVAS_HINT_FILL); - if (IsTvProfile()) - evas_object_color_set(label, 255, 255, 255, 255); - else evas_object_color_set(label, 0, 0, 0, 255); +#if BUILDFLAG(IS_TIZEN_TV) + evas_object_color_set(label, 255, 255, 255, 255); +#else + evas_object_color_set(label, 0, 0, 0, 255); +#endif elm_box_pack_end(box_, label); evas_object_show(label); } diff --git a/wrt/src/browser/wrt_native_window_on_screen.cc b/wrt/src/browser/wrt_native_window_on_screen.cc index 34848601a41c..007d950bc1ec 100644 --- a/wrt/src/browser/wrt_native_window_on_screen.cc +++ b/wrt/src/browser/wrt_native_window_on_screen.cc @@ -112,12 +112,7 @@ int WRTNativeWindowOnScreen::SetRotationState(bool is_auto, int degree) { const int rotations[4] = {0, 90, 180, 270}; ecore_evas_wm_rotation_available_rotations_set(ee, rotations, 4); } -#if BUILDFLAG(IS_TIZEN_TV) - // TODO(dh81.song): - // need to check elm_win_wm_rotation_manual_rotation_done_set is appliable - // for all profile ecore_evas_wm_rotation_manual_rotation_done_set(ee, EINA_TRUE); -#endif rotation_degree = ecore_evas_rotation_get(ee); } else { if (degree != -1) diff --git a/wrt/src/browser/wrt_web_contents.cc b/wrt/src/browser/wrt_web_contents.cc index 8318a21b8804..0486b0971826 100644 --- a/wrt/src/browser/wrt_web_contents.cc +++ b/wrt/src/browser/wrt_web_contents.cc @@ -76,14 +76,14 @@ SelectPickerBase* CreateSelectPicker( SelectPickerBase* picker; Evas_Object* view_evas = WRTNativeWindow::FromWebContents(web_contents)->view_evas(); - if (IsTvProfile()) { - picker = new WRTSelectPickerTv(web_contents, selected_index, - is_multiple_selection, view_evas); - picker->SetFontSizeAsItem(item_font_size); - } else { - picker = new WRTSelectPicker( - web_contents, selected_index, is_multiple_selection, view_evas); - } +#if BUILDFLAG(IS_TIZEN_TV) + picker = new WRTSelectPickerTv(web_contents, selected_index, + is_multiple_selection, view_evas); + picker->SetFontSizeAsItem(item_font_size); +#else + picker = new WRTSelectPicker(web_contents, selected_index, + is_multiple_selection, view_evas); +#endif // Create two separate Elm_Genlist_Item_Class classes, because EFL cannot swap // item_style at runtime. picker->InitializeItemClass(); diff --git a/wrt/src/browser/wrt_web_contents_view_delegate.cc b/wrt/src/browser/wrt_web_contents_view_delegate.cc index 107d78af6d6f..765679ffeb9b 100644 --- a/wrt/src/browser/wrt_web_contents_view_delegate.cc +++ b/wrt/src/browser/wrt_web_contents_view_delegate.cc @@ -31,16 +31,14 @@ WRTWebContentsViewDelegate::WRTWebContentsViewDelegate( WRTWebContentsViewDelegate::~WRTWebContentsViewDelegate() {} bool WRTWebContentsViewDelegate::Focus() { -#if defined(USE_WAYLAND) - if (!IsTvProfile()) { - auto wci = static_cast(web_contents_); - auto* rwhva = static_cast( - wci->GetRenderWidgetHostView()); - ClipboardHelperEfl::GetInstance()->SetSourceWidget( - (rwhva && rwhva->offscreen_helper()) - ? rwhva->offscreen_helper()->content_image_elm_host() - : nullptr); - } +#if defined(USE_WAYLAND) && !BUILDFLAG(IS_TIZEN_TV) + auto wci = static_cast(web_contents_); + auto* rwhva = static_cast( + wci->GetRenderWidgetHostView()); + ClipboardHelperEfl::GetInstance()->SetSourceWidget( + (rwhva && rwhva->offscreen_helper()) + ? rwhva->offscreen_helper()->content_image_elm_host() + : nullptr); #endif return false; } -- 2.34.1