Cleanup web_view_evas_handler and related code

This part of the code is no longer used since post aura, hence removing.

Change-Id: I857d5f588d0452dac3008c5bf0e1c2459fff7386
Signed-off-by: Gajendra N <gajendra.n@samsung.com>

diff --git a/tizen_src/chromium_impl/content/browser/renderer_host/evas_event_handler.h b/tizen_src/chromium_impl/content/browser/renderer_host/evas_event_handler.h
deleted file mode 100644 (file)
index 8acf5eb..0000000
--- a/tizen_src/chromium_impl/content/browser/renderer_host/evas_event_handler.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2015 Samsung Electronics. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef EVAS_EVENT_HANDLER_H
-#define EVAS_EVENT_HANDLER_H
-
-#include "base/memory/ref_counted.h"
-
-#include <Evas.h>
-
-namespace content {
-
-class EvasEventHandler: public base::RefCountedThreadSafe<EvasEventHandler> {
- public:
-  virtual ~EvasEventHandler() {}
-
-  virtual bool HandleEvent_FocusIn() { return false; }
-  virtual bool HandleEvent_FocusOut() { return false; }
-  virtual bool HandleEvent_KeyUp (const Evas_Event_Key_Up*) { return false; }
-  virtual bool HandleEvent_KeyDown (const Evas_Event_Key_Down*) { return false; }
-  virtual bool HandleEvent_MouseDown (const Evas_Event_Mouse_Down*) { return false; }
-  virtual bool HandleEvent_MouseUp  (const Evas_Event_Mouse_Up*) { return false; }
-  virtual bool HandleEvent_MouseMove (const Evas_Event_Mouse_Move*) { return false; }
-  virtual bool HandleEvent_MouseWheel (const Evas_Event_Mouse_Wheel*) { return false; }
-  virtual bool HandleEvent_HWBack() { return false; }
-
-};
-
-} // namespace content
-
-#endif  // EVAS_EVENT_HANDLER_H

