From 8cc8c8248a270ccde3e3d4dd43d99ae2fce51d87 Mon Sep 17 00:00:00 2001 From: "cbiesinger%web.de" Date: Sat, 29 Oct 2005 12:54:24 +0000 Subject: [PATCH] bug 314091 Fix users of mozAutoDocUpdate to actually declare a local variable, so that the destructor doesn't get called immediately r+sr=bz git-svn-id: svn://10.0.0.236/trunk@183237 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/base/src/nsDocument.cpp | 2 +- mozilla/content/base/src/nsImageLoadingContent.cpp | 2 +- mozilla/content/base/src/nsObjectLoadingContent.cpp | 2 +- mozilla/content/html/content/src/nsGenericHTMLElement.cpp | 2 +- mozilla/content/html/content/src/nsHTMLInputElement.cpp | 2 +- mozilla/content/html/content/src/nsHTMLOptGroupElement.cpp | 2 +- mozilla/content/html/content/src/nsHTMLOptionElement.cpp | 4 ++-- mozilla/content/xtf/src/nsXTFElementWrapper.cpp | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/mozilla/content/base/src/nsDocument.cpp b/mozilla/content/base/src/nsDocument.cpp index e9b50716cec..04f9b05dd46 100644 --- a/mozilla/content/base/src/nsDocument.cpp +++ b/mozilla/content/base/src/nsDocument.cpp @@ -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(); diff --git a/mozilla/content/base/src/nsImageLoadingContent.cpp b/mozilla/content/base/src/nsImageLoadingContent.cpp index 91d2ff29d1a..b5e38bfa34c 100644 --- a/mozilla/content/base/src/nsImageLoadingContent.cpp +++ b/mozilla/content/base/src/nsImageLoadingContent.cpp @@ -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); } } diff --git a/mozilla/content/base/src/nsObjectLoadingContent.cpp b/mozilla/content/base/src/nsObjectLoadingContent.cpp index bf8db4fdfa1..ed9fcf41995 100644 --- a/mozilla/content/base/src/nsObjectLoadingContent.cpp +++ b/mozilla/content/base/src/nsObjectLoadingContent.cpp @@ -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) { diff --git a/mozilla/content/html/content/src/nsGenericHTMLElement.cpp b/mozilla/content/html/content/src/nsGenericHTMLElement.cpp index a5954f8d421..c4879cf0311 100644 --- a/mozilla/content/html/content/src/nsGenericHTMLElement.cpp +++ b/mozilla/content/html/content/src/nsGenericHTMLElement.cpp @@ -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); } diff --git a/mozilla/content/html/content/src/nsHTMLInputElement.cpp b/mozilla/content/html/content/src/nsHTMLInputElement.cpp index 47e0db9560b..ac5c0624349 100644 --- a/mozilla/content/html/content/src/nsHTMLInputElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLInputElement.cpp @@ -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); } } diff --git a/mozilla/content/html/content/src/nsHTMLOptGroupElement.cpp b/mozilla/content/html/content/src/nsHTMLOptGroupElement.cpp index d0a52a0c238..66ca2f5cf6f 100644 --- a/mozilla/content/html/content/src/nsHTMLOptGroupElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLOptGroupElement.cpp @@ -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); } diff --git a/mozilla/content/html/content/src/nsHTMLOptionElement.cpp b/mozilla/content/html/content/src/nsHTMLOptionElement.cpp index c4cc0db2416..97e80b32907 100644 --- a/mozilla/content/html/content/src/nsHTMLOptionElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLOptionElement.cpp @@ -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); } diff --git a/mozilla/content/xtf/src/nsXTFElementWrapper.cpp b/mozilla/content/xtf/src/nsXTFElementWrapper.cpp index ece24730de7..9e915908e3a 100644 --- a/mozilla/content/xtf/src/nsXTFElementWrapper.cpp +++ b/mozilla/content/xtf/src/nsXTFElementWrapper.cpp @@ -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;