From 7be31fe9f04fb9d718af9f9e1e7d1f1646922c12 Mon Sep 17 00:00:00 2001 From: Seoyeon Kim Date: Mon, 16 Oct 2017 13:53:48 +0900 Subject: [PATCH] Revert "[4.0] Implement WebViewLite interface" This reverts commit 3d068e7c63f15edc498af44006f8d947d30b7038. Change-Id: I4fb8cb9fc1e473972c514d9153fe85cf0a6b3de3 --- automated-tests/src/dali-toolkit/CMakeLists.txt | 1 - .../toolkit-web-view-lite.cpp | 125 ----------------- .../toolkit-web-view-lite.h | 75 ----------- build/tizen/dali-toolkit/Makefile.am | 2 - .../controls/web-view-lite/web-view-lite.cpp | 96 ------------- .../controls/web-view-lite/web-view-lite.h | 149 --------------------- dali-toolkit/devel-api/file.list | 4 - .../controls/web-view-lite/web-view-lite-impl.cpp | 133 ------------------ .../controls/web-view-lite/web-view-lite-impl.h | 122 ----------------- dali-toolkit/internal/file.list | 1 - 10 files changed, 708 deletions(-) delete mode 100644 automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-web-view-lite.cpp delete mode 100644 automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-web-view-lite.h delete mode 100644 dali-toolkit/devel-api/controls/web-view-lite/web-view-lite.cpp delete mode 100644 dali-toolkit/devel-api/controls/web-view-lite/web-view-lite.h delete mode 100644 dali-toolkit/internal/controls/web-view-lite/web-view-lite-impl.cpp delete mode 100644 dali-toolkit/internal/controls/web-view-lite/web-view-lite-impl.h diff --git a/automated-tests/src/dali-toolkit/CMakeLists.txt b/automated-tests/src/dali-toolkit/CMakeLists.txt index a21720e..4def66d 100755 --- a/automated-tests/src/dali-toolkit/CMakeLists.txt +++ b/automated-tests/src/dali-toolkit/CMakeLists.txt @@ -86,7 +86,6 @@ LIST(APPEND TC_SOURCES dali-toolkit-test-utils/toolkit-native-image-source.cpp dali-toolkit-test-utils/toolkit-video-player.cpp dali-toolkit-test-utils/toolkit-trigger-event-factory.cpp - dali-toolkit-test-utils/toolkit-web-view-lite.cpp dali-toolkit-test-utils/dali-test-suite-utils.cpp dali-toolkit-test-utils/dummy-control.cpp dali-toolkit-test-utils/mesh-builder.cpp diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-web-view-lite.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-web-view-lite.cpp deleted file mode 100644 index be0611d..0000000 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-web-view-lite.cpp +++ /dev/null @@ -1,125 +0,0 @@ -/* - * Copyright (c) 2017 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -// CLASS HEADER -#include "toolkit-web-view-lite.h" - -namespace Dali -{ - -namespace Internal -{ - -namespace Adaptor -{ - -class WebViewLite: public Dali::BaseObject -{ -public: - - WebViewLite() - { - } - -public: - Dali::WebEngineLitePlugin::WebEngineLiteSignalType mFinishedSignal; - -private: -}; - -inline WebViewLite& GetImplementation( Dali::WebEngineLite& webViewLite ) -{ - DALI_ASSERT_ALWAYS(webViewLite && "WebViewLite handle is empty"); - BaseObject& handle = webViewLite.GetBaseObject(); - return static_cast< Internal::Adaptor::WebEngineLite& >( handle ); -} - -inline const WebViewLite& GetImplementation( const Dali::WebEngineLite& webViewLite ) -{ - DALI_ASSERT_ALWAYS(webViewLite && "WebViewLite handle is empty"); - const BaseObject& handle = webViewLite.GetBaseObject(); - return static_cast< const Internal::Adaptor::WebEngineLite& >( handle ); -} - -} // namespace Adaptor - -} // namespace Internal - - -/********************************************************************************/ -/********************************* PUBLIC CLASS *******************************/ -/********************************************************************************/ - -WebViewLite::WebViewLite() -{ -} - -WebViewLite::WebViewLite( Internal::Adaptor::WebEngineLite* internal ) -: BaseHandle( internal ) -{ -} - -WebViewLite::~WebViewLite() -{ -} - -WebViewLite WebViewLite::New() -{ - Internal::Adaptor::WebEngineLite* webViewLite = new Internal::Adaptor::WebEngineLite(); - - return WebViewLite( webViewLite ); -} - -WebViewLite::WebViewLite( const WebViewLite& webViewLite ) -: BaseHandle( webViewLite ) -{ -} - -WebViewLite& WebViewLite::operator=( const WebViewLite& webViewLite ) -{ - BaseHandle::operator=( webViewLite ); - return *this; -} - -WebViewLite WebViewLite::DownCast( BaseHandle handle ) -{ - WebViewLite webViewLite; - return webViewLite; -} - -void WebViewLite::CreateInstance(int width, int height, int windowX, int windowY, const std::sting& locale, const std::string& timezoneID) -{ - Internal::Adaptor::GetImplementation( *this ).CreateInstance(width, height, windowX, windowY, locale, timezoneID); -} - -void WebViewLite::DestroyInstance() -{ - Internal::Adaptor::GetImplementation( *this ).DestroyInstance(); -} - -void WebViewLite::LoadHtml(const std::string& path) -{ - return Internal::Adaptor::GetImplementation( *this ).LoadHtml(path); -} - -Dali::WebEngineLitePlugin::WebEngineLiteSignalType& WebViewLite::FinishedSignal() -{ - return Internal::Adaptor::GetImplementation( *this ).mFinishedSignal; -} - -} // namespace Dali; - diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-web-view-lite.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-web-view-lite.h deleted file mode 100644 index 9969e3d..0000000 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-web-view-lite.h +++ /dev/null @@ -1,75 +0,0 @@ -#ifndef __DALI_TOOLKIT_WEBVIEWLITE_H__ -#define __DALI_TOOLKIT_WEBVIEWLITE_H__ - -/* - * Copyright (c) 2017 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -// EXTERNAL INCLUDES -#include -#include - -#include - -namespace Dali -{ - -namespace Internal -{ - -namespace Adaptor -{ - -class WebViewLite; -} -} - -/** - * @brief WebViewLite class is used for Web. - */ -class WebViewLite: public BaseHandle -{ -public: - - WebViewLite(); - - ~WebViewLite(); - - static WebViewLite New(); - - WebViewLite( const WebViewLite& webViewLite ); - - WebViewLite& operator=( const WebViewLite& webViewLite ); - - static WebViewLite DownCast( BaseHandle handle ); - - void CreateInstance(int width, int height, int windowX, int windowY, const std::string& locale, const std::string& timezoneID); - - void DestroyInstance(); - - void LoadHtml(const std::string& path); - - Dali::WebEngineLitePlugin::WebEngineLiteSignalType& FinishedSignal(); - -private: - - WebViewLite( Internal::Adaptor::WebEngineLite* internal ); - -}; - -} // namespace Dali; - -#endif diff --git a/build/tizen/dali-toolkit/Makefile.am b/build/tizen/dali-toolkit/Makefile.am index 01f6a6b..35534a0 100644 --- a/build/tizen/dali-toolkit/Makefile.am +++ b/build/tizen/dali-toolkit/Makefile.am @@ -151,7 +151,6 @@ develapitransitioneffectsdir = $(develapidir)/transition-effects develapitoolbardir = $(develapicontrolsdir)/tool-bar develapitooltipdir = $(develapicontrolsdir)/tooltip develapitextselectionpopupdir = $(develapicontrolsdir)/text-controls -develapiwebviewlitedir = $(develapicontrolsdir)/web-view-lite develapivisualfactorydir = $(develapidir)/visual-factory develapivisualsdir = $(develapidir)/visuals @@ -181,7 +180,6 @@ develapitoolbar_HEADERS = $(devel_api_tool_bar_header_files) develapitooltip_HEADERS = $(devel_api_tooltip_header_files) develapitransitioneffects_HEADERS = $(devel_api_transition_effects_header_files) develapitextselectionpopup_HEADERS = $(devel_api_text_controls_header_files) -develapiwebviewlite_HEADERS = $(devel_api_web_view_lite_header_files) # public api source publicapidir = $(topleveldir)/public-api diff --git a/dali-toolkit/devel-api/controls/web-view-lite/web-view-lite.cpp b/dali-toolkit/devel-api/controls/web-view-lite/web-view-lite.cpp deleted file mode 100644 index feaf80b..0000000 --- a/dali-toolkit/devel-api/controls/web-view-lite/web-view-lite.cpp +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Copyright (c) 2017 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -// CLASS HEADER -#include - -// INTERNAL INCLUDES -#include - -namespace Dali -{ - -namespace Toolkit -{ - -WebViewLite::WebViewLite() -{ -} - -WebViewLite::WebViewLite( const WebViewLite& webViewLite ) -: Control( webViewLite ) -{ -} - -WebViewLite& WebViewLite::operator=( const WebViewLite& webViewLite ) -{ - if( &webViewLite != this ) - { - Control::operator=( webViewLite ); - } - - return *this; -} - -WebViewLite::~WebViewLite() -{ -} - -WebViewLite WebViewLite::New() -{ - return Internal::WebViewLite::New(); -} - -WebViewLite WebViewLite::DownCast( BaseHandle handle ) -{ - return Control::DownCast< WebViewLite, Internal::WebViewLite >( handle ); -} - -void WebViewLite::CreateInstance(int width, int height, int windowX, int windowY, const std::string& locale, const std::string& timezoneID) -{ - Dali::Toolkit::GetImpl( *this ).CreateInstance(width, height, windowX, windowY, locale, timezoneID); -} - -void WebViewLite::DestroyInstance() -{ - Dali::Toolkit::GetImpl( *this ).DestroyInstance(); -} - -void WebViewLite::LoadHtml(const std::string& path) -{ - Dali::Toolkit::GetImpl( *this ).LoadHtml(path); -} - -WebViewLite::WebViewLiteSignalType& WebViewLite::FinishedSignal() -{ - return Dali::Toolkit::GetImpl( *this ).FinishedSignal(); -} - -WebViewLite::WebViewLite( Internal::WebViewLite& implementation ) -: Control( implementation ) -{ -} - -WebViewLite::WebViewLite( Dali::Internal::CustomActor* internal ) -: Control( internal ) -{ - VerifyCustomActorPointer< Internal::WebViewLite >( internal ); -} - -} // namespace Toolkit - -} // namespace Dali diff --git a/dali-toolkit/devel-api/controls/web-view-lite/web-view-lite.h b/dali-toolkit/devel-api/controls/web-view-lite/web-view-lite.h deleted file mode 100644 index 7f2cbae..0000000 --- a/dali-toolkit/devel-api/controls/web-view-lite/web-view-lite.h +++ /dev/null @@ -1,149 +0,0 @@ -#ifndef __DALI_TOOLKIT_WEB_VIEW_LITE_H__ -#define __DALI_TOOLKIT_WEB_VIEW_LITE_H__ - -/* - * Copyright (c) 2017 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -// INTERNAL INCLUDES -#include - -namespace Dali -{ - -namespace Toolkit -{ - -namespace Internal DALI_INTERNAL -{ - class WebViewLite; -} // namespace Internal - -class DALI_IMPORT_API WebViewLite: public Control -{ -public: - - typedef Signal< void (WebViewLite&) > WebViewLiteSignalType; - -public: - - /** - * @brief Creates an initialized WebViewLite. - * - * @return A handle to a newly allocated Dali WebViewLite - * - * @note WebViewLite will not display anything - */ - static WebViewLite New(); - - /** - * @brief Creates an uninitialized WebViewLite. - */ - WebViewLite(); - - /** - * @brief Destructor. - * - * This is non-virtual since derived Handel types must not contain data or virtual methods. - */ - ~WebViewLite(); - - /* - * @brief Copy constructor. - * - * @param[in] webViewLite WebViewLite to copy. The copied WebViewLite will point at the same implementation - */ - WebViewLite( const WebViewLite& webViewLite ); - - /** - * @brief Assignment operator. - * - * @param[in] webViewLite The WebViewLite to assign from - * @return The updated WebViewLite - */ - WebViewLite& operator=( const WebViewLite& webViewLite ); - - /** - * @brief Downcasts a handle to WebViewLite handle. - * - * If handle points to a WebViewLite, the downcast produces valid handle. - * If not, the returned handle is left uninitialized. - * - * @param[in] handle Handle to an object - * @return Handle to a WebViewLite or an uninitialized handle - */ - static WebViewLite DownCast( BaseHandle handle ); - - /** - * @brief Creates an internal web view instance (e.g. minimized web engine instance) - * - * @param [in] width The width of Web - * @param [in] height The height of Web - * @param [in] windowX The x position of window - * @param [in] windowY The y position of window - * @param [in] locale The locale of Web - * @param [in] timezoneID The timezoneID of Web - */ - void CreateInstance(int width, int height, int windowX, int windowY, const std::string& locale, const std::string& timezoneID); - - /** - * @brief Destroys an internal web view instance (e.g. minimized web engine instance) - */ - void DestroyInstance(); - - /** - * @brief Loads a html file - * - * @param [in] path The path of Web - */ - void LoadHtml(const std::string& path); - - /** - * @brief Connects to this signal to be notified when a web view is finished. - * - * @return A signal object to connect with - */ - WebViewLiteSignalType& FinishedSignal(); - -public: // Not intended for application developers - - /// @cond internal - /** - * @brief Creates a handle using the Toolkit::Internal implementation. - * - * @param[in] implementation The WebViewLite implementation - */ - DALI_INTERNAL WebViewLite( Internal::WebViewLite& implementation ); - - /** - * @brief Allows the creation of this WebViewLite from an Internal::CustomActor pointer. - * - * @param[in] internal A pointer to the internal CustomActor - */ - DALI_INTERNAL WebViewLite( Dali::Internal::CustomActor* internal ); - /// @endcond - -}; - -/** - * @} - */ - -} // namespace Toolkit - -} // namespace Dali - -#endif // __DALI_TOOLKIT_WEB_VIEW_LITE_H__ diff --git a/dali-toolkit/devel-api/file.list b/dali-toolkit/devel-api/file.list index 624ae7e..ed9059d 100644 --- a/dali-toolkit/devel-api/file.list +++ b/dali-toolkit/devel-api/file.list @@ -23,7 +23,6 @@ devel_api_src_files = \ $(devel_api_src_dir)/controls/text-controls/text-selection-popup.cpp \ $(devel_api_src_dir)/controls/text-controls/text-selection-toolbar.cpp \ $(devel_api_src_dir)/controls/tool-bar/tool-bar.cpp \ - $(devel_api_src_dir)/controls/web-view-lite/web-view-lite.cpp \ $(devel_api_src_dir)/focus-manager/keyinput-focus-manager.cpp \ $(devel_api_src_dir)/focus-manager/keyboard-focus-manager-devel.cpp \ $(devel_api_src_dir)/image-loader/async-image-loader-devel.cpp \ @@ -141,6 +140,3 @@ devel_api_transition_effects_header_files = \ devel_api_gaussian_blur_view_header_files = \ $(devel_api_src_dir)/controls/gaussian-blur-view/gaussian-blur-view.h - -devel_api_web_view_lite_header_files = \ - $(devel_api_src_dir)/controls/web-view-lite/web-view-lite.h diff --git a/dali-toolkit/internal/controls/web-view-lite/web-view-lite-impl.cpp b/dali-toolkit/internal/controls/web-view-lite/web-view-lite-impl.cpp deleted file mode 100644 index 4aff712..0000000 --- a/dali-toolkit/internal/controls/web-view-lite/web-view-lite-impl.cpp +++ /dev/null @@ -1,133 +0,0 @@ -/* - * Copyright (c) 2017 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -// CLASS HEADER -#include "web-view-lite-impl.h" - -// EXTERNAL INCLUDES -#include -#include -#include -#include - -// INTERNAL INCLUDES -#include - -namespace Dali -{ - -namespace Toolkit -{ - -namespace Internal -{ - -namespace -{ - -BaseHandle Create() -{ - return Toolkit::WebViewLite::New(); -} - -DALI_TYPE_REGISTRATION_BEGIN( Toolkit::WebViewLite, Toolkit::Control, Create ); - -DALI_SIGNAL_REGISTRATION( Toolkit, WebViewLite, "finished", FINISHED_SIGNAL ) - -DALI_TYPE_REGISTRATION_END() - -} // anonymous namepsace - -WebViewLite::WebViewLite() -: Control( ControlBehaviour( ACTOR_BEHAVIOUR_DEFAULT | DISABLE_STYLE_CHANGE_SIGNALS ) ) -{ - mWebViewLite = Dali::WebEngineLite::New(); -} - -WebViewLite::~WebViewLite() -{ -} - -Toolkit::WebViewLite WebViewLite::New() -{ - WebViewLite* impl = new WebViewLite(); - Toolkit::WebViewLite handle = Toolkit::WebViewLite( *impl ); - - impl->Initialize(); - - return handle; -} - -void WebViewLite::OnInitialize() -{ - mWebViewLite.FinishedSignal().Connect( this, &WebViewLite::EmitFinishedSignal ); -} - -void WebViewLite::CreateInstance(int width, int height, int windowX, int windowY, const std::string& locale, const std::string& timezoneID) -{ - mWebViewLite.CreateInstance(width, height, windowX, windowY, locale, timezoneID); -} - -void WebViewLite::DestroyInstance() -{ - mWebViewLite.DestroyInstance(); -} - -void WebViewLite::LoadHtml(const std::string& path) -{ - mWebViewLite.LoadHtml(path); -} - -Dali::Toolkit::WebViewLite::WebViewLiteSignalType& WebViewLite::FinishedSignal() -{ - return mFinishedSignal; -} - -void WebViewLite::EmitFinishedSignal() -{ - if ( !mFinishedSignal.Empty() ) - { - Dali::Toolkit::WebViewLite handle( GetOwner() ); - mFinishedSignal.Emit( handle ); - } -} - -bool WebViewLite::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor ) -{ - Dali::BaseHandle handle( object ); - - bool connected( true ); - Toolkit::WebViewLite webViewLite = Toolkit::WebViewLite::DownCast( handle ); - - if( 0 == strcmp( signalName.c_str(), FINISHED_SIGNAL ) ) - { - webViewLite.FinishedSignal().Connect( tracker, functor ); - } - else - { - // signalName does not match any signal - connected = false; - } - - return connected; -} - -} // namespace Internal - -} // namespace Toolkit - -} // namespace Dali diff --git a/dali-toolkit/internal/controls/web-view-lite/web-view-lite-impl.h b/dali-toolkit/internal/controls/web-view-lite/web-view-lite-impl.h deleted file mode 100644 index 8fccfa8..0000000 --- a/dali-toolkit/internal/controls/web-view-lite/web-view-lite-impl.h +++ /dev/null @@ -1,122 +0,0 @@ -#ifndef DALI_TOOLKIT_INTERNAL_WEB_VIEW_LITE_H -#define DALI_TOOLKIT_INTERNAL_WEB_VIEW_LITE_H - -/* - * Copyright (c) 2017 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -// EXTERNAL INCLUDES -#include - -// INTERNAL INCLUDES -#include -#include -#include - -namespace Dali -{ - -namespace Toolkit -{ - -class WebViewLite; - -namespace Internal -{ - -class WebViewLite: public Control -{ -protected: - - WebViewLite(); - - virtual ~WebViewLite(); - -public: - - /** - * @copydoc Toolkit::WebViewLite::New() - */ - static Toolkit::WebViewLite New(); - - /** - * @copydoc Dali::Toolkit::WebViewLite::CreateInstance() - */ - void CreateInstance(int width, int height, int windowX, int windowY, const std::string& locale, const std::string& timezoneID); - - /** - * @copydoc Dali::Toolkit::WebViewLite::DestroyInstance() - */ - void DestroyInstance(); - - /** - * @copydoc Dali::Toolkit::WebViewLite::LoadHtml() - */ - void LoadHtml(const std::string& path); - - /** - * @copydoc Dali::Toolkit::WebViewLite::FinishedSignal() - */ - Dali::Toolkit::WebViewLite::WebViewLiteSignalType& FinishedSignal(); - - /** - * @brief Emit the finished signal - */ - void EmitFinishedSignal(); - - static bool DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor ); - -private: // From Control - - /** - * @copydoc Toolkit::Control::OnInitialize() - */ - virtual void OnInitialize(); - -private: - - // Undefined - WebViewLite( const WebViewLite& webViewLite ); - - WebViewLite& operator=( const WebViewLite& webViewLite ); - -private: - - Dali::WebEngineLite mWebViewLite; - Dali::Toolkit::WebViewLite::WebViewLiteSignalType mFinishedSignal; -}; - -} // namespace Internal - -inline Toolkit::Internal::WebViewLite& GetImpl( Toolkit::WebViewLite& handle ) -{ - DALI_ASSERT_ALWAYS( handle ); - Dali::RefObject& impl = handle.GetImplementation(); - return static_cast< Toolkit::Internal::WebViewLite& >( impl ); -} - -inline const Toolkit::Internal::WebViewLite& GetImpl( const Toolkit::WebViewLite& handle ) -{ - DALI_ASSERT_ALWAYS( handle ); - const Dali::RefObject& impl = handle.GetImplementation(); - return static_cast< const Toolkit::Internal::WebViewLite& >( impl ); -} - -} // namespace Toolkit - -} // namespace Dali - -#endif // DALI_TOOLKIT_WEB_VIEW_LITE_H diff --git a/dali-toolkit/internal/file.list b/dali-toolkit/internal/file.list index f559778..3fa035e 100755 --- a/dali-toolkit/internal/file.list +++ b/dali-toolkit/internal/file.list @@ -89,7 +89,6 @@ toolkit_src_files = \ $(toolkit_src_dir)/controls/tool-bar/tool-bar-impl.cpp \ $(toolkit_src_dir)/controls/tooltip/tooltip.cpp \ $(toolkit_src_dir)/controls/video-view/video-view-impl.cpp \ - $(toolkit_src_dir)/controls/web-view-lite/web-view-lite-impl.cpp \ $(toolkit_src_dir)/accessibility-manager/accessibility-manager-impl.cpp \ \ $(toolkit_src_dir)/feedback/feedback-style.cpp \ -- 2.7.4