[EWK_REFACTOR] Move IsIMEShow() and GetIMERect() from EWebView to RWHV

To remove dependency with EWebView in SelectionControllerEfl,
move IsIMEShow() and GetIMERect() from EWebView to RWHV so that they can
call directly without EWebView.
Also, remove im_context() in RWHV since there's no caller any more.

Bug: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=12028

Change-Id: I22784d116f6e2176541c4bfd70484f7b65bb0673
Signed-off-by: hh4813.kim <hh4813.kim@samsung.com>

diff --git a/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.cc b/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.cc
index c8cf36e..00b32c4 100644 (file)
--- a/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.cc
+++ b/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.cc
@@ -1583,4 +1583,18 @@ bool RenderWidgetHostViewEfl::IsLastAvailableTextEmpty() const {
   return RenderWidgetHostViewBase::selection_text_.empty();
 }
 
+bool RenderWidgetHostViewEfl::IsIMEShow() const {
+  if (im_context_)
+    return im_context_->IsShow();
+
+  return false;
+}
+
+gfx::Rect RenderWidgetHostViewEfl::GetIMERect() const {
+  if (im_context_)
+    return im_context_->GetIMERect();
+
+  return gfx::Rect();
+}
+
 }  // namespace content

diff --git a/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.h b/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.h
index d99510a..35bde6b 100644 (file)
--- a/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.h
+++ b/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.h
@@ -175,8 +175,6 @@ class RenderWidgetHostViewEfl
   void Init_EvasGL(int width, int height);
   void CreateNativeSurface(int width, int height);
 
-  IMContextEfl* im_context() const { return im_context_; }
-
   void HandleGestureBegin();
   void HandleGestureEnd();
   void HandleGesture(ui::GestureEvent*);
@@ -198,6 +196,9 @@ class RenderWidgetHostViewEfl
 
   bool IsLastAvailableTextEmpty() const;
 
+  bool IsIMEShow() const;
+  gfx::Rect GetIMERect() const;
+
  protected:
   friend class RenderWidgetHostView;
 

diff --git a/tizen_src/ewk/efl_integration/eweb_view.cc b/tizen_src/ewk/efl_integration/eweb_view.cc
index 1699950..45e54ef 100644 (file)
--- a/tizen_src/ewk/efl_integration/eweb_view.cc
+++ b/tizen_src/ewk/efl_integration/eweb_view.cc
@@ -2117,28 +2117,6 @@ void EWebView::InputPickerShow(ui::TextInputType input_type, double input_value)
   inputPicker_->showDatePicker(input_type, input_value);
 }
 
-bool EWebView::IsIMEShow() {
-#if defined(EWK_REFACTOR)
-  if (rwhv()->im_context())
-    return rwhv()->im_context()->IsShow();
-  return false;
-#else
-  NOTIMPLEMENTED();
-  return false;
-#endif
-}
-
-gfx::Rect EWebView::GetIMERect() {
-#if defined(EWK_REFACTOR)
-  if (rwhv()->im_context())
-    return rwhv()->im_context()->GetIMERect();
-  return gfx::Rect();
-#else
-  NOTIMPLEMENTED();
-  return gfx::Rect();
-#endif
-}
-
 void EWebView::LoadNotFoundErrorPage(const std::string& invalidUrl) {
   RenderViewHost* render_view_host = web_contents_->GetRenderViewHost();
   if (render_view_host)

diff --git a/tizen_src/ewk/efl_integration/eweb_view.h b/tizen_src/ewk/efl_integration/eweb_view.h
index 7e36c5b..2a9efa3 100644 (file)
--- a/tizen_src/ewk/efl_integration/eweb_view.h
+++ b/tizen_src/ewk/efl_integration/eweb_view.h
@@ -422,9 +422,6 @@ class EWebView {
 
   void ShowContentsDetectedPopup(const char*);
 
-  bool IsIMEShow();
-  gfx::Rect GetIMERect();
-
   // Returns TCP port number with Inspector, or 0 if error.
   int StartInspectorServer(int port = 0);
   bool StopInspectorServer();

diff --git a/tizen_src/ewk/efl_integration/selection_controller_efl.cc b/tizen_src/ewk/efl_integration/selection_controller_efl.cc
index 289e99a..9942623 100644 (file)
--- a/tizen_src/ewk/efl_integration/selection_controller_efl.cc
+++ b/tizen_src/ewk/efl_integration/selection_controller_efl.cc
@@ -589,8 +589,10 @@ void SelectionControllerEfl::ChangeContextMenuPosition(gfx::Point& position, int
   evas_object_geometry_get(GetParentView()->evas_object(), &webViewX, &webViewY, &webViewWidth, &webViewHeight);
   gfx::Rect viewportRect = gfx::Rect(webViewX, webViewY, webViewWidth, webViewHeight);
 
-  if (GetParentView()->IsIMEShow()) { // Get the Visible Rect .
-    imeRect = GetParentView()->GetIMERect();
+  RenderWidgetHostViewEfl* rwhv =
+      static_cast<RenderWidgetHostViewEfl*>(web_contents_.GetRenderWidgetHostView());
+  if (rwhv && rwhv->IsIMEShow()) { // Get the Visible Rect .
+    imeRect = rwhv->GetIMERect();
     if ((viewportRect.y() + viewportRect.height()) > imeRect.y())
         viewportRect.set_height(imeRect.y() - viewportRect.y());
   }