зеркало из https://github.com/mozilla/pjs.git
bug 314091 Fix users of mozAutoDocUpdate to actually declare a local variable,
so that the destructor doesn't get called immediately r+sr=bz
This commit is contained in:
Родитель
de31f068b8
Коммит
10fb8378c6
|
@ -986,7 +986,7 @@ nsDocument::ResetStylesheetsToURI(nsIURI* aURI)
|
|||
{
|
||||
NS_PRECONDITION(aURI, "Null URI passed to ResetStylesheetsToURI");
|
||||
|
||||
mozAutoDocUpdate(this, UPDATE_STYLE, PR_TRUE);
|
||||
mozAutoDocUpdate upd(this, UPDATE_STYLE, PR_TRUE);
|
||||
|
||||
// The stylesheets should forget us
|
||||
PRInt32 indx = mStyleSheets.Count();
|
||||
|
|
|
@ -596,7 +596,7 @@ nsImageLoadingContent::UpdateImageState(PRBool aNotify)
|
|||
NS_ASSERTION(thisContent->IsInDoc(), "Something is confused");
|
||||
PRInt32 changedBits = oldState ^ ImageState();
|
||||
if (changedBits) {
|
||||
mozAutoDocUpdate(doc, UPDATE_CONTENT_STATE, PR_TRUE);
|
||||
mozAutoDocUpdate upd(doc, UPDATE_CONTENT_STATE, PR_TRUE);
|
||||
doc->ContentStatesChanged(thisContent, nsnull, changedBits);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -979,7 +979,7 @@ nsObjectLoadingContent::NotifyStateChanged(ObjectType aOldType,
|
|||
PRInt32 changedBits = aOldState ^ newState;
|
||||
|
||||
{
|
||||
mozAutoDocUpdate(doc, UPDATE_CONTENT_STATE, PR_TRUE);
|
||||
mozAutoDocUpdate upd(doc, UPDATE_CONTENT_STATE, PR_TRUE);
|
||||
doc->ContentStatesChanged(thisContent, nsnull, changedBits);
|
||||
}
|
||||
if (aSync) {
|
||||
|
|
|
@ -3246,7 +3246,7 @@ nsGenericHTMLFormElement::AfterSetAttr(PRInt32 aNameSpaceID, nsIAtom* aName,
|
|||
if (aNotify && aName == nsHTMLAtoms::disabled && CanBeDisabled()) {
|
||||
nsIDocument* document = GetCurrentDoc();
|
||||
if (document) {
|
||||
mozAutoDocUpdate(document, UPDATE_CONTENT_STATE, PR_TRUE);
|
||||
mozAutoDocUpdate upd(document, UPDATE_CONTENT_STATE, PR_TRUE);
|
||||
document->ContentStatesChanged(this, nsnull, NS_EVENT_STATE_DISABLED |
|
||||
NS_EVENT_STATE_ENABLED);
|
||||
}
|
||||
|
|
|
@ -997,7 +997,7 @@ nsHTMLInputElement::SetCheckedInternal(PRBool aChecked, PRBool aNotify)
|
|||
if (aNotify) {
|
||||
nsIDocument* document = GetCurrentDoc();
|
||||
if (document) {
|
||||
mozAutoDocUpdate(document, UPDATE_CONTENT_STATE, aNotify);
|
||||
mozAutoDocUpdate upd(document, UPDATE_CONTENT_STATE, aNotify);
|
||||
document->ContentStatesChanged(this, nsnull, NS_EVENT_STATE_CHECKED);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -192,7 +192,7 @@ nsHTMLOptGroupElement::AfterSetAttr(PRInt32 aNameSpaceID, nsIAtom* aName,
|
|||
aName == nsHTMLAtoms::disabled) {
|
||||
nsIDocument* document = GetCurrentDoc();
|
||||
if (document) {
|
||||
mozAutoDocUpdate(document, UPDATE_CONTENT_STATE, PR_TRUE);
|
||||
mozAutoDocUpdate upd(document, UPDATE_CONTENT_STATE, PR_TRUE);
|
||||
document->ContentStatesChanged(this, nsnull, NS_EVENT_STATE_DISABLED |
|
||||
NS_EVENT_STATE_ENABLED);
|
||||
}
|
||||
|
|
|
@ -230,7 +230,7 @@ nsHTMLOptionElement::SetSelectedInternal(PRBool aValue, PRBool aNotify)
|
|||
if (aNotify) {
|
||||
nsIDocument* document = GetCurrentDoc();
|
||||
if (document) {
|
||||
mozAutoDocUpdate(document, UPDATE_CONTENT_STATE, aNotify);
|
||||
mozAutoDocUpdate upd(document, UPDATE_CONTENT_STATE, aNotify);
|
||||
document->ContentStatesChanged(this, nsnull, NS_EVENT_STATE_CHECKED);
|
||||
}
|
||||
}
|
||||
|
@ -502,7 +502,7 @@ nsHTMLOptionElement::AfterSetAttr(PRInt32 aNameSpaceID, nsIAtom* aName,
|
|||
aName == nsHTMLAtoms::disabled) {
|
||||
nsIDocument* document = GetCurrentDoc();
|
||||
if (document) {
|
||||
mozAutoDocUpdate(document, UPDATE_CONTENT_STATE, PR_TRUE);
|
||||
mozAutoDocUpdate upd(document, UPDATE_CONTENT_STATE, PR_TRUE);
|
||||
document->ContentStatesChanged(this, nsnull, NS_EVENT_STATE_DISABLED |
|
||||
NS_EVENT_STATE_ENABLED);
|
||||
}
|
||||
|
|
|
@ -761,7 +761,7 @@ nsXTFElementWrapper::SetIntrinsicState(PRInt32 aNewState)
|
|||
return NS_OK;
|
||||
|
||||
mIntrinsicState = aNewState;
|
||||
mozAutoDocUpdate(doc, UPDATE_CONTENT_STATE, PR_TRUE);
|
||||
mozAutoDocUpdate upd(doc, UPDATE_CONTENT_STATE, PR_TRUE);
|
||||
doc->ContentStatesChanged(this, nsnull, bits);
|
||||
|
||||
return NS_OK;
|
||||
|
|
Загрузка…
Ссылка в новой задаче