diff options
| author | Moonchild <moonchild@palemoon.org> | 2021-01-19 08:08:18 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2021-01-19 08:08:18 +0000 |
| commit | c76214f0b54cf74b69d0fb4afa0d2eca2e898a98 (patch) | |
| tree | 15ee2e9776727ecabcdc52d06de55dfd576485c1 /layout/reftests/table-bordercollapse | |
| parent | 810c2bf8080da2bc8ec4efb05223fea31817944b (diff) | |
| parent | 75286e68d703b1d8a4e0a7c72ce45d089024c124 (diff) | |
| download | UXP-c76214f0b54cf74b69d0fb4afa0d2eca2e898a98.tar UXP-c76214f0b54cf74b69d0fb4afa0d2eca2e898a98.tar.gz UXP-c76214f0b54cf74b69d0fb4afa0d2eca2e898a98.tar.lz UXP-c76214f0b54cf74b69d0fb4afa0d2eca2e898a98.tar.xz UXP-c76214f0b54cf74b69d0fb4afa0d2eca2e898a98.zip | |
Master merge
This merges master into release to replace Redwood.
# Conflicts:
# CLOBBER
# build/moz.configure/old.configure
# config/milestone.txt
# config/moz.build
# config/system-headers
# dom/abort/AbortController.cpp
# dom/abort/AbortController.h
# dom/abort/AbortSignal.cpp
# dom/abort/AbortSignal.h
# dom/abort/moz.build
# dom/abort/tests/moz.build
# dom/animation/KeyframeEffect.cpp
# dom/base/CustomElementRegistry.cpp
# dom/base/DocGroup.cpp
# dom/base/ResizeObserverController.cpp
# dom/base/ResizeObserverController.h
# dom/base/nsContentUtils.cpp
# dom/base/nsContentUtils.h
# dom/base/nsDocument.cpp
# dom/base/nsIDocument.h
# dom/fetch/FetchObserver.cpp
# dom/fetch/FetchObserver.h
# dom/heapsnapshot/AutoMemMap.cpp
# dom/heapsnapshot/AutoMemMap.h
# dom/heapsnapshot/CoreDump.proto
# dom/heapsnapshot/HeapSnapshot.cpp
# dom/heapsnapshot/HeapSnapshotTempFileHelperChild.h
# dom/heapsnapshot/HeapSnapshotTempFileHelperParent.cpp
# dom/heapsnapshot/HeapSnapshotTempFileHelperParent.h
# dom/heapsnapshot/PHeapSnapshotTempFileHelper.ipdl
# dom/heapsnapshot/moz.build
# dom/heapsnapshot/tests/gtest/moz.build
# dom/html/nsGenericHTMLElement.h
# dom/media/platforms/PlatformDecoderModule.h
# dom/media/platforms/moz.build
# dom/script/ModuleLoadRequest.cpp
# dom/script/ModuleLoadRequest.h
# dom/script/ModuleScript.cpp
# dom/script/ModuleScript.h
# dom/script/ScriptElement.cpp
# dom/script/ScriptElement.h
# dom/script/ScriptLoadHandler.cpp
# dom/script/ScriptLoadHandler.h
# dom/script/ScriptLoader.cpp
# dom/script/ScriptLoader.h
# dom/script/ScriptSettings.cpp
# dom/script/ScriptSettings.h
# dom/script/nsIScriptElement.h
# dom/script/nsIScriptLoaderObserver.idl
# dom/webidl/HTMLLinkElement.webidl
# gfx/gl/moz.build
# gfx/graphite2/src/moz.build
# gfx/layers/moz.build
# js/ductwork/inspector/moz.build
# js/ductwork/moz.build
# js/src/gc/Heap.h
# js/src/moz.build
# js/src/vm/UnboxedObject-inl.h
# js/src/vm/UnboxedObject.cpp
# js/src/vm/UnboxedObject.h
# layout/base/crashtests/crashtests.list
# layout/build/moz.build
# layout/generic/AspectRatio.h
# layout/generic/crashtests/crashtests.list
# layout/reftests/bidi/reftest-stylo.list
# layout/reftests/reftest-stylo.list
# layout/reftests/table-bordercollapse/reftest.list
# layout/reftests/writing-mode/reftest-stylo.list
# layout/style/StyleSheet.cpp
# layout/style/nsRuleNode.cpp
# layout/style/nsStyleStruct.cpp
# layout/style/nsStyleStruct.h
# modules/libpref/init/all.js
# nsprpub/pr/src/linking/prlink.c
# parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/AttributeName.java
# parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/ElementName.java
# parser/html/nsHtml5AtomList.h
# parser/html/nsHtml5AttributeName.cpp
# parser/html/nsHtml5AttributeName.h
# parser/html/nsHtml5ElementName.cpp
# parser/html/nsHtml5ElementName.h
# parser/html/nsHtml5TreeBuilderCppSupplement.h
# parser/htmlparser/nsElementTable.cpp
# parser/htmlparser/nsHTMLTagList.h
# security/nss/lib/nss/nss.h
# security/nss/lib/softoken/pkcs11.c
# security/nss/lib/softoken/softkver.h
# security/nss/lib/util/nssutil.h
# testing/web-platform/tests/tools/html5lib/html5lib/html5parser.py
# testing/web-platform/tests/tools/html5lib/html5lib/treebuilders/_base.py
# toolkit/modules/AppConstants.jsm
Diffstat (limited to 'layout/reftests/table-bordercollapse')
4 files changed, 62 insertions, 107 deletions
diff --git a/layout/reftests/table-bordercollapse/bug1379306-ref.html b/layout/reftests/table-bordercollapse/bug1379306-ref.html new file mode 100644 index 000000000..76c8ef813 --- /dev/null +++ b/layout/reftests/table-bordercollapse/bug1379306-ref.html @@ -0,0 +1,31 @@ +<!DOCTYPE html> +<title>Table Cell Testcase, bug 1379306</title> +<style> + table.collapse { + border-collapse: collapse; + } + td { + border: 20px solid #aaa; + width: 120px; + height: 150px; + } + .first { + background-color: #000; + position: absolute; + top: 20px; + left: 20px; + height: 10px; + width: 20px + } +</style> +<h1>Table Cell Testcase, bug 1379306</h1> + +<div style="position: relative;"> + <table class="collapse"> + <tr> + <td> + <div class="first"></div> + </td> + </tr> + </table> +</div>
\ No newline at end of file diff --git a/layout/reftests/table-bordercollapse/bug1379306.html b/layout/reftests/table-bordercollapse/bug1379306.html new file mode 100644 index 000000000..2d7f4bce4 --- /dev/null +++ b/layout/reftests/table-bordercollapse/bug1379306.html @@ -0,0 +1,30 @@ +<!DOCTYPE html> +<title>Table Cell Testcase, bug 1379306</title> +<style> + table.collapse { + border-collapse: collapse; + } + td { + border: 20px solid #aaa; + width: 120px; + height: 150px; + position: relative; + } + div { + background-color: #000; + position: absolute; + top: 0; + left: 0; + height: 10px; + width: 20px + } +</style> +<h1>Table Cell Testcase, bug 1379306</h1> + +<table class="collapse"> + <tr> + <td> + <div></div> + </td> + </tr> +</table>
\ No newline at end of file diff --git a/layout/reftests/table-bordercollapse/reftest-stylo.list b/layout/reftests/table-bordercollapse/reftest-stylo.list deleted file mode 100644 index 2821d7e2e..000000000 --- a/layout/reftests/table-bordercollapse/reftest-stylo.list +++ /dev/null @@ -1,107 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -== bc_dyn_cell1.html bc_dyn_cell1.html -== bc_dyn_cell2.html bc_dyn_cell2.html -== bc_dyn_cell3.html bc_dyn_cell3.html -== bc_dyn_cell4.html bc_dyn_cell4.html -== bc_dyn_cell5.html bc_dyn_cell5.html -== bc_dyn_row1.html bc_dyn_row1.html -== bc_dyn_row2.html bc_dyn_row2.html -== bc_dyn_row3.html bc_dyn_row3.html -== bc_dyn_rg1.html bc_dyn_rg1.html -== bc_dyn_rg2.html bc_dyn_rg2.html -== bc_dyn_rg3.html bc_dyn_rg3.html -== bc_dyn_col1.html bc_dyn_col1.html -== bc_dyn_col2.html bc_dyn_col2.html -== bc_dyn_col3.html bc_dyn_col3.html -== bc_dyn_cg1.html bc_dyn_cg1.html -== bc_dyn_cg2.html bc_dyn_cg2.html -== bc_dyn_cg3.html bc_dyn_cg3.html -== bc_dyn_table1.html bc_dyn_table1.html -== bc_dyn_table2.html bc_dyn_table2.html -== bc_dyn_table3.html bc_dyn_table3.html -== bc_borderoffset1.html bc_borderoffset1.html -== bc_borderoffset2.html bc_borderoffset2.html -== frame_above_rules_all.html frame_above_rules_all.html -== frame_above_rules_cols.html frame_above_rules_cols.html -== frame_above_rules_groups.html frame_above_rules_groups.html -== frame_above_rules_none.html frame_above_rules_none.html -== frame_above_rules_rows.html frame_above_rules_rows.html -== frame_below_rules_all.html frame_below_rules_all.html -== frame_below_rules_cols.html frame_below_rules_cols.html -== frame_below_rules_groups.html frame_below_rules_groups.html -== frame_below_rules_none.html frame_below_rules_none.html -== frame_below_rules_rows.html frame_below_rules_rows.html -== frame_border_rules_all.html frame_border_rules_all.html -== frame_border_rules_cols.html frame_border_rules_cols.html -== frame_border_rules_groups.html frame_border_rules_groups.html -== frame_border_rules_none.html frame_border_rules_none.html -== frame_border_rules_rows.html frame_border_rules_rows.html -== frame_box_rules_all.html frame_box_rules_all.html -== frame_box_rules_cols.html frame_box_rules_cols.html -== frame_box_rules_groups.html frame_box_rules_groups.html -== frame_box_rules_none.html frame_box_rules_none.html -== frame_box_rules_none-collapse.html frame_box_rules_none-collapse.html -== frame_box_rules_rows.html frame_box_rules_rows.html -== frame_hsides_rules_all.html frame_hsides_rules_all.html -== frame_hsides_rules_cols.html frame_hsides_rules_cols.html -== frame_hsides_rules_groups.html frame_hsides_rules_groups.html -== frame_hsides_rules_none.html frame_hsides_rules_none.html -skip == frame_hsides_rules_rows.html frame_hsides_rules_rows.html -== frame_lhs_rules_all.html frame_lhs_rules_all.html -== frame_lhs_rules_cols.html frame_lhs_rules_cols.html -== frame_lhs_rules_groups.html frame_lhs_rules_groups.html -== frame_lhs_rules_none.html frame_lhs_rules_none.html -== frame_lhs_rules_rows.html frame_lhs_rules_rows.html -== frame_rhs_rules_all.html frame_rhs_rules_all.html -== frame_rhs_rules_cols.html frame_rhs_rules_cols.html -== frame_rhs_rules_groups.html frame_rhs_rules_groups.html -== frame_rhs_rules_none.html frame_rhs_rules_none.html -== frame_rhs_rules_rows.html frame_rhs_rules_rows.html -== frame_void_rules_all.html frame_void_rules_all.html -== frame_void_rules_cols.html frame_void_rules_cols.html -== frame_void_rules_groups.html frame_void_rules_groups.html -== frame_void_rules_none.html frame_void_rules_none.html -== frame_void_rules_rows.html frame_void_rules_rows.html -== frame_vsides_rules_all.html frame_vsides_rules_all.html -== frame_vsides_rules_cols.html frame_vsides_rules_cols.html -== frame_vsides_rules_groups.html frame_vsides_rules_groups.html -== frame_vsides_rules_none.html frame_vsides_rules_none.html -== frame_vsides_rules_rows.html frame_vsides_rules_rows.html -== borderhandling-1.html borderhandling-1.html -== borderhandling-2.html borderhandling-2.html -== borderhandling-3.html borderhandling-3.html -== borderhandling-4.html borderhandling-4.html -== borderhandling-5.xhtml borderhandling-5.xhtml -== borderhandling-6.xhtml borderhandling-6.xhtml -== borderhandling-7.xhtml borderhandling-7.xhtml -== borderhandling-8.html borderhandling-8.html -== borderhandling-frame-border.html borderhandling-frame-border.html -== borderhandling-rules-border-empty-quirks.html borderhandling-rules-border-empty-quirks.html -== borderhandling-rules-border-rules-quirks.html borderhandling-rules-border-rules-quirks.html -== borderhandling-rules-border-none-quirks.html borderhandling-rules-border-none-quirks.html -== borderhandling-rules-border-groups-quirks.html borderhandling-rules-border-groups-quirks.html -== borderhandling-rules-border-rows-quirks.html borderhandling-rules-border-rows-quirks.html -skip == borderhandling-rules-border-cols-quirks.html borderhandling-rules-border-cols-quirks.html -== borderhandling-rules-border-all-quirks.html borderhandling-rules-border-all-quirks.html -== borderhandling-rules-border-empty-strict.html borderhandling-rules-border-empty-strict.html -== borderhandling-rules-border-rules-strict.html borderhandling-rules-border-rules-strict.html -== borderhandling-rules-border-none-strict.html borderhandling-rules-border-none-strict.html -== borderhandling-rules-border-groups-strict.html borderhandling-rules-border-groups-strict.html -== borderhandling-rules-border-rows-strict.html borderhandling-rules-border-rows-strict.html -== borderhandling-rules-border-cols-strict.html borderhandling-rules-border-cols-strict.html -== borderhandling-rules-border-all-strict.html borderhandling-rules-border-all-strict.html -== bordercolor-1.html bordercolor-1.html -== bordercolor-2.html bordercolor-2.html -== bordercolor-3.html bordercolor-3.html -== bordercolor-4.html bordercolor-4.html -== empty-toprow.html empty-toprow.html -== double_borders.html double_borders.html -== border-collapse-rtl.html border-collapse-rtl.html -# Fuzzy because for some reason the corner beveling is antialiased differently. -# So get 40 pixels of fuzz, 20 at each beveled corner (because the border width -# is 20px). -== border-style-outset-becomes-groove.html border-style-outset-becomes-groove.html -# Fuzzy because for some reason the corner beveling is antialiased differently. -# So get 40 pixels of fuzz, 20 at each beveled corner (because the border width -# is 20px). -== border-style-inset-becomes-ridge.html border-style-inset-becomes-ridge.html diff --git a/layout/reftests/table-bordercollapse/reftest.list b/layout/reftests/table-bordercollapse/reftest.list index 2610d202d..2cd93397e 100644 --- a/layout/reftests/table-bordercollapse/reftest.list +++ b/layout/reftests/table-bordercollapse/reftest.list @@ -3,6 +3,7 @@ == bug1375518-3.html bug1375518-ref.html == bug1375518-4.html bug1375518-4-ref.html == bug1375518-5.html bug1375518-5-ref.html +== bug1379306.html bug1379306-ref.html == bug1394226.html bug1394226-ref.html != bug1394226.html bug1394226-notref.html == bc_dyn_cell1.html bc_dyn_cell1_ref.html |