Bug 1038536 - Flatten image/src/ directory. r=seth

dom/base/moz.build

@@ -423,7 +423,7 @@ LOCAL_INCLUDES += [
     '/dom/xslt/xpath',
     '/dom/xul',
     '/gfx/2d',
-    '/image/src',
+    '/image',
     '/js/xpconnect/src',
     '/js/xpconnect/wrappers',
     '/layout/base',

dom/canvas/moz.build

@@ -142,7 +142,7 @@ LOCAL_INCLUDES += [
     '/dom/svg',
     '/dom/xul',
     '/gfx/gl',
-    '/image/src',
+    '/image',
     '/js/xpconnect/src',
     '/layout/generic',
     '/layout/style',

image/src/BMPFileHeaders.h → image/BMPFileHeaders.h

@@ -2,8 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef mozilla_image_src_BMPFileHeaders_h
-#define mozilla_image_src_BMPFileHeaders_h
+#ifndef mozilla_image_BMPFileHeaders_h
+#define mozilla_image_BMPFileHeaders_h
 
 namespace mozilla {
 namespace image {
@@ -141,4 +141,4 @@ enum ERLEState {
                               ///< be read as padding
 };
 
-#endif // mozilla_image_src_BMPFileHeaders_h
+#endif // mozilla_image_BMPFileHeaders_h

image/src/ClippedImage.h → image/ClippedImage.h

@@ -3,8 +3,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef mozilla_image_src_ClippedImage_h
-#define mozilla_image_src_ClippedImage_h
+#ifndef mozilla_image_ClippedImage_h
+#define mozilla_image_ClippedImage_h
 
 #include "ImageWrapper.h"
 #include "mozilla/gfx/2D.h"
@@ -91,4 +91,4 @@ class ClippedImage : public ImageWrapper
 } // namespace image
 } // namespace mozilla
 
-#endif // mozilla_image_src_ClippedImage_h
+#endif // mozilla_image_ClippedImage_h

image/src/DecodePool.h → image/DecodePool.h

@@ -7,8 +7,8 @@
  * DecodePool manages the threads used for decoding raster images.
  */
 
-#ifndef mozilla_image_src_DecodePool_h
-#define mozilla_image_src_DecodePool_h
+#ifndef mozilla_image_DecodePool_h
+#define mozilla_image_DecodePool_h
 
 #include "mozilla/Mutex.h"
 #include "mozilla/StaticPtr.h"
@@ -98,4 +98,4 @@ class DecodePool : public nsIObserver
 } // namespace image
 } // namespace mozilla
 
-#endif // mozilla_image_src_DecodePool_h
+#endif // mozilla_image_DecodePool_h

image/src/Decoder.h → image/Decoder.h

@@ -3,8 +3,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef mozilla_image_src_Decoder_h
-#define mozilla_image_src_Decoder_h
+#ifndef mozilla_image_Decoder_h
+#define mozilla_image_Decoder_h
 
 #include "FrameAnimator.h"
 #include "RasterImage.h"
@@ -502,4 +502,4 @@ class Decoder : public IResumable
 } // namespace image
 } // namespace mozilla
 
-#endif // mozilla_image_src_Decoder_h
+#endif // mozilla_image_Decoder_h

image/src/Downscaler.h → image/Downscaler.h

@@ -9,8 +9,8 @@
  * scaling implementation.
  */
 
-#ifndef mozilla_image_src_Downscaler_h
-#define mozilla_image_src_Downscaler_h
+#ifndef mozilla_image_Downscaler_h
+#define mozilla_image_Downscaler_h
 
 #include "mozilla/UniquePtr.h"
 #include "nsRect.h"
@@ -156,4 +156,4 @@ class Downscaler
 } // namespace image
 } // namespace mozilla
 
-#endif // mozilla_image_src_Downscaler_h
+#endif // mozilla_image_Downscaler_h

image/src/DynamicImage.h → image/DynamicImage.h

@@ -3,8 +3,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef mozilla_image_src_DynamicImage_h
-#define mozilla_image_src_DynamicImage_h
+#ifndef mozilla_image_DynamicImage_h
+#define mozilla_image_DynamicImage_h
 
 #include "mozilla/MemoryReporting.h"
 #include "gfxDrawable.h"
@@ -72,4 +72,4 @@ class DynamicImage : public Image
 } // namespace image
 } // namespace mozilla
 
-#endif // mozilla_image_src_DynamicImage_h
+#endif // mozilla_image_DynamicImage_h

