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

Merge mozilla-central to mozilla-inbound. a=merge CLOSED TREE

This commit is contained in:
Ciure Andrei 2018-04-11 12:00:35 +03:00
Родитель 1f8e86b1ea cc3eafe546
Коммит 3f4a118829
331 изменённых файлов: 11806 добавлений и 9372 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

304
accessible/base/ARIAMap.cpp
Просмотреть файл

@ -38,7 +38,7 @@ static const uint32_t kGenericAccType = 0;
static const nsRoleMapEntry sWAIRoleMaps[] =
{
{ // alert
nsGkAtoms::alert,
&nsGkAtoms::alert,
roles::ALERT,
kUseMapRole,
eNoValue,
@ -48,7 +48,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // alertdialog
nsGkAtoms::alertdialog,
&nsGkAtoms::alertdialog,
roles::DIALOG,
kUseMapRole,
eNoValue,
@ -58,7 +58,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // application
nsGkAtoms::application,
&nsGkAtoms::application,
roles::APPLICATION,
kUseMapRole,
eNoValue,
@ -68,7 +68,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // article
nsGkAtoms::article,
&nsGkAtoms::article,
roles::ARTICLE,
kUseMapRole,
eNoValue,
@ -79,7 +79,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
eReadonlyUntilEditable
},
{ // banner
nsGkAtoms::banner,
&nsGkAtoms::banner,
roles::NOTHING,
kUseNativeRole,
eNoValue,
@ -89,7 +89,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // button
nsGkAtoms::button,
&nsGkAtoms::button,
roles::PUSHBUTTON,
kUseMapRole,
eNoValue,
@ -100,7 +100,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
// eARIAPressed is auto applied on any button
},
{ // cell
nsGkAtoms::cell,
&nsGkAtoms::cell,
roles::CELL,
kUseMapRole,
eNoValue,
@ -110,7 +110,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // checkbox
nsGkAtoms::checkbox,
&nsGkAtoms::checkbox,
roles::CHECKBUTTON,
kUseMapRole,
eNoValue,
@ -122,7 +122,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
eARIAReadonly
},
{ // columnheader
nsGkAtoms::columnheader,
&nsGkAtoms::columnheader,
roles::COLUMNHEADER,
kUseMapRole,
eNoValue,
@ -134,7 +134,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
eARIAReadonlyOrEditableIfDefined
},
{ // combobox, which consists of text input and popup
nsGkAtoms::combobox,
&nsGkAtoms::combobox,
roles::EDITCOMBOBOX,
kUseMapRole,
eNoValue,
@ -147,7 +147,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
eARIAOrientation
},
{ // complementary
nsGkAtoms::complementary,
&nsGkAtoms::complementary,
roles::NOTHING,
kUseNativeRole,
eNoValue,
@ -157,7 +157,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // contentinfo
nsGkAtoms::contentinfo,
&nsGkAtoms::contentinfo,
roles::NOTHING,
kUseNativeRole,
eNoValue,
@ -167,7 +167,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // dialog
nsGkAtoms::dialog,
&nsGkAtoms::dialog,
roles::DIALOG,
kUseMapRole,
eNoValue,
@ -177,7 +177,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // directory
nsGkAtoms::directory,
&nsGkAtoms::directory,
roles::LIST,
kUseMapRole,
eNoValue,
@ -187,7 +187,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
states::READONLY
},
{ // doc-abstract
nsGkAtoms::docAbstract,
&nsGkAtoms::docAbstract,
roles::SECTION,
kUseMapRole,
eNoValue,
@ -197,7 +197,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // doc-acknowledgments
nsGkAtoms::docAcknowledgments,
&nsGkAtoms::docAcknowledgments,
roles::LANDMARK,
kUseMapRole,
eNoValue,
@ -207,7 +207,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // doc-afterword
nsGkAtoms::docAfterword,
&nsGkAtoms::docAfterword,
roles::LANDMARK,
kUseMapRole,
eNoValue,
@ -217,7 +217,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // doc-appendix
nsGkAtoms::docAppendix,
&nsGkAtoms::docAppendix,
roles::LANDMARK,
kUseMapRole,
eNoValue,
@ -227,7 +227,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // doc-backlink
nsGkAtoms::docBacklink,
&nsGkAtoms::docBacklink,
roles::LINK,
kUseMapRole,
eNoValue,
@ -237,7 +237,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
states::LINKED
},
{ // doc-biblioentry
nsGkAtoms::docBiblioentry,
&nsGkAtoms::docBiblioentry,
roles::LISTITEM,
kUseMapRole,
eNoValue,
@ -247,7 +247,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
states::READONLY
},
{ // doc-bibliography
nsGkAtoms::docBibliography,
&nsGkAtoms::docBibliography,
roles::LANDMARK,
kUseMapRole,
eNoValue,
@ -257,7 +257,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // doc-biblioref
nsGkAtoms::docBiblioref,
&nsGkAtoms::docBiblioref,
roles::LINK,
kUseMapRole,
eNoValue,
@ -267,7 +267,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
states::LINKED
},
{ // doc-chapter
nsGkAtoms::docChapter,
&nsGkAtoms::docChapter,
roles::LANDMARK,
kUseMapRole,
eNoValue,
@ -277,7 +277,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // doc-colophon
nsGkAtoms::docColophon,
&nsGkAtoms::docColophon,
roles::SECTION,
kUseMapRole,
eNoValue,
@ -287,7 +287,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // doc-conclusion
nsGkAtoms::docConclusion,
&nsGkAtoms::docConclusion,
roles::LANDMARK,
kUseMapRole,
eNoValue,
@ -297,7 +297,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // doc-cover
nsGkAtoms::docCover,
&nsGkAtoms::docCover,
roles::GRAPHIC,
kUseMapRole,
eNoValue,
@ -307,7 +307,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // doc-credit
nsGkAtoms::docCredit,
&nsGkAtoms::docCredit,
roles::SECTION,
kUseMapRole,
eNoValue,
@ -317,7 +317,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // doc-credits
nsGkAtoms::docCredits,
&nsGkAtoms::docCredits,
roles::LANDMARK,
kUseMapRole,
eNoValue,
@ -327,7 +327,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // doc-dedication
nsGkAtoms::docDedication,
&nsGkAtoms::docDedication,
roles::SECTION,
kUseMapRole,
eNoValue,
@ -337,7 +337,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // doc-endnote
nsGkAtoms::docEndnote,
&nsGkAtoms::docEndnote,
roles::LISTITEM,
kUseMapRole,
eNoValue,
@ -347,7 +347,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
states::READONLY
},
{ // doc-endnotes
nsGkAtoms::docEndnotes,
&nsGkAtoms::docEndnotes,
roles::LANDMARK,
kUseMapRole,
eNoValue,
@ -357,7 +357,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // doc-epigraph
nsGkAtoms::docEpigraph,
&nsGkAtoms::docEpigraph,
roles::SECTION,
kUseMapRole,
eNoValue,
@ -367,7 +367,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // doc-epilogue
nsGkAtoms::docEpilogue,
&nsGkAtoms::docEpilogue,
roles::LANDMARK,
kUseMapRole,
eNoValue,
@ -377,7 +377,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // doc-errata
nsGkAtoms::docErrata,
&nsGkAtoms::docErrata,
roles::LANDMARK,
kUseMapRole,
eNoValue,
@ -387,7 +387,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // doc-example
nsGkAtoms::docExample,
&nsGkAtoms::docExample,
roles::SECTION,
kUseMapRole,
eNoValue,
@ -397,7 +397,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // doc-footnote
nsGkAtoms::docFootnote,
&nsGkAtoms::docFootnote,
roles::FOOTNOTE,
kUseMapRole,
eNoValue,
@ -407,7 +407,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // doc-foreword
nsGkAtoms::docForeword,
&nsGkAtoms::docForeword,
roles::LANDMARK,
kUseMapRole,
eNoValue,
@ -417,7 +417,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // doc-glossary
nsGkAtoms::docGlossary,
&nsGkAtoms::docGlossary,
roles::LANDMARK,
kUseMapRole,
eNoValue,
@ -427,7 +427,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // doc-glossref
nsGkAtoms::docGlossref,
&nsGkAtoms::docGlossref,
roles::LINK,
kUseMapRole,
eNoValue,
@ -437,7 +437,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
states::LINKED
},
{ // doc-index
nsGkAtoms::docIndex,
&nsGkAtoms::docIndex,
roles::NAVIGATION,
kUseMapRole,
eNoValue,
@ -447,7 +447,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // doc-introduction
nsGkAtoms::docIntroduction,
&nsGkAtoms::docIntroduction,
roles::LANDMARK,
kUseMapRole,
eNoValue,
@ -457,7 +457,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // doc-noteref
nsGkAtoms::docNoteref,
&nsGkAtoms::docNoteref,
roles::LINK,
kUseMapRole,
eNoValue,
@ -467,7 +467,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
states::LINKED
},
{ // doc-notice
nsGkAtoms::docNotice,
&nsGkAtoms::docNotice,
roles::NOTE,
kUseMapRole,
eNoValue,
@ -477,7 +477,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // doc-pagebreak
nsGkAtoms::docPagebreak,
&nsGkAtoms::docPagebreak,
roles::SEPARATOR,
kUseMapRole,
eNoValue,
@ -487,7 +487,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // doc-pagelist
nsGkAtoms::docPagelist,
&nsGkAtoms::docPagelist,
roles::NAVIGATION,
kUseMapRole,
eNoValue,
@ -497,7 +497,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // doc-part
nsGkAtoms::docPart,
&nsGkAtoms::docPart,
roles::LANDMARK,
kUseMapRole,
eNoValue,
@ -507,7 +507,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // doc-preface
nsGkAtoms::docPreface,
&nsGkAtoms::docPreface,
roles::LANDMARK,
kUseMapRole,
eNoValue,
@ -517,7 +517,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // doc-prologue
nsGkAtoms::docPrologue,
&nsGkAtoms::docPrologue,
roles::LANDMARK,
kUseMapRole,
eNoValue,
@ -527,7 +527,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // doc-pullquote
nsGkAtoms::docPullquote,
&nsGkAtoms::docPullquote,
roles::SECTION,
kUseMapRole,
eNoValue,
@ -537,7 +537,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // doc-qna
nsGkAtoms::docQna,
&nsGkAtoms::docQna,
roles::SECTION,
kUseMapRole,
eNoValue,
@ -547,7 +547,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // doc-subtitle
nsGkAtoms::docSubtitle,
&nsGkAtoms::docSubtitle,
roles::HEADING,
kUseMapRole,
eNoValue,
@ -557,7 +557,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // doc-tip
nsGkAtoms::docTip,
&nsGkAtoms::docTip,
roles::NOTE,
kUseMapRole,
eNoValue,
@ -567,7 +567,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // doc-toc
nsGkAtoms::docToc,
&nsGkAtoms::docToc,
roles::NAVIGATION,
kUseMapRole,
eNoValue,
@ -577,7 +577,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // document
nsGkAtoms::document,
&nsGkAtoms::document,
roles::NON_NATIVE_DOCUMENT,
kUseMapRole,
eNoValue,
@ -588,7 +588,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
eReadonlyUntilEditable
},
{ // feed
nsGkAtoms::feed,
&nsGkAtoms::feed,
roles::GROUPING,
kUseMapRole,
eNoValue,
@ -598,7 +598,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // figure
nsGkAtoms::figure,
&nsGkAtoms::figure,
roles::FIGURE,
kUseMapRole,
eNoValue,
@ -608,7 +608,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // form
nsGkAtoms::form,
&nsGkAtoms::form,
roles::FORM,
kUseMapRole,
eNoValue,
@ -618,7 +618,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // graphics-document
nsGkAtoms::graphicsDocument,
&nsGkAtoms::graphicsDocument,
roles::NON_NATIVE_DOCUMENT,
kUseMapRole,
eNoValue,
@ -629,7 +629,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
eReadonlyUntilEditable
},
{ // graphics-object
nsGkAtoms::graphicsObject,
&nsGkAtoms::graphicsObject,
roles::GROUPING,
kUseMapRole,
eNoValue,
@ -639,7 +639,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // graphics-symbol
nsGkAtoms::graphicsSymbol,
&nsGkAtoms::graphicsSymbol,
roles::GRAPHIC,
kUseMapRole,
eNoValue,
@ -649,7 +649,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // grid
nsGkAtoms::grid,
&nsGkAtoms::grid,
roles::TABLE,
kUseMapRole,
eNoValue,
@ -662,7 +662,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
eFocusableUntilDisabled
},
{ // gridcell
nsGkAtoms::gridcell,
&nsGkAtoms::gridcell,
roles::GRID_CELL,
kUseMapRole,
eNoValue,
@ -674,7 +674,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
eARIAReadonlyOrEditableIfDefined
},
{ // group
nsGkAtoms::group,
&nsGkAtoms::group,
roles::GROUPING,
kUseMapRole,
eNoValue,
@ -684,7 +684,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // heading
nsGkAtoms::heading,
&nsGkAtoms::heading,
roles::HEADING,
kUseMapRole,
eNoValue,
@ -694,7 +694,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // img
nsGkAtoms::img,
&nsGkAtoms::img,
roles::GRAPHIC,
kUseMapRole,
eNoValue,
@ -704,7 +704,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // key
nsGkAtoms::key,
&nsGkAtoms::key,
roles::KEY,
kUseMapRole,
eNoValue,
@ -715,7 +715,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
eARIAPressed
},
{ // link
nsGkAtoms::link,
&nsGkAtoms::link,
roles::LINK,
kUseMapRole,
eNoValue,
@ -725,7 +725,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
states::LINKED
},
{ // list
nsGkAtoms::list_,
&nsGkAtoms::list_,
roles::LIST,
kUseMapRole,
eNoValue,
@ -735,7 +735,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
states::READONLY
},
{ // listbox
nsGkAtoms::listbox,
&nsGkAtoms::listbox,
roles::LISTBOX,
kUseMapRole,
eNoValue,
@ -749,7 +749,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
eARIAOrientation
},
{ // listitem
nsGkAtoms::listitem,
&nsGkAtoms::listitem,
roles::LISTITEM,
kUseMapRole,
eNoValue,
@ -759,7 +759,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
states::READONLY
},
{ // log
nsGkAtoms::log_,
&nsGkAtoms::log_,
roles::NOTHING,
kUseNativeRole,
eNoValue,
@ -769,7 +769,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // main
nsGkAtoms::main,
&nsGkAtoms::main,
roles::NOTHING,
kUseNativeRole,
eNoValue,
@ -779,7 +779,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // marquee
nsGkAtoms::marquee,
&nsGkAtoms::marquee,
roles::ANIMATION,
kUseMapRole,
eNoValue,
@ -789,7 +789,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // math
nsGkAtoms::math,
&nsGkAtoms::math,
roles::FLAT_EQUATION,
kUseMapRole,
eNoValue,
@ -799,7 +799,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // menu
nsGkAtoms::menu,
&nsGkAtoms::menu,
roles::MENUPOPUP,
kUseMapRole,
eNoValue,
@ -811,7 +811,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
eARIAOrientation
},
{ // menubar
nsGkAtoms::menubar,
&nsGkAtoms::menubar,
roles::MENUBAR,
kUseMapRole,
eNoValue,
@ -822,7 +822,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
eARIAOrientation
},
{ // menuitem
nsGkAtoms::menuitem,
&nsGkAtoms::menuitem,
roles::MENUITEM,
kUseMapRole,
eNoValue,
@ -832,7 +832,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // menuitemcheckbox
nsGkAtoms::menuitemcheckbox,
&nsGkAtoms::menuitemcheckbox,
roles::CHECK_MENU_ITEM,
kUseMapRole,
eNoValue,
@ -844,7 +844,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
eARIAReadonly
},
{ // menuitemradio
nsGkAtoms::menuitemradio,
&nsGkAtoms::menuitemradio,
roles::RADIO_MENU_ITEM,
kUseMapRole,
eNoValue,
@ -856,7 +856,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
eARIAReadonly
},
{ // navigation
nsGkAtoms::navigation,
&nsGkAtoms::navigation,
roles::NOTHING,
kUseNativeRole,
eNoValue,
@ -866,7 +866,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // none
nsGkAtoms::none,
&nsGkAtoms::none,
roles::NOTHING,
kUseMapRole,
eNoValue,
@ -876,7 +876,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // note
nsGkAtoms::note_,
&nsGkAtoms::note_,
roles::NOTE,
kUseMapRole,
eNoValue,
@ -886,7 +886,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // option
nsGkAtoms::option,
&nsGkAtoms::option,
roles::OPTION,
kUseMapRole,
eNoValue,
@ -898,7 +898,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
eARIACheckedMixed
},
{ // presentation
nsGkAtoms::presentation,
&nsGkAtoms::presentation,
roles::NOTHING,
kUseMapRole,
eNoValue,
@ -908,7 +908,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // progressbar
nsGkAtoms::progressbar,
&nsGkAtoms::progressbar,
roles::PROGRESSBAR,
kUseMapRole,
eHasValueMinMax,
@ -919,7 +919,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
eIndeterminateIfNoValue
},
{ // radio
nsGkAtoms::radio,
&nsGkAtoms::radio,
roles::RADIOBUTTON,
kUseMapRole,
eNoValue,
@ -930,7 +930,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
eARIACheckableBool
},
{ // radiogroup
nsGkAtoms::radiogroup,
&nsGkAtoms::radiogroup,
roles::RADIO_GROUP,
kUseMapRole,
eNoValue,
@ -942,7 +942,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
eARIAReadonly
},
{ // region
nsGkAtoms::region,
&nsGkAtoms::region,
roles::REGION,
kUseMapRole,
eNoValue,
@ -952,7 +952,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // row
nsGkAtoms::row,
&nsGkAtoms::row,
roles::ROW,
kUseMapRole,
eNoValue,
@ -963,7 +963,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
eARIASelectable
},
{ // rowgroup
nsGkAtoms::rowgroup,
&nsGkAtoms::rowgroup,
roles::GROUPING,
kUseMapRole,
eNoValue,
@ -973,7 +973,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // rowheader
nsGkAtoms::rowheader,
&nsGkAtoms::rowheader,
roles::ROWHEADER,
kUseMapRole,
eNoValue,
@ -985,7 +985,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
eARIAReadonlyOrEditableIfDefined
},
{ // scrollbar
nsGkAtoms::scrollbar,
&nsGkAtoms::scrollbar,
roles::SCROLLBAR,
kUseMapRole,
eHasValueMinMax,
@ -997,7 +997,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
eARIAReadonly
},
{ // search
nsGkAtoms::search,
&nsGkAtoms::search,
roles::NOTHING,
kUseNativeRole,
eNoValue,
@ -1007,7 +1007,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // searchbox
nsGkAtoms::searchbox,
&nsGkAtoms::searchbox,
roles::ENTRY,
kUseMapRole,
eNoValue,
@ -1020,7 +1020,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
eARIAReadonlyOrEditable
},
{ // separator
nsGkAtoms::separator_,
&nsGkAtoms::separator_,
roles::SEPARATOR,
kUseMapRole,
eHasValueMinMaxIfFocusable,
@ -1031,7 +1031,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
eARIAOrientation
},
{ // slider
nsGkAtoms::slider,
&nsGkAtoms::slider,
roles::SLIDER,
kUseMapRole,
eHasValueMinMax,
@ -1043,7 +1043,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
eARIAReadonly
},
{ // spinbutton
nsGkAtoms::spinbutton,
&nsGkAtoms::spinbutton,
roles::SPINBUTTON,
kUseMapRole,
eHasValueMinMax,
@ -1054,7 +1054,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
eARIAReadonly
},
{ // status
nsGkAtoms::status,
&nsGkAtoms::status,
roles::STATUSBAR,
kUseMapRole,
eNoValue,
@ -1064,7 +1064,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // switch
nsGkAtoms::svgSwitch,
&nsGkAtoms::svgSwitch,
roles::SWITCH,
kUseMapRole,
eNoValue,
@ -1076,7 +1076,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
eARIAReadonly
},
{ // tab
nsGkAtoms::tab,
&nsGkAtoms::tab,
roles::PAGETAB,
kUseMapRole,
eNoValue,
@ -1087,7 +1087,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
eARIASelectable
},
{ // table
nsGkAtoms::table,
&nsGkAtoms::table,
roles::TABLE,
kUseMapRole,
eNoValue,
@ -1098,7 +1098,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
eARIASelectable
},
{ // tablist
nsGkAtoms::tablist,
&nsGkAtoms::tablist,
roles::PAGETABLIST,
kUseMapRole,
eNoValue,
@ -1109,7 +1109,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
eARIAOrientation
},
{ // tabpanel
nsGkAtoms::tabpanel,
&nsGkAtoms::tabpanel,
roles::PROPERTYPAGE,
kUseMapRole,
eNoValue,
@ -1119,7 +1119,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // term
nsGkAtoms::term,
&nsGkAtoms::term,
roles::TERM,
kUseMapRole,
eNoValue,
@ -1129,7 +1129,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
states::READONLY
},
{ // textbox
nsGkAtoms::textbox,
&nsGkAtoms::textbox,
roles::ENTRY,
kUseMapRole,
eNoValue,
@ -1142,7 +1142,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
eARIAReadonlyOrEditable
},
{ // timer
nsGkAtoms::timer,
&nsGkAtoms::timer,
roles::NOTHING,
kUseNativeRole,
eNoValue,
@ -1151,7 +1151,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // toolbar
nsGkAtoms::toolbar,
&nsGkAtoms::toolbar,
roles::TOOLBAR,
kUseMapRole,
eNoValue,
@ -1162,7 +1162,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
eARIAOrientation
},
{ // tooltip
nsGkAtoms::tooltip,
&nsGkAtoms::tooltip,
roles::TOOLTIP,
kUseMapRole,
eNoValue,
@ -1172,7 +1172,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
kNoReqStates
},
{ // tree
nsGkAtoms::tree,
&nsGkAtoms::tree,
roles::OUTLINE,
kUseMapRole,
eNoValue,
@ -1186,7 +1186,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
eARIAOrientation
},
{ // treegrid
nsGkAtoms::treegrid,
&nsGkAtoms::treegrid,
roles::TREE_TABLE,
kUseMapRole,
eNoValue,
@ -1200,7 +1200,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
eARIAOrientation
},
{ // treeitem
nsGkAtoms::treeitem,
&nsGkAtoms::treeitem,
roles::OUTLINEITEM,
kUseMapRole,
eNoValue,
@ -1215,7 +1215,7 @@ static const nsRoleMapEntry sWAIRoleMaps[] =
};
static const nsRoleMapEntry sLandmarkRoleMap = {
nsGkAtoms::_empty,
&nsGkAtoms::_empty,
roles::NOTHING,
kUseNativeRole,
eNoValue,
@ -1226,7 +1226,7 @@ static const nsRoleMapEntry sLandmarkRoleMap = {
};
nsRoleMapEntry aria::gEmptyRoleMap = {
nsGkAtoms::_empty,
&nsGkAtoms::_empty,
roles::NOTHING,
kUseMapRole,
eNoValue,
@ -1261,48 +1261,48 @@ static const EStateRule sWAIUnivStateMap[] = {
struct AttrCharacteristics
{
const nsStaticAtom* const attributeName;
nsStaticAtom** attributeName;
const uint8_t characteristics;
};
static const AttrCharacteristics gWAIUnivAttrMap[] = {
{nsGkAtoms::aria_activedescendant, ATTR_BYPASSOBJ },
{nsGkAtoms::aria_atomic, ATTR_BYPASSOBJ_IF_FALSE | ATTR_VALTOKEN | ATTR_GLOBAL },
{nsGkAtoms::aria_busy, ATTR_VALTOKEN | ATTR_GLOBAL },
{nsGkAtoms::aria_checked, ATTR_BYPASSOBJ | ATTR_VALTOKEN }, /* exposes checkable obj attr */
{nsGkAtoms::aria_controls, ATTR_BYPASSOBJ | ATTR_GLOBAL },
{nsGkAtoms::aria_describedby, ATTR_BYPASSOBJ | ATTR_GLOBAL },
{nsGkAtoms::aria_details, ATTR_BYPASSOBJ | ATTR_GLOBAL },
{nsGkAtoms::aria_disabled, ATTR_BYPASSOBJ | ATTR_VALTOKEN | ATTR_GLOBAL },
{nsGkAtoms::aria_dropeffect, ATTR_VALTOKEN | ATTR_GLOBAL },
{nsGkAtoms::aria_errormessage, ATTR_BYPASSOBJ | ATTR_GLOBAL },
{nsGkAtoms::aria_expanded, ATTR_BYPASSOBJ | ATTR_VALTOKEN },
{nsGkAtoms::aria_flowto, ATTR_BYPASSOBJ | ATTR_GLOBAL },
{nsGkAtoms::aria_grabbed, ATTR_VALTOKEN | ATTR_GLOBAL },
{nsGkAtoms::aria_haspopup, ATTR_BYPASSOBJ_IF_FALSE | ATTR_VALTOKEN | ATTR_GLOBAL },
{nsGkAtoms::aria_hidden, ATTR_BYPASSOBJ | ATTR_VALTOKEN | ATTR_GLOBAL }, /* handled special way */
{nsGkAtoms::aria_invalid, ATTR_BYPASSOBJ | ATTR_VALTOKEN | ATTR_GLOBAL },
{nsGkAtoms::aria_label, ATTR_BYPASSOBJ | ATTR_GLOBAL },
{nsGkAtoms::aria_labelledby, ATTR_BYPASSOBJ | ATTR_GLOBAL },
{nsGkAtoms::aria_level, ATTR_BYPASSOBJ }, /* handled via groupPosition */
{nsGkAtoms::aria_live, ATTR_VALTOKEN | ATTR_GLOBAL },
{nsGkAtoms::aria_modal, ATTR_BYPASSOBJ | ATTR_VALTOKEN | ATTR_GLOBAL },
{nsGkAtoms::aria_multiline, ATTR_BYPASSOBJ | ATTR_VALTOKEN },
{nsGkAtoms::aria_multiselectable, ATTR_BYPASSOBJ | ATTR_VALTOKEN },
{nsGkAtoms::aria_owns, ATTR_BYPASSOBJ | ATTR_GLOBAL },
{nsGkAtoms::aria_orientation, ATTR_VALTOKEN },
{nsGkAtoms::aria_posinset, ATTR_BYPASSOBJ }, /* handled via groupPosition */
{nsGkAtoms::aria_pressed, ATTR_BYPASSOBJ | ATTR_VALTOKEN },
{nsGkAtoms::aria_readonly, ATTR_BYPASSOBJ | ATTR_VALTOKEN },
{nsGkAtoms::aria_relevant, ATTR_BYPASSOBJ | ATTR_GLOBAL },
{nsGkAtoms::aria_required, ATTR_BYPASSOBJ | ATTR_VALTOKEN },
{nsGkAtoms::aria_selected, ATTR_BYPASSOBJ | ATTR_VALTOKEN },
{nsGkAtoms::aria_setsize, ATTR_BYPASSOBJ }, /* handled via groupPosition */
{nsGkAtoms::aria_sort, ATTR_VALTOKEN },
{nsGkAtoms::aria_valuenow, ATTR_BYPASSOBJ },
{nsGkAtoms::aria_valuemin, ATTR_BYPASSOBJ },
{nsGkAtoms::aria_valuemax, ATTR_BYPASSOBJ },
{nsGkAtoms::aria_valuetext, ATTR_BYPASSOBJ }
{&nsGkAtoms::aria_activedescendant, ATTR_BYPASSOBJ },
{&nsGkAtoms::aria_atomic, ATTR_BYPASSOBJ_IF_FALSE | ATTR_VALTOKEN | ATTR_GLOBAL },
{&nsGkAtoms::aria_busy, ATTR_VALTOKEN | ATTR_GLOBAL },
{&nsGkAtoms::aria_checked, ATTR_BYPASSOBJ | ATTR_VALTOKEN }, /* exposes checkable obj attr */
{&nsGkAtoms::aria_controls, ATTR_BYPASSOBJ | ATTR_GLOBAL },
{&nsGkAtoms::aria_describedby, ATTR_BYPASSOBJ | ATTR_GLOBAL },
{&nsGkAtoms::aria_details, ATTR_BYPASSOBJ | ATTR_GLOBAL },
{&nsGkAtoms::aria_disabled, ATTR_BYPASSOBJ | ATTR_VALTOKEN | ATTR_GLOBAL },
{&nsGkAtoms::aria_dropeffect, ATTR_VALTOKEN | ATTR_GLOBAL },
{&nsGkAtoms::aria_errormessage, ATTR_BYPASSOBJ | ATTR_GLOBAL },
{&nsGkAtoms::aria_expanded, ATTR_BYPASSOBJ | ATTR_VALTOKEN },
{&nsGkAtoms::aria_flowto, ATTR_BYPASSOBJ | ATTR_GLOBAL },
{&nsGkAtoms::aria_grabbed, ATTR_VALTOKEN | ATTR_GLOBAL },
{&nsGkAtoms::aria_haspopup, ATTR_BYPASSOBJ_IF_FALSE | ATTR_VALTOKEN | ATTR_GLOBAL },
{&nsGkAtoms::aria_hidden, ATTR_BYPASSOBJ | ATTR_VALTOKEN | ATTR_GLOBAL }, /* handled special way */
{&nsGkAtoms::aria_invalid, ATTR_BYPASSOBJ | ATTR_VALTOKEN | ATTR_GLOBAL },
{&nsGkAtoms::aria_label, ATTR_BYPASSOBJ | ATTR_GLOBAL },
{&nsGkAtoms::aria_labelledby, ATTR_BYPASSOBJ | ATTR_GLOBAL },
{&nsGkAtoms::aria_level, ATTR_BYPASSOBJ }, /* handled via groupPosition */
{&nsGkAtoms::aria_live, ATTR_VALTOKEN | ATTR_GLOBAL },
{&nsGkAtoms::aria_modal, ATTR_BYPASSOBJ | ATTR_VALTOKEN | ATTR_GLOBAL },
{&nsGkAtoms::aria_multiline, ATTR_BYPASSOBJ | ATTR_VALTOKEN },
{&nsGkAtoms::aria_multiselectable, ATTR_BYPASSOBJ | ATTR_VALTOKEN },
{&nsGkAtoms::aria_owns, ATTR_BYPASSOBJ | ATTR_GLOBAL },
{&nsGkAtoms::aria_orientation, ATTR_VALTOKEN },
{&nsGkAtoms::aria_posinset, ATTR_BYPASSOBJ }, /* handled via groupPosition */
{&nsGkAtoms::aria_pressed, ATTR_BYPASSOBJ | ATTR_VALTOKEN },
{&nsGkAtoms::aria_readonly, ATTR_BYPASSOBJ | ATTR_VALTOKEN },
{&nsGkAtoms::aria_relevant, ATTR_BYPASSOBJ | ATTR_GLOBAL },
{&nsGkAtoms::aria_required, ATTR_BYPASSOBJ | ATTR_VALTOKEN },
{&nsGkAtoms::aria_selected, ATTR_BYPASSOBJ | ATTR_VALTOKEN },
{&nsGkAtoms::aria_setsize, ATTR_BYPASSOBJ }, /* handled via groupPosition */
{&nsGkAtoms::aria_sort, ATTR_VALTOKEN },
{&nsGkAtoms::aria_valuenow, ATTR_BYPASSOBJ },
{&nsGkAtoms::aria_valuemin, ATTR_BYPASSOBJ },
{&nsGkAtoms::aria_valuemax, ATTR_BYPASSOBJ },
{&nsGkAtoms::aria_valuetext, ATTR_BYPASSOBJ }
};
namespace {
@ -1395,7 +1395,7 @@ uint8_t
aria::AttrCharacteristicsFor(nsAtom* aAtom)
{
for (uint32_t i = 0; i < ArrayLength(gWAIUnivAttrMap); i++)
if (gWAIUnivAttrMap[i].attributeName == aAtom)
if (*gWAIUnivAttrMap[i].attributeName == aAtom)
return gWAIUnivAttrMap[i].characteristics;
return 0;

6
accessible/base/ARIAMap.h
Просмотреть файл

@ -142,7 +142,7 @@ struct nsRoleMapEntry
* Return true if matches to the given ARIA role.
*/
bool Is(nsAtom* aARIARole) const
{ return roleAtom == aARIARole; }
{ return *roleAtom == aARIARole; }
/**
* Return true if ARIA role has the given accessible type.
@ -154,10 +154,10 @@ struct nsRoleMapEntry
* Return ARIA role.
*/
const nsDependentAtomString ARIARoleString() const
{ return nsDependentAtomString(roleAtom); }
{ return nsDependentAtomString(*roleAtom); }
// ARIA role: string representation such as "button"
nsStaticAtom* const roleAtom;
nsStaticAtom** roleAtom;
// Role mapping rule: maps to enum Role
mozilla::a11y::role role;

16
accessible/base/ARIAStateMap.cpp
Просмотреть файл

@ -24,7 +24,7 @@ struct EnumTypeData
// States if the attribute value is matched to the enum value. Used as
// Element::AttrValuesArray, last item must be nullptr.
nsStaticAtom* const mValues[4];
nsStaticAtom* const* const mValues[4];
// States applied if corresponding enum values are matched.
const uint64_t mStates[3];
@ -89,9 +89,9 @@ aria::MapToState(EStateRule aRule, dom::Element* aElement, uint64_t* aState)
{
static const EnumTypeData data = {
nsGkAtoms::aria_autocomplete,
{ nsGkAtoms::inlinevalue,
nsGkAtoms::list_,
nsGkAtoms::both, nullptr },
{ &nsGkAtoms::inlinevalue,
&nsGkAtoms::list_,
&nsGkAtoms::both, nullptr },
{ states::SUPPORTS_AUTOCOMPLETION,
states::HASPOPUP | states::SUPPORTS_AUTOCOMPLETION,
states::HASPOPUP | states::SUPPORTS_AUTOCOMPLETION }, 0
@ -105,8 +105,8 @@ aria::MapToState(EStateRule aRule, dom::Element* aElement, uint64_t* aState)
{
static const EnumTypeData data = {
nsGkAtoms::aria_busy,
{ nsGkAtoms::_true,
nsGkAtoms::error, nullptr },
{ &nsGkAtoms::_true,
&nsGkAtoms::error, nullptr },
{ states::BUSY,
states::INVALID }, 0
};
@ -229,8 +229,8 @@ aria::MapToState(EStateRule aRule, dom::Element* aElement, uint64_t* aState)
{
static const EnumTypeData data = {
nsGkAtoms::aria_orientation,
{ nsGkAtoms::horizontal,
nsGkAtoms::vertical, nullptr },
{ &nsGkAtoms::horizontal,
&nsGkAtoms::vertical, nullptr },
{ states::HORIZONTAL,
states::VERTICAL },
states::HORIZONTAL | states::VERTICAL

2
accessible/base/TextAttrs.cpp
Просмотреть файл

@ -302,7 +302,7 @@ TextAttrsMgr::InvalidTextAttr::
do {
if (nsAccUtils::HasDefinedARIAToken(elm, nsGkAtoms::aria_invalid)) {
static Element::AttrValuesArray tokens[] =
{ nsGkAtoms::_false, nsGkAtoms::grammar, nsGkAtoms::spelling,
{ &nsGkAtoms::_false, &nsGkAtoms::grammar, &nsGkAtoms::spelling,
nullptr };
int32_t idx = elm->AsElement()->FindAttrValueIn(kNameSpaceID_None,

2
accessible/base/XULMap.h
Просмотреть файл

@ -120,7 +120,7 @@ XULMAP(
panel,
[](nsIContent* aContent, Accessible* aContext) -> Accessible* {
static const Element::AttrValuesArray sIgnoreTypeVals[] =
{ nsGkAtoms::autocomplete_richlistbox, nsGkAtoms::autocomplete, nullptr };
{ &nsGkAtoms::autocomplete_richlistbox, &nsGkAtoms::autocomplete, nullptr };
if (!aContent->IsElement() ||
aContent->AsElement()->FindAttrValueIn(kNameSpaceID_None, nsGkAtoms::type,

7
accessible/base/nsAccUtils.cpp
Просмотреть файл

@ -208,19 +208,20 @@ nsAccUtils::HasDefinedARIAToken(nsIContent *aContent, nsAtom *aAtom)
return true;
}
nsStaticAtom*
nsAtom*
nsAccUtils::GetARIAToken(dom::Element* aElement, nsAtom* aAttr)
{
if (!HasDefinedARIAToken(aElement, aAttr))
return nsGkAtoms::_empty;
static Element::AttrValuesArray tokens[] =
{ nsGkAtoms::_false, nsGkAtoms::_true, nsGkAtoms::mixed, nullptr};
{ &nsGkAtoms::_false, &nsGkAtoms::_true,
&nsGkAtoms::mixed, nullptr};
int32_t idx = aElement->FindAttrValueIn(kNameSpaceID_None,
aAttr, tokens, eCaseMatters);
if (idx >= 0)
return tokens[idx];
return *(tokens[idx]);
return nullptr;
}

3
accessible/base/nsAccUtils.h
Просмотреть файл

@ -101,8 +101,7 @@ public:
/**
* Return atomic value of ARIA attribute of boolean or NMTOKEN type.
*/
static nsStaticAtom* GetARIAToken(mozilla::dom::Element* aElement,
nsAtom* aAttr);
static nsAtom* GetARIAToken(mozilla::dom::Element* aElement, nsAtom* aAttr);
/**
* Return document accessible for the given DOM node.

26
accessible/base/nsAccessibilityService.cpp
Просмотреть файл

@ -304,16 +304,16 @@ static int32_t sPlatformDisabledState = 0;
// Markup maps array.
#define Attr(name, value) \
{ nsGkAtoms::name, nsGkAtoms::value }
{ &nsGkAtoms::name, &nsGkAtoms::value }
#define AttrFromDOM(name, DOMAttrName) \
{ nsGkAtoms::name, nullptr, nsGkAtoms::DOMAttrName }
{ &nsGkAtoms::name, nullptr, &nsGkAtoms::DOMAttrName }
#define AttrFromDOMIf(name, DOMAttrName, DOMAttrValue) \
{ nsGkAtoms::name, nullptr, nsGkAtoms::DOMAttrName, nsGkAtoms::DOMAttrValue }
{ &nsGkAtoms::name, nullptr, &nsGkAtoms::DOMAttrName, &nsGkAtoms::DOMAttrValue }
#define MARKUPMAP(atom, new_func, r, ... ) \
{ nsGkAtoms::atom, new_func, static_cast<a11y::role>(r), { __VA_ARGS__ } },
{ &nsGkAtoms::atom, new_func, static_cast<a11y::role>(r), { __VA_ARGS__ } },
static const HTMLMarkupMapInfo sHTMLMarkupMapList[] = {
#include "MarkupMap.h"
@ -323,7 +323,7 @@ static const HTMLMarkupMapInfo sHTMLMarkupMapList[] = {
#ifdef MOZ_XUL
#define XULMAP(atom, ...) \
{ nsGkAtoms::atom, __VA_ARGS__ },
{ &nsGkAtoms::atom, __VA_ARGS__ },
#define XULMAP_TYPE(atom, new_type) \
XULMAP( \
@ -1349,11 +1349,11 @@ nsAccessibilityService::Init()
eventListenerService->AddListenerChangeListener(this);
for (uint32_t i = 0; i < ArrayLength(sHTMLMarkupMapList); i++)
mHTMLMarkupMap.Put(sHTMLMarkupMapList[i].tag, &sHTMLMarkupMapList[i]);
mHTMLMarkupMap.Put(*sHTMLMarkupMapList[i].tag, &sHTMLMarkupMapList[i]);
#ifdef MOZ_XUL
for (uint32_t i = 0; i < ArrayLength(sXULMarkupMapList); i++)
mXULMarkupMap.Put(sXULMarkupMapList[i].tag, &sXULMarkupMapList[i]);
mXULMarkupMap.Put(*sXULMarkupMapList[i].tag, &sXULMarkupMapList[i]);
#endif
#ifdef A11Y_LOG
@ -1615,10 +1615,10 @@ nsAccessibilityService::MarkupAttributes(const nsIContent* aContent,
if (info->DOMAttrValue) {
if (aContent->IsElement() &&
aContent->AsElement()->AttrValueIs(kNameSpaceID_None,
info->DOMAttrName,
info->DOMAttrValue,
*info->DOMAttrName,
*info->DOMAttrValue,
eCaseMatters)) {
nsAccUtils::SetAccAttr(aAttributes, info->name, info->DOMAttrValue);
nsAccUtils::SetAccAttr(aAttributes, *info->name, *info->DOMAttrValue);
}
continue;
}
@ -1626,16 +1626,16 @@ nsAccessibilityService::MarkupAttributes(const nsIContent* aContent,
nsAutoString value;
if (aContent->IsElement()) {
aContent->AsElement()->GetAttr(kNameSpaceID_None, info->DOMAttrName, value);
aContent->AsElement()->GetAttr(kNameSpaceID_None, *info->DOMAttrName, value);
}
if (!value.IsEmpty())
nsAccUtils::SetAccAttr(aAttributes, info->name, value);
nsAccUtils::SetAccAttr(aAttributes, *info->name, value);
continue;
}
nsAccUtils::SetAccAttr(aAttributes, info->name, info->value);
nsAccUtils::SetAccAttr(aAttributes, *info->name, *info->value);
}
}

13
accessible/base/nsAccessibilityService.h
Просмотреть файл

@ -53,17 +53,16 @@ xpcAccessibleApplication* XPCApplicationAcc();
typedef Accessible* (New_Accessible)(nsIContent* aContent, Accessible* aContext);
// These fields are not `nsStaticAtom* const` because MSVC doesn't like it.
struct MarkupAttrInfo {
nsStaticAtom* name;
nsStaticAtom* value;
nsStaticAtom** name;
nsStaticAtom** value;
nsStaticAtom* DOMAttrName;
nsStaticAtom* DOMAttrValue;
nsStaticAtom** DOMAttrName;
nsStaticAtom** DOMAttrValue;
};
struct HTMLMarkupMapInfo {
const nsStaticAtom* const tag;
nsStaticAtom** tag;
New_Accessible* new_func;
a11y::role role;
MarkupAttrInfo attrs[4];
@ -71,7 +70,7 @@ struct HTMLMarkupMapInfo {
#ifdef MOZ_XUL
struct XULMarkupMapInfo {
const nsStaticAtom* const tag;
nsStaticAtom** tag;
New_Accessible* new_func;
};
#endif

5
accessible/generic/Accessible.cpp
Просмотреть файл

@ -1491,9 +1491,8 @@ nsAtom*
Accessible::LandmarkRole() const
{
const nsRoleMapEntry* roleMapEntry = ARIARoleMap();
return roleMapEntry && roleMapEntry->IsOfType(eLandmark)
? roleMapEntry->roleAtom
: nullptr;
return roleMapEntry && roleMapEntry->IsOfType(eLandmark) ?
*(roleMapEntry->roleAtom) : nullptr;
}
role

26
accessible/generic/DocAccessible.cpp
Просмотреть файл

@ -54,17 +54,17 @@ using namespace mozilla::a11y;
////////////////////////////////////////////////////////////////////////////////
// Static member initialization
static nsStaticAtom* const kRelationAttrs[] =
static nsStaticAtom** kRelationAttrs[] =
{
nsGkAtoms::aria_labelledby,
nsGkAtoms::aria_describedby,
nsGkAtoms::aria_details,
nsGkAtoms::aria_owns,
nsGkAtoms::aria_controls,
nsGkAtoms::aria_flowto,
nsGkAtoms::aria_errormessage,
nsGkAtoms::_for,
nsGkAtoms::control
&nsGkAtoms::aria_labelledby,
&nsGkAtoms::aria_describedby,
&nsGkAtoms::aria_details,
&nsGkAtoms::aria_owns,
&nsGkAtoms::aria_controls,
&nsGkAtoms::aria_flowto,
&nsGkAtoms::aria_errormessage,
&nsGkAtoms::_for,
&nsGkAtoms::control
};
static const uint32_t kRelationAttrsLen = ArrayLength(kRelationAttrs);
@ -1557,7 +1557,7 @@ DocAccessible::AddDependentIDsFor(Accessible* aRelProvider, nsAtom* aRelAttr)
return;
for (uint32_t idx = 0; idx < kRelationAttrsLen; idx++) {
nsStaticAtom* relAttr = kRelationAttrs[idx];
nsAtom* relAttr = *kRelationAttrs[idx];
if (aRelAttr && aRelAttr != relAttr)
continue;
@ -1629,8 +1629,8 @@ DocAccessible::RemoveDependentIDsFor(Accessible* aRelProvider,
return;
for (uint32_t idx = 0; idx < kRelationAttrsLen; idx++) {
nsStaticAtom* relAttr = kRelationAttrs[idx];
if (aRelAttr && aRelAttr != kRelationAttrs[idx])
nsAtom* relAttr = *kRelationAttrs[idx];
if (aRelAttr && aRelAttr != *kRelationAttrs[idx])
continue;
IDRefsIterator iter(this, relProviderElm, relAttr);

4
accessible/html/HTMLTableAccessible.cpp
Просмотреть файл

@ -311,8 +311,8 @@ HTMLTableHeaderCellAccessible::NativeRole()
{
// Check value of @scope attribute.
static Element::AttrValuesArray scopeValues[] =
{ nsGkAtoms::col, nsGkAtoms::colgroup,
nsGkAtoms::row, nsGkAtoms::rowgroup, nullptr };
{ &nsGkAtoms::col, &nsGkAtoms::colgroup,
&nsGkAtoms::row, &nsGkAtoms::rowgroup, nullptr };
int32_t valueIdx =
mContent->AsElement()->FindAttrValueIn(kNameSpaceID_None, nsGkAtoms::scope,
scopeValues, eCaseMatters);

2
accessible/ipc/ProxyAccessibleShared.h
Просмотреть файл

@ -62,7 +62,7 @@ bool IsSearchbox() const;
nsAtom* LandmarkRole() const;
nsStaticAtom* ARIARoleAtom() const;
nsAtom* ARIARoleAtom() const;
int32_t GetLevelInternal();
void ScrollTo(uint32_t aScrollType);

2
accessible/ipc/other/DocAccessibleChild.cpp
Просмотреть файл

@ -293,7 +293,7 @@ DocAccessibleChild::RecvARIARoleAtom(const uint64_t& aID, nsString* aRole)
}
if (const nsRoleMapEntry* roleMap = acc->ARIARoleMap()) {
if (nsStaticAtom* roleAtom = roleMap->roleAtom) {
if (nsAtom* roleAtom = *(roleMap->roleAtom)) {
roleAtom->ToString(*aRole);
}
}

2
accessible/ipc/other/ProxyAccessible.cpp
Просмотреть файл

@ -127,7 +127,7 @@ ProxyAccessible::LandmarkRole() const
return NS_GetStaticAtom(landmark);
}
nsStaticAtom*
nsAtom*
ProxyAccessible::ARIARoleAtom() const
{
nsString role;

4
accessible/mac/mozAccessible.mm
Просмотреть файл

@ -770,10 +770,10 @@ ConvertToNSArray(nsTArray<ProxyAccessible*>& aArray)
return @"AXLandmarkRegion";
// Now, deal with widget roles
nsStaticAtom* roleAtom = nullptr;
nsAtom* roleAtom = nullptr;
if (accWrap && accWrap->HasARIARole()) {
const nsRoleMapEntry* roleMap = accWrap->ARIARoleMap();
roleAtom = roleMap->roleAtom;
roleAtom = *roleMap->roleAtom;
}
if (proxy)
roleAtom = proxy->ARIARoleAtom();

2
accessible/xul/XULFormControlAccessible.cpp
Просмотреть файл

@ -193,7 +193,7 @@ bool
XULButtonAccessible::ContainsMenu() const
{
static Element::AttrValuesArray strings[] =
{nsGkAtoms::menu, nsGkAtoms::menuButton, nullptr};
{&nsGkAtoms::menu, &nsGkAtoms::menuButton, nullptr};
return mContent->AsElement()->FindAttrValueIn(kNameSpaceID_None,
nsGkAtoms::type,

2
accessible/xul/XULMenuAccessible.cpp
Просмотреть файл

@ -59,7 +59,7 @@ XULMenuitemAccessible::NativeState()
// Checkable/checked?
static Element::AttrValuesArray strings[] =
{ nsGkAtoms::radio, nsGkAtoms::checkbox, nullptr };
{ &nsGkAtoms::radio, &nsGkAtoms::checkbox, nullptr };
if (mContent->AsElement()->FindAttrValueIn(kNameSpaceID_None, nsGkAtoms::type,
strings, eCaseMatters) >= 0) {

1
browser/components/extensions/test/browser/browser-common.ini
Просмотреть файл

@ -70,6 +70,7 @@ skip-if = (os == 'win' && !debug) # bug 1352668
[browser_ext_commands_getAll.js]
[browser_ext_commands_onCommand.js]
[browser_ext_commands_update.js]
[browser_ext_connect_and_move_tabs.js]
[browser_ext_contentscript_connect.js]
[browser_ext_contextMenus.js]
[browser_ext_contextMenus_checkboxes.js]

95
browser/components/extensions/test/browser/browser_ext_connect_and_move_tabs.js Normal file
Просмотреть файл

@ -0,0 +1,95 @@
/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* vim: set sts=2 sw=2 et tw=80: */
"use strict";
// Tests that the Port object created by browser.runtime.connect is not
// prematurely disconnected as the underlying message managers change when a
// tab is moved between windows.
function loadExtension() {
return ExtensionTestUtils.loadExtension({
manifest: {
"content_scripts": [{
"js": ["script.js"],
"matches": ["http://mochi.test/"],
}],
},
background() {
browser.runtime.onConnect.addListener((port) => {
port.onDisconnect.addListener(() => {
browser.test.fail("onDisconnect should not fire because the port is to be closed from this side");
browser.test.sendMessage("port_disconnected");
});
port.onMessage.addListener(async msg => {
browser.test.assertEq("connect_from_contentscript", msg, "expected message");
// Move a tab to a new window and back. Regression test for bugzil.la/1448674
let {windowId, id: tabId, index} = port.sender.tab;
await browser.windows.create({tabId});
await browser.tabs.move(tabId, {index, windowId});
await browser.windows.create({tabId});
await browser.tabs.move(tabId, {index, windowId});
try {
// When the port is unexpectedly disconnected, postMessage will throw an error.
port.postMessage("ping");
} catch (e) {
browser.test.fail(`Error: ${e} :: ${e.stack}`);
browser.test.sendMessage("port_ping_ponged_before_disconnect");
}
});
browser.runtime.onMessage.addListener((msg, sender) => {
browser.test.assertEq("disconnect-me", msg, "expected message");
port.disconnect();
// Now port.onDisconnect should fire in the content script.
});
});
browser.test.onMessage.addListener(msg => {
browser.test.assertEq("open_extension_tab", msg, "expected message");
browser.tabs.create({url: "tab.html"});
});
},
files: {
"tab.html": `
<!DOCTYPE html><meta charset="utf-8">
<script src="script.js"></script>
`,
"script.js": function() {
let port = browser.runtime.connect();
port.onMessage.addListener(msg => {
browser.test.assertEq("ping", msg, "expected message");
browser.test.sendMessage("port_ping_ponged_before_disconnect");
port.onDisconnect.addListener(() => {
browser.test.sendMessage("port_disconnected");
});
browser.runtime.sendMessage("disconnect-me");
});
port.postMessage("connect_from_contentscript");
},
},
});
}
add_task(async function contentscript_connect_and_move_tabs() {
let extension = loadExtension();
await extension.startup();
await BrowserTestUtils.openNewForegroundTab(gBrowser, "http://mochi.test:8888/");
await extension.awaitMessage("port_ping_ponged_before_disconnect");
await extension.awaitMessage("port_disconnected");
// Must use gBrowser.selectedTab instead of the return value of
// BrowserTestUtils.openNewForegroundTab because the latter does not refer to
// the tab because the tab is moved between windows during the test.
await BrowserTestUtils.removeTab(gBrowser.selectedTab);
await extension.unload();
});
add_task(async function extension_tab_connect_and_move_tabs() {
let extension = loadExtension();
await extension.startup();
extension.sendMessage("open_extension_tab");
await extension.awaitMessage("port_ping_ponged_before_disconnect");
await extension.awaitMessage("port_disconnected");
// Upon unloading the extension, the extension tab is automatically removed.
await extension.unload();
});

18
build/unix/build-gcc/build-gcc.sh
Просмотреть файл

@ -29,11 +29,15 @@ prepare() {
tar() { :; }
sed() { :; }
wget() {
echo $1
# Get last argument given to wget.
eval echo \$$# >&3
}
# In GCC >= 7, the download_prerequisites script tried to do its own
# verification, but we have ours, so disable it.
set -- --no-verify
. ./contrib/download_prerequisites
) | while read url; do
) 3>&1 > /dev/null | while read url; do
file=$(basename $url)
case "$file" in
gmp-*.tar.*)
@ -49,7 +53,15 @@ prepare() {
mpc-*.tar.*)
# If download_prerequisites wants 0.8.1, use 0.8.2 instead.
file=${file/0.8.1/0.8.2}
download_and_check http://www.multiprecision.org/downloads $file.asc
case "$file" in
*-0.8.2.tar*|*-0.9.tar*|*-1.0.tar*)
ext=asc
;;
*)
ext=sig
;;
esac
download_and_check http://www.multiprecision.org/downloads $file.$ext
;;
*)
download $(dirname $url) $file

6
devtools/client/inspector/animation/components/AnimatedPropertyListContainer.js
Просмотреть файл

@ -55,6 +55,12 @@ class AnimatedPropertyListContainer extends PureComponent {
timeScale,
}
),
dom.div(
{
className: "animated-property-list-background",
},
dom.span()
),
AnimatedPropertyList(
{
animation,

7
devtools/client/inspector/animation/components/AnimatedPropertyListHeader.js
Просмотреть файл

@ -35,8 +35,13 @@ class AnimatedPropertyListHeader extends PureComponent {
return dom.div(
{
className: "animated-property-list-header devtools-toolbar"
className: "animated-property-list-header"
},
dom.div(
{
className: "devtools-toolbar"
}
),
KeyframesProgressTickList(),
KeyframesProgressBar(
{

7
devtools/client/inspector/animation/components/AnimationListHeader.js
Просмотреть файл

@ -33,8 +33,13 @@ class AnimationListHeader extends PureComponent {
return dom.div(
{
className: "animation-list-header devtools-toolbar"
className: "animation-list-header"
},
dom.div(
{
className: "devtools-toolbar"
}
),
AnimationTimelineTickList(
{
timeScale

6
devtools/client/inspector/animation/components/CurrentTimeScrubberController.js
Просмотреть файл

@ -40,8 +40,8 @@ class CurrentTimeScrubberController extends PureComponent {
}
componentDidMount() {
const parentEl = ReactDOM.findDOMNode(this).parentElement;
parentEl.addEventListener("mousedown", this.onMouseDown);
const el = ReactDOM.findDOMNode(this);
el.addEventListener("mousedown", this.onMouseDown);
}
componentWillUnmount() {
@ -127,7 +127,7 @@ class CurrentTimeScrubberController extends PureComponent {
return dom.div(
{
className: "current-time-scrubber-controller devtools-toolbar",
className: "current-time-scrubber-controller",
},
CurrentTimeScrubber(
{

22
devtools/client/inspector/animation/test/browser_animation_animation-timeline-tick.js
Просмотреть файл

@ -28,15 +28,15 @@ add_task(async function() {
ok(listHeaderEl, "The header element should be in animation list container element");
info("Checking time tick item elements existence");
assertTimelineTickItems(timeScale, listHeaderEl);
assertTimelineTickItems(timeScale, listContainerEl);
const timelineTickItemLength =
listHeaderEl.querySelectorAll(".animation-timeline-tick-item").length;
listContainerEl.querySelectorAll(".animation-timeline-tick-item").length;
info("Checking timeline tick item elements after enlarge sidebar width");
await setSidebarWidth("100%", inspector);
assertTimelineTickItems(timeScale, listHeaderEl);
assertTimelineTickItems(timeScale, listContainerEl);
ok(timelineTickItemLength <
listHeaderEl.querySelectorAll(".animation-timeline-tick-item").length,
listContainerEl.querySelectorAll(".animation-timeline-tick-item").length,
"The timeline tick item elements should increase");
});
@ -44,22 +44,22 @@ add_task(async function() {
* Assert timeline tick item's position and label.
*
* @param {TimeScale} - timeScale
* @param {Element} - listHeaderEl which is header element
* @param {Element} - listContainerEl
*/
function assertTimelineTickItems(timeScale, listHeaderEl) {
const animationTimelineTickListEl =
listHeaderEl.querySelector(".animation-timeline-tick-list");
ok(animationTimelineTickListEl,
function assertTimelineTickItems(timeScale, listContainerEl) {
const timelineTickListEl =
listContainerEl.querySelector(".animation-timeline-tick-list");
ok(timelineTickListEl,
"The animation timeline tick list element should be in header");
const width = animationTimelineTickListEl.offsetWidth;
const width = timelineTickListEl.offsetWidth;
const animationDuration = timeScale.getDuration();
const minTimeInterval = TIME_GRADUATION_MIN_SPACING * animationDuration / width;
const interval = findOptimalTimeInterval(minTimeInterval);
const expectedTickItem = Math.ceil(animationDuration / interval);
const timelineTickItemEls =
listHeaderEl.querySelectorAll(".animation-timeline-tick-item");
timelineTickListEl.querySelectorAll(".animation-timeline-tick-item");
is(timelineTickItemEls.length, expectedTickItem,
"The expected number of timeline ticks were found");

14
devtools/client/netmonitor/src/actions/ui.js
Просмотреть файл

@ -17,15 +17,23 @@ const {
WATERFALL_RESIZE,
} = require("../constants");
const { getDisplayedRequests } = require("../selectors/index");
/**
* Change network details panel.
*
* @param {boolean} open - expected network details panel open state
*/
function openNetworkDetails(open) {
return {
type: OPEN_NETWORK_DETAILS,
open,
return (dispatch, getState) => {
const visibleRequestItems = getDisplayedRequests(getState());
let defaultSelectedId = visibleRequestItems.length ? visibleRequestItems[0].id : null;
return dispatch({
type: OPEN_NETWORK_DETAILS,
open,
defaultSelectedId,
});
};
}

4
devtools/client/netmonitor/src/reducers/requests.js
Просмотреть файл

@ -177,8 +177,8 @@ function requestsReducer(state = Requests(), action) {
return nextState;
}
if (!state.selectedId && state.requests.size > 0) {
nextState.selectedId = [...state.requests.values()][0].id;
if (!state.selectedId && action.defaultSelectedId) {
nextState.selectedId = action.defaultSelectedId;
return nextState;
}

1
devtools/client/netmonitor/test/browser.ini
Просмотреть файл

@ -142,6 +142,7 @@ skip-if = (os == 'linux' && debug && bits == 32) # Bug 1303439
[browser_net_open_in_style_editor.js]
[browser_net_open_request_in_tab.js]
[browser_net_pane-collapse.js]
[browser_net_pane-network-details.js]
[browser_net_pane-toggle.js]
[browser_net_pause.js]
[browser_net_params_sorted.js]

127
devtools/client/netmonitor/test/browser_net_pane-network-details.js Normal file
Просмотреть файл

@ -0,0 +1,127 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
/**
* Test the action of request details panel when filters are applied.
* If there are any visible requests, the first request from the
* list of visible requests should be displayed in the network
* details panel
* If there are no visible requests the panel should remain closed
*/
const REQUESTS_WITH_MEDIA_AND_FLASH_AND_WS = [
{ url: "sjs_content-type-test-server.sjs?fmt=html&res=undefined&text=Sample" },
{ url: "sjs_content-type-test-server.sjs?fmt=css&text=sample" },
{ url: "sjs_content-type-test-server.sjs?fmt=js&text=sample" },
{ url: "sjs_content-type-test-server.sjs?fmt=font" },
{ url: "sjs_content-type-test-server.sjs?fmt=image" },
{ url: "sjs_content-type-test-server.sjs?fmt=audio" },
{ url: "sjs_content-type-test-server.sjs?fmt=video" },
{ url: "sjs_content-type-test-server.sjs?fmt=flash" },
{ url: "sjs_content-type-test-server.sjs?fmt=ws" },
];
add_task(async function() {
let { monitor } = await initNetMonitor(FILTERING_URL);
let { document, store, windowRequire } = monitor.panelWin;
let Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
let {
getSelectedRequest,
getSortedRequests,
} = windowRequire("devtools/client/netmonitor/src/selectors/index");
store.dispatch(Actions.batchEnable(false));
function setFreetextFilter(value) {
store.dispatch(Actions.setRequestFilterText(value));
}
info("Starting test... ");
let wait = waitForNetworkEvents(monitor, 9);
loadFrameScriptUtils();
await performRequestsInContent(REQUESTS_WITH_MEDIA_AND_FLASH_AND_WS);
await wait;
let toggleButton = document.querySelector(".network-details-panel-toggle");
info("Test with the first request in the list visible");
EventUtils.sendMouseEvent({ type: "click" },
document.querySelector(".requests-list-filter-all-button"));
testDetailsPanel(true, 0);
info("Test with first request in the list not visible");
EventUtils.sendMouseEvent({ type: "click" },
document.querySelector(".requests-list-filter-all-button"));
EventUtils.sendMouseEvent({ type: "click" },
document.querySelector(".requests-list-filter-js-button"));
testFilterButtons(monitor, "js");
testDetailsPanel(true, 2);
info("Test with no request in the list visible i.e. no request match the filters");
EventUtils.sendMouseEvent({ type: "click" },
document.querySelector(".requests-list-filter-all-button"));
setFreetextFilter("foobar");
// The network details panel should not open as there are no available requests visible
testDetailsPanel(false);
await teardown(monitor);
function getSelectedIndex(state) {
if (!state.requests.selectedId) {
return -1;
}
return getSortedRequests(state).findIndex(r => r.id === state.requests.selectedId);
}
async function testDetailsPanel(shouldPanelOpen, selectedItemIndex = 0) {
// Expected default state should be panel closed
if (shouldPanelOpen) {
// Toggle switch should be enabled only when there are visible requests
is(toggleButton.hasAttribute("disabled"), false,
"The pane toggle button should be enabled.");
} else {
is(toggleButton.hasAttribute("disabled"), true,
"The pane toggle button should be disabled.");
}
is(toggleButton.classList.contains("pane-collapsed"), true,
"The pane toggle button should still indicate that the details pane is " +
"collapsed.");
is(!!document.querySelector(".network-details-panel"), false,
"The details pane should still be hidden.");
is(getSelectedRequest(store.getState()), null,
"There should still be no selected item in the requests menu.");
// Trigger the details panel toggle action
EventUtils.sendMouseEvent({ type: "click" }, toggleButton);
if (shouldPanelOpen) {
is(toggleButton.hasAttribute("disabled"), false,
"The pane toggle button should still be enabled after being pressed.");
is(toggleButton.classList.contains("pane-collapsed"), false,
"The pane toggle button should now indicate that the details pane is " +
"not collapsed anymore after being pressed.");
is(!!document.querySelector(".network-details-panel"), true,
"The details pane should not be hidden after toggle button was pressed.");
isnot(getSelectedRequest(store.getState()), null,
"There should be a selected item in the requests menu.");
is(getSelectedIndex(store.getState()), selectedItemIndex,
`The item index ${selectedItemIndex} should be selected in the requests menu.`);
// Close the panel
EventUtils.sendMouseEvent({ type: "click" }, toggleButton);
} else {
is(toggleButton.hasAttribute("disabled"), true,
"The pane toggle button should be disabled.");
is(toggleButton.classList.contains("pane-collapsed"), true,
"The pane toggle button should still indicate that the details pane is " +
"collapsed.");
is(!!document.querySelector(".network-details-panel"), false,
"The details pane should still be hidden.");
is(getSelectedRequest(store.getState()), null,
"There should still be no selected item in the requests menu.");
}
}
});

104
devtools/client/themes/animation.css
Просмотреть файл

@ -7,6 +7,7 @@
:root {
--animation-even-background-color: rgba(0, 0, 0, 0.05);
--command-pick-image: url(chrome://devtools/skin/images/command-pick.svg);
--devtools-toolbar-height: 24px;
--fast-track-image: url("images/animation-fast-track.svg");
--fill-color-cssanimation: var(--theme-contrast-background);
--fill-color-csstransition: var(--theme-highlight-blue);
@ -47,7 +48,7 @@
}
#animation-container .animation-container-splitter {
overflow: auto;
overflow: hidden;
}
/* Animation Toolbar */
@ -86,10 +87,10 @@ select.playback-rate-selector.devtools-button:not(:empty):not(:disabled):not(.ch
/* Animation List Container */
.animation-list-container {
display: flex;
flex-direction: column;
height: 100%;
overflow: hidden;
overflow-y: auto;
overflow-x: hidden;
position: relative;
width: 100%;
-moz-user-select: none;
}
@ -102,33 +103,63 @@ select.playback-rate-selector.devtools-button:not(:empty):not(:disabled):not(.ch
.animation-list-header {
display: grid;
grid-template-columns: var(--sidebar-width) calc(100% - var(--sidebar-width) - var(--graph-right-offset)) var(--graph-right-offset);
line-height: var(--devtools-toolbar-height);
min-height: 100%;
padding: 0;
pointer-events: none;
position: sticky;
top: 0;
z-index: 2;
}
.animation-list-header .devtools-toolbar {
position: absolute;
width: 100%;
}
/* Animation Timeline Tick List */
.animation-timeline-tick-list {
grid-column: 2/3;
height: 100%;
position: relative;
}
.animation-timeline-tick-item {
height: 100%;
position: absolute;
}
.animation-timeline-tick-item::before {
border-left: var(--tick-line-style);
height: 100vh;
pointer-events: none;
content: "";
height: 100%;
position: absolute;
}
/* Current Time Scrubber */
.current-time-scrubber-controller {
cursor: col-resize;
grid-column: 2 / 3;
height: 100%;
padding: 0;
position: absolute;
width: 100%;
}
.current-time-scrubber-controller::before {
content: "";
cursor: col-resize;
height: var(--devtools-toolbar-height);
pointer-events: auto;
position: absolute;
/* In order to click on edge of current-time-scrubber-controller element */
width: calc(100% + 1px);
}
.current-time-scrubber {
cursor: col-resize;
height: 100vh;
height: 100%;
margin-left: -6px;
pointer-events: auto;
position: absolute;
width: 12px;
z-index: 1;
@ -156,11 +187,12 @@ select.playback-rate-selector.devtools-button:not(:empty):not(:disabled):not(.ch
/* Animation List */
.animation-list {
flex: 1;
list-style-type: none;
margin: 0;
overflow: auto;
padding: 0;
position: absolute;
top: var(--devtools-toolbar-height);
width: 100%;
}
/* Animation Item */
@ -234,8 +266,8 @@ select.playback-rate-selector.devtools-button:not(:empty):not(:disabled):not(.ch
right: 0;
top: 5px;
width: 15px;
z-index: 1;
-moz-context-properties: fill;
z-index: 1;
}
.animation-summary-graph-path {
@ -363,24 +395,37 @@ select.playback-rate-selector.devtools-button:not(:empty):not(:disabled):not(.ch
display: flex;
flex: 1;
flex-direction: column;
overflow: hidden;
overflow-y: auto;
position: relative;
}
/* Animated Property List Header */
.animated-property-list-header {
display: grid;
grid-template-columns: var(--sidebar-width) calc(100% - var(--sidebar-width) - var(--graph-right-offset)) var(--graph-right-offset);
line-height: var(--devtools-toolbar-height);
min-height: 100%;
padding: 0;
pointer-events: none;
position: sticky;
top: 0;
z-index: 1;
}
.animated-property-list-header .devtools-toolbar {
position: absolute;
width: 100%;
}
/* Keyframes Progress Tick List */
.keyframes-progress-tick-list {
grid-column: 2 / 3;
position: relative;
height: 100%;
position: absolute;
width: 100%;
}
.keyframes-progress-tick-item {
height: 100vh;
position: absolute;
}
@ -397,12 +442,13 @@ select.playback-rate-selector.devtools-button:not(:empty):not(:disabled):not(.ch
background: none;
grid-column: 2 / 3;
padding: 0;
pointer-events: none;
position: relative;
height: 100%;
position: absolute;
width: 100%;
}
.keyframes-progress-bar {
height: 100vh;
height: 100%;
position: absolute;
z-index: 1;
}
@ -428,12 +474,32 @@ select.playback-rate-selector.devtools-button:not(:empty):not(:disabled):not(.ch
}
/* Animated Property List */
.animated-property-list-background {
border-left: var(--tick-line-style);
border-right: var(--tick-line-style);
bottom: 0;
left: var(--sidebar-width);
min-height: 100%;
position: sticky;
top: 0;
width: calc(100% - var(--sidebar-width) - var(--graph-right-offset));
}
.animated-property-list-background span {
border-left: var(--tick-line-style);
height: 100%;
left: 50%;
position: absolute;
}
.animated-property-list {
flex: 1;
list-style-type: none;
margin: 0;
overflow-y: auto;
padding: 0;
position: absolute;
top: var(--devtools-toolbar-height);
width: 100%;
}
/* Animated Property Item */
@ -496,8 +562,8 @@ select.playback-rate-selector.devtools-button:not(:empty):not(:disabled):not(.ch
/* Keyframes Graph */
.keyframes-graph {
height: 100%;
padding-top: 3px;
height: 100%;
position: relative;
width: calc(100% - var(--sidebar-width) - var(--graph-right-offset));
}

2
devtools/shared/css/generated/properties-db.js
Просмотреть файл

@ -3111,7 +3111,6 @@ exports.CSS_PROPERTIES = {
"stroke-miterlimit",
"stroke-opacity",
"stroke-width",
"-x-system-font",
"-moz-tab-size",
"table-layout",
"text-align",
@ -5720,7 +5719,6 @@ exports.CSS_PROPERTIES = {
"line-height",
"font-size-adjust",
"font-stretch",
"-x-system-font",
"font-feature-settings",
"font-language-override",
"font-kerning",

20
dom/animation/test/chrome/test_animation_properties.html
Просмотреть файл

@ -156,9 +156,8 @@ var gTests = [
values: [ valueFormat(0, '0', 'replace', 'linear'),
valueFormat(1, '0', 'replace') ] },
{ property: 'border-image-repeat',
values: [ valueFormat(0,
'stretch stretch', 'replace', 'linear'),
valueFormat(1, 'stretch stretch', 'replace') ] },
values: [ valueFormat(0, 'stretch', 'replace', 'linear'),
valueFormat(1, 'stretch', 'replace') ] },
{ property: 'border-image-slice',
values: [ valueFormat(0, '100%', 'replace', 'linear'),
valueFormat(1, '100%', 'replace') ] },
@ -216,9 +215,8 @@ var gTests = [
values: [ valueFormat(0, '0', 'replace', 'linear'),
valueFormat(1, '0', 'replace') ] },
{ property: 'border-image-repeat',
values: [ valueFormat(0,
'stretch stretch', 'replace', 'linear'),
valueFormat(1, 'stretch stretch', 'replace') ] },
values: [ valueFormat(0, 'stretch', 'replace', 'linear'),
valueFormat(1, 'stretch', 'replace') ] },
{ property: 'border-image-slice',
values: [ valueFormat(0, '100%', 'replace', 'linear'),
valueFormat(1, '100%', 'replace') ] },
@ -485,9 +483,8 @@ var gTests = [
values: [ valueFormat(0, '0', 'replace', 'linear'),
valueFormat(1, '0', 'replace') ] },
{ property: 'border-image-repeat',
values: [ valueFormat(0,
'stretch stretch', 'replace', 'linear'),
valueFormat(1, 'stretch stretch', 'replace') ] },
values: [ valueFormat(0, 'stretch', 'replace', 'linear'),
valueFormat(1, 'stretch', 'replace') ] },
{ property: 'border-image-slice',
values: [ valueFormat(0, '100%', 'replace', 'linear'),
valueFormat(1, '100%', 'replace') ] },
@ -544,9 +541,8 @@ var gTests = [
values: [ valueFormat(0, '0', 'replace', 'linear'),
valueFormat(1, '0', 'replace') ] },
{ property: 'border-image-repeat',
values: [ valueFormat(0,
'stretch stretch', 'replace', 'linear'),
valueFormat(1, 'stretch stretch', 'replace') ] },
values: [ valueFormat(0, 'stretch', 'replace', 'linear'),
valueFormat(1, 'stretch', 'replace') ] },
{ property: 'border-image-slice',
values: [ valueFormat(0, '100%', 'replace', 'linear'),
valueFormat(1, '100%', 'replace') ] },

18
dom/base/Element.cpp
Просмотреть файл

@ -2164,7 +2164,7 @@ Element::FindAttributeDependence(const nsAtom* aAttribute,
for (uint32_t mapindex = 0; mapindex < aMapCount; ++mapindex) {
for (const MappedAttributeEntry* map = aMaps[mapindex];
map->attribute; ++map) {
if (aAttribute == map->attribute) {
if (aAttribute == *map->attribute) {
return true;
}
}
@ -2906,7 +2906,7 @@ Element::FindAttrValueIn(int32_t aNameSpaceID,
const nsAttrValue* val = mAttrsAndChildren.GetAttr(aName, aNameSpaceID);
if (val) {
for (int32_t i = 0; aValues[i]; ++i) {
if (val->Equals(aValues[i], aCaseSensitive)) {
if (val->Equals(*aValues[i], aCaseSensitive)) {
return i;
}
}
@ -3418,16 +3418,16 @@ nsDOMTokenListPropertyDestructor(void *aObject, nsAtom *aProperty,
NS_RELEASE(list);
}
static nsStaticAtom* const sPropertiesToTraverseAndUnlink[] =
static nsStaticAtom** sPropertiesToTraverseAndUnlink[] =
{
nsGkAtoms::sandbox,
nsGkAtoms::sizes,
nsGkAtoms::dirAutoSetBy,
&nsGkAtoms::sandbox,
&nsGkAtoms::sizes,
&nsGkAtoms::dirAutoSetBy,
nullptr
};
// static
nsStaticAtom* const*
nsStaticAtom***
Element::HTMLSVGPropertiesToTraverseAndUnlink()
{
return sPropertiesToTraverseAndUnlink;
@ -3438,10 +3438,10 @@ Element::GetTokenList(nsAtom* aAtom,
const DOMTokenListSupportedTokenArray aSupportedTokens)
{
#ifdef DEBUG
const nsStaticAtom* const* props = HTMLSVGPropertiesToTraverseAndUnlink();
nsStaticAtom*** props = HTMLSVGPropertiesToTraverseAndUnlink();
bool found = false;
for (uint32_t i = 0; props[i]; ++i) {
if (props[i] == aAtom) {
if (*props[i] == aAtom) {
found = true;
break;
}

6
dom/base/Element.h
Просмотреть файл

@ -803,7 +803,7 @@ public:
* @return ATTR_MISSING, ATTR_VALUE_NO_MATCH or the non-negative index
* indicating the first value of aValues that matched
*/
typedef nsStaticAtom* const AttrValuesArray;
typedef nsStaticAtom* const* const AttrValuesArray;
int32_t FindAttrValueIn(int32_t aNameSpaceID,
nsAtom* aName,
AttrValuesArray* aValues,
@ -964,7 +964,7 @@ public:
* Attribute Mapping Helpers
*/
struct MappedAttributeEntry {
const nsStaticAtom* const attribute;
nsStaticAtom** attribute;
};
/**
@ -981,7 +981,7 @@ public:
return FindAttributeDependence(aAttribute, aMaps, N);
}
static nsStaticAtom* const* HTMLSVGPropertiesToTraverseAndUnlink();
static nsStaticAtom*** HTMLSVGPropertiesToTraverseAndUnlink();
private:
void DescribeAttribute(uint32_t index, nsAString& aOutDescription) const;

10
dom/base/FragmentOrElement.cpp
Просмотреть файл

@ -1439,10 +1439,9 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(FragmentOrElement)
}
if (tmp->IsHTMLElement() || tmp->IsSVGElement()) {
nsStaticAtom* const* props =
Element::HTMLSVGPropertiesToTraverseAndUnlink();
nsStaticAtom*** props = Element::HTMLSVGPropertiesToTraverseAndUnlink();
for (uint32_t i = 0; props[i]; ++i) {
tmp->DeleteProperty(props[i]);
tmp->DeleteProperty(*props[i]);
}
if (tmp->MayHaveAnimations()) {
nsAtom** effectProps = EffectSet::GetEffectSetPropertyAtoms();
@ -2005,11 +2004,10 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INTERNAL(FragmentOrElement)
}
}
if (tmp->IsHTMLElement() || tmp->IsSVGElement()) {
nsStaticAtom* const* props =
Element::HTMLSVGPropertiesToTraverseAndUnlink();
nsStaticAtom*** props = Element::HTMLSVGPropertiesToTraverseAndUnlink();
for (uint32_t i = 0; props[i]; ++i) {
nsISupports* property =
static_cast<nsISupports*>(tmp->GetProperty(props[i]));
static_cast<nsISupports*>(tmp->GetProperty(*props[i]));
cb.NoteXPCOMChild(property);
}
if (tmp->MayHaveAnimations()) {

2
dom/base/nsContentUtils.cpp
Просмотреть файл

@ -4664,7 +4664,7 @@ nsContentUtils::HasNonEmptyAttr(const nsIContent* aContent,
int32_t aNameSpaceID,
nsAtom* aName)
{
static Element::AttrValuesArray strings[] = {nsGkAtoms::_empty, nullptr};
static Element::AttrValuesArray strings[] = {&nsGkAtoms::_empty, nullptr};
return aContent->IsElement() &&
aContent->AsElement()->FindAttrValueIn(aNameSpaceID, aName, strings, eCaseMatters)
== Element::ATTR_VALUE_NO_MATCH;

2
dom/events/EventStateManager.cpp
Просмотреть файл

@ -2964,7 +2964,7 @@ NodeAllowsClickThrough(nsINode* aNode)
if (aNode->IsXULElement()) {
mozilla::dom::Element* element = aNode->AsElement();
static Element::AttrValuesArray strings[] =
{nsGkAtoms::always, nsGkAtoms::never, nullptr};
{&nsGkAtoms::always, &nsGkAtoms::never, nullptr};
switch (element->FindAttrValueIn(kNameSpaceID_None, nsGkAtoms::clickthrough,
strings, eCaseMatters)) {
case 0:

8
dom/gamepad/windows/WindowsGamepad.cpp
Просмотреть файл

@ -249,16 +249,16 @@ UnpackDpad(LONG dpad_value, const Gamepad* gamepad, nsTArray<bool>& buttons)
// Value will be in the range 0-7. The value represents the
// position of the d-pad around a circle, with 0 being straight up,
// 2 being right, 4 being straight down, and 6 being left.
if (value < 2 || value > 6) {
if ((value < 2 || value > 6) && buttons.Length() > kUp) {
buttons[kUp] = true;
}
if (value > 2 && value < 6) {
if ((value > 2 && value < 6) && buttons.Length() > kDown) {
buttons[kDown] = true;
}
if (value > 4) {
if (value > 4 && buttons.Length() > kLeft) {
buttons[kLeft] = true;
}
if (value > 0 && value < 4) {
if ((value > 0 && value < 4) && buttons.Length() > kRight) {
buttons[kRight] = true;
}
}

2
dom/html/HTMLBRElement.cpp
Просмотреть файл

@ -67,7 +67,7 @@ NS_IMETHODIMP_(bool)
HTMLBRElement::IsAttributeMapped(const nsAtom* aAttribute) const
{
static const MappedAttributeEntry attributes[] = {
{ nsGkAtoms::clear },
{ &nsGkAtoms::clear },
{ nullptr }
};

20
dom/html/HTMLBodyElement.cpp
Просмотреть файл

@ -232,16 +232,16 @@ NS_IMETHODIMP_(bool)
HTMLBodyElement::IsAttributeMapped(const nsAtom* aAttribute) const
{
static const MappedAttributeEntry attributes[] = {
{ nsGkAtoms::link },
{ nsGkAtoms::vlink },
{ nsGkAtoms::alink },
{ nsGkAtoms::text },
{ nsGkAtoms::marginwidth },
{ nsGkAtoms::marginheight },
{ nsGkAtoms::topmargin },
{ nsGkAtoms::rightmargin },
{ nsGkAtoms::bottommargin },
{ nsGkAtoms::leftmargin },
{ &nsGkAtoms::link },
{ &nsGkAtoms::vlink },
{ &nsGkAtoms::alink },
{ &nsGkAtoms::text },
{ &nsGkAtoms::marginwidth },
{ &nsGkAtoms::marginheight },
{ &nsGkAtoms::topmargin },
{ &nsGkAtoms::rightmargin },
{ &nsGkAtoms::bottommargin },
{ &nsGkAtoms::leftmargin },
{ nullptr },
};

6
dom/html/HTMLFontElement.cpp
Просмотреть файл

@ -98,9 +98,9 @@ NS_IMETHODIMP_(bool)
HTMLFontElement::IsAttributeMapped(const nsAtom* aAttribute) const
{
static const MappedAttributeEntry attributes[] = {
{ nsGkAtoms::face },
{ nsGkAtoms::size },
{ nsGkAtoms::color },
{ &nsGkAtoms::face },
{ &nsGkAtoms::size },
{ &nsGkAtoms::color },
{ nullptr }
};

10
dom/html/HTMLHRElement.cpp
Просмотреть файл

@ -171,11 +171,11 @@ NS_IMETHODIMP_(bool)
HTMLHRElement::IsAttributeMapped(const nsAtom* aAttribute) const
{
static const MappedAttributeEntry attributes[] = {
{ nsGkAtoms::align },
{ nsGkAtoms::width },
{ nsGkAtoms::size },
{ nsGkAtoms::color },
{ nsGkAtoms::noshade },
{ &nsGkAtoms::align },
{ &nsGkAtoms::width },
{ &nsGkAtoms::size },
{ &nsGkAtoms::color },
{ &nsGkAtoms::noshade },
{ nullptr },
};

6
dom/html/HTMLIFrameElement.cpp
Просмотреть файл

@ -109,9 +109,9 @@ NS_IMETHODIMP_(bool)
HTMLIFrameElement::IsAttributeMapped(const nsAtom* aAttribute) const
{
static const MappedAttributeEntry attributes[] = {
{ nsGkAtoms::width },
{ nsGkAtoms::height },
{ nsGkAtoms::frameborder },
{ &nsGkAtoms::width },
{ &nsGkAtoms::height },
{ &nsGkAtoms::frameborder },
{ nullptr },
};

21
dom/html/HTMLInputElement.cpp
Просмотреть файл

@ -5537,20 +5537,6 @@ HTMLInputElement::IsInputDateTimeOthersEnabled()
return sDateTimeOthersEnabled;
}
/* static */ bool
HTMLInputElement::IsInputNumberEnabled()
{
static bool sInputNumberEnabled = false;
static bool sInputNumberPrefCached = false;
if (!sInputNumberPrefCached) {
sInputNumberPrefCached = true;
Preferences::AddBoolVarCache(&sInputNumberEnabled, "dom.forms.number",
false);
}
return sInputNumberEnabled;
}
/* static */ bool
HTMLInputElement::IsInputColorEnabled()
{
@ -5587,8 +5573,7 @@ HTMLInputElement::ParseAttribute(int32_t aNamespaceID,
if (aAttribute == nsGkAtoms::type) {
aResult.ParseEnumValue(aValue, kInputTypeTable, false, kInputDefaultType);
int32_t newType = aResult.GetEnumValue();
if ((newType == NS_FORM_INPUT_NUMBER && !IsInputNumberEnabled()) ||
(newType == NS_FORM_INPUT_COLOR && !IsInputColorEnabled()) ||
if ((newType == NS_FORM_INPUT_COLOR && !IsInputColorEnabled()) ||
(IsDateTimeInputType(newType) && !IsDateTimeTypeSupported(newType))) {
// There's no public way to set an nsAttrValue to an enum value, but we
// can just re-parse with a table that doesn't have any types other than
@ -5695,8 +5680,8 @@ NS_IMETHODIMP_(bool)
HTMLInputElement::IsAttributeMapped(const nsAtom* aAttribute) const
{
static const MappedAttributeEntry attributes[] = {
{ nsGkAtoms::align },
{ nsGkAtoms::type },
{ &nsGkAtoms::align },
{ &nsGkAtoms::type },
{ nullptr },
};

7
dom/html/HTMLInputElement.h
Просмотреть файл

@ -1756,13 +1756,6 @@ private:
static bool
IsInputDateTimeOthersEnabled();
/**
* Checks preference "dom.forms.number" to determine if input type=number
* should be supported.
*/
static bool
IsInputNumberEnabled();
/**
* Checks preference "dom.forms.color" to determine if date/time related
* types should be supported.

2
dom/html/HTMLLIElement.cpp
Просмотреть файл

@ -83,7 +83,7 @@ NS_IMETHODIMP_(bool)
HTMLLIElement::IsAttributeMapped(const nsAtom* aAttribute) const
{
static const MappedAttributeEntry attributes[] = {
{ nsGkAtoms::type },
{ &nsGkAtoms::type },
{ nullptr },
};

2
dom/html/HTMLLinkElement.cpp
Просмотреть файл

@ -235,7 +235,7 @@ HTMLLinkElement::CreateAndDispatchEvent(nsIDocument* aDoc,
// doing the "right" thing costs virtually nothing here, even if it doesn't
// make much sense.
static Element::AttrValuesArray strings[] =
{nsGkAtoms::_empty, nsGkAtoms::stylesheet, nullptr};
{&nsGkAtoms::_empty, &nsGkAtoms::stylesheet, nullptr};
if (!nsContentUtils::HasNonEmptyAttr(this, kNameSpaceID_None,
nsGkAtoms::rev) &&

2
dom/html/HTMLPreElement.cpp
Просмотреть файл

@ -62,7 +62,7 @@ HTMLPreElement::IsAttributeMapped(const nsAtom* aAttribute) const
}
static const MappedAttributeEntry attributes[] = {
{ nsGkAtoms::wrap },
{ &nsGkAtoms::wrap },
{ nullptr },
};

4
dom/html/HTMLSharedElement.cpp
Просмотреть файл

@ -101,8 +101,8 @@ HTMLSharedElement::IsAttributeMapped(const nsAtom* aAttribute) const
{
if (mNodeInfo->Equals(nsGkAtoms::dir)) {
static const MappedAttributeEntry attributes[] = {
{ nsGkAtoms::type },
// { nsGkAtoms::compact }, // XXX
{ &nsGkAtoms::type },
// { &nsGkAtoms::compact }, // XXX
{ nullptr}
};

2
dom/html/HTMLSharedListElement.cpp
Просмотреть файл

@ -100,7 +100,7 @@ HTMLSharedListElement::IsAttributeMapped(const nsAtom* aAttribute) const
if (mNodeInfo->Equals(nsGkAtoms::ol) ||
mNodeInfo->Equals(nsGkAtoms::ul)) {
static const MappedAttributeEntry attributes[] = {
{ nsGkAtoms::type },
{ &nsGkAtoms::type },
{ nullptr }
};

2
dom/html/HTMLTableCaptionElement.cpp
Просмотреть файл

@ -68,7 +68,7 @@ NS_IMETHODIMP_(bool)
HTMLTableCaptionElement::IsAttributeMapped(const nsAtom* aAttribute) const
{
static const MappedAttributeEntry attributes[] = {
{ nsGkAtoms::align },
{ &nsGkAtoms::align },
{ nullptr }
};

18
dom/html/HTMLTableCellElement.cpp
Просмотреть файл

@ -237,19 +237,19 @@ NS_IMETHODIMP_(bool)
HTMLTableCellElement::IsAttributeMapped(const nsAtom* aAttribute) const
{
static const MappedAttributeEntry attributes[] = {
{ nsGkAtoms::align },
{ nsGkAtoms::valign },
{ nsGkAtoms::nowrap },
{ &nsGkAtoms::align },
{ &nsGkAtoms::valign },
{ &nsGkAtoms::nowrap },
#if 0
// XXXldb If these are implemented, they might need to move to
// GetAttributeChangeHint (depending on how, and preferably not).
{ nsGkAtoms::abbr },
{ nsGkAtoms::axis },
{ nsGkAtoms::headers },
{ nsGkAtoms::scope },
{ &nsGkAtoms::abbr },
{ &nsGkAtoms::axis },
{ &nsGkAtoms::headers },
{ &nsGkAtoms::scope },
#endif
{ nsGkAtoms::width },
{ nsGkAtoms::height },
{ &nsGkAtoms::width },
{ &nsGkAtoms::height },
{ nullptr }
};

8
dom/html/HTMLTableColElement.cpp
Просмотреть файл

@ -91,10 +91,10 @@ NS_IMETHODIMP_(bool)
HTMLTableColElement::IsAttributeMapped(const nsAtom* aAttribute) const
{
static const MappedAttributeEntry attributes[] = {
{ nsGkAtoms::width },
{ nsGkAtoms::align },
{ nsGkAtoms::valign },
{ nsGkAtoms::span },
{ &nsGkAtoms::width },
{ &nsGkAtoms::align },
{ &nsGkAtoms::valign },
{ &nsGkAtoms::span },
{ nullptr }
};

18
dom/html/HTMLTableElement.cpp
Просмотреть файл

@ -1016,17 +1016,17 @@ NS_IMETHODIMP_(bool)
HTMLTableElement::IsAttributeMapped(const nsAtom* aAttribute) const
{
static const MappedAttributeEntry attributes[] = {
{ nsGkAtoms::cellpadding },
{ nsGkAtoms::cellspacing },
{ nsGkAtoms::border },
{ nsGkAtoms::width },
{ nsGkAtoms::height },
{ nsGkAtoms::hspace },
{ nsGkAtoms::vspace },
{ &nsGkAtoms::cellpadding },
{ &nsGkAtoms::cellspacing },
{ &nsGkAtoms::border },
{ &nsGkAtoms::width },
{ &nsGkAtoms::height },
{ &nsGkAtoms::hspace },
{ &nsGkAtoms::vspace },
{ nsGkAtoms::bordercolor },
{ &nsGkAtoms::bordercolor },
{ nsGkAtoms::align },
{ &nsGkAtoms::align },
{ nullptr }
};

6
dom/html/HTMLTableRowElement.cpp
Просмотреть файл

@ -273,9 +273,9 @@ NS_IMETHODIMP_(bool)
HTMLTableRowElement::IsAttributeMapped(const nsAtom* aAttribute) const
{
static const MappedAttributeEntry attributes[] = {
{ nsGkAtoms::align },
{ nsGkAtoms::valign },
{ nsGkAtoms::height },
{ &nsGkAtoms::align },
{ &nsGkAtoms::valign },
{ &nsGkAtoms::height },
{ nullptr }
};

6
dom/html/HTMLTableSectionElement.cpp
Просмотреть файл

@ -181,9 +181,9 @@ NS_IMETHODIMP_(bool)
HTMLTableSectionElement::IsAttributeMapped(const nsAtom* aAttribute) const
{
static const MappedAttributeEntry attributes[] = {
{ nsGkAtoms::align },
{ nsGkAtoms::valign },
{ nsGkAtoms::height },
{ &nsGkAtoms::align },
{ &nsGkAtoms::valign },
{ &nsGkAtoms::height },
{ nullptr }
};

2
dom/html/HTMLTextAreaElement.cpp
Просмотреть файл

@ -484,7 +484,7 @@ NS_IMETHODIMP_(bool)
HTMLTextAreaElement::IsAttributeMapped(const nsAtom* aAttribute) const
{
static const MappedAttributeEntry attributes[] = {
{ nsGkAtoms::wrap },
{ &nsGkAtoms::wrap },
{ nullptr }
};

4
dom/html/HTMLVideoElement.cpp
Просмотреть файл

@ -111,8 +111,8 @@ NS_IMETHODIMP_(bool)
HTMLVideoElement::IsAttributeMapped(const nsAtom* aAttribute) const
{
static const MappedAttributeEntry attributes[] = {
{ nsGkAtoms::width },
{ nsGkAtoms::height },
{ &nsGkAtoms::width },
{ &nsGkAtoms::height },
{ nullptr }
};

28
dom/html/nsGenericHTMLElement.cpp
Просмотреть файл

@ -315,7 +315,7 @@ nsGenericHTMLElement::Spellcheck()
for (node = this; node; node = node->GetParent()) {
if (node->IsHTMLElement()) {
static Element::AttrValuesArray strings[] =
{nsGkAtoms::_true, nsGkAtoms::_false, nullptr};
{&nsGkAtoms::_true, &nsGkAtoms::_false, nullptr};
switch (node->AsElement()->FindAttrValueIn(kNameSpaceID_None,
nsGkAtoms::spellcheck, strings,
eCaseMatters)) {
@ -1221,49 +1221,49 @@ nsGenericHTMLElement::MapCommonAttributesInto(const nsMappedAttributes* aAttribu
/* static */ const nsGenericHTMLElement::MappedAttributeEntry
nsGenericHTMLElement::sCommonAttributeMap[] = {
{ nsGkAtoms::contenteditable },
{ nsGkAtoms::lang },
{ nsGkAtoms::hidden },
{ &nsGkAtoms::contenteditable },
{ &nsGkAtoms::lang },
{ &nsGkAtoms::hidden },
{ nullptr }
};
/* static */ const Element::MappedAttributeEntry
nsGenericHTMLElement::sImageMarginSizeAttributeMap[] = {
{ nsGkAtoms::width },
{ nsGkAtoms::height },
{ nsGkAtoms::hspace },
{ nsGkAtoms::vspace },
{ &nsGkAtoms::width },
{ &nsGkAtoms::height },
{ &nsGkAtoms::hspace },
{ &nsGkAtoms::vspace },
{ nullptr }
};
/* static */ const Element::MappedAttributeEntry
nsGenericHTMLElement::sImageAlignAttributeMap[] = {
{ nsGkAtoms::align },
{ &nsGkAtoms::align },
{ nullptr }
};
/* static */ const Element::MappedAttributeEntry
nsGenericHTMLElement::sDivAlignAttributeMap[] = {
{ nsGkAtoms::align },
{ &nsGkAtoms::align },
{ nullptr }
};
/* static */ const Element::MappedAttributeEntry
nsGenericHTMLElement::sImageBorderAttributeMap[] = {
{ nsGkAtoms::border },
{ &nsGkAtoms::border },
{ nullptr }
};
/* static */ const Element::MappedAttributeEntry
nsGenericHTMLElement::sBackgroundAttributeMap[] = {
{ nsGkAtoms::background },
{ nsGkAtoms::bgcolor },
{ &nsGkAtoms::background },
{ &nsGkAtoms::bgcolor },
{ nullptr }
};
/* static */ const Element::MappedAttributeEntry
nsGenericHTMLElement::sBackgroundColorAttributeMap[] = {
{ nsGkAtoms::bgcolor },
{ &nsGkAtoms::bgcolor },
{ nullptr }
};

2
dom/html/nsGenericHTMLElement.h
Просмотреть файл

@ -920,7 +920,7 @@ protected:
ContentEditableTristate GetContentEditableValue() const
{
static const Element::AttrValuesArray values[] =
{ nsGkAtoms::_false, nsGkAtoms::_true, nsGkAtoms::_empty, nullptr };
{ &nsGkAtoms::_false, &nsGkAtoms::_true, &nsGkAtoms::_empty, nullptr };
if (!MayHaveContentEditableAttr())
return eInherit;

2
dom/html/nsTextEditorState.cpp
Просмотреть файл

@ -212,7 +212,7 @@ nsITextControlElement::GetWrapPropertyEnum(nsIContent* aContent,
nsAutoString wrap;
if (aContent->IsHTMLElement()) {
static Element::AttrValuesArray strings[] =
{nsGkAtoms::HARD, nsGkAtoms::OFF, nullptr};
{&nsGkAtoms::HARD, &nsGkAtoms::OFF, nullptr};
switch (aContent->AsElement()->FindAttrValueIn(kNameSpaceID_None,
nsGkAtoms::wrap, strings,

2
dom/html/reftests/autofocus/reftest.list
Просмотреть файл

@ -1,4 +1,4 @@
default-preferences pref(dom.forms.number,true) pref(dom.forms.datetime,true)
default-preferences pref(dom.forms.datetime,true)
fuzzy-if(skiaContent,1,3) needs-focus == input-load.html input-ref.html
fuzzy-if(skiaContent,1,3) needs-focus == input-create.html input-ref.html
fuzzy-if(skiaContent,1,3) needs-focus == input-number.html input-number-ref.html

8
dom/html/test/forms/test_input_types_pref.html
Просмотреть файл

@ -20,14 +20,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=764481
var testData = [
{
prefs: [["dom.forms.number", false]],
inputType: "number",
expectedType: "text"
}, {
prefs: [["dom.forms.number", true]],
inputType: "number",
expectedType: "number"
}, {
prefs: [["dom.forms.color", false]],
inputType: "color",
expectedType: "text"

38
dom/mathml/nsMathMLElement.cpp
Просмотреть файл

@ -183,37 +183,37 @@ nsMathMLElement::ParseAttribute(int32_t aNamespaceID,
}
static Element::MappedAttributeEntry sMtableStyles[] = {
{ nsGkAtoms::width },
{ &nsGkAtoms::width },
{ nullptr }
};
static Element::MappedAttributeEntry sTokenStyles[] = {
{ nsGkAtoms::mathsize_ },
{ nsGkAtoms::fontsize_ },
{ nsGkAtoms::color },
{ nsGkAtoms::fontfamily_ },
{ nsGkAtoms::fontstyle_ },
{ nsGkAtoms::fontweight_ },
{ nsGkAtoms::mathvariant_},
{ &nsGkAtoms::mathsize_ },
{ &nsGkAtoms::fontsize_ },
{ &nsGkAtoms::color },
{ &nsGkAtoms::fontfamily_ },
{ &nsGkAtoms::fontstyle_ },
{ &nsGkAtoms::fontweight_ },
{ &nsGkAtoms::mathvariant_},
{ nullptr }
};
static Element::MappedAttributeEntry sEnvironmentStyles[] = {
{ nsGkAtoms::scriptlevel_ },
{ nsGkAtoms::scriptminsize_ },
{ nsGkAtoms::scriptsizemultiplier_ },
{ nsGkAtoms::background },
{ &nsGkAtoms::scriptlevel_ },
{ &nsGkAtoms::scriptminsize_ },
{ &nsGkAtoms::scriptsizemultiplier_ },
{ &nsGkAtoms::background },
{ nullptr }
};
static Element::MappedAttributeEntry sCommonPresStyles[] = {
{ nsGkAtoms::mathcolor_ },
{ nsGkAtoms::mathbackground_ },
{ &nsGkAtoms::mathcolor_ },
{ &nsGkAtoms::mathbackground_ },
{ nullptr }
};
static Element::MappedAttributeEntry sDirStyles[] = {
{ nsGkAtoms::dir },
{ &nsGkAtoms::dir },
{ nullptr }
};
@ -998,13 +998,13 @@ nsMathMLElement::IsLink(nsIURI** aURI) const
// result is poorly specified. Either way, we return false.
static Element::AttrValuesArray sTypeVals[] =
{ nsGkAtoms::_empty, nsGkAtoms::simple, nullptr };
{ &nsGkAtoms::_empty, &nsGkAtoms::simple, nullptr };
static Element::AttrValuesArray sShowVals[] =
{ nsGkAtoms::_empty, nsGkAtoms::_new, nsGkAtoms::replace, nullptr };
{ &nsGkAtoms::_empty, &nsGkAtoms::_new, &nsGkAtoms::replace, nullptr };
static Element::AttrValuesArray sActuateVals[] =
{ nsGkAtoms::_empty, nsGkAtoms::onRequest, nullptr };
{ &nsGkAtoms::_empty, &nsGkAtoms::onRequest, nullptr };
// Optimization: check for href first for early return
href = mAttrsAndChildren.GetAttr(nsGkAtoms::href,
@ -1050,7 +1050,7 @@ nsMathMLElement::GetLinkTarget(nsAString& aTarget)
if (aTarget.IsEmpty()) {
static Element::AttrValuesArray sShowVals[] =
{ nsGkAtoms::_new, nsGkAtoms::replace, nullptr };
{ &nsGkAtoms::_new, &nsGkAtoms::replace, nullptr };
switch (FindAttrValueIn(kNameSpaceID_XLink, nsGkAtoms::show,
sShowVals, eCaseMatters)) {

8
dom/svg/SVGAElement.cpp
Просмотреть файл

@ -262,13 +262,13 @@ SVGAElement::IsLink(nsIURI** aURI) const
// result is poorly specified. Either way, we return false.
static Element::AttrValuesArray sTypeVals[] =
{ nsGkAtoms::_empty, nsGkAtoms::simple, nullptr };
{ &nsGkAtoms::_empty, &nsGkAtoms::simple, nullptr };
static Element::AttrValuesArray sShowVals[] =
{ nsGkAtoms::_empty, nsGkAtoms::_new, nsGkAtoms::replace, nullptr };
{ &nsGkAtoms::_empty, &nsGkAtoms::_new, &nsGkAtoms::replace, nullptr };
static Element::AttrValuesArray sActuateVals[] =
{ nsGkAtoms::_empty, nsGkAtoms::onRequest, nullptr };
{ &nsGkAtoms::_empty, &nsGkAtoms::onRequest, nullptr };
// Optimization: check for href first for early return
bool useBareHref = mStringAttributes[HREF].IsExplicitlySet();
@ -304,7 +304,7 @@ SVGAElement::GetLinkTarget(nsAString& aTarget)
if (aTarget.IsEmpty()) {
static Element::AttrValuesArray sShowVals[] =
{ nsGkAtoms::_new, nsGkAtoms::replace, nullptr };
{ &nsGkAtoms::_new, &nsGkAtoms::replace, nullptr };
switch (FindAttrValueIn(kNameSpaceID_XLink, nsGkAtoms::show,
sShowVals, eCaseMatters)) {

5
dom/svg/SVGDocument.cpp
Просмотреть файл

@ -157,11 +157,6 @@ SVGDocument::EnsureNonSVGUserAgentStyleSheetsLoaded()
auto cache = nsLayoutStylesheetCache::Singleton();
StyleSheet* sheet = cache->NumberControlSheet();
if (sheet) {
// number-control.css can be behind a pref
EnsureOnDemandBuiltInUASheet(sheet);
}
EnsureOnDemandBuiltInUASheet(cache->FormsSheet());
EnsureOnDemandBuiltInUASheet(cache->CounterStylesSheet());
EnsureOnDemandBuiltInUASheet(cache->HTMLSheet());

112
dom/svg/nsSVGElement.cpp
Просмотреть файл

@ -929,38 +929,38 @@ nsSVGElement::IsAttributeMapped(const nsAtom* name) const
// PresentationAttributes-FillStroke
/* static */ const Element::MappedAttributeEntry
nsSVGElement::sFillStrokeMap[] = {
{ nsGkAtoms::fill },
{ nsGkAtoms::fill_opacity },
{ nsGkAtoms::fill_rule },
{ nsGkAtoms::paint_order },
{ nsGkAtoms::stroke },
{ nsGkAtoms::stroke_dasharray },
{ nsGkAtoms::stroke_dashoffset },
{ nsGkAtoms::stroke_linecap },
{ nsGkAtoms::stroke_linejoin },
{ nsGkAtoms::stroke_miterlimit },
{ nsGkAtoms::stroke_opacity },
{ nsGkAtoms::stroke_width },
{ nsGkAtoms::vector_effect },
{ &nsGkAtoms::fill },
{ &nsGkAtoms::fill_opacity },
{ &nsGkAtoms::fill_rule },
{ &nsGkAtoms::paint_order },
{ &nsGkAtoms::stroke },
{ &nsGkAtoms::stroke_dasharray },
{ &nsGkAtoms::stroke_dashoffset },
{ &nsGkAtoms::stroke_linecap },
{ &nsGkAtoms::stroke_linejoin },
{ &nsGkAtoms::stroke_miterlimit },
{ &nsGkAtoms::stroke_opacity },
{ &nsGkAtoms::stroke_width },
{ &nsGkAtoms::vector_effect },
{ nullptr }
};
// PresentationAttributes-Graphics
/* static */ const Element::MappedAttributeEntry
nsSVGElement::sGraphicsMap[] = {
{ nsGkAtoms::clip_path },
{ nsGkAtoms::clip_rule },
{ nsGkAtoms::colorInterpolation },
{ nsGkAtoms::cursor },
{ nsGkAtoms::display },
{ nsGkAtoms::filter },
{ nsGkAtoms::image_rendering },
{ nsGkAtoms::mask },
{ nsGkAtoms::opacity },
{ nsGkAtoms::pointer_events },
{ nsGkAtoms::shape_rendering },
{ nsGkAtoms::text_rendering },
{ nsGkAtoms::visibility },
{ &nsGkAtoms::clip_path },
{ &nsGkAtoms::clip_rule },
{ &nsGkAtoms::colorInterpolation },
{ &nsGkAtoms::cursor },
{ &nsGkAtoms::display },
{ &nsGkAtoms::filter },
{ &nsGkAtoms::image_rendering },
{ &nsGkAtoms::mask },
{ &nsGkAtoms::opacity },
{ &nsGkAtoms::pointer_events },
{ &nsGkAtoms::shape_rendering },
{ &nsGkAtoms::text_rendering },
{ &nsGkAtoms::visibility },
{ nullptr }
};
@ -968,90 +968,90 @@ nsSVGElement::sGraphicsMap[] = {
/* static */ const Element::MappedAttributeEntry
nsSVGElement::sTextContentElementsMap[] = {
// Properties that we don't support are commented out.
// { nsGkAtoms::alignment_baseline },
// { nsGkAtoms::baseline_shift },
{ nsGkAtoms::direction },
{ nsGkAtoms::dominant_baseline },
{ nsGkAtoms::letter_spacing },
{ nsGkAtoms::text_anchor },
{ nsGkAtoms::text_decoration },
{ nsGkAtoms::unicode_bidi },
{ nsGkAtoms::word_spacing },
{ nsGkAtoms::writing_mode },
// { &nsGkAtoms::alignment_baseline },
// { &nsGkAtoms::baseline_shift },
{ &nsGkAtoms::direction },
{ &nsGkAtoms::dominant_baseline },
{ &nsGkAtoms::letter_spacing },
{ &nsGkAtoms::text_anchor },
{ &nsGkAtoms::text_decoration },
{ &nsGkAtoms::unicode_bidi },
{ &nsGkAtoms::word_spacing },
{ &nsGkAtoms::writing_mode },
{ nullptr }
};
// PresentationAttributes-FontSpecification
/* static */ const Element::MappedAttributeEntry
nsSVGElement::sFontSpecificationMap[] = {
{ nsGkAtoms::font_family },
{ nsGkAtoms::font_size },
{ nsGkAtoms::font_size_adjust },
{ nsGkAtoms::font_stretch },
{ nsGkAtoms::font_style },
{ nsGkAtoms::font_variant },
{ nsGkAtoms::fontWeight },
{ &nsGkAtoms::font_family },
{ &nsGkAtoms::font_size },
{ &nsGkAtoms::font_size_adjust },
{ &nsGkAtoms::font_stretch },
{ &nsGkAtoms::font_style },
{ &nsGkAtoms::font_variant },
{ &nsGkAtoms::fontWeight },
{ nullptr }
};
// PresentationAttributes-GradientStop
/* static */ const Element::MappedAttributeEntry
nsSVGElement::sGradientStopMap[] = {
{ nsGkAtoms::stop_color },
{ nsGkAtoms::stop_opacity },
{ &nsGkAtoms::stop_color },
{ &nsGkAtoms::stop_opacity },
{ nullptr }
};
// PresentationAttributes-Viewports
/* static */ const Element::MappedAttributeEntry
nsSVGElement::sViewportsMap[] = {
{ nsGkAtoms::overflow },
{ nsGkAtoms::clip },
{ &nsGkAtoms::overflow },
{ &nsGkAtoms::clip },
{ nullptr }
};
// PresentationAttributes-Makers
/* static */ const Element::MappedAttributeEntry
nsSVGElement::sMarkersMap[] = {
{ nsGkAtoms::marker_end },
{ nsGkAtoms::marker_mid },
{ nsGkAtoms::marker_start },
{ &nsGkAtoms::marker_end },
{ &nsGkAtoms::marker_mid },
{ &nsGkAtoms::marker_start },
{ nullptr }
};
// PresentationAttributes-Color
/* static */ const Element::MappedAttributeEntry
nsSVGElement::sColorMap[] = {
{ nsGkAtoms::color },
{ &nsGkAtoms::color },
{ nullptr }
};
// PresentationAttributes-Filters
/* static */ const Element::MappedAttributeEntry
nsSVGElement::sFiltersMap[] = {
{ nsGkAtoms::colorInterpolationFilters },
{ &nsGkAtoms::colorInterpolationFilters },
{ nullptr }
};
// PresentationAttributes-feFlood
/* static */ const Element::MappedAttributeEntry
nsSVGElement::sFEFloodMap[] = {
{ nsGkAtoms::flood_color },
{ nsGkAtoms::flood_opacity },
{ &nsGkAtoms::flood_color },
{ &nsGkAtoms::flood_opacity },
{ nullptr }
};
// PresentationAttributes-LightingEffects
/* static */ const Element::MappedAttributeEntry
nsSVGElement::sLightingEffectsMap[] = {
{ nsGkAtoms::lighting_color },
{ &nsGkAtoms::lighting_color },
{ nullptr }
};
// PresentationAttributes-mask
/* static */ const Element::MappedAttributeEntry
nsSVGElement::sMaskMap[] = {
{ nsGkAtoms::mask_type },
{ &nsGkAtoms::mask_type },
{ nullptr }
};

12
dom/xbl/nsXBLPrototypeBinding.cpp
Просмотреть файл

@ -1557,16 +1557,16 @@ nsXBLPrototypeBinding::WriteNamespace(nsIObjectOutputStream* aStream,
bool CheckTagNameWhiteList(int32_t aNameSpaceID, nsAtom *aTagName)
{
static Element::AttrValuesArray kValidXULTagNames[] = {
nsGkAtoms::autorepeatbutton, nsGkAtoms::box, nsGkAtoms::browser,
nsGkAtoms::button, nsGkAtoms::hbox, nsGkAtoms::image, nsGkAtoms::menu,
nsGkAtoms::menubar, nsGkAtoms::menuitem, nsGkAtoms::menupopup,
nsGkAtoms::row, nsGkAtoms::slider, nsGkAtoms::spacer,
nsGkAtoms::splitter, nsGkAtoms::text, nsGkAtoms::tree, nullptr};
&nsGkAtoms::autorepeatbutton, &nsGkAtoms::box, &nsGkAtoms::browser,
&nsGkAtoms::button, &nsGkAtoms::hbox, &nsGkAtoms::image, &nsGkAtoms::menu,
&nsGkAtoms::menubar, &nsGkAtoms::menuitem, &nsGkAtoms::menupopup,
&nsGkAtoms::row, &nsGkAtoms::slider, &nsGkAtoms::spacer,
&nsGkAtoms::splitter, &nsGkAtoms::text, &nsGkAtoms::tree, nullptr};
uint32_t i;
if (aNameSpaceID == kNameSpaceID_XUL) {
for (i = 0; kValidXULTagNames[i]; ++i) {
if (aTagName == kValidXULTagNames[i]) {
if (aTagName == *(kValidXULTagNames[i])) {
return true;
}
}

66
dom/xslt/xpath/txCoreFunctionCall.cpp
Просмотреть файл

@ -21,46 +21,46 @@ using namespace mozilla;
struct txCoreFunctionDescriptor
{
const int8_t mMinParams;
const int8_t mMaxParams;
const Expr::ResultType mReturnType;
const nsStaticAtom* const mName;
int8_t mMinParams;
int8_t mMaxParams;
Expr::ResultType mReturnType;
nsStaticAtom** mName;
};
// This must be ordered in the same order as txCoreFunctionCall::eType.
// If you change one, change the other.
static const txCoreFunctionDescriptor descriptTable[] =
{
{ 1, 1, Expr::NUMBER_RESULT, nsGkAtoms::count }, // COUNT
{ 1, 1, Expr::NODESET_RESULT, nsGkAtoms::id }, // ID
{ 0, 0, Expr::NUMBER_RESULT, nsGkAtoms::last }, // LAST
{ 0, 1, Expr::STRING_RESULT, nsGkAtoms::localName }, // LOCAL_NAME
{ 0, 1, Expr::STRING_RESULT, nsGkAtoms::namespaceUri }, // NAMESPACE_URI
{ 0, 1, Expr::STRING_RESULT, nsGkAtoms::name }, // NAME
{ 0, 0, Expr::NUMBER_RESULT, nsGkAtoms::position }, // POSITION
{ 1, 1, Expr::NUMBER_RESULT, &nsGkAtoms::count }, // COUNT
{ 1, 1, Expr::NODESET_RESULT, &nsGkAtoms::id }, // ID
{ 0, 0, Expr::NUMBER_RESULT, &nsGkAtoms::last }, // LAST
{ 0, 1, Expr::STRING_RESULT, &nsGkAtoms::localName }, // LOCAL_NAME
{ 0, 1, Expr::STRING_RESULT, &nsGkAtoms::namespaceUri }, // NAMESPACE_URI
{ 0, 1, Expr::STRING_RESULT, &nsGkAtoms::name }, // NAME
{ 0, 0, Expr::NUMBER_RESULT, &nsGkAtoms::position }, // POSITION
{ 2, -1, Expr::STRING_RESULT, nsGkAtoms::concat }, // CONCAT
{ 2, 2, Expr::BOOLEAN_RESULT, nsGkAtoms::contains }, // CONTAINS
{ 0, 1, Expr::STRING_RESULT, nsGkAtoms::normalizeSpace }, // NORMALIZE_SPACE
{ 2, 2, Expr::BOOLEAN_RESULT, nsGkAtoms::startsWith }, // STARTS_WITH
{ 0, 1, Expr::STRING_RESULT, nsGkAtoms::string }, // STRING
{ 0, 1, Expr::NUMBER_RESULT, nsGkAtoms::stringLength }, // STRING_LENGTH
{ 2, 3, Expr::STRING_RESULT, nsGkAtoms::substring }, // SUBSTRING
{ 2, 2, Expr::STRING_RESULT, nsGkAtoms::substringAfter }, // SUBSTRING_AFTER
{ 2, 2, Expr::STRING_RESULT, nsGkAtoms::substringBefore }, // SUBSTRING_BEFORE
{ 3, 3, Expr::STRING_RESULT, nsGkAtoms::translate }, // TRANSLATE
{ 2, -1, Expr::STRING_RESULT, &nsGkAtoms::concat }, // CONCAT
{ 2, 2, Expr::BOOLEAN_RESULT, &nsGkAtoms::contains }, // CONTAINS
{ 0, 1, Expr::STRING_RESULT, &nsGkAtoms::normalizeSpace }, // NORMALIZE_SPACE
{ 2, 2, Expr::BOOLEAN_RESULT, &nsGkAtoms::startsWith }, // STARTS_WITH
{ 0, 1, Expr::STRING_RESULT, &nsGkAtoms::string }, // STRING
{ 0, 1, Expr::NUMBER_RESULT, &nsGkAtoms::stringLength }, // STRING_LENGTH
{ 2, 3, Expr::STRING_RESULT, &nsGkAtoms::substring }, // SUBSTRING
{ 2, 2, Expr::STRING_RESULT, &nsGkAtoms::substringAfter }, // SUBSTRING_AFTER
{ 2, 2, Expr::STRING_RESULT, &nsGkAtoms::substringBefore }, // SUBSTRING_BEFORE
{ 3, 3, Expr::STRING_RESULT, &nsGkAtoms::translate }, // TRANSLATE
{ 0, 1, Expr::NUMBER_RESULT, nsGkAtoms::number }, // NUMBER
{ 1, 1, Expr::NUMBER_RESULT, nsGkAtoms::round }, // ROUND
{ 1, 1, Expr::NUMBER_RESULT, nsGkAtoms::floor }, // FLOOR
{ 1, 1, Expr::NUMBER_RESULT, nsGkAtoms::ceiling }, // CEILING
{ 1, 1, Expr::NUMBER_RESULT, nsGkAtoms::sum }, // SUM
{ 0, 1, Expr::NUMBER_RESULT, &nsGkAtoms::number }, // NUMBER
{ 1, 1, Expr::NUMBER_RESULT, &nsGkAtoms::round }, // ROUND
{ 1, 1, Expr::NUMBER_RESULT, &nsGkAtoms::floor }, // FLOOR
{ 1, 1, Expr::NUMBER_RESULT, &nsGkAtoms::ceiling }, // CEILING
{ 1, 1, Expr::NUMBER_RESULT, &nsGkAtoms::sum }, // SUM
{ 1, 1, Expr::BOOLEAN_RESULT, nsGkAtoms::boolean }, // BOOLEAN
{ 0, 0, Expr::BOOLEAN_RESULT, nsGkAtoms::_false }, // _FALSE
{ 1, 1, Expr::BOOLEAN_RESULT, nsGkAtoms::lang }, // LANG
{ 1, 1, Expr::BOOLEAN_RESULT, nsGkAtoms::_not }, // _NOT
{ 0, 0, Expr::BOOLEAN_RESULT, nsGkAtoms::_true } // _TRUE
{ 1, 1, Expr::BOOLEAN_RESULT, &nsGkAtoms::boolean }, // BOOLEAN
{ 0, 0, Expr::BOOLEAN_RESULT, &nsGkAtoms::_false }, // _FALSE
{ 1, 1, Expr::BOOLEAN_RESULT, &nsGkAtoms::lang }, // LANG
{ 1, 1, Expr::BOOLEAN_RESULT, &nsGkAtoms::_not }, // _NOT
{ 0, 0, Expr::BOOLEAN_RESULT, &nsGkAtoms::_true } // _TRUE
};
@ -723,7 +723,7 @@ txCoreFunctionCall::getTypeFromAtom(nsAtom* aName, eType& aType)
{
uint32_t i;
for (i = 0; i < ArrayLength(descriptTable); ++i) {
if (aName == descriptTable[i].mName) {
if (aName == *descriptTable[i].mName) {
aType = static_cast<eType>(i);
return true;
@ -737,6 +737,6 @@ txCoreFunctionCall::getTypeFromAtom(nsAtom* aName, eType& aType)
void
txCoreFunctionCall::appendName(nsAString& aDest)
{
aDest.Append(descriptTable[mType].mName->GetUTF16String());
aDest.Append((*descriptTable[mType].mName)->GetUTF16String());
}
#endif

2
dom/xul/XULDocument.cpp
Просмотреть файл

@ -4131,7 +4131,7 @@ XULDocument::IsDocumentRightToLeft()
Element* element = GetRootElement();
if (element) {
static Element::AttrValuesArray strings[] =
{nsGkAtoms::ltr, nsGkAtoms::rtl, nullptr};
{&nsGkAtoms::ltr, &nsGkAtoms::rtl, nullptr};
switch (element->FindAttrValueIn(kNameSpaceID_None, nsGkAtoms::localedir,
strings, eCaseMatters)) {
case 0: return false;

6
image/test/reftest/downscaling/reftest.list
Просмотреть файл

@ -26,10 +26,10 @@
# RUN TESTS NOT AFFECTED BY DOWNSCALE-DURING-DECODE:
# ==================================================
fuzzy-if(skiaContent,14,416) fuzzy-if(webrender,102-102,396-396) fails-if(webrender&&winWidget) == downscale-svg-1a.html downscale-svg-1-ref.html?80
fuzzy(80,468) fuzzy-if(webrender,65-65,579-579) fails-if(webrender&&winWidget) == downscale-svg-1b.html downscale-svg-1-ref.html?72
fuzzy-if(skiaContent,14,416) fuzzy-if(webrender,102-102,396-472) == downscale-svg-1a.html downscale-svg-1-ref.html?80
fuzzy(80,468) fuzzy-if(webrender,65-65,579-580) == downscale-svg-1b.html downscale-svg-1-ref.html?72
fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),1,62) fuzzy-if(skiaContent,8,292) fuzzy-if(webrender,14-14,316-316) == downscale-svg-1c.html downscale-svg-1-ref.html?64
fuzzy(17,208) fuzzy-if(webrender,83-83,325-325) fails-if(webrender&&winWidget) == downscale-svg-1d.html downscale-svg-1-ref.html?53
fuzzy(17,208) fuzzy-if(webrender,83-84,274-325) == downscale-svg-1d.html downscale-svg-1-ref.html?53
fuzzy(80,216) fuzzy-if(skiaContent,110,181) fuzzy-if(webrender,84-84,216-216) == downscale-svg-1e.html downscale-svg-1-ref.html?40
fuzzy(51,90) fuzzy-if(skiaContent,142,77) fuzzy-if(webrender,62-62,98-98) == downscale-svg-1f.html downscale-svg-1-ref.html?24

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

@ -248,7 +248,7 @@ GetClickableAncestor(nsIFrame* aFrame, nsAtom* stopAt = nullptr, nsAutoString* a
}
static Element::AttrValuesArray clickableRoles[] =
{ nsGkAtoms::button, nsGkAtoms::key, nullptr };
{ &nsGkAtoms::button, &nsGkAtoms::key, nullptr };
if (content->IsElement() &&
content->AsElement()->FindAttrValueIn(kNameSpaceID_None, nsGkAtoms::role,
clickableRoles, eIgnoreCase) >= 0) {

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

@ -396,7 +396,7 @@ GetFieldSetBlockFrame(nsIFrame* aFieldsetFrame)
{ _flags, { (FrameCreationFunc)_func }, nullptr, nullptr }
#define FCDATA_WITH_WRAPPING_BLOCK(_flags, _func, _anon_box) \
{ _flags | FCDATA_CREATE_BLOCK_WRAPPER_FOR_ALL_KIDS, \
{ (FrameCreationFunc)_func }, nullptr, _anon_box }
{ (FrameCreationFunc)_func }, nullptr, &_anon_box }
#define UNREACHABLE_FCDATA() \
{ 0, { (FrameCreationFunc)nullptr }, nullptr, nullptr }
@ -3509,7 +3509,7 @@ nsCSSFrameConstructor::FindDataByTag(nsAtom* aTag,
*endData = aDataPtr + aDataLength;
curData != endData;
++curData) {
if (curData->mTag == aTag) {
if (*curData->mTag == aTag) {
if (aTagFound) {
*aTagFound = true;
}
@ -3533,11 +3533,11 @@ nsCSSFrameConstructor::FindDataByTag(nsAtom* aTag,
{ _int, FULL_CTOR_FCDATA(0, _func) }
#define SIMPLE_TAG_CREATE(_tag, _func) \
{ nsGkAtoms::_tag, SIMPLE_FCDATA(_func) }
{ &nsGkAtoms::_tag, SIMPLE_FCDATA(_func) }
#define SIMPLE_TAG_CHAIN(_tag, _func) \
{ nsGkAtoms::_tag, FCDATA_DECL(FCDATA_FUNC_IS_DATA_GETTER, _func) }
{ &nsGkAtoms::_tag, FCDATA_DECL(FCDATA_FUNC_IS_DATA_GETTER, _func) }
#define COMPLEX_TAG_CREATE(_tag, _func) \
{ nsGkAtoms::_tag, FULL_CTOR_FCDATA(0, _func) }
{ &nsGkAtoms::_tag, FULL_CTOR_FCDATA(0, _func) }
static bool
IsFrameForFieldSet(nsIFrame* aFrame)
@ -3587,7 +3587,7 @@ nsCSSFrameConstructor::FindHTMLData(Element* aElement,
SIMPLE_TAG_CHAIN(img, nsCSSFrameConstructor::FindImgData),
SIMPLE_TAG_CHAIN(mozgeneratedcontentimage,
nsCSSFrameConstructor::FindImgData),
{ nsGkAtoms::br,
{ &nsGkAtoms::br,
FCDATA_DECL(FCDATA_IS_LINE_PARTICIPANT | FCDATA_IS_LINE_BREAK,
NS_NewBRFrame) },
SIMPLE_TAG_CREATE(wbr, NS_NewWBRFrame),
@ -3598,12 +3598,12 @@ nsCSSFrameConstructor::FindHTMLData(Element* aElement,
SIMPLE_TAG_CHAIN(embed, nsCSSFrameConstructor::FindObjectData),
COMPLEX_TAG_CREATE(fieldset,
&nsCSSFrameConstructor::ConstructFieldSetFrame),
{ nsGkAtoms::legend,
{ &nsGkAtoms::legend,
FCDATA_DECL(FCDATA_ALLOW_BLOCK_STYLES | FCDATA_MAY_NEED_SCROLLFRAME,
NS_NewLegendFrame) },
SIMPLE_TAG_CREATE(frameset, NS_NewHTMLFramesetFrame),
SIMPLE_TAG_CREATE(iframe, NS_NewSubDocumentFrame),
{ nsGkAtoms::button,
{ &nsGkAtoms::button,
FCDATA_WITH_WRAPPING_BLOCK(FCDATA_ALLOW_BLOCK_STYLES |
FCDATA_ALLOW_GRID_FLEX_COLUMNSET,
NS_NewHTMLButtonControlFrame,
@ -3895,7 +3895,8 @@ nsCSSFrameConstructor::ConstructFrameFromItemInternal(FrameConstructionItem& aIt
nsIFrame* possiblyLeafFrame = newFrame;
if (bits & FCDATA_CREATE_BLOCK_WRAPPER_FOR_ALL_KIDS) {
RefPtr<ComputedStyle> outerSC = mPresShell->StyleSet()->
ResolveInheritingAnonymousBoxStyle(data->mAnonBoxPseudo, computedStyle);
ResolveInheritingAnonymousBoxStyle(*data->mAnonBoxPseudo,
computedStyle);
#ifdef DEBUG
nsContainerFrame* containerFrame = do_QueryFrame(newFrame);
MOZ_ASSERT(containerFrame);
@ -4274,9 +4275,9 @@ bool IsXULDisplayType(const nsStyleDisplay* aDisplay)
FCDATA_MAY_NEED_SCROLLFRAME, _func)
#define SIMPLE_XUL_CREATE(_tag, _func) \
{ nsGkAtoms::_tag, SIMPLE_XUL_FCDATA(_func) }
{ &nsGkAtoms::_tag, SIMPLE_XUL_FCDATA(_func) }
#define SCROLLABLE_XUL_CREATE(_tag, _func) \
{ nsGkAtoms::_tag, SCROLLABLE_XUL_FCDATA(_func) }
{ &nsGkAtoms::_tag, SCROLLABLE_XUL_FCDATA(_func) }
#define SIMPLE_XUL_DISPLAY_CREATE(_display, _func) \
FCDATA_FOR_DISPLAY(_display, SIMPLE_XUL_FCDATA(_func))
#define SCROLLABLE_XUL_DISPLAY_CREATE(_display, _func) \
@ -5064,10 +5065,10 @@ nsCSSFrameConstructor::FlushAccumulatedBlock(nsFrameConstructorState& aState,
// Only <math> elements can be floated or positioned. All other MathML
// should be in-flow.
#define SIMPLE_MATHML_CREATE(_tag, _func) \
{ nsGkAtoms::_tag, \
FCDATA_DECL(FCDATA_DISALLOW_OUT_OF_FLOW | \
FCDATA_FORCE_NULL_ABSPOS_CONTAINER | \
FCDATA_WRAP_KIDS_IN_BLOCKS, _func) }
{ &nsGkAtoms::_tag, \
FCDATA_DECL(FCDATA_DISALLOW_OUT_OF_FLOW | \
FCDATA_FORCE_NULL_ABSPOS_CONTAINER | \
FCDATA_WRAP_KIDS_IN_BLOCKS, _func) }
/* static */
const nsCSSFrameConstructor::FrameConstructionData*
@ -5242,7 +5243,7 @@ nsCSSFrameConstructor::ConstructMarker(nsFrameConstructorState& aState,
FCDATA_SKIP_ABSPOS_PUSH | \
FCDATA_DISALLOW_GENERATED_CONTENT, _func)
#define SIMPLE_SVG_CREATE(_tag, _func) \
{ nsGkAtoms::_tag, SIMPLE_SVG_FCDATA(_func) }
{ &nsGkAtoms::_tag, SIMPLE_SVG_FCDATA(_func) }
static bool
IsFilterPrimitiveChildTag(const nsAtom* aTag)
@ -5445,12 +5446,12 @@ nsCSSFrameConstructor::FindSVGData(Element* aElement,
SIMPLE_SVG_CREATE(path, NS_NewSVGGeometryFrame),
SIMPLE_SVG_CREATE(defs, NS_NewSVGContainerFrame),
SIMPLE_SVG_CREATE(generic_, NS_NewSVGGenericContainerFrame),
{ nsGkAtoms::text,
{ &nsGkAtoms::text,
FCDATA_WITH_WRAPPING_BLOCK(FCDATA_DISALLOW_OUT_OF_FLOW |
FCDATA_ALLOW_BLOCK_STYLES,
NS_NewSVGTextFrame,
nsCSSAnonBoxes::mozSVGText) },
{ nsGkAtoms::foreignObject,
{ &nsGkAtoms::foreignObject,
FCDATA_WITH_WRAPPING_BLOCK(FCDATA_DISALLOW_OUT_OF_FLOW,
NS_NewSVGForeignObjectFrame,
nsCSSAnonBoxes::mozSVGForeignContent) },
@ -9330,7 +9331,7 @@ nsCSSFrameConstructor::sPseudoParentData[eParentTypeCount] = {
FCDATA_IS_WRAPPER_ANON_BOX |
FCDATA_DESIRED_PARENT_TYPE_TO_BITS(eTypeRow),
&nsCSSFrameConstructor::ConstructTableCell),
nsCSSAnonBoxes::tableCell
&nsCSSAnonBoxes::tableCell
},
{ // Row
FULL_CTOR_FCDATA(FCDATA_IS_TABLE_PART | FCDATA_SKIP_FRAMESET |
@ -9338,7 +9339,7 @@ nsCSSFrameConstructor::sPseudoParentData[eParentTypeCount] = {
FCDATA_IS_WRAPPER_ANON_BOX |
FCDATA_DESIRED_PARENT_TYPE_TO_BITS(eTypeRowGroup),
&nsCSSFrameConstructor::ConstructTableRowOrRowGroup),
nsCSSAnonBoxes::tableRow
&nsCSSAnonBoxes::tableRow
},
{ // Row group
FULL_CTOR_FCDATA(FCDATA_IS_TABLE_PART | FCDATA_SKIP_FRAMESET |
@ -9346,7 +9347,7 @@ nsCSSFrameConstructor::sPseudoParentData[eParentTypeCount] = {
FCDATA_IS_WRAPPER_ANON_BOX |
FCDATA_DESIRED_PARENT_TYPE_TO_BITS(eTypeTable),
&nsCSSFrameConstructor::ConstructTableRowOrRowGroup),
nsCSSAnonBoxes::tableRowGroup
&nsCSSAnonBoxes::tableRowGroup
},
{ // Column group
FCDATA_DECL(FCDATA_IS_TABLE_PART | FCDATA_SKIP_FRAMESET |
@ -9356,13 +9357,13 @@ nsCSSFrameConstructor::sPseudoParentData[eParentTypeCount] = {
// restyle these: they have non-inheriting styles.
FCDATA_DESIRED_PARENT_TYPE_TO_BITS(eTypeTable),
NS_NewTableColGroupFrame),
nsCSSAnonBoxes::tableColGroup
&nsCSSAnonBoxes::tableColGroup
},
{ // Table
FULL_CTOR_FCDATA(FCDATA_SKIP_FRAMESET | FCDATA_USE_CHILD_ITEMS |
FCDATA_IS_WRAPPER_ANON_BOX,
&nsCSSFrameConstructor::ConstructTable),
nsCSSAnonBoxes::table
&nsCSSAnonBoxes::table
},
{ // Ruby
FCDATA_DECL(FCDATA_IS_LINE_PARTICIPANT |
@ -9370,7 +9371,7 @@ nsCSSFrameConstructor::sPseudoParentData[eParentTypeCount] = {
FCDATA_IS_WRAPPER_ANON_BOX |
FCDATA_SKIP_FRAMESET,
NS_NewRubyFrame),
nsCSSAnonBoxes::ruby
&nsCSSAnonBoxes::ruby
},
{ // Ruby Base
FCDATA_DECL(FCDATA_USE_CHILD_ITEMS |
@ -9379,7 +9380,7 @@ nsCSSFrameConstructor::sPseudoParentData[eParentTypeCount] = {
FCDATA_DESIRED_PARENT_TYPE_TO_BITS(eTypeRubyBaseContainer) |
FCDATA_SKIP_FRAMESET,
NS_NewRubyBaseFrame),
nsCSSAnonBoxes::rubyBase
&nsCSSAnonBoxes::rubyBase
},
{ // Ruby Base Container
FCDATA_DECL(FCDATA_USE_CHILD_ITEMS |
@ -9388,7 +9389,7 @@ nsCSSFrameConstructor::sPseudoParentData[eParentTypeCount] = {
FCDATA_DESIRED_PARENT_TYPE_TO_BITS(eTypeRuby) |
FCDATA_SKIP_FRAMESET,
NS_NewRubyBaseContainerFrame),
nsCSSAnonBoxes::rubyBaseContainer
&nsCSSAnonBoxes::rubyBaseContainer
},
{ // Ruby Text
FCDATA_DECL(FCDATA_USE_CHILD_ITEMS |
@ -9397,7 +9398,7 @@ nsCSSFrameConstructor::sPseudoParentData[eParentTypeCount] = {
FCDATA_DESIRED_PARENT_TYPE_TO_BITS(eTypeRubyTextContainer) |
FCDATA_SKIP_FRAMESET,
NS_NewRubyTextFrame),
nsCSSAnonBoxes::rubyText
&nsCSSAnonBoxes::rubyText
},
{ // Ruby Text Container
FCDATA_DECL(FCDATA_USE_CHILD_ITEMS |
@ -9405,7 +9406,7 @@ nsCSSFrameConstructor::sPseudoParentData[eParentTypeCount] = {
FCDATA_DESIRED_PARENT_TYPE_TO_BITS(eTypeRuby) |
FCDATA_SKIP_FRAMESET,
NS_NewRubyTextContainerFrame),
nsCSSAnonBoxes::rubyTextContainer
&nsCSSAnonBoxes::rubyTextContainer
}
};
@ -9974,7 +9975,7 @@ nsCSSFrameConstructor::WrapItemsInPseudoParent(nsIContent* aParentContent,
const FCItemIterator& aEndIter)
{
const PseudoParentData& pseudoData = sPseudoParentData[aWrapperType];
nsICSSAnonBoxPseudo* pseudoType = pseudoData.mPseudoType;
nsAtom* pseudoType = *pseudoData.mPseudoType;
StyleDisplay parentDisplay = aParentStyle->StyleDisplay()->mDisplay;
if (pseudoType == nsCSSAnonBoxes::table &&
@ -10057,7 +10058,7 @@ nsCSSFrameConstructor::CreateNeededPseudoSiblings(
const PseudoParentData& pseudoData =
sPseudoParentData[eTypeRubyBaseContainer];
already_AddRefed<ComputedStyle> pseudoStyle = mPresShell->StyleSet()->
ResolveInheritingAnonymousBoxStyle(pseudoData.mPseudoType,
ResolveInheritingAnonymousBoxStyle(*pseudoData.mPseudoType,
aParentFrame->Style());
FrameConstructionItem* newItem =
new (this) FrameConstructionItem(&pseudoData.mFCData,

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

@ -739,7 +739,7 @@ private:
FrameFullConstructor mFullConstructor;
// For cases when FCDATA_CREATE_BLOCK_WRAPPER_FOR_ALL_KIDS is set, the
// anonymous box type to use for that wrapper.
nsICSSAnonBoxPseudo* const mAnonBoxPseudo;
nsICSSAnonBoxPseudo * const * const mAnonBoxPseudo;
};
/* Structure representing a mapping of an atom to a FrameConstructionData.
@ -747,7 +747,9 @@ private:
stored somewhere that this struct can point to (that is, a static
nsAtom*) and that it's allocated before the struct is ever used. */
struct FrameConstructionDataByTag {
const nsStaticAtom* const mTag;
// Pointer to nsStaticAtom* is used because we want to initialize this
// statically, so before our atom tables are set up.
const nsStaticAtom * const * const mTag;
const FrameConstructionData mData;
};
@ -778,7 +780,7 @@ private:
for a table pseudo-frame */
struct PseudoParentData {
const FrameConstructionData mFCData;
nsICSSAnonBoxPseudo* const mPseudoType;
nsICSSAnonBoxPseudo * const * const mPseudoType;
};
/* Array of such structures that we use to properly construct table
pseudo-frames as needed */

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

@ -2407,11 +2407,6 @@ nsDocumentViewer::CreateStyleSet(nsIDocument* aDocument)
// an SVG document, and excluding xul.css which will be loaded on demand by
// nsXULElement::BindToTree.)
sheet = cache->NumberControlSheet();
if (sheet) {
styleSet->PrependStyleSheet(SheetType::Agent, sheet->AsServo());
}
sheet = cache->FormsSheet();
if (sheet) {
styleSet->PrependStyleSheet(SheetType::Agent, sheet->AsServo());

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

@ -793,10 +793,10 @@ void
nsImageMap::AddArea(HTMLAreaElement* aArea)
{
static Element::AttrValuesArray strings[] =
{nsGkAtoms::rect, nsGkAtoms::rectangle,
nsGkAtoms::circle, nsGkAtoms::circ,
nsGkAtoms::_default,
nsGkAtoms::poly, nsGkAtoms::polygon,
{&nsGkAtoms::rect, &nsGkAtoms::rectangle,
&nsGkAtoms::circle, &nsGkAtoms::circ,
&nsGkAtoms::_default,
&nsGkAtoms::poly, &nsGkAtoms::polygon,
nullptr};
UniquePtr<Area> area;

26
layout/inspector/InspectorUtils.cpp
Просмотреть файл

@ -406,17 +406,21 @@ static void InsertNoDuplicates(nsTArray<nsString>& aArray,
static void GetKeywordsForProperty(const nsCSSPropertyID aProperty,
nsTArray<nsString>& aArray)
{
const nsCSSProps::KTableEntry* keywordTable;
if (nsCSSProps::IsShorthand(aProperty)) {
// Shorthand props have no keywords.
return;
}
const nsCSSProps::KTableEntry* keywordTable =
nsCSSProps::kKeywordTableTable[aProperty];
// Special cases where nsCSSPropList.h doesn't hold the table.
if (keywordTable == nullptr) {
if (aProperty == eCSSProperty_clip_path) {
keywordTable = nsCSSProps::kClipPathGeometryBoxKTable;
if (aProperty == eCSSProperty_font) {
keywordTable = nsCSSProps::kFontKTable;
} else {
// Other shorthand props have no keywords.
return;
}
} else {
keywordTable = nsCSSProps::kKeywordTableTable[aProperty];
// Special cases where nsCSSPropList.h doesn't hold the table.
if (keywordTable == nullptr) {
if (aProperty == eCSSProperty_clip_path) {
keywordTable = nsCSSProps::kClipPathGeometryBoxKTable;
}
}
}
@ -798,6 +802,8 @@ InspectorUtils::GetCSSValuesForProperty(GlobalObject& aGlobalObject,
break;
}
}
// Some shorthands may have keywords not available in subproperties.
GetKeywordsForProperty(propertyID, aResult);
CSSPROPS_FOR_SHORTHAND_SUBPROPERTIES(subproperty, propertyID,
CSSEnabledState::eForAllContent) {
uint32_t propertyParserVariant = nsCSSProps::ParserVariant(*subproperty);

2
layout/reftests/backgrounds/gradient/reftest.list
Просмотреть файл

@ -1,3 +1,3 @@
== scaled-color-stop-position.html scaled-color-stop-position-ref.html
== color-stop-clamp-interpolation.html color-stop-clamp-interpolation-ref.html
fails-if(webrender&&winWidget) == linear-gradient-repeated.html linear-gradient-repeated-ref.html
fuzzy-if(webrender&&winWidget,2-2,72-72) == linear-gradient-repeated.html linear-gradient-repeated-ref.html

10
layout/reftests/backgrounds/reftest.list
Просмотреть файл

@ -178,10 +178,10 @@ fuzzy(30,474) fuzzy-if(skiaContent,31,474) == background-tiling-zoom-1.html back
skip-if(!cocoaWidget) == background-repeat-resampling.html background-repeat-resampling-ref.html
fuzzy-if(winWidget,102,2032) fuzzy-if(skiaContent,102,2811) fails-if(webrender&&winWidget) == background-clip-text-1a.html background-clip-text-1-ref.html
fuzzy-if(winWidget,102,2032) fuzzy-if(skiaContent,102,2811) fails-if(webrender&&winWidget) == background-clip-text-1b.html background-clip-text-1-ref.html
fuzzy-if(winWidget,102,2032) fuzzy-if(skiaContent,102,2811) fails-if(webrender&&winWidget) == background-clip-text-1c.html background-clip-text-1-ref.html
fuzzy-if(winWidget,102,2032) fuzzy-if(skiaContent,102,2811) fails-if(webrender&&winWidget) == background-clip-text-1d.html background-clip-text-1-ref.html
fuzzy-if(winWidget,102,2032) fuzzy-if(skiaContent,102,2811) fails-if(webrender&&winWidget) == background-clip-text-1e.html background-clip-text-1-ref.html
fuzzy-if(winWidget,102,2032) fuzzy-if(skiaContent,102,2811) fuzzy-if(webrender&&winWidget,153-153,2866-2866) == background-clip-text-1a.html background-clip-text-1-ref.html
fuzzy-if(winWidget,102,2032) fuzzy-if(skiaContent,102,2811) fuzzy-if(webrender&&winWidget,153-153,2866-2866) == background-clip-text-1b.html background-clip-text-1-ref.html
fuzzy-if(winWidget,102,2032) fuzzy-if(skiaContent,102,2811) fuzzy-if(webrender&&winWidget,153-153,2866-2866) == background-clip-text-1c.html background-clip-text-1-ref.html
fuzzy-if(winWidget,102,2032) fuzzy-if(skiaContent,102,2811) fuzzy-if(webrender&&winWidget,153-153,2866-2866) == background-clip-text-1d.html background-clip-text-1-ref.html
fuzzy-if(winWidget,102,2032) fuzzy-if(skiaContent,102,2811) fuzzy-if(webrender&&winWidget,153-153,2866-2866) == background-clip-text-1e.html background-clip-text-1-ref.html
== background-clip-text-2.html background-clip-text-2-ref.html

36
layout/reftests/border-image/reftest.list
Просмотреть файл

@ -11,8 +11,8 @@ fuzzy-if(winWidget,1,1) == multicolor-image-2.html multicolor-image-2-ref.html
== multicolor-image-5.html multicolor-image-5-ref.html
== transparent-image-1.html transparent-image-1-ref.html
!= repeat-image-1.html repeat-image-1-ref.html
fuzzy-if(webrender,15-15,975-975) fails-if(webrender&&winWidget) == 470250-1.html 470250-1-ref.html
fuzzy-if(webrender,15-15,975-975) fails-if(webrender&&winWidget) == 470250-2.html 470250-2-ref.html
fuzzy-if(webrender,15-15,975-986) == 470250-1.html 470250-1-ref.html
fuzzy-if(webrender,15-15,975-986) == 470250-2.html 470250-2-ref.html
!= different-h-v-1.html different-h-v-ref.html
!= different-h-v-2.html different-h-v-ref.html
!= different-h-v-1.html different-h-v-2.html
@ -43,19 +43,19 @@ fuzzy-if(asyncPan&&!layersGPUAccelerated,140,514) fuzzy-if(winWidget&&stylo,144,
# border images with gradients
fuzzy-if(webrender,1-1,1488-1804) == border-image-linear-gradient.html border-image-linear-gradient-ref.html
fuzzy(1,98) fuzzy-if(skiaContent,1,350) fuzzy-if(webrender,1-1,37537-37537) fails-if(webrender&&winWidget) == border-image-linear-gradient-slice-1.html border-image-linear-gradient-slice-1-ref.html
fuzzy(1,149) fuzzy-if(OSX,1,10595) fuzzy-if(webrender,1,25007) fails-if(webrender&&winWidget) == border-image-linear-gradient-slice-2.html border-image-linear-gradient-slice-2-ref.html
fuzzy(1,433) fuzzy-if(skiaContent,1,2500) fuzzy-if(webrender,1,85584) fails-if(webrender&&winWidget) == border-image-linear-gradient-slice-fill-1.html border-image-linear-gradient-slice-fill-1-ref.html
fuzzy(1,177) fuzzy-if(OSX,1,25771) fuzzy-if(skiaContent&&!Android,1,400) fuzzy-if(Android,1,6093) fuzzy-if(webrender,1,57412) fails-if(webrender&&winWidget) == border-image-linear-gradient-slice-fill-2.html border-image-linear-gradient-slice-fill-2-ref.html
fuzzy(1,48) fuzzy-if(OSX,5,1676) fuzzy-if(webrender,1,4479) fails-if(webrender&&winWidget) == border-image-linear-gradient-width.html border-image-linear-gradient-width-ref.html
fuzzy(1,5000) fuzzy-if(OSX,1,15000) fuzzy-if(webrender,2,58670) == border-image-linear-gradient-slice-width.html border-image-linear-gradient-slice-width-ref.html
fuzzy(1,3000) fuzzy-if(OSX,1,6000) fuzzy-if(webrender,1,26302) fails-if(webrender&&winWidget) == border-image-linear-gradient-outset.html border-image-linear-gradient-outset-ref.html
fuzzy(1,12) fuzzy-if(skiaContent,1,400) fuzzy-if(webrender,1-1,26872-26872) fails-if(webrender&&winWidget) == border-image-linear-gradient-repeat-repeat-1.html border-image-linear-gradient-repeat-repeat-1-ref.html
fuzzy(1,13) fuzzy-if(skiaContent,1,300) fuzzy-if(webrender,1-1,27131-27131) fails-if(webrender&&winWidget) == border-image-linear-gradient-repeat-round-1.html border-image-linear-gradient-repeat-round-1-ref.html
fuzzy-if(webrender,1-1,65098-65098) fails-if(webrender&&winWidget) == border-image-linear-gradient-repeat-repeat-2.html border-image-linear-gradient-repeat-repeat-2-ref.html
fuzzy(1,576) fuzzy-if(skiaContent,1,2000) fuzzy-if(webrender,1-1,64806-64806) fails-if(webrender&&winWidget) == border-image-linear-gradient-repeat-round-2.html border-image-linear-gradient-repeat-round-2-ref.html
fuzzy(1,8533) fuzzy-if(webrender,1,85925) fails-if(webrender&&winWidget) == border-image-linear-gradient-repeat-repeat-3.html border-image-linear-gradient-repeat-repeat-3-ref.html
fuzzy(1,7161) fuzzy-if(webrender,2,107112) fails-if(webrender&&winWidget) == border-image-linear-gradient-repeat-round-3.html border-image-linear-gradient-repeat-round-3-ref.html
fuzzy(1,98) fuzzy-if(skiaContent,1,350) fuzzy-if(webrender,1-2,37234-37537) == border-image-linear-gradient-slice-1.html border-image-linear-gradient-slice-1-ref.html
fuzzy(1,149) fuzzy-if(OSX,1,10595) fuzzy-if(webrender,1-3,24999-25007) == border-image-linear-gradient-slice-2.html border-image-linear-gradient-slice-2-ref.html
fuzzy(1,433) fuzzy-if(skiaContent,1,2500) fuzzy-if(webrender,1-3,84860-85584) == border-image-linear-gradient-slice-fill-1.html border-image-linear-gradient-slice-fill-1-ref.html
fuzzy(1,177) fuzzy-if(OSX,1,25771) fuzzy-if(skiaContent&&!Android,1,400) fuzzy-if(Android,1,6093) fuzzy-if(webrender,1-3,57249-57412) == border-image-linear-gradient-slice-fill-2.html border-image-linear-gradient-slice-fill-2-ref.html
fuzzy(1,48) fuzzy-if(OSX,5,1676) fuzzy-if(webrender,1-1,4479-4530) == border-image-linear-gradient-width.html border-image-linear-gradient-width-ref.html
fuzzy(1,5000) fuzzy-if(OSX,1,15000) fuzzy-if(webrender,2-2,58629-58667) == border-image-linear-gradient-slice-width.html border-image-linear-gradient-slice-width-ref.html
fuzzy(1,3000) fuzzy-if(OSX,1,6000) fuzzy-if(webrender,1-1,26067-26353) == border-image-linear-gradient-outset.html border-image-linear-gradient-outset-ref.html
fuzzy(1,12) fuzzy-if(skiaContent,1,400) fuzzy-if(webrender,1-2,26394-26872) == border-image-linear-gradient-repeat-repeat-1.html border-image-linear-gradient-repeat-repeat-1-ref.html
fuzzy(1,13) fuzzy-if(skiaContent,1,300) fuzzy-if(webrender,1-2,26265-27131) == border-image-linear-gradient-repeat-round-1.html border-image-linear-gradient-repeat-round-1-ref.html
fuzzy-if(webrender,1-2,65098-66334) == border-image-linear-gradient-repeat-repeat-2.html border-image-linear-gradient-repeat-repeat-2-ref.html
fuzzy(1,576) fuzzy-if(skiaContent,1,2000) fuzzy-if(webrender,1-2,64806-66821) == border-image-linear-gradient-repeat-round-2.html border-image-linear-gradient-repeat-round-2-ref.html
fuzzy(1,8533) fuzzy-if(webrender,1-2,84604-85925) == border-image-linear-gradient-repeat-repeat-3.html border-image-linear-gradient-repeat-repeat-3-ref.html
fuzzy(1,7161) fuzzy-if(webrender,2-3,92540-92746) == border-image-linear-gradient-repeat-round-3.html border-image-linear-gradient-repeat-round-3-ref.html
fuzzy-if(webrender,1,2096) == border-image-radial-gradient.html border-image-radial-gradient-ref.html
fuzzy(1,42) fuzzy-if(skiaContent,2,20) fuzzy-if(webrender,1,37818) == border-image-radial-gradient-slice-1.html border-image-radial-gradient-slice-1-ref.html
@ -66,15 +66,15 @@ fuzzy-if(skiaContent,1,2) fuzzy-if(webrender,1,4894) == border-image-radial-grad
fuzzy(1,9000) fuzzy-if(webrender,3,66698) == border-image-radial-gradient-slice-width.html border-image-radial-gradient-slice-width-ref.html
# OS X failures tracked in bug 957025
fuzzy-if(webrender,1-1,1766-1766) fails-if(webrender&&winWidget) == border-image-repeating-linear-gradient.html border-image-repeating-linear-gradient-ref.html
fuzzy-if(webrender,1-1,1766-1800) == border-image-repeating-linear-gradient.html border-image-repeating-linear-gradient-ref.html
fuzzy(1,5608) fails-if(OSX) fuzzy-if(skiaContent,1,6093) fuzzy-if(webrender,3,95449) == border-image-repeating-linear-gradient-slice-fill-2.html border-image-repeating-linear-gradient-slice-fill-2-ref.html
fuzzy(1,19200) fails-if(OSX) fuzzy-if(skiaContent,3,20000) fuzzy-if(webrender,3-3,18896-18896) fuzzy-if(webrender,2,112082) == border-image-repeating-linear-gradient-repeat-round-2.html border-image-repeating-linear-gradient-repeat-round-2-ref.html
fuzzy(1,657) fuzzy-if(webrender,3,3008) == border-image-repeating-radial-gradient.html border-image-repeating-radial-gradient-ref.html
fuzzy(1,510) fuzzy-if(skiaContent,3,362) fuzzy-if(webrender,3,62078) == border-image-repeating-radial-gradient-slice-1.html border-image-repeating-radial-gradient-slice-1-ref.html
fuzzy(1,438) fuzzy-if(skiaContent,3,437) fuzzy-if(webrender,3,40536) == border-image-repeating-radial-gradient-slice-2.html border-image-repeating-radial-gradient-slice-2-ref.html
fuzzy(1,1357) fuzzy-if(skiaContent,3,964) fuzzy-if(webrender,3,143220) fails-if(webrender&&winWidget) == border-image-repeating-radial-gradient-slice-fill-1.html border-image-repeating-radial-gradient-slice-fill-1-ref.html
fuzzy(1,1058) fails-if(OSX) fuzzy-if(skiaContent,3,887) fuzzy-if(webrender,3,94677) fails-if(webrender&&winWidget) == border-image-repeating-radial-gradient-slice-fill-2.html border-image-repeating-radial-gradient-slice-fill-2-ref.html
fuzzy(1,1357) fuzzy-if(skiaContent,3,964) fuzzy-if(webrender,1-4,85742-85800) == border-image-repeating-radial-gradient-slice-fill-1.html border-image-repeating-radial-gradient-slice-fill-1-ref.html
fuzzy(1,1058) fails-if(OSX) fuzzy-if(skiaContent,3,887) fuzzy-if(webrender,1-4,57087-57193) == border-image-repeating-radial-gradient-slice-fill-2.html border-image-repeating-radial-gradient-slice-fill-2-ref.html
fuzzy(1,602) fuzzy-if(webrender,3,7441) == border-image-repeating-radial-gradient-width.html border-image-repeating-radial-gradient-width-ref.html
fuzzy(3,18000) fails-if(OSX) fuzzy-if(skiaContent,4,16462) fuzzy-if(webrender,5,99728) == border-image-repeating-radial-gradient-slice-width.html border-image-repeating-radial-gradient-slice-width-ref.html
fuzzy-if(webrender,3,117768) == border-image-repeating-radial-gradient-repeat-repeat-2.html border-image-repeating-radial-gradient-repeat-repeat-2-ref.html

2
layout/reftests/box-shadow/reftest.list
Просмотреть файл

@ -11,7 +11,7 @@ random != boxshadow-blur-2.html boxshadow-blur-2-notref.html # fixedpoint divisi
== boxshadow-rounding.html boxshadow-rounding-ref.html
# One uses old path, one uses WR box shadow.
fails-if(Android) == boxshadow-button.html boxshadow-button-ref.html
fuzzy-if(OSX==1010,1,24) fuzzy-if(d2d,16,999) fuzzy-if(skiaContent,1,12) fuzzy-if(webrender,7-7,1560-1680) fails-if(webrender&&winWidget) == boxshadow-large-border-radius.html boxshadow-large-border-radius-ref.html # Bug 1209649
fuzzy-if(OSX==1010,1,24) fuzzy-if(d2d,16,999) fuzzy-if(skiaContent,1,12) fuzzy-if(webrender,5-7,1560-1680) == boxshadow-large-border-radius.html boxshadow-large-border-radius-ref.html # Bug 1209649
fails-if(Android) == boxshadow-fileupload.html boxshadow-fileupload-ref.html
fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),98,152) fuzzy-if(skiaContent,13,28) fuzzy-if(webrender,19-19,50-50) == boxshadow-inner-basic.html boxshadow-inner-basic-ref.svg

22
layout/reftests/bugs/reftest.list
Просмотреть файл

@ -412,7 +412,7 @@ fuzzy-if(Android,2,18) == 315920-17.html 315920-17-ref.html
== 320979-1.html 320979-1-ref.html
!= 321402-1.html about:blank
!= 321402-2.html about:blank
fails-if(webrender&&winWidget) == 321402-3.xul 321402-3-ref.xul
fuzzy-if(webrender&&winWidget,35-35,1-1) == 321402-3.xul 321402-3-ref.xul
== 321402-4.xul 321402-4-ref.xul
== 321402-5.xul 321402-5-ref.xul
== 321402-6.xul 321402-6-ref.xul
@ -556,9 +556,9 @@ fuzzy-if(skiaContent||Android,4,11) == 363858-1.html 363858-1-ref.html
== 363858-2.html 363858-2-ref.html
== 363858-3.html 363858-3-ref.html
== 363858-4.html 363858-4-ref.html
# fuzzy-if(OSX,45,2) fuzzy-if(winWidget,114,1) fails-if(webrender&&winWidget) == 363858-5a.html 363858-5-ref.html # bug 1452797
# fuzzy-if(OSX,45,2) fuzzy-if(winWidget,116,1) == 363858-5a.html 363858-5-ref.html # bug 1452797
== 363858-5b.html 363858-5-ref.html
# fuzzy-if(OSX,45,2) fuzzy-if(winWidget,114,1) fails-if(webrender&&winWidget) == 363858-6a.html 363858-6-ref.html # bug 1452797
# fuzzy-if(OSX,45,2) fuzzy-if(winWidget,116,1) == 363858-6a.html 363858-6-ref.html # bug 1452797
== 363858-6b.html 363858-6-ref.html
== 363874.html 363874-ref.html
== 363874-max-width.html 363874-max-width-ref.html
@ -654,7 +654,7 @@ fails-if(Android&&!asyncPan) == 371561-1.html 371561-1-ref.html
== 372553-1.html 372553-1-ref.html
== 372632-1.html 372632-1-ref.html
== 372768-1.html 372768-1-ref.html
fails-if(webrender&&winWidget) == 373295-1.html 373295-1-ref.html
fuzzy-if(webrender&&winWidget,83-83,2-2) == 373295-1.html 373295-1-ref.html
== 373298-1.html 373298-1-ref.html
== 373381-1.html 373381-1-ref.html
fuzzy-if(skiaContent&&!Android,2,40) == 373381-2.html 373381-2-ref.html
@ -728,8 +728,8 @@ fuzzy-if(skiaContent,2,5) == 381507-1.html 381507-1-ref.html
== 384762-1.html about:blank
== 384876-1.html 384876-1-ref.html
== 385533-1.html about:blank # assertion test
fails-if(webrender&&winWidget) == 385569-1a.html 385569-1-ref.html
fails-if(webrender&&winWidget) == 385569-1b.html 385569-1-ref.html
fuzzy-if(webrender&&winWidget,137-137,303-303) == 385569-1a.html 385569-1-ref.html
fuzzy-if(webrender&&winWidget,137-137,303-303) == 385569-1b.html 385569-1-ref.html
== 385607-1.html 385607-1-ref.html
== 385823-1.html 385823-1-ref.html
fuzzy-if(webrender,0-1,0-600) == 385823-2a.html 385823-2-ref.html
@ -941,7 +941,7 @@ fuzzy-if(winWidget,123,1600) == 409659-1a.html 409659-1-ref.html # Bug 1128229
fuzzy-if(winWidget,123,1900) == 409659-1d.html 409659-1-ref.html # Bug 1128229
== 410621-1.html 410621-1-ref.html
== 411059-1.html 411059-1-ref.html
fails-if(webrender&&winWidget) == 411334-1.xml 411334-1-ref.xml
fuzzy-if(webrender&&winWidget,129-129,770-770) == 411334-1.xml 411334-1-ref.xml
== 411367-1.html 411367-1-ref.html
== 411367-2.html 411367-2-ref.html
== 411367-3.html 411367-3-ref.html
@ -1002,7 +1002,7 @@ asserts(1) == 418574-2.html 418574-2-ref.html # bug 478135
== 421069-ref.html 421069-ref2.html
== 421203-1.xul 421203-1-ref.html
== 421203-2.xul 421203-1-ref.html
fails-if(webrender&&winWidget) == 421203-3.xul 321402-3-ref.xul
fuzzy-if(webrender&&winWidget,35-35,1-1) == 421203-3.xul 321402-3-ref.xul
== 421203-4.xul 321402-4-ref.xul
== 421203-5.xul 321402-5-ref.xul
== 421203-6.xul 321402-6-ref.xul
@ -1195,7 +1195,7 @@ fuzzy-if(webrender,4,361) == 449519-1.html 449519-1-ref.html
== 455171-5.html 455171-5-ref.html
== 455280-1.xhtml 455280-1-ref.xhtml
== 455826-1.html 455826-1-ref.html
fails-if(Android||cocoaWidget) fails-if(webrender&&winWidget) == 456147.xul 456147-ref.html # bug 458047
fails-if(Android||cocoaWidget) fuzzy-if(webrender&&winWidget,222-222,2806-2806) == 456147.xul 456147-ref.html # bug 458047
fuzzy-if(Android,11,41) fuzzy-if(winWidget||gtkWidget,4,6) fuzzy-if(d2d,15,69) fuzzy-if(skiaContent,42,150) == 456219-1a.html 456219-1-ref.html # bug 1128229
fuzzy-if(Android,11,41) fuzzy-if(winWidget||gtkWidget,4,6) fuzzy-if(d2d,15,69) fuzzy-if(skiaContent,42,150) == 456219-1b.html 456219-1-ref.html # bug 1128229
fuzzy-if(Android,11,41) fuzzy-if(winWidget||gtkWidget,4,6) fuzzy-if(d2d,15,69) fuzzy-if(skiaContent,42,150) == 456219-1c.html 456219-1-ref.html # bug 1128229
@ -1233,7 +1233,7 @@ fuzzy-if(skiaContent,1,12000) fails-if(webrender) == 461512-1.html 461512-1-ref.
== 462844-3.html 462844-ref.html
== 462844-4.html 462844-ref.html
== 463204-1.html 463204-1-ref.html
fuzzy-if(webrender,16-16,3425-3425) fails-if(webrender&&winWidget) == 463217-1.xul 463217-1-ref.xul
fuzzy-if(webrender,16-16,3425-3483) == 463217-1.xul 463217-1-ref.xul
== 463952-1.html 463952-1-ref.html
== 464811-1.html 464811-1-ref.html
== 465574-1.html 465574-1-ref.html # bug 421436
@ -1687,7 +1687,7 @@ fuzzy-if(skiaContent,1,4500) == 654950-1.html 654950-1-ref.html # Quartz alpha b
== 655836-1.html 655836-1-ref.html
!= 656875.html about:blank
== 658952.html 658952-ref.html
fuzzy-if(skiaContent,7,3500) fails-if(webrender&&winWidget) == 660682-1.html 660682-1-ref.html
fuzzy-if(skiaContent,7,3500) fuzzy-if(webrender&&winWidget,37-37,777-777) == 660682-1.html 660682-1-ref.html
fuzzy-if(d2d,1,256) skip-if(Android) fuzzy-if(skiaContent,1,68000) == 664127-1.xul 664127-1-ref.xul # Android: Intermittent failures - bug 1019131
== 665597-1.html 665597-1-ref.html
== 665597-2.html 665597-2-ref.html

2
layout/reftests/css-blending/reftest.list
Просмотреть файл

@ -2,7 +2,7 @@ pref(layout.css.mix-blend-mode.enabled,true) == blend-canvas.html blend-canvas-r
pref(layout.css.mix-blend-mode.enabled,true) == blend-constant-background-color.html blend-constant-background-color-ref.html
pref(layout.css.mix-blend-mode.enabled,true) fuzzy-if(webrender,1-1,1411-7875) == blend-gradient-background-color.html blend-gradient-background-color-ref.html
pref(layout.css.mix-blend-mode.enabled,true) == blend-image.html blend-image-ref.html
pref(layout.css.mix-blend-mode.enabled,true) fails-if(webrender&&winWidget) == blend-difference-stacking.html blend-difference-stacking-ref.html
pref(layout.css.mix-blend-mode.enabled,true) fuzzy-if(webrender&&winWidget,36-36,4-4) == blend-difference-stacking.html blend-difference-stacking-ref.html
fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),1,10000) fuzzy-if(skiaContent,1,30000) pref(layout.css.background-blend-mode.enabled,true) == background-blending-alpha.html background-blending-alpha-ref.html
pref(layout.css.background-blend-mode.enabled,true) fuzzy-if(webrender,1-1,1411-7875) == background-blending-gradient-color.html background-blending-gradient-color-ref.html

2
layout/reftests/css-break/reftest.list
Просмотреть файл

@ -1,7 +1,7 @@
default-preferences pref(layout.css.box-decoration-break.enabled,true)
== box-decoration-break-1.html box-decoration-break-1-ref.html
fuzzy(1,20) fuzzy-if(skiaContent,1,700) fuzzy-if(webrender,21-21,12245-12245) fails-if(webrender&&winWidget) == box-decoration-break-with-inset-box-shadow-1.html box-decoration-break-with-inset-box-shadow-1-ref.html
fuzzy(1,20) fuzzy-if(skiaContent,1,700) fuzzy-if(webrender,21-21,12245-12245) fuzzy-if(webrender&&winWidget,26-26,9123-9123) == box-decoration-break-with-inset-box-shadow-1.html box-decoration-break-with-inset-box-shadow-1-ref.html
fuzzy(45,460) fuzzy-if(skiaContent,57,439) fuzzy-if(Android,57,1330) == box-decoration-break-with-outset-box-shadow-1.html box-decoration-break-with-outset-box-shadow-1-ref.html # Bug 1386543
random-if(!gtkWidget) == box-decoration-break-border-image.html box-decoration-break-border-image-ref.html
== box-decoration-break-block-border-padding.html box-decoration-break-block-border-padding-ref.html

2
layout/reftests/forms/input/number/reftest.list
Просмотреть файл

@ -1,5 +1,3 @@
default-preferences pref(dom.forms.number,true)
# sanity checks:
# not valid on Android where type=number looks like type=text
skip-if(Android) != not-other-type-unthemed-1.html not-other-type-unthemed-1a-notref.html

4
layout/reftests/image-element/reftest.list
Просмотреть файл

@ -7,7 +7,7 @@ random == bug-364968.html bug-364968-ref.html
== canvas-outside-document-invalidate-01.html about:blank
fails-if(azureSkia) fails-if(cocoaWidget) == canvas-outside-document-invalidate-02.html about:blank # See bug 666800
#fails with Skia due to Skia bug http://code.google.com/p/skia/issues/detail?id=568
fails-if(webrender&&winWidget) == element-paint-simple.html element-paint-simple-ref.html
fuzzy-if(webrender&&winWidget,117-117,54-54) == element-paint-simple.html element-paint-simple-ref.html
== element-paint-repeated.html element-paint-repeated-ref.html
== element-paint-recursion.html element-paint-recursion-ref.html
== element-paint-continuation.html element-paint-continuation-ref.html
@ -17,7 +17,7 @@ fuzzy-if(d2d&&/^Windows\x20NT\x206\.1/.test(http.oscpu),16,90) == element-paint-
== element-paint-background-size-02.html element-paint-background-size-02-ref.html
fuzzy-if(skiaContent,255,4) == element-paint-transform-repeated.html element-paint-transform-repeated-ref.html
fuzzy-if(d2d,255,24) == element-paint-transform-03.html element-paint-transform-03-ref.html
fuzzy-if(asyncPan,2,140) fuzzy-if(skiaContent,3,106) fails-if(webrender&&winWidget) == element-paint-native-widget.html element-paint-native-widget-ref.html # in -ref the scrollframe is active and layerized differently with APZ
fuzzy-if(asyncPan,2,140) fuzzy-if(skiaContent,3,106) fuzzy-if(webrender&&winWidget,222-222,1323-1323) == element-paint-native-widget.html element-paint-native-widget-ref.html # in -ref the scrollframe is active and layerized differently with APZ
fails-if(usesRepeatResampling&&!(webrender&&winWidget)) == element-paint-subimage-sampling-restriction.html about:blank
== element-paint-clippath.html element-paint-clippath-ref.html
fuzzy-if(webrender,35-35,706-706) == element-paint-sharpness-01a.html element-paint-sharpness-01b.html

2
layout/reftests/mathml/reftest.list
Просмотреть файл

@ -17,7 +17,7 @@ pref(mathml.disabled,true) == disabled-scriptlevel-1.xhtml disabled-scriptlevel-
== displaystyle-2.html displaystyle-2-ref.html
== displaystyle-3.html displaystyle-3-ref.html
== displaystyle-4.html displaystyle-4-ref.html
random-if(smallScreen&&Android) fuzzy(255,200) fails-if(webrender&&winWidget) == mirror-op-1.html mirror-op-1-ref.html
random-if(smallScreen&&Android) fuzzy(255,200) fuzzy-if(webrender&&winWidget,255-255,265-265) == mirror-op-1.html mirror-op-1-ref.html
!= mirror-op-2.html mirror-op-2-ref.html
!= mirror-op-3.html mirror-op-3-ref.html
!= mirror-op-4.html mirror-op-4-ref.html

2
layout/reftests/position-sticky/reftest.list
Просмотреть файл

@ -40,7 +40,7 @@ fuzzy-if(Android,4,810) == containing-block-1.html containing-block-1-ref.html
== inline-1.html inline-1-ref.html
== inline-2.html inline-2-ref.html
fuzzy-if(OSX,99,210) == inline-3.html inline-3-ref.html
skip-if(!asyncPan) fails-if(webrender&&winWidget) == inline-4.html inline-4-ref.html
skip-if(!asyncPan) fuzzy-if(webrender&&winWidget,126-126,4-4) == inline-4.html inline-4-ref.html
fails == column-contain-1a.html column-contain-1-ref.html
== column-contain-1b.html column-contain-1-ref.html
== column-contain-2.html column-contain-2-ref.html

2
layout/reftests/svg/as-image/reftest.list
Просмотреть файл

@ -46,7 +46,7 @@ fuzzy(1,2) fuzzy-if(skiaContent,1,529) == canvas-drawImage-scale-2b.html canvas-
fuzzy-if(winWidget&&!d2d,1,10000) fuzzy-if(azureSkia,1,10000) fuzzy-if(Android,1,10000) == canvas-drawImage-alpha-1.html canvas-drawImage-alpha-1-ref.html
#Same as scale-2a but with globalAlpha:
fuzzy(1,2) fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),1,7018) fuzzy-if(azureSkia,1,40000) fails-if(webrender&&winWidget) == canvas-drawImage-alpha-2.html canvas-drawImage-alpha-2-ref.html
fuzzy(1,2) fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),1,7018) fuzzy-if(azureSkia,1,40000) fuzzy-if(webrender&&winWidget,1-1,39743-39743) == canvas-drawImage-alpha-2.html canvas-drawImage-alpha-2-ref.html
== canvas-drawImage-slice-1a.html lime100x100-ref.html
== canvas-drawImage-slice-1b.html lime100x100-ref.html

2
layout/reftests/svg/filters/css-filter-chains/reftest.list
Просмотреть файл

@ -4,6 +4,6 @@
default-preferences pref(layout.css.filters.enabled,true)
# Some platforms render this complex filter chain a little differently, and that's ok.
fuzzy(5,13000) fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu)&&layersGPUAccelerated,35,13269) fuzzy-if(webrender,6-6,18006-18006) fails-if(webrender&&winWidget) == long-chain.html long-chain-ref.html # Win10: Bug 1258241
fuzzy(5,13000) fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu)&&layersGPUAccelerated,35,13269) fuzzy-if(webrender,5-6,18006-18071) == long-chain.html long-chain-ref.html # Win10: Bug 1258241
== moz-element.html moz-element-ref.html
fuzzy-if(webrender,15-15,7958-8262) == same-filter.html same-filter-ref.html

14
layout/reftests/svg/filters/css-filters/reftest.list
Просмотреть файл

@ -3,16 +3,16 @@
default-preferences pref(layout.css.filters.enabled,true)
fuzzy-if(webrender,9-9,4780-4780) fails-if(webrender&&winWidget) == blur.html blur-ref.html
fuzzy-if(webrender,9-9,4780-4784) == blur.html blur-ref.html
== blur.svg blur-ref.svg
== blur-calc.html blur-calc-ref.html
== blur-calc-negative.html blur-calc-negative-ref.html
skip-if(d2d) == blur-cap-large-radius-on-software.html blur-cap-large-radius-on-software-ref.html
fuzzy-if(webrender,9-9,4780-4780) fails-if(webrender&&winWidget) == blur-em-radius.html blur-em-radius-ref.html
fuzzy-if(webrender,9-9,4780-4784) == blur-em-radius.html blur-em-radius-ref.html
== blur-invalid-radius.html blur-invalid-radius-ref.html
fuzzy-if(webrender,9-9,4780-4780) fails-if(webrender&&winWidget) == blur-rem-radius.html blur-rem-radius-ref.html
fuzzy-if(webrender,9-9,4780-4784) == blur-rem-radius.html blur-rem-radius-ref.html
== blur-zero-radius.html blur-zero-radius-ref.html
fuzzy-if(webrender,6-6,21308-21308) fails-if(webrender&&winWidget) == blur-zoomed-page.html blur-zoomed-page-ref.html
fuzzy-if(webrender,6-7,20420-21308) == blur-zoomed-page.html blur-zoomed-page-ref.html
== brightness.html brightness-ref.html
== brightness-darken.html brightness-darken-ref.html
== brightness-extreme.html brightness-extreme-ref.html
@ -26,9 +26,9 @@ fuzzy-if(webrender,6-6,21308-21308) fails-if(webrender&&winWidget) == blur-zoome
== contrast-percent.html contrast-percent-ref.html
== contrast-reduce.html contrast-reduce-ref.html
== contrast-zero.html contrast-zero-ref.html
fuzzy-if(webrender,9-9,2625-2625) fails-if(webrender&&winWidget) == drop-shadow.html drop-shadow-ref.html
fuzzy-if(webrender,9-9,2625-2625) fails-if(webrender&&winWidget) == drop-shadow-default-color.html drop-shadow-default-color-ref.html
fuzzy-if(webrender,9-9,2625-2625) fails-if(webrender&&winWidget) == drop-shadow-negative-offset.html drop-shadow-negative-offset-ref.html
fuzzy-if(webrender,9-9,2625-2628) == drop-shadow.html drop-shadow-ref.html
fuzzy-if(webrender,9-9,2625-2628) fails-if(webrender&&winWidget) == drop-shadow-default-color.html drop-shadow-default-color-ref.html
fuzzy-if(webrender,9-9,2625-2628) fails-if(webrender&&winWidget) == drop-shadow-negative-offset.html drop-shadow-negative-offset-ref.html
== filter-on-huge-bbox.html pass.svg
== filter-on-outer-svg.html pass.svg
fuzzy-if(webrender,1,10000) fuzzy-if(d2d,1,10000) == grayscale.html grayscale-ref.html

2
layout/reftests/svg/reftest.list
Просмотреть файл

@ -216,7 +216,7 @@ fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu)||skiaContent,1,800000) == fi
== foreignObject-ancestor-style-change-01.svg foreignObject-ancestor-style-change-01-ref.svg
== foreignObject-change-transform-01.svg pass.svg
== foreignObject-display-01.svg pass.svg
fuzzy-if(webrender,190,229) fails-if(webrender&&winWidget) == foreignObject-form-theme.svg foreignObject-form-theme-ref.html # Bug 1439980
fuzzy-if(webrender,190-255,229-1552) == foreignObject-form-theme.svg foreignObject-form-theme-ref.html # Bug 1439980
== foreignObject-img.html foreignObject-img-ref.html
== foreignObject-img-form-theme.html foreignObject-img-form-theme-ref.html
== foreignObject-move-repaint-01.svg pass.svg

34
layout/reftests/svg/text/reftest.list
Просмотреть файл

@ -1,14 +1,14 @@
fails-if(webrender&&winWidget) == simple.svg simple-ref.html
fuzzy-if(webrender&&winWidget,122-122,254-254) == simple.svg simple-ref.html
== simple-2.svg simple.svg
fails-if(webrender&&winWidget) == simple-underline.svg simple-underline-ref.html
fuzzy-if(webrender&&winWidget,122-122,254-254) == simple-underline.svg simple-underline-ref.html
== simple-underline-scaled.svg simple-underline-scaled-ref.svg
fails-if(webrender&&winWidget) == simple-anchor-end-bidi.svg simple-anchor-end-bidi-ref.html
fails-if(webrender&&winWidget) == simple-anchor-end-rtl.svg simple-anchor-end-rtl-ref.html
fails-if(webrender&&winWidget) == simple-anchor-end.svg simple-anchor-end-ref.html
fuzzy-if(skiaContent&&dwrite,104,131) fails-if(webrender&&winWidget) == simple-anchor-middle-bidi.svg simple-anchor-middle-bidi-ref.html
fails-if(webrender&&winWidget) == simple-anchor-middle-rtl.svg simple-anchor-middle-rtl-ref.html
fuzzy-if(skiaContent,111,81) fails-if(webrender&&winWidget) == simple-anchor-middle.svg simple-anchor-middle-ref.html
fails-if(webrender&&winWidget) == simple-bidi.svg simple-bidi-ref.html
fuzzy-if(webrender&&winWidget,166-166,318-318) == simple-anchor-end-bidi.svg simple-anchor-end-bidi-ref.html
fuzzy-if(webrender&&winWidget,132-132,204-204) == simple-anchor-end-rtl.svg simple-anchor-end-rtl-ref.html
fuzzy-if(webrender&&winWidget,122-122,250-250) == simple-anchor-end.svg simple-anchor-end-ref.html
fuzzy-if(skiaContent&&dwrite,104,131) fuzzy-if(webrender&&winWidget,194-194,319-319) == simple-anchor-middle-bidi.svg simple-anchor-middle-bidi-ref.html
fuzzy-if(webrender&&winWidget,132-132,207-207) == simple-anchor-middle-rtl.svg simple-anchor-middle-rtl-ref.html
fuzzy-if(skiaContent,111,81) fuzzy-if(webrender&&winWidget,122-122,254-254) == simple-anchor-middle.svg simple-anchor-middle-ref.html
fuzzy-if(webrender&&winWidget,132-132,319-319) == simple-bidi.svg simple-bidi-ref.html
== simple-bidi-2.svg simple-bidi.svg
== simple-dx.svg simple.svg
@ -25,12 +25,12 @@ fails-if(webrender&&winWidget) == simple-bidi.svg simple-bidi-ref.html
== simple-dx-rtl-2.svg simple-dx-rtl-2-ref.svg
== simple-fill-color-dynamic.svg simple-fill-color-dynamic-ref.svg
fails-if(webrender&&winWidget) == simple-fill-color.svg simple-fill-color-ref.html
fuzzy-if(webrender&&winWidget,125-125,254-254) == simple-fill-color.svg simple-fill-color-ref.html
== simple-fill-gradient.svg simple-fill-gradient-ref.svg
== simple-fill-none.svg simple.svg
== simple-pointer-events.svg simple.svg
fails-if(webrender&&winWidget) == simple-multiple-dx.svg simple-multiple-dx-ref.html
fuzzy-if(webrender&&winWidget,122-122,254-254) == simple-multiple-dx.svg simple-multiple-dx-ref.html
== simple-multiple-dx-2.svg simple-multiple-dx.svg
== simple-multiple-dx-anchor-end-bidi.svg simple-multiple-dx-anchor-end-bidi-ref.svg
== simple-multiple-dx-anchor-middle-bidi.svg simple-multiple-dx-anchor-middle-bidi-ref.svg
@ -43,7 +43,7 @@ fuzzy-if(skiaContent,1,2) == simple-multiple-dx-anchor-middle-rtl.svg simple-mul
== simple-multiple-dx-rtl.svg simple-multiple-dx-rtl-ref.svg
== simple-multiple-dx-rtl-2.svg simple-multiple-dx-rtl.svg
fails-if(webrender&&winWidget) == simple-rtl.svg simple-rtl-ref.html
fuzzy-if(webrender&&winWidget,132-132,206-206) == simple-rtl.svg simple-rtl-ref.html
== simple-rtl-2.svg simple-rtl.svg
== simple-transform-rotate.svg simple-transform-rotate-ref.svg
@ -196,10 +196,10 @@ needs-focus == deselectAll.svg deselectAll-ref.svg
fuzzy-if(skiaContent,1,250) needs-focus == selectSubString.svg selectSubString-ref.svg
fuzzy-if(skiaContent,1,600) needs-focus == selectSubString-2.svg selectSubString-2-ref.svg
fuzzy-if(skiaContent,1,250) needs-focus == selectSubString-3.svg selectSubString-3-ref.svg
fuzzy-if(webrender,1-1,237-237) needs-focus fails-if(webrender&&winWidget) == simple-selection.svg simple-selection-ref.html
fuzzy-if(skiaContent,1,100) fuzzy-if(webrender,1-1,575-575) needs-focus fails-if(webrender&&winWidget) == simple-bidi-selection.svg simple-bidi-selection-ref.html
fuzzy-if(skiaContent,1,50) fuzzy-if(webrender,1-1,237-237) needs-focus fails-if(webrender&&winWidget) == simple-fill-color-selection.svg simple-fill-color-selection-ref.html
fuzzy-if(skiaContent,1,150) fuzzy-if(webrender,1-1,222-222) needs-focus fails-if(webrender&&winWidget) == simple-underline-selection.svg simple-underline-selection-ref.html
fuzzy-if(skiaContent,1,300) fuzzy-if(webrender,1-1,934-934) needs-focus fails-if(webrender&&winWidget) == multiple-text-selection.svg multiple-text-selection-ref.html
fuzzy-if(webrender,1-1,237-237) needs-focus fuzzy-if(webrender&&winWidget,148-148,254-254) == simple-selection.svg simple-selection-ref.html
fuzzy-if(skiaContent,1,100) fuzzy-if(webrender,1-1,575-575) needs-focus fuzzy-if(webrender&&winWidget,148-148,318-318) == simple-bidi-selection.svg simple-bidi-selection-ref.html
fuzzy-if(skiaContent,1,50) fuzzy-if(webrender,1-1,237-237) needs-focus fuzzy-if(webrender&&winWidget,148-148,254-254) == simple-fill-color-selection.svg simple-fill-color-selection-ref.html
fuzzy-if(skiaContent,1,150) fuzzy-if(webrender,1-1,222-222) needs-focus fuzzy-if(webrender&&winWidget,148-148,254-254) == simple-underline-selection.svg simple-underline-selection-ref.html
fuzzy-if(skiaContent,1,300) fuzzy-if(webrender,1-1,934-934) needs-focus fuzzy-if(webrender&&winWidget,152-152,494-494) == multiple-text-selection.svg multiple-text-selection-ref.html
needs-focus == multiple-chunks-selection.svg multiple-chunks-selection-ref.svg
fuzzy-if(skiaContent,1,200) needs-focus == textpath-selection.svg textpath-selection-ref.svg

2
layout/reftests/text-overflow/reftest.list
Просмотреть файл

@ -5,7 +5,7 @@ fuzzy-if(Android,16,244) == marker-basic.html marker-basic-ref.html # Bug 11282
skip-if(Android) == bidi-simple.html bidi-simple-ref.html # Fails on Android due to anti-aliasing
skip-if(!gtkWidget) fuzzy-if(gtkWidget,2,289) == bidi-simple-scrolled.html bidi-simple-scrolled-ref.html # Fails on Windows and OSX due to anti-aliasing
fuzzy-if(Android,24,4000) fuzzy-if(cocoaWidget,1,40) fuzzy-if(asyncPan&&!layersGPUAccelerated,149,1836) == scroll-rounding.html scroll-rounding-ref.html # bug 760264
fuzzy(2,453) fuzzy-if(skiaContent,9,2100) fails-if(gtkWidget) fails-if(webrender&&winWidget) == anonymous-block.html anonymous-block-ref.html # gtkWidget:bug 1309103
fuzzy(2,453) fuzzy-if(skiaContent,9,2100) fails-if(gtkWidget) fuzzy-if(webrender&&winWidget,50-50,499-499) == anonymous-block.html anonymous-block-ref.html # gtkWidget:bug 1309103
== false-marker-overlap.html false-marker-overlap-ref.html
== visibility-hidden.html visibility-hidden-ref.html
fuzzy-if(asyncPan&&!layersGPUAccelerated,102,1724) fuzzy-if(gtkWidget,10,8) == block-padding.html block-padding-ref.html

8
layout/reftests/text-shadow/reftest.list
Просмотреть файл

@ -1,10 +1,10 @@
== 723669.html 723669-ref.html
fails-if(webrender&&winWidget) == basic.xul basic-ref.xul
random-if(Android) fails-if(webrender&&winWidget) == basic-negcoord.xul basic-negcoord-ref.xul
fuzzy-if(webrender&&winWidget,1-1,7-7) == basic.xul basic-ref.xul
random-if(Android) fuzzy-if(webrender&&winWidget,1-1,6-6) == basic-negcoord.xul basic-negcoord-ref.xul
!= blur.xul blur-notref.xul
fails-if(webrender&&winWidget) == color-inherit.xul color-inherit-ref.xul
fails-if(webrender&&winWidget) == multiple-noblur.xul multiple-noblur-ref.xul
fuzzy-if(webrender&&winWidget,1-1,6-6) == color-inherit.xul color-inherit-ref.xul
fuzzy-if(webrender&&winWidget,1-1,44-44) == multiple-noblur.xul multiple-noblur-ref.xul
== blur-opacity.html blur-opacity-ref.html
== basic.html basic-ref.html

2
layout/reftests/text-svgglyphs/reftest.list
Просмотреть файл

@ -5,7 +5,7 @@ pref(gfx.font_rendering.opentype_svg.enabled,false) != svg-glyph-positioning.s
pref(gfx.font_rendering.opentype_svg.enabled,true) fuzzy-if(skiaContent,2,350) == svg-glyph-positioning.svg svg-glyph-positioning-ref.svg
pref(gfx.font_rendering.opentype_svg.enabled,true) == svg-glyph-html.html svg-glyph-html-ref.svg
pref(gfx.font_rendering.opentype_svg.enabled,true) == svg-glyph-direct.svg svg-glyph-direct-ref.svg
pref(gfx.font_rendering.opentype_svg.enabled,true) fails-if(webrender&&winWidget) == svg-glyph-invalid.html svg-glyph-invalid-ref.html
pref(gfx.font_rendering.opentype_svg.enabled,true) fuzzy-if(webrender&&winWidget,138-138,2461-2461) == svg-glyph-invalid.html svg-glyph-invalid-ref.html
pref(gfx.font_rendering.opentype_svg.enabled,true) == svg-glyph-objectfill-solid.svg svg-glyph-objectfill-solid-ref.svg
pref(gfx.font_rendering.opentype_svg.enabled,true) fuzzy-if(skiaContent,2,200) == svg-glyph-objectstroke-solid.svg svg-glyph-objectstroke-solid-ref.svg
pref(gfx.font_rendering.opentype_svg.enabled,true) fuzzy(1,7) fuzzy-if(gtkWidget&&/^Linux\x20x86_64/.test(http.oscpu),1,79) fuzzy-if(skiaContent,1,300) == svg-glyph-objectgradient.svg svg-glyph-objectgradient-ref.svg # see bug 871961#c5

4
layout/reftests/transform-3d/reftest.list
Просмотреть файл

@ -80,8 +80,8 @@ fuzzy(1,10000) == opacity-preserve3d-3.html opacity-preserve3d-3-ref.html
fuzzy(1,10000) == opacity-preserve3d-4.html opacity-preserve3d-4-ref.html
== opacity-preserve3d-5.html opacity-preserve3d-5-ref.html
== snap-perspective-1.html snap-perspective-1-ref.html
fails-if(webrender&&winWidget) == mask-layer-1.html mask-layer-ref.html
fails-if(webrender&&winWidget) == mask-layer-2.html mask-layer-ref.html
fuzzy-if(webrender&&winWidget,1-1,16-16) == mask-layer-1.html mask-layer-ref.html
fuzzy-if(webrender&&winWidget,1-1,16-16) == mask-layer-2.html mask-layer-ref.html
fails-if(webrender) == mask-layer-3.html mask-layer-ref.html
== split-intersect1.html split-intersect1-ref.html
fuzzy(255,150) == split-intersect2.html split-intersect2-ref.html

6
layout/reftests/w3c-css/failures.list
Просмотреть файл

@ -92,12 +92,12 @@ fuzzy-if(OSX,255,200) css-writing-modes/box-offsets-rel-pos-vlr-005.xht
fuzzy-if(OSX,255,200) css-writing-modes/box-offsets-rel-pos-vrl-004.xht
fuzzy-if(OSX||winWidget,93,300) css-writing-modes/caption-side-v??-00?.xht
fuzzy-if(OSX||winWidget,215,780) css-writing-modes/central-baseline-alignment-00?.xht
fuzzy-if(OSX||winWidget,75,404) fails-if(webrender&&winWidget) css-writing-modes/direction-v??-00?.xht
fuzzy-if(OSX||winWidget,75,404) fuzzy-if(webrender&&winWidget,92-92,300-300) css-writing-modes/direction-v??-00?.xht
fuzzy-if(OSX||winWidget,135,902) css-writing-modes/float-contiguous-v??-01?.xht
fuzzy-if(OSX||winWidget,93,300) css-writing-modes/float-shrink-to-fit-vlr-009.xht
fuzzy-if(OSX||winWidget,93,300) css-writing-modes/float-shrink-to-fit-vrl-008.xht
fuzzy-if(OSX||winWidget,93,300) css-writing-modes/float-v??-0??.xht
fuzzy-if(OSX||winWidget,62,404) fails-if(webrender&&winWidget) css-writing-modes/height-width-inline-non-replaced-v??-00?.xht
fuzzy-if(OSX||winWidget,62,404) fuzzy-if(webrender&&winWidget,92-92,100-100) css-writing-modes/height-width-inline-non-replaced-v??-00?.xht
fuzzy-if(OSX||winWidget,218,621) css-writing-modes/inline-block-alignment-orthogonal-v??-00?.xht
fuzzy-if(OSX||winWidget,135,1080) css-writing-modes/inline-block-alignment-slr-009.xht
fuzzy-if(OSX||winWidget,111,960) css-writing-modes/inline-block-alignment-srl-008.xht
@ -106,7 +106,7 @@ fuzzy-if(OSX||winWidget,110,1200) css-writing-modes/row-progression-???-0??.xht
fuzzy-if(OSX||winWidget,110,1200) css-writing-modes/table-column-order-00?.xht
fuzzy-if(winWidget,110,1200) css-writing-modes/table-column-order-slr-007.xht
fuzzy-if(OSX||winWidget,110,1200) css-writing-modes/table-column-order-srl-006.xht
fuzzy-if(OSX||winWidget,75,404) fails-if(webrender&&winWidget) css-writing-modes/text-align-v??-0??.xht
fuzzy-if(OSX||winWidget,75,404) fuzzy-if(webrender&&winWidget,92-92,300-300) css-writing-modes/text-align-v??-0??.xht
fuzzy-if(OSX||winWidget,215,780) css-writing-modes/text-baseline-???-00?.xht
fuzzy-if(OSX,15,16) css-writing-modes/text-combine-upright-decorations-001.html
fuzzy-if(OSX||winWidget,255,480) css-writing-modes/text-indent-v??-0??.xht

48
layout/reftests/w3c-css/received/reftest.list
Просмотреть файл

@ -714,10 +714,10 @@ fails == css-writing-modes/contiguous-floated-table-vrl-006.xht reference/ref-fi
fails == css-writing-modes/contiguous-floated-table-vrl-008.xht reference/ref-filled-green-100px-square.xht
== css-writing-modes/different-block-flow-dir-001.xht reference/ref-filled-green-100px-square.xht
== css-writing-modes/different-block-flow-dir-002.xht reference/ref-filled-green-100px-square.xht
fuzzy-if(OSX||winWidget,75,404) fails-if(webrender&&winWidget) == css-writing-modes/direction-vlr-003.xht css-writing-modes/direction-vlr-003-ref.xht
fuzzy-if(OSX||winWidget,75,404) fails-if(webrender&&winWidget) == css-writing-modes/direction-vlr-005.xht reference/ref-filled-green-100px-square.xht
fuzzy-if(OSX||winWidget,75,404) fails-if(webrender&&winWidget) == css-writing-modes/direction-vrl-002.xht css-writing-modes/direction-vrl-002-ref.xht
fuzzy-if(OSX||winWidget,75,404) fails-if(webrender&&winWidget) == css-writing-modes/direction-vrl-004.xht css-writing-modes/direction-vrl-004-ref.xht
fuzzy-if(OSX||winWidget,75,404) fuzzy-if(webrender&&winWidget,92-92,300-300) == css-writing-modes/direction-vlr-003.xht css-writing-modes/direction-vlr-003-ref.xht
fuzzy-if(OSX||winWidget,75,404) fuzzy-if(webrender&&winWidget,92-92,300-300) == css-writing-modes/direction-vlr-005.xht reference/ref-filled-green-100px-square.xht
fuzzy-if(OSX||winWidget,75,404) fuzzy-if(webrender&&winWidget,92-92,300-300) == css-writing-modes/direction-vrl-002.xht css-writing-modes/direction-vrl-002-ref.xht
fuzzy-if(OSX||winWidget,75,404) fuzzy-if(webrender&&winWidget,92-92,300-300) == css-writing-modes/direction-vrl-004.xht css-writing-modes/direction-vrl-004-ref.xht
== css-writing-modes/flexbox_align-items-stretch-writing-modes.html css-writing-modes/flexbox_align-items-stretch-writing-modes-ref.html
== css-writing-modes/float-clear-vlr-003.xht reference/ref-filled-green-100px-square.xht
== css-writing-modes/float-clear-vlr-005.xht reference/ref-filled-green-100px-square.xht
@ -774,8 +774,8 @@ fuzzy-if(OSX||winWidget,93,300) == css-writing-modes/float-vrl-012.xht reference
!= css-writing-modes/full-width-002.html css-writing-modes/reference/full-width-002-horizontal-notref.html
skip != css-writing-modes/full-width-003.html css-writing-modes/reference/full-width-002-notcu-notref.html
skip != css-writing-modes/full-width-003.html css-writing-modes/reference/full-width-002-horizontal-notref.html
fuzzy-if(OSX||winWidget,62,404) fails-if(webrender&&winWidget) == css-writing-modes/height-width-inline-non-replaced-vlr-003.xht reference/ref-filled-green-100px-square.xht
fuzzy-if(OSX||winWidget,62,404) fails-if(webrender&&winWidget) == css-writing-modes/height-width-inline-non-replaced-vrl-002.xht css-writing-modes/abs-pos-non-replaced-icb-vrl-008-ref.xht
fuzzy-if(OSX||winWidget,62,404) fuzzy-if(webrender&&winWidget,92-92,100-100) == css-writing-modes/height-width-inline-non-replaced-vlr-003.xht reference/ref-filled-green-100px-square.xht
fuzzy-if(OSX||winWidget,62,404) fuzzy-if(webrender&&winWidget,92-92,100-100) == css-writing-modes/height-width-inline-non-replaced-vrl-002.xht css-writing-modes/abs-pos-non-replaced-icb-vrl-008-ref.xht
== css-writing-modes/horizontal-rule-vlr-003.xht css-writing-modes/horizontal-rule-vlr-003-ref.xht
== css-writing-modes/horizontal-rule-vlr-005.xht css-writing-modes/horizontal-rule-vrl-004-ref.xht
== css-writing-modes/horizontal-rule-vrl-002.xht css-writing-modes/horizontal-rule-vrl-002-ref.xht
@ -1048,24 +1048,24 @@ fails == css-writing-modes/table-progression-vlr-004.html css-writing-modes/tabl
fails == css-writing-modes/table-progression-vrl-002.html css-writing-modes/table-progression-002-ref.html
fails == css-writing-modes/table-progression-vrl-003.html css-writing-modes/table-progression-001-ref.html
fails == css-writing-modes/table-progression-vrl-004.html css-writing-modes/table-progression-002-ref.html
fuzzy-if(OSX||winWidget,75,404) fails-if(webrender&&winWidget) == css-writing-modes/text-align-vlr-003.xht reference/ref-filled-green-100px-square.xht
fuzzy-if(OSX||winWidget,75,404) fails-if(webrender&&winWidget) == css-writing-modes/text-align-vlr-005.xht reference/ref-filled-green-100px-square.xht
fuzzy-if(OSX||winWidget,75,404) fails-if(webrender&&winWidget) == css-writing-modes/text-align-vlr-007.xht reference/ref-filled-green-100px-square.xht
fuzzy-if(OSX||winWidget,75,404) fails-if(webrender&&winWidget) == css-writing-modes/text-align-vlr-009.xht css-writing-modes/text-align-vlr-009-ref.xht
fuzzy-if(OSX||winWidget,75,404) fails-if(webrender&&winWidget) == css-writing-modes/text-align-vlr-011.xht css-writing-modes/text-align-vlr-009-ref.xht
fuzzy-if(OSX||winWidget,75,404) fails-if(webrender&&winWidget) == css-writing-modes/text-align-vlr-013.xht css-writing-modes/text-align-vlr-009-ref.xht
fuzzy-if(OSX||winWidget,75,404) fails-if(webrender&&winWidget) == css-writing-modes/text-align-vlr-015.xht css-writing-modes/direction-vlr-003-ref.xht
fuzzy-if(OSX||winWidget,75,404) fails-if(webrender&&winWidget) == css-writing-modes/text-align-vlr-017.xht css-writing-modes/direction-vlr-003-ref.xht
fuzzy-if(OSX||winWidget,75,404) fails-if(webrender&&winWidget) == css-writing-modes/text-align-vlr-019.xht css-writing-modes/direction-vlr-003-ref.xht
fuzzy-if(OSX||winWidget,75,404) fails-if(webrender&&winWidget) == css-writing-modes/text-align-vrl-002.xht css-writing-modes/direction-vrl-004-ref.xht
fuzzy-if(OSX||winWidget,75,404) fails-if(webrender&&winWidget) == css-writing-modes/text-align-vrl-004.xht css-writing-modes/direction-vrl-004-ref.xht
fuzzy-if(OSX||winWidget,75,404) fails-if(webrender&&winWidget) == css-writing-modes/text-align-vrl-006.xht css-writing-modes/direction-vrl-004-ref.xht
fuzzy-if(OSX||winWidget,75,404) fails-if(webrender&&winWidget) == css-writing-modes/text-align-vrl-008.xht css-writing-modes/text-align-vrl-008-ref.xht
fuzzy-if(OSX||winWidget,75,404) fails-if(webrender&&winWidget) == css-writing-modes/text-align-vrl-010.xht css-writing-modes/text-align-vrl-008-ref.xht
fuzzy-if(OSX||winWidget,75,404) fails-if(webrender&&winWidget) == css-writing-modes/text-align-vrl-012.xht css-writing-modes/text-align-vrl-008-ref.xht
fuzzy-if(OSX||winWidget,75,404) fails-if(webrender&&winWidget) == css-writing-modes/text-align-vrl-014.xht css-writing-modes/direction-vrl-002-ref.xht
fuzzy-if(OSX||winWidget,75,404) fails-if(webrender&&winWidget) == css-writing-modes/text-align-vrl-016.xht css-writing-modes/direction-vrl-002-ref.xht
fuzzy-if(OSX||winWidget,75,404) fails-if(webrender&&winWidget) == css-writing-modes/text-align-vrl-018.xht css-writing-modes/direction-vrl-002-ref.xht
fuzzy-if(OSX||winWidget,75,404) fuzzy-if(webrender&&winWidget,92-92,300-300) == css-writing-modes/text-align-vlr-003.xht reference/ref-filled-green-100px-square.xht
fuzzy-if(OSX||winWidget,75,404) fuzzy-if(webrender&&winWidget,92-92,300-300) == css-writing-modes/text-align-vlr-005.xht reference/ref-filled-green-100px-square.xht
fuzzy-if(OSX||winWidget,75,404) fuzzy-if(webrender&&winWidget,92-92,300-300) == css-writing-modes/text-align-vlr-007.xht reference/ref-filled-green-100px-square.xht
fuzzy-if(OSX||winWidget,75,404) fuzzy-if(webrender&&winWidget,92-92,300-300) == css-writing-modes/text-align-vlr-009.xht css-writing-modes/text-align-vlr-009-ref.xht
fuzzy-if(OSX||winWidget,75,404) fuzzy-if(webrender&&winWidget,92-92,300-300) == css-writing-modes/text-align-vlr-011.xht css-writing-modes/text-align-vlr-009-ref.xht
fuzzy-if(OSX||winWidget,75,404) fuzzy-if(webrender&&winWidget,92-92,300-300) == css-writing-modes/text-align-vlr-013.xht css-writing-modes/text-align-vlr-009-ref.xht
fuzzy-if(OSX||winWidget,75,404) fuzzy-if(webrender&&winWidget,92-92,300-300) == css-writing-modes/text-align-vlr-015.xht css-writing-modes/direction-vlr-003-ref.xht
fuzzy-if(OSX||winWidget,75,404) fuzzy-if(webrender&&winWidget,92-92,300-300) == css-writing-modes/text-align-vlr-017.xht css-writing-modes/direction-vlr-003-ref.xht
fuzzy-if(OSX||winWidget,75,404) fuzzy-if(webrender&&winWidget,92-92,300-300) == css-writing-modes/text-align-vlr-019.xht css-writing-modes/direction-vlr-003-ref.xht
fuzzy-if(OSX||winWidget,75,404) fuzzy-if(webrender&&winWidget,92-92,300-300) == css-writing-modes/text-align-vrl-002.xht css-writing-modes/direction-vrl-004-ref.xht
fuzzy-if(OSX||winWidget,75,404) fuzzy-if(webrender&&winWidget,92-92,300-300) == css-writing-modes/text-align-vrl-004.xht css-writing-modes/direction-vrl-004-ref.xht
fuzzy-if(OSX||winWidget,75,404) fuzzy-if(webrender&&winWidget,92-92,300-300) == css-writing-modes/text-align-vrl-006.xht css-writing-modes/direction-vrl-004-ref.xht
fuzzy-if(OSX||winWidget,75,404) fuzzy-if(webrender&&winWidget,92-92,300-300) == css-writing-modes/text-align-vrl-008.xht css-writing-modes/text-align-vrl-008-ref.xht
fuzzy-if(OSX||winWidget,75,404) fuzzy-if(webrender&&winWidget,92-92,300-300) == css-writing-modes/text-align-vrl-010.xht css-writing-modes/text-align-vrl-008-ref.xht
fuzzy-if(OSX||winWidget,75,404) fuzzy-if(webrender&&winWidget,92-92,300-300) == css-writing-modes/text-align-vrl-012.xht css-writing-modes/text-align-vrl-008-ref.xht
fuzzy-if(OSX||winWidget,75,404) fuzzy-if(webrender&&winWidget,92-92,300-300) == css-writing-modes/text-align-vrl-014.xht css-writing-modes/direction-vrl-002-ref.xht
fuzzy-if(OSX||winWidget,75,404) fuzzy-if(webrender&&winWidget,92-92,300-300) == css-writing-modes/text-align-vrl-016.xht css-writing-modes/direction-vrl-002-ref.xht
fuzzy-if(OSX||winWidget,75,404) fuzzy-if(webrender&&winWidget,92-92,300-300) == css-writing-modes/text-align-vrl-018.xht css-writing-modes/direction-vrl-002-ref.xht
fuzzy-if(OSX||winWidget,215,780) == css-writing-modes/text-baseline-slr-009.xht css-writing-modes/text-baseline-slr-009-ref.xht
fuzzy-if(OSX||winWidget,215,780) == css-writing-modes/text-baseline-srl-008.xht css-writing-modes/text-baseline-vrl-006-ref.xht
fuzzy-if(OSX||winWidget,215,780) == css-writing-modes/text-baseline-vlr-003.xht css-writing-modes/text-baseline-vrl-002-ref.xht

Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше