X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fweb-view%2Fweb-view-impl.h;h=c41be87a0c32da8ef280637413f7f686e86e8494;hb=9e3fd659c4d25706ab65345bc7c562ac27248325;hp=bce288d5dc23f86ac147212be9c68981bfb429ae;hpb=b514a4671789bee2f03b0177393b9a21f62ac2c3;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/web-view/web-view-impl.h b/dali-toolkit/internal/controls/web-view/web-view-impl.h index bce288d..c41be87 100644 --- a/dali-toolkit/internal/controls/web-view/web-view-impl.h +++ b/dali-toolkit/internal/controls/web-view/web-view-impl.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_WEB_VIEW_H /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,7 +34,7 @@ namespace Toolkit { class KeyEvent; -class TouchData; +class TouchEvent; class WebView; namespace Internal @@ -188,17 +188,17 @@ private: // From Control /** * @copydoc Toolkit::Control::OnInitialize() */ - virtual void OnInitialize(); + void OnInitialize() override; /** * @copydoc Toolkit::Control::GetNaturalSize */ - virtual Vector3 GetNaturalSize(); + Vector3 GetNaturalSize() override; /** * @copydoc Toolkit::Control::OnRelayout() */ - virtual void OnRelayout( const Vector2& size, RelayoutContainer& container ); + void OnRelayout( const Vector2& size, RelayoutContainer& container ) override; /** * Signal occurs when the Web View has been touched. @@ -206,12 +206,12 @@ private: // From Control * @param[in] touch The Touch Data. * @return Whether to consume event or not. */ - bool OnTouchEvent( Actor actor, const Dali::TouchData& touch ); + bool OnTouchEvent( Actor actor, const Dali::TouchEvent& touch ); /** * @copydoc Toolkit::Control::OnKeyEvent() */ - virtual bool OnKeyEvent( const Dali::KeyEvent& event ); + bool OnKeyEvent( const Dali::KeyEvent& event ) override; private: