diff --git a/layout/reftests/columns/columnfill-overflow-style-ref.html b/layout/reftests/columns/columnfill-overflow-style-ref.html new file mode 100644 index 000000000000..faa69de1cddb --- /dev/null +++ b/layout/reftests/columns/columnfill-overflow-style-ref.html @@ -0,0 +1,21 @@ + + + + Bug 715203: Multicolumn support in scrolled columns + + + +
+
  • one +
  • two +
  • three +
    • + + diff --git a/layout/reftests/columns/columnfill-overflow-style.html b/layout/reftests/columns/columnfill-overflow-style.html new file mode 100644 index 000000000000..536a6a6fe75c --- /dev/null +++ b/layout/reftests/columns/columnfill-overflow-style.html @@ -0,0 +1,22 @@ + + + + Bug 715203: Multicolumn support in scrolled columns + + + +
    +
  • one +
  • two +
  • three +
    • + + diff --git a/layout/reftests/columns/reftest.list b/layout/reftests/columns/reftest.list index 1d7e9bd89439..93f64903cf81 100644 --- a/layout/reftests/columns/reftest.list +++ b/layout/reftests/columns/reftest.list @@ -16,10 +16,15 @@ == column-balancing-002.html column-balancing-002.ref.html == column-balancing-003.html column-balancing-000.ref.html == column-balancing-004.html column-balancing-004.ref.html + +# These next tests need to be a http tests because they use the ahem font, +# located in layout/reftests/fonts. HTTP(..) == columnfill-balance.html columnfill-balance-ref.html HTTP(..) == columnfill-auto.html columnfill-auto-ref.html HTTP(..) == columnfill-change.html columnfill-change-ref.html + == columnrule-basic.html columnrule-basic-ref.html == columnrule-complex.html columnrule-complex-ref.html != columnrule-linestyles.html columnrule-linestyles-notref.html == columnrule-padding.html columnrule-padding-ref.html +== columnfill-overflow-style.html columnfill-overflow-style-ref.html diff --git a/layout/style/ua.css b/layout/style/ua.css index df2af3a7d653..154b7461246d 100644 --- a/layout/style/ua.css +++ b/layout/style/ua.css @@ -162,6 +162,7 @@ -moz-column-width: inherit; -moz-column-gap: inherit; -moz-column-rule: inherit; + -moz-column-fill: inherit; /* Do not change these. nsCSSFrameConstructor depends on them to create a good frame tree. */ position: static !important;