image/src/FrameAnimator.h → image/FrameAnimator.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef mozilla_image_src_FrameAnimator_h
-#define mozilla_image_src_FrameAnimator_h
+#ifndef mozilla_image_FrameAnimator_h
+#define mozilla_image_FrameAnimator_h
 
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/TimeStamp.h"
@@ -287,4 +287,4 @@ class FrameAnimator
 } // namespace image
 } // namespace mozilla
 
-#endif // mozilla_image_src_FrameAnimator_h
+#endif // mozilla_image_FrameAnimator_h

image/src/FrozenImage.h → image/FrozenImage.h

@@ -3,8 +3,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef mozilla_image_src_FrozenImage_h
-#define mozilla_image_src_FrozenImage_h
+#ifndef mozilla_image_FrozenImage_h
+#define mozilla_image_FrozenImage_h
 
 #include "ImageWrapper.h"
 #include "mozilla/gfx/2D.h"
@@ -66,4 +66,4 @@ class FrozenImage : public ImageWrapper
 } // namespace image
 } // namespace mozilla
 
-#endif // mozilla_image_src_FrozenImage_h
+#endif // mozilla_image_FrozenImage_h

image/src/ICOFileHeaders.h → image/ICOFileHeaders.h

@@ -3,8 +3,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 
-#ifndef mozilla_image_src_ICOFileHeaders_h
-#define mozilla_image_src_ICOFileHeaders_h
+#ifndef mozilla_image_ICOFileHeaders_h
+#define mozilla_image_ICOFileHeaders_h
 
 namespace mozilla {
 namespace image {
@@ -78,4 +78,4 @@ struct IconDirEntry
 } // namespace image
 } // namespace mozilla
 
-#endif // mozilla_image_src_ICOFileHeaders_h
+#endif // mozilla_image_ICOFileHeaders_h

image/src/IProgressObserver.h → image/IProgressObserver.h

@@ -3,8 +3,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef mozilla_image_src_IProgressObserver_h
-#define mozilla_image_src_IProgressObserver_h
+#ifndef mozilla_image_IProgressObserver_h
+#define mozilla_image_IProgressObserver_h
 
 #include "mozilla/WeakPtr.h"
 #include "nsISupports.h"
@@ -56,4 +56,4 @@ class IProgressObserver : public SupportsWeakPtr<IProgressObserver>
 } // namespace image
 } // namespace mozilla
 
-#endif // mozilla_image_src_IProgressObserver_h
+#endif // mozilla_image_IProgressObserver_h

image/src/Image.h → image/Image.h

@@ -3,8 +3,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef mozilla_image_src_Image_h
-#define mozilla_image_src_Image_h
+#ifndef mozilla_image_Image_h
+#define mozilla_image_Image_h
 
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/TimeStamp.h"
@@ -339,4 +339,4 @@ class ImageResource : public Image
 } // namespace image
 } // namespace mozilla
 
-#endif // mozilla_image_src_Image_h
+#endif // mozilla_image_Image_h

image/src/ImageFactory.h → image/ImageFactory.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef mozilla_image_src_ImageFactory_h
-#define mozilla_image_src_ImageFactory_h
+#ifndef mozilla_image_ImageFactory_h
+#define mozilla_image_ImageFactory_h
 
 #include "nsCOMPtr.h"
 #include "nsProxyRelease.h"
@@ -92,4 +92,4 @@ class ImageFactory
 } // namespace image
 } // namespace mozilla
 
-#endif // mozilla_image_src_ImageFactory_h
+#endif // mozilla_image_ImageFactory_h

image/src/ImageMetadata.h → image/ImageMetadata.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef mozilla_image_src_ImageMetadata_h
-#define mozilla_image_src_ImageMetadata_h
+#ifndef mozilla_image_ImageMetadata_h
+#define mozilla_image_ImageMetadata_h
 
 #include <stdint.h>
 #include "mozilla/Maybe.h"
@@ -71,4 +71,4 @@ class ImageMetadata
 } // namespace image
 } // namespace mozilla
 
-#endif // mozilla_image_src_ImageMetadata_h
+#endif // mozilla_image_ImageMetadata_h

image/src/ImageOps.h → image/ImageOps.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef mozilla_image_src_ImageOps_h
-#define mozilla_image_src_ImageOps_h
+#ifndef mozilla_image_ImageOps_h
+#define mozilla_image_ImageOps_h
 
 #include "nsCOMPtr.h"
 #include "nsRect.h"
@@ -69,4 +69,4 @@ class ImageOps
 } // namespace image
 } // namespace mozilla
 
-#endif // mozilla_image_src_ImageOps_h
+#endif // mozilla_image_ImageOps_h

image/src/ImageRegion.h → image/ImageRegion.h

@@ -3,8 +3,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef mozilla_image_src_ImageRegion_h
-#define mozilla_image_src_ImageRegion_h
+#ifndef mozilla_image_ImageRegion_h
+#define mozilla_image_ImageRegion_h
 
 #include "gfxRect.h"
 
