Bug 1363483 - Add nsDisplayTableBackgroundColor to avoid display item…

… collision when processing background color of table. r=mattwoodrow MozReview-Commit-ID: JlYqyRGvtq3 UltraBlame original commit: efdda23fd13d44093c45cf8eabfc67eeab608f18
marco-c · Oct 1, 2019 · f4e6676 · f4e6676
1 parent 8e28499
commit f4e6676
Show file tree

Hide file tree

Showing 2 changed files with 125 additions and 0 deletions.
diff --git a/layout/painting/nsDisplayList.cpp b/layout/painting/nsDisplayList.cpp
@@ -16713,6 +16713,43 @@ useWillPaintBorderOptimization
 )
 ;
 }
+if
+(
+aSecondaryReferenceFrame
+)
+{
+bgItemList
+.
+AppendNewToTop
+(
+new
+(
+aBuilder
+)
+nsDisplayTableBackgroundColor
+(
+aBuilder
+aSecondaryReferenceFrame
+bgRect
+bg
+drawBackgroundColor
+?
+color
+:
+NS_RGBA
+(
+0
+0
+0
+0
+)
+aFrame
+)
+)
+;
+}
+else
+{
 bgItemList
 .
 AppendNewToTop
@@ -16742,6 +16779,7 @@ NS_RGBA
 )
 ;
 }
+}
 if
 (
 isThemed

diff --git a/layout/painting/nsDisplayList.h b/layout/painting/nsDisplayList.h
@@ -10230,6 +10230,93 @@ mColor
 }
 ;
 class
+nsDisplayTableBackgroundColor
+:
+public
+nsDisplayBackgroundColor
+{
+public
+:
+nsDisplayTableBackgroundColor
+(
+nsDisplayListBuilder
+*
+aBuilder
+nsIFrame
+*
+aFrame
+const
+nsRect
+&
+aBackgroundRect
+const
+nsStyleBackground
+*
+aBackgroundStyle
+nscolor
+aColor
+nsIFrame
+*
+aAncestorFrame
+)
+:
+nsDisplayBackgroundColor
+(
+aBuilder
+aFrame
+aBackgroundRect
+aBackgroundStyle
+aColor
+)
+mTableType
+(
+GetTableTypeFromFrame
+(
+aAncestorFrame
+)
+)
+{
+}
+virtual
+uint32_t
+GetPerFrameKey
+(
+)
+override
+{
+return
+(
+static_cast
+<
+uint8_t
+>
+(
+mTableType
+)
+<
+<
+nsDisplayItem
+:
+:
+TYPE_BITS
+)
+|
+nsDisplayItem
+:
+:
+GetPerFrameKey
+(
+)
+;
+}
+protected
+:
+TableType
+mTableType
+;
+}
+;
+class
 nsDisplayClearBackground
 :
 public