Bug 411852 - Glitch in an aPNG image rendering and tab thumbnail. r=stuart, a1.9=beltzner

2008-04-04 01:01:18 +00:00 · 2008-04-04 01:01:18 +00:00 · 6d1192eed8
--- a/modules/libpr0n/decoders/png/nsPNGDecoder.cpp
+++ b/modules/libpr0n/decoders/png/nsPNGDecoder.cpp
@ -185,7 +185,7 @@ void nsPNGDecoder::EndImageFrame()
    // Tell the image renderer that the frame is complete
    PRInt32 width, height;
    mFrame->GetWidth(&width);
-    mFrame->GetWidth(&height);
+    mFrame->GetHeight(&height);

    nsIntRect r(0, 0, width, height);
    nsCOMPtr<nsIImage> img(do_GetInterface(mFrame));
--- a/modules/libpr0n/test/reftest/apng/bug411852-1-ref.png
+++ b/modules/libpr0n/test/reftest/apng/bug411852-1-ref.png
--- a/modules/libpr0n/test/reftest/apng/bug411852-1.png
+++ b/modules/libpr0n/test/reftest/apng/bug411852-1.png
--- a/modules/libpr0n/test/reftest/apng/delaytest.html
+++ b/modules/libpr0n/test/reftest/apng/delaytest.html
@ -0,0 +1,24 @@
+<!DOCTYPE HTML>
+<html class="reftest-wait">
+<head>
+<title>Delayed image reftest wrapper</title>
+</head>
+<body>
+<img id="image1">
+<script>
+// This loads a externally specified image, waits 100ms, and then triggers the
+// reftest snapshot. This allows the animation on the page to complete.
+//
+// Use as "delaytest.html?animation.png"
+//
+function startTimer() {
+  const delay = 100;
+  setTimeout("document.documentElement.className = '';", delay);
+}
+var imgURL = document.location.search.substr(1);
+var img = document.images[0];
+img.src = imgURL;
+img.onload = startTimer;
+</script>
+</body>
+</html>
--- a/modules/libpr0n/test/reftest/apng/reftest.list
+++ b/modules/libpr0n/test/reftest/apng/reftest.list
@ -0,0 +1,5 @@
+# APNG tests 
+#
+# delaytest.html delays the reftest snapshot to allow time for the
+# animation to complete.
+== delaytest.html?bug411852-1.png bug411852-1-ref.png
--- a/modules/libpr0n/test/reftest/reftest.list
+++ b/modules/libpr0n/test/reftest/reftest.list
@ -22,6 +22,9 @@ include pngsuite-zlib/reftest.list
 # JPEG tests
 include jpeg/reftest.list

+# APNG tests
+include apng/reftest.list
+
 # Generic image tests
 include generic/reftest.list