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

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.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

30
layout/generic/nsLineLayout.cpp
View File

@@ -2464,25 +2464,23 @@ nsLineLayout::VerticalAlignFrames(PerSpanData* psd)
if (!applyMinLH && (isFirstLine || isLastLine)) {
nsIContent* blockContent = mRootSpan->mFrame->mFrame->GetContent();
if (blockContent) {
nsCOMPtr<nsIAtom> blockTagAtom;
nsresult result = blockContent->GetTag(getter_AddRefs(blockTagAtom));
if ( NS_SUCCEEDED(result) && blockTagAtom) {
// (2) above, if the first line of LI
if (isFirstLine && blockTagAtom.get() == nsHTMLAtoms::li) {
// if the line is empty, then don't force the min height (see bug 75963)
if (!IsZeroHeight()) {
applyMinLH = PR_TRUE;
foundLI = PR_TRUE;
}
}
// (3) above, if the last line of LI, DT, or DD
else if (!applyMinLH && isLastLine &&
((blockTagAtom.get() == nsHTMLAtoms::li) ||
(blockTagAtom.get() == nsHTMLAtoms::dt) ||
(blockTagAtom.get() == nsHTMLAtoms::dd))) {
nsIAtom *blockTagAtom = blockContent->Tag();
// (2) above, if the first line of LI
if (isFirstLine && blockTagAtom == nsHTMLAtoms::li) {
// if the line is empty, then don't force the min height
// (see bug 75963)
if (!IsZeroHeight()) {
applyMinLH = PR_TRUE;
foundLI = PR_TRUE;
}
}
// (3) above, if the last line of LI, DT, or DD
else if (!applyMinLH && isLastLine &&
((blockTagAtom == nsHTMLAtoms::li) ||
(blockTagAtom == nsHTMLAtoms::dt) ||
(blockTagAtom == nsHTMLAtoms::dd))) {
applyMinLH = PR_TRUE;
}
}
}
if (applyMinLH) {