From 36c76cd3a603d7d96910ca36fd543440b3a3bfec Mon Sep 17 00:00:00 2001 From: Arnaud Renevier Date: Tue, 5 May 2015 14:19:11 -0700 Subject: [PATCH] Remove tw_webview_delegate Use WebViewDelegateEwk directly instead of tizen_webview::WebViewDelegate Additionally, this patch moves WebViewEvasEventHandler out of tizen_webview namespace, where it doesn't belong. So we can now get totally rid of tizen_webview Bug: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=11619 Change-Id: Idd9fdc5a007921422c27affe5fd61652442b3d18 Signed-off-by: Arnaud Renevier --- .../browser/inputpicker/InputPicker.cc | 2 - .../web_view_evas_handler.cc} | 61 +++++++------------ .../web_view_evas_handler.h} | 4 -- tizen_src/ewk/efl_integration/efl_integration.gypi | 6 +- tizen_src/ewk/efl_integration/eweb_view.cc | 8 +-- tizen_src/ewk/efl_integration/eweb_view.h | 11 +--- .../efl_integration/private/ewk_view_private.cc | 8 --- .../private/webview_delegate_ewk.cc | 20 +++---- .../efl_integration/private/webview_delegate_ewk.h | 27 ++++----- tizen_src/ewk/efl_integration/public/ewk_main.cc | 4 -- .../efl_integration/selection_controller_efl.cc | 2 - .../efl_integration/tizen_webview/public/README | 17 ------ .../tizen_webview/public/tw_webview_delegate.cc | 31 ---------- .../tizen_webview/public/tw_webview_delegate.h | 70 ---------------------- .../efl_integration/web_contents_delegate_efl.cc | 1 - 15 files changed, 48 insertions(+), 224 deletions(-) rename tizen_src/ewk/efl_integration/{tizen_webview/public/tw_webview_evas_event_handler.cc => browser/web_view_evas_handler.cc} (57%) rename tizen_src/ewk/efl_integration/{tizen_webview/public/tw_webview_evas_event_handler.h => browser/web_view_evas_handler.h} (95%) delete mode 100644 tizen_src/ewk/efl_integration/tizen_webview/public/README delete mode 100644 tizen_src/ewk/efl_integration/tizen_webview/public/tw_webview_delegate.cc delete mode 100644 tizen_src/ewk/efl_integration/tizen_webview/public/tw_webview_delegate.h diff --git a/tizen_src/ewk/efl_integration/browser/inputpicker/InputPicker.cc b/tizen_src/ewk/efl_integration/browser/inputpicker/InputPicker.cc index 7ead9b9..fceab1d 100755 --- a/tizen_src/ewk/efl_integration/browser/inputpicker/InputPicker.cc +++ b/tizen_src/ewk/efl_integration/browser/inputpicker/InputPicker.cc @@ -26,8 +26,6 @@ extern void* EflAssistHandle; #endif -using namespace tizen_webview; - namespace content { static const unsigned maxDatetimeLength = 32; diff --git a/tizen_src/ewk/efl_integration/tizen_webview/public/tw_webview_evas_event_handler.cc b/tizen_src/ewk/efl_integration/browser/web_view_evas_handler.cc similarity index 57% rename from tizen_src/ewk/efl_integration/tizen_webview/public/tw_webview_evas_event_handler.cc rename to tizen_src/ewk/efl_integration/browser/web_view_evas_handler.cc index 559dca3..c015ba0 100644 --- a/tizen_src/ewk/efl_integration/tizen_webview/public/tw_webview_evas_event_handler.cc +++ b/tizen_src/ewk/efl_integration/browser/web_view_evas_handler.cc @@ -3,9 +3,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "tw_webview_evas_event_handler.h" +#include "browser/web_view_evas_handler.h" -#include "tizen_webview/public/tw_webview_delegate.h" +#include "private/webview_delegate_ewk.h" #include "eweb_view.h" @@ -13,7 +13,7 @@ using content::SelectionControllerEfl; namespace { inline bool isHardwareBackKey(const Evas_Event_Key_Down *event) { -#ifdef OS_TIZEN +#if defined(OS_TIZEN) return (strcmp(event->key, "XF86Stop") == 0); #else return (strcmp(event->key, "Escape") == 0); @@ -21,35 +21,27 @@ inline bool isHardwareBackKey(const Evas_Event_Key_Down *event) { } } -namespace tizen_webview { WebViewEvasEventHandler::WebViewEvasEventHandler(EWebView* wv) : webview_ (wv) { } bool WebViewEvasEventHandler::HandleEvent_FocusIn() { - WebViewDelegate* wvd = WebViewDelegate::GetInstance(); - if (!wvd) - return false; - return wvd->RequestHandleEvent_FocusIn(webview_); + return WebViewDelegateEwk::GetInstance(). + RequestHandleEvent_FocusIn(webview_); } bool WebViewEvasEventHandler::HandleEvent_FocusOut() { - WebViewDelegate* wvd = WebViewDelegate::GetInstance(); - if (!wvd) - return false; - return wvd->RequestHandleEvent_FocusOut(webview_); + return WebViewDelegateEwk::GetInstance(). + RequestHandleEvent_FocusOut(webview_); } bool WebViewEvasEventHandler::HandleEvent_KeyDown(const Evas_Event_Key_Down* event_info) { - bool handled = false; + bool handled = WebViewDelegateEwk::GetInstance(). + RequestHandleEvent_KeyDown(webview_, event_info); - WebViewDelegate* wvd = WebViewDelegate::GetInstance(); - if (wvd) { - handled = wvd->RequestHandleEvent_KeyDown(webview_, event_info); - if (handled) + if (handled) return handled; - } if (isHardwareBackKey(event_info)) { if (webview_->GetContextMenuController()) { @@ -69,39 +61,26 @@ bool WebViewEvasEventHandler::HandleEvent_KeyDown(const Evas_Event_Key_Down* eve } bool WebViewEvasEventHandler::HandleEvent_KeyUp(const Evas_Event_Key_Up* event_info) { - - WebViewDelegate* wvd = WebViewDelegate::GetInstance(); - if (!wvd) - return false; - return wvd->RequestHandleEvent_KeyUp(webview_, event_info); + return WebViewDelegateEwk::GetInstance(). + RequestHandleEvent_KeyUp(webview_, event_info); } bool WebViewEvasEventHandler::HandleEvent_MouseDown(const Evas_Event_Mouse_Down* event_info) { - WebViewDelegate* wvd = WebViewDelegate::GetInstance(); - if (!wvd) - return false; - return wvd->RequestHandleEvent_MouseDown(webview_, event_info); + return WebViewDelegateEwk::GetInstance(). + RequestHandleEvent_MouseDown(webview_, event_info); } bool WebViewEvasEventHandler::HandleEvent_MouseUp(const Evas_Event_Mouse_Up* event_info) { - WebViewDelegate* wvd = WebViewDelegate::GetInstance(); - if (!wvd) - return false; - return wvd->RequestHandleEvent_MouseUp(webview_, event_info); + return WebViewDelegateEwk::GetInstance(). + RequestHandleEvent_MouseUp(webview_, event_info); } bool WebViewEvasEventHandler::HandleEvent_MouseMove(const Evas_Event_Mouse_Move* event_info) { - WebViewDelegate* wvd = WebViewDelegate::GetInstance(); - if (!wvd) - return false; - return wvd->RequestHandleEvent_MouseMove(webview_, event_info); + return WebViewDelegateEwk::GetInstance(). + RequestHandleEvent_MouseMove(webview_, event_info); } bool WebViewEvasEventHandler::HandleEvent_MouseWheel(const Evas_Event_Mouse_Wheel* event_info) { - WebViewDelegate* wvd = WebViewDelegate::GetInstance(); - if (!wvd) - return false; - return wvd->RequestHandleEvent_MouseWheel(webview_, event_info); + return WebViewDelegateEwk::GetInstance(). + RequestHandleEvent_MouseWheel(webview_, event_info); } - -} // namespace tizen_webview diff --git a/tizen_src/ewk/efl_integration/tizen_webview/public/tw_webview_evas_event_handler.h b/tizen_src/ewk/efl_integration/browser/web_view_evas_handler.h similarity index 95% rename from tizen_src/ewk/efl_integration/tizen_webview/public/tw_webview_evas_event_handler.h rename to tizen_src/ewk/efl_integration/browser/web_view_evas_handler.h index 1a295a4..54563b1 100644 --- a/tizen_src/ewk/efl_integration/tizen_webview/public/tw_webview_evas_event_handler.h +++ b/tizen_src/ewk/efl_integration/browser/web_view_evas_handler.h @@ -10,8 +10,6 @@ class EWebView; -namespace tizen_webview { - class WebViewEvasEventHandler: public content::EvasEventHandler { public: explicit WebViewEvasEventHandler(EWebView*); @@ -30,6 +28,4 @@ class WebViewEvasEventHandler: public content::EvasEventHandler { EWebView* webview_; }; -} // namespace tizen_webview - #endif // TIZEN_WEBVIEW_PUBLIC_TW_WEBVIEW_EVAS_EVENT_HANDLER_H_ diff --git a/tizen_src/ewk/efl_integration/efl_integration.gypi b/tizen_src/ewk/efl_integration/efl_integration.gypi index 6352e5b..5a7d139 100644 --- a/tizen_src/ewk/efl_integration/efl_integration.gypi +++ b/tizen_src/ewk/efl_integration/efl_integration.gypi @@ -438,10 +438,8 @@ 'public/text_encoding_map_efl.cc', 'public/text_encoding_map_efl.h', - 'tizen_webview/public/tw_webview_delegate.cc', - 'tizen_webview/public/tw_webview_delegate.h', - 'tizen_webview/public/tw_webview_evas_event_handler.h', - 'tizen_webview/public/tw_webview_evas_event_handler.cc', + 'browser/web_view_evas_handler.cc', + 'browser/web_view_evas_handler.h', 'renderer/content_renderer_client_efl.cc', 'renderer/content_renderer_client_efl.h', diff --git a/tizen_src/ewk/efl_integration/eweb_view.cc b/tizen_src/ewk/efl_integration/eweb_view.cc index bfbd60f..1a883e1 100644 --- a/tizen_src/ewk/efl_integration/eweb_view.cc +++ b/tizen_src/ewk/efl_integration/eweb_view.cc @@ -57,8 +57,7 @@ #include "ui/gfx/screen.h" #include "devtools_delegate_efl.h" -#include "tizen_webview/public/tw_webview_delegate.h" -#include "tizen_webview/public/tw_webview_evas_event_handler.h" +#include "browser/web_view_evas_handler.h" #if defined(OS_TIZEN) #include @@ -77,7 +76,6 @@ #endif using namespace content; -using namespace tizen_webview; using web_contents_utils::WebViewFromWebContents; // GetContentClient() is defined in content_client.cc, but in content_client.h @@ -308,7 +306,7 @@ void EWebView::Initialize() { InitializeContent(); selection_controller_.reset(new content::SelectionControllerEfl(this, *web_contents_.get())); - evas_event_handler_ = new tizen_webview::WebViewEvasEventHandler(this); + evas_event_handler_ = new WebViewEvasEventHandler(this); scroll_detector_.reset(new ScrollDetector(this)); @@ -1362,7 +1360,7 @@ void EWebView::GetScrollSize(int* width, int* height) { *height = 0; Eina_Rectangle last_view_port = - WebViewDelegate::GetInstance()->GetLastUsedViewPortArea(evas_object()); + WebViewDelegateEwk::GetInstance().GetLastUsedViewPortArea(evas_object()); if (width && contents_size_.width() > last_view_port.w) *width = contents_size_.width() - last_view_port.w; diff --git a/tizen_src/ewk/efl_integration/eweb_view.h b/tizen_src/ewk/efl_integration/eweb_view.h index 619df1f..884697d 100644 --- a/tizen_src/ewk/efl_integration/eweb_view.h +++ b/tizen_src/ewk/efl_integration/eweb_view.h @@ -64,14 +64,11 @@ class WebContentsViewEfl; class PopupControllerEfl; } -namespace tizen_webview { -class WebViewEvasEventHandler; -} - class ErrorParams; class _Ewk_Policy_Decision; class _Ewk_Hit_Test; class Ewk_Context; +class WebViewEvasEventHandler; class WebAppScreenshotCapturedCallback : public base::RefCounted { public: @@ -472,7 +469,7 @@ class EWebView { void ReleasePopupMenuList(); - scoped_refptr evas_event_handler_; + scoped_refptr evas_event_handler_; scoped_refptr context_; scoped_refptr old_context_; scoped_ptr web_contents_; @@ -554,10 +551,6 @@ private: std::map hit_test_callback_; }; -namespace tizen_webview { -typedef ::EWebView WebViewImpl; -}; - const unsigned int g_default_tilt_motion_sensitivity = 3; diff --git a/tizen_src/ewk/efl_integration/private/ewk_view_private.cc b/tizen_src/ewk/efl_integration/private/ewk_view_private.cc index 092f03d..56a3dfb 100644 --- a/tizen_src/ewk/efl_integration/private/ewk_view_private.cc +++ b/tizen_src/ewk/efl_integration/private/ewk_view_private.cc @@ -7,13 +7,10 @@ #include #include "eweb_view.h" -#include "tizen_webview/public/tw_webview_delegate.h" #include "private/ewk_context_private.h" #include "private/webview_delegate_ewk.h" -using tizen_webview::WebViewDelegate; - // -------- EwkViewImpl struct EwkViewImpl { explicit EwkViewImpl(EWebView* wv) : wv_(wv) {} @@ -244,11 +241,6 @@ EWebView* GetWebViewFromEvasObject(const Evas_Object* eo) { Evas_Object* CreateWebViewAsEvasObject(Ewk_Context* context, Evas* canvas, Evas_Smart* smart /*= 0*/) { - if(!WebViewDelegate::IsDelegateRegistered()) { - WebViewDelegate::RegisterDelegate( - const_cast(&WebViewDelegateEwk::GetInstance())); - } - smart = smart ? smart : DefaultSmartClassInstance(); Evas_Object* wv_evas_object = evas_object_smart_add(canvas, smart); EWebView* view = new EWebView(context, wv_evas_object); 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 d226852..2b3cb5a 100644 --- a/tizen_src/ewk/efl_integration/private/webview_delegate_ewk.cc +++ b/tizen_src/ewk/efl_integration/private/webview_delegate_ewk.cc @@ -20,7 +20,7 @@ EWebView* WebViewDelegateEwk::GetWebViewFromEvasObject( return ::GetWebViewFromEvasObject(evas_object); } -bool WebViewDelegateEwk::IsWebViewEvasObject(Evas_Object* evas_object) { +bool WebViewDelegateEwk::IsWebViewEvasObject(Evas_Object* evas_object) const { return ::IsWebViewObject(evas_object); } @@ -33,7 +33,7 @@ Evas_Object_Smart_Clipped_Data* WebViewDelegateEwk::GetSmartClippedData( } Eina_Rectangle WebViewDelegateEwk::GetLastUsedViewPortArea( - Evas_Object* evas_object) { + Evas_Object* evas_object) const { Eina_Rectangle result = {-1, -1, -1, -1}; if (WebViewDelegateEwk::IsWebViewEvasObject(evas_object)) { Ewk_View_Smart_Data* sd = GetEwkViewSmartDataFromEvasObject(evas_object); @@ -46,7 +46,7 @@ Eina_Rectangle WebViewDelegateEwk::GetLastUsedViewPortArea( return result; } -bool WebViewDelegateEwk::RequestHandleEvent_FocusIn(EWebView* wv) { +bool WebViewDelegateEwk::RequestHandleEvent_FocusIn(EWebView* wv) const { Ewk_View_Smart_Data* sd = GetEwkViewSmartDataFromEvasObject(wv->evas_object()); 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 @@ -57,7 +57,7 @@ bool WebViewDelegateEwk::RequestHandleEvent_FocusIn(EWebView* wv) { return false; } -bool WebViewDelegateEwk::RequestHandleEvent_FocusOut(EWebView* wv) { +bool WebViewDelegateEwk::RequestHandleEvent_FocusOut(EWebView* wv) const { Ewk_View_Smart_Data* sd = GetEwkViewSmartDataFromEvasObject(wv->evas_object()); 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 @@ -69,7 +69,7 @@ bool WebViewDelegateEwk::RequestHandleEvent_FocusOut(EWebView* wv) { } bool WebViewDelegateEwk::RequestHandleEvent_MouseUp(EWebView* wv, - const Evas_Event_Mouse_Up* event_info) { + const Evas_Event_Mouse_Up* event_info) const { Ewk_View_Smart_Data* sd = GetEwkViewSmartDataFromEvasObject(wv->evas_object()); 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 @@ -81,7 +81,7 @@ bool WebViewDelegateEwk::RequestHandleEvent_MouseUp(EWebView* wv, } bool WebViewDelegateEwk::RequestHandleEvent_MouseDown(EWebView* wv, - const Evas_Event_Mouse_Down* event_info) { + const Evas_Event_Mouse_Down* event_info) const { Ewk_View_Smart_Data* sd = GetEwkViewSmartDataFromEvasObject(wv->evas_object()); 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 @@ -93,7 +93,7 @@ bool WebViewDelegateEwk::RequestHandleEvent_MouseDown(EWebView* wv, } bool WebViewDelegateEwk::RequestHandleEvent_MouseMove(EWebView* wv, - const Evas_Event_Mouse_Move* event_info) { + const Evas_Event_Mouse_Move* event_info) const { Ewk_View_Smart_Data* sd = GetEwkViewSmartDataFromEvasObject(wv->evas_object()); 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 @@ -105,7 +105,7 @@ bool WebViewDelegateEwk::RequestHandleEvent_MouseMove(EWebView* wv, } bool WebViewDelegateEwk::RequestHandleEvent_MouseWheel(EWebView* wv, - const Evas_Event_Mouse_Wheel* event_info) { + const Evas_Event_Mouse_Wheel* event_info) const { Ewk_View_Smart_Data* sd = GetEwkViewSmartDataFromEvasObject(wv->evas_object()); 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 @@ -117,7 +117,7 @@ bool WebViewDelegateEwk::RequestHandleEvent_MouseWheel(EWebView* wv, } bool WebViewDelegateEwk::RequestHandleEvent_KeyUp(EWebView* wv, - const Evas_Event_Key_Up* event_info) { + const Evas_Event_Key_Up* event_info) const { Ewk_View_Smart_Data* sd = GetEwkViewSmartDataFromEvasObject(wv->evas_object()); 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 @@ -129,7 +129,7 @@ bool WebViewDelegateEwk::RequestHandleEvent_KeyUp(EWebView* wv, } bool WebViewDelegateEwk::RequestHandleEvent_KeyDown(EWebView* wv, - const Evas_Event_Key_Down* event_info) { + const Evas_Event_Key_Down* event_info) const { Ewk_View_Smart_Data* sd = GetEwkViewSmartDataFromEvasObject(wv->evas_object()); 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 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 5e402cb..7aa84d2 100644 --- a/tizen_src/ewk/efl_integration/private/webview_delegate_ewk.h +++ b/tizen_src/ewk/efl_integration/private/webview_delegate_ewk.h @@ -8,30 +8,25 @@ #include #include "base/macros.h" -#include - -using tizen_webview::WebViewDelegate; - class EWebView; -struct WebViewDelegateEwk : public WebViewDelegate { +struct WebViewDelegateEwk { public: static const WebViewDelegateEwk& GetInstance(); EWebView* GetWebViewFromEvasObject(Evas_Object* evas_object) const; - bool IsWebViewEvasObject(Evas_Object* evas_object); + bool IsWebViewEvasObject(Evas_Object* evas_object) const; Evas_Object_Smart_Clipped_Data* GetSmartClippedData(Evas_Object* evas_object); - Eina_Rectangle GetLastUsedViewPortArea(Evas_Object* evas_object); + Eina_Rectangle GetLastUsedViewPortArea(Evas_Object* evas_object) const; - protected: // Event handlers - bool RequestHandleEvent_FocusIn(EWebView* wv); - bool RequestHandleEvent_FocusOut(EWebView* wv); - bool RequestHandleEvent_MouseUp(EWebView* wv, const Evas_Event_Mouse_Up* event_info); - bool RequestHandleEvent_MouseDown(EWebView* wv, const Evas_Event_Mouse_Down* event_info); - bool RequestHandleEvent_MouseMove(EWebView* wv, const Evas_Event_Mouse_Move* event_info); - bool RequestHandleEvent_MouseWheel(EWebView* wv, const Evas_Event_Mouse_Wheel* event_info); - bool RequestHandleEvent_KeyUp(EWebView* wv, const Evas_Event_Key_Up* event_info); - bool RequestHandleEvent_KeyDown(EWebView* wv, const Evas_Event_Key_Down* event_info); + 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; private: WebViewDelegateEwk() {} DISALLOW_COPY_AND_ASSIGN(WebViewDelegateEwk); diff --git a/tizen_src/ewk/efl_integration/public/ewk_main.cc b/tizen_src/ewk/efl_integration/public/ewk_main.cc index fc792de..fadec81 100644 --- a/tizen_src/ewk/efl_integration/public/ewk_main.cc +++ b/tizen_src/ewk/efl_integration/public/ewk_main.cc @@ -181,10 +181,6 @@ void ewk_home_directory_set(const char* path) //Initialize web engine void _ewk_init_web_engine() { - if(!WebViewDelegate::IsDelegateRegistered()) { - WebViewDelegate::RegisterDelegate( - const_cast(&WebViewDelegateEwk::GetInstance())); - } } void _ewk_shutdown_web_engine(void) diff --git a/tizen_src/ewk/efl_integration/selection_controller_efl.cc b/tizen_src/ewk/efl_integration/selection_controller_efl.cc index 444368f..5e2c614 100644 --- a/tizen_src/ewk/efl_integration/selection_controller_efl.cc +++ b/tizen_src/ewk/efl_integration/selection_controller_efl.cc @@ -12,8 +12,6 @@ #include "public/ewk_hit_test.h" #include "ui/gfx/screen.h" -using namespace tizen_webview; - namespace content { static const int menuHeight = 140;// The Height fo the context menu. diff --git a/tizen_src/ewk/efl_integration/tizen_webview/public/README b/tizen_src/ewk/efl_integration/tizen_webview/public/README deleted file mode 100644 index dcd4561..0000000 --- a/tizen_src/ewk/efl_integration/tizen_webview/public/README +++ /dev/null @@ -1,17 +0,0 @@ -Tizen WebView Public API -======================== - -This directory contains the public API for using Tizen WebView. -The primary consumer of this API is chromium-ewk package, -which is for providing Tizen's historic EWK API. - -The ground rule is as follows: -- The public headers in this directory should not depend on - other chromium headers outside this directory -- Clients of chromium-efl (e.g, chromium-ewk package) should - rely only on the public headers -- The api and types defined in the public headers should be - under the namespace tizen_webview - -The convention: -- use prefix 'tw_' for file name diff --git a/tizen_src/ewk/efl_integration/tizen_webview/public/tw_webview_delegate.cc b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_webview_delegate.cc deleted file mode 100644 index adfb566..0000000 --- a/tizen_src/ewk/efl_integration/tizen_webview/public/tw_webview_delegate.cc +++ /dev/null @@ -1,31 +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 "tw_webview_delegate.h" -#include - -namespace tizen_webview { - -static WebViewDelegate* gWebViewDelegate = NULL; - -void WebViewDelegate::RegisterDelegate(WebViewDelegate* wv_delegate) { - if (!gWebViewDelegate) { - gWebViewDelegate = wv_delegate; - } -} - -bool WebViewDelegate::IsDelegateRegistered() { - return gWebViewDelegate != NULL; -} - -WebViewDelegate* WebViewDelegate::GetInstance() { - if (!IsDelegateRegistered()) { - DLOG(ERROR) << "tizen_webview::WebViewDelegate is not yet registered."; - return NULL; - } - return gWebViewDelegate; -} - -} // namespace tizen_webview diff --git a/tizen_src/ewk/efl_integration/tizen_webview/public/tw_webview_delegate.h b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_webview_delegate.h deleted file mode 100644 index e20cf13..0000000 --- a/tizen_src/ewk/efl_integration/tizen_webview/public/tw_webview_delegate.h +++ /dev/null @@ -1,70 +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_PUBLIC_TW_WEBVIEW_DELEGATE_H_ -#define TIZEN_WEBVIEW_PUBLIC_TW_WEBVIEW_DELEGATE_H_ - -#include -#include - -class EWebView; - -namespace tizen_webview { - -class WebView; - -class WebViewDelegate { - public: - // Register the default delegate. - // Client of WebView should register one before creating a WebView first time. - // Client has the ownership for |wv_delegate| and should ensure its validity - // while using WebView. - // Currently, it is not allowed to re-register another delegate, - // and if try to do it it is simply ignored. - static void RegisterDelegate(WebViewDelegate* wv_delegate); - - // Check if a default delegate is registered or not - static bool IsDelegateRegistered(); - - // Get the default delegate registered in RegisterDefaultDelegate() - static WebViewDelegate* GetInstance(); - - // Retrieve WebView from |evas_object|. - // If |evas_object| is not WebView, return NULL. - virtual EWebView* GetWebViewFromEvasObject(Evas_Object* evas_object) const = 0; - - // Check if |evas_object| is WebView or not. - virtual bool IsWebViewEvasObject(Evas_Object* evas_object) = 0; - - // Get clipped data from WebView evas object which is a clipped smart object. - virtual Evas_Object_Smart_Clipped_Data* GetSmartClippedData( - Evas_Object* evas_object) = 0; - - // Get lastly used view port area. - // If |evas_object| is not a WebView, return Enia_Rectangle with width -1. - virtual Eina_Rectangle GetLastUsedViewPortArea(Evas_Object* evas_object) = 0; - - // ---- Custom Event handlers - // Give opportunity for client to process event. - // [Note] return true if handled, false otherwise. - virtual bool RequestHandleEvent_FocusIn(EWebView* wv) { return false; } - virtual bool RequestHandleEvent_FocusOut(EWebView* wv) { return false; } - virtual bool RequestHandleEvent_MouseUp( - EWebView* wv, const Evas_Event_Mouse_Up* event_info) { return false; } - virtual bool RequestHandleEvent_MouseDown( - EWebView* wv, const Evas_Event_Mouse_Down* event_info) { return false; } - virtual bool RequestHandleEvent_MouseMove( - EWebView* wv, const Evas_Event_Mouse_Move* event_info) { return false; } - virtual bool RequestHandleEvent_MouseWheel( - EWebView* wv, const Evas_Event_Mouse_Wheel* event_info) { return false; } - virtual bool RequestHandleEvent_KeyUp( - EWebView* wv, const Evas_Event_Key_Up* event_info) { return false; } - virtual bool RequestHandleEvent_KeyDown( - EWebView* wv, const Evas_Event_Key_Down* event_info) { return false; } -}; - -} // namespace tizen_webview - -#endif // TIZEN_WEBVIEW_PUBLIC_TW_WEBVIEW_DELEGATE_H_ diff --git a/tizen_src/ewk/efl_integration/web_contents_delegate_efl.cc b/tizen_src/ewk/efl_integration/web_contents_delegate_efl.cc index 952f293..eded89a1 100644 --- a/tizen_src/ewk/efl_integration/web_contents_delegate_efl.cc +++ b/tizen_src/ewk/efl_integration/web_contents_delegate_efl.cc @@ -52,7 +52,6 @@ using autofill::ContentAutofillDriver; using password_manager::PasswordManagerClientEfl; #endif using base::string16; -using namespace tizen_webview; using namespace ui; namespace content { -- 2.7.4