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

More nsIPresContext deCOMtamination (bug 229371). r+sr=roc.

Browse Source
This commit is contained in:
bryner@brianryner.com
2004-04-13 00:28:44 +00:00
parent 709b2596e8
commit 5ddc9f91a1
47 changed files with 291 additions and 516 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1440,8 +1440,7 @@ nsTextFrame::Paint(nsIPresContext* aPresContext,
aRenderingContext.GetHints(hints);
#ifdef IBMBIDI
PRBool bidiEnabled;
aPresContext->GetBidiEnabled(&bidiEnabled);
PRBool bidiEnabled = aPresContext->BidiEnabled();
#else
const PRBool bidiEnabled = PR_FALSE;
#endif // IBMBIDI
@@ -2234,10 +2233,8 @@ nsTextFrame::PaintUnicodeText(nsIPresContext* aPresContext,
#ifdef IBMBIDI
PRBool isRightToLeftOnBidiPlatform = PR_FALSE;
PRBool isBidiSystem = PR_FALSE;
PRBool bidiEnabled;
nsCharType charType = eCharType_LeftToRight;
aPresContext->GetBidiEnabled(&bidiEnabled);
if (bidiEnabled) {
if (aPresContext->BidiEnabled()) {
isBidiSystem = aPresContext->IsBidiSystem();
GetBidiProperty(aPresContext, nsLayoutAtoms::embeddingLevel, (void**) &level,sizeof(level));
GetBidiProperty(aPresContext, nsLayoutAtoms::charType, (void**) &charType,sizeof(charType));
@@ -2931,12 +2928,10 @@ nsTextFrame::PaintTextSlowly(nsIPresContext* aPresContext,
if (0 != textLength) {
#ifdef IBMBIDI
PRBool bidiEnabled;
PRUint8 level = 0;
nsCharType charType = eCharType_LeftToRight;
aPresContext->GetBidiEnabled(&bidiEnabled);
if (bidiEnabled) {
if (aPresContext->BidiEnabled()) {
nsBidiPresUtils* bidiUtils;
aPresContext->GetBidiUtils(&bidiUtils);
@@ -5223,9 +5218,7 @@ nsTextFrame::Reflow(nsIPresContext* aPresContext,
startingOffset = mContentOffset;
}
PRBool bidiEnabled;
aPresContext->GetBidiEnabled(&bidiEnabled);
if (bidiEnabled) {
if (aPresContext->BidiEnabled()) {
nsCharType charType = eCharType_LeftToRight;
PRUint32 hints = 0;
aReflowState.rendContext->GetHints(hints);