From 688952f4b9f42b8084c6649fa9bed49f6d19bca1 Mon Sep 17 00:00:00 2001 From: Arnaud Renevier Date: Thu, 26 Feb 2015 11:41:15 -0800 Subject: [PATCH] tizen_webview removal: remove tw_view_mode.h This is a first step toward removal of tizen_webview layer. Bug: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=11619 Reviewed by: Antonio Gomes, Balazs Kelemen Change-Id: Ia0a52ea1f3577fdeed51cf0ae29f18d64abbf870 Signed-off-by: Arnaud Renevier --- .../ewk/efl_integration/private/chromium_glue.cc | 24 ---------------------- .../ewk/efl_integration/private/chromium_glue.h | 4 ---- tizen_src/ewk/efl_integration/public/ewk_view.cc | 10 +++++---- tizen_src/impl/API/ewk_policy_decision_private.h | 1 + .../renderer_host/render_widget_host_view_efl.cc | 11 ++-------- .../renderer_host/render_widget_host_view_efl.h | 2 +- .../browser/web_contents/web_contents_view_efl.cc | 6 +++--- .../browser/web_contents/web_contents_view_efl.h | 5 ++--- tizen_src/impl/common/render_messages_efl.h | 1 - tizen_src/impl/eweb_view.cc | 3 +-- tizen_src/impl/eweb_view.h | 3 +-- tizen_src/impl/renderer/render_view_observer_efl.h | 1 - tizen_src/impl/tizen_webview/public/tw_view_mode.h | 21 ------------------- tizen_src/impl/tizen_webview/public/tw_webview.cc | 2 +- tizen_src/impl/tizen_webview/public/tw_webview.h | 5 +++-- 15 files changed, 21 insertions(+), 78 deletions(-) delete mode 100644 tizen_src/impl/tizen_webview/public/tw_view_mode.h diff --git a/tizen_src/ewk/efl_integration/private/chromium_glue.cc b/tizen_src/ewk/efl_integration/private/chromium_glue.cc index 4dd8b60..a224afc 100644 --- a/tizen_src/ewk/efl_integration/private/chromium_glue.cc +++ b/tizen_src/ewk/efl_integration/private/chromium_glue.cc @@ -284,28 +284,4 @@ Ewk_CSP_Header_Type from(tw::ContentSecurityPolicyType val) { GLUE_CAST_END() } -tw::View_Mode to(Ewk_View_Mode val) { - GLUE_CAST_START(val) - GLUE_CAST_TO(EWK_VIEW_MODE_WINDOWED, TW_VIEW_MODE_WINDOWED) - GLUE_CAST_TO(EWK_VIEW_MODE_FLOATING, TW_VIEW_MODE_FLOATING) - GLUE_CAST_TO(EWK_VIEW_MODE_FULLSCREEN, TW_VIEW_MODE_FULLSCREEN) - GLUE_CAST_TO(EWK_VIEW_MODE_MAXIMIZED, TW_VIEW_MODE_MAXIMIZED) - GLUE_CAST_TO(EWK_VIEW_MODE_MINIMIZED, TW_VIEW_MODE_MINIMIZED) - GLUE_CAST_END() - NOTREACHED(); - return TW_VIEW_MODE_WINDOWED; -} - -Ewk_View_Mode from(tw::View_Mode val) { - GLUE_CAST_START(val) - GLUE_CAST_FROM(EWK_VIEW_MODE_WINDOWED, TW_VIEW_MODE_WINDOWED) - GLUE_CAST_FROM(EWK_VIEW_MODE_FLOATING, TW_VIEW_MODE_FLOATING) - GLUE_CAST_FROM(EWK_VIEW_MODE_FULLSCREEN, TW_VIEW_MODE_FULLSCREEN) - GLUE_CAST_FROM(EWK_VIEW_MODE_MAXIMIZED, TW_VIEW_MODE_MAXIMIZED) - GLUE_CAST_FROM(EWK_VIEW_MODE_MINIMIZED, TW_VIEW_MODE_MINIMIZED) - GLUE_CAST_END() - NOTREACHED(); - return EWK_VIEW_MODE_WINDOWED; -} - } // namespace chromium_glue diff --git a/tizen_src/ewk/efl_integration/private/chromium_glue.h b/tizen_src/ewk/efl_integration/private/chromium_glue.h index 74854ea..9262f66 100644 --- a/tizen_src/ewk/efl_integration/private/chromium_glue.h +++ b/tizen_src/ewk/efl_integration/private/chromium_glue.h @@ -28,7 +28,6 @@ #include #include #include -#include namespace chromium_glue { @@ -71,9 +70,6 @@ Ewk_Find_Options from(tw::Find_Options); tw::ContentSecurityPolicyType to(Ewk_CSP_Header_Type); Ewk_CSP_Header_Type from(tw::ContentSecurityPolicyType); -tw::View_Mode to(Ewk_View_Mode); -Ewk_View_Mode from(tw::View_Mode); - } // namespace chromium_glue #endif // CHROMIUM_GLUE_H_ diff --git a/tizen_src/ewk/efl_integration/public/ewk_view.cc b/tizen_src/ewk/efl_integration/public/ewk_view.cc index a9ece9b..5f2b375 100644 --- a/tizen_src/ewk/efl_integration/public/ewk_view.cc +++ b/tizen_src/ewk/efl_integration/public/ewk_view.cc @@ -53,6 +53,7 @@ #include "private/ewk_back_forward_list_private.h" #include "private/ewk_history_private.h" #include "private/ewk_view_private.h" +#include "third_party/WebKit/public/web/WebViewModeEnums.h" using tizen_webview::WebView; using tizen_webview::WebContext; @@ -958,10 +959,11 @@ Eina_Bool ewk_view_mode_set(Evas_Object* ewkView, Ewk_View_Mode view_mode) { EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, EINA_FALSE); - if (view_mode == EWK_VIEW_MODE_WINDOWED || view_mode == EWK_VIEW_MODE_FULLSCREEN) { - tizen_webview::View_Mode tizen_webview_view_mode; - tizen_webview_view_mode = chromium_glue::to(view_mode); - impl->SetViewMode(tizen_webview_view_mode); + if (view_mode == EWK_VIEW_MODE_WINDOWED) { + impl->SetViewMode(blink::WebViewModeWindowed); + return EINA_TRUE; + } else if (view_mode == EWK_VIEW_MODE_FULLSCREEN) { + impl->SetViewMode(blink::WebViewModeFullscreen); return EINA_TRUE; } else { return EINA_FALSE; diff --git a/tizen_src/impl/API/ewk_policy_decision_private.h b/tizen_src/impl/API/ewk_policy_decision_private.h index 0c5853e..d5c93b0 100644 --- a/tizen_src/impl/API/ewk_policy_decision_private.h +++ b/tizen_src/impl/API/ewk_policy_decision_private.h @@ -16,6 +16,7 @@ #include "browser/policy_response_delegate_efl.h" #include "content/public/browser/web_contents_delegate.h" #include "content/public/common/resource_type.h" +#include "third_party/WebKit/public/web/WebViewModeEnums.h" #include "tizen_webview/public/tw_frame.h" #include "tizen_webview/public/tw_policy_decision.h" diff --git a/tizen_src/impl/browser/renderer_host/render_widget_host_view_efl.cc b/tizen_src/impl/browser/renderer_host/render_widget_host_view_efl.cc index a8f0310..c35a02d 100644 --- a/tizen_src/impl/browser/renderer_host/render_widget_host_view_efl.cc +++ b/tizen_src/impl/browser/renderer_host/render_widget_host_view_efl.cc @@ -1825,15 +1825,8 @@ void RenderWidgetHostViewEfl::OnSwapCompositorFrame( ack); } -void RenderWidgetHostViewEfl::SetViewMode(tizen_webview::View_Mode view_mode) { - blink::WebViewMode view_mode_for_blink; - if (view_mode == tizen_webview::TW_VIEW_MODE_WINDOWED) - view_mode_for_blink = blink::WebViewModeWindowed; - else if (view_mode == tizen_webview::TW_VIEW_MODE_FULLSCREEN) - view_mode_for_blink = blink::WebViewModeFullscreen; - else - return; - host_->Send(new ViewMsg_SetViewMode(host_->GetRoutingID(), view_mode_for_blink)); +void RenderWidgetHostViewEfl::SetViewMode(blink::WebViewMode view_mode) { + host_->Send(new ViewMsg_SetViewMode(host_->GetRoutingID(), view_mode)); } gfx::Vector2d RenderWidgetHostViewEfl::scroll_offset() const { diff --git a/tizen_src/impl/browser/renderer_host/render_widget_host_view_efl.h b/tizen_src/impl/browser/renderer_host/render_widget_host_view_efl.h index a63d9c9..d8379bb 100644 --- a/tizen_src/impl/browser/renderer_host/render_widget_host_view_efl.h +++ b/tizen_src/impl/browser/renderer_host/render_widget_host_view_efl.h @@ -230,7 +230,7 @@ class RenderWidgetHostViewEfl void ClearQueues(); // This function sets CSS "view-mode" media feature value. - void SetViewMode(tizen_webview::View_Mode view_mode); + void SetViewMode(blink::WebViewMode view_mode); void SetComposition(const ui::CompositionText& composition_text); void ConfirmComposition(base::string16& text); diff --git a/tizen_src/impl/browser/web_contents/web_contents_view_efl.cc b/tizen_src/impl/browser/web_contents/web_contents_view_efl.cc index e38e31e..132a7aa 100644 --- a/tizen_src/impl/browser/web_contents/web_contents_view_efl.cc +++ b/tizen_src/impl/browser/web_contents/web_contents_view_efl.cc @@ -34,7 +34,7 @@ WebContentsViewEfl::WebContentsViewEfl(WebContents* contents, : delegate_(delegate) , native_view_(NULL) , drag_dest_delegate_(NULL) - , view_mode_(tizen_webview::TW_VIEW_MODE_WINDOWED) // default value for webkit + , view_mode_(blink::WebViewModeWindowed) // default value for webkit , orientation_(0) , web_contents_(contents) {} @@ -57,7 +57,7 @@ RenderWidgetHostViewBase* WebContentsViewEfl::CreateViewForWidget( view->Init(native_view_, requested_size_); view->Show(); - if (view_mode_ != tizen_webview::TW_VIEW_MODE_WINDOWED) { + if (view_mode_ != blink::WebViewModeWindowed) { view->SetViewMode(view_mode_); } @@ -183,7 +183,7 @@ void WebContentsViewEfl::ShowContextMenu(RenderFrameHost* render_frame_host, GetEWebView()->ShowContextMenu(params); } -void WebContentsViewEfl::SetViewMode(tizen_webview::View_Mode mode) { +void WebContentsViewEfl::SetViewMode(blink::WebViewMode mode) { view_mode_ = mode; RenderWidgetHostViewEfl* view = static_cast( web_contents_->GetRenderWidgetHostView()); diff --git a/tizen_src/impl/browser/web_contents/web_contents_view_efl.h b/tizen_src/impl/browser/web_contents/web_contents_view_efl.h index 578ee23..fb01181 100644 --- a/tizen_src/impl/browser/web_contents/web_contents_view_efl.h +++ b/tizen_src/impl/browser/web_contents/web_contents_view_efl.h @@ -10,7 +10,6 @@ #include "browser/web_contents/web_drag_source_efl.h" #include "content/browser/renderer_host/render_view_host_delegate_view.h" #include "content/browser/web_contents/web_contents_view.h" -#include "tizen_webview/public/tw_view_mode.h" #include @@ -73,7 +72,7 @@ class WebContentsViewEfl bool IsDragging() const; - void SetViewMode(tizen_webview::View_Mode mode); + void SetViewMode(blink::WebViewMode mode); virtual void UpdateFormNavigation(int formElementCount, int currentNodeIndex, bool prevState, bool nextState) override; @@ -98,7 +97,7 @@ private: scoped_ptr drag_source_; scoped_ptr drag_dest_; - tizen_webview::View_Mode view_mode_; + blink::WebViewMode view_mode_; int orientation_; diff --git a/tizen_src/impl/common/render_messages_efl.h b/tizen_src/impl/common/render_messages_efl.h index 1feae20..f30b4a3 100644 --- a/tizen_src/impl/common/render_messages_efl.h +++ b/tizen_src/impl/common/render_messages_efl.h @@ -25,7 +25,6 @@ #include "tizen_webview/public/tw_error.h" #include "tizen_webview/public/tw_hit_test.h" #include "tizen_webview/public/tw_settings.h" -#include "tizen_webview/public/tw_view_mode.h" #include "tizen_webview/public/tw_wrt.h" #include diff --git a/tizen_src/impl/eweb_view.cc b/tizen_src/impl/eweb_view.cc index 26afc95..90f56fd 100644 --- a/tizen_src/impl/eweb_view.cc +++ b/tizen_src/impl/eweb_view.cc @@ -50,7 +50,6 @@ #include "tizen_webview/public/tw_hit_test.h" #include "tizen_webview/public/tw_touch_point.h" -#include "tizen_webview/public/tw_view_mode.h" #include "tizen_webview/public/tw_web_context.h" #include "tizen_webview/public/tw_webview.h" #include "tizen_webview/public/tw_webview_delegate.h" @@ -2121,7 +2120,7 @@ void EWebView::ShowFileChooser(const content::FileChooserParams& params) { file_chooser_->open(); } -void EWebView::SetViewMode(tizen_webview::View_Mode view_mode) { +void EWebView::SetViewMode(blink::WebViewMode view_mode) { GetWebContentsViewEfl()->SetViewMode(view_mode); } diff --git a/tizen_src/impl/eweb_view.h b/tizen_src/impl/eweb_view.h index edede6e..682f0cf 100644 --- a/tizen_src/impl/eweb_view.h +++ b/tizen_src/impl/eweb_view.h @@ -45,7 +45,6 @@ #include "browser/inputpicker/InputPicker.h" #include "third_party/WebKit/Source/platform/text/TextDirection.h" #include "tizen_webview/public/tw_hit_test.h" -#include "tizen_webview/public/tw_view_mode.h" #ifdef TIZEN_CONTENTS_DETECTION #include "popup_controller_efl.h" @@ -460,7 +459,7 @@ class EWebView { void SetLinkMagnifierEnabled(bool enabled); void SetOverrideEncoding(const std::string& encoding); - void SetViewMode(tizen_webview::View_Mode view_mode); + void SetViewMode(blink::WebViewMode view_mode); gfx::Point GetContextMenuPosition() const; diff --git a/tizen_src/impl/renderer/render_view_observer_efl.h b/tizen_src/impl/renderer/render_view_observer_efl.h index c3bc147..ca90abf 100644 --- a/tizen_src/impl/renderer/render_view_observer_efl.h +++ b/tizen_src/impl/renderer/render_view_observer_efl.h @@ -17,7 +17,6 @@ #include "third_party/WebKit/public/web/WebViewModeEnums.h" #include "tizen_webview/public/tw_content_security_policy.h" #include "tizen_webview/public/tw_hit_test.h" -#include "tizen_webview/public/tw_view_mode.h" namespace base { class FilePath; diff --git a/tizen_src/impl/tizen_webview/public/tw_view_mode.h b/tizen_src/impl/tizen_webview/public/tw_view_mode.h deleted file mode 100644 index 13a13a9..0000000 --- a/tizen_src/impl/tizen_webview/public/tw_view_mode.h +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright (c) 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_VIEW_MODE_H_ -#define TIZEN_WEBVIEW_PUBLIC_TW_VIEW_MODE_H_ - -namespace tizen_webview { - -// CSS view-mode media feature values. -enum View_Mode { - TW_VIEW_MODE_WINDOWED, - TW_VIEW_MODE_FLOATING, - TW_VIEW_MODE_FULLSCREEN, - TW_VIEW_MODE_MAXIMIZED, - TW_VIEW_MODE_MINIMIZED, -}; - -} // namespace tizen_webview - -#endif // TIZEN_WEBVIEW_PUBLIC_TW_VIEW_MODE_H_ diff --git a/tizen_src/impl/tizen_webview/public/tw_webview.cc b/tizen_src/impl/tizen_webview/public/tw_webview.cc index 55ff43c..d1fedfd 100644 --- a/tizen_src/impl/tizen_webview/public/tw_webview.cc +++ b/tizen_src/impl/tizen_webview/public/tw_webview.cc @@ -311,7 +311,7 @@ void WebView::SetOrientationLockCallback(Orientation_Lock_Cb func, void* data) { return impl_->SetOrientationLockCallback(func, data); } -void WebView::SetViewMode(View_Mode view_mode) { +void WebView::SetViewMode(blink::WebViewMode view_mode) { return impl_->SetViewMode(view_mode); } diff --git a/tizen_src/impl/tizen_webview/public/tw_webview.h b/tizen_src/impl/tizen_webview/public/tw_webview.h index 0fe5a4d..4fbcac5 100644 --- a/tizen_src/impl/tizen_webview/public/tw_webview.h +++ b/tizen_src/impl/tizen_webview/public/tw_webview.h @@ -18,7 +18,8 @@ #include "tizen_webview/public/tw_find_options.h" #include "tizen_webview/public/tw_macro.h" #include "tizen_webview/public/tw_touch_event.h" -#include "tizen_webview/public/tw_view_mode.h" + +#include "third_party/WebKit/public/web/WebViewModeEnums.h" // TODO: Remove this dependency #include "EdgeEffect.h" @@ -137,7 +138,7 @@ class WebView { void SetOrientation(int orientation); void SetOrientationLockCallback(Orientation_Lock_Cb func, void* data); // > View mode - void SetViewMode(tizen_webview::View_Mode view_mode); + void SetViewMode(blink::WebViewMode view_mode); bool IsFullscreen(); void ExitFullscreen(); // > View Snapshot -- 2.7.4