svnno****@sourc*****
svnno****@sourc*****
Sat Mar 8 22:12:36 JST 2008
Revision: 3461
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=3461
Author: ikezoe
Date: 2008-03-08 22:12:36 +0900 (Sat, 08 Mar 2008)
Log Message:
-----------
* module/embed/gecko/EmbedPrivate.[cpp|h],
module/embed/gecko/gtkmozembed_internal.h,
module/embed/gecko/gtkmozembed2.cpp: Remove unsed functions.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/module/embed/gecko/gtkmozembed/EmbedPrivate.cpp
kazehakase/trunk/module/embed/gecko/gtkmozembed/EmbedPrivate.h
kazehakase/trunk/module/embed/gecko/gtkmozembed/gtkmozembed.h
kazehakase/trunk/module/embed/gecko/gtkmozembed/gtkmozembed2.cpp
kazehakase/trunk/module/embed/gecko/gtkmozembed/gtkmozembed_internal.h
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2008-03-08 12:47:51 UTC (rev 3460)
+++ kazehakase/trunk/ChangeLog 2008-03-08 13:12:36 UTC (rev 3461)
@@ -12,6 +12,9 @@
instead of EmbedStream.
* module/embed/gecko/EmbedProgress.cpp: Do not copy string for
"status_change" signal.
+ * module/embed/gecko/EmbedPrivate.[cpp|h],
+ module/embed/gecko/gtkmozembed_internal.h,
+ module/embed/gecko/gtkmozembed2.cpp: Remove unsed functions.
2008-03-07 Hiroyuki Ikezoe <poinc****@ikezo*****>
Modified: kazehakase/trunk/module/embed/gecko/gtkmozembed/EmbedPrivate.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/gtkmozembed/EmbedPrivate.cpp 2008-03-08 12:47:51 UTC (rev 3460)
+++ kazehakase/trunk/module/embed/gecko/gtkmozembed/EmbedPrivate.cpp 2008-03-08 13:12:36 UTC (rev 3461)
@@ -56,7 +56,6 @@
#include <nsIComponentRegistrar.h>
#include <nsISupportsUtils.h>
-#include <nsIWebBrowserStream.h>
// all of our local includes
#include "EmbedPrivate.h"
@@ -514,17 +513,7 @@
}
/* static */
-#if 1
void
-EmbedPrivate::SetAppComponents(const nsModuleComponentInfo* aComps,
- int aNumComponents)
-{
- //sAppComps = aComps;
- //sNumAppComps = aNumComponents;
-}
-#endif
-/* static */
-void
EmbedPrivate::SetProfilePath(const char *aDir, const char *aName)
{
if (sProfileDir) {
@@ -556,52 +545,6 @@
}
}
-nsresult
-EmbedPrivate::OpenStream(const char *aBaseURI, const char *aContentType)
-{
- nsCOMPtr<nsIWebBrowser> webBrowser;
- mWindow->GetWebBrowser(getter_AddRefs(webBrowser));
-
- nsCOMPtr<nsIWebBrowserStream> wbStream = do_QueryInterface(webBrowser);
- if (!wbStream) return NS_ERROR_FAILURE;
-
- nsCOMPtr<nsIURI> uri;
- nsresult rv = NS_NewURI(getter_AddRefs(uri), nsEmbedCString(aBaseURI));
- if (NS_FAILED(rv))
- return rv;
-
- rv = wbStream->OpenStream(uri, nsDependentCString(aContentType));
- return rv;
-}
-
-nsresult
-EmbedPrivate::AppendToStream(const PRUint8 *aData, PRUint32 aLen)
-{
- // Attach listeners to this document since in some cases we don't
- // get updates for content added this way.
- ContentStateChange();
-
- nsCOMPtr<nsIWebBrowser> webBrowser;
- mWindow->GetWebBrowser(getter_AddRefs(webBrowser));
-
- nsCOMPtr<nsIWebBrowserStream> wbStream = do_QueryInterface(webBrowser);
- if (!wbStream) return NS_ERROR_FAILURE;
-
- return wbStream->AppendToStream(aData, aLen);
-}
-
-nsresult
-EmbedPrivate::CloseStream(void)
-{
- nsCOMPtr<nsIWebBrowser> webBrowser;
- mWindow->GetWebBrowser(getter_AddRefs(webBrowser));
-
- nsCOMPtr<nsIWebBrowserStream> wbStream = do_QueryInterface(webBrowser);
- if (!wbStream) return NS_ERROR_FAILURE;
-
- return wbStream->CloseStream();
-}
-
/* static */
EmbedPrivate *
EmbedPrivate::FindPrivateForBrowser(nsIWebBrowserChrome *aBrowser)
Modified: kazehakase/trunk/module/embed/gecko/gtkmozembed/EmbedPrivate.h
===================================================================
--- kazehakase/trunk/module/embed/gecko/gtkmozembed/EmbedPrivate.h 2008-03-08 12:47:51 UTC (rev 3460)
+++ kazehakase/trunk/module/embed/gecko/gtkmozembed/EmbedPrivate.h 2008-03-08 13:12:36 UTC (rev 3461)
@@ -84,15 +84,9 @@
static void PushStartup (void);
static void PopStartup (void);
static void SetCompPath (const char *aPath);
- static void SetAppComponents (const nsModuleComponentInfo* aComps,
- int aNumComponents);
static void SetProfilePath (const char *aDir, const char *aName);
static void SetDirectoryServiceProvider (nsIDirectoryServiceProvider * appFileLocProvider);
- nsresult OpenStream (const char *aBaseURI, const char *aContentType);
- nsresult AppendToStream (const PRUint8 *aData, PRUint32 aLen);
- nsresult CloseStream (void);
-
// This function will find the specific EmbedPrivate object for a
// given nsIWebBrowserChrome.
static EmbedPrivate *FindPrivateForBrowser(nsIWebBrowserChrome *aBrowser);
Modified: kazehakase/trunk/module/embed/gecko/gtkmozembed/gtkmozembed.h
===================================================================
--- kazehakase/trunk/module/embed/gecko/gtkmozembed/gtkmozembed.h 2008-03-08 12:47:51 UTC (rev 3460)
+++ kazehakase/trunk/module/embed/gecko/gtkmozembed/gtkmozembed.h 2008-03-08 13:12:36 UTC (rev 3461)
@@ -98,17 +98,6 @@
gboolean gtk_moz_embed_can_go_forward (GtkMozEmbed *embed);
void gtk_moz_embed_go_back (GtkMozEmbed *embed);
void gtk_moz_embed_go_forward (GtkMozEmbed *embed);
-void gtk_moz_embed_render_data (GtkMozEmbed *embed,
- const char *data,
- guint32 len,
- const char *base_uri,
- const char *mime_type);
-void gtk_moz_embed_open_stream (GtkMozEmbed *embed,
- const char *base_uri,
- const char *mime_type);
-void gtk_moz_embed_append_data (GtkMozEmbed *embed,
- const char *data, guint32 len);
-void gtk_moz_embed_close_stream (GtkMozEmbed *embed);
char *gtk_moz_embed_get_link_message (GtkMozEmbed *embed);
char *gtk_moz_embed_get_js_status (GtkMozEmbed *embed);
char *gtk_moz_embed_get_title (GtkMozEmbed *embed);
Modified: kazehakase/trunk/module/embed/gecko/gtkmozembed/gtkmozembed2.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/gtkmozembed/gtkmozembed2.cpp 2008-03-08 12:47:51 UTC (rev 3460)
+++ kazehakase/trunk/module/embed/gecko/gtkmozembed/gtkmozembed2.cpp 2008-03-08 13:12:36 UTC (rev 3461)
@@ -637,13 +637,6 @@
}
void
-gtk_moz_embed_set_app_components(const nsModuleComponentInfo* aComps,
- int aNumComponents)
-{
- EmbedPrivate::SetAppComponents(aComps, aNumComponents);
-}
-
-void
gtk_moz_embed_set_profile_path(const char *aDir, const char *aName)
{
EmbedPrivate::SetProfilePath(aDir, aName);
@@ -746,64 +739,6 @@
embedPrivate->mNavigation->GoForward();
}
-void
-gtk_moz_embed_render_data(GtkMozEmbed *embed, const char *data,
- guint32 len, const char *base_uri,
- const char *mime_type)
-{
- EmbedPrivate *embedPrivate;
-
- g_return_if_fail (embed != NULL);
- g_return_if_fail (GTK_IS_MOZ_EMBED(embed));
-
- embedPrivate = (EmbedPrivate *)embed->data;
-
- embedPrivate->OpenStream(base_uri, mime_type);
- embedPrivate->AppendToStream((const PRUint8*)data, len);
- embedPrivate->CloseStream();
-}
-
-void
-gtk_moz_embed_open_stream(GtkMozEmbed *embed, const char *base_uri,
- const char *mime_type)
-{
- EmbedPrivate *embedPrivate;
-
- g_return_if_fail (embed != NULL);
- g_return_if_fail (GTK_IS_MOZ_EMBED(embed));
- g_return_if_fail (GTK_WIDGET_REALIZED(GTK_WIDGET(embed)));
-
- embedPrivate = (EmbedPrivate *)embed->data;
-
- embedPrivate->OpenStream(base_uri, mime_type);
-}
-
-void gtk_moz_embed_append_data(GtkMozEmbed *embed, const char *data,
- guint32 len)
-{
- EmbedPrivate *embedPrivate;
-
- g_return_if_fail (embed != NULL);
- g_return_if_fail (GTK_IS_MOZ_EMBED(embed));
- g_return_if_fail (GTK_WIDGET_REALIZED(GTK_WIDGET(embed)));
-
- embedPrivate = (EmbedPrivate *)embed->data;
- embedPrivate->AppendToStream((const PRUint8*)data, len);
-}
-
-void
-gtk_moz_embed_close_stream(GtkMozEmbed *embed)
-{
- EmbedPrivate *embedPrivate;
-
- g_return_if_fail (embed != NULL);
- g_return_if_fail (GTK_IS_MOZ_EMBED(embed));
- g_return_if_fail (GTK_WIDGET_REALIZED(GTK_WIDGET(embed)));
-
- embedPrivate = (EmbedPrivate *)embed->data;
- embedPrivate->CloseStream();
-}
-
char *
gtk_moz_embed_get_link_message(GtkMozEmbed *embed)
{
@@ -967,57 +902,6 @@
embedPrivate->mWindow->GetWebBrowser(retval);
}
-PRUnichar *
-gtk_moz_embed_get_title_unichar (GtkMozEmbed *embed)
-{
- PRUnichar *retval = nsnull;
- EmbedPrivate *embedPrivate;
-
- g_return_val_if_fail ((embed != NULL), (PRUnichar *)NULL);
- g_return_val_if_fail (GTK_IS_MOZ_EMBED(embed), (PRUnichar *)NULL);
-
- embedPrivate = (EmbedPrivate *)embed->data;
-
- if (embedPrivate->mWindow)
- retval = NS_StringCloneData(embedPrivate->mWindow->mTitle);
-
- return retval;
-}
-
-PRUnichar *
-gtk_moz_embed_get_js_status_unichar (GtkMozEmbed *embed)
-{
- PRUnichar *retval = nsnull;
- EmbedPrivate *embedPrivate;
-
- g_return_val_if_fail ((embed != NULL), (PRUnichar *)NULL);
- g_return_val_if_fail (GTK_IS_MOZ_EMBED(embed), (PRUnichar *)NULL);
-
- embedPrivate = (EmbedPrivate *)embed->data;
-
- if (embedPrivate->mWindow)
- retval = NS_StringCloneData(embedPrivate->mWindow->mJSStatus);
-
- return retval;
-}
-
-PRUnichar *
-gtk_moz_embed_get_link_message_unichar (GtkMozEmbed *embed)
-{
- PRUnichar *retval = nsnull;
- EmbedPrivate *embedPrivate;
-
- g_return_val_if_fail ((embed != NULL), (PRUnichar *)NULL);
- g_return_val_if_fail (GTK_IS_MOZ_EMBED(embed), (PRUnichar *)NULL);
-
- embedPrivate = (EmbedPrivate *)embed->data;
-
- if (embedPrivate->mWindow)
- retval = NS_StringCloneData(embedPrivate->mWindow->mLinkMessage);
-
- return retval;
-}
-
// class and instance initialization
GType
Modified: kazehakase/trunk/module/embed/gecko/gtkmozembed/gtkmozembed_internal.h
===================================================================
--- kazehakase/trunk/module/embed/gecko/gtkmozembed/gtkmozembed_internal.h 2008-03-08 12:47:51 UTC (rev 3460)
+++ kazehakase/trunk/module/embed/gecko/gtkmozembed/gtkmozembed_internal.h 2008-03-08 13:12:36 UTC (rev 3461)
@@ -32,11 +32,6 @@
#endif /* __cplusplus */
extern void gtk_moz_embed_get_nsIWebBrowser (GtkMozEmbed *embed, nsIWebBrowser **retval);
-extern PRUnichar *gtk_moz_embed_get_title_unichar (GtkMozEmbed *embed);
-extern PRUnichar *gtk_moz_embed_get_js_status_unichar (GtkMozEmbed *embed);
-extern PRUnichar *gtk_moz_embed_get_link_message_unichar (GtkMozEmbed *embed);
-extern void gtk_moz_embed_set_directory_service_provider (nsIDirectoryServiceProvider *appFileLocProvider);
-extern void gtk_moz_embed_set_app_components (const nsModuleComponentInfo *aComps, int aNumComps);
#ifdef __cplusplus
}