Fix more warnings on linux

Source/core/platform/graphics/chromium/ImageFrameGeneratorTest.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 182 matching lines @@
 }
 
 TEST_F(ImageFrameGeneratorTest, cacheMissWithIncompleteDecode)
 {
     setFrameStatus(ImageFrame::FramePartial);
 
     const ScaledImageFragment* tempImage= m_generator->decodeAndScale(fullSize());
     EXPECT_FALSE(tempImage->isComplete());
     EXPECT_EQ(1, m_frameBufferRequestCount);
     ImageDecodingStore::instance()->unlockCache(m_generator.get(), tempImage);
-    EXPECT_EQ(2u, ImageDecodingStore::instance()->cacheEntries());
-    EXPECT_EQ(1u, ImageDecodingStore::instance()->imageCacheEntries());
-    EXPECT_EQ(1u, ImageDecodingStore::instance()->decoderCacheEntries());
+    EXPECT_EQ(2, ImageDecodingStore::instance()->cacheEntries());
+    EXPECT_EQ(1, ImageDecodingStore::instance()->imageCacheEntries());
+    EXPECT_EQ(1, ImageDecodingStore::instance()->decoderCacheEntries());
 
     addNewData();
     tempImage = m_generator->decodeAndScale(fullSize());
     EXPECT_FALSE(tempImage->isComplete());
     EXPECT_EQ(2, m_frameBufferRequestCount);
     ImageDecodingStore::instance()->unlockCache(m_generator.get(), tempImage);
-    EXPECT_EQ(3u, ImageDecodingStore::instance()->cacheEntries());
-    EXPECT_EQ(2u, ImageDecodingStore::instance()->imageCacheEntries());
-    EXPECT_EQ(1u, ImageDecodingStore::instance()->decoderCacheEntries());
+    EXPECT_EQ(3, ImageDecodingStore::instance()->cacheEntries());
+    EXPECT_EQ(2, ImageDecodingStore::instance()->imageCacheEntries());
+    EXPECT_EQ(1, ImageDecodingStore::instance()->decoderCacheEntries());
     EXPECT_EQ(0, m_decodersDestroyed);
 }
 
 TEST_F(ImageFrameGeneratorTest, cacheMissWithIncompleteDecodeAndScale)
 {
     setFrameStatus(ImageFrame::FramePartial);
 
     const ScaledImageFragment* tempImage= m_generator->decodeAndScale(scaledSize());
     EXPECT_FALSE(tempImage->isComplete());
     EXPECT_EQ(1, m_frameBufferRequestCount);
     ImageDecodingStore::instance()->unlockCache(m_generator.get(), tempImage);
-    EXPECT_EQ(3u, ImageDecodingStore::instance()->cacheEntries());
-    EXPECT_EQ(2u, ImageDecodingStore::instance()->imageCacheEntries());
-    EXPECT_EQ(1u, ImageDecodingStore::instance()->decoderCacheEntries());
+    EXPECT_EQ(3, ImageDecodingStore::instance()->cacheEntries());
+    EXPECT_EQ(2, ImageDecodingStore::instance()->imageCacheEntries());
+    EXPECT_EQ(1, ImageDecodingStore::instance()->decoderCacheEntries());
 
     addNewData();
     tempImage = m_generator->decodeAndScale(scaledSize());
     EXPECT_FALSE(tempImage->isComplete());
     EXPECT_EQ(2, m_frameBufferRequestCount);
     ImageDecodingStore::instance()->unlockCache(m_generator.get(), tempImage);
-    EXPECT_EQ(5u, ImageDecodingStore::instance()->cacheEntries());
-    EXPECT_EQ(4u, ImageDecodingStore::instance()->imageCacheEntries());
-    EXPECT_EQ(1u, ImageDecodingStore::instance()->decoderCacheEntries());
+    EXPECT_EQ(5, ImageDecodingStore::instance()->cacheEntries());
+    EXPECT_EQ(4, ImageDecodingStore::instance()->imageCacheEntries());
+    EXPECT_EQ(1, ImageDecodingStore::instance()->decoderCacheEntries());
     EXPECT_EQ(0, m_decodersDestroyed);
 }
 
 TEST_F(ImageFrameGeneratorTest, incompleteDecodeBecomesComplete)
 {
     setFrameStatus(ImageFrame::FramePartial);
 
     const ScaledImageFragment* tempImage = m_generator->decodeAndScale(fullSize());
     EXPECT_FALSE(tempImage->isComplete());
     EXPECT_EQ(1, m_frameBufferRequestCount);
     EXPECT_EQ(0, m_decodersDestroyed);
     ImageDecodingStore::instance()->unlockCache(m_generator.get(), tempImage);
-    EXPECT_EQ(2u, ImageDecodingStore::instance()->cacheEntries());
-    EXPECT_EQ(1u, ImageDecodingStore::instance()->imageCacheEntries());
-    EXPECT_EQ(1u, ImageDecodingStore::instance()->decoderCacheEntries());
+    EXPECT_EQ(2, ImageDecodingStore::instance()->cacheEntries());
+    EXPECT_EQ(1, ImageDecodingStore::instance()->imageCacheEntries());
+    EXPECT_EQ(1, ImageDecodingStore::instance()->decoderCacheEntries());
 
     setFrameStatus(ImageFrame::FrameComplete);
     addNewData();
 
     tempImage = m_generator->decodeAndScale(fullSize());
     EXPECT_TRUE(tempImage->isComplete());
     EXPECT_EQ(2, m_frameBufferRequestCount);
     EXPECT_EQ(1, m_decodersDestroyed);
     ImageDecodingStore::instance()->unlockCache(m_generator.get(), tempImage);
-    EXPECT_EQ(2u, ImageDecodingStore::instance()->cacheEntries());
-    EXPECT_EQ(2u, ImageDecodingStore::instance()->imageCacheEntries());
-    EXPECT_EQ(0u, ImageDecodingStore::instance()->decoderCacheEntries());
+    EXPECT_EQ(2, ImageDecodingStore::instance()->cacheEntries());
+    EXPECT_EQ(2, ImageDecodingStore::instance()->imageCacheEntries());
+    EXPECT_EQ(0, ImageDecodingStore::instance()->decoderCacheEntries());
 
     tempImage = m_generator->decodeAndScale(fullSize());
     EXPECT_TRUE(tempImage->isComplete());
     EXPECT_EQ(2, m_frameBufferRequestCount);
     ImageDecodingStore::instance()->unlockCache(m_generator.get(), tempImage);
 }
 
 TEST_F(ImageFrameGeneratorTest, incompleteDecodeAndScaleBecomesComplete)
 {
     setFrameStatus(ImageFrame::FramePartial);
 
     const ScaledImageFragment* tempImage = m_generator->decodeAndScale(scaledSize());
     EXPECT_FALSE(tempImage->isComplete());
     EXPECT_EQ(1, m_frameBufferRequestCount);
     EXPECT_EQ(0, m_decodersDestroyed);
     ImageDecodingStore::instance()->unlockCache(m_generator.get(), tempImage);
-    EXPECT_EQ(3u, ImageDecodingStore::instance()->cacheEntries());
-    EXPECT_EQ(2u, ImageDecodingStore::instance()->imageCacheEntries());
-    EXPECT_EQ(1u, ImageDecodingStore::instance()->decoderCacheEntries());
+    EXPECT_EQ(3, ImageDecodingStore::instance()->cacheEntries());
+    EXPECT_EQ(2, ImageDecodingStore::instance()->imageCacheEntries());
+    EXPECT_EQ(1, ImageDecodingStore::instance()->decoderCacheEntries());
 
     setFrameStatus(ImageFrame::FrameComplete);
     addNewData();
 
     tempImage = m_generator->decodeAndScale(scaledSize());
     EXPECT_TRUE(tempImage->isComplete());
     EXPECT_EQ(2, m_frameBufferRequestCount);
     EXPECT_EQ(1, m_decodersDestroyed);
     ImageDecodingStore::instance()->unlockCache(m_generator.get(), tempImage);
-    EXPECT_EQ(4u, ImageDecodingStore::instance()->cacheEntries());
-    EXPECT_EQ(4u, ImageDecodingStore::instance()->imageCacheEntries());
-    EXPECT_EQ(0u, ImageDecodingStore::instance()->decoderCacheEntries());
+    EXPECT_EQ(4, ImageDecodingStore::instance()->cacheEntries());
+    EXPECT_EQ(4, ImageDecodingStore::instance()->imageCacheEntries());
+    EXPECT_EQ(0, ImageDecodingStore::instance()->decoderCacheEntries());
 
     tempImage = m_generator->decodeAndScale(scaledSize());
     EXPECT_TRUE(tempImage->isComplete());
     ImageDecodingStore::instance()->unlockCache(m_generator.get(), tempImage);
 
     tempImage = m_generator->decodeAndScale(fullSize());
     EXPECT_TRUE(tempImage->isComplete());
     ImageDecodingStore::instance()->unlockCache(m_generator.get(), tempImage);
 
     EXPECT_EQ(2, m_frameBufferRequestCount);
 }
 
 static void decodeThreadMain(ImageFrameGenerator* generator)
 {
     const ScaledImageFragment* tempImage = generator->decodeAndScale(fullSize());
     ImageDecodingStore::instance()->unlockCache(generator, tempImage);
 }
 
 TEST_F(ImageFrameGeneratorTest, incompleteDecodeBecomesCompleteMultiThreaded)
 {
     setFrameStatus(ImageFrame::FramePartial);
 
     const ScaledImageFragment* tempImage = m_generator->decodeAndScale(fullSize());
     EXPECT_FALSE(tempImage->isComplete());
     EXPECT_EQ(1, m_frameBufferRequestCount);
     EXPECT_EQ(0, m_decodersDestroyed);
     ImageDecodingStore::instance()->unlockCache(m_generator.get(), tempImage);
-    EXPECT_EQ(2u, ImageDecodingStore::instance()->cacheEntries());
-    EXPECT_EQ(1u, ImageDecodingStore::instance()->imageCacheEntries());
-    EXPECT_EQ(1u, ImageDecodingStore::instance()->decoderCacheEntries());
+    EXPECT_EQ(2, ImageDecodingStore::instance()->cacheEntries());
+    EXPECT_EQ(1, ImageDecodingStore::instance()->imageCacheEntries());
+    EXPECT_EQ(1, ImageDecodingStore::instance()->decoderCacheEntries());
 
     // Frame can now be decoded completely.
     setFrameStatus(ImageFrame::FrameComplete);
     addNewData();
     OwnPtr<WebKit::WebThread> thread = adoptPtr(WebKit::Platform::current()->createThread("DecodeThread"));
     thread->postTask(new Task(WTF::bind(&decodeThreadMain, m_generator.get())));
     thread.clear();
 
     EXPECT_EQ(2, m_frameBufferRequestCount);
     EXPECT_EQ(1, m_decodersDestroyed);
-    EXPECT_EQ(2u, ImageDecodingStore::instance()->cacheEntries());
-    EXPECT_EQ(2u, ImageDecodingStore::instance()->imageCacheEntries());
-    EXPECT_EQ(0u, ImageDecodingStore::instance()->decoderCacheEntries());
+    EXPECT_EQ(2, ImageDecodingStore::instance()->cacheEntries());
+    EXPECT_EQ(2, ImageDecodingStore::instance()->imageCacheEntries());
+    EXPECT_EQ(0, ImageDecodingStore::instance()->decoderCacheEntries());
 
     tempImage = m_generator->decodeAndScale(fullSize());
     EXPECT_TRUE(tempImage->isComplete());
     EXPECT_EQ(2, m_frameBufferRequestCount);
     ImageDecodingStore::instance()->unlockCache(m_generator.get(), tempImage);
 }
 
 TEST_F(ImageFrameGeneratorTest, concurrentIncompleteDecodeAndScale)
 {
     setFrameStatus(ImageFrame::FramePartial);
 
     const ScaledImageFragment* fullImage = m_generator->decodeAndScale(fullSize());
     const ScaledImageFragment* scaledImage = m_generator->decodeAndScale(scaledSize());
     EXPECT_FALSE(fullImage->isComplete());
     EXPECT_FALSE(scaledImage->isComplete());
     EXPECT_EQ(2, m_frameBufferRequestCount);
     ImageDecodingStore::instance()->unlockCache(m_generator.get(), fullImage);
     ImageDecodingStore::instance()->unlockCache(m_generator.get(), scaledImage);
-    EXPECT_EQ(4u, ImageDecodingStore::instance()->cacheEntries());
-    EXPECT_EQ(3u, ImageDecodingStore::instance()->imageCacheEntries());
-    EXPECT_EQ(1u, ImageDecodingStore::instance()->decoderCacheEntries());
+    EXPECT_EQ(4, ImageDecodingStore::instance()->cacheEntries());
+    EXPECT_EQ(3, ImageDecodingStore::instance()->imageCacheEntries());
+    EXPECT_EQ(1, ImageDecodingStore::instance()->decoderCacheEntries());
     EXPECT_EQ(0, m_decodersDestroyed);
 
     addNewData();
     setFrameStatus(ImageFrame::FrameComplete);
     scaledImage = m_generator->decodeAndScale(scaledSize());
     EXPECT_TRUE(scaledImage->isComplete());
     EXPECT_EQ(3, m_frameBufferRequestCount);
     ImageDecodingStore::instance()->unlockCache(m_generator.get(), scaledImage);
-    EXPECT_EQ(5u, ImageDecodingStore::instance()->cacheEntries());
-    EXPECT_EQ(5u, ImageDecodingStore::instance()->imageCacheEntries());
-    EXPECT_EQ(0u, ImageDecodingStore::instance()->decoderCacheEntries());
+    EXPECT_EQ(5, ImageDecodingStore::instance()->cacheEntries());
+    EXPECT_EQ(5, ImageDecodingStore::instance()->imageCacheEntries());
+    EXPECT_EQ(0, ImageDecodingStore::instance()->decoderCacheEntries());
     EXPECT_EQ(1, m_decodersDestroyed);
 }
 
 TEST_F(ImageFrameGeneratorTest, incompleteBitmapCopied)
 {
     setFrameStatus(ImageFrame::FramePartial);
 
     const ScaledImageFragment* tempImage= m_generator->decodeAndScale(fullSize());
     EXPECT_FALSE(tempImage->isComplete());
     EXPECT_EQ(1, m_frameBufferRequestCount);
@@ skipping 79 matching lines @@
             // We have tested failures of all stages. This time all allocations
             // were successful.
             EXPECT_TRUE(image);
             break;
         }
         EXPECT_FALSE(image);
     }
 }
 
 } // namespace WebCore