wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 705961 - Ensure nsDocument doesn't modify the external resource hashtable while enumerating it. r=bz

Browse Source
This commit is contained in:
Bill de Araujo 2013-02-01 16:09:00 +00:00
parent ec7920b1bb
commit 829740f015
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
content/base/src/nsDocument.cpp
View File

@ -6734,10 +6734,11 @@ nsDocument::FlushPendingNotifications(mozFlushType aType)
}
static bool
Flush(nsIDocument* aDocument, void* aData)
Copy(nsIDocument* aDocument, void* aData)
{
const mozFlushType* type = static_cast<const mozFlushType*>(aData);
aDocument->FlushPendingNotifications(*type);
nsTArray<nsCOMPtr<nsIDocument> >* resources =
static_cast<nsTArray<nsCOMPtr<nsIDocument> >* >(aData);
resources->AppendElement(aDocument);
return true;
}
@ -6746,11 +6747,15 @@ nsDocument::FlushExternalResources(mozFlushType aType)
{
NS_ASSERTION(aType >= Flush_Style,
"should only need to flush for style or higher in external resources");
if (GetDisplayDocument()) {
return;
}
EnumerateExternalResources(Flush, &aType);
nsTArray<nsCOMPtr<nsIDocument> > resources;
EnumerateExternalResources(Copy, &resources);
for (uint32_t i = 0; i < resources.Length(); i++) {
resources[i]->FlushPendingNotifications(aType);
}
}
void