mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-08 02:14:43 +00:00
Bug 580834. Make nsLayoutUtils::GetActiveScrolledRoot stop at the nearest popup ancestor instead of asserting. r=tnikkel,a=dbaron
This commit is contained in:
parent
b77ef45783
commit
50f42b728b
5
layout/base/crashtests/580834-1.xhtml
Normal file
5
layout/base/crashtests/580834-1.xhtml
Normal file
@ -0,0 +1,5 @@
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<body>
|
||||
<menuitem xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"><tooltip/><vbox xmlns="http://www.w3.org/1999/xhtml"></vbox></menuitem>
|
||||
</body>
|
||||
</html>
|
@ -306,3 +306,4 @@ load 569018-1.html
|
||||
load 572003.xul
|
||||
load 572582-1.xhtml
|
||||
load 580494-1.html
|
||||
load 580834-1.xhtml
|
||||
|
@ -685,7 +685,8 @@ nsLayoutUtils::GetActiveScrolledRootFor(nsIFrame* aFrame,
|
||||
{
|
||||
nsIFrame* f = aFrame;
|
||||
while (f != aStopAtAncestor) {
|
||||
NS_ASSERTION(!IsPopup(f), "Should have stopped before popup");
|
||||
if (IsPopup(f))
|
||||
break;
|
||||
nsIFrame* parent = GetCrossDocParentFrame(f);
|
||||
if (!parent)
|
||||
break;
|
||||
|
Loading…
Reference in New Issue
Block a user