@@ -155,4 +155,4 @@ class ImageRegion
 }  // namespace image
 }  // namespace mozilla
 
-#endif // mozilla_image_src_ImageRegion_h
+#endif // mozilla_image_ImageRegion_h

image/src/ImageURL.h → image/ImageURL.h

@@ -3,8 +3,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef mozilla_image_src_ImageURL_h
-#define mozilla_image_src_ImageURL_h
+#ifndef mozilla_image_ImageURL_h
+#define mozilla_image_ImageURL_h
 
 #include "nsIURI.h"
 #include "MainThreadUtils.h"
@@ -90,4 +90,4 @@ class ImageURL
 } // namespace image
 } // namespace mozilla
 
-#endif // mozilla_image_src_ImageURL_h
+#endif // mozilla_image_ImageURL_h

image/src/ImageWrapper.h → image/ImageWrapper.h

@@ -3,8 +3,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef mozilla_image_src_ImageWrapper_h
-#define mozilla_image_src_ImageWrapper_h
+#ifndef mozilla_image_ImageWrapper_h
+#define mozilla_image_ImageWrapper_h
 
 #include "mozilla/MemoryReporting.h"
 #include "Image.h"
@@ -82,4 +82,4 @@ class ImageWrapper : public Image
 } // namespace image
 } // namespace mozilla
 
-#endif // mozilla_image_src_ImageWrapper_h
+#endif // mozilla_image_ImageWrapper_h

image/src/MultipartImage.h → image/MultipartImage.h

@@ -3,8 +3,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef mozilla_image_src_MultipartImage_h
-#define mozilla_image_src_MultipartImage_h
+#ifndef mozilla_image_MultipartImage_h
+#define mozilla_image_MultipartImage_h
 
 #include "ImageWrapper.h"
 #include "IProgressObserver.h"
@@ -88,4 +88,4 @@ class MultipartImage
 } // namespace image
 } // namespace mozilla
 
-#endif // mozilla_image_src_MultipartImage_h
+#endif // mozilla_image_MultipartImage_h

image/src/Orientation.h → image/Orientation.h

@@ -3,8 +3,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef mozilla_image_src_Orientation_h
-#define mozilla_image_src_Orientation_h
+#ifndef mozilla_image_Orientation_h
+#define mozilla_image_Orientation_h
 
 #include <stdint.h>
 
@@ -59,4 +59,4 @@ struct Orientation
 } // namespace image
 } // namespace mozilla
 
-#endif // mozilla_image_src_Orientation_h
+#endif // mozilla_image_Orientation_h

image/src/OrientedImage.h → image/OrientedImage.h

@@ -3,8 +3,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef mozilla_image_src_OrientedImage_h
-#define mozilla_image_src_OrientedImage_h
+#ifndef mozilla_image_OrientedImage_h
+#define mozilla_image_OrientedImage_h
 
 #include "ImageWrapper.h"
 #include "mozilla/gfx/2D.h"
@@ -72,4 +72,4 @@ class OrientedImage : public ImageWrapper
 } // namespace image
 } // namespace mozilla
 
-#endif // mozilla_image_src_OrientedImage_h
+#endif // mozilla_image_OrientedImage_h

image/src/ProgressTracker.h → image/ProgressTracker.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef mozilla_image_src_ProgressTracker_h
-#define mozilla_image_src_ProgressTracker_h
+#ifndef mozilla_image_ProgressTracker_h
+#define mozilla_image_ProgressTracker_h
 
 #include "mozilla/Mutex.h"
 #include "mozilla/RefPtr.h"
@@ -208,4 +208,4 @@ class ProgressTracker : public mozilla::SupportsWeakPtr<ProgressTracker>
 } // namespace image
 } // namespace mozilla
 
-#endif // mozilla_image_src_ProgressTracker_h
+#endif // mozilla_image_ProgressTracker_h

image/src/RasterImage.h → image/RasterImage.h

@@ -14,8 +14,8 @@
  * @author  Andrew Smith <[email protected]>
  */
 
-#ifndef mozilla_image_src_RasterImage_h
-#define mozilla_image_src_RasterImage_h
+#ifndef mozilla_image_RasterImage_h
+#define mozilla_image_RasterImage_h
 
 #include "Image.h"
 #include "nsCOMPtr.h"
@@ -486,4 +486,4 @@ RasterImage::GetAnimationMode(uint16_t* aAnimationMode) {
 } // namespace image
 } // namespace mozilla
 
-#endif /* mozilla_image_src_RasterImage_h */
+#endif /* mozilla_image_RasterImage_h */