Backed out changeset abc949687bdc (bug 1315554)
authorSebastian Hengst <archaeopteryx@coole-files.de>
Sat, 22 Jul 2017 11:03:41 +0200
changeset 419096 0322d59fdaa300b77452ab61aa18ca733fffe6b8
parent 419095 abc949687bdc774389bdfe12a49f7408373d514f
child 419097 e2a6c6b64735e03bfc9bfa3975a2664419a06d9d
push id7566
push usermtabara@mozilla.com
push dateWed, 02 Aug 2017 08:25:16 +0000
treeherdermozilla-beta@86913f512c3c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1315554
milestone56.0a1
backs outabc949687bdc774389bdfe12a49f7408373d514f
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset abc949687bdc (bug 1315554)
image/test/gtest/Common.cpp
image/test/gtest/Common.h
image/test/gtest/TestDecoders.cpp
image/test/gtest/green-large-bmp.ico
image/test/gtest/green-large-png.ico
image/test/gtest/moz.build
--- a/image/test/gtest/Common.cpp
+++ b/image/test/gtest/Common.cpp
@@ -674,28 +674,16 @@ ImageTestCase DownscaledTransparentICOWi
                        TEST_CASE_IS_TRANSPARENT | TEST_CASE_IGNORE_OUTPUT);
 }
 
 ImageTestCase TruncatedSmallGIFTestCase()
 {
   return ImageTestCase("green-1x1-truncated.gif", "image/gif", IntSize(1, 1));
 }
 
-ImageTestCase LargeICOWithBMPTestCase()
-{
-  return ImageTestCase("green-large-bmp.ico", "image/x-icon", IntSize(256, 256),
-                       TEST_CASE_IS_TRANSPARENT);
-}
-
-ImageTestCase LargeICOWithPNGTestCase()
-{
-  return ImageTestCase("green-large-png.ico", "image/x-icon", IntSize(512, 512),
-                       TEST_CASE_IS_TRANSPARENT);
-}
-
 ImageTestCase GreenMultipleSizesICOTestCase()
 {
   return ImageTestCase("green-multiple-sizes.ico", "image/x-icon",
                        IntSize(256, 256));
 }
 
 } // namespace image
 } // namespace mozilla
--- a/image/test/gtest/Common.h
+++ b/image/test/gtest/Common.h
@@ -409,16 +409,14 @@ ImageTestCase DownscaledGIFTestCase();
 ImageTestCase DownscaledJPGTestCase();
 ImageTestCase DownscaledBMPTestCase();
 ImageTestCase DownscaledICOTestCase();
 ImageTestCase DownscaledIconTestCase();
 ImageTestCase DownscaledTransparentICOWithANDMaskTestCase();
 
 ImageTestCase TruncatedSmallGIFTestCase();
 
-ImageTestCase LargeICOWithBMPTestCase();
-ImageTestCase LargeICOWithPNGTestCase();
 ImageTestCase GreenMultipleSizesICOTestCase();
 
 } // namespace image
 } // namespace mozilla
 
 #endif // mozilla_image_test_gtest_Common_h
--- a/image/test/gtest/TestDecoders.cpp
+++ b/image/test/gtest/TestDecoders.cpp
@@ -668,36 +668,16 @@ TEST_F(ImageDecoders, AnimatedGIFWithExt
   EXPECT_TRUE(bool(result.Surface()));
 }
 
 TEST_F(ImageDecoders, TruncatedSmallGIFSingleChunk)
 {
   CheckDecoderSingleChunk(TruncatedSmallGIFTestCase());
 }
 
-TEST_F(ImageDecoders, LargeICOWithBMPSingleChunk)
-{
-  CheckDecoderSingleChunk(LargeICOWithBMPTestCase());
-}
-
-TEST_F(ImageDecoders, LargeICOWithBMPMultiChunk)
-{
-  CheckDecoderMultiChunk(LargeICOWithBMPTestCase());
-}
-
-TEST_F(ImageDecoders, LargeICOWithPNGSingleChunk)
-{
-  CheckDecoderSingleChunk(LargeICOWithPNGTestCase());
-}
-
-TEST_F(ImageDecoders, LargeICOWithPNGMultiChunk)
-{
-  CheckDecoderMultiChunk(LargeICOWithPNGTestCase());
-}
-
 TEST_F(ImageDecoders, MultipleSizesICOSingleChunk)
 {
   ImageTestCase testCase = GreenMultipleSizesICOTestCase();
 
   // Create an image.
   RefPtr<Image> image =
     ImageFactory::CreateAnonymousImage(nsDependentCString(testCase.mMimeType));
   ASSERT_TRUE(!image->HasError());
deleted file mode 100644
index 3962cea29de37892ddda2b7dae390bd2865f784b..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 27b9f43cdd6f48e3f581455d8df10f3dbf0f0d30..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/image/test/gtest/moz.build
+++ b/image/test/gtest/moz.build
@@ -42,18 +42,16 @@ TEST_HARNESS_FILES.gtest += [
     'downscaled.ico',
     'downscaled.icon',
     'downscaled.jpg',
     'downscaled.png',
     'first-frame-green.gif',
     'first-frame-green.png',
     'first-frame-padding.gif',
     'green-1x1-truncated.gif',
-    'green-large-bmp.ico',
-    'green-large-png.ico',
     'green-multiple-sizes.ico',
     'green.bmp',
     'green.gif',
     'green.ico',
     'green.icon',
     'green.jpg',
     'green.png',
     'invalid-truncated-metadata.bmp',