зеркало из https://github.com/mozilla/gecko-dev.git
Fix build bustage: disambiguate nsXULDocument::State from nsForwardReference::State by renaming to nsForwardReference::Phase.
This commit is contained in:
waterson%netscape.com
Родитель
5eeb9d4a75
Коммит
3af1eee9aa
|
|
@ -32,9 +32,9 @@ public:
|
|||
virtual ~nsForwardReference() {}
|
||||
|
||||
/**
|
||||
* Priority codes returned from GetPriority()
|
||||
* Priority codes returned from GetPhase()
|
||||
*/
|
||||
enum State {
|
||||
enum Phase {
|
||||
/** A dummy marker, used to indicate unstarted resolution */
|
||||
eStart,
|
||||
|
||||
|
|
@ -56,16 +56,16 @@ public:
|
|||
* reference in a lower priority. This variable specifies this
|
||||
* ordering. The last Priority is guaranteed to be eDone.
|
||||
*/
|
||||
static const State kPasses[];
|
||||
static const Phase kPasses[];
|
||||
|
||||
/**
|
||||
* Get the state in which the forward reference should be resolved.
|
||||
* 'eConstruction' references are all resolved before 'eHookup' references
|
||||
* are resolved.
|
||||
*
|
||||
* @return the State in which the reference needs to be resolved
|
||||
* @return the Phase in which the reference needs to be resolved
|
||||
*/
|
||||
virtual State GetState() = 0;
|
||||
virtual Phase GetPhase() = 0;
|
||||
|
||||
/**
|
||||
* Result codes returned from Resolve()
|
||||
|
|
|
|||
|
|
@ -159,10 +159,10 @@ static NS_DEFINE_IID(kIParserIID, NS_IPARSER_IID);
|
|||
|
||||
#define XUL_NAMESPACE_URI "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
|
||||
const nsForwardReference::State nsForwardReference::kPasses[] = {
|
||||
nsForwardReference::State::eConstruction,
|
||||
nsForwardReference::State::eHookup,
|
||||
nsForwardReference::State::eDone
|
||||
const nsForwardReference::Phase nsForwardReference::kPasses[] = {
|
||||
nsForwardReference::eConstruction,
|
||||
nsForwardReference::eHookup,
|
||||
nsForwardReference::eDone
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -217,7 +217,7 @@ nsXULDocument::nsXULDocument(void)
|
|||
mCharSetID("UTF-8"),
|
||||
mDisplaySelection(PR_FALSE),
|
||||
mIsPopup(PR_FALSE),
|
||||
mResolutionPhase(nsForwardReference::State::eStart),
|
||||
mResolutionPhase(nsForwardReference::eStart),
|
||||
mState(eState_Master)
|
||||
{
|
||||
NS_INIT_REFCNT();
|
||||
|
|
@ -1814,7 +1814,7 @@ nsXULDocument::SetForm(nsIDOMHTMLFormElement* aForm)
|
|||
NS_IMETHODIMP
|
||||
nsXULDocument::AddForwardReference(nsForwardReference* aRef)
|
||||
{
|
||||
if (mResolutionPhase < aRef->GetState()) {
|
||||
if (mResolutionPhase < aRef->GetPhase()) {
|
||||
mForwardReferences.AppendElement(aRef);
|
||||
}
|
||||
else {
|
||||
|
|
@ -1829,7 +1829,7 @@ nsXULDocument::AddForwardReference(nsForwardReference* aRef)
|
|||
NS_IMETHODIMP
|
||||
nsXULDocument::ResolveForwardReferences()
|
||||
{
|
||||
if (mResolutionPhase == nsForwardReference::State::eDone)
|
||||
if (mResolutionPhase == nsForwardReference::eDone)
|
||||
return NS_OK;
|
||||
|
||||
// Resolve each outstanding 'forward' reference. We iterate
|
||||
|
|
@ -1838,7 +1838,7 @@ nsXULDocument::ResolveForwardReferences()
|
|||
// guaranteed to converge because we've "closed the gate" to new
|
||||
// forward references.
|
||||
|
||||
const nsForwardReference::State* pass = nsForwardReference::kPasses;
|
||||
const nsForwardReference::Phase* pass = nsForwardReference::kPasses;
|
||||
while ((mResolutionPhase = *pass) != nsForwardReference::eDone) {
|
||||
PRInt32 previous = 0;
|
||||
while (mForwardReferences.Count() && mForwardReferences.Count() != previous) {
|
||||
|
|
@ -1847,7 +1847,7 @@ nsXULDocument::ResolveForwardReferences()
|
|||
for (PRInt32 i = 0; i < mForwardReferences.Count(); ++i) {
|
||||
nsForwardReference* fwdref = NS_REINTERPRET_CAST(nsForwardReference*, mForwardReferences[i]);
|
||||
|
||||
if (fwdref->GetState() == *pass) {
|
||||
if (fwdref->GetPhase() == *pass) {
|
||||
nsForwardReference::Result result = fwdref->Resolve();
|
||||
|
||||
switch (result) {
|
||||
|
|
@ -2446,7 +2446,7 @@ nsXULDocument::AddSubtreeToDocument(nsIContent* aElement)
|
|||
|
||||
// If it's not there yet, we may be able to defer hookup until
|
||||
// later.
|
||||
if (listener && !resolved && (mResolutionPhase != nsForwardReference::State::eDone)) {
|
||||
if (listener && !resolved && (mResolutionPhase != nsForwardReference::eDone)) {
|
||||
BroadcasterHookup* hookup = new BroadcasterHookup(this, aElement);
|
||||
if (! hookup)
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
|
|
|
|||
|
|
@ -519,7 +519,7 @@ protected:
|
|||
nsCOMPtr<nsIDOMXULCommandDispatcher> mCommandDispatcher; // [OWNER] of the focus tracker
|
||||
|
||||
nsVoidArray mForwardReferences;
|
||||
nsForwardReference::State mResolutionPhase;
|
||||
nsForwardReference::Phase mResolutionPhase;
|
||||
|
||||
// The following are pointers into the content model which provide access to
|
||||
// the objects triggering either a popup or a tooltip. These are marked as
|
||||
|
|
@ -651,7 +651,7 @@ protected:
|
|||
|
||||
virtual ~BroadcasterHookup();
|
||||
|
||||
virtual State GetState() { return eHookup; }
|
||||
virtual Phase GetPhase() { return eHookup; }
|
||||
virtual Result Resolve();
|
||||
};
|
||||
|
||||
|
|
@ -676,7 +676,7 @@ protected:
|
|||
|
||||
virtual ~OverlayForwardReference();
|
||||
|
||||
virtual State GetState() { return eConstruction; }
|
||||
virtual Phase GetPhase() { return eConstruction; }
|
||||
virtual Result Resolve();
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -32,9 +32,9 @@ public:
|
|||
virtual ~nsForwardReference() {}
|
||||
|
||||
/**
|
||||
* Priority codes returned from GetPriority()
|
||||
* Priority codes returned from GetPhase()
|
||||
*/
|
||||
enum State {
|
||||
enum Phase {
|
||||
/** A dummy marker, used to indicate unstarted resolution */
|
||||
eStart,
|
||||
|
||||
|
|
@ -56,16 +56,16 @@ public:
|
|||
* reference in a lower priority. This variable specifies this
|
||||
* ordering. The last Priority is guaranteed to be eDone.
|
||||
*/
|
||||
static const State kPasses[];
|
||||
static const Phase kPasses[];
|
||||
|
||||
/**
|
||||
* Get the state in which the forward reference should be resolved.
|
||||
* 'eConstruction' references are all resolved before 'eHookup' references
|
||||
* are resolved.
|
||||
*
|
||||
* @return the State in which the reference needs to be resolved
|
||||
* @return the Phase in which the reference needs to be resolved
|
||||
*/
|
||||
virtual State GetState() = 0;
|
||||
virtual Phase GetPhase() = 0;
|
||||
|
||||
/**
|
||||
* Result codes returned from Resolve()
|
||||
|
|
|
|||
|
|
@ -159,10 +159,10 @@ static NS_DEFINE_IID(kIParserIID, NS_IPARSER_IID);
|
|||
|
||||
#define XUL_NAMESPACE_URI "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
|
||||
const nsForwardReference::State nsForwardReference::kPasses[] = {
|
||||
nsForwardReference::State::eConstruction,
|
||||
nsForwardReference::State::eHookup,
|
||||
nsForwardReference::State::eDone
|
||||
const nsForwardReference::Phase nsForwardReference::kPasses[] = {
|
||||
nsForwardReference::eConstruction,
|
||||
nsForwardReference::eHookup,
|
||||
nsForwardReference::eDone
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -217,7 +217,7 @@ nsXULDocument::nsXULDocument(void)
|
|||
mCharSetID("UTF-8"),
|
||||
mDisplaySelection(PR_FALSE),
|
||||
mIsPopup(PR_FALSE),
|
||||
mResolutionPhase(nsForwardReference::State::eStart),
|
||||
mResolutionPhase(nsForwardReference::eStart),
|
||||
mState(eState_Master)
|
||||
{
|
||||
NS_INIT_REFCNT();
|
||||
|
|
@ -1814,7 +1814,7 @@ nsXULDocument::SetForm(nsIDOMHTMLFormElement* aForm)
|
|||
NS_IMETHODIMP
|
||||
nsXULDocument::AddForwardReference(nsForwardReference* aRef)
|
||||
{
|
||||
if (mResolutionPhase < aRef->GetState()) {
|
||||
if (mResolutionPhase < aRef->GetPhase()) {
|
||||
mForwardReferences.AppendElement(aRef);
|
||||
}
|
||||
else {
|
||||
|
|
@ -1829,7 +1829,7 @@ nsXULDocument::AddForwardReference(nsForwardReference* aRef)
|
|||
NS_IMETHODIMP
|
||||
nsXULDocument::ResolveForwardReferences()
|
||||
{
|
||||
if (mResolutionPhase == nsForwardReference::State::eDone)
|
||||
if (mResolutionPhase == nsForwardReference::eDone)
|
||||
return NS_OK;
|
||||
|
||||
// Resolve each outstanding 'forward' reference. We iterate
|
||||
|
|
@ -1838,7 +1838,7 @@ nsXULDocument::ResolveForwardReferences()
|
|||
// guaranteed to converge because we've "closed the gate" to new
|
||||
// forward references.
|
||||
|
||||
const nsForwardReference::State* pass = nsForwardReference::kPasses;
|
||||
const nsForwardReference::Phase* pass = nsForwardReference::kPasses;
|
||||
while ((mResolutionPhase = *pass) != nsForwardReference::eDone) {
|
||||
PRInt32 previous = 0;
|
||||
while (mForwardReferences.Count() && mForwardReferences.Count() != previous) {
|
||||
|
|
@ -1847,7 +1847,7 @@ nsXULDocument::ResolveForwardReferences()
|
|||
for (PRInt32 i = 0; i < mForwardReferences.Count(); ++i) {
|
||||
nsForwardReference* fwdref = NS_REINTERPRET_CAST(nsForwardReference*, mForwardReferences[i]);
|
||||
|
||||
if (fwdref->GetState() == *pass) {
|
||||
if (fwdref->GetPhase() == *pass) {
|
||||
nsForwardReference::Result result = fwdref->Resolve();
|
||||
|
||||
switch (result) {
|
||||
|
|
@ -2446,7 +2446,7 @@ nsXULDocument::AddSubtreeToDocument(nsIContent* aElement)
|
|||
|
||||
// If it's not there yet, we may be able to defer hookup until
|
||||
// later.
|
||||
if (listener && !resolved && (mResolutionPhase != nsForwardReference::State::eDone)) {
|
||||
if (listener && !resolved && (mResolutionPhase != nsForwardReference::eDone)) {
|
||||
BroadcasterHookup* hookup = new BroadcasterHookup(this, aElement);
|
||||
if (! hookup)
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
|
|
|
|||
|
|
@ -519,7 +519,7 @@ protected:
|
|||
nsCOMPtr<nsIDOMXULCommandDispatcher> mCommandDispatcher; // [OWNER] of the focus tracker
|
||||
|
||||
nsVoidArray mForwardReferences;
|
||||
nsForwardReference::State mResolutionPhase;
|
||||
nsForwardReference::Phase mResolutionPhase;
|
||||
|
||||
// The following are pointers into the content model which provide access to
|
||||
// the objects triggering either a popup or a tooltip. These are marked as
|
||||
|
|
@ -651,7 +651,7 @@ protected:
|
|||
|
||||
virtual ~BroadcasterHookup();
|
||||
|
||||
virtual State GetState() { return eHookup; }
|
||||
virtual Phase GetPhase() { return eHookup; }
|
||||
virtual Result Resolve();
|
||||
};
|
||||
|
||||
|
|
@ -676,7 +676,7 @@ protected:
|
|||
|
||||
virtual ~OverlayForwardReference();
|
||||
|
||||
virtual State GetState() { return eConstruction; }
|
||||
virtual Phase GetPhase() { return eConstruction; }
|
||||
virtual Result Resolve();
|
||||
};
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче