From f1c2bbe99ae1ab69d85d6366aef61eaaa7d9b08f Mon Sep 17 00:00:00 2001 From: Phil Ringnalda Date: Sun, 12 Feb 2017 20:52:12 -0800 Subject: [PATCH] Backed out changeset 88b5a981e275 (bug 1324524) for Win8 reftest bustage --- .../table-bordercollapse/1324524-ref.html | 18 ------------------ .../table-bordercollapse/1324524.html | 19 ------------------- .../table-bordercollapse/reftest.list | 1 - layout/tables/nsTableCellFrame.cpp | 16 ++++++---------- 4 files changed, 6 insertions(+), 48 deletions(-) delete mode 100644 layout/reftests/table-bordercollapse/1324524-ref.html delete mode 100644 layout/reftests/table-bordercollapse/1324524.html diff --git a/layout/reftests/table-bordercollapse/1324524-ref.html b/layout/reftests/table-bordercollapse/1324524-ref.html deleted file mode 100644 index f8297b13eae2..000000000000 --- a/layout/reftests/table-bordercollapse/1324524-ref.html +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - -
diff --git a/layout/reftests/table-bordercollapse/1324524.html b/layout/reftests/table-bordercollapse/1324524.html deleted file mode 100644 index 7897ffa1b9d3..000000000000 --- a/layout/reftests/table-bordercollapse/1324524.html +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - -
diff --git a/layout/reftests/table-bordercollapse/reftest.list b/layout/reftests/table-bordercollapse/reftest.list index 0e953acaa950..e1910d93073f 100644 --- a/layout/reftests/table-bordercollapse/reftest.list +++ b/layout/reftests/table-bordercollapse/reftest.list @@ -104,4 +104,3 @@ fuzzy(255,40) == border-style-outset-becomes-groove.html border-style-outset-bec # So get 40 pixels of fuzz, 20 at each beveled corner (because the border width # is 20px). fuzzy(255,40) == border-style-inset-becomes-ridge.html border-style-inset-becomes-ridge-ref.html -fuzzy(1,8301) == 1324524.html 1324524-ref.html diff --git a/layout/tables/nsTableCellFrame.cpp b/layout/tables/nsTableCellFrame.cpp index ac7e3e860a48..195ba8f5d8c4 100644 --- a/layout/tables/nsTableCellFrame.cpp +++ b/layout/tables/nsTableCellFrame.cpp @@ -502,20 +502,16 @@ nsTableCellFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder, if (aBuilder->IsForEventDelivery() || !StyleBackground()->IsTransparent(this) || StyleDisplay()->mAppearance) { - if (!tableFrame->IsBorderCollapse()) { + if (!tableFrame->IsBorderCollapse() || + aBuilder->IsAtRootOfPseudoStackingContext() || + aBuilder->IsForEventDelivery()) { + // The cell background was not painted by the nsTablePainter, + // so we need to do it. We have special background processing here + // so we need to duplicate some code from nsFrame::DisplayBorderBackgroundOutline nsDisplayBackgroundImage::AppendBackgroundItemsToTop(aBuilder, this, GetRectRelativeToSelf(), aLists.BorderBackground()); - } else if (aBuilder->IsAtRootOfPseudoStackingContext() || - aBuilder->IsForEventDelivery()) { - // The cell background was not painted by the nsTablePainter, - // so we need to do it. We have special background processing here - // so we need to duplicate some code from nsFrame::DisplayBorderBackgroundOutline - nsDisplayTableItem* item = - new (aBuilder) nsDisplayTableCellBackground(aBuilder, this); - aLists.BorderBackground()->AppendNewToTop(item); - item->UpdateForFrameBackground(this); } else { // The nsTablePainter will paint our background. Make sure it // knows if we're background-attachment:fixed.