Bug 592641 - Tests.r=Neil,a=tests

content/html/document/test/Makefile.in

@@ -106,5 +106,17 @@ _TEST_FILES = 	test_bug1682.html \
 		test_bug571981.html \
 		$(NULL)
 
+ifneq (mobile,$(MOZ_BUILD_APP))
+_BROWSER_TEST_FILES = \
+		browser_bug592641.js \
+		bug592641_img.jpg \
+		$(NULL)
+endif
+
 libs:: $(_TEST_FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
+
+ifneq (mobile,$(MOZ_BUILD_APP))
+libs:: $(_BROWSER_TEST_FILES)
+	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
+endif

content/html/document/test/browser_bug592641.js

@@ -0,0 +1,64 @@
+// Test for bug 592641 - Image document doesn't show dimensions of cached images
+
+// Globals
+var testPath = "http://mochi.test:8888/browser/content/html/document/test/";
+var ctx = {loadsDone : 0};
+
+// Entry point from Mochikit
+function test() {
+
+  waitForExplicitFinish();
+
+  ctx.tab1 = gBrowser.addTab(testPath + "bug592641_img.jpg");
+  ctx.tab1Browser = gBrowser.getBrowserForTab(ctx.tab1);
+  ctx.tab1Browser.addEventListener("load",
+                                   // onload is fired in OnStopDecode, so let's
+                                   // use executeSoon() to make sure that any
+                                   // other OnStopDecode event handlers get the
+                                   // chance to fire first.
+                                   function() {executeSoon(load1Done);},
+                                   true);
+}
+
+function checkTitle(title) {
+
+  ctx.loadsDone++;
+  ok(/^bug592641_img\.jpg \(JPEG Image, 1500x1500 pixels\)/.test(title),
+     "Title should be correct on load #" + ctx.loadsDone);
+}
+
+
+function load1Done() {
+
+  // Check the title
+  var title = ctx.tab1Browser.contentWindow.document.title;
+  checkTitle(title);
+
+  // Try loading the same image in a new tab to make sure things work in
+  // the cached case.
+  ctx.tab2 = gBrowser.addTab(testPath + "bug592641_img.jpg");
+  ctx.tab2Browser = gBrowser.getBrowserForTab(ctx.tab2);
+  ctx.tab2Browser.addEventListener("load",
+                                   // onload is fired in OnStopDecode, so let's
+                                   // use executeSoon() to make sure that any
+                                   // other OnStopDecode event handlers get the
+                                   // chance to fire first.
+                                   function() {executeSoon(load2Done);},
+                                   true);
+
+
+}
+
+function load2Done() {
+
+  // Check the title
+  var title = ctx.tab2Browser.contentWindow.document.title;
+  checkTitle(title);
+
+  // Clean up
+  gBrowser.removeTab(ctx.tab1);
+  gBrowser.removeTab(ctx.tab2);
+
+  // Test done
+  finish();
+}