Bug 1419546 - Consider mLayer in nsDisplayTableBackgroundImage::GetPerFrameKey(). r=mattwoodrow
☠☠ backed out by b027efb62997 ☠ ☠
authorMorris Tseng <mtseng@mozilla.com>
Wed, 13 Dec 2017 10:44:17 -0600
changeset 447979 1444a77d7e453402776fd08bfa72de2d40de46cf
parent 447978 de51994befaf203355ce845590ec899000be46dc
child 447980 7c394ade418a7158173255f47be72bf618199ebd
push id8527
push userCallek@gmail.com
push dateThu, 11 Jan 2018 21:05:50 +0000
treeherdermozilla-beta@95342d212a7a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmattwoodrow
bugs1419546
milestone59.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1419546 - Consider mLayer in nsDisplayTableBackgroundImage::GetPerFrameKey(). r=mattwoodrow MozReview-Commit-ID: Bqk0U4REESW
layout/painting/nsDisplayList.h
--- a/layout/painting/nsDisplayList.h
+++ b/layout/painting/nsDisplayList.h
@@ -3842,17 +3842,18 @@ TableType GetTableTypeFromFrame(nsIFrame
  *
  * Also store ancestor frame as mStyleFrame for all rendering informations.
  */
 class nsDisplayTableBackgroundImage : public nsDisplayBackgroundImage {
 public:
   nsDisplayTableBackgroundImage(const InitData& aInitData, nsIFrame* aCellFrame);
 
   virtual uint32_t GetPerFrameKey() const override {
-    return (static_cast<uint8_t>(mTableType) << TYPE_BITS) |
+    return (mLayer << (TYPE_BITS + static_cast<uint8_t>(TableTypeBits::COUNT))) |
+           (static_cast<uint8_t>(mTableType) << TYPE_BITS) |
            nsDisplayItem::GetPerFrameKey();
   }
 
   virtual bool IsInvalid(nsRect& aRect) const override;
 
   virtual nsIFrame* FrameForInvalidation() const override { return mStyleFrame; }
 
   NS_DISPLAY_DECL_NAME("TableBackgroundImage", TYPE_TABLE_BACKGROUND_IMAGE)