Remove tw_frame.h

Use _Ewk_Frame struct directly instead of tizen_webview::Frame

Change-Id: I67f8fd2bfc3336573978e47498b67e45303eddac
Signed-off-by: Arnaud Renevier <a.renevier@samsung.com>

diff --git a/tizen_src/ewk/efl_integration/efl_integration.gypi b/tizen_src/ewk/efl_integration/efl_integration.gypi
index 6146233..1828932 100644 (file)
--- a/tizen_src/ewk/efl_integration/efl_integration.gypi
+++ b/tizen_src/ewk/efl_integration/efl_integration.gypi
@@ -306,6 +306,7 @@
       'private/ewk_custom_handlers_private.h',
       'private/ewk_error_private.h',
       'private/ewk_favicon_database_private.h',
+      'private/ewk_frame_private.cc',
       'private/ewk_frame_private.h',
       'private/ewk_geolocation_private.cc',
       'private/ewk_geolocation_private.h',
@@ -431,14 +432,12 @@
       'tizen_webview/public/tw_back_forward_list_impl.cc',
       'tizen_webview/public/tw_find_options.h',
       'tizen_webview/public/tw_context_menu_controller.cc',
-      'tizen_webview/public/tw_frame.cc',
       'tizen_webview/public/tw_back_forward_list.h',
       'tizen_webview/public/tw_policy_decision.cc',
       'tizen_webview/public/tw_touch_point.h',
       'tizen_webview/public/tw_webview_delegate.cc',
       'tizen_webview/public/tw_touch_event.h',
       'tizen_webview/public/tw_callbacks.h',
-      'tizen_webview/public/tw_frame.h',
       'tizen_webview/public/tw_webview_delegate.h',
       'tizen_webview/public/tw_context_menu_controller.h',
       'tizen_webview/public/tw_selection_controller.h',

diff --git a/tizen_src/ewk/efl_integration/eweb_view.cc b/tizen_src/ewk/efl_integration/eweb_view.cc
index 9376c6a..59992d4 100644 (file)
--- a/tizen_src/ewk/efl_integration/eweb_view.cc
+++ b/tizen_src/ewk/efl_integration/eweb_view.cc
@@ -14,6 +14,7 @@
 #include "common/web_contents_utils.h"
 #include "components/sessions/serialized_navigation_entry.h"
 #include "components/sessions/content/content_serialized_navigation_builder.h"
+#include "private/ewk_frame_private.h"
 #include "private/ewk_policy_decision_private.h"
 #include "private/ewk_settings_private.h"
 #include "private/ewk_text_style_private.h"
@@ -1049,14 +1050,14 @@ Ewk_Settings* EWebView::GetSettings() {
   return settings_.get();
 }
 
