From f369c57eb15bacf43c59e92f0e36693abdbe312b Mon Sep 17 00:00:00 2001 From: Phil Ringnalda Date: Mon, 1 Jul 2013 19:18:34 -0700 Subject: [PATCH] Backed out 066a0110bd0b:1dc02c10629c (bug 865919) for mochitest-4 assertions CLOSED TREE --- image/decoders/nsBMPDecoder.cpp | 6 --- image/test/mochitest/INT32_MIN.bmp | Bin 60 -> 0 bytes image/test/mochitest/Makefile.in | 2 - image/test/mochitest/test_bug865919.html | 54 ----------------------- 4 files changed, 62 deletions(-) delete mode 100644 image/test/mochitest/INT32_MIN.bmp delete mode 100644 image/test/mochitest/test_bug865919.html diff --git a/image/decoders/nsBMPDecoder.cpp b/image/decoders/nsBMPDecoder.cpp index 4037b476e66..9756e16f817 100644 --- a/image/decoders/nsBMPDecoder.cpp +++ b/image/decoders/nsBMPDecoder.cpp @@ -247,12 +247,6 @@ nsBMPDecoder::WriteInternal(const char* aBuffer, uint32_t aCount) return; } - // Check that our abs height is still valid. - if (GetHeight() < 0) { - PostDataError(); - return; - } - uint32_t real_height = GetHeight(); // Post our size to the superclass diff --git a/image/test/mochitest/INT32_MIN.bmp b/image/test/mochitest/INT32_MIN.bmp deleted file mode 100644 index d9a00161072ae6d3378dcaeea12079c873d4012d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 60 mcmZ?rwPAn&Ga#h_Wdo@OMg|Emj}1r)aYHanx|X3C$OHgiaRUPY diff --git a/image/test/mochitest/Makefile.in b/image/test/mochitest/Makefile.in index adccfcc6662..289cb22dec4 100644 --- a/image/test/mochitest/Makefile.in +++ b/image/test/mochitest/Makefile.in @@ -69,8 +69,6 @@ MOCHITEST_FILES = imgutils.js \ test_drawDiscardedImage.html \ short_header.gif \ test_short_gif_header.html \ - INT32_MIN.bmp \ - test_bug865919.html \ $(NULL) # Tests disabled due to intermittent orange diff --git a/image/test/mochitest/test_bug865919.html b/image/test/mochitest/test_bug865919.html deleted file mode 100644 index 4f10353f3b3..00000000000 --- a/image/test/mochitest/test_bug865919.html +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - Test for Bug 865919 - - - - - - - -
- -
- - - -