summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--layout/base/nsDisplayList.cpp3
-rw-r--r--layout/base/nsDisplayList.h2
-rw-r--r--layout/generic/nsFrame.cpp3
3 files changed, 3 insertions, 5 deletions
diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp
index 55461f7c0a..73e991246a 100644
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -882,8 +882,7 @@ void nsDisplayListBuilder::MarkOutOfFlowFrameForDisplay(nsIFrame* aDirtyFrame,
}
}
- nsPoint offset = aFrame->GetOffsetTo(aDirtyFrame);
- nsRect dirty = dirtyRectRelativeToDirtyFrame - offset;
+ nsRect dirty = dirtyRectRelativeToDirtyFrame - aFrame->GetOffsetTo(aDirtyFrame);
nsRect overflowRect = aFrame->GetVisualOverflowRect();
if (aFrame->IsTransformed() &&
diff --git a/layout/base/nsDisplayList.h b/layout/base/nsDisplayList.h
index ff2a14dd77..9eac132fa7 100644
--- a/layout/base/nsDisplayList.h
+++ b/layout/base/nsDisplayList.h
@@ -1195,11 +1195,11 @@ private:
nsRect mCaretRect;
uint32_t mFirstFrameMarkedForDisplay;
bool mIsBackgroundOnly;
- nsIFrame* mPresShellIgnoreScrollFrame;
// 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-
// events:none frame.
bool mInsidePointerEventsNoneDoc;
+ nsIFrame* mPresShellIgnoreScrollFrame;
};
PresShellState* CurrentPresShellState() {
diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index 8ba0bbf124..1c31f517d0 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -2707,8 +2707,7 @@ nsIFrame::BuildDisplayListForChild(nsDisplayListBuilder* aBuilder,
// dirty rect in child-relative coordinates
NS_ASSERTION(aBuilder->GetCurrentFrame() == this, "Wrong coord space!");
- nsPoint offset = child->GetOffsetTo(this);
- nsRect dirty = aBuilder->GetDirtyRect() - offset;
+ nsRect dirty = aBuilder->GetDirtyRect() - child->GetOffsetTo(this);
if (childType == nsGkAtoms::placeholderFrame) {
isPlaceholder = true;