From f0d240c48647d5832a4a7a7d40920085e3d1eb47 Mon Sep 17 00:00:00 2001 From: Atul Aggarwal Date: Fri, 6 Jan 2012 21:32:27 +0530 Subject: [PATCH] Bug 698263 - Rename mozilla::imagelib namespaces to mozilla::image r=joe --- image/build/nsImageModule.cpp | 6 +++--- image/decoders/nsBMPDecoder.cpp | 4 ++-- image/decoders/nsBMPDecoder.h | 4 ++-- image/decoders/nsGIFDecoder2.cpp | 4 ++-- image/decoders/nsGIFDecoder2.h | 4 ++-- image/decoders/nsICODecoder.cpp | 4 ++-- image/decoders/nsICODecoder.h | 4 ++-- image/decoders/nsIconDecoder.cpp | 4 ++-- image/decoders/nsIconDecoder.h | 4 ++-- image/decoders/nsJPEGDecoder.cpp | 4 ++-- image/decoders/nsJPEGDecoder.h | 4 ++-- image/decoders/nsPNGDecoder.cpp | 4 ++-- image/decoders/nsPNGDecoder.h | 4 ++-- image/encoders/bmp/nsBMPEncoder.cpp | 4 ++-- image/encoders/bmp/nsBMPEncoder.h | 4 ++-- image/encoders/ico/nsICOEncoder.cpp | 2 +- image/encoders/ico/nsICOEncoder.h | 4 ++-- image/src/BMPFileHeaders.h | 4 ++-- image/src/Decoder.cpp | 4 ++-- image/src/Decoder.h | 4 ++-- image/src/DiscardTracker.cpp | 4 ++-- image/src/DiscardTracker.h | 4 ++-- image/src/ICOFileHeaders.h | 4 ++-- image/src/Image.cpp | 4 ++-- image/src/Image.h | 4 ++-- image/src/RasterImage.cpp | 6 +++--- image/src/RasterImage.h | 4 ++-- image/src/SVGDocumentWrapper.cpp | 4 ++-- image/src/SVGDocumentWrapper.h | 4 ++-- image/src/VectorImage.cpp | 4 ++-- image/src/VectorImage.h | 4 ++-- image/src/imgLoader.cpp | 2 +- image/src/imgRequest.cpp | 2 +- image/src/imgRequest.h | 6 +++--- image/src/imgRequestProxy.cpp | 2 +- image/src/imgRequestProxy.h | 10 +++++----- image/src/imgStatusTracker.cpp | 2 +- image/src/imgStatusTracker.h | 10 +++++----- image/src/imgTools.cpp | 2 +- 39 files changed, 81 insertions(+), 81 deletions(-) diff --git a/image/build/nsImageModule.cpp b/image/build/nsImageModule.cpp index b79216261e6..cab6fe8db30 100644 --- a/image/build/nsImageModule.cpp +++ b/image/build/nsImageModule.cpp @@ -62,11 +62,11 @@ // objects that just require generic constructors namespace mozilla { -namespace imagelib { +namespace image { NS_GENERIC_FACTORY_CONSTRUCTOR(RasterImage) } } -using namespace mozilla::imagelib; +using namespace mozilla::image; NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(imgLoader, Init) NS_GENERIC_FACTORY_CONSTRUCTOR(imgRequestProxy) @@ -136,7 +136,7 @@ static void imglib_Shutdown() { imgLoader::Shutdown(); - mozilla::imagelib::DiscardTracker::Shutdown(); + mozilla::image::DiscardTracker::Shutdown(); } static const mozilla::Module kImageModule = { diff --git a/image/decoders/nsBMPDecoder.cpp b/image/decoders/nsBMPDecoder.cpp index ca05d00f925..81893d7a9b4 100644 --- a/image/decoders/nsBMPDecoder.cpp +++ b/image/decoders/nsBMPDecoder.cpp @@ -53,7 +53,7 @@ #include "ImageLogging.h" namespace mozilla { -namespace imagelib { +namespace image { #ifdef PR_LOGGING PRLogModuleInfo *gBMPLog = PR_NewLogModule("BMPDecoder"); @@ -775,5 +775,5 @@ void nsBMPDecoder::ProcessInfoHeader() mBIH.important_colors = LITTLE_TO_NATIVE32(mBIH.important_colors); } -} // namespace imagelib +} // namespace image } // namespace mozilla diff --git a/image/decoders/nsBMPDecoder.h b/image/decoders/nsBMPDecoder.h index 5f2322e737d..d8b7d0cefaa 100644 --- a/image/decoders/nsBMPDecoder.h +++ b/image/decoders/nsBMPDecoder.h @@ -48,7 +48,7 @@ #include "BMPFileHeaders.h" namespace mozilla { -namespace imagelib { +namespace image { class RasterImage; @@ -163,7 +163,7 @@ inline void Set4BitPixel(PRUint32*& aDecoded, PRUint8 aData, } } -} // namespace imagelib +} // namespace image } // namespace mozilla diff --git a/image/decoders/nsGIFDecoder2.cpp b/image/decoders/nsGIFDecoder2.cpp index 073a7ba545a..c321aa70dc9 100644 --- a/image/decoders/nsGIFDecoder2.cpp +++ b/image/decoders/nsGIFDecoder2.cpp @@ -85,7 +85,7 @@ mailing address. #include "qcms.h" namespace mozilla { -namespace imagelib { +namespace image { /* * GETN(n, s) requests at least 'n' bytes available from 'q', at start of state 's' @@ -1104,5 +1104,5 @@ nsGIFDecoder2::SpeedHistogram() } -} // namespace imagelib +} // namespace image } // namespace mozilla diff --git a/image/decoders/nsGIFDecoder2.h b/image/decoders/nsGIFDecoder2.h index 483badb45ae..ba5bfe33cdf 100644 --- a/image/decoders/nsGIFDecoder2.h +++ b/image/decoders/nsGIFDecoder2.h @@ -48,7 +48,7 @@ #include "GIF2.h" namespace mozilla { -namespace imagelib { +namespace image { class RasterImage; ////////////////////////////////////////////////////////////////////// @@ -102,7 +102,7 @@ private: gif_struct mGIFStruct; }; -} // namespace imagelib +} // namespace image } // namespace mozilla #endif diff --git a/image/decoders/nsICODecoder.cpp b/image/decoders/nsICODecoder.cpp index f907cd677d5..554c4c50d1b 100644 --- a/image/decoders/nsICODecoder.cpp +++ b/image/decoders/nsICODecoder.cpp @@ -56,7 +56,7 @@ #include "nsISupportsPrimitives.h" namespace mozilla { -namespace imagelib { +namespace image { #define ICONCOUNTOFFSET 4 #define DIRENTRYOFFSET 6 @@ -611,5 +611,5 @@ nsICODecoder::ProcessDirEntry(IconDirEntry& aTarget) aTarget.mImageOffset = LITTLE_TO_NATIVE32(aTarget.mImageOffset); } -} // namespace imagelib +} // namespace image } // namespace mozilla diff --git a/image/decoders/nsICODecoder.h b/image/decoders/nsICODecoder.h index 435b2699e4c..5d0d04272db 100644 --- a/image/decoders/nsICODecoder.h +++ b/image/decoders/nsICODecoder.h @@ -50,7 +50,7 @@ #include "ICOFileHeaders.h" namespace mozilla { -namespace imagelib { +namespace image { class RasterImage; @@ -123,7 +123,7 @@ private: bool mIsPNG; }; -} // namespace imagelib +} // namespace image } // namespace mozilla #endif diff --git a/image/decoders/nsIconDecoder.cpp b/image/decoders/nsIconDecoder.cpp index c69b82e1223..8a13ef83925 100644 --- a/image/decoders/nsIconDecoder.cpp +++ b/image/decoders/nsIconDecoder.cpp @@ -48,7 +48,7 @@ #include "ImageErrors.h" namespace mozilla { -namespace imagelib { +namespace image { nsIconDecoder::nsIconDecoder(RasterImage &aImage, imgIDecoderObserver* aObserver) : Decoder(aImage, aObserver), @@ -165,5 +165,5 @@ nsIconDecoder::WriteInternal(const char *aBuffer, PRUint32 aCount) } } -} // namespace imagelib +} // namespace image } // namespace mozilla diff --git a/image/decoders/nsIconDecoder.h b/image/decoders/nsIconDecoder.h index ec775063d3e..390ff52e6da 100644 --- a/image/decoders/nsIconDecoder.h +++ b/image/decoders/nsIconDecoder.h @@ -48,7 +48,7 @@ #include "imgIDecoderObserver.h" namespace mozilla { -namespace imagelib { +namespace image { class RasterImage; ////////////////////////////////////////////////////////////////////////////////////////////// @@ -94,7 +94,7 @@ enum { iconStateFinished = 3 }; -} // namespace imagelib +} // namespace image } // namespace mozilla #endif // nsIconDecoder_h__ diff --git a/image/decoders/nsJPEGDecoder.cpp b/image/decoders/nsJPEGDecoder.cpp index 00256817870..30590f0eecf 100644 --- a/image/decoders/nsJPEGDecoder.cpp +++ b/image/decoders/nsJPEGDecoder.cpp @@ -74,7 +74,7 @@ ycc_rgb_convert_argb (j_decompress_ptr cinfo, static void cmyk_convert_rgb(JSAMPROW row, JDIMENSION width); namespace mozilla { -namespace imagelib { +namespace image { #if defined(PR_LOGGING) PRLogModuleInfo *gJPEGlog = PR_NewLogModule("JPEGDecoder"); @@ -890,7 +890,7 @@ term_source (j_decompress_ptr jd) decoder->NotifyDone(); } -} // namespace imagelib +} // namespace image } // namespace mozilla diff --git a/image/decoders/nsJPEGDecoder.h b/image/decoders/nsJPEGDecoder.h index 512e0600d5f..c645004f9a1 100644 --- a/image/decoders/nsJPEGDecoder.h +++ b/image/decoders/nsJPEGDecoder.h @@ -63,7 +63,7 @@ extern "C" { #include namespace mozilla { -namespace imagelib { +namespace image { typedef struct { struct jpeg_error_mgr pub; /* "public" fields for IJG library*/ @@ -128,7 +128,7 @@ public: PRUint32 mCMSMode; }; -} // namespace imagelib +} // namespace image } // namespace mozilla #endif // nsJPEGDecoder_h__ diff --git a/image/decoders/nsPNGDecoder.cpp b/image/decoders/nsPNGDecoder.cpp index a43b33018c0..7574e2bc728 100644 --- a/image/decoders/nsPNGDecoder.cpp +++ b/image/decoders/nsPNGDecoder.cpp @@ -61,7 +61,7 @@ #include "gfxPlatform.h" namespace mozilla { -namespace imagelib { +namespace image { #ifdef PR_LOGGING static PRLogModuleInfo *gPNGLog = PR_NewLogModule("PNGDecoder"); @@ -887,5 +887,5 @@ nsPNGDecoder::SpeedHistogram() } -} // namespace imagelib +} // namespace image } // namespace mozilla diff --git a/image/decoders/nsPNGDecoder.h b/image/decoders/nsPNGDecoder.h index 2a29a563e37..4b4c9a845b6 100644 --- a/image/decoders/nsPNGDecoder.h +++ b/image/decoders/nsPNGDecoder.h @@ -53,7 +53,7 @@ #include "qcms.h" namespace mozilla { -namespace imagelib { +namespace image { class RasterImage; class nsPNGDecoder : public Decoder @@ -141,7 +141,7 @@ public: static const PRUint8 pngSignatureBytes[]; }; -} // namespace imagelib +} // namespace image } // namespace mozilla #endif // nsPNGDecoder_h__ diff --git a/image/encoders/bmp/nsBMPEncoder.cpp b/image/encoders/bmp/nsBMPEncoder.cpp index 19a2e5a0e1c..ade37621afc 100644 --- a/image/encoders/bmp/nsBMPEncoder.cpp +++ b/image/encoders/bmp/nsBMPEncoder.cpp @@ -545,7 +545,7 @@ nsBMPEncoder::InitInfoHeader(PRUint32 aBPP, PRUint32 aWidth, PRUint32 aHeight) void nsBMPEncoder::EncodeFileHeader() { - mozilla::imagelib::BMPFILEHEADER littleEndianBFH = mBMPFileHeader; + mozilla::image::BMPFILEHEADER littleEndianBFH = mBMPFileHeader; littleEndianBFH.filesize = NATIVE32_TO_LITTLE(littleEndianBFH.filesize); littleEndianBFH.reserved = NATIVE32_TO_LITTLE(littleEndianBFH.reserved); littleEndianBFH.dataoffset= NATIVE32_TO_LITTLE(littleEndianBFH.dataoffset); @@ -572,7 +572,7 @@ nsBMPEncoder::EncodeFileHeader() void nsBMPEncoder::EncodeInfoHeader() { - mozilla::imagelib::BMPINFOHEADER littleEndianmBIH = mBMPInfoHeader; + mozilla::image::BMPINFOHEADER littleEndianmBIH = mBMPInfoHeader; littleEndianmBIH.width = NATIVE32_TO_LITTLE(littleEndianmBIH.width); littleEndianmBIH.height = NATIVE32_TO_LITTLE(littleEndianmBIH.height); littleEndianmBIH.planes = NATIVE16_TO_LITTLE(littleEndianmBIH.planes); diff --git a/image/encoders/bmp/nsBMPEncoder.h b/image/encoders/bmp/nsBMPEncoder.h index 361b679f0fe..d4b0b316178 100644 --- a/image/encoders/bmp/nsBMPEncoder.h +++ b/image/encoders/bmp/nsBMPEncoder.h @@ -98,8 +98,8 @@ protected: // These headers will always contain endian independent stuff // They store the BMP headers which will be encoded - mozilla::imagelib::BMPFILEHEADER mBMPFileHeader; - mozilla::imagelib::BMPINFOHEADER mBMPInfoHeader; + mozilla::image::BMPFILEHEADER mBMPFileHeader; + mozilla::image::BMPINFOHEADER mBMPInfoHeader; // Keeps track of the start of the image buffer PRUint8* mImageBufferStart; diff --git a/image/encoders/ico/nsICOEncoder.cpp b/image/encoders/ico/nsICOEncoder.cpp index 3651ad51d1e..29f90e8933c 100644 --- a/image/encoders/ico/nsICOEncoder.cpp +++ b/image/encoders/ico/nsICOEncoder.cpp @@ -46,7 +46,7 @@ #include "nsStreamUtils.h" using namespace mozilla; -using namespace mozilla::imagelib; +using namespace mozilla::image; NS_IMPL_THREADSAFE_ISUPPORTS3(nsICOEncoder, imgIEncoder, nsIInputStream, nsIAsyncInputStream) diff --git a/image/encoders/ico/nsICOEncoder.h b/image/encoders/ico/nsICOEncoder.h index e58321cd8f4..39c21b16848 100644 --- a/image/encoders/ico/nsICOEncoder.h +++ b/image/encoders/ico/nsICOEncoder.h @@ -108,8 +108,8 @@ protected: // These headers will always contain endian independent stuff. // Don't trust the width and height of mICODirEntry directly, // instead use the accessors GetRealWidth() and GetRealHeight(). - mozilla::imagelib::IconFileHeader mICOFileHeader; - mozilla::imagelib::IconDirEntry mICODirEntry; + mozilla::image::IconFileHeader mICOFileHeader; + mozilla::image::IconDirEntry mICODirEntry; // Keeps track of the start of the image buffer PRUint8* mImageBufferStart; diff --git a/image/src/BMPFileHeaders.h b/image/src/BMPFileHeaders.h index 248e3442414..47f4d4a2f6d 100644 --- a/image/src/BMPFileHeaders.h +++ b/image/src/BMPFileHeaders.h @@ -39,7 +39,7 @@ #define MOZILLA_IMAGELIB_BMPHEADERS_H_ namespace mozilla { - namespace imagelib { + namespace image { struct BMPFILEHEADER { char signature[2]; // String "BM" @@ -97,7 +97,7 @@ namespace mozilla { PRUint8 blueRightShift; }; - } // namespace imagelib + } // namespace image } // namespace mozilla #define BITFIELD_LENGTH 12 // Length of the bitfields structure in the bmp file diff --git a/image/src/Decoder.cpp b/image/src/Decoder.cpp index fda0fb676c6..d562898825f 100644 --- a/image/src/Decoder.cpp +++ b/image/src/Decoder.cpp @@ -42,7 +42,7 @@ #include "nsIScriptError.h" namespace mozilla { -namespace imagelib { +namespace image { Decoder::Decoder(RasterImage &aImage, imgIDecoderObserver* aObserver) : mImage(aImage) @@ -326,5 +326,5 @@ Decoder::PostDecoderError(nsresult aFailureCode) NS_WARNING("Image decoding error - This is probably a bug!"); } -} // namespace imagelib +} // namespace image } // namespace mozilla diff --git a/image/src/Decoder.h b/image/src/Decoder.h index 566e021e0be..2ef2c9d1a20 100644 --- a/image/src/Decoder.h +++ b/image/src/Decoder.h @@ -44,7 +44,7 @@ #include "imgIDecoderObserver.h" namespace mozilla { -namespace imagelib { +namespace image { class Decoder { @@ -221,7 +221,7 @@ private: bool mIsAnimated; }; -} // namespace imagelib +} // namespace image } // namespace mozilla #endif // MOZILLA_IMAGELIB_DECODER_H_ diff --git a/image/src/DiscardTracker.cpp b/image/src/DiscardTracker.cpp index 8abf215435e..fcd85dc4bf3 100644 --- a/image/src/DiscardTracker.cpp +++ b/image/src/DiscardTracker.cpp @@ -42,7 +42,7 @@ #include "mozilla/Preferences.h" namespace mozilla { -namespace imagelib { +namespace image { static bool sInitialized = false; static bool sTimerOn = false; @@ -289,5 +289,5 @@ DiscardTracker::TimerCallback(nsITimer *aTimer, void *aClosure) TimerOff(); } -} // namespace imagelib +} // namespace image } // namespace mozilla diff --git a/image/src/DiscardTracker.h b/image/src/DiscardTracker.h index 9ea4a719134..c1f7b8be6f3 100644 --- a/image/src/DiscardTracker.h +++ b/image/src/DiscardTracker.h @@ -43,7 +43,7 @@ class nsITimer; namespace mozilla { -namespace imagelib { +namespace image { class RasterImage; // Struct to make a RasterImage insertable into the tracker list. This @@ -84,7 +84,7 @@ class DiscardTracker static void TimerCallback(nsITimer *aTimer, void *aClosure); }; -} // namespace imagelib +} // namespace image } // namespace mozilla #endif /* mozilla_imagelib_DiscardTracker_h_ */ diff --git a/image/src/ICOFileHeaders.h b/image/src/ICOFileHeaders.h index e40c9aa39a9..292e6592d3d 100644 --- a/image/src/ICOFileHeaders.h +++ b/image/src/ICOFileHeaders.h @@ -40,7 +40,7 @@ #define MOZILLA_IMAGELIB_ICOHEADERS_H_ namespace mozilla { - namespace imagelib { + namespace image { #define ICONFILEHEADERSIZE 6 #define ICODIRENTRYSIZE 16 @@ -73,7 +73,7 @@ namespace mozilla { }; - } // namespace imagelib + } // namespace image } // namespace mozilla #endif diff --git a/image/src/Image.cpp b/image/src/Image.cpp index db18fb7766b..9e71080a3d6 100644 --- a/image/src/Image.cpp +++ b/image/src/Image.cpp @@ -38,7 +38,7 @@ #include "Image.h" namespace mozilla { -namespace imagelib { +namespace image { // Constructor Image::Image(imgStatusTracker* aStatusTracker) : @@ -174,5 +174,5 @@ Image::EvaluateAnimation() } } -} // namespace imagelib +} // namespace image } // namespace mozilla diff --git a/image/src/Image.h b/image/src/Image.h index c95090019c2..fd6c551fece 100644 --- a/image/src/Image.h +++ b/image/src/Image.h @@ -43,7 +43,7 @@ #include "prtypes.h" namespace mozilla { -namespace imagelib { +namespace image { class Image : public imgIContainer { @@ -163,7 +163,7 @@ protected: } }; -} // namespace imagelib +} // namespace image } // namespace mozilla #endif // MOZILLA_IMAGELIB_IMAGE_H_ diff --git a/image/src/RasterImage.cpp b/image/src/RasterImage.cpp index 47bcb5f6eab..d88f4edd033 100644 --- a/image/src/RasterImage.cpp +++ b/image/src/RasterImage.cpp @@ -73,7 +73,7 @@ #include "mozilla/TimeStamp.h" using namespace mozilla; -using namespace mozilla::imagelib; +using namespace mozilla::image; using namespace mozilla::layers; // a mask for flags that will affect the decoding @@ -174,7 +174,7 @@ DiscardingEnabled() } namespace mozilla { -namespace imagelib { +namespace image { #ifndef DEBUG NS_IMPL_ISUPPORTS3(RasterImage, imgIContainer, nsIProperties, @@ -2954,5 +2954,5 @@ RasterImage::GetFramesNotified(PRUint32 *aFramesNotified) } #endif -} // namespace imagelib +} // namespace image } // namespace mozilla diff --git a/image/src/RasterImage.h b/image/src/RasterImage.h index 7e7c34e585c..96fc56b3618 100644 --- a/image/src/RasterImage.h +++ b/image/src/RasterImage.h @@ -162,7 +162,7 @@ namespace layers { class LayerManager; class ImageContainer; } -namespace imagelib { +namespace image { class imgDecodeWorker; class Decoder; @@ -637,7 +637,7 @@ class imgDecodeRequestor : public nsRunnable nsWeakPtr mContainer; }; -} // namespace imagelib +} // namespace image } // namespace mozilla #endif /* mozilla_imagelib_RasterImage_h_ */ diff --git a/image/src/SVGDocumentWrapper.cpp b/image/src/SVGDocumentWrapper.cpp index 6c82e251053..9940b87152b 100644 --- a/image/src/SVGDocumentWrapper.cpp +++ b/image/src/SVGDocumentWrapper.cpp @@ -66,7 +66,7 @@ using namespace mozilla::dom; namespace mozilla { -namespace imagelib { +namespace image { NS_IMPL_ISUPPORTS4(SVGDocumentWrapper, nsIStreamListener, @@ -464,5 +464,5 @@ SVGDocumentWrapper::GetRootSVGElem() return static_cast(rootElem); } -} // namespace imagelib +} // namespace image } // namespace mozilla diff --git a/image/src/SVGDocumentWrapper.h b/image/src/SVGDocumentWrapper.h index b15650dbd06..b2445f5295c 100644 --- a/image/src/SVGDocumentWrapper.h +++ b/image/src/SVGDocumentWrapper.h @@ -62,7 +62,7 @@ class nsSVGSVGElement; namespace mozilla { -namespace imagelib { +namespace image { class SVGDocumentWrapper MOZ_FINAL : public nsIStreamListener, public nsIObserver, @@ -187,7 +187,7 @@ private: bool mRegisteredForXPCOMShutdown; }; -} // namespace imagelib +} // namespace image } // namespace mozilla #endif // mozilla_imagelib_SVGDocumentWrapper_h_ diff --git a/image/src/VectorImage.cpp b/image/src/VectorImage.cpp index 611840f7dca..ec684cc572a 100644 --- a/image/src/VectorImage.cpp +++ b/image/src/VectorImage.cpp @@ -59,7 +59,7 @@ namespace mozilla { using namespace dom; -namespace imagelib { +namespace image { // Helper-class: SVGRootRenderingObserver class SVGRootRenderingObserver : public nsSVGRenderingObserver { @@ -747,5 +747,5 @@ VectorImage::InvalidateObserver() } } -} // namespace imagelib +} // namespace image } // namespace mozilla diff --git a/image/src/VectorImage.h b/image/src/VectorImage.h index 516156ea001..7bf0aa94677 100644 --- a/image/src/VectorImage.h +++ b/image/src/VectorImage.h @@ -51,7 +51,7 @@ namespace layers { class LayerManager; class ImageContainer; } -namespace imagelib { +namespace image { class SVGDocumentWrapper; class SVGRootRenderingObserver; @@ -132,7 +132,7 @@ private: // created via ExtractFrame? }; -} // namespace imagelib +} // namespace image } // namespace mozilla #endif // mozilla_imagelib_VectorImage_h_ diff --git a/image/src/imgLoader.cpp b/image/src/imgLoader.cpp index c4217e77413..cd80220fac5 100644 --- a/image/src/imgLoader.cpp +++ b/image/src/imgLoader.cpp @@ -96,7 +96,7 @@ #include "nsContentUtils.h" using namespace mozilla; -using namespace mozilla::imagelib; +using namespace mozilla::image; #if defined(DEBUG_pavlov) || defined(DEBUG_timeless) #include "nsISimpleEnumerator.h" diff --git a/image/src/imgRequest.cpp b/image/src/imgRequest.cpp index ac84fc90688..e75240d5722 100644 --- a/image/src/imgRequest.cpp +++ b/image/src/imgRequest.cpp @@ -87,7 +87,7 @@ #define SVG_MIMETYPE "image/svg+xml" using namespace mozilla; -using namespace mozilla::imagelib; +using namespace mozilla::image; static bool gInitializedPrefCaches = false; static bool gDecodeOnDraw = false; diff --git a/image/src/imgRequest.h b/image/src/imgRequest.h index 9e6e3959869..7b200dff1b9 100644 --- a/image/src/imgRequest.h +++ b/image/src/imgRequest.h @@ -71,9 +71,9 @@ class imgMemoryReporter; class imgRequestNotifyRunnable; namespace mozilla { -namespace imagelib { +namespace image { class Image; -} // namespace imagelib +} // namespace image } // namespace mozilla class imgRequest : public imgIDecoderObserver, @@ -227,7 +227,7 @@ private: nsCOMPtr mPrincipal; // Status-tracker -- transferred to mImage, when it gets instantiated nsAutoPtr mStatusTracker; - nsRefPtr mImage; + nsRefPtr mImage; nsCOMPtr mProperties; nsCOMPtr mSecurityInfo; nsCOMPtr mChannel; diff --git a/image/src/imgRequestProxy.cpp b/image/src/imgRequestProxy.cpp index c36e9c8f804..477ee29343a 100644 --- a/image/src/imgRequestProxy.cpp +++ b/image/src/imgRequestProxy.cpp @@ -55,7 +55,7 @@ #include "nspr.h" -using namespace mozilla::imagelib; +using namespace mozilla::image; NS_IMPL_ADDREF(imgRequestProxy) NS_IMPL_RELEASE(imgRequestProxy) diff --git a/image/src/imgRequestProxy.h b/image/src/imgRequestProxy.h index b90dea4e621..ef42a0631d6 100644 --- a/image/src/imgRequestProxy.h +++ b/image/src/imgRequestProxy.h @@ -67,9 +67,9 @@ class imgRequestNotifyRunnable; class imgStatusNotifyRunnable; namespace mozilla { -namespace imagelib { +namespace image { class Image; -} // namespace imagelib +} // namespace image } // namespace mozilla class imgRequestProxy : public imgIRequest, @@ -91,7 +91,7 @@ public: // Callers to Init or ChangeOwner are required to call NotifyListener after // (although not immediately after) doing so. nsresult Init(imgRequest *request, nsILoadGroup *aLoadGroup, - mozilla::imagelib::Image* aImage, + mozilla::image::Image* aImage, nsIURI* aURI, imgIDecoderObserver *aObserver); nsresult ChangeOwner(imgRequest *aNewOwner); // this will change mOwner. Do not call this if the previous @@ -130,7 +130,7 @@ public: // Setter for our |mImage| pointer, for imgRequest to use, once it // instantiates an Image. - void SetImage(mozilla::imagelib::Image* aImage); + void SetImage(mozilla::image::Image* aImage); // Removes all animation consumers that were created with // IncrementAnimationConsumers. This is necessary since we need @@ -228,7 +228,7 @@ private: // The image we represent. Is null until data has been received, and is then // set by imgRequest. - nsRefPtr mImage; + nsRefPtr mImage; // Our principal. Is null until data has been received from the channel, and // is then set by imgRequest. diff --git a/image/src/imgStatusTracker.cpp b/image/src/imgStatusTracker.cpp index b9149e58eb4..69e076c49e6 100644 --- a/image/src/imgStatusTracker.cpp +++ b/image/src/imgStatusTracker.cpp @@ -46,7 +46,7 @@ #include "ImageLogging.h" #include "RasterImage.h" -using namespace mozilla::imagelib; +using namespace mozilla::image; static nsresult GetResultFromImageStatus(PRUint32 aStatus) diff --git a/image/src/imgStatusTracker.h b/image/src/imgStatusTracker.h index 7224eaba303..dfe7bae727a 100644 --- a/image/src/imgStatusTracker.h +++ b/image/src/imgStatusTracker.h @@ -47,9 +47,9 @@ class imgStatusNotifyRunnable; class imgRequestNotifyRunnable; struct nsIntRect; namespace mozilla { -namespace imagelib { +namespace image { class Image; -} // namespace imagelib +} // namespace image } // namespace mozilla @@ -84,14 +84,14 @@ public: // aImage is the image that this status tracker will pass to the // imgRequestProxys in SyncNotify() and EmulateRequestFinished(), and must be // alive as long as this instance is, because we hold a weak reference to it. - imgStatusTracker(mozilla::imagelib::Image* aImage); + imgStatusTracker(mozilla::image::Image* aImage); imgStatusTracker(const imgStatusTracker& aOther); // Image-setter, for imgStatusTrackers created by imgRequest::Init, which // are created before their Image is created. This method should only // be called once, and only on an imgStatusTracker that was initialized // without an image. - void SetImage(mozilla::imagelib::Image* aImage); + void SetImage(mozilla::image::Image* aImage); // Schedule an asynchronous "replaying" of all the notifications that would // have to happen to put us in the current state. @@ -182,7 +182,7 @@ private: // A weak pointer to the Image, because it owns us, and we // can't create a cycle. - mozilla::imagelib::Image* mImage; + mozilla::image::Image* mImage; PRUint32 mState; nsresult mImageStatus; bool mHadLastPart; diff --git a/image/src/imgTools.cpp b/image/src/imgTools.cpp index 47a89ddf153..e4057eccfe4 100644 --- a/image/src/imgTools.cpp +++ b/image/src/imgTools.cpp @@ -53,7 +53,7 @@ #include "nsNetUtil.h" #include "RasterImage.h" -using namespace mozilla::imagelib; +using namespace mozilla::image; /* ========== imgITools implementation ========== */