Fixing bug 225837. DeCOMtaminating nsIContent more, making GetTag() return a weak raw pointer, and renaming GetTag() to Tag(), and making GetRangeList() return an const nsVoidArray*, and changing GetContentID() to return the id, and renaming it to ContentID(). r=jonas@sicking.cc, sr=bryner@brianryner.com.

This commit is contained in:
jst@mozilla.jstenback.com
2003-11-19 01:20:56 +00:00
parent f2c331b929
commit d47517f6dc
131 changed files with 1828 additions and 2336 deletions

View File

@@ -399,8 +399,7 @@ nsHTMLFramesetFrame::Init(nsIPresContext* aPresContext,
if (!child->IsContentOfType(nsIContent::eHTML))
continue;
nsCOMPtr<nsIAtom> tag;
child->GetTag(getter_AddRefs(tag));
nsIAtom *tag = child->Tag();
if (tag == nsHTMLAtoms::frameset || tag == nsHTMLAtoms::frame) {
nsRefPtr<nsStyleContext> kidSC;
nsresult result;
@@ -719,14 +718,10 @@ nsHTMLFramesetFrame* nsHTMLFramesetFrame::GetFramesetParent(nsIFrame* aChild)
if (content) {
nsCOMPtr<nsIContent> contentParent = content->GetParent();
if (contentParent && contentParent->IsContentOfType(nsIContent::eHTML)) {
nsCOMPtr<nsIAtom> tag;
contentParent->GetTag(getter_AddRefs(tag));
if (tag == nsHTMLAtoms::frameset) {
nsIFrame* fptr = aChild->GetParent();
parent = (nsHTMLFramesetFrame*) fptr;
}
if (contentParent && contentParent->IsContentOfType(nsIContent::eHTML) &&
contentParent->Tag() == nsHTMLAtoms::frameset) {
nsIFrame* fptr = aChild->GetParent();
parent = (nsHTMLFramesetFrame*) fptr;
}
}