diff --git a/accessible/tests/mochitest/tree/test_map.html b/accessible/tests/mochitest/tree/test_map.html index 39f5baf2189..6f0b0f2b60a 100644 --- a/accessible/tests/mochitest/tree/test_map.html +++ b/accessible/tests/mochitest/tree/test_map.html @@ -22,9 +22,9 @@ testAccessibleTree("imagemapcontainer", accTree); - // map group + // map group. Imagemaps are inlines by default, so TEXT_CONTAINER. accTree = - { PARAGRAPH: [ + { TEXT_CONTAINER: [ { PARAGRAPH: [ { TEXT_LEAF: [ ] }, { LINK: [ diff --git a/accessible/tests/mochitest/treeupdate/test_imagemap.html b/accessible/tests/mochitest/treeupdate/test_imagemap.html index 0648c0d8e94..6ee44b9ac8f 100644 --- a/accessible/tests/mochitest/treeupdate/test_imagemap.html +++ b/accessible/tests/mochitest/treeupdate/test_imagemap.html @@ -427,8 +427,11 @@
-
+ src="../letters.gif"> diff --git a/layout/reftests/bugs/607267-1-ref.html b/layout/reftests/bugs/607267-1-ref.html new file mode 100644 index 00000000000..e23c4dc2b46 --- /dev/null +++ b/layout/reftests/bugs/607267-1-ref.html @@ -0,0 +1,2 @@ + +Some text on one line diff --git a/layout/reftests/bugs/607267-1.html b/layout/reftests/bugs/607267-1.html new file mode 100644 index 00000000000..1d532431012 --- /dev/null +++ b/layout/reftests/bugs/607267-1.html @@ -0,0 +1,2 @@ + +Some text on one line diff --git a/layout/reftests/bugs/reftest.list b/layout/reftests/bugs/reftest.list index f03039c304e..87df0895c14 100644 --- a/layout/reftests/bugs/reftest.list +++ b/layout/reftests/bugs/reftest.list @@ -1602,6 +1602,7 @@ fails-if(!haveTestPlugin) == 599476.html 599476-ref.html == 604737.html 604737-ref.html == 605138-1.html 605138-1-ref.html == 605157-1.xhtml 605157-1-ref.xhtml +== 607267-1.html 607267-1-ref.html == 608756-1a.html 608756-1-ref.html == 608756-1b.html 608756-1-ref.html == 608756-2.html 608756-2-ref.html diff --git a/layout/style/html.css b/layout/style/html.css index 3bbad078541..ee9e58a797a 100644 --- a/layout/style/html.css +++ b/layout/style/html.css @@ -59,7 +59,6 @@ html, html[dir], legend, legend[dir], li, li[dir], listing, listing[dir], -map, map[dir], marquee, marquee[dir], menu, menu[dir], nav, nav[dir], @@ -105,7 +104,6 @@ form, header, hgroup, html, -map, nav, section { display: block; diff --git a/layout/style/quirk.css b/layout/style/quirk.css index 5cc56a179ad..a0c3cea8f96 100644 --- a/layout/style/quirk.css +++ b/layout/style/quirk.css @@ -193,13 +193,6 @@ dl > dl { } -/* Quirk: MAP acts like an inline, not a block */ - -map { - display: inline; -} - - /* Quirk: Make floated images have a margin (b=58899) */ img[align=left] {