From 7ed8fd57697b3c542fbe47ca3369ceaa65be8476 Mon Sep 17 00:00:00 2001 From: SeungSeop Park Date: Fri, 6 Jun 2014 13:37:46 +0900 Subject: [PATCH] break dependency to Ewk_Policy_[Decision|Navigation]_Type Issue: CBEFL-92 Change-Id: I143fff1e4e2e1d90d32323ba7a2442fcb64fc75b --- .../ewk_api_headers/public/ewk_policy_decision.h | 21 ----------------- tizen_src/impl/API/ewk_policy_decision_private.cc | 15 ++++++------ tizen_src/impl/API/ewk_policy_decision_private.h | 13 +++++++---- .../impl/tizen_webview/public/tw_policy_decision.h | 27 ++++++++++++++++++++++ 4 files changed, 44 insertions(+), 32 deletions(-) create mode 100644 tizen_src/impl/tizen_webview/public/tw_policy_decision.h diff --git a/tizen_src/ewk_api_headers/public/ewk_policy_decision.h b/tizen_src/ewk_api_headers/public/ewk_policy_decision.h index 45daae8..f71ea62 100644 --- a/tizen_src/ewk_api_headers/public/ewk_policy_decision.h +++ b/tizen_src/ewk_api_headers/public/ewk_policy_decision.h @@ -24,29 +24,8 @@ extern "C" { #endif -/** - * \enum Ewk_Policy_Decision_Type - * @brief Provides option to policy decision type. - */ -enum _Ewk_Policy_Decision_Type { - EWK_POLICY_DECISION_USE, - EWK_POLICY_DECISION_DOWNLOAD, - EWK_POLICY_DECISION_IGNORE -}; -typedef enum _Ewk_Policy_Decision_Type Ewk_Policy_Decision_Type; - typedef struct _Ewk_Policy_Decision Ewk_Policy_Decision; -enum _Ewk_Policy_Navigation_Type { - EWK_POLICY_NAVIGATION_TYPE_LINK_CLICKED = 0, - EWK_POLICY_NAVIGATION_TYPE_FORM_SUBMITTED = 1, - EWK_POLICY_NAVIGATION_TYPE_BACK_FORWARD = 2, - EWK_POLICY_NAVIGATION_TYPE_RELOAD = 3, - EWK_POLICY_NAVIGATION_TYPE_FORM_RESUBMITTED = 4, - EWK_POLICY_NAVIGATION_TYPE_OTHER = 5 -}; -typedef enum _Ewk_Policy_Navigation_Type Ewk_Policy_Navigation_Type; - #ifdef __cplusplus } #endif diff --git a/tizen_src/impl/API/ewk_policy_decision_private.cc b/tizen_src/impl/API/ewk_policy_decision_private.cc index f6c8119..d174e8d 100644 --- a/tizen_src/impl/API/ewk_policy_decision_private.cc +++ b/tizen_src/impl/API/ewk_policy_decision_private.cc @@ -29,6 +29,7 @@ using content::BrowserThread; using content::RenderFrameHost; using content::RenderViewHost; +using namespace tizen_webview; namespace { void FreeStringShare(void *data) { @@ -45,8 +46,8 @@ _Ewk_Policy_Decision::_Ewk_Policy_Decision(const GURL &request_url, const net::H , scheme_(NULL) , responseMime_(NULL) , responseHeaders_(NULL) - , decisionType_(EWK_POLICY_DECISION_USE) - , navigationType_(EWK_POLICY_NAVIGATION_TYPE_OTHER) + , decisionType_(TW_POLICY_DECISION_USE) + , navigationType_(TW_POLICY_NAVIGATION_TYPE_OTHER) , isDecided_(false) , isSuspended_(false) , responseStatusCode_(0) @@ -67,7 +68,7 @@ _Ewk_Policy_Decision::_Ewk_Policy_Decision(const GURL &request_url, const net::H responseMime_ = eina_stringshare_add(mime_type.c_str()); if (!net::IsSupportedMimeType(mime_type)) - decisionType_ = EWK_POLICY_DECISION_DOWNLOAD; + decisionType_ = TW_POLICY_DECISION_DOWNLOAD; } std::string set_cookie_; @@ -94,8 +95,8 @@ _Ewk_Policy_Decision::_Ewk_Policy_Decision(const NavigationPolicyParams ¶ms, , scheme_(NULL) , responseMime_(NULL) , responseHeaders_(NULL) - , decisionType_(EWK_POLICY_DECISION_USE) - , navigationType_(static_cast(params.type)) + , decisionType_(TW_POLICY_DECISION_USE) + , navigationType_(static_cast(params.type)) , isDecided_(false) , isSuspended_(false) , responseStatusCode_(0) @@ -113,8 +114,8 @@ _Ewk_Policy_Decision::_Ewk_Policy_Decision(content::WebContentsDelegateEfl* view , scheme_(NULL) , responseMime_(NULL) , responseHeaders_(NULL) - , decisionType_(EWK_POLICY_DECISION_USE) - , navigationType_(EWK_POLICY_NAVIGATION_TYPE_OTHER) + , decisionType_(TW_POLICY_DECISION_USE) + , navigationType_(TW_POLICY_NAVIGATION_TYPE_OTHER) , isDecided_(false) , isSuspended_(false) , responseStatusCode_(0) diff --git a/tizen_src/impl/API/ewk_policy_decision_private.h b/tizen_src/impl/API/ewk_policy_decision_private.h index 86e777c..23797cc 100644 --- a/tizen_src/impl/API/ewk_policy_decision_private.h +++ b/tizen_src/impl/API/ewk_policy_decision_private.h @@ -35,6 +35,11 @@ struct NavigationPolicyParams; +#include "tizen_webview/public/tw_policy_decision.h" + +struct NavigationPolicyParams; + + namespace content { class WebContentsDelegateEfl; class RenderViewHost; @@ -66,7 +71,7 @@ class _Ewk_Policy_Decision { bool isDecided() const { return isDecided_; } bool isSuspended() const { return isSuspended_; } - Ewk_Policy_Navigation_Type GetNavigationType() const { return navigationType_; } + tizen_webview::Policy_Navigation_Type GetNavigationType() const { return navigationType_; } Eina_Stringshare* GetCookie() const { return cookie_; } Eina_Stringshare* GetAuthUser() const { return AuthUser_; } Eina_Stringshare* GetAuthPassword() const { return AuthPassword_; } @@ -74,7 +79,7 @@ class _Ewk_Policy_Decision { Eina_Stringshare* GetScheme() const { return scheme_; } Eina_Stringshare* GetHost() const { return host_; } Eina_Stringshare* GetResponseMime() const { return responseMime_; } - Ewk_Policy_Decision_Type GetDecisionType() const { return decisionType_; } + tizen_webview::Policy_Decision_Type GetDecisionType() const { return decisionType_; } Eina_Hash* GetResponseHeaders() const { return responseHeaders_; } int GetResponseStatusCode() const { return responseStatusCode_; } @@ -103,8 +108,8 @@ class _Ewk_Policy_Decision { const char* scheme_; const char* responseMime_; Eina_Hash* responseHeaders_; - Ewk_Policy_Decision_Type decisionType_; - Ewk_Policy_Navigation_Type navigationType_; + tizen_webview::Policy_Decision_Type decisionType_; + tizen_webview::Policy_Navigation_Type navigationType_; bool isDecided_; bool isSuspended_; int responseStatusCode_; diff --git a/tizen_src/impl/tizen_webview/public/tw_policy_decision.h b/tizen_src/impl/tizen_webview/public/tw_policy_decision.h new file mode 100644 index 0000000..30bf17b --- /dev/null +++ b/tizen_src/impl/tizen_webview/public/tw_policy_decision.h @@ -0,0 +1,27 @@ +// Copyright (c) 2014 The Chromium Authors. 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_POLICY_DECISION_H_ +#define TIZEN_WEBVIEW_PUBLIC_TW_POLICY_DECISION_H_ + +namespace tizen_webview { + +enum Policy_Decision_Type { + TW_POLICY_DECISION_USE, + TW_POLICY_DECISION_DOWNLOAD, + TW_POLICY_DECISION_IGNORE +}; + +enum Policy_Navigation_Type { + TW_POLICY_NAVIGATION_TYPE_LINK_CLICKED = 0, + TW_POLICY_NAVIGATION_TYPE_FORM_SUBMITTED = 1, + TW_POLICY_NAVIGATION_TYPE_BACK_FORWARD = 2, + TW_POLICY_NAVIGATION_TYPE_RELOAD = 3, + TW_POLICY_NAVIGATION_TYPE_FORM_RESUBMITTED = 4, + TW_POLICY_NAVIGATION_TYPE_OTHER = 5 +}; + +} // namespace tizen_webview + +#endif // TIZEN_WEBVIEW_PUBLIC_TW_POLICY_DECISION_H_ -- 2.7.4