extern void* EflAssistHandle;
#endif
-using namespace tizen_webview;
-
namespace content {
static const unsigned maxDatetimeLength = 32;
// 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"
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);
}
}
-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()) {
}
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
class EWebView;
-namespace tizen_webview {
-
class WebViewEvasEventHandler: public content::EvasEventHandler {
public:
explicit WebViewEvasEventHandler(EWebView*);
EWebView* webview_;
};
-} // namespace tizen_webview
-
#endif // TIZEN_WEBVIEW_PUBLIC_TW_WEBVIEW_EVAS_EVENT_HANDLER_H_
'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',
#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 <vconf.h>
#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
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));
*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;
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<WebAppScreenshotCapturedCallback> {
public:
void ReleasePopupMenuList();
- scoped_refptr<tizen_webview::WebViewEvasEventHandler> evas_event_handler_;
+ scoped_refptr<WebViewEvasEventHandler> evas_event_handler_;
scoped_refptr<Ewk_Context> context_;
scoped_refptr<Ewk_Context> old_context_;
scoped_ptr<content::WebContents> web_contents_;
std::map<int64_t, WebViewAsyncRequestHitTestDataCallback*> hit_test_callback_;
};
-namespace tizen_webview {
-typedef ::EWebView WebViewImpl;
-};
-
const unsigned int g_default_tilt_motion_sensitivity = 3;
#include <cassert>
#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) {}
Evas_Object* CreateWebViewAsEvasObject(Ewk_Context* context,
Evas* canvas,
Evas_Smart* smart /*= 0*/) {
- if(!WebViewDelegate::IsDelegateRegistered()) {
- WebViewDelegate::RegisterDelegate(
- const_cast<WebViewDelegateEwk*>(&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);
return ::GetWebViewFromEvasObject(evas_object);
}
-bool WebViewDelegateEwk::IsWebViewEvasObject(Evas_Object* evas_object) {
+bool WebViewDelegateEwk::IsWebViewEvasObject(Evas_Object* evas_object) const {
return ::IsWebViewObject(evas_object);
}
}
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);
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
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
}
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
}
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
}
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
}
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
}
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
}
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
#include <Evas.h>
#include "base/macros.h"
-#include <tizen_webview/public/tw_webview_delegate.h>
-
-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);
//Initialize web engine
void _ewk_init_web_engine()
{
- if(!WebViewDelegate::IsDelegateRegistered()) {
- WebViewDelegate::RegisterDelegate(
- const_cast<WebViewDelegateEwk*>(&WebViewDelegateEwk::GetInstance()));
- }
}
void _ewk_shutdown_web_engine(void)
#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.
+++ /dev/null
-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
+++ /dev/null
-// 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 <base/logging.h>
-
-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
+++ /dev/null
-// 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 <Evas.h>
-#include <eina_rectangle.h>
-
-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_
using password_manager::PasswordManagerClientEfl;
#endif
using base::string16;
-using namespace tizen_webview;
using namespace ui;
namespace content {
projects / platform / framework / web / chromium-efl.git / commitdiff