mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fix build bustage: disambiguate nsXULDocument::State from nsForwardReference::State by renaming to nsForwardReference::Phase.

This commit is contained in:
waterson%netscape.com 1999-11-17 03:20:03 +00:00
Родитель 5eeb9d4a75
Коммит 3af1eee9aa
6 изменённых файлов: 36 добавлений и 36 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

10
content/xul/document/src/nsForwardReference.h
Просмотреть файл

@ -32,9 +32,9 @@ public:
virtual ~nsForwardReference() {} virtual ~nsForwardReference() {}
/** /**
* Priority codes returned from GetPriority() * Priority codes returned from GetPhase()
*/ */
enum State { enum Phase {
/** A dummy marker, used to indicate unstarted resolution */ /** A dummy marker, used to indicate unstarted resolution */
eStart, eStart,
@ -56,16 +56,16 @@ public:
* reference in a lower priority. This variable specifies this * reference in a lower priority. This variable specifies this
* ordering. The last Priority is guaranteed to be eDone. * 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. * Get the state in which the forward reference should be resolved.
* 'eConstruction' references are all resolved before 'eHookup' references * 'eConstruction' references are all resolved before 'eHookup' references
* are resolved. * 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() * Result codes returned from Resolve()

20
content/xul/document/src/nsXULDocument.cpp
Просмотреть файл

@ -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" #define XUL_NAMESPACE_URI "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
const nsForwardReference::State nsForwardReference::kPasses[] = { const nsForwardReference::Phase nsForwardReference::kPasses[] = {
nsForwardReference::State::eConstruction, nsForwardReference::eConstruction,
nsForwardReference::State::eHookup, nsForwardReference::eHookup,
nsForwardReference::State::eDone nsForwardReference::eDone
}; };
@ -217,7 +217,7 @@ nsXULDocument::nsXULDocument(void)
mCharSetID("UTF-8"), mCharSetID("UTF-8"),
mDisplaySelection(PR_FALSE), mDisplaySelection(PR_FALSE),
mIsPopup(PR_FALSE), mIsPopup(PR_FALSE),
mResolutionPhase(nsForwardReference::State::eStart), mResolutionPhase(nsForwardReference::eStart),
mState(eState_Master) mState(eState_Master)
{ {
NS_INIT_REFCNT(); NS_INIT_REFCNT();
@ -1814,7 +1814,7 @@ nsXULDocument::SetForm(nsIDOMHTMLFormElement* aForm)
NS_IMETHODIMP NS_IMETHODIMP
nsXULDocument::AddForwardReference(nsForwardReference* aRef) nsXULDocument::AddForwardReference(nsForwardReference* aRef)
{ {
if (mResolutionPhase < aRef->GetState()) { if (mResolutionPhase < aRef->GetPhase()) {
mForwardReferences.AppendElement(aRef); mForwardReferences.AppendElement(aRef);
} }
else { else {
@ -1829,7 +1829,7 @@ nsXULDocument::AddForwardReference(nsForwardReference* aRef)
NS_IMETHODIMP NS_IMETHODIMP
nsXULDocument::ResolveForwardReferences() nsXULDocument::ResolveForwardReferences()
{ {
if (mResolutionPhase == nsForwardReference::State::eDone) if (mResolutionPhase == nsForwardReference::eDone)
return NS_OK; return NS_OK;
// Resolve each outstanding 'forward' reference. We iterate // Resolve each outstanding 'forward' reference. We iterate
@ -1838,7 +1838,7 @@ nsXULDocument::ResolveForwardReferences()
// guaranteed to converge because we've "closed the gate" to new // guaranteed to converge because we've "closed the gate" to new
// forward references. // forward references.
const nsForwardReference::State* pass = nsForwardReference::kPasses; const nsForwardReference::Phase* pass = nsForwardReference::kPasses;
while ((mResolutionPhase = *pass) != nsForwardReference::eDone) { while ((mResolutionPhase = *pass) != nsForwardReference::eDone) {
PRInt32 previous = 0; PRInt32 previous = 0;
while (mForwardReferences.Count() && mForwardReferences.Count() != previous) { while (mForwardReferences.Count() && mForwardReferences.Count() != previous) {
@ -1847,7 +1847,7 @@ nsXULDocument::ResolveForwardReferences()
for (PRInt32 i = 0; i < mForwardReferences.Count(); ++i) { for (PRInt32 i = 0; i < mForwardReferences.Count(); ++i) {
nsForwardReference* fwdref = NS_REINTERPRET_CAST(nsForwardReference*, mForwardReferences[i]); nsForwardReference* fwdref = NS_REINTERPRET_CAST(nsForwardReference*, mForwardReferences[i]);
if (fwdref->GetState() == *pass) { if (fwdref->GetPhase() == *pass) {
nsForwardReference::Result result = fwdref->Resolve(); nsForwardReference::Result result = fwdref->Resolve();
switch (result) { switch (result) {
@ -2446,7 +2446,7 @@ nsXULDocument::AddSubtreeToDocument(nsIContent* aElement)
// If it's not there yet, we may be able to defer hookup until // If it's not there yet, we may be able to defer hookup until
// later. // later.
if (listener && !resolved && (mResolutionPhase != nsForwardReference::State::eDone)) { if (listener && !resolved && (mResolutionPhase != nsForwardReference::eDone)) {
BroadcasterHookup* hookup = new BroadcasterHookup(this, aElement); BroadcasterHookup* hookup = new BroadcasterHookup(this, aElement);
if (! hookup) if (! hookup)
return NS_ERROR_OUT_OF_MEMORY; return NS_ERROR_OUT_OF_MEMORY;

6
content/xul/document/src/nsXULDocument.h
Просмотреть файл

@ -519,7 +519,7 @@ protected:
nsCOMPtr<nsIDOMXULCommandDispatcher> mCommandDispatcher; // [OWNER] of the focus tracker nsCOMPtr<nsIDOMXULCommandDispatcher> mCommandDispatcher; // [OWNER] of the focus tracker
nsVoidArray mForwardReferences; nsVoidArray mForwardReferences;
nsForwardReference::State mResolutionPhase; nsForwardReference::Phase mResolutionPhase;
// The following are pointers into the content model which provide access to // 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 // the objects triggering either a popup or a tooltip. These are marked as
@ -651,7 +651,7 @@ protected:
virtual ~BroadcasterHookup(); virtual ~BroadcasterHookup();
virtual State GetState() { return eHookup; } virtual Phase GetPhase() { return eHookup; }
virtual Result Resolve(); virtual Result Resolve();
}; };
@ -676,7 +676,7 @@ protected:
virtual ~OverlayForwardReference(); virtual ~OverlayForwardReference();
virtual State GetState() { return eConstruction; } virtual Phase GetPhase() { return eConstruction; }
virtual Result Resolve(); virtual Result Resolve();
}; };

10
rdf/content/src/nsForwardReference.h
Просмотреть файл

@ -32,9 +32,9 @@ public:
virtual ~nsForwardReference() {} virtual ~nsForwardReference() {}
/** /**
* Priority codes returned from GetPriority() * Priority codes returned from GetPhase()
*/ */
enum State { enum Phase {
/** A dummy marker, used to indicate unstarted resolution */ /** A dummy marker, used to indicate unstarted resolution */
eStart, eStart,
@ -56,16 +56,16 @@ public:
* reference in a lower priority. This variable specifies this * reference in a lower priority. This variable specifies this
* ordering. The last Priority is guaranteed to be eDone. * 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. * Get the state in which the forward reference should be resolved.
* 'eConstruction' references are all resolved before 'eHookup' references * 'eConstruction' references are all resolved before 'eHookup' references
* are resolved. * 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() * Result codes returned from Resolve()

20
rdf/content/src/nsXULDocument.cpp
Просмотреть файл

@ -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" #define XUL_NAMESPACE_URI "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
const nsForwardReference::State nsForwardReference::kPasses[] = { const nsForwardReference::Phase nsForwardReference::kPasses[] = {
nsForwardReference::State::eConstruction, nsForwardReference::eConstruction,
nsForwardReference::State::eHookup, nsForwardReference::eHookup,
nsForwardReference::State::eDone nsForwardReference::eDone
}; };
@ -217,7 +217,7 @@ nsXULDocument::nsXULDocument(void)
mCharSetID("UTF-8"), mCharSetID("UTF-8"),
mDisplaySelection(PR_FALSE), mDisplaySelection(PR_FALSE),
mIsPopup(PR_FALSE), mIsPopup(PR_FALSE),
mResolutionPhase(nsForwardReference::State::eStart), mResolutionPhase(nsForwardReference::eStart),
mState(eState_Master) mState(eState_Master)
{ {
NS_INIT_REFCNT(); NS_INIT_REFCNT();
@ -1814,7 +1814,7 @@ nsXULDocument::SetForm(nsIDOMHTMLFormElement* aForm)
NS_IMETHODIMP NS_IMETHODIMP
nsXULDocument::AddForwardReference(nsForwardReference* aRef) nsXULDocument::AddForwardReference(nsForwardReference* aRef)
{ {
if (mResolutionPhase < aRef->GetState()) { if (mResolutionPhase < aRef->GetPhase()) {
mForwardReferences.AppendElement(aRef); mForwardReferences.AppendElement(aRef);
} }
else { else {
@ -1829,7 +1829,7 @@ nsXULDocument::AddForwardReference(nsForwardReference* aRef)
NS_IMETHODIMP NS_IMETHODIMP
nsXULDocument::ResolveForwardReferences() nsXULDocument::ResolveForwardReferences()
{ {
if (mResolutionPhase == nsForwardReference::State::eDone) if (mResolutionPhase == nsForwardReference::eDone)
return NS_OK; return NS_OK;
// Resolve each outstanding 'forward' reference. We iterate // Resolve each outstanding 'forward' reference. We iterate
@ -1838,7 +1838,7 @@ nsXULDocument::ResolveForwardReferences()
// guaranteed to converge because we've "closed the gate" to new // guaranteed to converge because we've "closed the gate" to new
// forward references. // forward references.
const nsForwardReference::State* pass = nsForwardReference::kPasses; const nsForwardReference::Phase* pass = nsForwardReference::kPasses;
while ((mResolutionPhase = *pass) != nsForwardReference::eDone) { while ((mResolutionPhase = *pass) != nsForwardReference::eDone) {
PRInt32 previous = 0; PRInt32 previous = 0;
while (mForwardReferences.Count() && mForwardReferences.Count() != previous) { while (mForwardReferences.Count() && mForwardReferences.Count() != previous) {
@ -1847,7 +1847,7 @@ nsXULDocument::ResolveForwardReferences()
for (PRInt32 i = 0; i < mForwardReferences.Count(); ++i) { for (PRInt32 i = 0; i < mForwardReferences.Count(); ++i) {
nsForwardReference* fwdref = NS_REINTERPRET_CAST(nsForwardReference*, mForwardReferences[i]); nsForwardReference* fwdref = NS_REINTERPRET_CAST(nsForwardReference*, mForwardReferences[i]);
if (fwdref->GetState() == *pass) { if (fwdref->GetPhase() == *pass) {
nsForwardReference::Result result = fwdref->Resolve(); nsForwardReference::Result result = fwdref->Resolve();
switch (result) { switch (result) {
@ -2446,7 +2446,7 @@ nsXULDocument::AddSubtreeToDocument(nsIContent* aElement)
// If it's not there yet, we may be able to defer hookup until // If it's not there yet, we may be able to defer hookup until
// later. // later.
if (listener && !resolved && (mResolutionPhase != nsForwardReference::State::eDone)) { if (listener && !resolved && (mResolutionPhase != nsForwardReference::eDone)) {
BroadcasterHookup* hookup = new BroadcasterHookup(this, aElement); BroadcasterHookup* hookup = new BroadcasterHookup(this, aElement);
if (! hookup) if (! hookup)
return NS_ERROR_OUT_OF_MEMORY; return NS_ERROR_OUT_OF_MEMORY;

6
rdf/content/src/nsXULDocument.h
Просмотреть файл

@ -519,7 +519,7 @@ protected:
nsCOMPtr<nsIDOMXULCommandDispatcher> mCommandDispatcher; // [OWNER] of the focus tracker nsCOMPtr<nsIDOMXULCommandDispatcher> mCommandDispatcher; // [OWNER] of the focus tracker
nsVoidArray mForwardReferences; nsVoidArray mForwardReferences;
nsForwardReference::State mResolutionPhase; nsForwardReference::Phase mResolutionPhase;
// The following are pointers into the content model which provide access to // 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 // the objects triggering either a popup or a tooltip. These are marked as
@ -651,7 +651,7 @@ protected:
virtual ~BroadcasterHookup(); virtual ~BroadcasterHookup();
virtual State GetState() { return eHookup; } virtual Phase GetPhase() { return eHookup; }
virtual Result Resolve(); virtual Result Resolve();
}; };
@ -676,7 +676,7 @@ protected:
virtual ~OverlayForwardReference(); virtual ~OverlayForwardReference();
virtual State GetState() { return eConstruction; } virtual Phase GetPhase() { return eConstruction; }
virtual Result Resolve(); virtual Result Resolve();
}; };