mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 975501 part 1: Add a XUL prefix to existing internal GRID constants. r=dholbert

This commit is contained in:
Simon Sapin 2014-02-26 23:43:18 -08:00
Родитель 667dcb83ca
Коммит d75e3393a7
5 изменённых файлов: 20 добавлений и 20 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

20
layout/base/nsCSSFrameConstructor.cpp
Просмотреть файл

@ -3923,15 +3923,15 @@ bool IsXULDisplayType(const nsStyleDisplay* aDisplay)
{
return (aDisplay->mDisplay == NS_STYLE_DISPLAY_INLINE_BOX ||
#ifdef MOZ_XUL
aDisplay->mDisplay == NS_STYLE_DISPLAY_INLINE_GRID ||
aDisplay->mDisplay == NS_STYLE_DISPLAY_INLINE_XUL_GRID ||
aDisplay->mDisplay == NS_STYLE_DISPLAY_INLINE_STACK ||
#endif
aDisplay->mDisplay == NS_STYLE_DISPLAY_BOX
#ifdef MOZ_XUL
|| aDisplay->mDisplay == NS_STYLE_DISPLAY_GRID ||
|| aDisplay->mDisplay == NS_STYLE_DISPLAY_XUL_GRID ||
aDisplay->mDisplay == NS_STYLE_DISPLAY_STACK ||
aDisplay->mDisplay == NS_STYLE_DISPLAY_GRID_GROUP ||
aDisplay->mDisplay == NS_STYLE_DISPLAY_GRID_LINE ||
aDisplay->mDisplay == NS_STYLE_DISPLAY_XUL_GRID_GROUP ||
aDisplay->mDisplay == NS_STYLE_DISPLAY_XUL_GRID_LINE ||
aDisplay->mDisplay == NS_STYLE_DISPLAY_DECK ||
aDisplay->mDisplay == NS_STYLE_DISPLAY_POPUP ||
aDisplay->mDisplay == NS_STYLE_DISPLAY_GROUPBOX
@ -4114,7 +4114,7 @@ nsCSSFrameConstructor::FindXULListBoxBodyData(Element* aElement,
nsStyleContext* aStyleContext)
{
if (aStyleContext->StyleDisplay()->mDisplay !=
NS_STYLE_DISPLAY_GRID_GROUP) {
NS_STYLE_DISPLAY_XUL_GRID_GROUP) {
return nullptr;
}
@ -4129,7 +4129,7 @@ nsCSSFrameConstructor::FindXULListItemData(Element* aElement,
nsStyleContext* aStyleContext)
{
if (aStyleContext->StyleDisplay()->mDisplay !=
NS_STYLE_DISPLAY_GRID_LINE) {
NS_STYLE_DISPLAY_XUL_GRID_LINE) {
return nullptr;
}
@ -4152,11 +4152,11 @@ nsCSSFrameConstructor::FindXULDisplayData(const nsStyleDisplay* aDisplay,
SCROLLABLE_ABSPOS_CONTAINER_XUL_INT_CREATE(NS_STYLE_DISPLAY_BOX,
NS_NewBoxFrame),
#ifdef MOZ_XUL
SCROLLABLE_XUL_INT_CREATE(NS_STYLE_DISPLAY_INLINE_GRID, NS_NewGridBoxFrame),
SCROLLABLE_XUL_INT_CREATE(NS_STYLE_DISPLAY_GRID, NS_NewGridBoxFrame),
SCROLLABLE_XUL_INT_CREATE(NS_STYLE_DISPLAY_GRID_GROUP,
SCROLLABLE_XUL_INT_CREATE(NS_STYLE_DISPLAY_INLINE_XUL_GRID, NS_NewGridBoxFrame),
SCROLLABLE_XUL_INT_CREATE(NS_STYLE_DISPLAY_XUL_GRID, NS_NewGridBoxFrame),
SCROLLABLE_XUL_INT_CREATE(NS_STYLE_DISPLAY_XUL_GRID_GROUP,
NS_NewGridRowGroupFrame),
SCROLLABLE_XUL_INT_CREATE(NS_STYLE_DISPLAY_GRID_LINE,
SCROLLABLE_XUL_INT_CREATE(NS_STYLE_DISPLAY_XUL_GRID_LINE,
NS_NewGridRowLeafFrame),
SIMPLE_XUL_INT_CREATE(NS_STYLE_DISPLAY_DECK, NS_NewDeckFrame),
SCROLLABLE_XUL_INT_CREATE(NS_STYLE_DISPLAY_GROUPBOX, NS_NewGroupBoxFrame),

2
layout/generic/nsHTMLReflowState.cpp
Просмотреть файл

@ -722,7 +722,7 @@ nsHTMLReflowState::InitFrameType(nsIAtom* aFrameType)
case NS_STYLE_DISPLAY_INLINE_BLOCK:
case NS_STYLE_DISPLAY_INLINE_TABLE:
case NS_STYLE_DISPLAY_INLINE_BOX:
case NS_STYLE_DISPLAY_INLINE_GRID:
case NS_STYLE_DISPLAY_INLINE_XUL_GRID:
case NS_STYLE_DISPLAY_INLINE_STACK:
case NS_STYLE_DISPLAY_INLINE_FLEX:
frameType = NS_CSS_FRAME_TYPE_INLINE;

8
layout/style/nsCSSProps.cpp
Просмотреть файл

@ -999,10 +999,10 @@ const KTableValue nsCSSProps::kDisplayKTable[] = {
eCSSKeyword__moz_box, NS_STYLE_DISPLAY_BOX,
eCSSKeyword__moz_inline_box, NS_STYLE_DISPLAY_INLINE_BOX,
#ifdef MOZ_XUL
eCSSKeyword__moz_grid, NS_STYLE_DISPLAY_GRID,
eCSSKeyword__moz_inline_grid, NS_STYLE_DISPLAY_INLINE_GRID,
eCSSKeyword__moz_grid_group, NS_STYLE_DISPLAY_GRID_GROUP,
eCSSKeyword__moz_grid_line, NS_STYLE_DISPLAY_GRID_LINE,
eCSSKeyword__moz_grid, NS_STYLE_DISPLAY_XUL_GRID,
eCSSKeyword__moz_inline_grid, NS_STYLE_DISPLAY_INLINE_XUL_GRID,
eCSSKeyword__moz_grid_group, NS_STYLE_DISPLAY_XUL_GRID_GROUP,
eCSSKeyword__moz_grid_line, NS_STYLE_DISPLAY_XUL_GRID_LINE,
eCSSKeyword__moz_stack, NS_STYLE_DISPLAY_STACK,
eCSSKeyword__moz_inline_stack, NS_STYLE_DISPLAY_INLINE_STACK,
eCSSKeyword__moz_deck, NS_STYLE_DISPLAY_DECK,

8
layout/style/nsStyleConsts.h
Просмотреть файл

@ -395,10 +395,10 @@ static inline mozilla::css::Side operator++(mozilla::css::Side& side, int) {
#define NS_STYLE_DISPLAY_BOX 18
#define NS_STYLE_DISPLAY_INLINE_BOX 19
#ifdef MOZ_XUL
#define NS_STYLE_DISPLAY_GRID 20
#define NS_STYLE_DISPLAY_INLINE_GRID 21
#define NS_STYLE_DISPLAY_GRID_GROUP 22
#define NS_STYLE_DISPLAY_GRID_LINE 23
#define NS_STYLE_DISPLAY_XUL_GRID 20
#define NS_STYLE_DISPLAY_INLINE_XUL_GRID 21
#define NS_STYLE_DISPLAY_XUL_GRID_GROUP 22
#define NS_STYLE_DISPLAY_XUL_GRID_LINE 23
#define NS_STYLE_DISPLAY_STACK 24
#define NS_STYLE_DISPLAY_INLINE_STACK 25
#define NS_STYLE_DISPLAY_DECK 26

2
layout/style/nsStyleStruct.h
Просмотреть файл

@ -1865,7 +1865,7 @@ struct nsStyleDisplay {
NS_STYLE_DISPLAY_INLINE_TABLE == aDisplay ||
NS_STYLE_DISPLAY_INLINE_BOX == aDisplay ||
NS_STYLE_DISPLAY_INLINE_FLEX == aDisplay ||
NS_STYLE_DISPLAY_INLINE_GRID == aDisplay ||
NS_STYLE_DISPLAY_INLINE_XUL_GRID == aDisplay ||
NS_STYLE_DISPLAY_INLINE_STACK == aDisplay;
}