Bug 1417021 - Fix various non-unified build errors in imagelib. r=aosmond

image/Decoder.cpp

@@ -5,17 +5,20 @@
 
 #include "Decoder.h"
 
-#include "mozilla/gfx/2D.h"
 #include "DecodePool.h"
 #include "GeckoProfiler.h"
 #include "IDecodingTask.h"
 #include "ISurfaceProvider.h"
+#include "mozilla/gfx/2D.h"
+#include "mozilla/gfx/Point.h"
+#include "mozilla/Telemetry.h"
+#include "nsComponentManagerUtils.h"
 #include "nsProxyRelease.h"
 #include "nsServiceManagerUtils.h"
-#include "nsComponentManagerUtils.h"
-#include "mozilla/Telemetry.h"
 
+using mozilla::gfx::IntPoint;
 using mozilla::gfx::IntSize;
+using mozilla::gfx::IntRect;
 using mozilla::gfx::SurfaceFormat;
 
 namespace mozilla {

image/DecoderFactory.cpp

@@ -10,7 +10,9 @@
 
 #include "AnimationSurfaceProvider.h"
 #include "Decoder.h"
+#include "DecodedSurfaceProvider.h"
 #include "IDecodingTask.h"
+#include "ImageOps.h"
 #include "nsPNGDecoder.h"
 #include "nsGIFDecoder2.h"
 #include "nsJPEGDecoder.h"

image/IDecodingTask.h

@@ -11,10 +11,10 @@
 #ifndef mozilla_image_IDecodingTask_h
 #define mozilla_image_IDecodingTask_h
 
+#include "imgFrame.h"
 #include "mozilla/NotNull.h"
 #include "mozilla/RefPtr.h"
-
+#include "nsIEventTarget.h"
-#include "imgFrame.h"
 #include "SourceBuffer.h"
 
 namespace mozilla {

image/ImageCacheKey.h

@@ -13,6 +13,7 @@
 #include "mozilla/BasePrincipal.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/RefPtr.h"
+#include "PLDHashTable.h"
 
 class nsIDocument;
 class nsIURI;

image/ImageMetadata.h

@@ -10,6 +10,7 @@
 #include <stdint.h>
 #include "mozilla/Maybe.h"
 #include "nsSize.h"
+#include "nsTArray.h"
 #include "Orientation.h"
 #include "FrameTimeout.h"
 

image/StreamingLexer.h

@@ -21,6 +21,7 @@
 #include "mozilla/Move.h"
 #include "mozilla/Variant.h"
 #include "mozilla/Vector.h"
+#include "SourceBuffer.h"
 
 namespace mozilla {
 namespace image {

image/decoders/nsJPEGDecoder.cpp

@@ -24,6 +24,7 @@
 
 #include "gfxPlatform.h"
 #include "mozilla/EndianUtils.h"
+#include "mozilla/gfx/Types.h"
 #include "mozilla/Telemetry.h"
 
 extern "C" {
@@ -38,6 +39,8 @@ extern "C" {
 
 static void cmyk_convert_rgb(JSAMPROW row, JDIMENSION width);
 
+using mozilla::gfx::SurfaceFormat;
+
 namespace mozilla {
 namespace image {
 

image/imgRequestProxy.cpp

@@ -4,8 +4,9 @@
  * 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/. */
 
-#include "ImageLogging.h"
 #include "imgRequestProxy.h"
+
+#include "ImageLogging.h"
 #include "imgLoader.h"
 #include "Image.h"
 #include "ImageOps.h"
@@ -14,8 +15,10 @@
 #include "imgINotificationObserver.h"
 #include "mozilla/dom/TabGroup.h"       // for TabGroup
 #include "mozilla/dom/DocGroup.h"       // for DocGroup
+#include "mozilla/Move.h"
 #include "mozilla/Telemetry.h"          // for Telemetry
 
+using namespace mozilla;
 using namespace mozilla::image;
 
 // The split of imgRequestProxy and imgRequestProxyStatic means that

image/test/gtest/Common.h

@@ -393,6 +393,7 @@ ImageTestCase CorruptICOWithBadBppTestCase();
 ImageTestCase TransparentPNGTestCase();
 ImageTestCase TransparentGIFTestCase();
 ImageTestCase FirstFramePaddingGIFTestCase();
+ImageTestCase TransparentIfWithinICOBMPTestCase(TestCaseFlags aFlags);
 ImageTestCase NoFrameDelayGIFTestCase();
 ImageTestCase ExtraImageSubBlocksAnimatedGIFTestCase();
 

image/test/gtest/TestDecoders.cpp

@@ -9,6 +9,7 @@
 #include "DecoderFactory.h"
 #include "decoders/nsBMPDecoder.h"
 #include "IDecodingTask.h"
+#include "ImageOps.h"
 #include "imgIContainer.h"
 #include "imgITools.h"
 #include "ImageFactory.h"

image/test/gtest/TestSourceBuffer.cpp

@@ -7,7 +7,9 @@
 #include <algorithm>
 #include <cstdint>
 
+#include "Common.h"
 #include "mozilla/Move.h"
+#include "nsIInputStream.h"
 #include "SourceBuffer.h"
 #include "SurfaceCache.h"
 

image/test/gtest/TestStreamingLexer.cpp

@@ -4,6 +4,7 @@
 
 #include "gtest/gtest.h"
 
+#include "Common.h"
 #include "mozilla/Vector.h"
 #include "StreamingLexer.h"