svnno****@sourc*****
svnno****@sourc*****
Sat Aug 15 15:39:52 JST 2009
Revision: 3779
http://sourceforge.jp/projects/kazehakase/svn/view?view=rev&revision=3779
Author: ikezoe
Date: 2009-08-15 15:39:52 +0900 (Sat, 15 Aug 2009)
Log Message:
-----------
* module/embed/gecko/kz-mozwrapper.cpp,
module/embed/gecko/mozilla.cpp: Xulrunner-1.9.1 support.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/module/embed/gecko/GtkPromptService.cpp
kazehakase/trunk/module/embed/gecko/gtkmozembed/Makefile.am
kazehakase/trunk/module/embed/gecko/kz-mozwrapper.cpp
kazehakase/trunk/module/embed/gecko/mozilla.cpp
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2009-07-25 06:46:33 UTC (rev 3778)
+++ kazehakase/trunk/ChangeLog 2009-08-15 06:39:52 UTC (rev 3779)
@@ -1,3 +1,8 @@
+2009-08-15 Hiroyuki Ikezoe <poinc****@ikezo*****>
+
+ * module/embed/gecko/kz-mozwrapper.cpp,
+ module/embed/gecko/mozilla.cpp: Xulrunner-1.9.1 support.
+
2009-07-25 Hiroyuki Ikezoe <poinc****@ikezo*****>
* Remove GtkWebcore stuff.
Modified: kazehakase/trunk/module/embed/gecko/GtkPromptService.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/GtkPromptService.cpp 2009-07-25 06:46:33 UTC (rev 3778)
+++ kazehakase/trunk/module/embed/gecko/GtkPromptService.cpp 2009-08-15 06:39:52 UTC (rev 3779)
@@ -105,7 +105,6 @@
if ((strstr(cText.get(), "print preview")) ||
(strstr(cTitle.get(), "Printer Error")))
{
- g_warning("%s", cText.get());
return NS_OK;
}
#if 0
Modified: kazehakase/trunk/module/embed/gecko/gtkmozembed/Makefile.am
===================================================================
--- kazehakase/trunk/module/embed/gecko/gtkmozembed/Makefile.am 2009-07-25 06:46:33 UTC (rev 3778)
+++ kazehakase/trunk/module/embed/gecko/gtkmozembed/Makefile.am 2009-08-15 06:39:52 UTC (rev 3779)
@@ -55,7 +55,7 @@
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/bookmarks \
-I$(top_srcdir)/src/net \
- -I$(top_srcdir)/src/libegg/pixbufthumbnail \
+ -I$(top_srcdir)/libegg/pixbufthumbnail \
-I$(top_srcdir)/src/utils \
-I$(top_srcdir)/module/embed/gecko
Modified: kazehakase/trunk/module/embed/gecko/kz-mozwrapper.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/kz-mozwrapper.cpp 2009-07-25 06:46:33 UTC (rev 3778)
+++ kazehakase/trunk/module/embed/gecko/kz-mozwrapper.cpp 2009-08-15 06:39:52 UTC (rev 3779)
@@ -150,7 +150,7 @@
getter_AddRefs(mWebBrowser));
if (!mWebBrowser) return NS_ERROR_FAILURE;
- mWebBrowser->GetContentDOMWindow (getter_AddRefs (mDOMWindow));
+ mWebBrowser->GetContentDOMWindow(getter_AddRefs(mDOMWindow));
/* this codes was taken from Galeon-1.3.17 */
/* This will instantiate an about:blank doc if necessary, but don't
@@ -174,6 +174,7 @@
if (NS_FAILED (rv)) return NS_ERROR_FAILURE;
GetListener();
AttachListeners();
+
#if 0
mKzMozSelectionListener = new KzMozSelectionListener;
mKzMozSelectionListener->Init(kzembed);
@@ -199,17 +200,12 @@
if (NS_FAILED (rv)) g_warning("failed to add a history listener");
#endif
-// SSL related code
-// These codes are picked from mozilla/GaleonWrapper in Galeon 1.3.21.
-// Original copyright notice.
-// Copyright (C) 2000 Marco Pesenti Gritti
+ nsCOMPtr<nsIDocShell> docShell;
+ rv = GetDocShell(getter_AddRefs(docShell));
- nsCOMPtr<nsIDocShell> docShell (do_GetInterface (mWebBrowser, &rv));
- NS_ENSURE_SUCCESS (rv, rv);
+ rv = docShell->GetSecurityUI(getter_AddRefs(mSecurityInfo));
+ NS_ENSURE_SUCCESS(rv, rv);
- rv = docShell->GetSecurityUI (getter_AddRefs (mSecurityInfo));
- NS_ENSURE_SUCCESS (rv, rv);
-
return NS_OK;
}
@@ -218,10 +214,10 @@
KzMozWrapper::GetListener (void)
{
if (mEventTarget) return NS_ERROR_FAILURE;
-
+
nsCOMPtr<nsIDOMWindow> domWindowExternal;
mWebBrowser->GetContentDOMWindow(getter_AddRefs(domWindowExternal));
-
+
nsCOMPtr<nsIDOMWindow2> domWindow;
domWindow = do_QueryInterface(domWindowExternal);
if (!domWindow) return NS_ERROR_FAILURE;
@@ -250,7 +246,7 @@
KzMozWrapper::DetachListeners(void)
{
if (!mEventTarget) return NS_ERROR_FAILURE;
-
+
const PRUnichar domLiteral[] = { 'D', 'O', 'M', 'L', 'i', 'n', 'k',
'A', 'd', 'd', 'e', 'd', '\0' };
return mEventTarget->RemoveEventListener(nsEmbedString(domLiteral),
@@ -272,31 +268,21 @@
// Our own methods
//
+#include <nsPIDOMWindow.h>
nsresult
KzMozWrapper::GetDocShell (nsIDocShell **aDocShell)
{
if (!mWebBrowser) return NS_ERROR_FAILURE;
- nsCOMPtr<nsIDocShellTreeItem> browserAsItem;
- browserAsItem = do_QueryInterface(mWebBrowser);
- if (!browserAsItem) return NS_ERROR_FAILURE;
+ nsCOMPtr<nsIDOMWindow> domWindow;
+ mWebBrowser->GetContentDOMWindow(getter_AddRefs(domWindow));
- // get the owner for that item
- nsCOMPtr<nsIDocShellTreeOwner> treeOwner;
- browserAsItem->GetTreeOwner(getter_AddRefs(treeOwner));
- if (!treeOwner) return NS_ERROR_FAILURE;
+ if (!domWindow)
+ return NS_ERROR_FAILURE;
- // get the primary content shell as an item
- nsCOMPtr<nsIDocShellTreeItem> contentItem;
- treeOwner->GetPrimaryContentShell(getter_AddRefs(contentItem));
- if (!contentItem) return NS_ERROR_FAILURE;
+ nsCOMPtr<nsPIDOMWindow> domWindowPrivate = do_QueryInterface(domWindow);
- // QI that back to a docshell
- nsCOMPtr<nsIDocShell> DocShell;
- DocShell = do_QueryInterface(contentItem);
- if (!DocShell) return NS_ERROR_FAILURE;
-
- *aDocShell = DocShell.get();
+ *aDocShell = domWindowPrivate->GetDocShell();
NS_IF_ADDREF(*aDocShell);
return NS_OK;
Modified: kazehakase/trunk/module/embed/gecko/mozilla.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/mozilla.cpp 2009-07-25 06:46:33 UTC (rev 3778)
+++ kazehakase/trunk/module/embed/gecko/mozilla.cpp 2009-08-15 06:39:52 UTC (rev 3779)
@@ -131,8 +131,8 @@
xulrunner_init (void)
{
static const GREVersionRange greVersion = {
- "1.9a", PR_TRUE,
- "2", PR_TRUE
+ "1.9.1", PR_TRUE,
+ "2.0", PR_TRUE,
};
char xpcomPath[PATH_MAX];