From 532390cf38309eb554d601491a0bb1abea3af395 Mon Sep 17 00:00:00 2001 From: Jinkun Jang Date: Sat, 16 Mar 2013 01:17:36 +0900 Subject: [PATCH] merge with master --- CMakeLists.txt | 15 +- inc/FWeb.h | 2 + inc/FWebBookmarkItem.h | 191 ++++ inc/FWebCtrlAuthenticationChallenge.h | 32 +- inc/FWebCtrlGeolocationPermissionManager.h | 121 +- inc/FWebCtrlHitElementResult.h | 8 +- inc/FWebCtrlIJavaScriptBridge.h | 12 +- inc/FWebCtrlILoadingListener.h | 76 +- inc/FWebCtrlITextSearchListener.h | 14 +- inc/FWebCtrlIWebDownloadListener.h | 22 +- inc/FWebCtrlIWebKeypadEventListener.h | 38 +- inc/FWebCtrlIWebUiEventListener.h | 28 +- inc/FWebCtrlIWebUiEventListenerF.h | 144 +++ inc/FWebCtrlPageNavigationList.h | 20 +- inc/FWebCtrlWeb.h | 507 ++++++--- inc/FWebCtrlWebSetting.h | 185 +-- inc/FWebCtrlWebStorageManager.h | 252 +++++ inc/FWebHistoryItem.h | 9 +- inc/FWebWebBookmark.h | 225 ++++ inc/FWebWebHistory.h | 28 +- packaging/osp-web.spec | 4 +- src/FWebBookmarkItem.cpp | 149 +++ src/FWebHistoryItem.cpp | 1 + src/FWebWebBookmark.cpp | 183 +++ src/FWeb_BookmarkItemImpl.cpp | 168 +++ src/FWeb_BookmarkItemImpl.h | 74 ++ src/FWeb_HistoryItemImpl.cpp | 44 +- src/FWeb_WebBookmarkImpl.cpp | 273 +++++ src/FWeb_WebBookmarkImpl.h | 73 ++ .../FWebCtrlGeolocationPermissionManager.cpp | 11 +- src/controls/FWebCtrlWeb.cpp | 173 ++- src/controls/FWebCtrlWebSetting.cpp | 40 + src/controls/FWebCtrl_AppControlListener.cpp | 7 +- src/controls/FWebCtrl_AppControlListener.h | 4 +- src/controls/FWebCtrl_AuthConfirmPopup.cpp | 227 ++-- src/controls/FWebCtrl_AuthConfirmPopup.h | 18 +- src/controls/FWebCtrl_CertificatePopup.cpp | 282 +++++ src/controls/FWebCtrl_CertificatePopup.h | 74 ++ src/controls/FWebCtrl_EflWebkit.cpp | 77 +- src/controls/FWebCtrl_EflWebkit.h | 8 +- src/controls/FWebCtrl_GeolocationConfirmPopup.cpp | 189 +--- src/controls/FWebCtrl_GeolocationConfirmPopup.h | 29 +- .../FWebCtrl_GeolocationPermissionManagerImpl.cpp | 27 +- .../FWebCtrl_GeolocationPermissionManagerImpl.h | 2 - src/controls/FWebCtrl_GestureState.cpp | 33 +- src/controls/FWebCtrl_InputPickerPopup.cpp | 13 +- src/controls/FWebCtrl_InputPickerPopup.h | 1 - src/controls/FWebCtrl_PromptPopup.cpp | 190 +--- src/controls/FWebCtrl_PromptPopup.h | 10 +- src/controls/FWebCtrl_SelectBox.cpp | 200 +--- src/controls/FWebCtrl_SelectBox.h | 8 +- src/controls/FWebCtrl_UserConfirmPopup.cpp | 254 +++++ src/controls/FWebCtrl_UserConfirmPopup.h | 84 ++ src/controls/FWebCtrl_Utility.cpp | 71 +- src/controls/FWebCtrl_Utility.h | 12 +- src/controls/FWebCtrl_Web.cpp | 108 +- src/controls/FWebCtrl_Web.h | 4 + src/controls/FWebCtrl_WebEventArg.h | 4 +- src/controls/FWebCtrl_WebImpl.cpp | 1196 +++++++++++++------- src/controls/FWebCtrl_WebImpl.h | 71 +- src/controls/FWebCtrl_WebPopup.cpp | 230 ++++ src/controls/FWebCtrl_WebPopup.h | 123 ++ src/controls/FWebCtrl_WebSettingImpl.cpp | 36 +- src/controls/FWebCtrl_WebSettingImpl.h | 12 + 64 files changed, 5086 insertions(+), 1640 deletions(-) create mode 100755 inc/FWebBookmarkItem.h mode change 100644 => 100755 inc/FWebCtrlIJavaScriptBridge.h mode change 100644 => 100755 inc/FWebCtrlIWebUiEventListener.h create mode 100755 inc/FWebCtrlIWebUiEventListenerF.h create mode 100755 inc/FWebCtrlWebStorageManager.h create mode 100755 inc/FWebWebBookmark.h create mode 100755 src/FWebBookmarkItem.cpp create mode 100755 src/FWebWebBookmark.cpp create mode 100755 src/FWeb_BookmarkItemImpl.cpp create mode 100755 src/FWeb_BookmarkItemImpl.h create mode 100755 src/FWeb_WebBookmarkImpl.cpp create mode 100755 src/FWeb_WebBookmarkImpl.h mode change 100644 => 100755 src/controls/FWebCtrl_AppControlListener.h create mode 100644 src/controls/FWebCtrl_CertificatePopup.cpp create mode 100644 src/controls/FWebCtrl_CertificatePopup.h create mode 100755 src/controls/FWebCtrl_UserConfirmPopup.cpp create mode 100755 src/controls/FWebCtrl_UserConfirmPopup.h create mode 100644 src/controls/FWebCtrl_WebPopup.cpp create mode 100644 src/controls/FWebCtrl_WebPopup.h mode change 100644 => 100755 src/controls/FWebCtrl_WebSettingImpl.h diff --git a/CMakeLists.txt b/CMakeLists.txt index a4e01fe..0e31ae6 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,6 +48,10 @@ SET (${this_target}_SOURCE_FILES src/FWeb_HistoryItemImpl.cpp src/FWebWebHistory.cpp src/FWeb_WebHistoryImpl.cpp + src/FWebBookmarkItem.cpp + src/FWeb_BookmarkItemImpl.cpp + src/FWebWebBookmark.cpp + src/FWeb_WebBookmarkImpl.cpp src/controls/FWebCtrlWeb.cpp src/controls/FWebCtrl_WebImpl.cpp src/controls/FWebCtrl_AuthConfirmPopup.cpp @@ -75,6 +79,9 @@ SET (${this_target}_SOURCE_FILES src/controls/FWebCtrlGeolocationPermissionManager.cpp src/controls/FWebCtrl_GeolocationPermissionManagerImpl.cpp src/controls/FWebCtrl_InputPickerPopup.cpp + src/controls/FWebCtrl_UserConfirmPopup.cpp + src/controls/FWebCtrl_WebPopup.cpp + src/controls/FWebCtrl_CertificatePopup.cpp ) ## Add Definitions ADD_DEFINITIONS(${OSP_DEFINITIONS} -D_MODEL_RES_WVGA) @@ -102,6 +109,8 @@ TARGET_LINK_LIBRARIES(${this_target} "-losp-image" ) TARGET_LINK_LIBRARIES(${this_target} "-losp-media" ) TARGET_LINK_LIBRARIES(${this_target} "-losp-net" ) TARGET_LINK_LIBRARIES(${this_target} "-lecore" ) +TARGET_LINK_LIBRARIES(${this_target} "-lecore_imf" ) +TARGET_LINK_LIBRARIES(${this_target} "-lecore_imf_evas" ) TARGET_LINK_LIBRARIES(${this_target} "-lelementary" ) TARGET_LINK_LIBRARIES(${this_target} "-levas" ) TARGET_LINK_LIBRARIES(${this_target} "-leina" ) @@ -127,12 +136,12 @@ ADD_CUSTOM_COMMAND(TARGET ${this_target} ) INSTALL(DIRECTORY ${LIBRARY_OUTPUT_PATH}/ DESTINATION lib/osp - FILES_MATCHING PATTERN "libosp-*" PATTERN + FILES_MATCHING PATTERN "libosp-*" PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ) INSTALL(DIRECTORY ${LIBRARY_OUTPUT_PATH}/ DESTINATION lib/osp/browser-plugin - FILES_MATCHING PATTERN "libweb-*" PATTERN + FILES_MATCHING PATTERN "libweb-*" PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ) @@ -142,7 +151,7 @@ INSTALL(DIRECTORY ${LIBRARY_OUTPUT_PATH}/debug/ DESTINATION lib/osp/debug PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ) -INSTALL(DIRECTORY ${LIBRARY_OUTPUT_PATH}/debug/ DESTINATION lib/osp/browser-plugin/debug +INSTALL(DIRECTORY ${LIBRARY_OUTPUT_PATH}/debug/ DESTINATION lib/osp/browser-plugin/debug FILES_MATCHING PATTERN "libweb-*" PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ diff --git a/inc/FWeb.h b/inc/FWeb.h index d7f4157..165bbe3 100755 --- a/inc/FWeb.h +++ b/inc/FWeb.h @@ -26,6 +26,8 @@ #include #include +#include +#include //Controls namespace #include diff --git a/inc/FWebBookmarkItem.h b/inc/FWebBookmarkItem.h new file mode 100755 index 0000000..08ef21d --- /dev/null +++ b/inc/FWebBookmarkItem.h @@ -0,0 +1,191 @@ +// +// Open Service Platform +// Copyright (c) 2012 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. +// + +/** + * @file FWebBookmarkItem.h + * @brief This is the header file for the %BookmarkItem class. + * + * This header file contains the declarations of the %BookmarkItem class. + */ + +#ifndef _FWEB_BOOKMARK_ITEM_H_ +#define _FWEB_BOOKMARK_ITEM_H_ + +#include + +namespace Tizen { namespace Graphics +{ +class Bitmap; +}} // Tizen::Graphics + +namespace Tizen { namespace Web +{ +class _BookmarkItemImpl; + +/** + * A unique ID. This ID is unique within a local storage only. @n + * @c RecordId is assigned by the local storage when a record is saved to the storage. @n + * + * + * @since 2.1 + */ +typedef int RecordId; + +/** + * The root folder ID. @n + * In fact, it is symbolic value because the root folder record doesn't exist physically. + * + * @since 2.1 + */ +const RecordId ROOT_FOLDER_ID = -1; + +/** +* @class BookmarkItem +* @brief This class is used for accessing a bookmark item stored in the WebBookmark class. +* +* @since 2.1 +* @final This class is not intended for extension. +* +* The %BookmarkItem class provides access to the WebBookmark class. +* Each item contains the title, the URL of the page, the item type and parent folder id. +*/ +class _OSP_EXPORT_ BookmarkItem + : public Tizen::Base::Object +{ +public: + + /** + * Copying of objects using this copy constructor is allowed. + * This is the copy constructor for the %BookmarkItem class. @n + * It creates an instance of %BookmarkItem with the values of the specified instance. + * + * @since 2.1 + * + * @param[in] setting An instance of %BookmarkItem + */ + BookmarkItem(const BookmarkItem& rhs); + + /** + * This destructor overrides Tizen::Base::Object::~Object(). + * + * @since 2.1 + */ + virtual ~BookmarkItem(void); + + /** + * Gets the title from the current bookmark item. + * + * @since 2.1 + * + * @return The title of the current bookmark item + */ + Tizen::Base::String GetTitle(void) const; + + /** + * Gets the URL from the current bookmark item. + * + * @since 2.1 + * + * @return The URL of the current bookmark item @n + * If the item type is folder, this method will return the empty string. + * @see IsFolder() + */ + Tizen::Base::String GetUrl(void) const; + + /** + * Gets the favicon image from current bookmark item. + * + * @since 2.1 + * + * @return The image + * + * @exception E_SUCCESS The method is successful. + * @exception E_SYSTEM Either of the following conditions has occurred: @n + * - The method cannot proceed due to a severe system error. @n + * - The method has failed because it doesn¡¯t work on a service application. + * @remarks The specific error code can be accessed using the GetLastResult() method. + */ + Tizen::Graphics::Bitmap* GetFaviconN(void) const; + + /** + * Gets the parent folder id of the current bookmark item. + * + * @since 2.1 + * + * @return The parent folder id of the current bookmark item @n + * If the current bookmark item is the one in topmost level, this method will return ::ROOT_FOLDER_ID. + */ + RecordId GetParentFolderId(void) const; + + /** + * Checks whether the type of current bookmark item is folder or not. + * + * @since 2.1 + * + * @return @c true if the type of current bookmark item is folder, @n + * else @c false + */ + bool IsFolder(void) const; + + /** + * Gets the hash value of the current instance. + * + * @since 2.1 + * + * @return The hash value of the current instance + */ + virtual int GetHashCode(void) const; + + /** + * Compares two instances of the %BookmarkItem class. + * + * @since 2.1 + * + * @return @c true if the two instances match, or if and only if the two instances contain the same elements, @n + * else @c false @n + * @param[in] obj The object to compare with the current instance + * @see Tizen::Base::Object::Equals() + */ + virtual bool Equals(const Object& obj) const; + + /** + * Copying of objects using this copy assignment operator is allowed. + * + * @since 2.1 + * + * @param[in] setting The instance of the %BookmarkItem class to assign from + */ + BookmarkItem& operator =(const BookmarkItem& rhs); + +private: + // + // This default constructor is intentionally declared as private to implement the Singleton semantic + // + // @remarks This constructor is hidden. + // + BookmarkItem(void); + +private: + _BookmarkItemImpl* __pBookmarkItemImpl; + + friend class _BookmarkItemImpl; + + friend class _WebBookmarkImpl; +}; + +}} +#endif // _FWEB_BOOKMARK_ITEM_H_ diff --git a/inc/FWebCtrlAuthenticationChallenge.h b/inc/FWebCtrlAuthenticationChallenge.h index 69343db..36c165a 100755 --- a/inc/FWebCtrlAuthenticationChallenge.h +++ b/inc/FWebCtrlAuthenticationChallenge.h @@ -34,10 +34,10 @@ namespace Tizen { namespace Web { namespace Controls /** * - * @class AuthenticationChallenge + * @class AuthenticationChallenge * @brief This class handles the HyperText Transfer Protocol (HTTP) authentication requests. * - * @since 2.0 + * @since 2.0 * * The %AuthenticationChallenge class sends the user ID and password to the server requesting user authentication. * @n @@ -50,35 +50,37 @@ public: /** * This destructor overrides Tizen::Base::Object::~Object(). * - * @since 2.0 + * @since 2.0 */ virtual ~AuthenticationChallenge(void); /** * Sends the user ID and password to the host. * - * @since 2.0 + * @since 2.0 * - * @privilege %http://tizen.org/privilege/web.privacy + * @privlevel public + * @privilege http://tizen.org/privilege/web.privacy * - * @param[in] userId The user ID for authentication - * @param[in] password The password for authentication - * @exception E_SUCCESS The method is successful. - * @exception E_PRIVILEGE_DENIED The application does not have the privilege to call this method. - * @remarks The specific error code can be accessed using the GetLastResult() method. + * @param[in] userId The user ID for authentication + * @param[in] password The password for authentication + * @exception E_SUCCESS The method is successful. + * @exception E_PRIVILEGE_DENIED The application does not have the privilege to call this method. + * @remarks The specific error code can be accessed using the GetLastResult() method. */ void Process(const UserId& userId, const Tizen::Base::String& password); /** * Cancels the authentication request. * - * @since 2.0 + * @since 2.0 * - * @privilege %http://tizen.org/privilege/web.privacy + * @privlevel public + * @privilege http://tizen.org/privilege/web.privacy * - * @exception E_SUCCESS The method is successful. - * @exception E_PRIVILEGE_DENIED The application does not have the privilege to call this method. - * @remarks The specific error code can be accessed using the GetLastResult() method. + * @exception E_SUCCESS The method is successful. + * @exception E_PRIVILEGE_DENIED The application does not have the privilege to call this method. + * @remarks The specific error code can be accessed using the GetLastResult() method. */ void Cancel(void); diff --git a/inc/FWebCtrlGeolocationPermissionManager.h b/inc/FWebCtrlGeolocationPermissionManager.h index 37dc548..55dd1d2 100755 --- a/inc/FWebCtrlGeolocationPermissionManager.h +++ b/inc/FWebCtrlGeolocationPermissionManager.h @@ -15,14 +15,12 @@ // /** - * @if VISPARTNER-MANUFACTURER * @file FWebCtrlGeolocationPermissionManager.h * @brief This is the header file for the %GeolocationPermissionManager class. - * @visibility partner-manufacturer + * @privlevel platform * * This header file contains the declarations of the %GeolocationPermissionManager class. * - * @endif */ #ifndef _FWEB_CTRL_GEOLOCATION_PERMISSION_MANAGER_H_ #define _FWEB_CTRL_GEOLOCATION_PERMISSION_MANAGER_H_ @@ -41,19 +39,14 @@ namespace Tizen { namespace Web { namespace Controls class _GeolocationPermissionManagerImpl; /** - * @if VISPARTNER-MANUFACTURER * @class GeolocationPermissionManager * @brief This class provides methods to manage geolocation permissions. * * @since 2.0 * - * @visibility partner-manufacturer - * @privilege %http://tizen.org/privilege/web.privacy - * * The %GeolocationPermissionManager class provides methods to manage geolocation permissions decided by a user from origins using html5 JavaScript geolocation APIs. * @n * Origin consists of the scheme, host, and port. - * @endif */ class _OSP_EXPORT_ GeolocationPermissionManager @@ -62,98 +55,86 @@ class _OSP_EXPORT_ GeolocationPermissionManager public: /** - * @if VISPARTNER-MANUFACTURER * Gets the origin list stored at the geolocation database. * * @since 2.0 * - * @visibility partner-manufacturer - * @privilege %http://tizen.org/privilege/web.privacy + * @privlevel platform + * @privilege http://tizen.org/privilege/geolocationpermission.read * - * @return A pointer to IList containing origin(Tizen::Base::String) list, @n - * else @c null if no geolocation permission data exists - * @exception E_SUCCESS The method is successful. - * @exception E_SERVICE_BUSY The dedicated service module is too busy to handle another request. - * @exception E_PRIVILEGE_DENIED The application does not have the privilege to call this method. - * @remarks The specific error code can be accessed using the GetLastResult() method. - * @endif + * @return A pointer to IList containing origin(Tizen::Base::String) list, @n + * else @c null if no geolocation permission data exists + * @exception E_SUCCESS The method is successful. + * @exception E_SYSTEM The method cannot proceed due to a severe system error. + * @exception E_PRIVILEGE_DENIED The application does not have the privilege to call this method. + * @remarks The specific error code can be accessed using the GetLastResult() method. */ Tizen::Base::Collection::IList* GetOriginListN(void) const; /** - * @if VISPARTNER-MANUFACTURER * Checks whether geolocation permission is allowed or not for the specified @c origin. * * @since 2.0 * - * @visibility partner-manufacturer - * @privilege %http://tizen.org/privilege/web.privacy - * - * @return @c true if geolocation permission is allowed, @n - * else @c false - * @param[in] origin The origin - * @exception E_SUCCESS The method is successful. - * @exception E_DATA_NOT_FOUND There is no permission data for the specified @c origin. - * @exception E_SERVICE_BUSY The dedicated service module is too busy to handle another request. - * @exception E_PRIVILEGE_DENIED The application does not have the privilege to call this method. - * @remarks The specific error code can be accessed using the GetLastResult() method. - * @endif + * @privlevel platform + * @privilege http://tizen.org/privilege/geolocationpermission.read + * + * @return @c true if geolocation permission is allowed, @n + * else @c false + * @param[in] origin The origin + * @exception E_SUCCESS The method is successful. + * @exception E_DATA_NOT_FOUND There is no permission data for the specified @c origin. + * @exception E_SYSTEM The method cannot proceed due to a severe system error. + * @exception E_PRIVILEGE_DENIED The application does not have the privilege to call this method. + * @remarks The specific error code can be accessed using the GetLastResult() method. */ bool IsPermissionAllowed(const Tizen::Base::String& origin) const; /** - * @if VISPARTNER-MANUFACTURER * Removes the geolocation data for the specified @c origin. * * @since 2.0 * - * @visibility partner-manufacturer - * @privilege %http://tizen.org/privilege/web.privacy + * @privlevel platform + * @privilege http://tizen.org/privilege/geolocationpermission.write * - * @return An error code - * @param[in] origin The origin - * @exception E_SUCCESS The method is successful. - * @exception E_DATA_NOT_FOUND There is no permission data for the specified @c origin. - * @exception E_SERVICE_BUSY The dedicated service module is too busy to handle another request. - * @exception E_PRIVILEGE_DENIED The application does not have the privilege to call this method. + * @return An error code + * @param[in] origin The origin + * @exception E_SUCCESS The method is successful. + * @exception E_DATA_NOT_FOUND There is no permission data for the specified @c origin. + * @exception E_SYSTEM The method cannot proceed due to a severe system error. + * @exception E_PRIVILEGE_DENIED The application does not have the privilege to call this method. * @see RemoveAll() - * @endif */ result Remove(const Tizen::Base::String& origin); /** - * @if VISPARTNER-MANUFACTURER * Removes all elements in the list. * * @since 2.0 * - * @visibility partner-manufacturer - * @privilege %http://tizen.org/privilege/web.privacy + * @privlevel platform + * @privilege http://tizen.org/privilege/geolocationpermission.write * - * @return An error code - * @exception E_SUCCESS The method is successful. - * @exception E_SERVICE_BUSY The dedicated service module is too busy to handle another request. - * @exception E_PRIVILEGE_DENIED The application does not have the privilege to call this method. + * @return An error code + * @exception E_SUCCESS The method is successful. + * @exception E_SYSTEM The method cannot proceed due to a severe system error. + * @exception E_PRIVILEGE_DENIED The application does not have the privilege to call this method. * @see Remove() - * @endif */ result RemoveAll(void); /** - * @if VISPARTNER-MANUFACTURER * Gets the geolocation permission manager instance. * * @since 2.0 * - * @visibility partner-manufacturer - * @privilege %http://tizen.org/privilege/web.privacy - * - * @return A pointer to the %GeolocationPermissionManager instance, @n - * else @c null if it fails - * @exception E_SUCCESS The method is successful. - * @exception E_PRIVILEGE_DENIED The application does not have the privilege to call this method. - * @remarks The specific error code can be accessed using the GetLastResult() method. - * @endif + * @return A pointer to the %GeolocationPermissionManager instance, @n + * else @c null if it fails + * @exception E_SUCCESS The method is successful. + * @exception E_OUT_OF_MEMORY The memory is insufficient. + * @exception E_SYSTEM The method cannot proceed due to a severe system error. + * @remarks The specific error code can be accessed using the GetLastResult() method. */ static GeolocationPermissionManager* GetInstance(void); @@ -172,19 +153,19 @@ private: // virtual ~GeolocationPermissionManager(void); - /** - * Initializes this instance of the %Web control with the specified parameters. - * - * @since 2.0 - * - * @return An error code - */ + // + // Initializes this instance of the %Web control with the specified parameters. + // + // @since 2.0 + // + // @return An error code + // result Construct(void); // // The implementation of this copy constructor is intentionally blank and declared as private to prohibit copying of objects. // - // @param[in] rhs The instance of the % GeolocationPermissionManager class to copy from + // @param[in] rhs The instance of the % GeolocationPermissionManager class to copy from // @remarks This constructor is hidden. // GeolocationPermissionManager(const GeolocationPermissionManager& rhs); @@ -192,21 +173,21 @@ private: // // Initializes the geolocation permission manager instance. // - // @since 2.0 + // @since 2.0 // static void InitGeolocationPermissionManager(void); // // Destroys the geolocation permission manager instance. // - // @since 2.0 + // @since 2.0 // static void DestroyGeolocationPermissionManager(void); // // The implementation of this copy assignment operator is intentionally blank and declared as private to prohibit copying of objects. // - // @param[in] rhs An instance of % GeolocationPermissionManager to assign from + // @param[in] rhs An instance of % GeolocationPermissionManager to assign from // @remarks This operator is hidden. // GeolocationPermissionManager& operator=(const GeolocationPermissionManager& rhs); diff --git a/inc/FWebCtrlHitElementResult.h b/inc/FWebCtrlHitElementResult.h index 171b658..a22edd6 100755 --- a/inc/FWebCtrlHitElementResult.h +++ b/inc/FWebCtrlHitElementResult.h @@ -42,10 +42,10 @@ namespace Tizen { namespace Web { namespace Controls { /** - * @class HitElementResult + * @class HitElementResult * @brief This class provides methods to retrieve information from the HyperText Markup Language (HTML) element, pointed by the x and y coordinates. * - * @since 2.0 + * @since 2.0 * * The %HitElementResult class provides methods to retrieve information from the HTML element, such as tag name, attributes and content. * @n @@ -116,7 +116,7 @@ public: * @since 2.0 * * @return @c true if the element is an image element, @n - * else @c false + * else @c false */ bool HasImage(void) const; @@ -126,7 +126,7 @@ public: * @since 2.0 * * @return @c true if there is a URL linked to the element, @n - * else @c false + * else @c false */ bool HasUrl(void) const; diff --git a/inc/FWebCtrlIJavaScriptBridge.h b/inc/FWebCtrlIJavaScriptBridge.h old mode 100644 new mode 100755 index f12b8d8..2ac521f --- a/inc/FWebCtrlIJavaScriptBridge.h +++ b/inc/FWebCtrlIJavaScriptBridge.h @@ -39,9 +39,9 @@ namespace Tizen { namespace Web { namespace Controls /** * @interface IJavaScriptBridge - * @brief This interface provides a communication channel between JavaScript and native object. + * @brief This interface provides a communication channel between JavaScript and native object. * - * @since 2.0 + * @since 2.0 * * The %IJavaScriptBridge interface provides a communication channel between JavaScript and C++ object. */ @@ -51,16 +51,16 @@ public: /** * This polymorphic destructor should be overridden if required. This way, the destructors of the derived classes are called when the destructor of this interface is called. * - * @since 2.0 + * @since 2.0 */ virtual ~IJavaScriptBridge(void) {} /** * Called asynchronously on invocation request from JavaScript side through the requestToNative() method. * - * @since 2.0 + * @since 2.0 * - * @param[in] pArg The parameters delivered by JavaScript + * @param[in] pArg The parameters delivered by JavaScript */ virtual void HandleJavaScriptRequestN(Tizen::Web::Json::IJsonValue* pArg) = 0; @@ -69,7 +69,7 @@ public: * * @since 2.0 * - * @return The name of %IJavaScriptBridge + * @return The name of %IJavaScriptBridge */ virtual Tizen::Base::String GetName(void) = 0; diff --git a/inc/FWebCtrlILoadingListener.h b/inc/FWebCtrlILoadingListener.h index 3c39c7d..8690463 100755 --- a/inc/FWebCtrlILoadingListener.h +++ b/inc/FWebCtrlILoadingListener.h @@ -45,7 +45,7 @@ namespace Tizen { namespace Web { namespace Controls * * Defines the type of %Web navigation. * - * @since 2.0 + * @since 2.0 */ enum WebNavigationType { @@ -62,7 +62,7 @@ enum WebNavigationType * * Defines the types of loading errors. * - * @since 2.0 + * @since 2.0 */ enum LoadingErrorType { @@ -73,7 +73,7 @@ enum LoadingErrorType WEB_BAD_URL, /**< The URL is invalid */ WEB_HTTP_RESPONSE, /**< The hypertext transfer protocol (HTTP) response */ WEB_OUT_OF_MEMORY, /**< The memory is not enough to load the page */ - WEB_FILE_ACCESS_FAILED, /**< The file access failed */ + WEB_FILE_ACCESS_FAILED, /**< The file access failed */ WEB_REQUEST_MAX_EXCEEDED, /**< The request has failed because the total number of requests have exceeded the maximum limit */ WEB_INVALID_CERTIFICATE /**< The hypertext transfer protocol secure (HTTPS) request has failed due to an invalid certificate or CA */ }; @@ -83,7 +83,7 @@ enum LoadingErrorType * * Defines the decision policy. * - * @since 2.0 + * @since 2.0 */ enum DecisionPolicy { @@ -96,7 +96,7 @@ enum DecisionPolicy * @interface ILoadingListener * @brief This interface is for receiving the events that occur during the loading of data. * - * @since 2.0 + * @since 2.0 * * The %ILoadingListener interface receives the events that occur during the loading of data. * To listen to the events occurred during a data loading operation, implement this listener. If there is no @@ -111,62 +111,62 @@ public: /** * This polymorphic destructor should be overridden if required. This way, the destructors of the derived classes are called when the destructor of this interface is called. * - * @since 2.0 + * @since 2.0 */ virtual ~ILoadingListener(void) {} /** * Called when an authentication is requested. * - * @since 2.0 + * @since 2.0 * * @return @c true if the ownership is taken by the application, @n - * else @c false, and a default dialog for the ID and password is displayed @n + * else @c false, and a default dialog for the ID and password is displayed @n * If this method returns @c true, the application must delete the AuthenticationChallenge instance. * @param[in] host The host requiring the authentication * @param[in] realm The description to help save the user credentials for future visits - * @param[in] authentication The handler to send a user response to the server that requested the authentication + * @param[in] authentication The handler to send a user response to the server that requested the authentication */ virtual bool OnHttpAuthenticationRequestedN(const Tizen::Base::String& host, const Tizen::Base::String& realm, const Tizen::Web::Controls::AuthenticationChallenge& authentication) = 0; /** * Called when the authentication request is cancelled. * - * @since 2.0 + * @since 2.0 */ virtual void OnHttpAuthenticationCanceled(void) = 0; /** * Called when the loading operation starts. * - * @since 2.0 + * @since 2.0 */ virtual void OnLoadingStarted(void) = 0; /** * Called when the loading operation is cancelled. * - * @since 2.0 + * @since 2.0 */ virtual void OnLoadingCanceled(void) = 0; /** * Called when the loading operation fails. * - * @since 2.0 + * @since 2.0 * - * @param[in] error The error that occurred during loading - * @param[in] reason The reason for the loading failure, @n - * - WEB_HTTP_RESPONSE: The HTTP state code such as "404" @n - * - WEB_MIME_NOT_SUPPORTED: The Multipurpose Internet Mail Extensions (MIME) type such as "application/rdf+xml" is not supported @n - * - WEB_BAD_URL: The URL is incorrect + * @param[in] error The error that occurred during loading + * @param[in] reason The reason for the loading failure, @n + * - @c WEB_HTTP_RESPONSE: The HTTP state code such as "404" @n + * - @c WEB_MIME_NOT_SUPPORTED: The Multipurpose Internet Mail Extensions (MIME) type such as "application/rdf+xml" is not supported @n + * - @c WEB_BAD_URL: The URL is incorrect */ virtual void OnLoadingErrorOccurred(LoadingErrorType error, const Tizen::Base::String& reason) = 0; /** * Called when the loading operation is completed. * - * @since 2.0 + * @since 2.0 */ virtual void OnLoadingCompleted(void) = 0; @@ -174,16 +174,16 @@ public: * Called when the loading progress for the current page is requested. @n * The progress rate is displayed as a percentage. * - * @since 2.0 + * @since 2.0 * - * @param[in] progress The progress rate ranging from [0~100] + * @param[in] progress The progress rate ranging from [@c 0 ~ @c 100] */ virtual void OnEstimatedProgress(int progress) = 0; /** * Called when the title of the new page has been received. * - * @since 2.0 + * @since 2.0 */ virtual void OnPageTitleReceived(const Tizen::Base::String& title) = 0; @@ -192,26 +192,26 @@ public: * If an application wants to handle the URL, it must return @c true. If an application returns @c false, the request of the URL continues with the * browser engine. * - * @since 2.0 + * @since 2.0 * - * @return @c true if the application handles the URL after the request is canceled in the browser engine, @n + * @return @c true if the application handles the URL after the request is canceled in the browser engine, @n * else @c false if the browser engine proceeds with the requested URL - * @param[in] url The URL that is requested - * @param[in] type The type indicating how the URL is triggered + * @param[in] url The URL that is requested + * @param[in] type The type indicating how the URL is triggered */ virtual bool OnLoadingRequested(const Tizen::Base::String& url, WebNavigationType type) = 0; /** * Called to notify an application of the content type of the data to be downloaded. @n - * - To handle data by itself, the application must return WEB_DECISION_DOWNLOAD. The data is routed to IWebDownloadListener to be downloaded incrementally. @n - * - If an application returns WEB_DECISION_CONTINUE, the browser engine continues the downloading and tries to parse the data. @n - * - If an application returns WEB_DECISION_IGNORE, the browser engine cancels the downloading of the data. + * - To handle data by itself, the application must return @c WEB_DECISION_DOWNLOAD. The data is routed to IWebDownloadListener to be downloaded incrementally. @n + * - If an application returns @c WEB_DECISION_CONTINUE, the browser engine continues the downloading and tries to parse the data. @n + * - If an application returns @c WEB_DECISION_IGNORE, the browser engine cancels the downloading of the data. * - * @since 2.0 + * @since 2.0 * - * @return DecisionPolicy A value of the enumerator DecisionPolicy - * @param[in] mime The content type of the data that is downloaded - * @param[in] httpHeader The HTTP header string + * @return DecisionPolicy A value of the enumerator DecisionPolicy + * @param[in] mime The content type of the data that is downloaded + * @param[in] httpHeader The HTTP header string */ virtual DecisionPolicy OnWebDataReceived(const Tizen::Base::String& mime, const Tizen::Net::Http::HttpHeader& httpHeader) = 0; @@ -221,7 +221,7 @@ protected: // // Gets the Impl instance. // - // @since 2.0 + // @since 2.0 // virtual void ILoadingListener_Reserved1(void) {} @@ -230,7 +230,7 @@ protected: // // Gets the Impl instance. // - // @since 2.0 + // @since 2.0 // virtual void ILoadingListener_Reserved2(void) {} @@ -239,7 +239,7 @@ protected: // // Gets the Impl instance. // - // @since 2.0 + // @since 2.0 // virtual void ILoadingListener_Reserved3(void) {} @@ -248,7 +248,7 @@ protected: // // Gets the Impl instance. // - // @since 2.0 + // @since 2.0 // virtual void ILoadingListener_Reserved4(void) {} @@ -257,7 +257,7 @@ protected: // // Gets the Impl instance. // - // @since 2.0 + // @since 2.0 // virtual void ILoadingListener_Reserved5(void) {} diff --git a/inc/FWebCtrlITextSearchListener.h b/inc/FWebCtrlITextSearchListener.h index a436dc9..0799c79 100755 --- a/inc/FWebCtrlITextSearchListener.h +++ b/inc/FWebCtrlITextSearchListener.h @@ -31,9 +31,9 @@ namespace Tizen { namespace Web { namespace Controls /** * @interface ITextSearchListener - * @brief This interface is for receiving the result of the search operation made by asynchronous methods. + * @brief This interface is for receiving the result of the search operation made by asynchronous methods. * - * @since 2.0 + * @since 2.0 * * The %ITextSearchListener interface receives the result of the search operation made by asynchronous methods. */ @@ -47,17 +47,17 @@ public: /** * This polymorphic destructor should be overridden if required. This way, the destructors of the derived classes are called when the destructor of this interface is called. * - * @since 2.0 + * @since 2.0 */ virtual ~ITextSearchListener(void) {} /** * Called when the text is found. * - * @since 2.0 + * @since 2.0 * * @param[in] totalCount The total count of matches - * @param[in] currentOrdinal The ordinal of currently selected match @n + * @param[in] currentOrdinal The ordinal of currently selected match @n * If there is no match, it will be set to zero. */ virtual void OnTextFound(int totalCount, int currentOrdinal) = 0; @@ -69,7 +69,7 @@ protected: // // Gets the Impl instance. // - // @since 2.0 + // @since 2.0 // virtual void ITextSearchListener_Reserved1(void) {}; @@ -78,7 +78,7 @@ protected: // // Gets the Impl instance. // - // @since 2.0 + // @since 2.0 // virtual void ITextSearchListener_Reserved2(void) {}; }; diff --git a/inc/FWebCtrlIWebDownloadListener.h b/inc/FWebCtrlIWebDownloadListener.h index 9336c5f..3d24772 100755 --- a/inc/FWebCtrlIWebDownloadListener.h +++ b/inc/FWebCtrlIWebDownloadListener.h @@ -35,7 +35,7 @@ namespace Tizen { namespace Web { namespace Controls * @interface IWebDownloadListener * @brief This interface downloads data from the internet. * - * @since 2.0 + * @since 2.0 * * The %IWebDownloadListener interface downloads data from the internet. * An application receives content from a network incrementally @@ -71,7 +71,7 @@ namespace Tizen { namespace Web { namespace Controls * @endcode * * As soon as the first chunk of data is received, OnWebDataReceived() is fired with the MIME type. - * If you want to download the data, return WEB_DECISION_DOWNLOAD. + * If you want to download the data, return @c WEB_DECISION_DOWNLOAD. * * @code * DecisionPolicy @@ -98,33 +98,33 @@ public: /** * This polymorphic destructor should be overridden if required. This way, the destructors of the derived classes are called when the destructor of this interface is called. * - * @since 2.0 + * @since 2.0 */ virtual ~IWebDownloadListener(void) {} /** * Called when the HyperText Transfer Protocol (HTTP) protocol receives the next chunked data. * - * @since 2.0 + * @since 2.0 * - * @param[in] chunk The chunked data - * @remarks The received data size is less than the capacity of the specified Tizen::Base::ByteBuffer by @c 1. + * @param[in] chunk The chunked data + * @remarks The received data size is less than the capacity of the specified Tizen::Base::ByteBuffer by @c 1. */ virtual void OnWebChunkedDataReceived(const Tizen::Base::ByteBuffer& chunk) = 0; /** * Called when the downloading of the content is completed. * - * @since 2.0 + * @since 2.0 */ virtual void OnWebDataDownloadCompleted(void) = 0; /** * Called when an error has occurred while downloading content. * - * @since 2.0 + * @since 2.0 * - * @param[in] error The type of error that occurred while downloading data + * @param[in] error The type of error that occurred while downloading data */ virtual void OnWebDownloadFailed(LoadingErrorType error) = 0; @@ -134,7 +134,7 @@ protected: // // Gets the Impl instance. // - // @since 2.0 + // @since 2.0 // virtual void IWebDownloadListener_Reserved1(void) {} @@ -143,7 +143,7 @@ protected: // // Gets the Impl instance. // - // @since 2.0 + // @since 2.0 // virtual void IWebDownloadListener_Reserved2(void) {} diff --git a/inc/FWebCtrlIWebKeypadEventListener.h b/inc/FWebCtrlIWebKeypadEventListener.h index 7318aa3..85c3e27 100755 --- a/inc/FWebCtrlIWebKeypadEventListener.h +++ b/inc/FWebCtrlIWebKeypadEventListener.h @@ -36,9 +36,9 @@ namespace Tizen { namespace Web { namespace Controls /** * @interface IWebKeypadEventListener - * @brief This interface provides a listener for keypad events invoked by the