rpms/mozilla/FC-3 mozilla-1.7.8-imgloader-comarray.patch, NONE, 1.1 mozilla.spec, 1.46, 1.47 sources, 1.27, 1.28

[fedora-cvs-commits redhat com]

Author: caillon

Update of /cvs/dist/rpms/mozilla/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv29772

Modified Files:
	mozilla.spec sources 
Added Files:
	mozilla-1.7.8-imgloader-comarray.patch 
Log Message:
* Tue Jul 19 2005 Christopher Aillon <caillon redhat com> 37:1.7.10-1.3.1
- Update to 1.7.10
- Fix a crash on 64bit platforms (#160330)


mozilla-1.7.8-imgloader-comarray.patch:
 imgLoader.cpp |   16 +++++-----------
 imgLoader.h   |    4 ++--
 2 files changed, 7 insertions(+), 13 deletions(-)

--- NEW FILE mozilla-1.7.8-imgloader-comarray.patch ---
Index: modules/libpr0n/src/imgLoader.cpp
===================================================================
RCS file: /cvsroot/mozilla/modules/libpr0n/src/imgLoader.cpp,v
retrieving revision 1.78.2.2
diff -d -u -p -r1.78.2.2 imgLoader.cpp
--- modules/libpr0n/src/imgLoader.cpp	16 Aug 2004 18:06:37 -0000	1.78.2.2
+++ modules/libpr0n/src/imgLoader.cpp	15 Jul 2005 04:31:06 -0000
@@ -896,7 +896,7 @@ void imgCacheValidator::AddProxy(imgRequ
   // the network.
   aProxy->AddToLoadGroup();
 
-  mProxies.AppendElement(aProxy);
+  mProxies.AppendObject(aProxy);
 }
 
 /** nsIRequestObserver methods **/
@@ -909,13 +909,10 @@ NS_IMETHODIMP imgCacheValidator::OnStart
     PRBool isFromCache;
     if (NS_SUCCEEDED(cacheChan->IsFromCache(&isFromCache)) && isFromCache) {
 
-      PRUint32 count;
-      mProxies.Count(&count);
+      PRUint32 count = mProxies.Count();
       for (PRInt32 i = count-1; i>=0; i--) {
-        imgRequestProxy *proxy;
-        mProxies.GetElementAt(i, (nsISupports**)&proxy);
+        imgRequestProxy *proxy = NS_STATIC_CAST(imgRequestProxy *, mProxies[i]);
         mRequest->NotifyProxyListener(proxy);
-        NS_RELEASE(proxy);
       }
 
       mRequest->SetLoadId(mContext);
@@ -964,14 +961,11 @@ NS_IMETHODIMP imgCacheValidator::OnStart
 
   mDestListener = NS_STATIC_CAST(nsIStreamListener*, pl);
 
-  PRUint32 count;
-  mProxies.Count(&count);
+  PRUint32 count = mProxies.Count();
   for (PRInt32 i = count-1; i>=0; i--) {
-    imgRequestProxy *proxy;
-    mProxies.GetElementAt(i, (nsISupports**)&proxy);
+    imgRequestProxy *proxy = NS_STATIC_CAST(imgRequestProxy *, mProxies[i]);
     proxy->ChangeOwner(request);
     request->NotifyProxyListener(proxy);
-    NS_RELEASE(proxy);
   }
 
   NS_RELEASE(request);
Index: modules/libpr0n/src/imgLoader.h
===================================================================
RCS file: /cvsroot/mozilla/modules/libpr0n/src/imgLoader.h,v
retrieving revision 1.10.38.1
diff -d -u -p -r1.10.38.1 imgLoader.h
--- modules/libpr0n/src/imgLoader.h	16 Aug 2004 18:06:37 -0000	1.10.38.1
+++ modules/libpr0n/src/imgLoader.h	15 Jul 2005 04:31:06 -0000
@@ -90,7 +90,7 @@ private:
  * validate checker
  */
 
-#include "nsSupportsArray.h"
+#include "nsCOMArray.h"
 
 class imgCacheValidator : public nsIStreamListener
 {
@@ -109,7 +109,7 @@ private:
   nsCOMPtr<nsIStreamListener> mDestListener;
 
   imgRequest *mRequest;
-  nsSupportsArray mProxies;
+  nsCOMArray<imgIRequest> mProxies;
 
   void *mContext;
 };


Index: mozilla.spec
===================================================================
RCS file: /cvs/dist/rpms/mozilla/FC-3/mozilla.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- mozilla.spec	13 May 2005 18:17:00 -0000	1.46
+++ mozilla.spec	20 Jul 2005 02:48:20 -0000	1.47
@@ -8,7 +8,7 @@
 
 Name:        mozilla
 Summary:     Web browser and mail reader
-Version:     1.7.8
+Version:     1.7.10
 Release:     1.3.1
 Epoch:       37
 License:     MPL/NPL/GPL/LGPL
@@ -60,7 +60,7 @@
 Patch103:    firefox-1.0-gtk-system-colors.patch
 Patch104:    mozilla-1.7.5-g-application-name.patch
 Patch105:    firefox-1.0-remote-intern-atoms.patch
-
+Patch107:    mozilla-1.7.8-imgloader-comarray.patch
 
 Buildroot:   %{_tmppath}/%{name}-root
 Prefix:      /usr
@@ -208,6 +208,7 @@
 %patch103 -p0
 %patch104 -p0
 %patch105 -p0
+%patch107 -p0
 
 # set up our default bookmarks
 /bin/cp %{SOURCE19} $RPM_BUILD_DIR/mozilla/profile/defaults/bookmarks.html
@@ -704,7 +705,6 @@
 %dir %{mozdir}/chrome/lang
 %dir %{mozdir}/chrome
 
-%dir %{mozdir}/res/builtin
 %dir %{mozdir}/res/rdf
 %dir %{mozdir}/res/dtd
 %dir %{mozdir}/res/fonts
@@ -820,6 +820,10 @@
 %{mozdir}/xpt_link
 
 %changelog
+* Tue Jul 19 2005 Christopher Aillon <caillon redhat com> 37:1.7.10-1.3.1
+- Update to 1.7.10
+- Fix a crash on 64bit platforms (#160330)
+
 * Fri May 13 2005 Christopher Aillon <caillon redhat com> 37:1.7.8-1.3.1
 - Update to 1.7.8
 - Own all the files we install


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mozilla/FC-3/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	13 May 2005 18:17:00 -0000	1.27
+++ sources	20 Jul 2005 02:48:20 -0000	1.28
@@ -1 +1 @@
-a6fa13d0c9243060bac6821fcff4b973  mozilla-1.7.8-source.tar.bz2
+27d4215b2a52aff47dcf328b3b135fa2  mozilla-1.7.10-source.tar.bz2