Issue #1355 - Fix the nit, remove nsPoint offset in nsFrame.cpp and change PresShellState member order

This commit is contained in:
win7-7 2020-05-10 15:00:08 +03:00 • committed by Roy Tam
commit e87c06beb3
3 changed files with 3 additions and 5 deletions

View file

@ -882,8 +882,7 @@ void nsDisplayListBuilder::MarkOutOfFlowFrameForDisplay(nsIFrame* aDirtyFrame,
} }
} }
nsPoint offset = aFrame->GetOffsetTo(aDirtyFrame); nsRect dirty = dirtyRectRelativeToDirtyFrame - aFrame->GetOffsetTo(aDirtyFrame);
nsRect dirty = dirtyRectRelativeToDirtyFrame - offset;
nsRect overflowRect = aFrame->GetVisualOverflowRect(); nsRect overflowRect = aFrame->GetVisualOverflowRect();
if (aFrame->IsTransformed() && if (aFrame->IsTransformed() &&

View file

@ -1195,11 +1195,11 @@ private:
nsRect mCaretRect; nsRect mCaretRect;
uint32_t mFirstFrameMarkedForDisplay; uint32_t mFirstFrameMarkedForDisplay;
bool mIsBackgroundOnly; bool mIsBackgroundOnly;
nsIFrame* mPresShellIgnoreScrollFrame;
// This is a per-document flag turning off event handling for all content // This is a per-document flag turning off event handling for all content
// in the document, and is set when we enter a subdocument for a pointer- // in the document, and is set when we enter a subdocument for a pointer-
// events:none frame. // events:none frame.
bool mInsidePointerEventsNoneDoc; bool mInsidePointerEventsNoneDoc;
nsIFrame* mPresShellIgnoreScrollFrame;
}; };
PresShellState* CurrentPresShellState() { PresShellState* CurrentPresShellState() {

View file

@ -2707,8 +2707,7 @@ nsIFrame::BuildDisplayListForChild(nsDisplayListBuilder* aBuilder,
// dirty rect in child-relative coordinates // dirty rect in child-relative coordinates
NS_ASSERTION(aBuilder->GetCurrentFrame() == this, "Wrong coord space!"); NS_ASSERTION(aBuilder->GetCurrentFrame() == this, "Wrong coord space!");
nsPoint offset = child->GetOffsetTo(this); nsRect dirty = aBuilder->GetDirtyRect() - child->GetOffsetTo(this);
nsRect dirty = aBuilder->GetDirtyRect() - offset;
if (childType == nsGkAtoms::placeholderFrame) { if (childType == nsGkAtoms::placeholderFrame) {
isPlaceholder = true; isPlaceholder = true;