diff --git a/accessible/tests/mochitest/jsat/test_traversal.html b/accessible/tests/mochitest/jsat/test_traversal.html
index 533e9d89f..e2c4ff418 100644
--- a/accessible/tests/mochitest/jsat/test_traversal.html
+++ b/accessible/tests/mochitest/jsat/test_traversal.html
@@ -83,7 +83,7 @@
'listitem-2-3']);
queueTraversalSequence(gQueue, docAcc, TraversalRules.Graphic, null,
- ['image-2', 'image-3']);
+ ['image-1', 'image-2', 'image-3']);
queueTraversalSequence(gQueue, docAcc, TraversalRules.Link, null,
['link-0', 'link-1', 'link-2', 'link-3']);
@@ -117,7 +117,7 @@
'1. Scheme', '2. Racket', '3. Clojure',
'4. Standard Lisp', 'link-0', ' Lisp',
'checkbox-1-5', ' LeLisp', '• JavaScript',
- 'heading-5', 'image-2', 'image-3',
+ 'heading-5', 'image-1', 'image-2', 'image-3',
'Not actually an image', 'link-1', 'anchor-1',
'link-2', 'anchor-2', 'link-3', '3', '1', '4',
'1', 'Sunday', 'M', 'Week 1', '3', '4', '7', '2',
diff --git a/accessible/tests/mochitest/tree/test_invalid_img.xhtml b/accessible/tests/mochitest/tree/test_invalid_img.xhtml
index 2079c86ee..f7c29fb8f 100644
--- a/accessible/tests/mochitest/tree/test_invalid_img.xhtml
+++ b/accessible/tests/mochitest/tree/test_invalid_img.xhtml
@@ -20,8 +20,8 @@
document.getElementsByTagName("img")[0].firstChild.data = "2";
var accTree = {
- role: ROLE_TEXT,
- children: [ { role: ROLE_TEXT_LEAF } ]
+ role: ROLE_GRAPHIC,
+ children: []
};
testAccessibleTree("the_img", accTree);
SimpleTest.finish();
diff --git a/dom/base/nsIImageLoadingContent.idl b/dom/base/nsIImageLoadingContent.idl
index eacc4ac3a..234571e1b 100644
--- a/dom/base/nsIImageLoadingContent.idl
+++ b/dom/base/nsIImageLoadingContent.idl
@@ -68,7 +68,7 @@ interface nsIImageLoadingContent : imgINotificationObserver
* the image was blocked. This status always refers to the
* CURRENT_REQUEST load.
*/
- readonly attribute short imageBlockingStatus;
+ [infallible] readonly attribute short imageBlockingStatus;
/**
* Used to register an image decoder observer. Typically, this will
diff --git a/dom/html/reftests/468263-2-alternate-ref.html b/dom/html/reftests/468263-2-alternate-ref.html
index 538898c97..c3bdb9da9 100644
--- a/dom/html/reftests/468263-2-alternate-ref.html
+++ b/dom/html/reftests/468263-2-alternate-ref.html
@@ -2,6 +2,7 @@
![]()
+ ![]()
diff --git a/image/test/crashtests/delaytest.html b/image/test/crashtests/delaytest.html
index 00cd1ebd1..762aec789 100644
--- a/image/test/crashtests/delaytest.html
+++ b/image/test/crashtests/delaytest.html
@@ -4,7 +4,8 @@
Delayed image reftest wrapper
-![]()
+
+![]()
-![]()
+
+![]()
diff --git a/image/test/reftest/bmp/bmpsuite/b/wrapper.html b/image/test/reftest/bmp/bmpsuite/b/wrapper.html
index 47e68959f..22b74c8fc 100644
--- a/image/test/reftest/bmp/bmpsuite/b/wrapper.html
+++ b/image/test/reftest/bmp/bmpsuite/b/wrapper.html
@@ -14,13 +14,13 @@
-![]()
+
+![]()
diff --git a/image/test/reftest/bmp/bmpsuite/q/wrapper.html b/image/test/reftest/bmp/bmpsuite/q/wrapper.html
index 47e68959f..22b74c8fc 100644
--- a/image/test/reftest/bmp/bmpsuite/q/wrapper.html
+++ b/image/test/reftest/bmp/bmpsuite/q/wrapper.html
@@ -14,13 +14,13 @@
-![]()
+
+![]()
diff --git a/image/test/reftest/downscaling/downscale-16px.html b/image/test/reftest/downscaling/downscale-16px.html
index b34adb93d..06d6db2bf 100644
--- a/image/test/reftest/downscaling/downscale-16px.html
+++ b/image/test/reftest/downscaling/downscale-16px.html
@@ -14,13 +14,13 @@
-![]()
+
+![]()
diff --git a/image/test/reftest/downscaling/downscale-8px.html b/image/test/reftest/downscaling/downscale-8px.html
index 32cb1b211..fdc632e53 100644
--- a/image/test/reftest/downscaling/downscale-8px.html
+++ b/image/test/reftest/downscaling/downscale-8px.html
@@ -14,7 +14,8 @@
-![]()
+
+![]()
-![]()
+
+![]()
-![]()
+
+![]()
-![]()
+
+![]()
diff --git a/image/test/reftest/pngsuite-background/wrapper.html b/image/test/reftest/pngsuite-background/wrapper.html
index 5bbe75e01..45b516775 100644
--- a/image/test/reftest/pngsuite-background/wrapper.html
+++ b/image/test/reftest/pngsuite-background/wrapper.html
@@ -14,7 +14,8 @@
-![]()
+
+![]()
-![]()
+
+![]()
diff --git a/image/test/reftest/pngsuite-transparency/wrapper.html b/image/test/reftest/pngsuite-transparency/wrapper.html
index 5bbe75e01..45b516775 100644
--- a/image/test/reftest/pngsuite-transparency/wrapper.html
+++ b/image/test/reftest/pngsuite-transparency/wrapper.html
@@ -14,7 +14,8 @@
-![]()
+
+![]()
+
+
+
+
+
+![]()
+
+![]()
+