mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-24 19:37:15 +00:00
Fix crash due to text inputs flushing pending restyles while we're in text
control frame code. Bug 257818, r+sr=dbaron
This commit is contained in:
parent
0fe0345b40
commit
7f286e3000
@ -2226,10 +2226,6 @@ nsGenericHTMLElement::GetPrimaryFrameFor(nsIContent* aContent,
|
|||||||
// Cause a flush of content, so we get up-to-date frame
|
// Cause a flush of content, so we get up-to-date frame
|
||||||
// information
|
// information
|
||||||
aDocument->FlushPendingNotifications(Flush_Frames);
|
aDocument->FlushPendingNotifications(Flush_Frames);
|
||||||
} else {
|
|
||||||
// Still need to flush out style reresolves so we don't hand back
|
|
||||||
// a frame that could get destroyed on layout flush
|
|
||||||
aDocument->FlushPendingNotifications(Flush_StyleReresolves);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get presentation shell 0
|
// Get presentation shell 0
|
||||||
|
@ -5016,7 +5016,7 @@ PresShell::EndReflowBatching(PRBool aFlushPendingReflows)
|
|||||||
nsresult rv = NS_OK;
|
nsresult rv = NS_OK;
|
||||||
mBatchReflows = PR_FALSE;
|
mBatchReflows = PR_FALSE;
|
||||||
if (aFlushPendingReflows) {
|
if (aFlushPendingReflows) {
|
||||||
rv = FlushPendingNotifications(Flush_Layout);
|
rv = FlushPendingNotifications(Flush_OnlyReflow);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
PostReflowEvent();
|
PostReflowEvent();
|
||||||
|
@ -5016,7 +5016,7 @@ PresShell::EndReflowBatching(PRBool aFlushPendingReflows)
|
|||||||
nsresult rv = NS_OK;
|
nsresult rv = NS_OK;
|
||||||
mBatchReflows = PR_FALSE;
|
mBatchReflows = PR_FALSE;
|
||||||
if (aFlushPendingReflows) {
|
if (aFlushPendingReflows) {
|
||||||
rv = FlushPendingNotifications(Flush_Layout);
|
rv = FlushPendingNotifications(Flush_OnlyReflow);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
PostReflowEvent();
|
PostReflowEvent();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user