Merge "Removing of WAC2.0 support routine in plugin logic."

diff --git a/src/plugin-loading/plugin_logic.cpp b/src/plugin-loading/plugin_logic.cpp
index df34bc1..315bb74 100644 (file)
--- a/src/plugin-loading/plugin_logic.cpp
+++ b/src/plugin-loading/plugin_logic.cpp
@@ -327,6 +327,7 @@ void PluginLogic::Impl::unloadFrame(JSGlobalContextRef context)
     }
 
     sessionIt->second->unloadFrame(context);
+    m_sessions.erase(sessionIt);
 }
 
 void PluginLogic::Impl::setCustomProperties(JSGlobalContextRef context,

diff --git a/src/standards/W3C/Widget/plugin_initializer.cpp b/src/standards/W3C/Widget/plugin_initializer.cpp
index 05d385b..6042af9 100644 (file)
--- a/src/standards/W3C/Widget/plugin_initializer.cpp
+++ b/src/standards/W3C/Widget/plugin_initializer.cpp
@@ -121,10 +121,6 @@ PLUGIN_CLASS_MAP_ADD_INTERFACE_PRODUCT(
         INTERFACE_WIDGET_NAME,
         &Options::WidgetOptions)
 
-PLUGIN_CLASS_MAP_ADD_CLASS(WRT_JS_EXTENSION_OBJECT_GLOBAL,
-        OBJECT_WIDGET,
-        (js_class_template_getter)WrtPlugins::W3C::JSWidget::getClassRef,
-        &Options::WidgetOptions)
 PLUGIN_CLASS_MAP_END
 
 #undef OBJECT_WIDGET