svnno****@sourc*****
svnno****@sourc*****
Sat Jan 5 21:26:33 JST 2008
Revision: 3348
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=3348
Author: kous
Date: 2008-01-05 21:26:33 +0900 (Sat, 05 Jan 2008)
Log Message:
-----------
* module/embed/gecko/kz-mozwrapper.cpp: buildable but thumbnail is disabled.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/module/embed/gecko/kz-mozprogresslistener.cpp
kazehakase/trunk/module/embed/gecko/kz-mozwrapper.cpp
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2008-01-05 11:52:51 UTC (rev 3347)
+++ kazehakase/trunk/ChangeLog 2008-01-05 12:26:33 UTC (rev 3348)
@@ -1,5 +1,11 @@
2008-01-05 Kouhei Sutou <kou****@cozmi*****>
+ * module/embed/gecko/kz-mozwrapper.cpp: buildable but thumbnail is
+ disabled.
+
+ * macros/gecko.m4: checked
+ nsWebProgressListener2::OnRefreshAttempted availability.
+
* module/embed/gecko/GtkPromptService.cpp: don't use nsIDocument.
* module/embed/gecko/kz-mozprogresslistener.cpp
Modified: kazehakase/trunk/module/embed/gecko/kz-mozprogresslistener.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/kz-mozprogresslistener.cpp 2008-01-05 11:52:51 UTC (rev 3347)
+++ kazehakase/trunk/module/embed/gecko/kz-mozprogresslistener.cpp 2008-01-05 12:26:33 UTC (rev 3348)
@@ -98,6 +98,7 @@
aCurTotalProgress, aMaxTotalProgress);
}
+#ifdef HAVE_NSWEBPROGRESSLISTENER2_ONREFRESHATTEMPTED
NS_IMETHODIMP
KzMozProgressListener::OnRefreshAttempted(nsIWebProgress *aWebProgress,
nsIURI *aRefreshURI,
@@ -107,6 +108,7 @@
{
// FIXME
}
+#endif
NS_IMETHODIMP
KzMozProgressListener::OnProgressChange64(nsIWebProgress *aWebProgress,
Modified: kazehakase/trunk/module/embed/gecko/kz-mozwrapper.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/kz-mozwrapper.cpp 2008-01-05 11:52:51 UTC (rev 3347)
+++ kazehakase/trunk/module/embed/gecko/kz-mozwrapper.cpp 2008-01-05 12:26:33 UTC (rev 3348)
@@ -45,7 +45,12 @@
#include <nsIDocShell.h>
#include <nsIDocShellTreeItem.h>
#include <nsIDocShellTreeOwner.h>
+#define nsAString_h___
#include <nsIContent.h>
+#undef nsAString_h___
+#define nsString_h___
+#include <nsIPrintOptions.h>
+#undef nsString_h___
#include <nsIContentViewer.h>
#include <nsIDOMHTMLDocument.h>
#include <nsIDOMHTMLElement.h>
@@ -84,7 +89,6 @@
#include <nsIWebBrowserPrint.h>
#include <nsIPrintSettingsService.h>
#include <nsIPrintSettings.h>
-#include <nsIPrintOptions.h>
#include <nsISupportsPrimitives.h>
#include <nsIDOM3Document.h>
#include <nsIDocCharset.h>
@@ -92,10 +96,13 @@
#ifdef HAVE_NSIPRESCONTEXT_H
# include <nsIPresContext.h>
#else
+typedef nsString nsAFlatString;
typedef nsCString nsAFlatCString;
+# define nsString_h___
# define nsAString_h___
# include <nsPresContext.h>
# undef nsAString_h___
+# undef nsString_h___
#endif
#include "kz-mozprogresslistener.h"
@@ -2093,8 +2100,8 @@
nsCOMPtr<nsIDOMWindow> domWindow;
GetDOMWindow(getter_AddRefs(domWindow));
- if (!MozillaPrivate::CreateThumbnail(domWindow, uri,
- last_modified, size))
+// if (!MozillaPrivate::CreateThumbnail(domWindow, uri,
+// last_modified, size))
return NS_ERROR_FAILURE;
return NS_OK;