svnno****@sourc*****
svnno****@sourc*****
Tue Mar 11 20:53:19 JST 2008
Revision: 3474
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=3474
Author: ikezoe
Date: 2008-03-11 20:53:19 +0900 (Tue, 11 Mar 2008)
Log Message:
-----------
* macro/gecko.m4, module/embed/gecko/kz-mozprogresslistener.[cpp|h],
module/embed/gecko/mozilla.cpp, module/embed/gecko/kz-mozwrapper.cpp:
More cleanup.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/macros/gecko.m4
kazehakase/trunk/module/embed/gecko/kz-mozprogresslistener.cpp
kazehakase/trunk/module/embed/gecko/kz-mozprogresslistener.h
kazehakase/trunk/module/embed/gecko/kz-mozwrapper.cpp
kazehakase/trunk/module/embed/gecko/mozilla.cpp
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2008-03-11 11:40:19 UTC (rev 3473)
+++ kazehakase/trunk/ChangeLog 2008-03-11 11:53:19 UTC (rev 3474)
@@ -6,6 +6,9 @@
module/embed/gecko/kz-mozfilepicker.cpp,
module/embed/gecko/kz-moz-wrapper.cpp: Remove old codes. I confirmed
xulrunner-1,9b and firefox2.
+ * macro/gecko.m4, module/embed/gecko/kz-mozprogresslistener.[cpp|h],
+ module/embed/gecko/mozilla.cpp, module/embed/gecko/kz-mozwrapper.cpp:
+ More cleanup.
2008-03-10 Hiroyuki Ikezoe <poinc****@ikezo*****>
Modified: kazehakase/trunk/macros/gecko.m4
===================================================================
--- kazehakase/trunk/macros/gecko.m4 2008-03-11 11:40:19 UTC (rev 3473)
+++ kazehakase/trunk/macros/gecko.m4 2008-03-11 11:53:19 UTC (rev 3474)
@@ -96,20 +96,6 @@
AC_MSG_RESULT([$result])
-AC_MSG_CHECKING([whether nsIFilePicker methods expect nsAString&])
-
-AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM(
- [[#include <nsEmbedString.h>
- #include <nsIFilePicker.h>]],
- [[nsIFilePicker *p;
- p->SetDefaultString (nsEmbedString());]]
- )],
- [AC_DEFINE([MOZ_NSIFILEPICKER_NSASTRING_],[1],[Define if nsIFilePicker uses nsAString&]) result=yes],
- [result=no])
-
-AC_MSG_RESULT([$result])
-
AC_MSG_CHECKING([whether nsIFilePicker::GetFileURL methods expect nsIFileURL**])
AC_COMPILE_IFELSE(
@@ -124,36 +110,7 @@
AC_MSG_RESULT([$result])
-dnl Changed from char* to nsAString& in 1.8a1
-AC_MSG_CHECKING([whether nsIMIMEInfo methods expect nsAString&])
-
-AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM(
- [[#include <nsEmbedString.h>
- #include <nsIMIMEInfo.h>]],
- [[nsIMIMEInfo *p;
- p->SetDescription (nsEmbedString());]]
- )],
- [AC_DEFINE([MOZ_NSIMIMEINFO_NSACSTRING_],[1],[Define if nsIMIMEInfo uses nsAString&]) result=yes],
- [result=no])
-
-AC_MSG_RESULT([$result])
-
-AC_MSG_CHECKING([whether nsICacheSession methods expect nsAString&])
-
-AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM(
- [[#include <nsEmbedString.h>
- #include <nsICacheSession.h>]],
- [[nsICacheSession *p;
- p->OpenCacheEntry (nsEmbedCString(),0, PR_FALSE, nsnull);]]
- )],
- [AC_DEFINE([MOZ_NSICACHESESSION_NSACSTRING_],[1],[Define if nsICacheSession uses nsAString&]) result=yes],
- [result=no])
-
-AC_MSG_RESULT([$result])
-
AC_MSG_CHECKING([whether nsIHelperAppLauncherDialog methods expect PRBool])
AC_COMPILE_IFELSE(
@@ -255,21 +212,6 @@
AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/content/nsICanvasRenderingContextInternal.h],
[AC_DEFINE([HAVE_NSICANVASRENDERINGCONTEXTINTERNAL_H],[1],[Define if nsICanvasRenderingContextInternal.h exists])])
-AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/nsIWebProgressListener2.h],
- [AC_DEFINE([HAVE_NSIWEBPROGRESSLISTENER2_H],[1],[Define if nsIWebProgressListener2.h exists])],
- [AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/uriloader/nsIWebProgressListener2.h],
- [AC_DEFINE([HAVE_NSIWEBPROGRESSLISTENER2_H],[1],[Define if nsIWebProgressListener2.h exists])])])
-
-AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/nsITransfer.h],
- [AC_DEFINE([HAVE_NSITRANSFER_H],[1],[Define if nsITransfer.h exists])],
- [AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/uriloader/nsITransfer.h],
- [AC_DEFINE([HAVE_NSITRANSFER_H],[1],[Define if nsITransfer.h exists])])])
-
-AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/nsIPresContext.h],
- [AC_DEFINE([HAVE_NSIPRESCONTEXT_H],[1],[Define if nsIPresContext.h exists])],
- [AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/layout/nsIPresContext.h],
- [AC_DEFINE([HAVE_NSIPRESCONTEXT_H],[1],[Define if nsIPresContext.h exists])])])
-
dnl Not a simple file check due to the header being in the SDK since 1.8a6
dnl https://bugzilla.mozilla.org/show_bug.cgi?id=271068
Modified: kazehakase/trunk/module/embed/gecko/kz-mozprogresslistener.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/kz-mozprogresslistener.cpp 2008-03-11 11:40:19 UTC (rev 3473)
+++ kazehakase/trunk/module/embed/gecko/kz-mozprogresslistener.cpp 2008-03-11 11:53:19 UTC (rev 3474)
@@ -42,15 +42,9 @@
{
}
-#ifdef HAVE_NSITRANSFER_H
NS_IMPL_ISUPPORTS2(KzMozProgressListener,
nsIWebProgressListener,
nsITransfer)
-#else
-NS_IMPL_ISUPPORTS2(KzMozProgressListener,
- nsIDownload,
- nsIWebProgressListener)
-#endif
NS_IMETHODIMP
KzMozProgressListener::OnStateChange(nsIWebProgress *aWebProgress,
@@ -84,7 +78,6 @@
return NS_OK;
}
-#ifdef HAVE_NSIWEBPROGRESSLISTENER2_H
NS_IMETHODIMP
KzMozProgressListener::OnProgressChange (nsIWebProgress *aWebProgress,
nsIRequest *aRequest,
@@ -117,15 +110,6 @@
PRInt64 aMaxSelfProgress,
PRInt64 aCurTotalProgress,
PRInt64 aMaxTotalProgress)
-#else
-NS_IMETHODIMP
-KzMozProgressListener::OnProgressChange(nsIWebProgress *aWebProgress,
- nsIRequest *aRequest,
- PRInt32 aCurSelfProgress,
- PRInt32 aMaxSelfProgress,
- PRInt32 aCurTotalProgress,
- PRInt32 aMaxTotalProgress)
-#endif
{
mPercentComplete = (PRInt32)(((float)aCurTotalProgress / (float)aMaxTotalProgress) * 100.0 + 0.5);
@@ -164,30 +148,16 @@
NS_IMETHODIMP
KzMozProgressListener::Init(nsIURI *aSource,
nsIURI *aTarget,
-#if HAVE_NSIWEBPROGRESSLISTENER2_H
const nsAString &aDisplayName,
nsIMIMEInfo *aMIMEInfo,
PRTime aStartTime,
nsILocalFile *aTempFile,
nsICancelable *aCancelable)
-#else
- const PRUnichar *aDisplayName,
- nsIMIMEInfo *aMIMEInfo,
- PRInt64 startTime,
- nsIWebBrowserPersist *aPersist)
-#endif
{
mTotalProgress = 0;
mCurrentProgress = 0;
mPercentComplete = 0;
-#ifndef HAVE_NSIWEBPROGRESSLISTENER2_H
- if (aPersist)
- {
- mPersist = aPersist;
- mPersist->SetProgressListener(this);
- }
-#endif
nsEmbedString leafName;
nsCOMPtr<nsIFileURL> fileUrl = do_QueryInterface(aTarget);
@@ -213,30 +183,13 @@
return NS_ERROR_NOT_IMPLEMENTED;
}
-#ifndef HAVE_NSITRANSFER_H
NS_IMETHODIMP
-KzMozProgressListener::GetTarget(nsIURI * *aTarget)
-{
- return NS_ERROR_NOT_IMPLEMENTED;
-}
-#endif
-
-NS_IMETHODIMP
KzMozProgressListener::GetTargetFile(nsILocalFile * *aTarget)
{
return NS_ERROR_NOT_IMPLEMENTED;
}
-#ifndef HAVE_NSITRANSFER_H
NS_IMETHODIMP
-KzMozProgressListener::GetPersist(nsIWebBrowserPersist * *aPersist)
-{
- NS_IF_ADDREF(*aPersist = mPersist);
- return NS_OK;
-}
-#endif
-
-NS_IMETHODIMP
KzMozProgressListener::GetPercentComplete(PRInt32 *aPercentComplete)
{
NS_ENSURE_ARG_POINTER(aPercentComplete);
@@ -245,61 +198,13 @@
return NS_OK;
}
-#ifndef HAVE_NSITRANSFER_H
-NS_IMETHODIMP
-KzMozProgressListener::GetDisplayName(PRUnichar * *aDisplayName)
-{
- return NS_ERROR_NOT_IMPLEMENTED;
-}
NS_IMETHODIMP
-KzMozProgressListener::SetDisplayName(const PRUnichar * aDisplayName)
-{
- return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-KzMozProgressListener::GetStartTime(PRInt64 *aStartTime)
-{
- return NS_ERROR_NOT_IMPLEMENTED;
-}
-#endif
-
-NS_IMETHODIMP
KzMozProgressListener::GetMIMEInfo(nsIMIMEInfo * *aMIMEInfo)
{
return NS_ERROR_NOT_IMPLEMENTED;
}
-#ifndef HAVE_NSIWEBPROGRESSLISTENER2_H
-NS_IMETHODIMP
-KzMozProgressListener::GetListener(nsIWebProgressListener * *aListener)
-{
- NS_ENSURE_ARG_POINTER(aListener);
- NS_IF_ADDREF(*aListener = (nsIWebProgressListener *)this);
- return NS_OK;
-}
-
-NS_IMETHODIMP
-KzMozProgressListener::SetListener(nsIWebProgressListener * aListener)
-{
- return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-KzMozProgressListener::GetObserver(nsIObserver * *aObserver)
-{
- return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-KzMozProgressListener::SetObserver(nsIObserver * aObserver)
-{
- mObserver = aObserver;
- return NS_OK;
-}
-#endif
-
nsresult
KzMozProgressListener::Cancel ()
{
Modified: kazehakase/trunk/module/embed/gecko/kz-mozprogresslistener.h
===================================================================
--- kazehakase/trunk/module/embed/gecko/kz-mozprogresslistener.h 2008-03-11 11:40:19 UTC (rev 3473)
+++ kazehakase/trunk/module/embed/gecko/kz-mozprogresslistener.h 2008-03-11 11:53:19 UTC (rev 3474)
@@ -31,11 +31,7 @@
#include <nsWeakReference.h>
#include <nsIObserver.h>
#include <nsIWebBrowserPersist.h>
-#ifdef HAVE_NSITRANSFER_H
#include <nsITransfer.h>
-#else
-#include <nsIDownload.h>
-#endif
#define KZ_DOWNLOAD_CID \
{ /* d2a2f743-f126-4f1f-1234-d4e50490f112 */ \
@@ -48,12 +44,7 @@
#define KZ_DOWNLOAD_CLASSNAME "Kazehakase's Download Progress Listener"
class KzMozProgressListener :
-#ifdef HAVE_NSITRANSFER_H
public nsITransfer
-#else
- public nsIWebProgressListener,
- public nsIDownload
-#endif
{
public:
KzMozProgressListener();
@@ -61,21 +52,14 @@
NS_DECL_ISUPPORTS
NS_DECL_NSIWEBPROGRESSLISTENER
-#if HAVE_NSIWEBPROGRESSLISTENER2_H
NS_DECL_NSIWEBPROGRESSLISTENER2
-#endif
NS_DECL_NSITRANSFER
-#ifndef HAVE_NSITRANSFER_H
- NS_DECL_NSIDOWNLOAD
-#endif
-#ifdef HAVE_NSITRANSFER_H
nsresult GetMIMEInfo (nsIMIMEInfo **aMIMEInfo);
nsresult GetTargetFile (nsILocalFile **aFile);
nsresult GetSource(nsIURI * *aSource);
nsresult GetPercentComplete(PRInt32 *aPercentComplete);
-#endif
nsresult Cancel();
PRInt32 mPercentComplete;
Modified: kazehakase/trunk/module/embed/gecko/kz-mozwrapper.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/kz-mozwrapper.cpp 2008-03-11 11:40:19 UTC (rev 3473)
+++ kazehakase/trunk/module/embed/gecko/kz-mozwrapper.cpp 2008-03-11 11:53:19 UTC (rev 3474)
@@ -94,9 +94,6 @@
#include <nsIDocCharset.h>
-#ifdef HAVE_NSIPRESCONTEXT_H
-# include <nsIPresContext.h>
-#else
typedef nsString nsAFlatString;
typedef nsCString nsAFlatCString;
# define nsString_h___
@@ -104,7 +101,6 @@
# include <nsPresContext.h>
# undef nsAString_h___
# undef nsString_h___
-#endif
#include "kz-mozprogresslistener.h"
#include "kz-mozutils.h"
@@ -2182,11 +2178,7 @@
gboolean
KzMozWrapper::SetZoomOnDocShell (float aZoom, nsIDocShell *DocShell)
{
-#ifdef HAVE_NSIPRESCONTEXT_H
- nsCOMPtr<nsIPresContext> PresContext;
-#else
nsCOMPtr<nsPresContext> PresContext;
-#endif
nsresult rv = DocShell->GetPresContext (getter_AddRefs(PresContext));
if (NS_FAILED(rv) || !PresContext) return FALSE;
Modified: kazehakase/trunk/module/embed/gecko/mozilla.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/mozilla.cpp 2008-03-11 11:40:19 UTC (rev 3473)
+++ kazehakase/trunk/module/embed/gecko/mozilla.cpp 2008-03-11 11:53:19 UTC (rev 3474)
@@ -67,11 +67,7 @@
{
KZ_DOWNLOAD_CLASSNAME,
KZ_DOWNLOAD_CID,
-#ifdef HAVE_NSITRANSFER_H
NS_TRANSFER_CONTRACTID,
-#else
- NS_DOWNLOAD_CONTRACTID,
-#endif
KzMozProgressListenerConstructor
},
{