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

Clean up nsIFrame::IsEmpty signature and move towards making 'white-space' work on inlines. b=191699 r+sr=roc

Browse Source
This commit is contained in:
dbaron@dbaron.org
2003-11-10 23:36:06 +00:00
parent 46786deea7
commit 3696673382
32 changed files with 128 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
layout/html/base/src/nsTextFrame.cpp
View File

@@ -483,9 +483,7 @@ public:
PRBool aCheckVis,
PRBool* aIsVisible);
NS_IMETHOD IsEmpty(nsCompatibility aCompatMode,
PRBool aIsPre,
PRBool* aResult);
virtual PRBool IsEmpty();
#ifdef ACCESSIBILITY
NS_IMETHOD GetAccessible(nsIAccessible** aAccessible);
@@ -5890,24 +5888,22 @@ nsTextFrame::GetType() const
return nsLayoutAtoms::textFrame;
}
NS_IMETHODIMP
nsTextFrame::IsEmpty(nsCompatibility aCompatMode,
PRBool aIsPre,
PRBool* aResult)
/* virtual */ PRBool
nsTextFrame::IsEmpty()
{
// XXXldb Should this check aCompatMode as well???
if (aIsPre) {
*aResult = PR_FALSE;
return NS_OK;
// XXXldb Should this check compatibility mode as well???
if (GetStyleText()->WhiteSpaceIsSignificant()) {
return PR_FALSE;
}
nsCOMPtr<nsITextContent> textContent( do_QueryInterface(mContent) );
if (! textContent) {
NS_NOTREACHED("text frame has no text content");
*aResult = PR_TRUE;
return NS_ERROR_UNEXPECTED;
return PR_TRUE;
}
return textContent->IsOnlyWhitespace(aResult);
PRBool isOnlyWS;
textContent->IsOnlyWhitespace(&isOnlyWS);
return isOnlyWS;
}
#ifdef DEBUG