remove ifdef IBMBIDI in content/, r+sr=roc+moz, bug 89203
git-svn-id: svn://10.0.0.236/trunk@136507 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -53,9 +53,7 @@
|
||||
#include "nsLayoutAtoms.h"
|
||||
#include "prenv.h"
|
||||
|
||||
#ifdef IBMBIDI
|
||||
#include "nsBidiUtils.h"
|
||||
#endif
|
||||
|
||||
inline PRBool IsFixedUnit(nsStyleUnit aUnit, PRBool aEnumOK)
|
||||
{
|
||||
@@ -1086,16 +1084,12 @@ nsChangeHint nsStyleDisplay::CalcDifference(const nsStyleDisplay& aOther) const
|
||||
|
||||
nsStyleVisibility::nsStyleVisibility(nsIPresContext* aPresContext)
|
||||
{
|
||||
#ifdef IBMBIDI
|
||||
PRUint32 bidiOptions;
|
||||
aPresContext->GetBidi(&bidiOptions);
|
||||
if (GET_BIDI_OPTION_DIRECTION(bidiOptions) == IBMBIDI_TEXTDIRECTION_RTL)
|
||||
mDirection = NS_STYLE_DIRECTION_RTL;
|
||||
else
|
||||
mDirection = NS_STYLE_DIRECTION_LTR;
|
||||
#else
|
||||
mDirection = NS_STYLE_DIRECTION_LTR;
|
||||
#endif // IBMBIDI
|
||||
|
||||
aPresContext->GetLanguage(getter_AddRefs(mLanguage));
|
||||
mVisible = NS_STYLE_VISIBILITY_VISIBLE;
|
||||
@@ -1280,9 +1274,7 @@ nsStyleTextReset::nsStyleTextReset(void)
|
||||
{
|
||||
mVerticalAlign.SetIntValue(NS_STYLE_VERTICAL_ALIGN_BASELINE, eStyleUnit_Enumerated);
|
||||
mTextDecoration = NS_STYLE_TEXT_DECORATION_NONE;
|
||||
#ifdef IBMBIDI
|
||||
mUnicodeBidi = NS_STYLE_UNICODE_BIDI_NORMAL;
|
||||
#endif // IBMBIDI
|
||||
}
|
||||
|
||||
nsStyleTextReset::nsStyleTextReset(const nsStyleTextReset& aSource)
|
||||
@@ -1295,10 +1287,7 @@ nsStyleTextReset::~nsStyleTextReset(void) { }
|
||||
nsChangeHint nsStyleTextReset::CalcDifference(const nsStyleTextReset& aOther) const
|
||||
{
|
||||
if (mVerticalAlign == aOther.mVerticalAlign
|
||||
#ifdef IBMBIDI
|
||||
&& mUnicodeBidi == aOther.mUnicodeBidi
|
||||
#endif // IBMBIDI
|
||||
) {
|
||||
&& mUnicodeBidi == aOther.mUnicodeBidi) {
|
||||
if (mTextDecoration != aOther.mTextDecoration)
|
||||
return NS_STYLE_HINT_VISUAL;
|
||||
return NS_STYLE_HINT_NONE;
|
||||
|
||||
Reference in New Issue
Block a user