Bug 1102048 (Part 25, header guards) - Make image/src files comply with the Mozilla Coding Style Guide. r=seth

This commit is contained in:
Glenn Randers-Pehrson 2015-03-23 16:59:00 -07:00
parent bf546a88ce
commit db8250a655
11 changed files with 38 additions and 38 deletions

View File

@ -3,8 +3,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef nsImageModule_h #ifndef mozilla_image_build_nsImageModule_h
#define nsImageModule_h #define mozilla_image_build_nsImageModule_h
#include "nsError.h" #include "nsError.h"
@ -17,5 +17,4 @@ void ShutdownModule();
} /* namespace image */ } /* namespace image */
} /* namespace mozilla */ } /* namespace mozilla */
#endif // mozilla_image_build_nsImageModule_h
#endif /* nsImageModule_h */

View File

@ -3,8 +3,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef MOZILLA_IMAGELIB_FROZENIMAGE_H_ #ifndef mozilla_image_src_FrozenImage_h
#define MOZILLA_IMAGELIB_FROZENIMAGE_H_ #define mozilla_image_src_FrozenImage_h
#include "ImageWrapper.h" #include "ImageWrapper.h"
#include "mozilla/gfx/2D.h" #include "mozilla/gfx/2D.h"
@ -64,4 +64,4 @@ private:
} // namespace image } // namespace image
} // namespace mozilla } // namespace mozilla
#endif // MOZILLA_IMAGELIB_FROZENIMAGE_H_ #endif // mozilla_image_src_FrozenImage_h

View File

