mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-13 05:15:45 +00:00
Bug 1405830 - Reset aStatus before calling nsHTMLScrollFrame::Reflow() the second time. r=dholbert
nsListControlFrame's Reflow() and ReflowAsDropdown() might need to call nsHTMLScrollFrame::Reflow() twice. In case that happens, reset aStatus to ensure nsHTMLScrollFrame::Reflow() always uses a fresh status. MozReview-Commit-ID: LwdsvRHpCt5 --HG-- extra : rebase_source : 67bbe7c759616be15452913cb1685bfb0fee4fae
This commit is contained in:
parent
c0799cfa99
commit
abaaefa126
19
layout/forms/crashtests/1405830.html
Normal file
19
layout/forms/crashtests/1405830.html
Normal file
@ -0,0 +1,19 @@
|
||||
<html>
|
||||
<head>
|
||||
<style>
|
||||
#a { display: -webkit-box }
|
||||
* { column-width: 0em }
|
||||
</style>
|
||||
<script>
|
||||
function go() {
|
||||
document.body.appendChild(a);
|
||||
}
|
||||
</script>
|
||||
<body onload=go()>
|
||||
<select id="a" multiple=""></select>
|
||||
0
|
||||
Q
|
||||
-
|
||||
w
|
||||
g
|
||||
k
|
@ -69,3 +69,4 @@ load 1228670.xhtml
|
||||
load 1279354.html
|
||||
load 1388230-1.html
|
||||
load 1388230-2.html
|
||||
load 1405830.html
|
||||
|
@ -490,6 +490,7 @@ nsListControlFrame::Reflow(nsPresContext* aPresContext,
|
||||
// XXXbz to make the ascent really correct, we should add our
|
||||
// mComputedPadding.top to it (and subtract it from descent). Need that
|
||||
// because nsGfxScrollFrame just adds in the border....
|
||||
aStatus.Reset();
|
||||
nsHTMLScrollFrame::Reflow(aPresContext, aDesiredSize, state, aStatus);
|
||||
}
|
||||
|
||||
@ -614,6 +615,7 @@ nsListControlFrame::ReflowAsDropdown(nsPresContext* aPresContext,
|
||||
|
||||
mLastDropdownComputedBSize = state.ComputedBSize();
|
||||
|
||||
aStatus.Reset();
|
||||
nsHTMLScrollFrame::Reflow(aPresContext, aDesiredSize, state, aStatus);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user