Author: fejj
Date: 2007-11-08 12:14:46 -0500 (Thu, 08 Nov 2007)
New Revision: 89214
Modified:
trunk/moon/plugin/ChangeLog
trunk/moon/plugin/plugin.cpp
trunk/moon/plugin/plugin.h
Log:
2007-11-08 Jeffrey Stedfast <[EMAIL PROTECTED]>
* plugin.cpp (plugin_instance_get_surface): New function needed by
BrowserHost class.
(TryLoad): Removed an unnecessary g_assert() (the code handles the
error case properly).
Modified: trunk/moon/plugin/ChangeLog
===================================================================
--- trunk/moon/plugin/ChangeLog 2007-11-08 17:12:51 UTC (rev 89213)
+++ trunk/moon/plugin/ChangeLog 2007-11-08 17:14:46 UTC (rev 89214)
@@ -1,3 +1,10 @@
+2007-11-08 Jeffrey Stedfast <[EMAIL PROTECTED]>
+
+ * plugin.cpp (plugin_instance_get_surface): New function needed by
+ BrowserHost class.
+ (TryLoad): Removed an unnecessary g_assert() (the code handles the
+ error case properly).
+
2007-11-07 Jb Evain <[EMAIL PROTECTED]>
* browser-http.cpp|h: implement a GetStatus method for
Modified: trunk/moon/plugin/plugin.cpp
===================================================================
--- trunk/moon/plugin/plugin.cpp 2007-11-08 17:12:51 UTC (rev 89213)
+++ trunk/moon/plugin/plugin.cpp 2007-11-08 17:14:46 UTC (rev 89214)
@@ -950,6 +950,12 @@
return instance;
}
+Surface *
+plugin_instance_get_surface (PluginInstance *instance)
+{
+ return instance->surface;
+}
+
int32
plugin_instance_get_actual_width (PluginInstance *instance)
{
@@ -1047,12 +1053,10 @@
const char*
PluginXamlLoader::TryLoad (int *error)
{
- g_assert (GetFilename () == NULL ^ GetString () == NULL);
-
- *error = 0;
-
DependencyObject* element;
Type::Kind element_type;
+
+ *error = 0;
printf ("PluginXamlLoader::TryLoad, filename: %s, str: %s\n",
GetFilename (), GetString ());
Modified: trunk/moon/plugin/plugin.h
===================================================================
--- trunk/moon/plugin/plugin.h 2007-11-08 17:12:51 UTC (rev 89213)
+++ trunk/moon/plugin/plugin.h 2007-11-08 17:14:46 UTC (rev 89214)
@@ -210,6 +210,8 @@
int32 plugin_instance_get_actual_width (PluginInstance *instance);
int32 plugin_instance_get_actual_height (PluginInstance *instance);
+Surface *plugin_instance_get_surface (PluginInstance *instance);
+
char* plugin_instance_get_init_params (PluginInstance *instance);
void plugin_instance_get_browser_information (PluginInstance *instance,
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
