corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug 314453 Rename ImageURIChanged and ObjectURIChanged to LoadImage and

Browse Source 
LoadObject, respectively, in order to make it clear what they do rather than
prescribing when they should be called. r+sr=bz
This commit is contained in:
cbiesinger@web.de
2006-01-01 11:25:43 +00:00
parent fc17350d6d
commit 0e030470fb
10 changed files with 65 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
content/base/src/nsObjectLoadingContent.cpp
View File

@@ -699,11 +699,11 @@ nsObjectLoadingContent::ObjectState() const
// <protected>
nsresult
nsObjectLoadingContent::ObjectURIChanged(const nsAString& aURI,
PRBool aNotify,
const nsCString& aTypeHint,
PRBool aForceType,
PRBool aForceLoad)
nsObjectLoadingContent::LoadObject(const nsAString& aURI,
PRBool aNotify,
const nsCString& aTypeHint,
PRBool aForceType,
PRBool aForceLoad)
{
LOG(("OBJLC [%p]: Loading object: URI string=<%s> notify=%i type=<%s> forcetype=%i forceload=%i\n",
this, NS_ConvertUTF16toUTF8(aURI).get(), aNotify, aTypeHint.get(), aForceType, aForceLoad));
@@ -730,15 +730,15 @@ nsObjectLoadingContent::ObjectURIChanged(const nsAString& aURI,
return NS_OK;
}
return ObjectURIChanged(uri, aNotify, aTypeHint, aForceType, aForceLoad);
return LoadObject(uri, aNotify, aTypeHint, aForceType, aForceLoad);
}
nsresult
nsObjectLoadingContent::ObjectURIChanged(nsIURI* aURI,
PRBool aNotify,
const nsCString& aTypeHint,
PRBool aForceType,
PRBool aForceLoad)
nsObjectLoadingContent::LoadObject(nsIURI* aURI,
PRBool aNotify,
const nsCString& aTypeHint,
PRBool aForceType,
PRBool aForceLoad)
{
LOG(("OBJLC [%p]: Loading object: URI=<%p> notify=%i type=<%s> forcetype=%i forceload=%i\n",
this, aURI, aNotify, aTypeHint.get(), aForceType, aForceLoad));
@@ -881,7 +881,7 @@ nsObjectLoadingContent::ObjectURIChanged(nsIURI* aURI,
switch (newType) {
case eType_Image:
// Don't notify, because we will take care of that ourselves.
rv = ImageURIChanged(aURI, aForceLoad, PR_FALSE);
rv = LoadImage(aURI, aForceLoad, PR_FALSE);
break;
case eType_Plugin:
rv = Instantiate(aTypeHint, aURI);
@@ -1034,7 +1034,7 @@ nsObjectLoadingContent::RemovedFromDocument()
mFrameLoader->Destroy();
mFrameLoader = nsnull;
// Clear the current URI, so that ObjectURIChanged doesn't think that we
// Clear the current URI, so that LoadObject doesn't think that we
// have already loaded the content.
mURI = nsnull;
}