зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1038536 - Flatten image/src/ directory. r=seth
--HG-- rename : image/src/BMPFileHeaders.h => image/BMPFileHeaders.h rename : image/src/ClippedImage.cpp => image/ClippedImage.cpp rename : image/src/ClippedImage.h => image/ClippedImage.h rename : image/src/DecodePool.cpp => image/DecodePool.cpp rename : image/src/DecodePool.h => image/DecodePool.h rename : image/src/Decoder.cpp => image/Decoder.cpp rename : image/src/Decoder.h => image/Decoder.h rename : image/src/Downscaler.cpp => image/Downscaler.cpp rename : image/src/Downscaler.h => image/Downscaler.h rename : image/src/DynamicImage.cpp => image/DynamicImage.cpp rename : image/src/DynamicImage.h => image/DynamicImage.h rename : image/src/FrameAnimator.cpp => image/FrameAnimator.cpp rename : image/src/FrameAnimator.h => image/FrameAnimator.h rename : image/src/FrozenImage.cpp => image/FrozenImage.cpp rename : image/src/FrozenImage.h => image/FrozenImage.h rename : image/src/ICOFileHeaders.h => image/ICOFileHeaders.h rename : image/src/IProgressObserver.h => image/IProgressObserver.h rename : image/src/Image.cpp => image/Image.cpp rename : image/src/Image.h => image/Image.h rename : image/src/ImageFactory.cpp => image/ImageFactory.cpp rename : image/src/ImageFactory.h => image/ImageFactory.h rename : image/src/ImageMetadata.cpp => image/ImageMetadata.cpp rename : image/src/ImageMetadata.h => image/ImageMetadata.h rename : image/src/ImageOps.cpp => image/ImageOps.cpp rename : image/src/ImageOps.h => image/ImageOps.h rename : image/src/ImageRegion.h => image/ImageRegion.h rename : image/src/ImageURL.h => image/ImageURL.h rename : image/src/ImageWrapper.cpp => image/ImageWrapper.cpp rename : image/src/ImageWrapper.h => image/ImageWrapper.h rename : image/src/MultipartImage.cpp => image/MultipartImage.cpp rename : image/src/MultipartImage.h => image/MultipartImage.h rename : image/src/Orientation.h => image/Orientation.h rename : image/src/OrientedImage.cpp => image/OrientedImage.cpp rename : image/src/OrientedImage.h => image/OrientedImage.h rename : image/src/ProgressTracker.cpp => image/ProgressTracker.cpp rename : image/src/ProgressTracker.h => image/ProgressTracker.h rename : image/src/RasterImage.cpp => image/RasterImage.cpp rename : image/src/RasterImage.h => image/RasterImage.h rename : image/src/SVGDocumentWrapper.cpp => image/SVGDocumentWrapper.cpp rename : image/src/SVGDocumentWrapper.h => image/SVGDocumentWrapper.h rename : image/src/ScriptedNotificationObserver.cpp => image/ScriptedNotificationObserver.cpp rename : image/src/ScriptedNotificationObserver.h => image/ScriptedNotificationObserver.h rename : image/src/ShutdownTracker.cpp => image/ShutdownTracker.cpp rename : image/src/ShutdownTracker.h => image/ShutdownTracker.h rename : image/src/SourceBuffer.cpp => image/SourceBuffer.cpp rename : image/src/SourceBuffer.h => image/SourceBuffer.h rename : image/src/SurfaceCache.cpp => image/SurfaceCache.cpp rename : image/src/SurfaceCache.h => image/SurfaceCache.h rename : image/src/VectorImage.cpp => image/VectorImage.cpp rename : image/src/VectorImage.h => image/VectorImage.h rename : image/src/imgFrame.cpp => image/imgFrame.cpp rename : image/src/imgFrame.h => image/imgFrame.h rename : image/src/imgLoader.cpp => image/imgLoader.cpp rename : image/src/imgLoader.h => image/imgLoader.h rename : image/src/imgRequest.cpp => image/imgRequest.cpp rename : image/src/imgRequest.h => image/imgRequest.h rename : image/src/imgRequestProxy.cpp => image/imgRequestProxy.cpp rename : image/src/imgRequestProxy.h => image/imgRequestProxy.h rename : image/src/imgTools.cpp => image/imgTools.cpp rename : image/src/imgTools.h => image/imgTools.h
This commit is contained in:
Родитель
b1a71b0116
Коммит
700935223f
|
@ -423,7 +423,7 @@ LOCAL_INCLUDES += [
|
|||
'/dom/xslt/xpath',
|
||||
'/dom/xul',
|
||||
'/gfx/2d',
|
||||
'/image/src',
|
||||
'/image',
|
||||
'/js/xpconnect/src',
|
||||
'/js/xpconnect/wrappers',
|
||||
'/layout/base',
|
||||
|
|
|
@ -142,7 +142,7 @@ LOCAL_INCLUDES += [
|
|||
'/dom/svg',
|
||||
'/dom/xul',
|
||||
'/gfx/gl',
|
||||
'/image/src',
|
||||
'/image',
|
||||
'/js/xpconnect/src',
|
||||
'/layout/generic',
|
||||
'/layout/style',
|
||||
|
|
|
@ -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
|
|
@ -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 @@ private:
|
|||
} // namespace image
|
||||
} // namespace mozilla
|
||||
|
||||
#endif // mozilla_image_src_ClippedImage_h
|
||||
#endif // mozilla_image_ClippedImage_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"
|
||||
|
@ -111,4 +111,4 @@ private:
|
|||
} // namespace image
|
||||
} // namespace mozilla
|
||||
|
||||
#endif // mozilla_image_src_DecodePool_h
|
||||
#endif // mozilla_image_DecodePool_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 @@ private:
|
|||
} // namespace image
|
||||
} // namespace mozilla
|
||||
|
||||
#endif // mozilla_image_src_Decoder_h
|
||||
#endif // mozilla_image_Decoder_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 @@ public:
|
|||
} // namespace image
|
||||
} // namespace mozilla
|
||||
|
||||
#endif // mozilla_image_src_Downscaler_h
|
||||
#endif // mozilla_image_Downscaler_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 @@ private:
|
|||
} // namespace image
|
||||
} // namespace mozilla
|
||||
|
||||
#endif // mozilla_image_src_DynamicImage_h
|
||||
#endif // mozilla_image_DynamicImage_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 @@ private: // data
|
|||
} // namespace image
|
||||
} // namespace mozilla
|
||||
|
||||
#endif // mozilla_image_src_FrameAnimator_h
|
||||
#endif // mozilla_image_FrameAnimator_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 @@ private:
|
|||
} // namespace image
|
||||
} // namespace mozilla
|
||||
|
||||
#endif // mozilla_image_src_FrozenImage_h
|
||||
#endif // mozilla_image_FrozenImage_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
|
|
@ -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 @@ protected:
|
|||
} // namespace image
|
||||
} // namespace mozilla
|
||||
|
||||
#endif // mozilla_image_src_IProgressObserver_h
|
||||
#endif // mozilla_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_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 @@ protected:
|
|||
} // namespace image
|
||||
} // namespace mozilla
|
||||
|
||||
#endif // mozilla_image_src_Image_h
|
||||
#endif // mozilla_image_Image_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 @@ private:
|
|||
} // namespace image
|
||||
} // namespace mozilla
|
||||
|
||||
#endif // mozilla_image_src_ImageFactory_h
|
||||
#endif // mozilla_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_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 @@ private:
|
|||
} // namespace image
|
||||
} // namespace mozilla
|
||||
|
||||
#endif // mozilla_image_src_ImageMetadata_h
|
||||
#endif // mozilla_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_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 @@ private:
|
|||
} // namespace image
|
||||
} // namespace mozilla
|
||||
|
||||
#endif // mozilla_image_src_ImageOps_h
|
||||
#endif // mozilla_image_ImageOps_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 @@ private:
|
|||
} // namespace image
|
||||
} // namespace mozilla
|
||||
|
||||
#endif // mozilla_image_src_ImageRegion_h
|
||||
#endif // mozilla_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_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 @@ private:
|
|||
} // namespace image
|
||||
} // namespace mozilla
|
||||
|
||||
#endif // mozilla_image_src_ImageURL_h
|
||||
#endif // mozilla_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_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 @@ private:
|
|||
} // namespace image
|
||||
} // namespace mozilla
|
||||
|
||||
#endif // mozilla_image_src_ImageWrapper_h
|
||||
#endif // mozilla_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_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 @@ private:
|
|||
} // namespace image
|
||||
} // namespace mozilla
|
||||
|
||||
#endif // mozilla_image_src_MultipartImage_h
|
||||
#endif // mozilla_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_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
|
|
@ -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 @@ private:
|
|||
} // namespace image
|
||||
} // namespace mozilla
|
||||
|
||||
#endif // mozilla_image_src_OrientedImage_h
|
||||
#endif // mozilla_image_OrientedImage_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 @@ private:
|
|||
} // namespace image
|
||||
} // namespace mozilla
|
||||
|
||||
#endif // mozilla_image_src_ProgressTracker_h
|
||||
#endif // mozilla_image_ProgressTracker_h
|
|
@ -14,8 +14,8 @@
|
|||
* @author Andrew Smith <asmith15@learn.senecac.on.ca>
|
||||
*/
|
||||
|
||||
#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 */
|
|
@ -5,8 +5,8 @@
|
|||
|
||||
/* This class wraps an SVG document, for use by VectorImage objects. */
|
||||
|
||||
#ifndef mozilla_image_src_SVGDocumentWrapper_h
|
||||
#define mozilla_image_src_SVGDocumentWrapper_h
|
||||
#ifndef mozilla_image_SVGDocumentWrapper_h
|
||||
#define mozilla_image_SVGDocumentWrapper_h
|
||||
|
||||
#include "mozilla/Attributes.h"
|
||||
|
||||
|
@ -148,4 +148,4 @@ private:
|
|||
} // namespace image
|
||||
} // namespace mozilla
|
||||
|
||||
#endif // mozilla_image_src_SVGDocumentWrapper_h
|
||||
#endif // mozilla_image_SVGDocumentWrapper_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_ScriptedNotificationObserver_h
|
||||
#define mozilla_image_src_ScriptedNotificationObserver_h
|
||||
#ifndef mozilla_image_ScriptedNotificationObserver_h
|
||||
#define mozilla_image_ScriptedNotificationObserver_h
|
||||
|
||||
#include "imgINotificationObserver.h"
|
||||
#include "nsCOMPtr.h"
|
||||
|
@ -34,4 +34,4 @@ private:
|
|||
} // namespace image
|
||||
} // namespace mozilla
|
||||
|
||||
#endif // mozilla_image_src_ScriptedNotificationObserver_h
|
||||
#endif // mozilla_image_ScriptedNotificationObserver_h
|
|
@ -8,8 +8,8 @@
|
|||
* whether shutdown has started.
|
||||
*/
|
||||
|
||||
#ifndef mozilla_image_src_ShutdownTracker_h
|
||||
#define mozilla_image_src_ShutdownTracker_h
|
||||
#ifndef mozilla_image_ShutdownTracker_h
|
||||
#define mozilla_image_ShutdownTracker_h
|
||||
|
||||
namespace mozilla {
|
||||
namespace image {
|
||||
|
@ -43,4 +43,4 @@ private:
|
|||
} // namespace image
|
||||
} // namespace mozilla
|
||||
|
||||
#endif // mozilla_image_src_ShutdownTracker_h
|
||||
#endif // mozilla_image_ShutdownTracker_h
|
|
@ -8,8 +8,8 @@
|
|||
* storing image source (compressed) data.
|
||||
*/
|
||||
|
||||
#ifndef mozilla_image_src_sourcebuffer_h
|
||||
#define mozilla_image_src_sourcebuffer_h
|
||||
#ifndef mozilla_image_sourcebuffer_h
|
||||
#define mozilla_image_sourcebuffer_h
|
||||
|
||||
#include "mozilla/Maybe.h"
|
||||
#include "mozilla/MemoryReporting.h"
|
||||
|
@ -379,4 +379,4 @@ private:
|
|||
} // namespace image
|
||||
} // namespace mozilla
|
||||
|
||||
#endif // mozilla_image_src_sourcebuffer_h
|
||||
#endif // mozilla_image_sourcebuffer_h
|
|
@ -8,8 +8,8 @@
|
|||
* data in imagelib.
|
||||
*/
|
||||
|
||||
#ifndef mozilla_image_src_SurfaceCache_h
|
||||
#define mozilla_image_src_SurfaceCache_h
|
||||
#ifndef mozilla_image_SurfaceCache_h
|
||||
#define mozilla_image_SurfaceCache_h
|
||||
|
||||
#include "mozilla/Maybe.h" // for Maybe
|
||||
#include "mozilla/MemoryReporting.h" // for MallocSizeOf
|
||||
|
@ -417,4 +417,4 @@ private:
|
|||
} // namespace image
|
||||
} // namespace mozilla
|
||||
|
||||
#endif // mozilla_image_src_SurfaceCache_h
|
||||
#endif // mozilla_image_SurfaceCache_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_VectorImage_h
|
||||
#define mozilla_image_src_VectorImage_h
|
||||
#ifndef mozilla_image_VectorImage_h
|
||||
#define mozilla_image_VectorImage_h
|
||||
|
||||
#include "Image.h"
|
||||
#include "nsIStreamListener.h"
|
||||
|
@ -124,4 +124,4 @@ inline NS_IMETHODIMP VectorImage::SetAnimationMode(uint16_t aAnimationMode) {
|
|||
} // namespace image
|
||||
} // namespace mozilla
|
||||
|
||||
#endif // mozilla_image_src_VectorImage_h
|
||||
#endif // mozilla_image_VectorImage_h
|
|
@ -16,10 +16,10 @@ FAIL_ON_WARNINGS = True
|
|||
|
||||
FINAL_LIBRARY = 'xul'
|
||||
LOCAL_INCLUDES += [
|
||||
'../encoders/bmp',
|
||||
'../encoders/ico',
|
||||
'../encoders/jpeg',
|
||||
'../encoders/png',
|
||||
'../src',
|
||||
'/image',
|
||||
'/image/encoders/bmp',
|
||||
'/image/encoders/ico',
|
||||
'/image/encoders/jpeg',
|
||||
'/image/encoders/png',
|
||||
]
|
||||
|
||||
|
|
|
@ -36,7 +36,7 @@ FAIL_ON_WARNINGS = True
|
|||
|
||||
# Decoders need RasterImage.h
|
||||
LOCAL_INCLUDES += [
|
||||
'/image/src',
|
||||
'/image',
|
||||
]
|
||||
|
||||
FINAL_LIBRARY = 'xul'
|
||||
|
|
|
@ -11,7 +11,7 @@ SOURCES += [
|
|||
FAIL_ON_WARNINGS = True
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'/image/src',
|
||||
'/image',
|
||||
]
|
||||
|
||||
FINAL_LIBRARY = 'xul'
|
||||
|
|
|
@ -12,9 +12,9 @@ FAIL_ON_WARNINGS = True
|
|||
|
||||
# Decoders need RasterImage.h
|
||||
LOCAL_INCLUDES += [
|
||||
'../bmp',
|
||||
'../png',
|
||||
'/image/src',
|
||||
'/image',
|
||||
'/image/encoders/bmp',
|
||||
'/image/encoders/png',
|
||||
]
|
||||
|
||||
FINAL_LIBRARY = 'xul'
|
||||
|
|
|
@ -11,7 +11,7 @@ SOURCES += [
|
|||
FAIL_ON_WARNINGS = True
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'/image/src',
|
||||
'/image',
|
||||
]
|
||||
|
||||
FINAL_LIBRARY = 'xul'
|
||||
|
|
|
@ -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_imgFrame_h
|
||||
#define mozilla_image_src_imgFrame_h
|
||||
#ifndef mozilla_image_imgFrame_h
|
||||
#define mozilla_image_imgFrame_h
|
||||
|
||||
#include "mozilla/MemoryReporting.h"
|
||||
#include "mozilla/Monitor.h"
|
||||
|
@ -532,4 +532,4 @@ private:
|
|||
} // namespace image
|
||||
} // namespace mozilla
|
||||
|
||||
#endif // mozilla_image_src_imgFrame_h
|
||||
#endif // mozilla_image_imgFrame_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_imgLoader_h
|
||||
#define mozilla_image_src_imgLoader_h
|
||||
#ifndef mozilla_image_imgLoader_h
|
||||
#define mozilla_image_imgLoader_h
|
||||
|
||||
#include "mozilla/Attributes.h"
|
||||
#include "mozilla/Mutex.h"
|
||||
|
@ -571,4 +571,4 @@ private:
|
|||
bool mHadInsecureRedirect;
|
||||
};
|
||||
|
||||
#endif // mozilla_image_src_imgLoader_h
|
||||
#endif // mozilla_image_imgLoader_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_imgRequest_h
|
||||
#define mozilla_image_src_imgRequest_h
|
||||
#ifndef mozilla_image_imgRequest_h
|
||||
#define mozilla_image_imgRequest_h
|
||||
|
||||
#include "nsIChannelEventSink.h"
|
||||
#include "nsIInterfaceRequestor.h"
|
||||
|
@ -279,4 +279,4 @@ private:
|
|||
bool mHadInsecureRedirect : 1;
|
||||
};
|
||||
|
||||
#endif // mozilla_image_src_imgRequest_h
|
||||
#endif // mozilla_image_imgRequest_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_imgRequestProxy_h
|
||||
#define mozilla_image_src_imgRequestProxy_h
|
||||
#ifndef mozilla_image_imgRequestProxy_h
|
||||
#define mozilla_image_imgRequestProxy_h
|
||||
|
||||
#include "imgIRequest.h"
|
||||
#include "nsISecurityInfoProvider.h"
|
||||
|
@ -243,4 +243,4 @@ protected:
|
|||
nsCOMPtr<nsIPrincipal> mPrincipal;
|
||||
};
|
||||
|
||||
#endif // mozilla_image_src_imgRequestProxy_h
|
||||
#endif // mozilla_image_imgRequestProxy_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_imgITools_h
|
||||
#define mozilla_image_src_imgITools_h
|
||||
#ifndef mozilla_image_imgITools_h
|
||||
#define mozilla_image_imgITools_h
|
||||
|
||||
#include "imgITools.h"
|
||||
|
||||
|
@ -28,4 +28,4 @@ public:
|
|||
private:
|
||||
virtual ~imgTools();
|
||||
};
|
||||
#endif // mozilla_image_src_imgITools_h
|
||||
#endif // mozilla_image_imgITools_h
|
|
@ -4,7 +4,7 @@
|
|||
# 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/.
|
||||
|
||||
DIRS += ['build', 'src', 'decoders', 'encoders']
|
||||
DIRS += ['build', 'decoders', 'encoders']
|
||||
|
||||
with Files('**'):
|
||||
BUG_COMPONENT = ('Core', 'ImageLib')
|
||||
|
@ -35,4 +35,70 @@ XPIDL_MODULE = 'imglib2'
|
|||
|
||||
EXPORTS += [
|
||||
'ImageLogging.h',
|
||||
'ImageOps.h',
|
||||
'ImageRegion.h',
|
||||
'imgLoader.h',
|
||||
'imgRequest.h',
|
||||
'imgRequestProxy.h',
|
||||
'IProgressObserver.h',
|
||||
'Orientation.h',
|
||||
'SurfaceCache.h',
|
||||
]
|
||||
|
||||
UNIFIED_SOURCES += [
|
||||
'ClippedImage.cpp',
|
||||
'DecodePool.cpp',
|
||||
'Decoder.cpp',
|
||||
'DynamicImage.cpp',
|
||||
'FrameAnimator.cpp',
|
||||
'FrozenImage.cpp',
|
||||
'Image.cpp',
|
||||
'ImageFactory.cpp',
|
||||
'ImageMetadata.cpp',
|
||||
'ImageOps.cpp',
|
||||
'ImageWrapper.cpp',
|
||||
'imgFrame.cpp',
|
||||
'imgTools.cpp',
|
||||
'MultipartImage.cpp',
|
||||
'OrientedImage.cpp',
|
||||
'ScriptedNotificationObserver.cpp',
|
||||
'ShutdownTracker.cpp',
|
||||
'SourceBuffer.cpp',
|
||||
'SurfaceCache.cpp',
|
||||
'SVGDocumentWrapper.cpp',
|
||||
'VectorImage.cpp',
|
||||
]
|
||||
if CONFIG['MOZ_ENABLE_SKIA']:
|
||||
UNIFIED_SOURCES += [ 'Downscaler.cpp']
|
||||
|
||||
# These files can't be unified because of ImageLogging.h #include order issues.
|
||||
SOURCES += [
|
||||
'imgLoader.cpp',
|
||||
'imgRequest.cpp',
|
||||
'imgRequestProxy.cpp',
|
||||
'ProgressTracker.cpp',
|
||||
'RasterImage.cpp',
|
||||
]
|
||||
|
||||
FAIL_ON_WARNINGS = True
|
||||
|
||||
include('/ipc/chromium/chromium-config.mozbuild')
|
||||
|
||||
FINAL_LIBRARY = 'xul'
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
# Because SVGDocumentWrapper.cpp includes "mozilla/dom/SVGSVGElement.h"
|
||||
'/dom/base',
|
||||
'/dom/svg',
|
||||
# Access to Skia headers for Downscaler
|
||||
'/gfx/2d',
|
||||
# We need to instantiate the decoders
|
||||
'/image/decoders',
|
||||
# Because VectorImage.cpp includes nsSVGUtils.h and nsSVGEffects.h
|
||||
'/layout/svg',
|
||||
# For URI-related functionality
|
||||
'/netwerk/base',
|
||||
]
|
||||
|
||||
# Because imgFrame.cpp includes "cairo.h"
|
||||
CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
|
||||
|
|
|
@ -1,74 +0,0 @@
|
|||
# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
|
||||
# vim: set filetype=python:
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# 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/.
|
||||
|
||||
EXPORTS += [
|
||||
'ImageOps.h',
|
||||
'ImageRegion.h',
|
||||
'imgLoader.h',
|
||||
'imgRequest.h',
|
||||
'imgRequestProxy.h',
|
||||
'IProgressObserver.h',
|
||||
'Orientation.h',
|
||||
'SurfaceCache.h',
|
||||
]
|
||||
|
||||
UNIFIED_SOURCES += [
|
||||
'ClippedImage.cpp',
|
||||
'DecodePool.cpp',
|
||||
'Decoder.cpp',
|
||||
'DynamicImage.cpp',
|
||||
'FrameAnimator.cpp',
|
||||
'FrozenImage.cpp',
|
||||
'Image.cpp',
|
||||
'ImageFactory.cpp',
|
||||
'ImageMetadata.cpp',
|
||||
'ImageOps.cpp',
|
||||
'ImageWrapper.cpp',
|
||||
'imgFrame.cpp',
|
||||
'imgTools.cpp',
|
||||
'MultipartImage.cpp',
|
||||
'OrientedImage.cpp',
|
||||
'ScriptedNotificationObserver.cpp',
|
||||
'ShutdownTracker.cpp',
|
||||
'SourceBuffer.cpp',
|
||||
'SurfaceCache.cpp',
|
||||
'SVGDocumentWrapper.cpp',
|
||||
'VectorImage.cpp',
|
||||
]
|
||||
if CONFIG['MOZ_ENABLE_SKIA']:
|
||||
UNIFIED_SOURCES += [ 'Downscaler.cpp']
|
||||
|
||||
# These files can't be unified because of ImageLogging.h #include order issues.
|
||||
SOURCES += [
|
||||
'imgLoader.cpp',
|
||||
'imgRequest.cpp',
|
||||
'imgRequestProxy.cpp',
|
||||
'ProgressTracker.cpp',
|
||||
'RasterImage.cpp',
|
||||
]
|
||||
|
||||
FAIL_ON_WARNINGS = True
|
||||
|
||||
include('/ipc/chromium/chromium-config.mozbuild')
|
||||
|
||||
FINAL_LIBRARY = 'xul'
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
# Because SVGDocumentWrapper.cpp includes "mozilla/dom/SVGSVGElement.h"
|
||||
'/dom/base',
|
||||
'/dom/svg',
|
||||
# Access to Skia headers for Downscaler
|
||||
'/gfx/2d',
|
||||
# We need to instantiate the decoders
|
||||
'/image/decoders',
|
||||
# Because VectorImage.cpp includes nsSVGUtils.h and nsSVGEffects.h
|
||||
'/layout/svg',
|
||||
# For URI-related functionality
|
||||
'/netwerk/base',
|
||||
]
|
||||
|
||||
# Because imgFrame.cpp includes "cairo.h"
|
||||
CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
|
Загрузка…
Ссылка в новой задаче