Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/mozilla-firefox/patches/mozilla-firefox-1.0.7-imgloader-comarray.patch

    Annotation of /trunk/mozilla-firefox/patches/mozilla-firefox-1.0.7-imgloader-comarray.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 153 - (hide annotations) (download)
    Tue May 8 20:52:56 2007 UTC (17 years, 1 month ago) by niro
    File size: 2483 byte(s) 
    -import
    1 niro 153 Index: modules/libpr0n/src/imgLoader.cpp
    2     ===================================================================
    3     RCS file: /cvsroot/mozilla/modules/libpr0n/src/imgLoader.cpp,v
    4     retrieving revision 1.78.2.2
    5     diff -d -u -p -r1.78.2.2 imgLoader.cpp
    6     --- modules/libpr0n/src/imgLoader.cpp 16 Aug 2004 18:06:37 -0000 1.78.2.2
    7     +++ modules/libpr0n/src/imgLoader.cpp 15 Jul 2005 04:31:06 -0000
    8     @@ -896,7 +896,7 @@ void imgCacheValidator::AddProxy(imgRequ
    9     // the network.
    10     aProxy->AddToLoadGroup();
    11    
    12     - mProxies.AppendElement(aProxy);
    13     + mProxies.AppendObject(aProxy);
    14     }
    15    
    16     /** nsIRequestObserver methods **/
    17     @@ -909,13 +909,10 @@ NS_IMETHODIMP imgCacheValidator::OnStart
    18     PRBool isFromCache;
    19     if (NS_SUCCEEDED(cacheChan->IsFromCache(&isFromCache)) && isFromCache) {
    20    
    21     - PRUint32 count;
    22     - mProxies.Count(&count);
    23     + PRUint32 count = mProxies.Count();
    24     for (PRInt32 i = count-1; i>=0; i--) {
    25     - imgRequestProxy *proxy;
    26     - mProxies.GetElementAt(i, (nsISupports**)&proxy);
    27     + imgRequestProxy *proxy = NS_STATIC_CAST(imgRequestProxy *, mProxies[i]);
    28     mRequest->NotifyProxyListener(proxy);
    29     - NS_RELEASE(proxy);
    30     }
    31    
    32     mRequest->SetLoadId(mContext);
    33     @@ -964,14 +961,11 @@ NS_IMETHODIMP imgCacheValidator::OnStart
    34    
    35     mDestListener = NS_STATIC_CAST(nsIStreamListener*, pl);
    36    
    37     - PRUint32 count;
    38     - mProxies.Count(&count);
    39     + PRUint32 count = mProxies.Count();
    40     for (PRInt32 i = count-1; i>=0; i--) {
    41     - imgRequestProxy *proxy;
    42     - mProxies.GetElementAt(i, (nsISupports**)&proxy);
    43     + imgRequestProxy *proxy = NS_STATIC_CAST(imgRequestProxy *, mProxies[i]);
    44     proxy->ChangeOwner(request);
    45     request->NotifyProxyListener(proxy);
    46     - NS_RELEASE(proxy);
    47     }
    48    
    49     NS_RELEASE(request);
    50     Index: modules/libpr0n/src/imgLoader.h
    51     ===================================================================
    52     RCS file: /cvsroot/mozilla/modules/libpr0n/src/imgLoader.h,v
    53     retrieving revision 1.10.38.1
    54     diff -d -u -p -r1.10.38.1 imgLoader.h
    55     --- modules/libpr0n/src/imgLoader.h 16 Aug 2004 18:06:37 -0000 1.10.38.1
    56     +++ modules/libpr0n/src/imgLoader.h 15 Jul 2005 04:31:06 -0000
    57     @@ -90,7 +90,7 @@ private:
    58     * validate checker
    59     */
    60    
    61     -#include "nsSupportsArray.h"
    62     +#include "nsCOMArray.h"
    63    
    64     class imgCacheValidator : public nsIStreamListener
    65     {
    66     @@ -109,7 +109,7 @@ private:
    67     nsCOMPtr<nsIStreamListener> mDestListener;
    68    
    69     imgRequest *mRequest;
    70     - nsSupportsArray mProxies;
    71     + nsCOMArray<imgIRequest> mProxies;
    72    
    73     void *mContext;
    74     };