diff --git a/tizen_src/ewk/efl_integration/BUILD.gn b/tizen_src/ewk/efl_integration/BUILD.gn
index 5ff84f0..f374a0d 100644 (file)
--- a/tizen_src/ewk/efl_integration/BUILD.gn
+++ b/tizen_src/ewk/efl_integration/BUILD.gn
@@ -362,8 +362,6 @@ shared_library("chromium-ewk") {
     "browser/vibration/vibration_provider_client.h",
     "browser/web_cache_efl/web_cache_manager_efl.cc",
     "browser/web_cache_efl/web_cache_manager_efl.h",
-    "browser/web_view_evas_handler.cc",
-    "browser/web_view_evas_handler.h",
     "browser/webdata/web_data_service.cc",
     "browser/webdata/web_data_service.h",
     "browser/webdata/web_data_service_factory.cc",

diff --git a/tizen_src/ewk/efl_integration/browser/web_view_evas_handler.cc b/tizen_src/ewk/efl_integration/browser/web_view_evas_handler.cc
deleted file mode 100644 (file)
index 3312ec2..0000000
--- a/tizen_src/ewk/efl_integration/browser/web_view_evas_handler.cc
+++ /dev/null
@@ -1,110 +0,0 @@
-// Copyright (c) 2014 The Chromium Authors. All rights reserved.
-// Copyright 2014 Samsung Electronics. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "browser/web_view_evas_handler.h"
-
-#include "private/webview_delegate_ewk.h"
-
-#include "eweb_view.h"
-#include "tizen/system_info.h"
-
-using content::SelectionControllerEfl;
-
-namespace {
-
-inline bool IsHardwareBackKey(const Evas_Event_Key_Up* event) {
-#if BUILDFLAG(IS_TIZEN)
-  return (strcmp(event->key, "XF86Back") == 0 ||
-      strcmp(event->key, "XF86Stop") == 0);
-#else
-  return (strcmp(event->key, "Escape") == 0);
-#endif
-}
-
-}
-
-WebViewEvasEventHandler::WebViewEvasEventHandler(EWebView* wv)
-    : webview_ (wv) {
-}
-
-bool WebViewEvasEventHandler::HandleEvent_FocusIn() {
-  return WebViewDelegateEwk::GetInstance().
-      RequestHandleEvent_FocusIn(webview_);
-}
-
-bool WebViewEvasEventHandler::HandleEvent_FocusOut() {
-  return WebViewDelegateEwk::GetInstance().
-      RequestHandleEvent_FocusOut(webview_);
-}
-
-bool WebViewEvasEventHandler::HandleEvent_KeyDown(
-    const Evas_Event_Key_Down* event_info) {
-  return WebViewDelegateEwk::GetInstance().
-      RequestHandleEvent_KeyDown(webview_, event_info);
-}
-
-bool WebViewEvasEventHandler::HandleEvent_KeyUp(
-    const Evas_Event_Key_Up* event_info) {
-  bool handled = WebViewDelegateEwk::GetInstance().
-      RequestHandleEvent_KeyUp(webview_, event_info);
-
-#if BUILDFLAG(IS_TIZEN)
-  return handled;
-#endif
-
-  if (handled)
-    return true;
-
-  if (IsHardwareBackKey(event_info))
-    return HandleEvent_HWBack();
-
-  return false;
-}
-
-bool WebViewEvasEventHandler::HandleEvent_MouseDown(
-    const Evas_Event_Mouse_Down* event_info) {
-  return WebViewDelegateEwk::GetInstance().
-      RequestHandleEvent_MouseDown(webview_, event_info);
-}
-
-bool WebViewEvasEventHandler::HandleEvent_MouseUp(
-    const Evas_Event_Mouse_Up* event_info) {
-  return WebViewDelegateEwk::GetInstance().
-      RequestHandleEvent_MouseUp(webview_, event_info);
-}
-
-bool WebViewEvasEventHandler::HandleEvent_MouseMove(
-    const Evas_Event_Mouse_Move* event_info) {
-  return WebViewDelegateEwk::GetInstance().
-      RequestHandleEvent_MouseMove(webview_, event_info);
-}
-
-bool WebViewEvasEventHandler::HandleEvent_MouseWheel(
-    const Evas_Event_Mouse_Wheel* event_info) {
-  return WebViewDelegateEwk::GetInstance().
-      RequestHandleEvent_MouseWheel(webview_, event_info);
-}
-
-bool WebViewEvasEventHandler::HandleEvent_HWBack() {
-  if (webview_->GetContextMenuController()) {
-    webview_->ResetContextMenuController();
-    if (webview_->GetSelectionController()->IsAnyHandleVisible())
-      webview_->GetSelectionController()->ClearSelectionViaEWebView();
-    return true;
-  }
-
-  if (webview_->IsFullscreen()) {
-    webview_->ExitFullscreen();
-    return true;
-  }
-
-  if (IsMobileProfile() || IsWearableProfile()) {
-    // Tell the embedding APP to handle BACK HW.
-    webview_->SmartCallback<EWebViewCallbacks::HWBackUnhandled>().call();
-    return true;
-  }
-
-  return false;
-}

diff --git a/tizen_src/ewk/efl_integration/browser/web_view_evas_handler.h b/tizen_src/ewk/efl_integration/browser/web_view_evas_handler.h
deleted file mode 100644 (file)
index a08b220..0000000
--- a/tizen_src/ewk/efl_integration/browser/web_view_evas_handler.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) 2014 The Chromium Authors. All rights reserved.
-// Copyright 2014 Samsung Electronics. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef TIZEN_WEBVIEW_EVENT_TW_WEBVIEW_EVAS_EVENT_HANDLER_H_
-#define TIZEN_WEBVIEW_EVENT_TW_WEBVIEW_EVAS_EVENT_HANDLER_H_
-
-#include "content/browser/renderer_host/evas_event_handler.h"
-
-class EWebView;
-
-class WebViewEvasEventHandler: public content::EvasEventHandler {
- public:
-  explicit WebViewEvasEventHandler(EWebView*);
-
-  // ---- event handlers
-  bool HandleEvent_FocusIn() override;
-  bool HandleEvent_FocusOut() override;
-  bool HandleEvent_KeyDown (const Evas_Event_Key_Down*) override;
-  bool HandleEvent_KeyUp (const Evas_Event_Key_Up*) override;
-  bool HandleEvent_MouseDown (const Evas_Event_Mouse_Down*) override;
-  bool HandleEvent_MouseUp   (const Evas_Event_Mouse_Up*) override;
-  bool HandleEvent_MouseMove (const Evas_Event_Mouse_Move*) override;
-  bool HandleEvent_MouseWheel(const Evas_Event_Mouse_Wheel*) override;
-  bool HandleEvent_HWBack() override;
-
- private:
-  EWebView* webview_;
-};
-
-#endif  // TIZEN_WEBVIEW_PUBLIC_TW_WEBVIEW_EVAS_EVENT_HANDLER_H_