-tizen_webview::Frame* EWebView::GetMainFrame() {
+_Ewk_Frame* EWebView::GetMainFrame() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (!frame_.get()) {
     RenderViewHost* render_view_host = web_contents_->GetRenderViewHost();
 
     if (render_view_host)
-      frame_.reset(new tizen_webview::Frame(render_view_host->GetMainFrame()));
+      frame_.reset(new _Ewk_Frame(render_view_host->GetMainFrame()));
   }
 
   return frame_.get();

diff --git a/tizen_src/ewk/efl_integration/eweb_view.h b/tizen_src/ewk/efl_integration/eweb_view.h
index 8e31d5b..078e2d1 100644 (file)
--- a/tizen_src/ewk/efl_integration/eweb_view.h
+++ b/tizen_src/ewk/efl_integration/eweb_view.h
@@ -64,7 +64,6 @@
 #include "tizen_webview/public/tw_touch_event.h"
 #include "tizen_webview/public/tw_callbacks.h"
 #include "tizen_webview/public/tw_content_security_policy.h"
-#include "tizen_webview/public/tw_frame.h"
 #include "tizen_webview/public/tw_find_options.h"
 #include "tizen_webview/public/tw_touch_event.h"
 
@@ -292,7 +291,7 @@ class EWebView {
   const char* GetSelectedText() const;
   bool IsLastAvailableTextEmpty() const;
   Ewk_Settings* GetSettings();
-  tizen_webview::Frame* GetMainFrame();
+  _Ewk_Frame* GetMainFrame();
   void UpdateWebKitPreferences();
   void LoadHTMLString(const char* html, const char* base_uri, const char* unreachable_uri);
   void LoadPlainTextString(const char* plain_text);
@@ -510,7 +509,7 @@ class EWebView {
   scoped_ptr<content::WebContentsDelegateEfl> web_contents_delegate_;
   std::string pending_url_request_;
   scoped_ptr<Ewk_Settings> settings_;
-  scoped_ptr<tizen_webview::Frame> frame_;
+  scoped_ptr<_Ewk_Frame> frame_;
   scoped_ptr<tizen_webview::PolicyDecision> window_policy_;
   Evas_Object* evas_object_;
   Evas_Object* native_view_;

diff --git a/tizen_src/ewk/efl_integration/tizen_webview/public/tw_frame.cc b/tizen_src/ewk/efl_integration/private/ewk_frame_private.cc
similarity index 72%
rename from tizen_src/ewk/efl_integration/tizen_webview/public/tw_frame.cc
rename to tizen_src/ewk/efl_integration/private/ewk_frame_private.cc
index 4cbf6b8..a1e724d 100644 (file)
--- a/tizen_src/ewk/efl_integration/tizen_webview/public/tw_frame.cc
+++ b/tizen_src/ewk/efl_integration/private/ewk_frame_private.cc
@@ -1,9 +1,9 @@
-// Copyright (c) 2014 The Chromium Authors. All rights reserved.
-// Copyright 2014 Samsung Electronics. All rights reserved.
+// Copyright (c) 2015 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "tw_frame.h"
+#include "ewk_frame_private.h"
 
 #include "common/navigation_policy_params.h"
 #include "content/public/browser/render_frame_host.h"
@@ -15,8 +15,7 @@ using content::RenderFrameHost;
 using content::RenderViewHost;
 using content::WebContents;
 
-namespace tizen_webview {
-Frame::Frame(RenderFrameHost* rfh)
+_Ewk_Frame::_Ewk_Frame(RenderFrameHost* rfh)
   : is_main_frame_(false) {
   if (!rfh)
     return;
@@ -29,8 +28,8 @@ Frame::Frame(RenderFrameHost* rfh)
   is_main_frame_ = wc->GetMainFrame() == rfh;
 }
 
-Frame::Frame(const NavigationPolicyParams &params)
+_Ewk_Frame::_Ewk_Frame(const NavigationPolicyParams &params)
   : is_main_frame_(params.is_main_frame)
 {
 }
-} //namespace tizen_webview
+

diff --git a/tizen_src/ewk/efl_integration/private/ewk_frame_private.h b/tizen_src/ewk/efl_integration/private/ewk_frame_private.h
index db7796b..83e58da 100644 (file)
--- a/tizen_src/ewk/efl_integration/private/ewk_frame_private.h
+++ b/tizen_src/ewk/efl_integration/private/ewk_frame_private.h
@@ -5,9 +5,22 @@
 #ifndef EWK_FRAME_PRIVATE_H
 #define EWK_FRAME_PRIVATE_H
 
-#include <tizen_webview/public/tw_frame.h>
+namespace content {
+class RenderFrameHost;
+}
 
-struct _Ewk_Frame : public tizen_webview::Frame {
+struct NavigationPolicyParams;
+
+class _Ewk_Frame {
+public:
+  _Ewk_Frame(content::RenderFrameHost* rfh);
+  _Ewk_Frame(const NavigationPolicyParams &params);
+
+  bool IsMainFrame() const { return is_main_frame_; }
+
+private:
+  bool is_main_frame_;
 };
 
+
 #endif // EWK_FRAME_PRIVATE_H

diff --git a/tizen_src/ewk/efl_integration/private/ewk_policy_decision_private.cc b/tizen_src/ewk/efl_integration/private/ewk_policy_decision_private.cc
index 8e6c88f..90512d9 100644 (file)
--- a/tizen_src/ewk/efl_integration/private/ewk_policy_decision_private.cc
+++ b/tizen_src/ewk/efl_integration/private/ewk_policy_decision_private.cc
@@ -10,6 +10,7 @@
 #include <content/public/browser/render_view_host.h>
 #include "eweb_view.h"
 #include <net/http/http_response_headers.h>
+#include "private/ewk_frame_private.h"
 
 using content::BrowserThread;
 using content::RenderFrameHost;
@@ -74,7 +75,7 @@ _Ewk_Policy_Decision::_Ewk_Policy_Decision(const GURL &request_url,
 _Ewk_Policy_Decision::_Ewk_Policy_Decision(const NavigationPolicyParams &params, content::RenderViewHost* rvh)
   : web_view_(NULL)
   , navigation_policy_handler_(new NavigationPolicyHandlerEfl(rvh, params))
-  , frame_(new tizen_webview::Frame(params))
+  , frame_(new _Ewk_Frame(params))
   , cookie_(params.cookie)
   , httpMethod_(params.httpMethod)
   , responseHeaders_(NULL)
@@ -111,7 +112,7 @@ _Ewk_Policy_Decision::_Ewk_Policy_Decision(EWebView* view,
     view->web_contents().GetMainFrame();
   }
 
-  frame_.reset(new tizen_webview::Frame(rfh));
+  frame_.reset(new _Ewk_Frame(rfh));
 }
 
 _Ewk_Policy_Decision::~_Ewk_Policy_Decision() {
@@ -204,12 +205,12 @@ void _Ewk_Policy_Decision::InitializeOnUIThread() {
        * In some situations there is no renderer associated to the response
        * Such case can be observed while running TC utc_blink_ewk_geolocation_permission_request_suspend_func
        */
-      frame_.reset(new tizen_webview::Frame(host));
+      frame_.reset(new _Ewk_Frame(host));
     }
   }
 }
 
-tizen_webview::Frame* _Ewk_Policy_Decision::GetFrameRef() const {
+_Ewk_Frame* _Ewk_Policy_Decision::GetFrameRef() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   // Ups, forgot to initialize something?
   DCHECK(frame_.get());

diff --git a/tizen_src/ewk/efl_integration/private/ewk_policy_decision_private.h b/tizen_src/ewk/efl_integration/private/ewk_policy_decision_private.h
index 8f6890e..7492c80 100644 (file)
--- a/tizen_src/ewk/efl_integration/private/ewk_policy_decision_private.h
+++ b/tizen_src/ewk/efl_integration/private/ewk_policy_decision_private.h
@@ -17,7 +17,6 @@
 #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"
 #include <tizen_webview/public/tw_policy_decision.h>
 
@@ -80,7 +79,7 @@ class _Ewk_Policy_Decision {
 
   NavigationPolicyHandlerEfl* GetNavigationPolicyHandler() const { return navigation_policy_handler_.get(); }
 
-  tizen_webview::Frame* GetFrameRef() const;
+  _Ewk_Frame* GetFrameRef() const;
 
   void InitializeOnUIThread();
   void ParseUrl(const GURL& url);
@@ -107,7 +106,7 @@ private:
   EWebView* web_view_;
   scoped_refptr<PolicyResponseDelegateEfl> policy_response_delegate_;
   scoped_ptr<NavigationPolicyHandlerEfl> navigation_policy_handler_;
-  scoped_ptr<tizen_webview::Frame> frame_;
+  scoped_ptr<_Ewk_Frame> frame_;
   content::WebContentsDelegate::NewWindowDecideCallback window_create_callback_;
   std::string cookie_;
   std::string url_;

diff --git a/tizen_src/ewk/efl_integration/tizen_webview/public/tw_frame.h b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_frame.h
deleted file mode 100644 (file)
index 51f0cfd..0000000
--- a/tizen_src/ewk/efl_integration/tizen_webview/public/tw_frame.h
+++ /dev/null
@@ -1,28 +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_FRAME_H_
-#define TIZEN_WEBVIEW_PUBLIC_TW_FRAME_H_
-
-namespace content {
-class RenderFrameHost;
-}
-
-struct NavigationPolicyParams;
-
-namespace tizen_webview {
-class Frame {
-public:
-  Frame(content::RenderFrameHost* rfh);
-  Frame(const NavigationPolicyParams &params);
-
-  bool IsMainFrame() const { return is_main_frame_; }
-
-private:
-  bool is_main_frame_;
-};
-}
-
-#endif // TIZEN_WEBVIEW_PUBLIC_TW_FRAME_H_

diff --git a/tizen_src/ewk/efl_integration/tizen_webview/public/tw_policy_decision.cc b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_policy_decision.cc
index 84c2f14..79197de 100644 (file)
--- a/tizen_src/ewk/efl_integration/tizen_webview/public/tw_policy_decision.cc
+++ b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_policy_decision.cc
@@ -128,7 +128,7 @@ int PolicyDecision::GetResponseStatusCode() const {
   return impl_->GetResponseStatusCode();
 }
 
-tizen_webview::Frame* PolicyDecision::GetFrameRef() const {
+_Ewk_Frame* PolicyDecision::GetFrameRef() const {
   return impl_->GetFrameRef();
 }
 

diff --git a/tizen_src/ewk/efl_integration/tizen_webview/public/tw_policy_decision.h b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_policy_decision.h
index b32c50f..41e9c83 100644 (file)
--- a/tizen_src/ewk/efl_integration/tizen_webview/public/tw_policy_decision.h
+++ b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_policy_decision.h
@@ -27,10 +27,10 @@ class _Ewk_Policy_Decision;
 struct NavigationPolicyParams;
 class PolicyResponseDelegateEfl;
 class EWebView;
+class _Ewk_Frame;
 
 namespace tizen_webview {
 
-class Frame;
 class WebView;
 
 enum Policy_Decision_Type {
@@ -85,7 +85,7 @@ class PolicyDecision {
   tizen_webview::Policy_Decision_Type GetDecisionType() const;
   Eina_Hash* GetResponseHeaders() const;
   int GetResponseStatusCode() const;
-  Frame* GetFrameRef() const;
+  _Ewk_Frame* GetFrameRef() const;
  private:
   typedef ::_Ewk_Policy_Decision Impl;
   Impl* impl_;

diff --git a/tizen_src/ewk/efl_integration/tizen_webview/public/tw_webview.cc b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_webview.cc
index 8db222e..4f1b623 100644 (file)
--- a/tizen_src/ewk/efl_integration/tizen_webview/public/tw_webview.cc
+++ b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_webview.cc
@@ -92,7 +92,7 @@ void WebView::HideSelectionHandlers() {
 #endif
 }
 
-tizen_webview::Frame* WebView::GetMainFrame() {
+_Ewk_Frame* WebView::GetMainFrame() {
   return impl_->GetMainFrame();
 }
 

diff --git a/tizen_src/ewk/efl_integration/tizen_webview/public/tw_webview.h b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_webview.h
index 10c8c60..7fc6f0a 100644 (file)
--- a/tizen_src/ewk/efl_integration/tizen_webview/public/tw_webview.h
+++ b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_webview.h
@@ -28,6 +28,7 @@ struct SelectionStylePrams;
 // TODO END
 
 class EWebView;
+class _Ewk_Frame;
 
 namespace gfx {
 class Point;
@@ -35,7 +36,6 @@ class Point;
 
 namespace tizen_webview {
 
-class Frame;
 class ContextMenuController;
 class SelectionController;
 class WebContext;
@@ -64,7 +64,7 @@ class WebView {
   void ResetContextMenuController();
   void HideSelectionHandlers();
 
-  Frame* GetMainFrame();
+  _Ewk_Frame* GetMainFrame();
 
   // ---- User Agent
   bool SetUserAgent(const char* userAgent);