Bug 1250767 - Unified build bustage fixups.

This commit is contained in:
Cameron McCormack 2016-02-25 11:09:34 +11:00
parent 266f47e295
commit a7d57c40a3
2 changed files with 4 additions and 2 deletions

View File

@ -166,7 +166,6 @@ UNIFIED_SOURCES += [
'nsFontFaceUtils.cpp',
'nsHTMLCSSStyleSheet.cpp',
'nsHTMLStyleSheet.cpp',
'nsLayoutStylesheetCache.cpp',
'nsMediaFeatures.cpp',
'nsNthIndexCache.cpp',
'nsROCSSPrimitiveValue.cpp',
@ -190,8 +189,11 @@ UNIFIED_SOURCES += [
]
# nsCSSRuleProcessor.cpp needs to be built separately because it uses plarena.h.
# nsLayoutStylesheetCache.cpp needs to be built separately because it uses
# nsExceptionHandler.h, which includes windows.h.
SOURCES += [
'nsCSSRuleProcessor.cpp',
'nsLayoutStylesheetCache.cpp',
]
EXTRA_COMPONENTS += [

View File

@ -3762,7 +3762,7 @@ nsStyleText::TextEmphasisSide(WritingMode aWM) const
!(mTextEmphasisPosition & NS_STYLE_TEXT_EMPHASIS_POSITION_RIGHT)) &&
(!(mTextEmphasisPosition & NS_STYLE_TEXT_EMPHASIS_POSITION_OVER) !=
!(mTextEmphasisPosition & NS_STYLE_TEXT_EMPHASIS_POSITION_UNDER)));
Side side = aWM.IsVertical() ?
mozilla::Side side = aWM.IsVertical() ?
(mTextEmphasisPosition & NS_STYLE_TEXT_EMPHASIS_POSITION_LEFT
? eSideLeft : eSideRight) :
(mTextEmphasisPosition & NS_STYLE_TEXT_EMPHASIS_POSITION_OVER