summaryrefslogtreecommitdiffstats
path: root/layout/generic/nsFrame.cpp
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2020-04-16 17:51:36 -0400
committerMatt A. Tobin <email@mattatobin.com>2020-04-16 17:52:30 -0400
commit1f5c67934f05d036de575c3d8172587fa6d398bc (patch)
tree2b9107c18edfe1752152febbc68f938050136d84 /layout/generic/nsFrame.cpp
parent32c3ee92b8b9b1640d346761b36c642f9a968ce3 (diff)
downloadUXP-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/nsFrame.cpp')
-rw-r--r--layout/generic/nsFrame.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index 2b81ce83b..71f6172bd 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -8964,10 +8964,10 @@ GetCorrectedParent(const nsIFrame* aFrame)
nsIContent* content = aFrame->GetContent();
Element* element =
content && content->IsElement() ? content->AsElement() : nullptr;
- if (element && element->IsNativeAnonymous() &&
+ if (element && element->IsNativeAnonymous() && !element->IsNativeScrollbarContent() &&
element->GetPseudoElementType() == aFrame->StyleContext()->GetPseudoType()) {
while (parent->GetContent() && parent->GetContent()->IsNativeAnonymous()) {
- parent = parent->GetParent();
+ parent = parent->GetInFlowParent();
}
}