X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fstandards%2FW3C%2FWidget%2Fplugin_initializer.cpp;h=d296869203ead77498600451c0b2eb1acfa58d24;hb=refs%2Fchanges%2F05%2F10205%2F1;hp=6042af95f39cb2b2ed85e78b60c68bc8cbb038d1;hpb=afa7fe810d3cee7ce1dfabebac91e97da9ea34dc;p=platform%2Fframework%2Fweb%2Fwrt-plugins-common.git diff --git a/src/standards/W3C/Widget/plugin_initializer.cpp b/src/standards/W3C/Widget/plugin_initializer.cpp index 6042af9..d296869 100644 --- a/src/standards/W3C/Widget/plugin_initializer.cpp +++ b/src/standards/W3C/Widget/plugin_initializer.cpp @@ -25,8 +25,6 @@ #include #include -#include -#include #include "JSWidget.h" #include "JSPreferences.h" @@ -41,21 +39,18 @@ using namespace WrtPlugins::W3C; using namespace WrtDeviceApis; using namespace WrtDeviceApis::Commons; -namespace Options{ - -class_definition_options_t WidgetOptions = -{ +namespace Options { +class_definition_options_t WidgetOptions = { JS_CLASS, CREATE_INSTANCE, - ALWAYS_NOTICE, + NONE_NOTICE, USE_OVERLAYED, //ignored - IFrameSupport::RegisterWidget, + NULL, NULL, NULL }; -class_definition_options_t WidgetInterfaceOptions = -{ +class_definition_options_t WidgetInterfaceOptions = { JS_INTERFACE, CREATE_INSTANCE, ALWAYS_NOTICE, @@ -64,7 +59,6 @@ class_definition_options_t WidgetInterfaceOptions = NULL, NULL }; - }; void on_widget_init_callback(feature_mapping_interface_t *mapping) @@ -82,7 +76,7 @@ void on_widget_start_callback(int widgetId) { WrtAccessSingleton::Instance().initialize(widgetId); } - Catch (Commons::Exception) + Catch(Commons::Exception) { LogError("Wrt wrapper registration failed"); return; @@ -96,12 +90,11 @@ void on_widget_stop_callback(int widgetId) { WrtAccessSingleton::Instance().deinitialize(widgetId); } - Catch (Commons::Exception) + Catch(Commons::Exception) { LogError("Wrt wrapper registration failed"); return; } - } PLUGIN_ON_WIDGET_START(on_widget_start_callback) @@ -110,16 +103,17 @@ PLUGIN_ON_WIDGET_INIT(on_widget_init_callback) PLUGIN_CLASS_MAP_BEGIN PLUGIN_CLASS_MAP_ADD_INTERFACE( - WRT_JS_EXTENSION_OBJECT_GLOBAL, - INTERFACE_WIDGET_NAME, - (js_class_template_getter)WrtPlugins::W3C::JSWidget::getClassRef, - reinterpret_cast(WrtPlugins::W3C::JSWidget::callAsConstructor), - &Options::WidgetInterfaceOptions) + WRT_JS_EXTENSION_OBJECT_GLOBAL, + INTERFACE_WIDGET_NAME, + (js_class_template_getter) WrtPlugins::W3C::JSWidget::getClassRef, + reinterpret_cast(WrtPlugins::W3C::JSWidget:: + callAsConstructor), + &Options::WidgetInterfaceOptions) PLUGIN_CLASS_MAP_ADD_INTERFACE_PRODUCT( - WRT_JS_EXTENSION_OBJECT_GLOBAL, - OBJECT_WIDGET, - INTERFACE_WIDGET_NAME, - &Options::WidgetOptions) + WRT_JS_EXTENSION_OBJECT_GLOBAL, + OBJECT_WIDGET, + INTERFACE_WIDGET_NAME, + &Options::WidgetOptions) PLUGIN_CLASS_MAP_END