diff options
| author | win7-7 <win7-7@users.noreply.github.com> | 2020-05-10 15:00:08 +0300 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-05-20 13:49:35 +0000 |
| commit | 3a1bebfb87d994b810574fdfeba09683e80cd2c9 (patch) | |
| tree | bb836adff7cda14d03eddee6397c6d4face82603 /layout/base | |
| parent | d3d3aad6e52397334844ed80f8db650174937854 (diff) | |
| download | UXP-3a1bebfb87d994b810574fdfeba09683e80cd2c9.tar UXP-3a1bebfb87d994b810574fdfeba09683e80cd2c9.tar.gz UXP-3a1bebfb87d994b810574fdfeba09683e80cd2c9.tar.lz UXP-3a1bebfb87d994b810574fdfeba09683e80cd2c9.tar.xz UXP-3a1bebfb87d994b810574fdfeba09683e80cd2c9.zip | |
Issue #1355 - Fix the nit, remove nsPoint offset in nsFrame.cpp and change PresShellState member order
Diffstat (limited to 'layout/base')
| -rw-r--r-- | layout/base/nsDisplayList.cpp | 3 | ||||
| -rw-r--r-- | layout/base/nsDisplayList.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp index 55461f7c0..73e991246 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 ff2a14dd7..9eac132fa 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() { |