@ -3,8 +3,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef MOZILLA_IMAGELIB_PROGRESSOBSERVER_H_ #ifndef mozilla_image_src_IProgressObserver_h
#define MOZILLA_IMAGELIB_PROGRESSOBSERVER_H_ #define mozilla_image_src_IProgressObserver_h
#include "mozilla/WeakPtr.h" #include "mozilla/WeakPtr.h"
#include "nsISupports.h" #include "nsISupports.h"
@ -16,7 +16,7 @@ namespace image {
/** /**
* An interface for observing changes to image state, as reported by * An interface for observing changes to image state, as reported by
* ProgressTracker. * ProgressTracker.
* *
* This is the ImageLib-internal version of imgINotificationObserver, * This is the ImageLib-internal version of imgINotificationObserver,
* essentially, with implementation details that code outside of ImageLib * essentially, with implementation details that code outside of ImageLib
* shouldn't see. * shouldn't see.
@ -56,4 +56,4 @@ protected:
} // namespace image } // namespace image
} // namespace mozilla } // namespace mozilla
#endif // MOZILLA_IMAGELIB_PROGRESSOBSERVER_H_ #endif // mozilla_image_src_IProgressObserver_h

View File

@ -4,8 +4,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef MOZILLA_IMAGELIB_IMAGEFACTORY_H_ #ifndef mozilla_image_src_ImageFactory_h
#define MOZILLA_IMAGELIB_IMAGEFACTORY_H_ #define mozilla_image_src_ImageFactory_h
#include "nsCOMPtr.h" #include "nsCOMPtr.h"
#include "nsProxyRelease.h" #include "nsProxyRelease.h"
@ -79,4 +79,4 @@ private:
} // namespace image } // namespace image
} // namespace mozilla } // namespace mozilla
#endif // MOZILLA_IMAGELIB_IMAGEFACTORY_H_ #endif // mozilla_image_src_ImageFactory_h

View File

@ -4,8 +4,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef MOZILLA_IMAGELIB_IMAGEOPS_H_ #ifndef mozilla_image_src_ImageOps_h
#define MOZILLA_IMAGELIB_IMAGEOPS_H_ #define mozilla_image_src_ImageOps_h
#include "nsCOMPtr.h" #include "nsCOMPtr.h"
@ -69,4 +69,4 @@ private:
} // namespace image } // namespace image
} // namespace mozilla } // namespace mozilla
#endif // MOZILLA_IMAGELIB_IMAGEOPS_H_ #endif // mozilla_image_src_ImageOps_h

View File

@ -3,8 +3,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef MOZILLA_IMAGELIB_IMAGE_REGION_H_ #ifndef mozilla_image_src_ImageRegion_h
#define MOZILLA_IMAGELIB_IMAGE_REGION_H_ #define mozilla_image_src_ImageRegion_h
#include "gfxRect.h" #include "gfxRect.h"
@ -155,4 +155,4 @@ private:
} // namespace image } // namespace image
} // namespace mozilla } // namespace mozilla
#endif #endif // mozilla_image_src_ImageRegion_h

View File

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

View File

@ -3,8 +3,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef MOZILLA_IMAGELIB_IMAGEWRAPPER_H_ #ifndef mozilla_image_src_ImageWrapper_h
#define MOZILLA_IMAGELIB_IMAGEWRAPPER_H_ #define mozilla_image_src_ImageWrapper_h
#include "mozilla/MemoryReporting.h" #include "mozilla/MemoryReporting.h"
#include "Image.h" #include "Image.h"
@ -86,4 +86,4 @@ private:
} // namespace image } // namespace image
} // namespace mozilla } // namespace mozilla
#endif // MOZILLA_IMAGELIB_IMAGEWRAPPER_H_ #endif // mozilla_image_src_ImageWrapper_h

View File

@ -3,8 +3,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef MOZILLA_IMAGELIB_ORIENTATION_H_ #ifndef mozilla_image_src_Orientation_h
#define MOZILLA_IMAGELIB_ORIENTATION_H_ #define mozilla_image_src_Orientation_h
#include <stdint.h> #include <stdint.h>
@ -56,7 +56,7 @@ struct Orientation
Flip flip; Flip flip;
}; };
} } // namespace image
} } // namespace mozilla
#endif #endif // mozilla_image_src_Orientation_h

View File

@ -3,8 +3,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef MOZILLA_IMAGELIB_ORIENTEDIMAGE_H_ #ifndef mozilla_image_src_OrientedImage_h
#define MOZILLA_IMAGELIB_ORIENTEDIMAGE_H_ #define mozilla_image_src_OrientedImage_h
#include "ImageWrapper.h" #include "ImageWrapper.h"
#include "mozilla/gfx/2D.h" #include "mozilla/gfx/2D.h"
@ -70,4 +70,4 @@ private:
} // namespace image } // namespace image
} // namespace mozilla } // namespace mozilla
#endif // MOZILLA_IMAGELIB_ORIENTEDIMAGE_H_ #endif // mozilla_image_src_OrientedImage_h

View File

@ -8,8 +8,8 @@
* storing image source (compressed) data. * storing image source (compressed) data.
*/ */
#ifndef MOZILLA_IMAGELIB_SOURCEBUFFER_H_ #ifndef mozilla_image_src_sourcebuffer_h
#define MOZILLA_IMAGELIB_SOURCEBUFFER_H_ #define mozilla_image_src_sourcebuffer_h
#include "mozilla/Maybe.h" #include "mozilla/Maybe.h"
#include "mozilla/MemoryReporting.h" #include "mozilla/MemoryReporting.h"
@ -117,7 +117,8 @@ public:
/// If at the end, returns the status passed to SourceBuffer::Complete(). /// If at the end, returns the status passed to SourceBuffer::Complete().
nsresult CompletionStatus() const nsresult CompletionStatus() const
{ {
MOZ_ASSERT(mState == COMPLETE, "Calling CompletionStatus() in the wrong state"); MOZ_ASSERT(mState == COMPLETE,
"Calling CompletionStatus() in the wrong state");
return mState == COMPLETE ? mData.mAtEnd.mStatus : NS_OK; return mState == COMPLETE ? mData.mAtEnd.mStatus : NS_OK;
} }
@ -378,4 +379,4 @@ private:
} // namespace image } // namespace image
} // namespace mozilla } // namespace mozilla
#endif // MOZILLA_IMAGELIB_SOURCEBUFFER_H_ #endif // mozilla_image_src_sourcebuffer_h