[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 <wei90727.li@samsung.com>

diff --git a/wrt/src/browser/api/wrt_api_web_contents.cc b/wrt/src/browser/api/wrt_api_web_contents.cc
index 2a9c62b..1552034 100644 (file)
--- 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<content::RenderWidgetHostViewAura*>(
-          GetWebContents()->GetRenderWidgetHostView());
-      if (rwhva && rwhva->aura_efl_helper() &&
-          rwhva->aura_efl_helper()->GetIMContextEfl()) {
-        rwhva->aura_efl_helper()->GetIMContextEfl()->RequestHide();
-      }
-#endif
+    auto rwhva = static_cast<content::RenderWidgetHostViewAura*>(
+        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 (executable)
new mode 100644 (file)
index 9ea43d1..bcba234
--- 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> 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 3484860..007d950 100644 (file)
--- 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 8318a21..0486b09 100644 (file)
--- 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 107d78a..765679f 100644 (file)
--- 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<content::WebContentsImpl*>(web_contents_);
-    auto* rwhva = static_cast<content::RenderWidgetHostViewAura*>(
-        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<content::WebContentsImpl*>(web_contents_);
+  auto* rwhva = static_cast<content::RenderWidgetHostViewAura*>(
+      wci->GetRenderWidgetHostView());
+  ClipboardHelperEfl::GetInstance()->SetSourceWidget(
+      (rwhva && rwhva->offscreen_helper())
+          ? rwhva->offscreen_helper()->content_image_elm_host()
+          : nullptr);
 #endif
   return false;
 }