Author: toshok
Date: 2007-07-11 19:32:29 -0400 (Wed, 11 Jul 2007)
New Revision: 81838
Modified:
trunk/moon/plugin/ChangeLog
trunk/moon/plugin/plugin-class.cpp
trunk/moon/plugin/plugin.cpp
trunk/moon/plugin/plugin.h
Log:
* plugin.h, plugin.cpp: add getRootObject to return the
MoonlightControlObject.
* plugin-class.cpp (MoonlightDependencyObjectClass::Invoke):
implement "getHost" by returning PluginInstance->getRootObject().
2007-07-11 Chris Toshok <[EMAIL PROTECTED]>
Modified: trunk/moon/plugin/ChangeLog
===================================================================
--- trunk/moon/plugin/ChangeLog 2007-07-11 23:24:38 UTC (rev 81837)
+++ trunk/moon/plugin/ChangeLog 2007-07-11 23:32:29 UTC (rev 81838)
@@ -1,5 +1,13 @@
2007-07-11 Chris Toshok <[EMAIL PROTECTED]>
+ * plugin.h, plugin.cpp: add getRootObject to return the
+ MoonlightControlObject.
+
+ * plugin-class.cpp (MoonlightDependencyObjectClass::Invoke):
+ implement "getHost" by returning PluginInstance->getRootObject().
+
+2007-07-11 Chris Toshok <[EMAIL PROTECTED]>
+
* plugin-class.h, plugin-class.cpp: substantially rework this
stuff. Rename everything Moonlight*Class and Moonlight*Object
instead of Plugin*Class/Object, to make it a little clearer that
Modified: trunk/moon/plugin/plugin-class.cpp
===================================================================
--- trunk/moon/plugin/plugin-class.cpp 2007-07-11 23:24:38 UTC (rev 81837)
+++ trunk/moon/plugin/plugin-class.cpp 2007-07-11 23:32:29 UTC (rev 81838)
@@ -718,6 +718,11 @@
OBJECT_TO_NPVARIANT (depobj, *result);
return true;
}
+ else if (name == NPID ("getHost")) {
+ PluginInstance *plugin = (PluginInstance*)
npobj->instance->pdata;
+
+ OBJECT_TO_NPVARIANT ((NPObject*)plugin->getRootObject(),
*result);
+ }
else if (name == NPID ("addEventListener")) {
// not yet implemented
return true;
Modified: trunk/moon/plugin/plugin.cpp
===================================================================
--- trunk/moon/plugin/plugin.cpp 2007-07-11 23:24:38 UTC (rev 81837)
+++ trunk/moon/plugin/plugin.cpp 2007-07-11 23:32:29 UTC (rev 81838)
@@ -547,6 +547,13 @@
return window->width;
}
+MoonlightControlObject *
+PluginInstance::getRootObject ()
+{
+ NPN_RetainObject (rootobject);
+ return rootobject;
+}
+
int32
plugin_instance_get_actual_width (PluginInstance *instance)
{
Modified: trunk/moon/plugin/plugin.h
===================================================================
--- trunk/moon/plugin/plugin.h 2007-07-11 23:24:38 UTC (rev 81837)
+++ trunk/moon/plugin/plugin.h 2007-07-11 23:32:29 UTC (rev 81838)
@@ -89,6 +89,8 @@
bool getEnableHtmlAccess ();
bool getWindowless ();
+ MoonlightControlObject *getRootObject ();
+
int32 getActualHeight ();
int32 getActualWidth ();
};
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
