diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-06-01 21:58:35 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-06-01 21:58:35 +0000 |
| commit | c6ca4380e9e5e95df9de02daf8bfb9a6ebc22810 (patch) | |
| tree | c7672903a2030d37f861b12900165a015f49d10a /layout/xul/nsRootBoxFrame.cpp | |
| parent | 451509e2c0188a4164d4b3d1d9f5839ed1e95246 (diff) | |
| parent | 744b044935f7d1d67fbe0df42d898efcbdd00536 (diff) | |
| download | UXP-c6ca4380e9e5e95df9de02daf8bfb9a6ebc22810.tar UXP-c6ca4380e9e5e95df9de02daf8bfb9a6ebc22810.tar.gz UXP-c6ca4380e9e5e95df9de02daf8bfb9a6ebc22810.tar.lz UXP-c6ca4380e9e5e95df9de02daf8bfb9a6ebc22810.tar.xz UXP-c6ca4380e9e5e95df9de02daf8bfb9a6ebc22810.zip | |
Merge remote-tracking branch 'origin/redwood' into release
Diffstat (limited to 'layout/xul/nsRootBoxFrame.cpp')
| -rw-r--r-- | layout/xul/nsRootBoxFrame.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/layout/xul/nsRootBoxFrame.cpp b/layout/xul/nsRootBoxFrame.cpp index fe41dce52..3e7515ea8 100644 --- a/layout/xul/nsRootBoxFrame.cpp +++ b/layout/xul/nsRootBoxFrame.cpp @@ -8,6 +8,7 @@ #include "nsGkAtoms.h" #include "nsIPresShell.h" #include "nsBoxFrame.h" +#include "nsDisplayList.h" #include "nsStackLayout.h" #include "nsIRootBox.h" #include "nsIContent.h" @@ -75,7 +76,6 @@ public: nsEventStatus* aEventStatus) override; virtual void BuildDisplayList(nsDisplayListBuilder* aBuilder, - const nsRect& aDirtyRect, const nsDisplayListSet& aLists) override; /** @@ -176,14 +176,14 @@ nsRootBoxFrame::Reflow(nsPresContext* aPresContext, void nsRootBoxFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder, - const nsRect& aDirtyRect, const nsDisplayListSet& aLists) { if (mContent && mContent->GetProperty(nsGkAtoms::DisplayPortMargins)) { // The XUL document's root element may have displayport margins set in // ChromeProcessController::InitializeRoot, and we should to supply the // base rect. - nsRect displayPortBase = aDirtyRect.Intersect(nsRect(nsPoint(0, 0), GetSize())); + nsRect displayPortBase = + aBuilder->GetDirtyRect().Intersect(nsRect(nsPoint(0, 0), GetSize())); nsLayoutUtils::SetDisplayPortBase(mContent, displayPortBase); } @@ -192,7 +192,7 @@ nsRootBoxFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder, // of a background display list element. DisplayBorderBackgroundOutline(aBuilder, aLists, true); - BuildDisplayListForChildren(aBuilder, aDirtyRect, aLists); + BuildDisplayListForChildren(aBuilder, aLists); } nsresult |