From 1906ca2e093b1779c8d14026d17baeb0f624e263 Mon Sep 17 00:00:00 2001 From: Manjeet Date: Wed, 13 Mar 2024 18:00:27 +0530 Subject: [PATCH] [M120 Migration]Enabling some functions for OnScreen rendering mode Moving the following functions to common helper MoveCaret SetScaledContentSize ConvertPointInViewPix SetCustomViewportSize Reference: https://review.tizen.org/gerrit/294759 Change-Id: Ie964d79ef9eb83ac64817f1e6a623a3c0cc67971 Signed-off-by: Manjeet --- .../renderer_host/rwhv_aura_common_helper_efl.cc | 7 +++++++ .../renderer_host/rwhv_aura_common_helper_efl.h | 2 ++ .../renderer_host/rwhv_aura_offscreen_helper_efl.cc | 20 -------------------- .../renderer_host/rwhv_aura_offscreen_helper_efl.h | 8 -------- .../browser/selection/selection_controller_efl.cc | 16 ++++++++-------- 5 files changed, 17 insertions(+), 36 deletions(-) diff --git a/tizen_src/chromium_impl/content/browser/renderer_host/rwhv_aura_common_helper_efl.cc b/tizen_src/chromium_impl/content/browser/renderer_host/rwhv_aura_common_helper_efl.cc index 7c0b7d1..ca2b174 100644 --- a/tizen_src/chromium_impl/content/browser/renderer_host/rwhv_aura_common_helper_efl.cc +++ b/tizen_src/chromium_impl/content/browser/renderer_host/rwhv_aura_common_helper_efl.cc @@ -292,6 +292,13 @@ void RWHVAuraCommonHelperEfl::RequestSnapshotAsyncOnscreen( request_id); } +void RWHVAuraCommonHelperEfl::MoveCaret(const gfx::Point& point) { + if (auto* delegate = rwhv_aura_->host()->delegate()) { + delegate->MoveCaret(gfx::Point(point.x() / device_scale_factor_, + point.y() / device_scale_factor_)); + } +} + gfx::Point RWHVAuraCommonHelperEfl::ConvertPointInViewPix(gfx::Point point) { return gfx::ToFlooredPoint( gfx::ScalePoint(gfx::PointF(point), device_scale_factor_)); diff --git a/tizen_src/chromium_impl/content/browser/renderer_host/rwhv_aura_common_helper_efl.h b/tizen_src/chromium_impl/content/browser/renderer_host/rwhv_aura_common_helper_efl.h index b578d75..a216b09 100644 --- a/tizen_src/chromium_impl/content/browser/renderer_host/rwhv_aura_common_helper_efl.h +++ b/tizen_src/chromium_impl/content/browser/renderer_host/rwhv_aura_common_helper_efl.h @@ -101,6 +101,8 @@ class CONTENT_EXPORT RWHVAuraCommonHelperEfl { void* user_data, float scale_factor = 1.0); + + void MoveCaret(const gfx::Point& point); void SetScaledContentSize(const gfx::SizeF& size) { scaled_contents_size_ = size; } diff --git a/tizen_src/chromium_impl/content/browser/renderer_host/rwhv_aura_offscreen_helper_efl.cc b/tizen_src/chromium_impl/content/browser/renderer_host/rwhv_aura_offscreen_helper_efl.cc index 6c498af..b48a311 100644 --- a/tizen_src/chromium_impl/content/browser/renderer_host/rwhv_aura_offscreen_helper_efl.cc +++ b/tizen_src/chromium_impl/content/browser/renderer_host/rwhv_aura_offscreen_helper_efl.cc @@ -943,14 +943,6 @@ void RWHVAuraOffscreenHelperEfl::Hide() { evas_object_hide(content_image_elm_host_); } -void RWHVAuraOffscreenHelperEfl::SetCustomViewportSize(const gfx::Size& size) { - if (custom_viewport_size_ != size) { - custom_viewport_size_ = size; - // Take the view port change into account. - rwhva()->host()->SynchronizeVisualProperties(); - } -} - gfx::Size RWHVAuraOffscreenHelperEfl::GetVisibleViewportSize() { if (!custom_viewport_size_.IsEmpty()) return custom_viewport_size_; @@ -962,18 +954,6 @@ gfx::Rect RWHVAuraOffscreenHelperEfl::GetViewBounds() { gfx::ConvertRectToDips(GetViewBoundsInPix(), device_scale_factor_)); } -gfx::Point RWHVAuraOffscreenHelperEfl::ConvertPointInViewPix(gfx::Point point) { - return gfx::ToFlooredPoint( - gfx::ScalePoint(gfx::PointF(point), device_scale_factor_)); -} - -void RWHVAuraOffscreenHelperEfl::MoveCaret(const gfx::Point& point) { - if (auto* delegate = rwhva()->host()->delegate()) { - delegate->MoveCaret(gfx::Point(point.x() / device_scale_factor_, - point.y() / device_scale_factor_)); - } -} - void RWHVAuraOffscreenHelperEfl::SelectClosestWord( const gfx::Point& touch_point) { int view_x, view_y; diff --git a/tizen_src/chromium_impl/content/browser/renderer_host/rwhv_aura_offscreen_helper_efl.h b/tizen_src/chromium_impl/content/browser/renderer_host/rwhv_aura_offscreen_helper_efl.h index c6be69c..30202b2 100644 --- a/tizen_src/chromium_impl/content/browser/renderer_host/rwhv_aura_offscreen_helper_efl.h +++ b/tizen_src/chromium_impl/content/browser/renderer_host/rwhv_aura_offscreen_helper_efl.h @@ -53,7 +53,6 @@ class CONTENT_EXPORT RWHVAuraOffscreenHelperEfl void Focus(bool focus) override; bool HasFocus() override; - void SetCustomViewportSize(const gfx::Size& size); bool GetHorizontalPanningHold() const { return horizontal_panning_hold_; } void SetHorizontalPanningHold(bool hold) { horizontal_panning_hold_ = hold; } bool GetVerticalPanningHold() const { return vertical_panning_hold_; } @@ -66,9 +65,6 @@ class CONTENT_EXPORT RWHVAuraOffscreenHelperEfl gfx::Rect GetViewBoundsInPix() const; const gfx::Size GetScrollableSize() const; - void SetScaledContentSize(const gfx::SizeF& size) { - scaled_contents_size_ = size; - } int GetTopControlsHeight(); #if BUILDFLAG(IS_TIZEN) @@ -93,11 +89,9 @@ class CONTENT_EXPORT RWHVAuraOffscreenHelperEfl Evas_Object* content_image_elm_host() const { return content_image_elm_host_; } - gfx::Point ConvertPointInViewPix(gfx::Point point); void SetFocusInOutCallbacks(const OnFocusCallback& on_focus_in, const OnFocusCallback& on_focus_out); - void MoveCaret(const gfx::Point& point); void SelectClosestWord(const gfx::Point& touch_point); void RequestMagnifierSnapshotAsync(const Eina_Rectangle rect, Screenshot_Captured_Callback callback, @@ -153,8 +147,6 @@ class CONTENT_EXPORT RWHVAuraOffscreenHelperEfl gfx::NativeView aura_parent_window_ = nullptr; int rotation_ = 0; - gfx::SizeF scaled_contents_size_; - gfx::Size custom_viewport_size_; #if BUILDFLAG(IS_TIZEN_TV) bool radio_or_checkbox_focused_ = false; diff --git a/tizen_src/chromium_impl/content/browser/selection/selection_controller_efl.cc b/tizen_src/chromium_impl/content/browser/selection/selection_controller_efl.cc index 0b62ec7..bde133e 100644 --- a/tizen_src/chromium_impl/content/browser/selection/selection_controller_efl.cc +++ b/tizen_src/chromium_impl/content/browser/selection/selection_controller_efl.cc @@ -214,8 +214,8 @@ void SelectionControllerEfl::OnSelectionChanged( // In case of the selected text contains only line break and no other // characters, we should use caret selection mode. if (GetSelectionEditable() && !handle_being_dragged_ && rwhva_ && - rwhva_->GetSelectedText() == (u"\n") && rwhva_->offscreen_helper()) { - rwhva_->offscreen_helper()->MoveCaret( + rwhva_->GetSelectedText() == (u"\n") && rwhva_->aura_efl_helper()) { + rwhva_->aura_efl_helper()->MoveCaret( selection_data_->GetLeftRect().origin()); is_caret_mode_forced_ = true; } @@ -279,8 +279,8 @@ void SelectionControllerEfl::SetSelectionMode(enum SelectionMode mode) { void SelectionControllerEfl::ToggleCaretAfterSelection() { if (!GetCaretSelectionStatus() && GetSelectionEditable() && - rwhva_->offscreen_helper()) { - rwhva_->offscreen_helper()->MoveCaret( + rwhva_->aura_efl_helper()) { + rwhva_->aura_efl_helper()->MoveCaret( selection_data_->GetRightRect().origin()); ClearSelection(); } @@ -614,8 +614,8 @@ void SelectionControllerEfl::HandleDragUpdateNotification(SelectionHandleEfl* ha switch (handle->Type()) { case SelectionHandleEfl::HANDLE_TYPE_INPUT: { - if (rwhva_->offscreen_helper()) - rwhva_->offscreen_helper()->MoveCaret(handle->GetBasePosition()); + if (rwhva_->aura_efl_helper()) + rwhva_->aura_efl_helper()->MoveCaret(handle->GetBasePosition()); return; } case SelectionHandleEfl::HANDLE_TYPE_LEFT: @@ -705,8 +705,8 @@ void SelectionControllerEfl::HandlePostponedGesture(int x, web_contents()->GetRenderWidgetHostView()); gfx::Point point = gfx::Point(x, y); - if (rwhva && rwhva_->offscreen_helper()) - point = rwhva->offscreen_helper()->ConvertPointInViewPix(point); + if (rwhva && rwhva_->aura_efl_helper()) + point = rwhva->aura_efl_helper()->ConvertPointInViewPix(point); switch (type) { case ui::ET_GESTURE_LONG_PRESS: { ClearSelectionViaEWebView(); -- 2.7.4