diff --git a/tizen_src/ewk/efl_integration/eweb_view.cc b/tizen_src/ewk/efl_integration/eweb_view.cc
index ef449a7..2124d99 100644 (file)
--- a/tizen_src/ewk/efl_integration/eweb_view.cc
+++ b/tizen_src/ewk/efl_integration/eweb_view.cc
@@ -25,7 +25,6 @@
 #include "browser/select_picker/select_picker_mobile.h"
 #include "browser/select_picker/select_picker_tv.h"
 #include "browser/web_view_browser_message_filter.h"
-#include "browser/web_view_evas_handler.h"
 #include "browser_context_efl.h"
 #include "common/content_client_efl.h"
 #include "common/render_messages_ewk.h"
@@ -388,8 +387,6 @@ void EWebView::Initialize() {
 
   InitializeContent();
 
-  evas_event_handler_ = new WebViewEvasEventHandler(this);
-
   scroll_detector_.reset(new ScrollDetector(this));
 
 #if defined(TIZEN_PEPPER_EXTENSIONS)

diff --git a/tizen_src/ewk/efl_integration/eweb_view.h b/tizen_src/ewk/efl_integration/eweb_view.h
index f71549e..7d9f4f8 100644 (file)
--- a/tizen_src/ewk/efl_integration/eweb_view.h
+++ b/tizen_src/ewk/efl_integration/eweb_view.h
@@ -84,7 +84,6 @@ class _Ewk_App_Control;
 class _Ewk_Policy_Decision;
 class _Ewk_Hit_Test;
 class Ewk_Context;
-class WebViewEvasEventHandler;
 class _Ewk_Quota_Permission_Request;
 
 #if defined(TIZEN_ATK_SUPPORT)
@@ -819,7 +818,6 @@ class EWebView {
 
   static Eina_Bool DelayedPopulateAndShowContextMenu(void* data);
 
-  scoped_refptr<WebViewEvasEventHandler> evas_event_handler_;
   scoped_refptr<Ewk_Context> context_;
   std::unique_ptr<content::WebContents> web_contents_;
   std::unique_ptr<content::WebContentsDelegateEfl> web_contents_delegate_;

diff --git a/tizen_src/ewk/efl_integration/private/webview_delegate_ewk.cc b/tizen_src/ewk/efl_integration/private/webview_delegate_ewk.cc
index 0ced3c7..9aa120e 100644 (file)
--- a/tizen_src/ewk/efl_integration/private/webview_delegate_ewk.cc
+++ b/tizen_src/ewk/efl_integration/private/webview_delegate_ewk.cc
@@ -46,100 +46,6 @@ Eina_Rectangle WebViewDelegateEwk::GetLastUsedViewPortArea(
   return result;
 }
 
-bool WebViewDelegateEwk::RequestHandleEvent_FocusIn(EWebView* wv) const {
-  Ewk_View_Smart_Data* sd = GetEwkViewSmartDataFromEvasObject(wv->ewk_view());
-  if (sd && sd->api && sd->api->focus_in) {
-    // XXX: is it what we want, or do we want to return false if api->focus_in
-    // returns false?
-    sd->api->focus_in(sd);
-    return true;
-  }
-  return false;
-}
-
-bool WebViewDelegateEwk::RequestHandleEvent_FocusOut(EWebView* wv) const {
-  Ewk_View_Smart_Data* sd = GetEwkViewSmartDataFromEvasObject(wv->ewk_view());
-  if (sd && sd->api && sd->api->focus_out) {
-    // XXX: is it what we want, or do we want to return false if api->focus_out
-    // returns false?
-    sd->api->focus_out(sd);
-    return true;
-  }
-  return false;
-}
-
-bool WebViewDelegateEwk::RequestHandleEvent_MouseUp(EWebView* wv,
-    const Evas_Event_Mouse_Up* event_info) const {
-  Ewk_View_Smart_Data* sd = GetEwkViewSmartDataFromEvasObject(wv->ewk_view());
-  if (sd && sd->api && sd->api->mouse_up) {
-    // XXX: is it what we want, or do we want to return false if api->mouse_up
-    // returns false?
-    sd->api->mouse_up(sd, event_info);
-    return true;
-  }
-  return false;
-}
-
-bool WebViewDelegateEwk::RequestHandleEvent_MouseDown(EWebView* wv,
-    const Evas_Event_Mouse_Down* event_info) const {
-  Ewk_View_Smart_Data* sd = GetEwkViewSmartDataFromEvasObject(wv->ewk_view());
-  if (sd && sd->api && sd->api->mouse_down) {
-    // XXX: is it what we want, or do we want to return false if api->mouse_down
-    // returns false?
-    sd->api->mouse_down(sd, event_info);
-    return true;
-  }
-  return false;
-}
-
-bool WebViewDelegateEwk::RequestHandleEvent_MouseMove(EWebView* wv,
-    const Evas_Event_Mouse_Move* event_info) const {
-  Ewk_View_Smart_Data* sd = GetEwkViewSmartDataFromEvasObject(wv->ewk_view());
-  if (sd && sd->api && sd->api->mouse_move) {
-    // XXX: is it what we want, or do we want to return false if api->mouse_move
-    // returns false?
-    sd->api->mouse_move(sd, event_info);
-    return true;
-  }
-  return false;
-}
-
-bool WebViewDelegateEwk::RequestHandleEvent_MouseWheel(EWebView* wv,
-    const Evas_Event_Mouse_Wheel* event_info) const {
-  Ewk_View_Smart_Data* sd = GetEwkViewSmartDataFromEvasObject(wv->ewk_view());
-  if (sd && sd->api && sd->api->mouse_wheel) {
-    // XXX: is it what we want, or do we want to return false if api->mouse_wheel
-    // returns false?
-    sd->api->mouse_wheel(sd, event_info);
-    return true;
-  }
-  return false;
-}
-
-bool WebViewDelegateEwk::RequestHandleEvent_KeyUp(EWebView* wv,
-    const Evas_Event_Key_Up* event_info) const {
-  Ewk_View_Smart_Data* sd = GetEwkViewSmartDataFromEvasObject(wv->ewk_view());
-  if (sd && sd->api && sd->api->key_up) {
-    // XXX: is it what we want, or do we want to return false if api->key_up
-    // returns false?
-    sd->api->key_up(sd, event_info);
-    return true;
-  }
-  return false;
-}
-
-bool WebViewDelegateEwk::RequestHandleEvent_KeyDown(EWebView* wv,
-    const Evas_Event_Key_Down* event_info) const {
-  Ewk_View_Smart_Data* sd = GetEwkViewSmartDataFromEvasObject(wv->ewk_view());
-  if (sd && sd->api && sd->api->key_down) {
-    // XXX: is it what we want, or do we want to return false if api->key_down
-    // returns false?
-    sd->api->key_down(sd, event_info);
-    return true;
-  }
-  return false;
-}
-
 void WebViewDelegateEwk::RequestHandleOrientationLock(EWebView* wv,
     int orientation) const {
   Ewk_View_Smart_Data* sd = GetEwkViewSmartDataFromEvasObject(wv->ewk_view());

diff --git a/tizen_src/ewk/efl_integration/private/webview_delegate_ewk.h b/tizen_src/ewk/efl_integration/private/webview_delegate_ewk.h
index 0f4de1c..f9b622f 100644 (file)
--- a/tizen_src/ewk/efl_integration/private/webview_delegate_ewk.h
+++ b/tizen_src/ewk/efl_integration/private/webview_delegate_ewk.h
@@ -17,15 +17,6 @@ struct WebViewDelegateEwk {
   Evas_Object_Smart_Clipped_Data* GetSmartClippedData(Evas_Object* evas_object);
   Eina_Rectangle GetLastUsedViewPortArea(Evas_Object* evas_object) const;
 
-  // Event handlers
-  bool RequestHandleEvent_FocusIn(EWebView* wv) const;
-  bool RequestHandleEvent_FocusOut(EWebView* wv) const;
-  bool RequestHandleEvent_MouseUp(EWebView* wv, const Evas_Event_Mouse_Up* event_info) const;
-  bool RequestHandleEvent_MouseDown(EWebView* wv, const Evas_Event_Mouse_Down* event_info) const;
-  bool RequestHandleEvent_MouseMove(EWebView* wv, const Evas_Event_Mouse_Move* event_info) const;
-  bool RequestHandleEvent_MouseWheel(EWebView* wv, const Evas_Event_Mouse_Wheel* event_info) const;
-  bool RequestHandleEvent_KeyUp(EWebView* wv, const Evas_Event_Key_Up* event_info) const;
-  bool RequestHandleEvent_KeyDown(EWebView* wv, const Evas_Event_Key_Down* event_info) const;
   void RequestHandleOrientationLock(EWebView* wv, int orientation) const;
   void RequestHandleOrientationUnlock(EWebView* wv) const;
  private: