diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2020-04-16 17:51:36 -0400 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2020-04-16 17:52:30 -0400 |
| commit | 1f5c67934f05d036de575c3d8172587fa6d398bc (patch) | |
| tree | 2b9107c18edfe1752152febbc68f938050136d84 /layout/generic/nsIFrameInlines.h | |
| parent | 32c3ee92b8b9b1640d346761b36c642f9a968ce3 (diff) | |
| download | UXP-1f5c67934f05d036de575c3d8172587fa6d398bc.tar UXP-1f5c67934f05d036de575c3d8172587fa6d398bc.tar.gz UXP-1f5c67934f05d036de575c3d8172587fa6d398bc.tar.lz UXP-1f5c67934f05d036de575c3d8172587fa6d398bc.tar.xz UXP-1f5c67934f05d036de575c3d8172587fa6d398bc.zip | |
Bug 1343937 - Fix a crash in nsWrapperCache.h
* Implement and use GetInFlowParent
* Exempt scrollbar NAC from the new NAC semantics
Tag #1375
Diffstat (limited to 'layout/generic/nsIFrameInlines.h')
| -rw-r--r-- | layout/generic/nsIFrameInlines.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/layout/generic/nsIFrameInlines.h b/layout/generic/nsIFrameInlines.h index eb9a7202a..3068c9f79 100644 --- a/layout/generic/nsIFrameInlines.h +++ b/layout/generic/nsIFrameInlines.h @@ -8,8 +8,10 @@ #define nsIFrameInlines_h___ #include "nsContainerFrame.h" +#include "nsPlaceholderFrame.h" #include "nsStyleStructInlines.h" #include "nsCSSAnonBoxes.h" +#include "nsFrameManager.h" bool nsIFrame::IsFlexItem() const @@ -160,4 +162,15 @@ nsIFrame::BaselineBOffset(mozilla::WritingMode aWM, return SynthesizeBaselineBOffsetFromBorderBox(aWM, aBaselineGroup); } +nsContainerFrame* +nsIFrame::GetInFlowParent() +{ + if (GetStateBits() & NS_FRAME_OUT_OF_FLOW) { + nsFrameManager* fm = PresContext()->FrameManager(); + return fm->GetPlaceholderFrameFor(FirstContinuation())->GetParent(); + } + + return GetParent(); +} + #endif |