summaryrefslogtreecommitdiffstats
path: root/layout
diff options
context:
space:
mode:
Diffstat (limited to 'layout')
-rw-r--r--layout/base/AccessibleCaret.cpp1
-rw-r--r--layout/base/AccessibleCaret.h1
-rw-r--r--layout/base/AccessibleCaretEventHub.cpp1
-rw-r--r--layout/base/AccessibleCaretEventHub.h1
-rw-r--r--layout/base/AccessibleCaretLogger.h1
-rw-r--r--layout/base/AccessibleCaretManager.cpp13
-rw-r--r--layout/base/AccessibleCaretManager.h1
-rw-r--r--layout/base/ArenaRefPtr.h1
-rw-r--r--layout/base/ArenaRefPtrInlines.h1
-rw-r--r--layout/base/FrameLayerBuilder.cpp4
-rw-r--r--layout/base/LayoutConstants.h1
-rw-r--r--layout/base/PositionedEventTargeting.cpp2
-rw-r--r--layout/base/RestyleManager.cpp52
-rw-r--r--layout/base/RestyleManager.h4
-rw-r--r--layout/base/RestyleManagerBase.cpp19
-rw-r--r--layout/base/RestyleManagerBase.h1
-rw-r--r--layout/base/RestyleManagerHandle.h5
-rw-r--r--layout/base/RestyleManagerHandleInlines.h3
-rw-r--r--layout/base/ScrollStyles.cpp (renamed from layout/base/ScrollbarStyles.cpp)6
-rw-r--r--layout/base/ScrollStyles.h (renamed from layout/base/ScrollbarStyles.h)18
-rw-r--r--layout/base/ServoRestyleManager.cpp19
-rw-r--r--layout/base/ServoRestyleManager.h4
-rw-r--r--layout/base/StaticPresData.cpp1
-rw-r--r--layout/base/StaticPresData.h1
-rw-r--r--layout/base/TouchManager.cpp1
-rw-r--r--layout/base/TouchManager.h1
-rw-r--r--layout/base/UnitTransforms.h1
-rw-r--r--layout/base/Units.h1
-rw-r--r--layout/base/ZoomConstraintsClient.cpp2
-rw-r--r--layout/base/crashtests/1261351-iframe.html33
-rw-r--r--layout/base/crashtests/1404789-1.html16
-rw-r--r--layout/base/crashtests/1404789-2.html2
-rw-r--r--layout/base/crashtests/1419762.html15
-rw-r--r--layout/base/crashtests/crashtests.list9
-rw-r--r--layout/base/gtest/TestAccessibleCaretEventHub.cpp1
-rw-r--r--layout/base/gtest/TestAccessibleCaretManager.cpp1
-rw-r--r--layout/base/gtest/moz.build1
-rw-r--r--layout/base/moz.build10
-rw-r--r--layout/base/nsArenaMemoryStats.h1
-rw-r--r--layout/base/nsCSSFrameConstructor.cpp1600
-rw-r--r--layout/base/nsCSSFrameConstructor.h290
-rw-r--r--layout/base/nsCaret.cpp1
-rw-r--r--layout/base/nsCaret.h1
-rw-r--r--layout/base/nsChangeHint.h4
-rw-r--r--layout/base/nsDisplayItemTypes.h1
-rw-r--r--layout/base/nsDisplayList.cpp1
-rw-r--r--layout/base/nsDisplayList.h1
-rw-r--r--layout/base/nsDocumentViewer.cpp3
-rw-r--r--layout/base/nsFrameManager.cpp419
-rw-r--r--layout/base/nsFrameManager.h44
-rw-r--r--layout/base/nsFrameManagerBase.h1
-rw-r--r--layout/base/nsFrameTraversal.cpp19
-rw-r--r--layout/base/nsIPresShell.h30
-rw-r--r--layout/base/nsLayoutUtils.cpp142
-rw-r--r--layout/base/nsLayoutUtils.h61
-rw-r--r--layout/base/nsPresArena.cpp1
-rw-r--r--layout/base/nsPresArena.h1
-rw-r--r--layout/base/nsPresArenaObjectList.h1
-rw-r--r--layout/base/nsPresContext.cpp28
-rw-r--r--layout/base/nsPresContext.h18
-rw-r--r--layout/base/nsPresShell.cpp119
-rw-r--r--layout/base/nsPresShell.h11
-rw-r--r--layout/base/nsRefreshDriver.cpp1
-rw-r--r--layout/base/nsRefreshDriver.h1
-rw-r--r--layout/base/nsStyleSheetService.cpp1
-rw-r--r--layout/base/nsStyleSheetService.h1
-rw-r--r--layout/base/tests/chrome/chrome.ini1
-rw-r--r--layout/base/tests/mochitest.ini12
-rw-r--r--layout/base/tests/selection-utils.js1
-rw-r--r--layout/base/tests/test_reftests_with_caret.html23
-rw-r--r--layout/build/moz.build6
-rw-r--r--layout/build/nsContentDLF.cpp1
-rw-r--r--layout/build/nsLayoutModule.cpp16
-rw-r--r--layout/build/nsLayoutStatics.cpp5
-rw-r--r--layout/forms/moz.build1
-rw-r--r--layout/forms/nsColorControlFrame.cpp7
-rw-r--r--layout/forms/nsComboboxControlFrame.cpp16
-rw-r--r--layout/forms/nsComboboxControlFrame.h11
-rw-r--r--layout/forms/nsGfxButtonControlFrame.cpp24
-rw-r--r--layout/forms/nsGfxButtonControlFrame.h1
-rw-r--r--layout/forms/nsListControlFrame.cpp10
-rw-r--r--layout/forms/nsListControlFrame.h2
-rw-r--r--layout/forms/nsMeterFrame.cpp9
-rw-r--r--layout/forms/nsNumberControlFrame.cpp33
-rw-r--r--layout/forms/nsNumberControlFrame.h3
-rw-r--r--layout/forms/nsProgressFrame.cpp7
-rw-r--r--layout/forms/nsRangeFrame.cpp8
-rw-r--r--layout/forms/nsTextControlFrame.cpp33
-rw-r--r--layout/forms/test/chrome.ini1
-rw-r--r--layout/forms/test/mochitest.ini20
-rw-r--r--layout/forms/test/test_bug935876.html4
-rw-r--r--layout/generic/AspectRatio.h1
-rw-r--r--layout/generic/DetailsFrame.cpp9
-rw-r--r--layout/generic/DetailsFrame.h7
-rw-r--r--layout/generic/FrameChildList.cpp1
-rw-r--r--layout/generic/FrameChildList.h1
-rw-r--r--layout/generic/JustificationUtils.h1
-rw-r--r--layout/generic/ReflowInput.cpp3
-rw-r--r--layout/generic/ReflowOutput.cpp1
-rw-r--r--layout/generic/RubyUtils.cpp1
-rw-r--r--layout/generic/RubyUtils.h1
-rw-r--r--layout/generic/ScrollVelocityQueue.cpp1
-rw-r--r--layout/generic/ScrollVelocityQueue.h1
-rw-r--r--layout/generic/Selection.h5
-rw-r--r--layout/generic/StickyScrollContainer.cpp1
-rw-r--r--layout/generic/StickyScrollContainer.h1
-rw-r--r--layout/generic/TextOverflow.cpp5
-rw-r--r--layout/generic/TextOverflow.h1
-rw-r--r--layout/generic/crashtests/1381134-2.html45
-rw-r--r--layout/generic/crashtests/1381134.html45
-rw-r--r--layout/generic/crashtests/crashtests.list36
-rw-r--r--layout/generic/moz.build1
-rw-r--r--layout/generic/nsAbsoluteContainingBlock.cpp25
-rw-r--r--layout/generic/nsAtomicContainerFrame.h1
-rw-r--r--layout/generic/nsBlockFrame.cpp15
-rw-r--r--layout/generic/nsContainerFrame.cpp10
-rw-r--r--layout/generic/nsDirection.h1
-rw-r--r--layout/generic/nsFirstLetterFrame.cpp3
-rw-r--r--layout/generic/nsFlexContainerFrame.cpp1
-rw-r--r--layout/generic/nsFlexContainerFrame.h1
-rw-r--r--layout/generic/nsFontInflationData.cpp1
-rw-r--r--layout/generic/nsFontInflationData.h1
-rw-r--r--layout/generic/nsFrame.cpp63
-rw-r--r--layout/generic/nsGfxScrollFrame.cpp176
-rw-r--r--layout/generic/nsGfxScrollFrame.h10
-rw-r--r--layout/generic/nsGridContainerFrame.cpp1
-rw-r--r--layout/generic/nsGridContainerFrame.h1
-rw-r--r--layout/generic/nsHTMLParts.h3
-rw-r--r--layout/generic/nsIAnonymousContentCreator.h17
-rw-r--r--layout/generic/nsIFrame.h25
-rw-r--r--layout/generic/nsIFrameInlines.h14
-rw-r--r--layout/generic/nsIScrollableFrame.h4
-rw-r--r--layout/generic/nsImageFrame.cpp14
-rw-r--r--layout/generic/nsPlaceholderFrame.cpp5
-rw-r--r--layout/generic/nsPluginFrame.cpp121
-rw-r--r--layout/generic/nsRubyBaseContainerFrame.cpp1
-rw-r--r--layout/generic/nsRubyBaseContainerFrame.h1
-rw-r--r--layout/generic/nsRubyBaseFrame.cpp1
-rw-r--r--layout/generic/nsRubyBaseFrame.h1
-rw-r--r--layout/generic/nsRubyContentFrame.cpp1
-rw-r--r--layout/generic/nsRubyContentFrame.h1
-rw-r--r--layout/generic/nsRubyFrame.cpp1
-rw-r--r--layout/generic/nsRubyFrame.h1
-rw-r--r--layout/generic/nsRubyTextContainerFrame.cpp1
-rw-r--r--layout/generic/nsRubyTextContainerFrame.h1
-rw-r--r--layout/generic/nsRubyTextFrame.cpp1
-rw-r--r--layout/generic/nsRubyTextFrame.h1
-rw-r--r--layout/generic/nsSelection.cpp104
-rw-r--r--layout/generic/nsTextFrame.cpp4
-rw-r--r--layout/generic/test/mochitest.ini1
-rw-r--r--layout/inspector/inDOMUtils.cpp42
-rw-r--r--layout/inspector/inDeepTreeWalker.cpp1
-rw-r--r--layout/inspector/moz.build1
-rw-r--r--layout/inspector/nsFontFaceList.cpp1
-rw-r--r--layout/inspector/tests/chrome/chrome.ini1
-rw-r--r--layout/inspector/tests/chrome/test_bug727834.css1
-rw-r--r--layout/inspector/tests/chrome/test_bug727834.xul1
-rw-r--r--layout/inspector/tests/test_bug522601.xhtml3
-rw-r--r--layout/ipc/moz.build1
-rw-r--r--layout/mathml/moz.build1
-rw-r--r--layout/mathml/tests/stretchy-and-large-operators.html1
-rw-r--r--layout/media/Makefile.in11
-rw-r--r--layout/media/moz.build18
-rw-r--r--layout/media/symbols.def.in678
-rw-r--r--layout/media/webrtc/moz.build1
-rw-r--r--layout/moz.build1
-rw-r--r--layout/printing/PrintTranslator.cpp1
-rw-r--r--layout/printing/PrintTranslator.h1
-rw-r--r--layout/printing/ipc/PRemotePrintJob.ipdl1
-rw-r--r--layout/printing/ipc/RemotePrintJobChild.cpp1
-rw-r--r--layout/printing/ipc/RemotePrintJobChild.h1
-rw-r--r--layout/printing/ipc/RemotePrintJobParent.cpp1
-rw-r--r--layout/printing/ipc/RemotePrintJobParent.h1
-rw-r--r--layout/printing/moz.build1
-rw-r--r--layout/printing/nsPrintEngine.cpp16
-rw-r--r--layout/reftests/abs-pos/reftest-stylo.list69
-rw-r--r--layout/reftests/abs-pos/reftest.list8
-rw-r--r--layout/reftests/async-scrolling/reftest-stylo.list59
-rw-r--r--layout/reftests/async-scrolling/reftest.list24
-rw-r--r--layout/reftests/backgrounds/background-referrer.sjs5
-rw-r--r--layout/reftests/backgrounds/gradient/reftest-stylo.list4
-rw-r--r--layout/reftests/backgrounds/reftest-stylo.list215
-rw-r--r--layout/reftests/backgrounds/reftest.list2
-rw-r--r--layout/reftests/backgrounds/vector/empty/reftest-stylo.list27
-rw-r--r--layout/reftests/backgrounds/vector/reftest-stylo.list256
-rw-r--r--layout/reftests/bidi/dirAuto/reftest-stylo.list120
-rw-r--r--layout/reftests/bidi/numeral/reftest-stylo.list121
-rw-r--r--layout/reftests/bidi/reftest-stylo.list183
-rw-r--r--layout/reftests/bidi/reftest.list6
-rw-r--r--layout/reftests/border-dotted/reftest-stylo.list13
-rw-r--r--layout/reftests/border-image/reftest-stylo.list95
-rw-r--r--layout/reftests/border-image/reftest.list4
-rw-r--r--layout/reftests/border-radius/reftest-stylo.list117
-rw-r--r--layout/reftests/border-radius/reftest.list30
-rw-r--r--layout/reftests/box-ordinal/reftest-stylo.list15
-rw-r--r--layout/reftests/box-properties/reftest-stylo.list37
-rw-r--r--layout/reftests/box-shadow/reftest-stylo.list57
-rw-r--r--layout/reftests/box-shadow/reftest.list4
-rw-r--r--layout/reftests/box-sizing/reftest-stylo.list17
-rw-r--r--layout/reftests/box/reftest-stylo.list14
-rw-r--r--layout/reftests/bugs/1066554-1.html20
-rw-r--r--layout/reftests/bugs/1133905-1-h-rtl.html10
-rw-r--r--layout/reftests/bugs/1133905-1-h.html9
-rw-r--r--layout/reftests/bugs/1133905-1-rtl.html9
-rw-r--r--layout/reftests/bugs/1133905-1-v-rtl.html10
-rw-r--r--layout/reftests/bugs/1133905-1-v.html9
-rw-r--r--layout/reftests/bugs/1133905-1-vh-rtl.html10
-rw-r--r--layout/reftests/bugs/1133905-1-vh.html9
-rw-r--r--layout/reftests/bugs/1133905-1.html8
-rw-r--r--layout/reftests/bugs/1133905-2-h-rtl.html10
-rw-r--r--layout/reftests/bugs/1133905-2-h.html9
-rw-r--r--layout/reftests/bugs/1133905-2-rtl.html9
-rw-r--r--layout/reftests/bugs/1133905-2-v-rtl.html10
-rw-r--r--layout/reftests/bugs/1133905-2-v.html9
-rw-r--r--layout/reftests/bugs/1133905-2-vh-rtl.html10
-rw-r--r--layout/reftests/bugs/1133905-2-vh.html9
-rw-r--r--layout/reftests/bugs/1133905-2.html8
-rw-r--r--layout/reftests/bugs/1133905-3-h-rtl.html10
-rw-r--r--layout/reftests/bugs/1133905-3-h.html9
-rw-r--r--layout/reftests/bugs/1133905-3-rtl.html9
-rw-r--r--layout/reftests/bugs/1133905-3-v-rtl.html10
-rw-r--r--layout/reftests/bugs/1133905-3-v.html9
-rw-r--r--layout/reftests/bugs/1133905-3-vh-rtl.html10
-rw-r--r--layout/reftests/bugs/1133905-3-vh.html9
-rw-r--r--layout/reftests/bugs/1133905-3.html8
-rw-r--r--layout/reftests/bugs/1133905-4-h-rtl.html10
-rw-r--r--layout/reftests/bugs/1133905-4-h.html9
-rw-r--r--layout/reftests/bugs/1133905-4-rtl.html9
-rw-r--r--layout/reftests/bugs/1133905-4-v-rtl.html10
-rw-r--r--layout/reftests/bugs/1133905-4-v.html9
-rw-r--r--layout/reftests/bugs/1133905-4-vh-rtl.html10
-rw-r--r--layout/reftests/bugs/1133905-4-vh.html9
-rw-r--r--layout/reftests/bugs/1133905-4.html8
-rw-r--r--layout/reftests/bugs/1133905-5-h-rtl.html10
-rw-r--r--layout/reftests/bugs/1133905-5-h.html9
-rw-r--r--layout/reftests/bugs/1133905-5-rtl.html9
-rw-r--r--layout/reftests/bugs/1133905-5-v-rtl.html10
-rw-r--r--layout/reftests/bugs/1133905-5-v.html9
-rw-r--r--layout/reftests/bugs/1133905-5-vh-rtl.html10
-rw-r--r--layout/reftests/bugs/1133905-5-vh.html9
-rw-r--r--layout/reftests/bugs/1133905-5.html8
-rw-r--r--layout/reftests/bugs/1133905-6-h-rtl.html10
-rw-r--r--layout/reftests/bugs/1133905-6-h.html9
-rw-r--r--layout/reftests/bugs/1133905-6-rtl.html9
-rw-r--r--layout/reftests/bugs/1133905-6-v-rtl.html10
-rw-r--r--layout/reftests/bugs/1133905-6-v.html9
-rw-r--r--layout/reftests/bugs/1133905-6-vh-rtl.html10
-rw-r--r--layout/reftests/bugs/1133905-6-vh.html9
-rw-r--r--layout/reftests/bugs/1133905-6.html8
-rw-r--r--layout/reftests/bugs/1133905-ref-h-rtl.html10
-rw-r--r--layout/reftests/bugs/1133905-ref-h.html9
-rw-r--r--layout/reftests/bugs/1133905-ref-rtl.html9
-rw-r--r--layout/reftests/bugs/1133905-ref-v-rtl.html10
-rw-r--r--layout/reftests/bugs/1133905-ref-v.html9
-rw-r--r--layout/reftests/bugs/1133905-ref-vh-rtl.html10
-rw-r--r--layout/reftests/bugs/1133905-ref-vh.html9
-rw-r--r--layout/reftests/bugs/1133905-ref.html8
-rw-r--r--layout/reftests/bugs/reftest-stylo.list2380
-rw-r--r--layout/reftests/bugs/reftest.list273
-rw-r--r--layout/reftests/canvas/reftest-stylo.list122
-rw-r--r--layout/reftests/canvas/reftest.list8
-rw-r--r--layout/reftests/columns/reftest-stylo.list44
-rw-r--r--layout/reftests/counter-style/reftest-stylo.list38
-rw-r--r--layout/reftests/counters/reftest-stylo.list85
-rw-r--r--layout/reftests/css-animations/reftest-stylo.list34
-rw-r--r--layout/reftests/css-blending/reftest-stylo.list101
-rw-r--r--layout/reftests/css-blending/reftest.list2
-rw-r--r--layout/reftests/css-break/reftest-stylo.list13
-rw-r--r--layout/reftests/css-break/reftest.list4
-rw-r--r--layout/reftests/css-calc/reftest-stylo.list3
-rw-r--r--layout/reftests/css-charset/reftest-stylo.list11
-rw-r--r--layout/reftests/css-default/reftest-stylo.list3
-rw-r--r--layout/reftests/css-default/submit-button/reftest-stylo.list12
-rw-r--r--layout/reftests/css-disabled/button/reftest-stylo.list14
-rw-r--r--layout/reftests/css-disabled/fieldset/reftest-stylo.list12
-rw-r--r--layout/reftests/css-disabled/input/reftest-stylo.list10
-rw-r--r--layout/reftests/css-disabled/label/reftest-stylo.list2
-rw-r--r--layout/reftests/css-disabled/object/reftest-stylo.list2
-rw-r--r--layout/reftests/css-disabled/output/reftest-stylo.list2
-rw-r--r--layout/reftests/css-disabled/reftest-stylo.list9
-rw-r--r--layout/reftests/css-disabled/select/reftest-stylo.list14
-rw-r--r--layout/reftests/css-disabled/select/reftest.list12
-rw-r--r--layout/reftests/css-disabled/textarea/reftest-stylo.list10
-rw-r--r--layout/reftests/css-display/display-contents-shadow-dom-1-ref.html2
-rw-r--r--layout/reftests/css-display/display-contents-shadow-dom-1.html77
-rw-r--r--layout/reftests/css-display/reftest-stylo.list37
-rw-r--r--layout/reftests/css-display/reftest.list14
-rw-r--r--layout/reftests/css-enabled/button/reftest-stylo.list14
-rw-r--r--layout/reftests/css-enabled/fieldset/reftest-stylo.list12
-rw-r--r--layout/reftests/css-enabled/input/reftest-stylo.list10
-rw-r--r--layout/reftests/css-enabled/label/reftest-stylo.list2
-rw-r--r--layout/reftests/css-enabled/object/reftest-stylo.list2
-rw-r--r--layout/reftests/css-enabled/optgroup/reftest-stylo.list2
-rw-r--r--layout/reftests/css-enabled/option/reftest-stylo.list2
-rw-r--r--layout/reftests/css-enabled/output/reftest-stylo.list2
-rw-r--r--layout/reftests/css-enabled/reftest-stylo.list11
-rw-r--r--layout/reftests/css-enabled/select/reftest-stylo.list14
-rw-r--r--layout/reftests/css-enabled/textarea/reftest-stylo.list10
-rw-r--r--layout/reftests/css-gradients/reftest-stylo.list169
-rw-r--r--layout/reftests/css-gradients/reftest.list60
-rw-r--r--layout/reftests/css-grid/reftest-stylo.list233
-rw-r--r--layout/reftests/css-grid/reftest.list4
-rw-r--r--layout/reftests/css-import/reftest-stylo.list16
-rw-r--r--layout/reftests/css-invalid/button/reftest-stylo.list13
-rw-r--r--layout/reftests/css-invalid/default-style/reftest-stylo.list6
-rw-r--r--layout/reftests/css-invalid/fieldset/reftest-stylo.list30
-rw-r--r--layout/reftests/css-invalid/form/reftest-stylo.list25
-rw-r--r--layout/reftests/css-invalid/input/reftest-stylo.list38
-rw-r--r--layout/reftests/css-invalid/output/reftest-stylo.list3
-rw-r--r--layout/reftests/css-invalid/reftest-stylo.list15
-rw-r--r--layout/reftests/css-invalid/select/reftest-stylo.list16
-rw-r--r--layout/reftests/css-invalid/select/reftest.list4
-rw-r--r--layout/reftests/css-invalid/textarea/reftest-stylo.list16
-rw-r--r--layout/reftests/css-mediaqueries/reftest-stylo.list50
-rw-r--r--layout/reftests/css-mediaqueries/reftest.list6
-rw-r--r--layout/reftests/css-optional/reftest-stylo.list11
-rw-r--r--layout/reftests/css-parsing/reftest-stylo.list10
-rw-r--r--layout/reftests/css-placeholder/input/reftest-stylo.list28
-rw-r--r--layout/reftests/css-placeholder/reftest-stylo.list8
-rw-r--r--layout/reftests/css-placeholder/textarea/reftest-stylo.list26
-rw-r--r--layout/reftests/css-required/reftest-stylo.list30
-rw-r--r--layout/reftests/css-ruby/reftest-stylo.list59
-rw-r--r--layout/reftests/css-selectors/reftest-stylo.list9
-rw-r--r--layout/reftests/css-sizing/reftest-stylo.list5
-rw-r--r--layout/reftests/css-submit-invalid/button-submit/reftest-stylo.list17
-rw-r--r--layout/reftests/css-submit-invalid/default-style/reftest-stylo.list4
-rw-r--r--layout/reftests/css-submit-invalid/input-image/reftest-stylo.list18
-rw-r--r--layout/reftests/css-submit-invalid/input-submit/reftest-stylo.list18
-rw-r--r--layout/reftests/css-submit-invalid/reftest-stylo.list5
-rw-r--r--layout/reftests/css-transitions/reftest-stylo.list5
-rw-r--r--layout/reftests/css-ui-invalid/button/reftest-stylo.list14
-rw-r--r--layout/reftests/css-ui-invalid/default-style/reftest-stylo.list13
-rw-r--r--layout/reftests/css-ui-invalid/input/reftest-stylo.list48
-rw-r--r--layout/reftests/css-ui-invalid/output/reftest-stylo.list4
-rw-r--r--layout/reftests/css-ui-invalid/reftest-stylo.list10
-rw-r--r--layout/reftests/css-ui-invalid/select/reftest-stylo.list22
-rw-r--r--layout/reftests/css-ui-invalid/select/reftest.list4
-rw-r--r--layout/reftests/css-ui-invalid/textarea/reftest-stylo.list19
-rw-r--r--layout/reftests/css-ui-valid/button/reftest-stylo.list14
-rw-r--r--layout/reftests/css-ui-valid/input/reftest-stylo.list47
-rw-r--r--layout/reftests/css-ui-valid/output/reftest-stylo.list4
-rw-r--r--layout/reftests/css-ui-valid/reftest-stylo.list7
-rw-r--r--layout/reftests/css-ui-valid/select/reftest-stylo.list21
-rw-r--r--layout/reftests/css-ui-valid/select/reftest.list4
-rw-r--r--layout/reftests/css-ui-valid/textarea/reftest-stylo.list21
-rw-r--r--layout/reftests/css-valid/button/reftest-stylo.list13
-rw-r--r--layout/reftests/css-valid/fieldset/reftest-stylo.list3
-rw-r--r--layout/reftests/css-valid/input/reftest-stylo.list37
-rw-r--r--layout/reftests/css-valid/output/reftest-stylo.list3
-rw-r--r--layout/reftests/css-valid/reftest-stylo.list10
-rw-r--r--layout/reftests/css-valid/select/reftest-stylo.list15
-rw-r--r--layout/reftests/css-valid/select/reftest.list4
-rw-r--r--layout/reftests/css-valid/textarea/reftest-stylo.list16
-rw-r--r--layout/reftests/css-valuesandunits/reftest-stylo.list19
-rw-r--r--layout/reftests/css-valuesandunits/reftest.list2
-rw-r--r--layout/reftests/css-variables/reftest-stylo.list5
-rw-r--r--layout/reftests/css-visited/reftest-stylo.list5
-rw-r--r--layout/reftests/cssom/reftest-stylo.list5
-rw-r--r--layout/reftests/datalist/reftest-stylo.list3
-rw-r--r--layout/reftests/details-summary/disabled-no-summary-ref.html11
-rw-r--r--layout/reftests/details-summary/disabled-single-summary-ref.html12
-rw-r--r--layout/reftests/details-summary/reftest-stylo.list87
-rw-r--r--layout/reftests/details-summary/reftest.list11
-rw-r--r--layout/reftests/dom/reftest-stylo.list76
-rw-r--r--layout/reftests/first-letter/reftest-stylo.list82
-rw-r--r--layout/reftests/first-letter/reftest.list2
-rw-r--r--layout/reftests/first-line/reftest-stylo.list49
-rw-r--r--layout/reftests/flexbox/pagination/reftest-stylo.list31
-rw-r--r--layout/reftests/flexbox/reftest-stylo.list121
-rw-r--r--layout/reftests/flexbox/reftest.list6
-rw-r--r--layout/reftests/floats/reftest-stylo.list121
-rw-r--r--layout/reftests/floats/reftest.list2
-rw-r--r--layout/reftests/font-face/reftest-stylo.list235
-rw-r--r--layout/reftests/font-face/reftest.list18
-rw-r--r--layout/reftests/font-features/reftest-stylo.list137
-rw-r--r--layout/reftests/font-features/reftest.list2
-rw-r--r--layout/reftests/font-inflation/reftest-stylo.list121
-rw-r--r--layout/reftests/font-inflation/reftest.list2
-rw-r--r--layout/reftests/font-loading-api/reftest-stylo.list12
-rw-r--r--layout/reftests/font-matching/reftest-stylo.list143
-rw-r--r--layout/reftests/font-matching/reftest.list5
-rwxr-xr-xlayout/reftests/fonts/mark-generate.py1
-rw-r--r--layout/reftests/fonts/math/generate.py1
-rw-r--r--layout/reftests/forms/button/reftest-stylo.list61
-rw-r--r--layout/reftests/forms/button/reftest.list15
-rw-r--r--layout/reftests/forms/fieldset/reftest-stylo.list19
-rw-r--r--layout/reftests/forms/input/checkbox/reftest-stylo.list18
-rw-r--r--layout/reftests/forms/input/checkbox/reftest.list2
-rw-r--r--layout/reftests/forms/input/color/reftest-stylo.list20
-rw-r--r--layout/reftests/forms/input/color/reftest.list14
-rw-r--r--layout/reftests/forms/input/datetime/reftest.list25
-rw-r--r--layout/reftests/forms/input/email/reftest-stylo.list4
-rw-r--r--layout/reftests/forms/input/file/reftest-stylo.list20
-rw-r--r--layout/reftests/forms/input/file/reftest.list12
-rw-r--r--layout/reftests/forms/input/hidden/reftest-stylo.list2
-rw-r--r--layout/reftests/forms/input/number/number-style-inheritance-ref.html6
-rw-r--r--layout/reftests/forms/input/number/number-style-inheritance.html6
-rw-r--r--layout/reftests/forms/input/number/reftest-stylo.list65
-rw-r--r--layout/reftests/forms/input/number/reftest.list19
-rw-r--r--layout/reftests/forms/input/percentage/reftest-stylo.list2
-rw-r--r--layout/reftests/forms/input/radio/reftest-stylo.list10
-rw-r--r--layout/reftests/forms/input/range/reftest-stylo.list54
-rw-r--r--layout/reftests/forms/input/range/reftest.list2
-rw-r--r--layout/reftests/forms/input/reftest-stylo.list14
-rw-r--r--layout/reftests/forms/input/search/reftest-stylo.list4
-rw-r--r--layout/reftests/forms/input/tel/reftest-stylo.list4
-rw-r--r--layout/reftests/forms/input/text/reftest-stylo.list16
-rw-r--r--layout/reftests/forms/input/url/reftest-stylo.list4
-rw-r--r--layout/reftests/forms/legend/reftest-stylo.list5
-rw-r--r--layout/reftests/forms/legend/reftest.list2
-rw-r--r--layout/reftests/forms/legend/shadow-dom.html29
-rw-r--r--layout/reftests/forms/meter/default-style/reftest-stylo.list3
-rw-r--r--layout/reftests/forms/meter/reftest-stylo.list49
-rw-r--r--layout/reftests/forms/meter/reftest.list2
-rw-r--r--layout/reftests/forms/output/reftest-stylo.list8
-rw-r--r--layout/reftests/forms/placeholder/reftest-stylo.list39
-rw-r--r--layout/reftests/forms/placeholder/reftest.list4
-rw-r--r--layout/reftests/forms/progress/reftest-stylo.list49
-rw-r--r--layout/reftests/forms/reftest-stylo.list36
-rw-r--r--layout/reftests/forms/reftest.list4
-rw-r--r--layout/reftests/forms/select/reftest-stylo.list15
-rw-r--r--layout/reftests/forms/select/reftest.list2
-rw-r--r--layout/reftests/forms/textarea/reftest-stylo.list23
-rw-r--r--layout/reftests/forms/textarea/reftest.list14
-rw-r--r--layout/reftests/forms/textbox/reftest-stylo.list28
-rw-r--r--layout/reftests/forms/textbox/reftest.list17
-rw-r--r--layout/reftests/generated-content/reftest-stylo.list20
-rw-r--r--layout/reftests/ib-split/reftest-stylo.list86
-rw-r--r--layout/reftests/image-element/reftest-stylo.list67
-rw-r--r--layout/reftests/image-rect/reftest-stylo.list23
-rw-r--r--layout/reftests/image-rect/reftest.list4
-rw-r--r--layout/reftests/image-region/reftest-stylo.list3
-rw-r--r--layout/reftests/image/reftest-stylo.list137
-rw-r--r--layout/reftests/image/reftest.list4
-rw-r--r--layout/reftests/indic-shaping/reftest-stylo.list32
-rw-r--r--layout/reftests/inline-borderpadding/reftest-stylo.list9
-rw-r--r--layout/reftests/inline/reftest-stylo.list8
-rw-r--r--layout/reftests/invalidation/reftest-stylo.list85
-rw-r--r--layout/reftests/invalidation/reftest.list4
-rw-r--r--layout/reftests/layers/reftest-stylo.list33
-rw-r--r--layout/reftests/layers/reftest.list2
-rw-r--r--layout/reftests/line-breaking/reftest-stylo.list41
-rw-r--r--layout/reftests/list-item/reftest-stylo.list13
-rw-r--r--layout/reftests/margin-collapsing/reftest-stylo.list943
-rw-r--r--layout/reftests/mathml/columnlines-1-ref.html1
-rw-r--r--layout/reftests/mathml/columnlines-1a.html1
-rw-r--r--layout/reftests/mathml/columnlines-1b.html1
-rw-r--r--layout/reftests/mathml/columnlines-1c.html1
-rw-r--r--layout/reftests/mathml/columnlines-2-ref.html1
-rw-r--r--layout/reftests/mathml/columnlines-2a.html1
-rw-r--r--layout/reftests/mathml/columnlines-2b.html1
-rw-r--r--layout/reftests/mathml/columnlines-3-1-ref.html1
-rw-r--r--layout/reftests/mathml/columnlines-3-1.html1
-rw-r--r--layout/reftests/mathml/columnlines-3-2-ref.html1
-rw-r--r--layout/reftests/mathml/columnlines-3-2.html1
-rw-r--r--layout/reftests/mathml/menclose-1-ref.html1
-rw-r--r--layout/reftests/mathml/menclose-1a.html1
-rw-r--r--layout/reftests/mathml/menclose-1b.html1
-rw-r--r--layout/reftests/mathml/menclose-1c.html1
-rw-r--r--layout/reftests/mathml/menclose-1d.html1
-rw-r--r--layout/reftests/mathml/menclose-1e.html1
-rw-r--r--layout/reftests/mathml/menclose-1f.html1
-rw-r--r--layout/reftests/mathml/menclose-1g.html1
-rw-r--r--layout/reftests/mathml/menclose-1h.html1
-rw-r--r--layout/reftests/mathml/menclose-1i.html1
-rw-r--r--layout/reftests/mathml/menclose-1j.html1
-rw-r--r--layout/reftests/mathml/menclose-1k.html1
-rw-r--r--layout/reftests/mathml/menclose-1l.html1
-rw-r--r--layout/reftests/mathml/menclose-1m.html1
-rw-r--r--layout/reftests/mathml/menclose-1n.html1
-rw-r--r--layout/reftests/mathml/menclose-1o.html1
-rw-r--r--layout/reftests/mathml/menclose-1p.html1
-rw-r--r--layout/reftests/mathml/mo-lspace-rspace-ref.html1
-rw-r--r--layout/reftests/mathml/mo-lspace-rspace.html1
-rw-r--r--layout/reftests/mathml/reftest-stylo.list415
-rw-r--r--layout/reftests/mathml/reftest.list14
-rw-r--r--layout/reftests/mathml/rowlines-1-ref.html1
-rw-r--r--layout/reftests/mathml/rowlines-1a.html1
-rw-r--r--layout/reftests/mathml/rowlines-1b.html1
-rw-r--r--layout/reftests/mathml/rowlines-1c.html1
-rw-r--r--layout/reftests/mathml/rowlines-2-ref.html1
-rw-r--r--layout/reftests/mathml/rowlines-2a.html1
-rw-r--r--layout/reftests/mathml/rowlines-2b.html1
-rw-r--r--layout/reftests/mathml/rowlines-3-1-ref.html1
-rw-r--r--layout/reftests/mathml/rowlines-3-1.html1
-rw-r--r--layout/reftests/mathml/rowlines-3-2-ref.html1
-rw-r--r--layout/reftests/mathml/rowlines-3-2.html1
-rw-r--r--layout/reftests/mathml/shadow-dom-1.html8
-rw-r--r--layout/reftests/mathml/tablespacing-8-ref.html1
-rw-r--r--layout/reftests/mathml/tablespacing-8a.html1
-rw-r--r--layout/reftests/mathml/tablespacing-8b.html1
-rw-r--r--layout/reftests/moz.build1
-rw-r--r--layout/reftests/mp4-video/reftest-stylo.list2
-rw-r--r--layout/reftests/native-theme/reftest-stylo.list88
-rw-r--r--layout/reftests/native-theme/reftest.list8
-rw-r--r--layout/reftests/object/reftest-stylo.list60
-rw-r--r--layout/reftests/object/reftest.list2
-rw-r--r--layout/reftests/ogg-video/reftest-stylo.list65
-rw-r--r--layout/reftests/ogg-video/reftest.list55
-rw-r--r--layout/reftests/outline/reftest-stylo.list15
-rw-r--r--layout/reftests/outline/reftest.list2
-rw-r--r--layout/reftests/pagination/reftest-stylo.list109
-rw-r--r--layout/reftests/percent-overflow-sizing/reftest-stylo.list76
-rw-r--r--layout/reftests/pixel-rounding/reftest-stylo.list186
-rw-r--r--layout/reftests/position-dynamic-changes/horizontal/reftest-stylo.list19
-rw-r--r--layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest-stylo.list19
-rw-r--r--layout/reftests/position-dynamic-changes/mixed/reftest-stylo.list19
-rw-r--r--layout/reftests/position-dynamic-changes/reftest-stylo.list12
-rw-r--r--layout/reftests/position-dynamic-changes/relative/reftest-stylo.list8
-rw-r--r--layout/reftests/position-dynamic-changes/vertical/reftest-stylo.list19
-rw-r--r--layout/reftests/position-relative/reftest-stylo.list10
-rw-r--r--layout/reftests/position-sticky/reftest-stylo.list55
-rw-r--r--layout/reftests/position-sticky/reftest.list22
-rw-r--r--layout/reftests/printing/reftest-stylo.list52
-rw-r--r--layout/reftests/reftest-sanity/reftest-stylo.list210
-rw-r--r--layout/reftests/reftest-sanity/reftest.list8
-rw-r--r--layout/reftests/reftest-stylo.list422
-rw-r--r--layout/reftests/reftest.list19
-rw-r--r--layout/reftests/scoped-style/reftest-stylo.list58
-rw-r--r--layout/reftests/scrolling/reftest-stylo.list69
-rw-r--r--layout/reftests/scrolling/reftest.list36
-rw-r--r--layout/reftests/selection/reftest-stylo.list43
-rw-r--r--layout/reftests/selection/reftest.list7
-rw-r--r--layout/reftests/svg/as-image/reftest-stylo.list275
-rw-r--r--layout/reftests/svg/as-image/reftest.list2
-rw-r--r--layout/reftests/svg/as-image/zoom/reftest-stylo.list12
-rw-r--r--layout/reftests/svg/filters/css-filter-chains/reftest-stylo.list11
-rw-r--r--layout/reftests/svg/filters/css-filters/reftest-stylo.list69
-rw-r--r--layout/reftests/svg/filters/css-svg-filter-chains/reftest-stylo.list11
-rw-r--r--layout/reftests/svg/filters/reftest-stylo.list128
-rw-r--r--layout/reftests/svg/filters/svg-filter-chains/reftest-stylo.list19
-rw-r--r--layout/reftests/svg/image/reftest-stylo.list44
-rw-r--r--layout/reftests/svg/image/reftest.list4
-rw-r--r--layout/reftests/svg/load-only/reftest-stylo.list4
-rw-r--r--layout/reftests/svg/mask-img-ref.html1
-rw-r--r--layout/reftests/svg/mask-img.html1
-rw-r--r--layout/reftests/svg/moz-only/reftest-stylo.list40
-rw-r--r--layout/reftests/svg/reftest-stylo.list499
-rw-r--r--layout/reftests/svg/reftest.list52
-rw-r--r--layout/reftests/svg/sizing/reftest-stylo.list322
-rw-r--r--layout/reftests/svg/smil/container/reftest-stylo.list25
-rw-r--r--layout/reftests/svg/smil/event/reftest-stylo.list33
-rw-r--r--layout/reftests/svg/smil/event/reftest.list2
-rw-r--r--layout/reftests/svg/smil/motion/reftest-stylo.list23
-rw-r--r--layout/reftests/svg/smil/pause/reftest-stylo.list3
-rw-r--r--layout/reftests/svg/smil/reftest-stylo.list286
-rw-r--r--layout/reftests/svg/smil/reftest.list2
-rw-r--r--layout/reftests/svg/smil/repeat/reftest-stylo.list4
-rw-r--r--layout/reftests/svg/smil/restart/reftest-stylo.list9
-rw-r--r--layout/reftests/svg/smil/seek/reftest-stylo.list18
-rw-r--r--layout/reftests/svg/smil/set/reftest-stylo.list3
-rw-r--r--layout/reftests/svg/smil/smil-grid.js1
-rw-r--r--layout/reftests/svg/smil/sort/reftest-stylo.list14
-rw-r--r--layout/reftests/svg/smil/style/reftest-stylo.list159
-rw-r--r--layout/reftests/svg/smil/syncbase/reftest-stylo.list100
-rw-r--r--layout/reftests/svg/smil/timed/reftest-stylo.list19
-rw-r--r--layout/reftests/svg/smil/transform/reftest-stylo.list23
-rw-r--r--layout/reftests/svg/smil/transform/reftest.list4
-rw-r--r--layout/reftests/svg/svg-integration/clip-path/reftest-stylo.list50
-rw-r--r--layout/reftests/svg/svg-integration/reftest-stylo.list49
-rw-r--r--layout/reftests/svg/svg-integration/reftest.list10
-rw-r--r--layout/reftests/svg/text/reftest-stylo.list204
-rw-r--r--layout/reftests/tab-size/reftest-stylo.list12
-rw-r--r--layout/reftests/table-anonymous-boxes/reftest-stylo.list119
-rw-r--r--layout/reftests/table-background/reftest-stylo.list100
-rw-r--r--layout/reftests/table-background/reftest.list2
-rw-r--r--layout/reftests/table-bordercollapse/bug1379306-ref.html31
-rw-r--r--layout/reftests/table-bordercollapse/bug1379306.html30
-rw-r--r--layout/reftests/table-bordercollapse/reftest-stylo.list107
-rw-r--r--layout/reftests/table-bordercollapse/reftest.list1
-rw-r--r--layout/reftests/table-dom/reftest-stylo.list45
-rw-r--r--layout/reftests/table-html/bug1379306-2-ref.html21
-rw-r--r--layout/reftests/table-html/bug1379306-2.html21
-rw-r--r--layout/reftests/table-html/bug1379306-3-ref.html23
-rw-r--r--layout/reftests/table-html/bug1379306-3.html23
-rw-r--r--layout/reftests/table-html/reftest-stylo.list3
-rw-r--r--layout/reftests/table-html/reftest.list2
-rw-r--r--layout/reftests/table-overflow/reftest-stylo.list8
-rw-r--r--layout/reftests/table-width/reftest-stylo.list74
-rw-r--r--layout/reftests/text-decoration/reftest-stylo.list119
-rw-r--r--layout/reftests/text-indent/reftest-stylo.list20
-rw-r--r--layout/reftests/text-overflow/reftest-stylo.list54
-rw-r--r--layout/reftests/text-overflow/reftest.list10
-rw-r--r--layout/reftests/text-shadow/reftest-stylo.list48
-rw-r--r--layout/reftests/text-shadow/reftest.list6
-rw-r--r--layout/reftests/text-stroke/reftest-stylo.list10
-rw-r--r--layout/reftests/text-svgglyphs/reftest-stylo.list27
-rw-r--r--layout/reftests/text-svgglyphs/reftest.list4
-rw-r--r--layout/reftests/text-transform/reftest-stylo.list46
-rw-r--r--layout/reftests/text/reftest-stylo.list366
-rw-r--r--layout/reftests/text/reftest.list31
-rw-r--r--layout/reftests/transform-3d/reftest-stylo.list93
-rw-r--r--layout/reftests/transform-3d/reftest.list8
-rw-r--r--layout/reftests/transform/reftest-stylo.list159
-rw-r--r--layout/reftests/unicode/reftest-stylo.list8
-rw-r--r--layout/reftests/view-source/reftest-stylo.list3
-rw-r--r--layout/reftests/w3c-css/failures.list4
-rw-r--r--layout/reftests/w3c-css/received/reftest-stylo.list103
-rw-r--r--layout/reftests/w3c-css/received/reftest.list4
-rw-r--r--layout/reftests/w3c-css/submitted/background/reftest-stylo.list35
-rw-r--r--layout/reftests/w3c-css/submitted/color4/reftest-stylo.list15
-rw-r--r--layout/reftests/w3c-css/submitted/conditional3/reftest-stylo.list47
-rw-r--r--layout/reftests/w3c-css/submitted/contain/reftest-stylo.list12
-rw-r--r--layout/reftests/w3c-css/submitted/css21/pagination/reftest-stylo.list46
-rw-r--r--layout/reftests/w3c-css/submitted/css21/reftest-stylo.list3
-rw-r--r--layout/reftests/w3c-css/submitted/css21/replaced-sizing/reftest-stylo.list10
-rw-r--r--layout/reftests/w3c-css/submitted/filters/reftest-stylo.list3
-rw-r--r--layout/reftests/w3c-css/submitted/flexbox/reftest-stylo.list206
-rw-r--r--layout/reftests/w3c-css/submitted/flexbox/reftest.list2
-rw-r--r--layout/reftests/w3c-css/submitted/fonts3/reftest-stylo.list6
-rw-r--r--layout/reftests/w3c-css/submitted/images3/reftest-stylo.list209
-rw-r--r--layout/reftests/w3c-css/submitted/lists-3/reftest-stylo.list4
-rw-r--r--layout/reftests/w3c-css/submitted/masking/reftest-stylo.list85
-rw-r--r--layout/reftests/w3c-css/submitted/multicol3/reftest-stylo.list3
-rw-r--r--layout/reftests/w3c-css/submitted/reftest-stylo.list76
-rw-r--r--layout/reftests/w3c-css/submitted/ruby/reftest-stylo.list19
-rw-r--r--layout/reftests/w3c-css/submitted/selectors4/reftest-stylo.list8
-rw-r--r--layout/reftests/w3c-css/submitted/text-decor-3/reftest-stylo.list134
-rw-r--r--layout/reftests/w3c-css/submitted/text3/reftest-stylo.list9
-rw-r--r--layout/reftests/w3c-css/submitted/transforms/reftest-stylo.list5
-rw-r--r--layout/reftests/w3c-css/submitted/ui3/reftest-stylo.list16
-rw-r--r--layout/reftests/w3c-css/submitted/ui3/reftest.list6
-rw-r--r--layout/reftests/w3c-css/submitted/values3/reftest-stylo.list33
-rw-r--r--layout/reftests/w3c-css/submitted/variables/reftest-stylo.list175
-rw-r--r--layout/reftests/w3c-css/submitted/will-change/reftest-stylo.list20
-rw-r--r--layout/reftests/w3c-css/submitted/writing-modes-3/reftest-stylo.list18
-rw-r--r--layout/reftests/web-animations/reftest-stylo.list9
-rw-r--r--layout/reftests/web-animations/reftest.list6
-rw-r--r--layout/reftests/webcomponents/adjacent-insertion-points-1-ref.html6
-rw-r--r--layout/reftests/webcomponents/adjacent-insertion-points-1.html17
-rw-r--r--layout/reftests/webcomponents/adjacent-insertion-points-2-ref.html6
-rw-r--r--layout/reftests/webcomponents/adjacent-insertion-points-2.html17
-rw-r--r--layout/reftests/webcomponents/basic-insertion-point-1-ref.html8
-rw-r--r--layout/reftests/webcomponents/basic-insertion-point-1.html21
-rw-r--r--layout/reftests/webcomponents/basic-insertion-point-2-ref.html11
-rw-r--r--layout/reftests/webcomponents/basic-insertion-point-2.html24
-rw-r--r--layout/reftests/webcomponents/basic-shadow-1.html2
-rw-r--r--layout/reftests/webcomponents/basic-shadow-2.html2
-rw-r--r--layout/reftests/webcomponents/basic-shadow-3.html2
-rw-r--r--layout/reftests/webcomponents/basic-shadow-4.html2
-rw-r--r--layout/reftests/webcomponents/basic-shadow-element-1-ref.html10
-rw-r--r--layout/reftests/webcomponents/basic-shadow-element-1.html19
-rw-r--r--layout/reftests/webcomponents/basic-slot-1-ref.html11
-rw-r--r--layout/reftests/webcomponents/basic-slot-1.html6
-rw-r--r--layout/reftests/webcomponents/basic-slot-2-ref.html16
-rw-r--r--layout/reftests/webcomponents/basic-slot-2.html7
-rw-r--r--layout/reftests/webcomponents/basic-slot-3-ref.html8
-rw-r--r--layout/reftests/webcomponents/basic-slot-3.html18
-rw-r--r--layout/reftests/webcomponents/basic-slot-4.html20
-rw-r--r--layout/reftests/webcomponents/cross-tree-selection-1.html5
-rw-r--r--layout/reftests/webcomponents/dynamic-insertion-point-distribution-1.html17
-rw-r--r--layout/reftests/webcomponents/dynamic-insertion-point-distribution-2.html17
-rw-r--r--layout/reftests/webcomponents/dynamic-shadow-element-1-ref.html10
-rw-r--r--layout/reftests/webcomponents/dynamic-shadow-element-1.html23
-rw-r--r--layout/reftests/webcomponents/fallback-content-1.html8
-rw-r--r--layout/reftests/webcomponents/input-transition-1.html27
-rw-r--r--layout/reftests/webcomponents/nested-insertion-point-1.html11
-rw-r--r--layout/reftests/webcomponents/nested-shadow-element-1.html29
-rw-r--r--layout/reftests/webcomponents/reframe-shadow-child-1.html16
-rw-r--r--layout/reftests/webcomponents/reframe-shadow-child-2.html15
-rw-r--r--layout/reftests/webcomponents/reftest-stylo.list22
-rw-r--r--layout/reftests/webcomponents/reftest.list18
-rw-r--r--layout/reftests/webcomponents/remove-append-shadow-host-1.html2
-rw-r--r--layout/reftests/webcomponents/remove-insertion-point-1.html8
-rw-r--r--layout/reftests/webcomponents/style-sharing-across-shadow.html22
-rw-r--r--layout/reftests/webcomponents/style-sharing.html14
-rw-r--r--layout/reftests/webcomponents/update-dist-node-descendants-1.html24
-rw-r--r--layout/reftests/webkit-box/reftest-stylo.list43
-rw-r--r--layout/reftests/webkit-gradient/reftest-stylo.list23
-rw-r--r--layout/reftests/webm-video/reftest-stylo.list110
-rw-r--r--layout/reftests/webm-video/reftest.list81
-rw-r--r--layout/reftests/writing-mode/abspos/reftest-stylo.list130
-rw-r--r--layout/reftests/writing-mode/reftest-stylo.list192
-rw-r--r--layout/reftests/writing-mode/reftest.list20
-rw-r--r--layout/reftests/writing-mode/tables/reftest-stylo.list95
-rw-r--r--layout/reftests/writing-mode/tables/reftest.list12
-rw-r--r--layout/reftests/xul-document-load/reftest-stylo.list46
-rw-r--r--layout/reftests/xul/reftest-stylo.list90
-rw-r--r--layout/reftests/xul/reftest.list5
-rw-r--r--layout/reftests/z-index/reftest-stylo.list13
-rw-r--r--layout/reftests/z-index/reftest.list2
-rw-r--r--layout/style/AnimationCollection.cpp1
-rw-r--r--layout/style/AnimationCollection.h1
-rw-r--r--layout/style/AnimationCommon.cpp1
-rw-r--r--layout/style/AnimationCommon.h1
-rw-r--r--layout/style/CSSCalc.h1
-rw-r--r--layout/style/CSSEnabledState.h1
-rw-r--r--layout/style/CSSRuleList.cpp1
-rw-r--r--layout/style/CSSStyleSheet.cpp20
-rw-r--r--layout/style/CSSStyleSheet.h3
-rw-r--r--layout/style/CSSUnprefixingService.js1
-rw-r--r--layout/style/CSSValue.h1
-rw-r--r--layout/style/CSSVariableDeclarations.cpp1
-rw-r--r--layout/style/CSSVariableDeclarations.h1
-rw-r--r--layout/style/CSSVariableResolver.cpp1
-rw-r--r--layout/style/CSSVariableResolver.h1
-rw-r--r--layout/style/CSSVariableValues.h1
-rw-r--r--layout/style/CounterStyleManager.cpp1
-rw-r--r--layout/style/CounterStyleManager.h1
-rw-r--r--layout/style/DeclarationBlock.h1
-rw-r--r--layout/style/DeclarationBlockInlines.h1
-rw-r--r--layout/style/DocumentStyleRootIterator.cpp40
-rw-r--r--layout/style/DocumentStyleRootIterator.h37
-rw-r--r--layout/style/FontFaceSet.cpp1
-rw-r--r--layout/style/HandleRefPtr.h1
-rw-r--r--layout/style/IncrementalClearCOMRuleArray.cpp1
-rw-r--r--layout/style/IncrementalClearCOMRuleArray.h1
-rw-r--r--layout/style/LayerAnimationInfo.cpp1
-rw-r--r--layout/style/LayerAnimationInfo.h1
-rw-r--r--layout/style/Loader.cpp11
-rw-r--r--layout/style/MediaQueryList.h1
-rw-r--r--layout/style/RuleNodeCacheConditions.cpp1
-rw-r--r--layout/style/RuleProcessorCache.cpp1
-rw-r--r--layout/style/RuleProcessorCache.h1
-rw-r--r--layout/style/ServoBindingList.h1
-rw-r--r--layout/style/ServoBindingTypes.h1
-rw-r--r--layout/style/ServoBindings.cpp1
-rw-r--r--layout/style/ServoBindings.h1
-rw-r--r--layout/style/ServoElementSnapshot.cpp1
-rw-r--r--layout/style/ServoElementSnapshot.h1
-rw-r--r--layout/style/ServoStyleSet.cpp3
-rw-r--r--layout/style/ServoStyleSet.h1
-rw-r--r--layout/style/ServoStyleSheet.cpp11
-rw-r--r--layout/style/ServoStyleSheet.h4
-rw-r--r--layout/style/ServoTypes.h1
-rw-r--r--layout/style/ServoUtils.h1
-rw-r--r--layout/style/SheetParsingMode.h1
-rw-r--r--layout/style/StyleAnimationValue.cpp1
-rw-r--r--layout/style/StyleBackendType.h1
-rw-r--r--layout/style/StyleComplexColor.h1
-rw-r--r--layout/style/StyleRule.cpp20
-rw-r--r--layout/style/StyleSetHandle.h1
-rw-r--r--layout/style/StyleSetHandleInlines.h1
-rw-r--r--layout/style/StyleSheet.cpp9
-rw-r--r--layout/style/StyleSheet.h24
-rw-r--r--layout/style/StyleSheetInfo.h1
-rw-r--r--layout/style/StyleSheetInlines.h13
-rw-r--r--layout/style/crashtests/1017798-1.html28
-rw-r--r--layout/style/crashtests/786108-2.html2
-rw-r--r--layout/style/moz.build3
-rw-r--r--layout/style/nsAnimationManager.cpp5
-rw-r--r--layout/style/nsAnimationManager.h1
-rw-r--r--layout/style/nsCSSDataBlock.cpp1
-rw-r--r--layout/style/nsCSSDataBlock.h1
-rw-r--r--layout/style/nsCSSKeywordList.h1
-rw-r--r--layout/style/nsCSSParser.cpp23
-rw-r--r--layout/style/nsCSSPropAliasList.h1
-rw-r--r--layout/style/nsCSSPropList.h10
-rw-r--r--layout/style/nsCSSProps.cpp6
-rw-r--r--layout/style/nsCSSProps.h1
-rw-r--r--layout/style/nsCSSPseudoClassList.h16
-rw-r--r--layout/style/nsCSSPseudoElements.h18
-rw-r--r--layout/style/nsCSSRules.cpp29
-rw-r--r--layout/style/nsCSSRules.h7
-rw-r--r--layout/style/nsCSSValue.cpp1
-rw-r--r--layout/style/nsComputedDOMStyle.cpp65
-rw-r--r--layout/style/nsComputedDOMStyle.h7
-rw-r--r--layout/style/nsComputedDOMStylePropertyList.h1
-rw-r--r--layout/style/nsDOMCSSAttrDeclaration.cpp6
-rw-r--r--layout/style/nsDOMCSSAttrDeclaration.h2
-rw-r--r--layout/style/nsDOMCSSDeclaration.cpp2
-rw-r--r--layout/style/nsHTMLCSSStyleSheet.cpp1
-rw-r--r--layout/style/nsICSSDeclaration.h6
-rw-r--r--layout/style/nsLayoutStylesheetCache.cpp11
-rw-r--r--layout/style/nsLayoutStylesheetCache.h1
-rw-r--r--layout/style/nsMediaFeatures.cpp1
-rw-r--r--layout/style/nsMediaFeatures.h1
-rw-r--r--layout/style/nsROCSSPrimitiveValue.cpp1
-rw-r--r--layout/style/nsRuleNode.cpp12
-rw-r--r--layout/style/nsStyleConsts.h7
-rw-r--r--layout/style/nsStyleSet.cpp2
-rw-r--r--layout/style/nsStyleStruct.cpp12
-rw-r--r--layout/style/nsStyleStruct.h2
-rw-r--r--layout/style/nsStyleStructInlines.h1
-rw-r--r--layout/style/nsStyleUtil.cpp2
-rw-r--r--layout/style/nsTransitionManager.cpp6
-rw-r--r--layout/style/nsTransitionManager.h1
-rw-r--r--layout/style/res/forms.css2
-rw-r--r--layout/style/res/html.css19
-rw-r--r--layout/style/res/ua.css6
-rw-r--r--layout/style/test/ListCSSProperties.cpp1
-rw-r--r--layout/style/test/chrome/chrome.ini2
-rw-r--r--layout/style/test/chrome/test_bug1346623.html60
-rw-r--r--layout/style/test/descriptor_database.js1
-rw-r--r--layout/style/test/flexbox_layout_testcases.js1
-rw-r--r--layout/style/test/mochitest.ini21
-rw-r--r--layout/style/test/moz.build1
-rw-r--r--layout/style/test/property_database.js13
-rw-r--r--layout/style/test/test_cascade.html1
-rw-r--r--layout/style/test/test_pseudoelement_state.html30
-rw-r--r--layout/style/test/test_rule_insertion.html4
-rw-r--r--layout/style/test/test_value_storage.html18
-rw-r--r--layout/svg/moz.build1
-rw-r--r--layout/tables/TableArea.h1
-rw-r--r--layout/tables/moz.build1
-rw-r--r--layout/tables/nsTableFrame.cpp1
-rw-r--r--layout/tools/layout-debug/moz.build1
-rw-r--r--layout/tools/layout-debug/src/moz.build1
-rw-r--r--layout/tools/layout-debug/ui/content/layoutdebug.xul5
-rw-r--r--layout/tools/layout-debug/ui/moz.build1
-rw-r--r--layout/tools/recording/moz.build1
-rw-r--r--layout/tools/recording/recording.js1
-rw-r--r--layout/tools/recording/recording.xul1
-rw-r--r--layout/tools/reftest/Makefile.in1
-rw-r--r--layout/tools/reftest/bootstrap.js13
-rwxr-xr-xlayout/tools/reftest/clean-reftest-output.pl1
-rw-r--r--layout/tools/reftest/mach_commands.py87
-rw-r--r--layout/tools/reftest/mach_test_package_commands.py28
-rw-r--r--layout/tools/reftest/moz.build1
-rw-r--r--layout/tools/reftest/reftest-analyzer-structured.xhtml1
-rw-r--r--layout/tools/reftest/reftest-analyzer.xhtml1
-rw-r--r--layout/tools/reftest/reftest-content.js1
-rw-r--r--layout/tools/reftest/reftest.jsm26
-rw-r--r--layout/tools/reftest/reftest.xul1
-rw-r--r--layout/tools/reftest/reftestcommandline.py5
-rw-r--r--layout/xul/BoxObject.cpp1
-rw-r--r--layout/xul/crashtests/crashtests.list4
-rw-r--r--layout/xul/grid/moz.build1
-rw-r--r--layout/xul/moz.build1
-rw-r--r--layout/xul/nsBoxFrame.cpp1
-rw-r--r--layout/xul/nsListBoxBodyFrame.cpp4
-rw-r--r--layout/xul/nsMenuPopupFrame.cpp1
-rw-r--r--layout/xul/reftest/reftest.list4
-rw-r--r--layout/xul/test/chrome.ini1
-rw-r--r--layout/xul/test/mochitest.ini3
-rw-r--r--layout/xul/tree/moz.build1
-rw-r--r--layout/xul/tree/nsTreeBodyFrame.cpp1
827 files changed, 3909 insertions, 21428 deletions
diff --git a/layout/base/AccessibleCaret.cpp b/layout/base/AccessibleCaret.cpp
index 165f385f5..27877c732 100644
--- a/layout/base/AccessibleCaret.cpp
+++ b/layout/base/AccessibleCaret.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/base/AccessibleCaret.h b/layout/base/AccessibleCaret.h
index 42e5bb386..342950010 100644
--- a/layout/base/AccessibleCaret.h
+++ b/layout/base/AccessibleCaret.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/base/AccessibleCaretEventHub.cpp b/layout/base/AccessibleCaretEventHub.cpp
index b897e4d77..d7e9d70b6 100644
--- a/layout/base/AccessibleCaretEventHub.cpp
+++ b/layout/base/AccessibleCaretEventHub.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/base/AccessibleCaretEventHub.h b/layout/base/AccessibleCaretEventHub.h
index 6681f8669..e2fb4c04a 100644
--- a/layout/base/AccessibleCaretEventHub.h
+++ b/layout/base/AccessibleCaretEventHub.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/base/AccessibleCaretLogger.h b/layout/base/AccessibleCaretLogger.h
index 9a0235643..76695f666 100644
--- a/layout/base/AccessibleCaretLogger.h
+++ b/layout/base/AccessibleCaretLogger.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/base/AccessibleCaretManager.cpp b/layout/base/AccessibleCaretManager.cpp
index ac3f36bea..4dd55009c 100644
--- a/layout/base/AccessibleCaretManager.cpp
+++ b/layout/base/AccessibleCaretManager.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -23,9 +22,6 @@
#include "nsFrameSelection.h"
#include "nsGenericHTMLElement.h"
#include "nsIHapticFeedback.h"
-#ifdef MOZ_WIDGET_ANDROID
-#include "nsWindow.h"
-#endif
namespace mozilla {
@@ -897,15 +893,6 @@ AccessibleCaretManager::SetSelectionDragState(bool aState) const
if (fs) {
fs->SetDragState(aState);
}
-
- // Pin Fennecs DynamicToolbarAnimator in place before/after dragging,
- // to avoid co-incident screen scrolling.
- #ifdef MOZ_WIDGET_ANDROID
- nsIDocument* doc = mPresShell->GetDocument();
- MOZ_ASSERT(doc);
- nsIWidget* widget = nsContentUtils::WidgetForDocument(doc);
- static_cast<nsWindow*>(widget)->SetSelectionDragState(aState);
- #endif
}
void
diff --git a/layout/base/AccessibleCaretManager.h b/layout/base/AccessibleCaretManager.h
index 1cfe85d01..e8636b356 100644
--- a/layout/base/AccessibleCaretManager.h
+++ b/layout/base/AccessibleCaretManager.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/base/ArenaRefPtr.h b/layout/base/ArenaRefPtr.h
index bc8ecaa70..732ca01e8 100644
--- a/layout/base/ArenaRefPtr.h
+++ b/layout/base/ArenaRefPtr.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: set ts=2 sw=2 et tw=78:
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/layout/base/ArenaRefPtrInlines.h b/layout/base/ArenaRefPtrInlines.h
index a85e98569..36cb8a9a5 100644
--- a/layout/base/ArenaRefPtrInlines.h
+++ b/layout/base/ArenaRefPtrInlines.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: set ts=2 sw=2 et tw=78:
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/layout/base/FrameLayerBuilder.cpp b/layout/base/FrameLayerBuilder.cpp
index 934d108e0..8695cd650 100644
--- a/layout/base/FrameLayerBuilder.cpp
+++ b/layout/base/FrameLayerBuilder.cpp
@@ -2502,7 +2502,6 @@ ContainerState::PreparePaintedLayerForUse(PaintedLayer* aLayer,
aData->mVisibilityComputedRegion.SetEmpty();
// FIXME: Temporary workaround for bug 681192 and bug 724786.
-#ifndef MOZ_WIDGET_ANDROID
// Calculate exact position of the top-left of the active scrolled root.
// This might not be 0,0 due to the snapping in ScaleToNearestPixels.
gfxPoint animatedGeometryRootTopLeft = scaledOffset - ThebesPoint(matrix.GetTranslation()) + mParameters.mOffset;
@@ -2515,9 +2514,6 @@ ContainerState::PreparePaintedLayerForUse(PaintedLayer* aLayer,
} else if (didResetScrollPositionForLayerPixelAlignment) {
aData->mAnimatedGeometryRootPosition = animatedGeometryRootTopLeft;
}
-#else
- Unused << didResetScrollPositionForLayerPixelAlignment;
-#endif
}
#if defined(DEBUG) || defined(MOZ_DUMP_PAINTING)
diff --git a/layout/base/LayoutConstants.h b/layout/base/LayoutConstants.h
index cd6e1c3f5..d624a1a19 100644
--- a/layout/base/LayoutConstants.h
+++ b/layout/base/LayoutConstants.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/base/PositionedEventTargeting.cpp b/layout/base/PositionedEventTargeting.cpp
index 668ff2938..731e951e5 100644
--- a/layout/base/PositionedEventTargeting.cpp
+++ b/layout/base/PositionedEventTargeting.cpp
@@ -620,8 +620,6 @@ FindFrameTargetedByInputEvent(WidgetGUIEvent* aEvent,
PET_LOG("Final target is %p\n", target);
// Uncomment this to dump the frame tree to help with debugging.
- // Note that dumping the frame tree at the top of the function may flood
- // logcat on Android devices and cause the PET_LOGs to get dropped.
// aRootFrame->DumpFrameTree();
if (!target || !prefs->mRepositionEventCoords) {
diff --git a/layout/base/RestyleManager.cpp b/layout/base/RestyleManager.cpp
index a5a4e1237..9e80ef7bc 100644
--- a/layout/base/RestyleManager.cpp
+++ b/layout/base/RestyleManager.cpp
@@ -146,8 +146,10 @@ RestyleManager::RestyleElement(Element* aElement,
}
if (aMinHint & nsChangeHint_ReconstructFrame) {
- FrameConstructor()->RecreateFramesForContent(aElement, false,
- nsCSSFrameConstructor::REMOVE_FOR_RECONSTRUCTION, nullptr);
+ FrameConstructor()->RecreateFramesForContent(
+ aElement,
+ nsCSSFrameConstructor::InsertionKind::Sync,
+ nsCSSFrameConstructor::REMOVE_FOR_RECONSTRUCTION);
} else if (aPrimaryFrame) {
ComputeAndProcessStyleChange(aPrimaryFrame, aMinHint, aRestyleTracker,
aRestyleHint, aRestyleHintData);
@@ -241,14 +243,14 @@ RestyleManager::AnimationsWithDestroyedFrame::StopAnimationsWithoutFrame(
// Forwarded nsIDocumentObserver method, to handle restyling (and
// passing the notification to the frame).
-nsresult
+void
RestyleManager::ContentStateChanged(nsIContent* aContent,
EventStates aStateMask)
{
// XXXbz it would be good if this function only took Elements, but
// we'd have to make ESM guarantee that usefully.
if (!aContent->IsElement()) {
- return NS_OK;
+ return;
}
Element* aElement = aContent->AsElement();
@@ -258,7 +260,6 @@ RestyleManager::ContentStateChanged(nsIContent* aContent,
ContentStateChangedInternal(aElement, aStateMask, &changeHint, &restyleHint);
PostRestyleEvent(aElement, restyleHint, changeHint);
- return NS_OK;
}
// Forwarded nsIMutationObserver method, to handle restyling.
@@ -1057,6 +1058,25 @@ ElementForStyleContext(nsIContent* aParentContent,
return f->GetContent()->AsElement();
}
+ Element* frameElement = aFrame->GetContent()->AsElement();
+ if (frameElement->IsNativeAnonymous() &&
+ nsCSSPseudoElements::PseudoElementIsJSCreatedNAC(aPseudoType)) {
+ // NAC-implemented pseudos use the closest non-NAC element as their
+ // element to inherit from.
+ //
+ // FIXME(heycam): In theory we shouldn't need to limit this only to
+ // JS-created pseudo-implementing NAC, as all pseudo-implementing
+ // should use the closest non-native anonymous ancestor element as
+ // its originating element. But removing that part of the condition
+ // reveals some bugs in style resultion with display:contents and
+ // XBL. See bug 1345809.
+ Element* originatingElement =
+ nsContentUtils::GetClosestNonNativeAnonymousAncestor(frameElement);
+ if (originatingElement) {
+ return originatingElement;
+ }
+ }
+
if (aParentContent) {
return aParentContent->AsElement();
}
@@ -1806,7 +1826,7 @@ ElementRestyler::ConditionallyRestyleUndisplayedNodes(
}
for (UndisplayedNode* undisplayed = aUndisplayed; undisplayed;
- undisplayed = undisplayed->mNext) {
+ undisplayed = undisplayed->getNext()) {
if (!undisplayed->mContent->IsElement()) {
continue;
@@ -2336,6 +2356,16 @@ ElementRestyler::ComputeRestyleResultFromFrame(nsIFrame* aSelf,
return;
}
+ // Each NAC element inherits from the first non-NAC ancestor, so child
+ // NAC may inherit from our parent instead of us. That means we can't
+ // cull traversal if our style context didn't change.
+ if (aSelf->GetContent() && aSelf->GetContent()->IsNativeAnonymous()) {
+ LOG_RESTYLE_CONTINUE("native anonymous content");
+ aRestyleResult = RestyleResult::eContinue;
+ aCanStopWithStyleChange = false;
+ return;
+ }
+
// Style changes might have moved children between the two nsLetterFrames
// (the one matching ::first-letter and the one containing the rest of the
// content). Continue restyling to the children of the nsLetterFrame so
@@ -3437,7 +3467,7 @@ ElementRestyler::RestyleUndisplayedNodes(nsRestyleHint aChildRestyleHint,
if (undisplayed) {
pusher.PushAncestorAndStyleScope(undisplayedParent);
}
- for (; undisplayed; undisplayed = undisplayed->mNext) {
+ for (; undisplayed; undisplayed = undisplayed->getNext()) {
NS_ASSERTION(undisplayedParent ||
undisplayed->mContent ==
mPresContext->Document()->GetRootElement(),
@@ -3454,7 +3484,7 @@ ElementRestyler::RestyleUndisplayedNodes(nsRestyleHint aChildRestyleHint,
// not have a frame and would not otherwise be pushed as an ancestor.
nsIContent* parent = undisplayed->mContent->GetParent();
TreeMatchContext::AutoAncestorPusher insertionPointPusher(mTreeMatchContext);
- if (parent && nsContentUtils::IsContentInsertionPoint(parent)) {
+ if (parent && parent->IsActiveChildrenElement()) {
insertionPointPusher.PushAncestorAndStyleScope(parent);
}
@@ -3593,14 +3623,14 @@ ElementRestyler::MustReframeForPseudo(CSSPseudoElementType aPseudoType,
// Check for a ::before pseudo style and the absence of a ::before content,
// but only if aFrame is null or is the first continuation/ib-split.
if ((aFrame && !nsLayoutUtils::IsFirstContinuationOrIBSplitSibling(aFrame)) ||
- nsLayoutUtils::GetBeforeFrameForContent(aGenConParentFrame, aContent)) {
+ nsLayoutUtils::GetBeforeFrame(aContent)) {
return false;
}
} else {
// Similarly for ::after, but check for being the last continuation/
// ib-split.
if ((aFrame && nsLayoutUtils::GetNextContinuationOrIBSplitSibling(aFrame)) ||
- nsLayoutUtils::GetAfterFrameForContent(aGenConParentFrame, aContent)) {
+ nsLayoutUtils::GetAfterFrame(aContent)) {
return false;
}
}
@@ -3680,7 +3710,7 @@ ElementRestyler::RestyleContentChildren(nsIFrame* aParent,
// nsPageFrame that does not have a content.
nsIContent* parent = child->GetContent() ? child->GetContent()->GetParent() : nullptr;
TreeMatchContext::AutoAncestorPusher insertionPointPusher(mTreeMatchContext);
- if (parent && nsContentUtils::IsContentInsertionPoint(parent)) {
+ if (parent && parent->IsActiveChildrenElement()) {
insertionPointPusher.PushAncestorAndStyleScope(parent);
}
diff --git a/layout/base/RestyleManager.h b/layout/base/RestyleManager.h
index 4886d77bc..dd58f4bb4 100644
--- a/layout/base/RestyleManager.h
+++ b/layout/base/RestyleManager.h
@@ -59,8 +59,8 @@ public:
// Forwarded nsIDocumentObserver method, to handle restyling (and
// passing the notification to the frame).
- nsresult ContentStateChanged(nsIContent* aContent,
- EventStates aStateMask);
+ void ContentStateChanged(nsIContent* aContent,
+ EventStates aStateMask);
// Forwarded nsIMutationObserver method, to handle restyling.
void AttributeWillChange(Element* aElement,
diff --git a/layout/base/RestyleManagerBase.cpp b/layout/base/RestyleManagerBase.cpp
index e2145934b..192c0df99 100644
--- a/layout/base/RestyleManagerBase.cpp
+++ b/layout/base/RestyleManagerBase.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -172,7 +171,7 @@ RestyleManagerBase::ChangeHintToString(nsChangeHint aHint)
"NeutralChange", "InvalidateRenderingObservers",
"ReflowChangesSizeOrPosition", "UpdateComputedBSize",
"UpdateUsesOpacity", "UpdateBackgroundPosition",
- "AddOrRemoveTransform", "CSSOverflowChange",
+ "AddOrRemoveTransform", "ScrollbarChange",
};
static_assert(nsChangeHint_AllHints == (1 << ArrayLength(names)) - 1,
"Name list doesn't match change hints.");
@@ -1112,11 +1111,11 @@ if (!mDestroyedFrames) {
nsPresContext* presContext = PresContext();
nsCSSFrameConstructor* frameConstructor = presContext->FrameConstructor();
- // Handle nsChangeHint_CSSOverflowChange, by either updating the
+ // Handle nsChangeHint_ScrollbarChange, by either updating the
// scrollbars on the viewport, or upgrading the change hint to frame-reconstruct.
for (nsStyleChangeData& data : aChangeList) {
- if (data.mHint & nsChangeHint_CSSOverflowChange) {
- data.mHint &= ~nsChangeHint_CSSOverflowChange;
+ if (data.mHint & nsChangeHint_ScrollbarChange) {
+ data.mHint &= ~nsChangeHint_ScrollbarChange;
bool doReconstruct = true; // assume the worst
// Only bother with this if we're html/body, since:
@@ -1138,9 +1137,9 @@ if (!mDestroyedFrames) {
// to reconstruct - we can just reflow, because no scrollframe is being
// added/removed.
nsIContent* prevOverrideNode =
- presContext->GetViewportScrollbarStylesOverrideNode();
+ presContext->GetViewportScrollStylesOverrideNode();
nsIContent* newOverrideNode =
- presContext->UpdateViewportScrollbarStylesOverride();
+ presContext->UpdateViewportScrollStylesOverride();
if (data.mContent == prevOverrideNode ||
data.mContent == newOverrideNode) {
@@ -1267,8 +1266,10 @@ if (!mDestroyedFrames) {
// We could also have problems with triggering of CSS transitions
// on elements whose frames are reconstructed, since we depend on
// the reconstruction happening synchronously.
- frameConstructor->RecreateFramesForContent(content, false,
- nsCSSFrameConstructor::REMOVE_FOR_RECONSTRUCTION, nullptr);
+ frameConstructor->RecreateFramesForContent(
+ content,
+ nsCSSFrameConstructor::InsertionKind::Sync,
+ nsCSSFrameConstructor::REMOVE_FOR_RECONSTRUCTION);
} else {
NS_ASSERTION(frame, "This shouldn't happen");
diff --git a/layout/base/RestyleManagerBase.h b/layout/base/RestyleManagerBase.h
index d92c3d1f7..8b8bf4170 100644
--- a/layout/base/RestyleManagerBase.h
+++ b/layout/base/RestyleManagerBase.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/base/RestyleManagerHandle.h b/layout/base/RestyleManagerHandle.h
index 8be04d12c..5cc26e41e 100644
--- a/layout/base/RestyleManagerHandle.h
+++ b/layout/base/RestyleManagerHandle.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -125,8 +124,8 @@ public:
nsIContent* aChild);
inline void RestyleForAppend(nsIContent* aContainer,
nsIContent* aFirstNewContent);
- inline nsresult ContentStateChanged(nsIContent* aContent,
- EventStates aStateMask);
+ inline void ContentStateChanged(nsIContent* aContent,
+ EventStates aStateMask);
inline void AttributeWillChange(dom::Element* aElement,
int32_t aNameSpaceID,
nsIAtom* aAttribute,
diff --git a/layout/base/RestyleManagerHandleInlines.h b/layout/base/RestyleManagerHandleInlines.h
index cc374edd5..6c8276fce 100644
--- a/layout/base/RestyleManagerHandleInlines.h
+++ b/layout/base/RestyleManagerHandleInlines.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -122,7 +121,7 @@ RestyleManagerHandle::Ptr::RestyleForAppend(nsIContent* aContainer,
FORWARD(RestyleForAppend, (aContainer, aFirstNewContent));
}
-nsresult
+void
RestyleManagerHandle::Ptr::ContentStateChanged(nsIContent* aContent,
EventStates aStateMask)
{
diff --git a/layout/base/ScrollbarStyles.cpp b/layout/base/ScrollStyles.cpp
index cc9f0c57d..328657d3d 100644
--- a/layout/base/ScrollbarStyles.cpp
+++ b/layout/base/ScrollStyles.cpp
@@ -3,12 +3,12 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#include "ScrollbarStyles.h"
+#include "ScrollStyles.h"
#include "nsStyleStruct.h" // for nsStyleDisplay and nsStyleBackground::Position
namespace mozilla {
- ScrollbarStyles::ScrollbarStyles(uint8_t aH, uint8_t aV,
+ ScrollStyles::ScrollStyles(uint8_t aH, uint8_t aV,
const nsStyleDisplay* aDisplay)
: mHorizontal(aH), mVertical(aV),
mScrollBehavior(aDisplay->mScrollBehavior),
@@ -19,7 +19,7 @@ namespace mozilla {
mScrollSnapDestinationX(aDisplay->mScrollSnapDestination.mXPosition),
mScrollSnapDestinationY(aDisplay->mScrollSnapDestination.mYPosition) {}
- ScrollbarStyles::ScrollbarStyles(const nsStyleDisplay* aDisplay)
+ ScrollStyles::ScrollStyles(const nsStyleDisplay* aDisplay)
: mHorizontal(aDisplay->mOverflowX), mVertical(aDisplay->mOverflowY),
mScrollBehavior(aDisplay->mScrollBehavior),
mScrollSnapTypeX(aDisplay->mScrollSnapTypeX),
diff --git a/layout/base/ScrollbarStyles.h b/layout/base/ScrollStyles.h
index e6f0c6dde..c5743ee6b 100644
--- a/layout/base/ScrollbarStyles.h
+++ b/layout/base/ScrollStyles.h
@@ -3,8 +3,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#ifndef ScrollbarStyles_h
-#define ScrollbarStyles_h
+#ifndef ScrollStyles_h
+#define ScrollStyles_h
#include <stdint.h>
#include "nsStyleConsts.h" // for NS_STYLE_SCROLL_SNAP_*
@@ -16,7 +16,7 @@ struct nsStyleDisplay;
namespace mozilla {
-struct ScrollbarStyles
+struct ScrollStyles
{
// Always one of NS_STYLE_OVERFLOW_SCROLL, NS_STYLE_OVERFLOW_HIDDEN,
// or NS_STYLE_OVERFLOW_AUTO.
@@ -34,7 +34,7 @@ struct ScrollbarStyles
nsStyleCoord::CalcValue mScrollSnapDestinationX;
nsStyleCoord::CalcValue mScrollSnapDestinationY;
- ScrollbarStyles(uint8_t aH, uint8_t aV)
+ ScrollStyles(uint8_t aH, uint8_t aV)
: mHorizontal(aH), mVertical(aV),
mScrollBehavior(NS_STYLE_SCROLL_BEHAVIOR_AUTO),
mScrollSnapTypeX(NS_STYLE_SCROLL_SNAP_TYPE_NONE),
@@ -50,10 +50,10 @@ struct ScrollbarStyles
mScrollSnapDestinationY.mHasPercent = false;
}
- explicit ScrollbarStyles(const nsStyleDisplay* aDisplay);
- ScrollbarStyles(uint8_t aH, uint8_t aV, const nsStyleDisplay* aDisplay);
- ScrollbarStyles() {}
- bool operator==(const ScrollbarStyles& aStyles) const {
+ explicit ScrollStyles(const nsStyleDisplay* aDisplay);
+ ScrollStyles(uint8_t aH, uint8_t aV, const nsStyleDisplay* aDisplay);
+ ScrollStyles() {}
+ bool operator==(const ScrollStyles& aStyles) const {
return aStyles.mHorizontal == mHorizontal && aStyles.mVertical == mVertical &&
aStyles.mScrollBehavior == mScrollBehavior &&
aStyles.mScrollSnapTypeX == mScrollSnapTypeX &&
@@ -63,7 +63,7 @@ struct ScrollbarStyles
aStyles.mScrollSnapDestinationX == mScrollSnapDestinationX &&
aStyles.mScrollSnapDestinationY == mScrollSnapDestinationY;
}
- bool operator!=(const ScrollbarStyles& aStyles) const {
+ bool operator!=(const ScrollStyles& aStyles) const {
return !(*this == aStyles);
}
bool IsHiddenInBothDirections() const {
diff --git a/layout/base/ServoRestyleManager.cpp b/layout/base/ServoRestyleManager.cpp
index 82c81ea46..9ff3f4e88 100644
--- a/layout/base/ServoRestyleManager.cpp
+++ b/layout/base/ServoRestyleManager.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -278,24 +277,17 @@ ServoRestyleManager::FrameForPseudoElement(const nsIContent* aContent,
nsIAtom* aPseudoTagOrNull)
{
MOZ_ASSERT_IF(aPseudoTagOrNull, aContent->IsElement());
- nsIFrame* primaryFrame = aContent->GetPrimaryFrame();
if (!aPseudoTagOrNull) {
- return primaryFrame;
- }
-
- if (!primaryFrame) {
- return nullptr;
+ return aContent->GetPrimaryFrame();
}
- // NOTE: we probably need to special-case display: contents here. Gecko's
- // RestyleManager passes the primary frame of the parent instead.
if (aPseudoTagOrNull == nsCSSPseudoElements::before) {
- return nsLayoutUtils::GetBeforeFrameForContent(primaryFrame, aContent);
+ return nsLayoutUtils::GetBeforeFrame(aContent);
}
if (aPseudoTagOrNull == nsCSSPseudoElements::after) {
- return nsLayoutUtils::GetAfterFrameForContent(primaryFrame, aContent);
+ return nsLayoutUtils::GetAfterFrame(aContent);
}
MOZ_CRASH("Unkown pseudo-element given to "
@@ -514,12 +506,12 @@ ServoRestyleManager::ContentRemoved(nsINode* aContainer,
NS_WARNING("stylo: ServoRestyleManager::ContentRemoved not implemented");
}
-nsresult
+void
ServoRestyleManager::ContentStateChanged(nsIContent* aContent,
EventStates aChangedBits)
{
if (!aContent->IsElement()) {
- return NS_OK;
+ return;
}
Element* aElement = aContent->AsElement();
@@ -553,7 +545,6 @@ ServoRestyleManager::ContentStateChanged(nsIContent* aContent,
snapshot->AddState(previousState);
PostRestyleEvent(aElement, restyleHint, changeHint);
- return NS_OK;
}
void
diff --git a/layout/base/ServoRestyleManager.h b/layout/base/ServoRestyleManager.h
index 6856171c1..855b3cab1 100644
--- a/layout/base/ServoRestyleManager.h
+++ b/layout/base/ServoRestyleManager.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -63,8 +62,7 @@ public:
nsIContent* aChild);
void RestyleForAppend(nsIContent* aContainer,
nsIContent* aFirstNewContent);
- nsresult ContentStateChanged(nsIContent* aContent,
- EventStates aStateMask);
+ void ContentStateChanged(nsIContent* aContent, EventStates aStateMask);
void AttributeWillChange(dom::Element* aElement,
int32_t aNameSpaceID,
nsIAtom* aAttribute,
diff --git a/layout/base/StaticPresData.cpp b/layout/base/StaticPresData.cpp
index 73acd5440..74b0e17eb 100644
--- a/layout/base/StaticPresData.cpp
+++ b/layout/base/StaticPresData.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/base/StaticPresData.h b/layout/base/StaticPresData.h
index 62e174fd2..5e8b8d66b 100644
--- a/layout/base/StaticPresData.h
+++ b/layout/base/StaticPresData.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/base/TouchManager.cpp b/layout/base/TouchManager.cpp
index e7972d5af..4439a3a7b 100644
--- a/layout/base/TouchManager.cpp
+++ b/layout/base/TouchManager.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: set ts=2 sw=2 et tw=78:
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/layout/base/TouchManager.h b/layout/base/TouchManager.h
index 7c0d51734..8a41a90ca 100644
--- a/layout/base/TouchManager.h
+++ b/layout/base/TouchManager.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: set ts=2 sw=2 et tw=78:
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/layout/base/UnitTransforms.h b/layout/base/UnitTransforms.h
index e3a5af2d2..5320964dd 100644
--- a/layout/base/UnitTransforms.h
+++ b/layout/base/UnitTransforms.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/base/Units.h b/layout/base/Units.h
index 199a91902..4e33ae8a4 100644
--- a/layout/base/Units.h
+++ b/layout/base/Units.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/base/ZoomConstraintsClient.cpp b/layout/base/ZoomConstraintsClient.cpp
index 2391a116d..67666676b 100644
--- a/layout/base/ZoomConstraintsClient.cpp
+++ b/layout/base/ZoomConstraintsClient.cpp
@@ -53,7 +53,7 @@ GetWidget(nsIPresShell* aShell)
return nullptr;
}
if (nsIFrame* rootFrame = aShell->GetRootFrame()) {
-#if defined(MOZ_WIDGET_ANDROID) || defined(MOZ_WIDGET_UIKIT)
+#if defined(MOZ_WIDGET_UIKIT)
return rootFrame->GetNearestWidget();
#else
if (nsView* view = rootFrame->GetView()) {
diff --git a/layout/base/crashtests/1261351-iframe.html b/layout/base/crashtests/1261351-iframe.html
index 82c1e25fa..a0484f332 100644
--- a/layout/base/crashtests/1261351-iframe.html
+++ b/layout/base/crashtests/1261351-iframe.html
@@ -3,23 +3,26 @@
'use strict';
// -sp-context: content
(function () {
- let proto = Object.create(HTMLDivElement.prototype);
- proto.template = `<style></style>`;
- proto.createdCallback = function() {
- let shadow = this.createShadowRoot();
- if (this.template) {
- let te = document.createElement('template');
- te.innerHTML = this.template;
- shadow.appendChild(document.importNode(te.content, true));
- }
- };
+ class UiComponentTest extends HTMLDivElement {
+ constructor() {
+ super();
+ this.template = `<style></style>`;
+ }
- let UiComponentTest = document.registerElement('ui-component-test', {
- prototype: proto,
- });
+ connectedCallback() {
+ let shadow = this.createShadowRoot();
+ if (this.template) {
+ let te = document.createElement('template');
+ te.innerHTML = this.template;
+ shadow.appendChild(document.importNode(te.content, true));
+ }
+ }
+ };
- let uic = new UiComponentTest();
- document.body.appendChild(uic);
+ customElements.define('ui-component-test', UiComponentTest, { extend: 'div'} );
+
+ let uic = new UiComponentTest();
+ document.body.appendChild(uic);
})();
</script>
diff --git a/layout/base/crashtests/1404789-1.html b/layout/base/crashtests/1404789-1.html
new file mode 100644
index 000000000..bd577ae24
--- /dev/null
+++ b/layout/base/crashtests/1404789-1.html
@@ -0,0 +1,16 @@
+<!doctype html>
+<script>
+ // Test for content redistribution outside of the document.
+ // Passes if it doesn't assert.
+ let host = document.createElement('div');
+ host.innerHTML = "<div id='foo'></div>";
+
+ let shadowRoot = host.createShadowRoot();
+ shadowRoot.innerHTML = "<content select='#foo'></content>";
+
+ host.firstElementChild.removeAttribute('id');
+
+ // Move to the document, do the same.
+ document.documentElement.appendChild(host);
+ host.firstElementChild.setAttribute('id', 'foo');
+</script>
diff --git a/layout/base/crashtests/1404789-2.html b/layout/base/crashtests/1404789-2.html
new file mode 100644
index 000000000..667618141
--- /dev/null
+++ b/layout/base/crashtests/1404789-2.html
@@ -0,0 +1,2 @@
+<!doctype html>
+<iframe style="display: none" src="1404789-1.html"></iframe>
diff --git a/layout/base/crashtests/1419762.html b/layout/base/crashtests/1419762.html
new file mode 100644
index 000000000..08a56106d
--- /dev/null
+++ b/layout/base/crashtests/1419762.html
@@ -0,0 +1,15 @@
+<style id='style_1'>
+ :first-child { display: table-column-group; }
+</style>
+<script>
+ try { o1 = document.createElement('isindex') } catch(e) { }
+ try { o2 = document.createElement('input') } catch(e) { }
+ try { o3 = document.createElement('optgroup') } catch(e) { }
+ try { o4 = document.createElement('col') } catch(e) { }
+ try { document.documentElement.appendChild(o1) } catch(e) { }
+ try { o1.appendChild(o2) } catch(e) { }
+ try { o1.appendChild(o3) } catch(e) { }
+ try { document.documentElement.offsetTop; } catch (e) { }
+ try { document.documentElement.appendChild(o4) } catch(e) { }
+ try { document.styleSheets[0].insertRule('optgroup::first-line { list-style-type: japanese-formal; }', 0); } catch(e) { }
+</script>
diff --git a/layout/base/crashtests/crashtests.list b/layout/base/crashtests/crashtests.list
index 6ded4ff3f..1a3bf667b 100644
--- a/layout/base/crashtests/crashtests.list
+++ b/layout/base/crashtests/crashtests.list
@@ -294,7 +294,7 @@ load 469861-1.xhtml
load 469861-2.xhtml
load 470851-1.xhtml
load 471594-1.xhtml
-asserts-if(Android&&!asyncPan,1-2) load 473042.xhtml # bug 1034369 (may also cause a few assertions to be registered on the next test)
+load 473042.xhtml # bug 1034369 (may also cause a few assertions to be registered on the next test)
asserts(0-5) load 474075.html # bug 847368
load 477333-1.xhtml
load 477731-1.html
@@ -411,7 +411,7 @@ load 709536-1.xhtml
load 722137.html
load 725535.html
load 727601.html
-skip-if(Android) asserts(0-2) pref(dom.disable_open_during_load,false) load 735943.html # the assertion is bug 735966, for android bug 760271
+asserts(0-2) pref(dom.disable_open_during_load,false) load 735943.html # the assertion is bug 735966
asserts(0-2) load 736389-1.xhtml # sometimes the above assertions are delayed and is reported on this test instead
load 736924-1.html
load 749816-1.html
@@ -447,7 +447,7 @@ load 866588.html
load 876092.html
load 876221.html
load 897852.html
-asserts(4-6) asserts-if(Android&&!asyncPan,2) load 898913.html # bug 847368
+asserts(4-6) load 898913.html # bug 847368
pref(layers.acceleration.enabled,false) pref(layers.force-active,true) load 919434.html
load 926728.html
load 930381.html
@@ -483,3 +483,6 @@ load 1308793.svg
load 1308848-1.html
load 1308848-2.html
asserts(0-1) load 1343606.html # bug 1343948
+load 1404789-1.html
+load 1404789-2.html
+load 1419762.html
diff --git a/layout/base/gtest/TestAccessibleCaretEventHub.cpp b/layout/base/gtest/TestAccessibleCaretEventHub.cpp
index 5216a52dc..cc3b332ee 100644
--- a/layout/base/gtest/TestAccessibleCaretEventHub.cpp
+++ b/layout/base/gtest/TestAccessibleCaretEventHub.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/base/gtest/TestAccessibleCaretManager.cpp b/layout/base/gtest/TestAccessibleCaretManager.cpp
index 78ec6eea9..acaea92a5 100644
--- a/layout/base/gtest/TestAccessibleCaretManager.cpp
+++ b/layout/base/gtest/TestAccessibleCaretManager.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/base/gtest/moz.build b/layout/base/gtest/moz.build
index 2e9100443..0dbc4c5e7 100644
--- a/layout/base/gtest/moz.build
+++ b/layout/base/gtest/moz.build
@@ -1,5 +1,4 @@
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/layout/base/moz.build b/layout/base/moz.build
index f115280ce..86377e9db 100644
--- a/layout/base/moz.build
+++ b/layout/base/moz.build
@@ -1,5 +1,4 @@
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -96,7 +95,7 @@ EXPORTS += [
'nsRefreshDriver.h',
'nsStyleChangeList.h',
'nsStyleSheetService.h',
- 'ScrollbarStyles.h',
+ 'ScrollStyles.h',
'StackArena.h',
'Units.h',
'UnitTransforms.h',
@@ -163,7 +162,7 @@ SOURCES += [
'RestyleManager.cpp',
'RestyleManagerBase.cpp',
'RestyleTracker.cpp',
- 'ScrollbarStyles.cpp',
+ 'ScrollStyles.cpp',
'ServoRestyleManager.cpp',
'StackArena.cpp',
'StaticPresData.cpp',
@@ -194,11 +193,6 @@ LOCAL_INCLUDES += [
'/view',
]
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
- LOCAL_INCLUDES += [
- '/widget/android',
- ]
-
FINAL_LIBRARY = 'xul'
BROWSER_CHROME_MANIFESTS += ['tests/browser.ini']
diff --git a/layout/base/nsArenaMemoryStats.h b/layout/base/nsArenaMemoryStats.h
index 2a872cfe8..ea4535e2c 100644
--- a/layout/base/nsArenaMemoryStats.h
+++ b/layout/base/nsArenaMemoryStats.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp
index d28e60740..2cc5ec818 100644
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -43,6 +43,7 @@
#include "nsContainerFrame.h"
#include "nsNameSpaceManager.h"
#include "nsIComboboxControlFrame.h"
+#include "nsComboboxControlFrame.h"
#include "nsIListControlFrame.h"
#include "nsIDOMCharacterData.h"
#include "nsPlaceholderFrame.h"
@@ -691,10 +692,9 @@ nsAbsoluteItems::nsAbsoluteItems(nsContainerFrame* aContainingBlock)
void
nsAbsoluteItems::AddChild(nsIFrame* aChild)
{
- NS_ASSERTION(aChild->PresContext()->FrameManager()->
- GetPlaceholderFrameFor(aChild),
- "Child without placeholder being added to nsAbsoluteItems?");
aChild->AddStateBits(NS_FRAME_OUT_OF_FLOW);
+ NS_ASSERTION(aChild->GetPlaceholderFrame(),
+ "Child without placeholder being added to nsAbsoluteItems?");
nsFrameItems::AddChild(aChild);
}
@@ -1831,11 +1831,7 @@ nsCSSFrameConstructor::CreateGeneratedContentItem(nsFrameConstructorState& aStat
aPseudoElement == CSSPseudoElementType::after,
"unexpected aPseudoElement");
- // XXXbz is this ever true?
- if (!aParentContent->IsElement()) {
- NS_ERROR("Bogus generated content parent");
- return;
- }
+ MOZ_ASSERT(aParentContent->IsElement());
StyleSetHandle styleSet = mPresShell->StyleSet();
@@ -1863,7 +1859,15 @@ nsCSSFrameConstructor::CreateGeneratedContentItem(nsFrameConstructorState& aStat
nsresult rv = NS_NewXMLElement(getter_AddRefs(container), nodeInfo.forget());
if (NS_FAILED(rv))
return;
+
+ // Cleared when the pseudo is unbound from the tree, so no need to store a
+ // strong reference, nor a destructor.
+ nsIAtom* property = isBefore
+ ? nsGkAtoms::beforePseudoProperty : nsGkAtoms::afterPseudoProperty;
+ aParentContent->SetProperty(property, container.get());
+
container->SetIsNativeAnonymousRoot();
+ container->SetPseudoElementType(aPseudoElement);
// If the parent is in a shadow tree, make sure we don't
// bind with a document because shadow roots and its descendants
@@ -2402,12 +2406,12 @@ nsCSSFrameConstructor::ConstructDocElementFrame(Element* aDocEle
GetRootFrame()->SetStyleContextWithoutNotification(sc);
}
- // Make sure to call UpdateViewportScrollbarStylesOverride before
+ // Make sure to call UpdateViewportScrollStylesOverride before
// SetUpDocElementContainingBlock, since it sets up our scrollbar state
// properly.
DebugOnly<nsIContent*> propagatedScrollFrom;
if (nsPresContext* presContext = mPresShell->GetPresContext()) {
- propagatedScrollFrom = presContext->UpdateViewportScrollbarStylesOverride();
+ propagatedScrollFrom = presContext->UpdateViewportScrollStylesOverride();
}
SetUpDocElementContainingBlock(aDocElement);
@@ -3028,14 +3032,12 @@ nsCSSFrameConstructor::CreatePlaceholderFrameFor(nsIPresShell* aPresShell,
placeholderFrame->Init(aContent, aParentFrame, aPrevInFlow);
- // The placeholder frame has a pointer back to the out-of-flow frame
+ // Associate the placeholder/out-of-flow with each other.
placeholderFrame->SetOutOfFlowFrame(aFrame);
+ aFrame->SetProperty(nsIFrame::PlaceholderFrameProperty(), placeholderFrame);
aFrame->AddStateBits(NS_FRAME_OUT_OF_FLOW);
- // Add mapping from absolutely positioned frame to its placeholder frame
- aPresShell->FrameManager()->RegisterPlaceholderFrame(placeholderFrame);
-
return placeholderFrame;
}
@@ -3076,7 +3078,7 @@ nsCSSFrameConstructor::ConstructSelectFrame(nsFrameConstructorState& aState,
// The drop-down list's frame is created explicitly. The combobox frame shares its content
// with the drop-down list.
nsFrameState flags = NS_BLOCK_FLOAT_MGR;
- nsContainerFrame* comboboxFrame =
+ nsComboboxControlFrame* comboboxFrame =
NS_NewComboboxControlFrame(mPresShell, styleContext, flags);
// Save the history state so we don't restore during construction
@@ -3091,10 +3093,6 @@ nsCSSFrameConstructor::ConstructSelectFrame(nsFrameConstructorState& aState,
aState.AddChild(comboboxFrame, aFrameItems, content, styleContext,
aParentFrame);
- nsIComboboxControlFrame* comboBox = do_QueryFrame(comboboxFrame);
- NS_ASSERTION(comboBox, "NS_NewComboboxControlFrame returned frame that "
- "doesn't implement nsIComboboxControlFrame");
-
// Resolve pseudo element style for the dropdown list
RefPtr<nsStyleContext> listStyle;
listStyle = mPresShell->StyleSet()->
@@ -3109,7 +3107,7 @@ nsCSSFrameConstructor::ConstructSelectFrame(nsFrameConstructorState& aState,
listControlFrame->SetComboboxFrame(comboboxFrame);
}
// Notify combobox that it should use the listbox as it's popup
- comboBox->SetDropDown(listFrame);
+ comboboxFrame->SetDropDown(listFrame);
NS_ASSERTION(!listFrame->IsAbsPosContainingBlock(),
"Ended up with positioned dropdown list somehow.");
@@ -3130,10 +3128,29 @@ nsCSSFrameConstructor::ConstructSelectFrame(nsFrameConstructorState& aState,
// Create display and button frames from the combobox's anonymous content.
// The anonymous content is appended to existing anonymous content for this
// element (the scrollbars).
-
nsFrameItems childItems;
- CreateAnonymousFrames(aState, content, comboboxFrame,
- aItem.mPendingBinding, childItems);
+
+ // nsComboboxControlFrame needs special frame creation behavior for its first
+ // piece of anonymous content, which means that we can't take the normal
+ // ProcessChildren path.
+ AutoTArray<nsIAnonymousContentCreator::ContentInfo, 2> newAnonymousItems;
+ DebugOnly<nsresult> rv = GetAnonymousContent(content, comboboxFrame, newAnonymousItems);
+ MOZ_ASSERT(NS_SUCCEEDED(rv));
+ MOZ_ASSERT(newAnonymousItems.Length() == 2);
+
+ // Manually create a frame for the special NAC.
+ MOZ_ASSERT(newAnonymousItems[0].mContent == comboboxFrame->GetDisplayNode());
+ newAnonymousItems.RemoveElementAt(0);
+ nsIFrame* customFrame = comboboxFrame->CreateFrameForDisplayNode();
+ MOZ_ASSERT(customFrame);
+ customFrame->AddStateBits(NS_FRAME_ANONYMOUSCONTENTCREATOR_CONTENT);
+ childItems.AddChild(customFrame);
+
+ // The other piece of NAC can take the normal path.
+ FrameConstructionItemList fcItems;
+ AddFCItemsForAnonymousContent(aState, comboboxFrame, newAnonymousItems,
+ fcItems);
+ ConstructFramesFromItemList(aState, fcItems, comboboxFrame, childItems);
comboboxFrame->SetInitialChildList(kPrincipalList, childItems);
@@ -3173,7 +3190,7 @@ nsCSSFrameConstructor::ConstructSelectFrame(nsFrameConstructorState& aState,
* But the select tag should really be fixed to use GFX scrollbars that can
* be create with BuildScrollFrame.
*/
-nsresult
+void
nsCSSFrameConstructor::InitializeSelectFrame(nsFrameConstructorState& aState,
nsContainerFrame* scrollFrame,
nsContainerFrame* scrolledFrame,
@@ -3219,7 +3236,6 @@ nsCSSFrameConstructor::InitializeSelectFrame(nsFrameConstructorState& aState,
// Set the scrolled frame's initial child lists
scrolledFrame->SetInitialChildList(kPrincipalList, childItems);
- return NS_OK;
}
nsIFrame*
@@ -3564,10 +3580,6 @@ nsCSSFrameConstructor::FindHTMLData(Element* aElement,
return nullptr;
}
- if (aTag == nsGkAtoms::details && !HTMLDetailsElement::IsDetailsEnabled()) {
- return nullptr;
- }
-
static const FrameConstructionDataByTag sHTMLData[] = {
SIMPLE_TAG_CHAIN(img, nsCSSFrameConstructor::FindImgData),
SIMPLE_TAG_CHAIN(mozgeneratedcontentimage,
@@ -3656,14 +3668,8 @@ nsCSSFrameConstructor::FindInputData(Element* aElement,
nsCSSAnonBoxes::buttonContent) },
// TODO: this is temporary until a frame is written: bug 635240.
SIMPLE_INT_CREATE(NS_FORM_INPUT_NUMBER, NS_NewNumberControlFrame),
-#if defined(MOZ_WIDGET_ANDROID)
- // On Android/B2G, date/time input appears as a normal text box.
- SIMPLE_INT_CREATE(NS_FORM_INPUT_TIME, NS_NewTextControlFrame),
- SIMPLE_INT_CREATE(NS_FORM_INPUT_DATE, NS_NewTextControlFrame),
-#else
SIMPLE_INT_CREATE(NS_FORM_INPUT_TIME, NS_NewDateTimeControlFrame),
SIMPLE_INT_CREATE(NS_FORM_INPUT_DATE, NS_NewDateTimeControlFrame),
-#endif
// TODO: this is temporary until a frame is written: bug 888320
SIMPLE_INT_CREATE(NS_FORM_INPUT_MONTH, NS_NewTextControlFrame),
// TODO: this is temporary until a frame is written: bug 888320
@@ -3810,7 +3816,7 @@ nsCSSFrameConstructor::ConstructFrameFromItemInternal(FrameConstructionItem& aIt
// AutoDisplayContentsAncestorPusher above.)
TreeMatchContext::AutoAncestorPusher
insertionPointPusher(aState.mTreeMatchContext);
- if (adcp.IsEmpty() && parent && nsContentUtils::IsContentInsertionPoint(parent)) {
+ if (adcp.IsEmpty() && parent && parent->IsActiveChildrenElement()) {
if (aState.mTreeMatchContext.mAncestorFilter.HasFilter()) {
insertionPointPusher.PushAncestorAndStyleScope(parent);
} else {
@@ -4099,70 +4105,6 @@ nsCSSFrameConstructor::ConstructFrameFromItemInternal(FrameConstructionItem& aIt
}
}
-// after the node has been constructed and initialized create any
-// anonymous content a node needs.
-nsresult
-nsCSSFrameConstructor::CreateAnonymousFrames(nsFrameConstructorState& aState,
- nsIContent* aParent,
- nsContainerFrame* aParentFrame,
- PendingBinding* aPendingBinding,
- nsFrameItems& aChildItems)
-{
- AutoTArray<nsIAnonymousContentCreator::ContentInfo, 4> newAnonymousItems;
- nsresult rv = GetAnonymousContent(aParent, aParentFrame, newAnonymousItems);
- NS_ENSURE_SUCCESS(rv, rv);
-
- uint32_t count = newAnonymousItems.Length();
- if (count == 0) {
- return NS_OK;
- }
-
- nsFrameConstructorState::PendingBindingAutoPusher pusher(aState,
- aPendingBinding);
- TreeMatchContext::AutoAncestorPusher ancestorPusher(aState.mTreeMatchContext);
- if (aState.mTreeMatchContext.mAncestorFilter.HasFilter()) {
- ancestorPusher.PushAncestorAndStyleScope(aParent->AsElement());
- } else {
- ancestorPusher.PushStyleScope(aParent->AsElement());
- }
-
- nsIAnonymousContentCreator* creator = do_QueryFrame(aParentFrame);
- NS_ASSERTION(creator,
- "How can that happen if we have nodes to construct frames for?");
-
- InsertionPoint insertion(aParentFrame, aParent);
- for (uint32_t i=0; i < count; i++) {
- nsIContent* content = newAnonymousItems[i].mContent;
- NS_ASSERTION(content, "null anonymous content?");
- NS_ASSERTION(!newAnonymousItems[i].mStyleContext, "Unexpected style context");
- NS_ASSERTION(newAnonymousItems[i].mChildren.IsEmpty(),
- "This method is not currently used with frames that implement "
- "nsIAnonymousContentCreator::CreateAnonymousContent to "
- "output a list where the items have their own children");
-
- nsIFrame* newFrame = creator->CreateFrameFor(content);
- if (newFrame) {
- NS_ASSERTION(content->GetPrimaryFrame(),
- "Content must have a primary frame now");
- newFrame->AddStateBits(NS_FRAME_ANONYMOUSCONTENTCREATOR_CONTENT);
- aChildItems.AddChild(newFrame);
- } else {
- FrameConstructionItemList items;
- {
- // Skip parent display based style-fixup during our
- // AddFrameConstructionItems() call:
- TreeMatchContext::AutoParentDisplayBasedStyleFixupSkipper
- parentDisplayBasedStyleFixupSkipper(aState.mTreeMatchContext);
-
- AddFrameConstructionItems(aState, content, true, insertion, items);
- }
- ConstructFramesFromItemList(aState, items, aParentFrame, aChildItems);
- }
- }
-
- return NS_OK;
-}
-
static void
SetFlagsOnSubtree(nsIContent *aNode, uintptr_t aFlagsToSet)
{
@@ -4214,6 +4156,13 @@ ConnectAnonymousTreeDescendants(nsIContent* aParent,
}
}
+void SetNativeAnonymousBitOnDescendants(nsIContent *aRoot)
+{
+ for (nsIContent* curr = aRoot; curr; curr = curr->GetNextNode(aRoot)) {
+ curr->SetFlags(NODE_IS_NATIVE_ANONYMOUS);
+ }
+}
+
nsresult
nsCSSFrameConstructor::GetAnonymousContent(nsIContent* aParent,
nsIFrame* aParentFrame,
@@ -4235,16 +4184,32 @@ nsCSSFrameConstructor::GetAnonymousContent(nsIContent* aParent,
nsIContent* content = aContent[i].mContent;
NS_ASSERTION(content, "null anonymous content?");
- // least-surprise CSS binding until we do the SVG specified
- // cascading rules for <svg:use> - bug 265894
- if (aParentFrame->GetType() == nsGkAtoms::svgUseFrame) {
+ ConnectAnonymousTreeDescendants(content, aContent[i].mChildren);
+
+ nsIAtom* parentFrameType = aParentFrame->GetType();
+ if (parentFrameType == nsGkAtoms::svgUseFrame) {
+ // least-surprise CSS binding until we do the SVG specified
+ // cascading rules for <svg:use> - bug 265894
content->SetFlags(NODE_IS_ANONYMOUS_ROOT);
} else {
content->SetIsNativeAnonymousRoot();
+ // Don't mark descendants of the custom content container
+ // as native anonymous. When canvas custom content is initially
+ // created and appended to the custom content container, in
+ // nsIDocument::InsertAnonymousContent, it is not considered native
+ // anonymous content. But if we end up reframing the root element,
+ // we will re-create the nsCanvasFrame, and we would end up in here,
+ // marking it as NAC. Existing uses of canvas custom content would
+ // break if it becomes NAC (since each element starts inheriting
+ // styles from its closest non-NAC ancestor, rather than from its
+ // parent).
+ if (!(parentFrameType == nsGkAtoms::canvasFrame &&
+ content == static_cast<nsCanvasFrame*>(aParentFrame)
+ ->GetCustomContentContainer())) {
+ SetNativeAnonymousBitOnDescendants(content);
+ }
}
- ConnectAnonymousTreeDescendants(content, aContent[i].mChildren);
-
bool anonContentIsEditable = content->HasFlag(NODE_IS_EDITABLE);
// If the parent is in a shadow tree, make sure we don't
@@ -4269,11 +4234,9 @@ nsCSSFrameConstructor::GetAnonymousContent(nsIContent* aParent,
}
if (ServoStyleSet* styleSet = mPresShell->StyleSet()->GetAsServo()) {
- // Eagerly compute styles for the anonymous content tree, but only do so
- // if the content doesn't have an explicit style context (if it does, we
- // don't need the normal computed values).
+ // Eagerly compute styles for the anonymous content tree.
for (auto& info : aContent) {
- if (!info.mStyleContext) {
+ if (info.mContent->IsElement()) {
styleSet->StyleNewSubtree(info.mContent);
}
}
@@ -4579,11 +4542,25 @@ nsCSSFrameConstructor::BeginBuildingScrollFrame(nsFrameConstructorState& aState,
// if there are any anonymous children for the scroll frame, create
// frames for them.
- // Pass a null pending binding: we don't care how constructors for any of
- // this anonymous content order with anything else. It's never been
- // consistent anyway.
- CreateAnonymousFrames(aState, aContent, gfxScrollFrame, nullptr,
- anonymousItems);
+ //
+ // We can't take the normal ProcessChildren path, because the NAC needs to
+ // be parented to the scrollframe, and everything else needs to be parented
+ // to the scrolledframe.
+ AutoTArray<nsIAnonymousContentCreator::ContentInfo, 4> scrollNAC;
+ DebugOnly<nsresult> rv = GetAnonymousContent(aContent, gfxScrollFrame, scrollNAC);
+ MOZ_ASSERT(NS_SUCCEEDED(rv));
+ if (scrollNAC.Length() > 0) {
+ TreeMatchContext::AutoAncestorPusher ancestorPusher(aState.mTreeMatchContext);
+ if (aState.mTreeMatchContext.mAncestorFilter.HasFilter()) {
+ ancestorPusher.PushAncestorAndStyleScope(aContent->AsElement());
+ } else {
+ ancestorPusher.PushStyleScope(aContent->AsElement());
+ }
+
+ FrameConstructionItemList items;
+ AddFCItemsForAnonymousContent(aState, gfxScrollFrame, scrollNAC, items);
+ ConstructFramesFromItemList(aState, items, gfxScrollFrame, anonymousItems);
+ }
aNewFrame = gfxScrollFrame;
@@ -4683,7 +4660,7 @@ nsCSSFrameConstructor::FindDisplayData(const nsStyleDisplay* aDisplay,
if (aElement->IsHTMLElement(nsGkAtoms::body)) {
if (nsPresContext* presContext = mPresShell->GetPresContext()) {
propagatedScrollToViewport =
- presContext->UpdateViewportScrollbarStylesOverride() == aElement;
+ presContext->UpdateViewportScrollStylesOverride() == aElement;
}
}
@@ -4719,7 +4696,7 @@ nsCSSFrameConstructor::FindDisplayData(const nsStyleDisplay* aDisplay,
// scrollframe so that it paginates correctly, but we don't want to set
// the bit on the block that tells it to clip at paint time.
if (mPresShell->GetPresContext()->
- ElementWouldPropagateScrollbarStyles(aElement)) {
+ ElementWouldPropagateScrollStyles(aElement)) {
suppressScrollFrame = false;
}
}
@@ -5039,22 +5016,46 @@ nsCSSFrameConstructor::ResolveStyleContext(const InsertionPoint& aInsertion,
already_AddRefed<nsStyleContext>
nsCSSFrameConstructor::ResolveStyleContext(nsStyleContext* aParentStyleContext,
nsIContent* aContent,
- nsFrameConstructorState* aState)
+ nsFrameConstructorState* aState,
+ Element* aOriginatingElementOrNull)
{
StyleSetHandle styleSet = mPresShell->StyleSet();
aContent->OwnerDoc()->FlushPendingLinkUpdates();
RefPtr<nsStyleContext> result;
if (aContent->IsElement()) {
- if (aState) {
- result = styleSet->ResolveStyleFor(aContent->AsElement(),
- aParentStyleContext,
- aState->mTreeMatchContext);
+ auto pseudoType = aContent->AsElement()->GetPseudoElementType();
+ if (pseudoType == CSSPseudoElementType::NotPseudo) {
+ MOZ_ASSERT(!aOriginatingElementOrNull);
+ if (aState) {
+ result = styleSet->ResolveStyleFor(aContent->AsElement(),
+ aParentStyleContext,
+ aState->mTreeMatchContext);
+ } else {
+ result = styleSet->ResolveStyleFor(aContent->AsElement(),
+ aParentStyleContext);
+ }
} else {
- result = styleSet->ResolveStyleFor(aContent->AsElement(),
- aParentStyleContext);
+ MOZ_ASSERT(aContent->IsInNativeAnonymousSubtree());
+ if (!aOriginatingElementOrNull) {
+ // For pseudo-implementing NAC created by JS using the ChromeOnly
+ // document.createElement(..., { pseudo: ... }) API, we find the
+ // originating element by lookup the tree until we find a non-NAC
+ // ancestor. (These are the correct semantics for C++-generated pseudo-
+ // implementing NAC as well, but for those cases we already have a
+ // correct originating element passed in.)
+ MOZ_ASSERT(nsCSSPseudoElements::PseudoElementIsJSCreatedNAC(pseudoType));
+ aOriginatingElementOrNull =
+ nsContentUtils::GetClosestNonNativeAnonymousAncestor(aContent->AsElement());
+ }
+ MOZ_ASSERT(aOriginatingElementOrNull);
+ result = styleSet->ResolvePseudoElementStyle(aOriginatingElementOrNull,
+ pseudoType,
+ aParentStyleContext,
+ aContent->AsElement());
}
} else {
+ MOZ_ASSERT(!aOriginatingElementOrNull);
NS_ASSERTION(aContent->IsNodeOfType(nsINode::eTEXT),
"shouldn't waste time creating style contexts for "
"comments and processing instructions");
@@ -5790,7 +5791,7 @@ nsCSSFrameConstructor::AddFrameConstructionItemsInternal(nsFrameConstructorState
// ::before and ::after); we always want to create "internal" anonymous
// content.
auto* details = HTMLDetailsElement::FromContentOrNull(parent);
- if (details && details->IsDetailsEnabled() && !details->Open() &&
+ if (details && !details->Open() &&
(!aContent->IsRootOfNativeAnonymousSubtree() ||
aContent->IsGeneratedContentContainerForBefore() ||
aContent->IsGeneratedContentContainerForAfter())) {
@@ -5958,7 +5959,7 @@ nsCSSFrameConstructor::AddFrameConstructionItemsInternal(nsFrameConstructorState
}
FrameConstructionItem* item = nullptr;
- if (details && details->IsDetailsEnabled() && details->Open()) {
+ if (details && details->Open()) {
auto* summary = HTMLSummaryElement::FromContentOrNull(aContent);
if (summary && summary->IsMainSummary()) {
// If details is open, the main summary needs to be rendered as if it is
@@ -6071,9 +6072,10 @@ nsCSSFrameConstructor::AddFrameConstructionItemsInternal(nsFrameConstructorState
static void
AddGenConPseudoToFrame(nsIFrame* aOwnerFrame, nsIContent* aContent)
{
- NS_ASSERTION(nsLayoutUtils::IsFirstContinuationOrIBSplitSibling(aOwnerFrame),
- "property should only be set on first continuation/ib-sibling");
+ // FIXME(emilio): Remove this property, and use the frame of the generated
+ // content itself to tear the content down? It should be quite simpler.
+ aOwnerFrame = nsLayoutUtils::FirstContinuationOrIBSplitSibling(aOwnerFrame);
nsIFrame::ContentArray* value =
aOwnerFrame->GetProperty(nsIFrame::GenConProperty());
if (!value) {
@@ -6204,16 +6206,16 @@ IsRootBoxFrame(nsIFrame *aFrame)
return (aFrame->GetType() == nsGkAtoms::rootFrame);
}
-nsresult
+void
nsCSSFrameConstructor::ReconstructDocElementHierarchy()
{
Element* rootElement = mDocument->GetRootElement();
if (!rootElement) {
/* nothing to do */
- return NS_OK;
+ return;
}
- return RecreateFramesForContent(rootElement, false, REMOVE_FOR_RECONSTRUCTION,
- nullptr);
+ RecreateFramesForContent(rootElement, InsertionKind::Sync,
+ REMOVE_FOR_RECONSTRUCTION);
}
nsContainerFrame*
@@ -6318,129 +6320,24 @@ nsCSSFrameConstructor::GetFloatContainingBlock(nsIFrame* aFrame)
}
/**
- * This function will check whether aContainer has :after generated content.
- * If so, appending to it should actually insert. The return value is the
- * parent to use for newly-appended content. *aAfterFrame points to the :after
- * frame before which appended content should go, if there is one.
- */
-static nsContainerFrame*
-AdjustAppendParentForAfterContent(nsFrameManager* aFrameManager,
- nsIContent* aContainer,
- nsContainerFrame* aParentFrame,
- nsIContent* aChild,
- nsIFrame** aAfterFrame)
-{
- // If the parent frame has any pseudo-elements or aContainer is a
- // display:contents node then we need to walk through the child
- // frames to find the first one that is either a ::after frame for an
- // ancestor of aChild or a frame that is for a node later in the
- // document than aChild and return that in aAfterFrame.
- if (aParentFrame->GetGenConPseudos() ||
- nsLayoutUtils::HasPseudoStyle(aContainer, aParentFrame->StyleContext(),
- CSSPseudoElementType::after,
- aParentFrame->PresContext()) ||
- aFrameManager->GetDisplayContentsStyleFor(aContainer)) {
- nsIFrame* afterFrame = nullptr;
- nsContainerFrame* parent =
- static_cast<nsContainerFrame*>(aParentFrame->LastContinuation());
- bool done = false;
- while (!done && parent) {
- // Ensure that all normal flow children are on the principal child list.
- parent->DrainSelfOverflowList();
-
- nsIFrame* child = parent->GetChildList(nsIFrame::kPrincipalList).LastChild();
- if (child && child->IsPseudoFrame(aContainer) &&
- !child->IsGeneratedContentFrame()) {
- // Drill down into non-generated pseudo frames of aContainer.
- nsContainerFrame* childAsContainer = do_QueryFrame(child);
- if (childAsContainer) {
- parent = nsLayoutUtils::LastContinuationWithChild(childAsContainer);
- continue;
- }
- }
-
- for (; child; child = child->GetPrevSibling()) {
- nsIContent* c = child->GetContent();
- if (child->IsGeneratedContentFrame()) {
- nsIContent* p = c->GetParent();
- if (c->NodeInfo()->NameAtom() == nsGkAtoms::mozgeneratedcontentafter) {
- if (!nsContentUtils::ContentIsDescendantOf(aChild, p) &&
- p != aContainer &&
- nsContentUtils::PositionIsBefore(p, aChild)) {
- // ::after generated content for content earlier in the doc and not
- // for an ancestor. "p != aContainer" may seem redundant but it
- // checks if the ::after belongs to the XBL insertion point we're
- // inserting aChild into (in which case ContentIsDescendantOf is
- // false even though p == aContainer).
- // See layout/reftests/bugs/482592-1a.xhtml for an example of that.
- done = true;
- break;
- }
- } else if (nsContentUtils::PositionIsBefore(p, aChild)) {
- // Non-::after generated content for content earlier in the doc.
- done = true;
- break;
- }
- } else if (nsContentUtils::PositionIsBefore(c, aChild)) {
- // Content is before aChild.
- done = true;
- break;
- }
- afterFrame = child;
- }
-
- parent = static_cast<nsContainerFrame*>(parent->GetPrevContinuation());
- }
- if (afterFrame) {
- *aAfterFrame = afterFrame;
- return afterFrame->GetParent();
- }
- }
-
- *aAfterFrame = nullptr;
-
- if (IsFramePartOfIBSplit(aParentFrame)) {
- // We might be in a situation where the last part of the {ib} split was
- // empty. Since we have no ::after pseudo-element, we do in fact want to be
- // appending to that last part, so advance to it if needed. Note that here
- // aParentFrame is the result of a GetLastIBSplitSibling call, so must be
- // either the last or next to last ib-split sibling.
- nsContainerFrame* trailingInline = GetIBSplitSibling(aParentFrame);
- if (trailingInline) {
- aParentFrame = trailingInline;
- }
-
- // Always make sure to look at the last continuation of the frame
- // for the {ib} case, even if that continuation is empty. We
- // don't do this for the non-ib-split-frame case, since in the
- // other cases appending to the last nonempty continuation is fine
- // and in fact not doing that can confuse code that doesn't know
- // to pull kids from continuations other than its next one.
- aParentFrame =
- static_cast<nsContainerFrame*>(aParentFrame->LastContinuation());
- }
-
- return aParentFrame;
-}
-
-/**
* This function will get the previous sibling to use for an append operation.
- * it takes a parent frame (must not be null) and its :after frame (may be
- * null).
+ *
+ * It takes a parent frame (must not be null) and the next insertion sibling, if
+ * the parent content is display: contents or has ::after content (may be null).
*/
static nsIFrame*
-FindAppendPrevSibling(nsIFrame* aParentFrame, nsIFrame* aAfterFrame)
+FindAppendPrevSibling(nsIFrame* aParentFrame, nsIFrame* aNextSibling)
{
- if (aAfterFrame) {
- NS_ASSERTION(aAfterFrame->GetParent() == aParentFrame, "Wrong parent");
- NS_ASSERTION(aAfterFrame->GetPrevSibling() ||
- aParentFrame->PrincipalChildList().FirstChild() == aAfterFrame,
- ":after frame must be on the principal child list here");
- return aAfterFrame->GetPrevSibling();
- }
-
aParentFrame->DrainSelfOverflowList();
+ if (aNextSibling) {
+ MOZ_ASSERT(aNextSibling->GetParent() == aParentFrame, "Wrong parent");
+ MOZ_ASSERT(aNextSibling->GetPrevSibling() ||
+ aParentFrame->PrincipalChildList().FirstChild() == aNextSibling,
+ "next sibling must be on the principal child list here");
+ return aNextSibling->GetPrevSibling();
+ }
+
return aParentFrame->GetChildList(kPrincipalList).LastChild();
}
@@ -6463,7 +6360,7 @@ GetInsertNextSibling(nsIFrame* aParentFrame, nsIFrame* aPrevSibling)
* appending flowed frames to a parent's principal child list. It handles the
* case where the parent is the trailing inline of an {ib} split.
*/
-nsresult
+void
nsCSSFrameConstructor::AppendFramesToParent(nsFrameConstructorState& aState,
nsContainerFrame* aParentFrame,
nsFrameItems& aFrameList,
@@ -6548,13 +6445,11 @@ nsCSSFrameConstructor::AppendFramesToParent(nsFrameConstructorState& aStat
return AppendFramesToParent(aState, aParentFrame->GetParent(), ibSiblings,
aParentFrame, true);
}
-
- return NS_OK;
+ return;
}
// Insert the frames after our aPrevSibling
InsertFrames(aParentFrame, kPrincipalList, aPrevSibling, aFrameList);
- return NS_OK;
}
#define UNSET_DISPLAY static_cast<StyleDisplay>(255)
@@ -6656,111 +6551,147 @@ nsCSSFrameConstructor::IsValidSibling(nsIFrame* aSibling,
return true;
}
+// FIXME(emilio): If we ever kill IsValidSibling() we can simplify this quite a
+// bit (no need to pass aTargetContent or aTargetContentDisplay, and the
+// adjust() calls can be responsibility of the caller).
+template<nsCSSFrameConstructor::SiblingDirection aDirection>
nsIFrame*
-nsCSSFrameConstructor::FindFrameForContentSibling(nsIContent* aContent,
- nsIContent* aTargetContent,
- StyleDisplay& aTargetContentDisplay,
- nsContainerFrame* aParentFrame,
- bool aPrevSibling)
-{
- nsIFrame* sibling = aContent->GetPrimaryFrame();
- if (!sibling && GetDisplayContentsStyleFor(aContent)) {
- // A display:contents node - check if it has a ::before / ::after frame...
- sibling = aPrevSibling ?
- nsLayoutUtils::GetAfterFrameForContent(aParentFrame, aContent) :
- nsLayoutUtils::GetBeforeFrameForContent(aParentFrame, aContent);
- if (!sibling) {
- // ... then recurse into children ...
- const bool forward = !aPrevSibling;
- FlattenedChildIterator iter(aContent, forward);
- sibling = aPrevSibling ?
- FindPreviousSibling(iter, aTargetContent, aTargetContentDisplay, aParentFrame) :
- FindNextSibling(iter, aTargetContent, aTargetContentDisplay, aParentFrame);
- }
- if (!sibling) {
- // ... then ::after / ::before on the opposite end.
- sibling = aPrevSibling ?
- nsLayoutUtils::GetBeforeFrameForContent(aParentFrame, aContent) :
- nsLayoutUtils::GetAfterFrameForContent(aParentFrame, aContent);
- }
- if (!sibling) {
- return nullptr;
+nsCSSFrameConstructor::FindSiblingInternal(
+ FlattenedChildIterator aIter,
+ nsIContent* aTargetContent,
+ StyleDisplay& aTargetContentDisplay)
+{
+ auto adjust = [&](nsIFrame* aPotentialSiblingFrame) -> nsIFrame* {
+ return AdjustSiblingFrame(
+ aPotentialSiblingFrame, aTargetContent, aTargetContentDisplay,
+ aDirection);
+ };
+
+ auto nextDomSibling = [](FlattenedChildIterator& aIter) -> nsIContent* {
+ return aDirection == SiblingDirection::Forward
+ ? aIter.GetNextChild() : aIter.GetPreviousChild();
+ };
+
+ auto getNearPseudo = [](const nsIContent* aContent) -> nsIFrame* {
+ return aDirection == SiblingDirection::Forward
+ ? nsLayoutUtils::GetBeforeFrame(aContent)
+ : nsLayoutUtils::GetAfterFrame(aContent);
+ };
+
+ auto getFarPseudo = [](const nsIContent* aContent) -> nsIFrame* {
+ return aDirection == SiblingDirection::Forward
+ ? nsLayoutUtils::GetAfterFrame(aContent)
+ : nsLayoutUtils::GetBeforeFrame(aContent);
+ };
+
+ while (nsIContent* sibling = nextDomSibling(aIter)) {
+ if (nsIFrame* primaryFrame = sibling->GetPrimaryFrame()) {
+ // XXX the GetContent() == sibling check is needed due to bug 135040.
+ // Remove it once that's fixed.
+ if (primaryFrame->GetContent() == sibling) {
+ if (nsIFrame* frame = adjust(primaryFrame)) {
+ return frame;
+ }
+ }
+ }
+
+ if (GetDisplayContentsStyleFor(sibling)) {
+ if (nsIFrame* frame = adjust(getNearPseudo(sibling))) {
+ return frame;
+ }
+
+ const bool startFromBeginning = aDirection == SiblingDirection::Forward;
+ FlattenedChildIterator iter(sibling, startFromBeginning);
+ nsIFrame* sibling = FindSiblingInternal<aDirection>(
+ iter, aTargetContent, aTargetContentDisplay);
+ if (sibling) {
+ return sibling;
+ }
}
- } else if (!sibling || sibling->GetContent() != aContent) {
- // XXX the GetContent() != aContent check is needed due to bug 135040.
- // Remove it once that's fixed.
- return nullptr;
}
- // If the frame is out-of-flow, GetPrimaryFrame() will have returned the
- // out-of-flow frame; we want the placeholder.
- if (sibling->GetStateBits() & NS_FRAME_OUT_OF_FLOW) {
- nsIFrame* placeholderFrame = GetPlaceholderFrameFor(sibling);
- NS_ASSERTION(placeholderFrame, "no placeholder for out-of-flow frame");
- sibling = placeholderFrame;
+ return adjust(getFarPseudo(aIter.Parent()));
+}
+
+nsIFrame*
+nsCSSFrameConstructor::AdjustSiblingFrame(
+ nsIFrame* aSibling,
+ nsIContent* aTargetContent,
+ mozilla::StyleDisplay& aTargetContentDisplay,
+ SiblingDirection aDirection)
+{
+ if (!aSibling) {
+ return nullptr;
}
- // The frame we have now should never be a continuation
- NS_ASSERTION(!sibling->GetPrevContinuation(), "How did that happen?");
+ if (aSibling->GetStateBits() & NS_FRAME_OUT_OF_FLOW) {
+ aSibling = aSibling->GetPlaceholderFrame();
+ MOZ_ASSERT(aSibling);
+ }
- if (aPrevSibling) {
- // The frame may be a ib-split frame (a split inline frame that
- // contains a block). Get the last part of that split.
- if (IsFramePartOfIBSplit(sibling)) {
- sibling = GetLastIBSplitSibling(sibling, true);
+ MOZ_ASSERT(!aSibling->GetPrevContinuation(), "How?");
+ if (aDirection == SiblingDirection::Backward) {
+ // The frame may be a ib-split frame (a split inline frame that contains a
+ // block). Get the last part of that split.
+ if (IsFramePartOfIBSplit(aSibling)) {
+ aSibling = GetLastIBSplitSibling(aSibling, true);
}
// The frame may have a continuation. If so, we want the last
// non-overflow-container continuation as our previous sibling.
- sibling = sibling->GetTailContinuation();
+ aSibling = aSibling->GetTailContinuation();
}
- if (aTargetContent &&
- !IsValidSibling(sibling, aTargetContent, aTargetContentDisplay)) {
- sibling = nullptr;
+ if (!IsValidSibling(aSibling, aTargetContent, aTargetContentDisplay)) {
+ return nullptr;
}
- return sibling;
+ return aSibling;
}
nsIFrame*
-nsCSSFrameConstructor::FindPreviousSibling(FlattenedChildIterator aIter,
- nsIContent* aTargetContent,
- StyleDisplay& aTargetContentDisplay,
- nsContainerFrame* aParentFrame)
+nsCSSFrameConstructor::FindPreviousSibling(const FlattenedChildIterator& aIter,
+ StyleDisplay& aTargetContentDisplay)
{
- // Note: not all content objects are associated with a frame (e.g., if it's
- // `display: none') so keep looking until we find a previous frame.
- while (nsIContent* sibling = aIter.GetPreviousChild()) {
- MOZ_ASSERT(sibling != aTargetContent);
- nsIFrame* prevSibling =
- FindFrameForContentSibling(sibling, aTargetContent, aTargetContentDisplay,
- aParentFrame, true);
- if (prevSibling) {
- // Found a previous sibling, we're done!
- return prevSibling;
- }
- }
+ return FindSibling<SiblingDirection::Backward>(aIter, aTargetContentDisplay);
+}
- return nullptr;
+nsIFrame*
+nsCSSFrameConstructor::FindNextSibling(const FlattenedChildIterator& aIter,
+ StyleDisplay& aTargetContentDisplay)
+{
+ return FindSibling<SiblingDirection::Forward>(aIter, aTargetContentDisplay);
}
+template<nsCSSFrameConstructor::SiblingDirection aDirection>
nsIFrame*
-nsCSSFrameConstructor::FindNextSibling(FlattenedChildIterator aIter,
- nsIContent* aTargetContent,
- StyleDisplay& aTargetContentDisplay,
- nsContainerFrame* aParentFrame)
+nsCSSFrameConstructor::FindSibling(const FlattenedChildIterator& aIter,
+ StyleDisplay& aTargetContentDisplay)
{
- while (nsIContent* sibling = aIter.GetNextChild()) {
- MOZ_ASSERT(sibling != aTargetContent);
- nsIFrame* nextSibling =
- FindFrameForContentSibling(sibling, aTargetContent, aTargetContentDisplay,
- aParentFrame, false);
+ nsIContent* targetContent = aIter.Get();
+ nsIFrame* sibling =
+ FindSiblingInternal<aDirection>(aIter, targetContent, aTargetContentDisplay);
+ if (sibling) {
+ return sibling;
+ }
- if (nextSibling) {
- // We found a next sibling, we're done!
- return nextSibling;
+ // Our siblings (if any) do not have a frame to guide us. The frame for the
+ // target content should be inserted whereever a frame for the container would
+ // be inserted. This is needed when inserting into display: contents nodes.
+ const nsIContent* current = aIter.Parent();
+ while (GetDisplayContentsStyleFor(current)) {
+ const nsIContent* parent = current->GetFlattenedTreeParent();
+ MOZ_ASSERT(parent, "No display: contents on the root");
+
+ FlattenedChildIterator iter(parent);
+ iter.Seek(current);
+ sibling = FindSiblingInternal<aDirection>(
+ iter, targetContent, aTargetContentDisplay);
+ if (sibling) {
+ return sibling;
}
+
+ current = parent;
}
return nullptr;
@@ -6826,8 +6757,7 @@ nsCSSFrameConstructor::GetInsertionPrevSibling(InsertionPoint* aInsertion,
// Note that FindPreviousSibling is passed the iterator by value, so that
// the later usage of the iterator starts from the same place.
StyleDisplay childDisplay = UNSET_DISPLAY;
- nsIFrame* prevSibling =
- FindPreviousSibling(iter, iter.Get(), childDisplay, aInsertion->mParentFrame);
+ nsIFrame* prevSibling = FindPreviousSibling(iter, childDisplay);
// Now, find the geometric parent so that we can handle
// continuations properly. Use the prev sibling if we have it;
@@ -6840,48 +6770,20 @@ nsCSSFrameConstructor::GetInsertionPrevSibling(InsertionPoint* aInsertion,
iter.Seek(aEndSkipChild);
iter.GetPreviousChild();
}
- nsIFrame* nextSibling =
- FindNextSibling(iter, iter.Get(), childDisplay, aInsertion->mParentFrame);
- if (GetDisplayContentsStyleFor(aInsertion->mContainer)) {
- if (!nextSibling) {
- // Our siblings (if any) does not have a frame to guide us.
- // The frame for aChild should be inserted whereever a frame for
- // the container would be inserted. This is needed when inserting
- // into nested display:contents nodes.
- nsIContent* child = aInsertion->mContainer;
- nsIContent* parent = child->GetParent();
- aInsertion->mParentFrame =
- ::GetAdjustedParentFrame(aInsertion->mParentFrame,
- aInsertion->mParentFrame->GetType(),
- parent);
- InsertionPoint fakeInsertion(aInsertion->mParentFrame, parent);
- nsIFrame* result = GetInsertionPrevSibling(&fakeInsertion, child, aIsAppend,
- aIsRangeInsertSafe, nullptr, nullptr);
- MOZ_ASSERT(aInsertion->mParentFrame->GetContent() ==
- fakeInsertion.mParentFrame->GetContent());
- // fakeInsertion.mParentFrame may now be a continuation of the frame
- // we started with in the ctor above.
- aInsertion->mParentFrame = fakeInsertion.mParentFrame;
- return result;
- }
-
- prevSibling = nextSibling->GetPrevSibling();
- }
-
- if (nextSibling) {
+ if (nsIFrame* nextSibling = FindNextSibling(iter, childDisplay)) {
aInsertion->mParentFrame = nextSibling->GetParent()->GetContentInsertionFrame();
} else {
// No previous or next sibling, so treat this like an appended frame.
*aIsAppend = true;
if (IsFramePartOfIBSplit(aInsertion->mParentFrame)) {
// Since we're appending, we'll walk to the last anonymous frame
- // that was created for the broken inline frame. But don't walk
- // to the trailing inline if it's empty; stop at the block.
+ // that was created for the broken inline frame. We can walk to the
+ // trailing inline, since we know this is a real append, and not an
+ // insert (that would've been handled by `FindNextSibling`).
aInsertion->mParentFrame =
- GetLastIBSplitSibling(aInsertion->mParentFrame, false);
+ GetLastIBSplitSibling(aInsertion->mParentFrame, true);
}
- // Get continuation that parents the last child. This MUST be done
- // before the AdjustAppendParentForAfterContent call.
+ // Get continuation that parents the last child.
aInsertion->mParentFrame =
nsLayoutUtils::LastContinuationWithChild(aInsertion->mParentFrame);
// Deal with fieldsets
@@ -6889,12 +6791,7 @@ nsCSSFrameConstructor::GetInsertionPrevSibling(InsertionPoint* aInsertion,
::GetAdjustedParentFrame(aInsertion->mParentFrame,
aInsertion->mParentFrame->GetType(),
aChild);
- nsIFrame* appendAfterFrame;
- aInsertion->mParentFrame =
- ::AdjustAppendParentForAfterContent(this, aInsertion->mContainer,
- aInsertion->mParentFrame,
- aChild, &appendAfterFrame);
- prevSibling = ::FindAppendPrevSibling(aInsertion->mParentFrame, appendAfterFrame);
+ prevSibling = ::FindAppendPrevSibling(aInsertion->mParentFrame, nullptr);
}
}
@@ -7010,7 +6907,8 @@ nsCSSFrameConstructor::ReframeTextIfNeeded(nsIContent* aParentContent,
}
NS_ASSERTION(!aContent->GetPrimaryFrame(),
"Text node has a frame and NS_CREATE_FRAME_IF_NON_WHITESPACE");
- ContentInserted(aParentContent, aContent, nullptr, false);
+ const bool allowLazyConstruction = true;
+ ContentInserted(aParentContent, aContent, nullptr, allowLazyConstruction);
}
// For inserts aChild should be valid, for appends it should be null.
@@ -7020,11 +6918,8 @@ nsCSSFrameConstructor::MaybeConstructLazily(Operation aOperation,
nsIContent* aContainer,
nsIContent* aChild)
{
- // XXXmats no lazy frames for display:contents direct descendants yet
- // (Mozilla bug 979782).
if (mPresShell->GetPresContext()->IsChrome() || !aContainer ||
- aContainer->IsInNativeAnonymousSubtree() || aContainer->IsXULElement() ||
- GetDisplayContentsStyleFor(aContainer)) {
+ aContainer->IsInNativeAnonymousSubtree() || aContainer->IsXULElement()) {
return false;
}
@@ -7060,8 +6955,7 @@ nsCSSFrameConstructor::MaybeConstructLazily(Operation aOperation,
// hit a node with a leaf frame.
//
// Also, it's fine if one of the nodes without primary frame is a display:
- // contents node except if it's the direct ancestor of the children we're
- // recreating frames for.
+ // contents node.
bool noPrimaryFrame = false;
bool needsFrameBitSet = false;
#endif
@@ -7293,8 +7187,9 @@ nsCSSFrameConstructor::MaybeRecreateForFrameset(nsIFrame* aParentFrame,
cur = cur->GetNextSibling()) {
if (IsSpecialFramesetChild(cur)) {
// Just reframe the parent, since framesets are weird like that.
- RecreateFramesForContent(aParentFrame->GetContent(), false,
- REMOVE_FOR_RECONSTRUCTION, nullptr);
+ RecreateFramesForContent(aParentFrame->GetContent(),
+ InsertionKind::Sync,
+ REMOVE_FOR_RECONSTRUCTION);
return true;
}
}
@@ -7302,7 +7197,7 @@ nsCSSFrameConstructor::MaybeRecreateForFrameset(nsIFrame* aParentFrame,
return false;
}
-nsresult
+void
nsCSSFrameConstructor::ContentAppended(nsIContent* aContainer,
nsIContent* aFirstNewContent,
bool aAllowLazyConstruction)
@@ -7345,8 +7240,8 @@ nsCSSFrameConstructor::ContentAppended(nsIContent* aContainer,
if (tag == nsGkAtoms::treechildren ||
tag == nsGkAtoms::treeitem ||
tag == nsGkAtoms::treerow)
- return NS_OK;
+ return;
}
#endif // MOZ_XUL
@@ -7359,21 +7254,21 @@ nsCSSFrameConstructor::ContentAppended(nsIContent* aContainer,
//XXXsmaug This is super unefficient!
nsIContent* bindingParent = aContainer->GetBindingParent();
LAYOUT_PHASE_TEMP_EXIT();
- nsresult rv = RecreateFramesForContent(bindingParent, false,
- REMOVE_FOR_RECONSTRUCTION, nullptr);
+ RecreateFramesForContent(bindingParent, InsertionKind::Sync,
+ REMOVE_FOR_RECONSTRUCTION);
LAYOUT_PHASE_TEMP_REENTER();
- return rv;
+ return;
}
// See comment in ContentRangeInserted for why this is necessary.
if (!GetContentInsertionFrameFor(aContainer) &&
!aContainer->IsActiveChildrenElement()) {
- return NS_OK;
+ return;
}
if (aAllowLazyConstruction &&
MaybeConstructLazily(CONTENTAPPEND, aContainer, aFirstNewContent)) {
- return NS_OK;
+ return;
}
LAYOUT_PHASE_TEMP_EXIT();
@@ -7383,13 +7278,13 @@ nsCSSFrameConstructor::ContentAppended(nsIContent* aContainer,
nsContainerFrame*& parentFrame = insertion.mParentFrame;
LAYOUT_PHASE_TEMP_REENTER();
if (!parentFrame) {
- return NS_OK;
+ return;
}
LAYOUT_PHASE_TEMP_EXIT();
if (MaybeRecreateForFrameset(parentFrame, aFirstNewContent, nullptr)) {
LAYOUT_PHASE_TEMP_REENTER();
- return NS_OK;
+ return;
}
LAYOUT_PHASE_TEMP_REENTER();
@@ -7397,21 +7292,22 @@ nsCSSFrameConstructor::ContentAppended(nsIContent* aContainer,
// Nothing to do here; we shouldn't be constructing kids of leaves
// Clear lazy bits so we don't try to construct again.
ClearLazyBits(aFirstNewContent, nullptr);
- return NS_OK;
+ return;
}
if (parentFrame->IsFrameOfType(nsIFrame::eMathML)) {
LAYOUT_PHASE_TEMP_EXIT();
- nsresult rv = RecreateFramesForContent(parentFrame->GetContent(), false,
- REMOVE_FOR_RECONSTRUCTION, nullptr);
+ RecreateFramesForContent(parentFrame->GetContent(),
+ InsertionKind::Sync,
+ REMOVE_FOR_RECONSTRUCTION);
LAYOUT_PHASE_TEMP_REENTER();
- return rv;
+ return;
}
// If the frame we are manipulating is a ib-split frame (that is, one
// that's been created as a result of a block-in-inline situation) then we
// need to append to the last ib-split sibling, not to the frame itself.
- bool parentIBSplit = IsFramePartOfIBSplit(parentFrame);
+ const bool parentIBSplit = IsFramePartOfIBSplit(parentFrame);
if (parentIBSplit) {
#ifdef DEBUG
if (gNoisyContentUpdates) {
@@ -7437,38 +7333,79 @@ nsCSSFrameConstructor::ContentAppended(nsIContent* aContainer,
parentFrame->GetType() != nsGkAtoms::detailsFrame,
"Parent frame should not be fieldset or details!");
- // Deal with possible :after generated content on the parent
- nsIFrame* parentAfterFrame;
- parentFrame =
- ::AdjustAppendParentForAfterContent(this, insertion.mContainer, parentFrame,
- aFirstNewContent, &parentAfterFrame);
+ // Deal with possible :after generated content on the parent, or display:
+ // contents.
+ nsIFrame* nextSibling = nullptr;
+ if (GetDisplayContentsStyleFor(insertion.mContainer) ||
+ nsLayoutUtils::GetAfterFrame(insertion.mContainer)) {
+ FlattenedChildIterator iter(insertion.mContainer);
+ iter.Seek(insertion.mContainer->GetLastChild());
+ StyleDisplay unused = UNSET_DISPLAY;
+ nextSibling = FindNextSibling(iter, unused);
+ }
- // Create some new frames
- nsFrameConstructorState state(mPresShell,
- GetAbsoluteContainingBlock(parentFrame, FIXED_POS),
- GetAbsoluteContainingBlock(parentFrame, ABS_POS),
- GetFloatContainingBlock(parentFrame));
- state.mTreeMatchContext.InitAncestors(aContainer->AsElement());
+ if (nextSibling) {
+ parentFrame = nextSibling->GetParent()->GetContentInsertionFrame();
+ } else if (parentIBSplit) {
+ // We might be in a situation where the last part of the {ib} split was
+ // empty. Since we have no ::after pseudo-element, we do in fact want to be
+ // appending to that last part, so advance to it if needed. Note that here
+ // aParentFrame is the result of a GetLastIBSplitSibling call, so must be
+ // either the last or next to last ib-split sibling.
+ if (nsContainerFrame* trailingInline = GetIBSplitSibling(parentFrame)) {
+ parentFrame = trailingInline;
+ }
- // See if the containing block has :first-letter style applied.
- bool haveFirstLetterStyle = false, haveFirstLineStyle = false;
- nsContainerFrame* containingBlock = state.mFloatedItems.containingBlock;
- if (containingBlock) {
- haveFirstLetterStyle = HasFirstLetterStyle(containingBlock);
- haveFirstLineStyle =
- ShouldHaveFirstLineStyle(containingBlock->GetContent(),
- containingBlock->StyleContext());
+ // Always make sure to look at the last continuation of the frame
+ // for the {ib} case, even if that continuation is empty. We
+ // don't do this for the non-ib-split-frame case, since in the
+ // other cases appending to the last nonempty continuation is fine
+ // and in fact not doing that can confuse code that doesn't know
+ // to pull kids from continuations other than its next one.
+ parentFrame =
+ static_cast<nsContainerFrame*>(parentFrame->LastContinuation());
}
+ nsContainerFrame* containingBlock = GetFloatContainingBlock(parentFrame);
+
+ // See if the containing block has :first-letter style applied.
+ const bool haveFirstLetterStyle =
+ containingBlock && HasFirstLetterStyle(containingBlock);
+
+ const bool haveFirstLineStyle =
+ containingBlock &&
+ ShouldHaveFirstLineStyle(containingBlock->GetContent(),
+ containingBlock->StyleContext());
+
if (haveFirstLetterStyle) {
+ nsWeakFrame wf(nextSibling);
// Before we get going, remove the current letter frames
- RemoveLetterFrames(state.mPresShell, containingBlock);
+ RemoveLetterFrames(mPresShell, containingBlock);
+
+ // Reget nextSibling, since we may have killed it.
+ if (nextSibling && !wf) {
+ FlattenedChildIterator iter(insertion.mContainer);
+ iter.Seek(insertion.mContainer->GetLastChild());
+ StyleDisplay unused = UNSET_DISPLAY;
+ nextSibling = FindNextSibling(iter, unused);
+ if (nextSibling) {
+ parentFrame = nextSibling->GetParent()->GetContentInsertionFrame();
+ containingBlock = GetFloatContainingBlock(parentFrame);
+ }
+ }
}
+ // Create some new frames
+ nsFrameConstructorState state(mPresShell,
+ GetAbsoluteContainingBlock(parentFrame, FIXED_POS),
+ GetAbsoluteContainingBlock(parentFrame, ABS_POS),
+ containingBlock);
+ state.mTreeMatchContext.InitAncestors(aContainer->AsElement());
+
nsIAtom* frameType = parentFrame->GetType();
FlattenedChildIterator iter(aContainer);
- bool haveNoXBLChildren = (!iter.XBLInvolved() || !iter.GetNextChild());
+ const bool haveNoXBLChildren = !iter.XBLInvolved() || !iter.GetNextChild();
FrameConstructionItemList items;
if (aFirstNewContent->GetPreviousSibling() &&
GetParentType(frameType) == eTypeBlock &&
@@ -7493,7 +7430,7 @@ nsCSSFrameConstructor::ContentAppended(nsIContent* aContainer,
AddFrameConstructionItems(state, child, false, insertion, items);
}
- nsIFrame* prevSibling = ::FindAppendPrevSibling(parentFrame, parentAfterFrame);
+ nsIFrame* prevSibling = ::FindAppendPrevSibling(parentFrame, nextSibling);
// Perform special check for diddling around with the frames in
// a ib-split inline frame.
@@ -7503,7 +7440,7 @@ nsCSSFrameConstructor::ContentAppended(nsIContent* aContainer,
if (WipeContainingBlock(state, containingBlock, parentFrame, items,
true, prevSibling)) {
LAYOUT_PHASE_TEMP_REENTER();
- return NS_OK;
+ return;
}
LAYOUT_PHASE_TEMP_REENTER();
@@ -7516,8 +7453,11 @@ nsCSSFrameConstructor::ContentAppended(nsIContent* aContainer,
!prevSibling->IsInlineOutside() ||
prevSibling->GetType() == nsGkAtoms::brFrame);
// :after content can't be <br> so no need to check it
- items.SetLineBoundaryAtEnd(!parentAfterFrame ||
- !parentAfterFrame->IsInlineOutside());
+ //
+ // FIXME(emilio): A display: contents sibling could! Write a test-case and
+ // fix.
+ items.SetLineBoundaryAtEnd(
+ !nextSibling || !nextSibling->IsInlineOutside());
}
// To suppress whitespace-only text frames, we have to verify that
// our container's DOM child list matches its flattened tree child list.
@@ -7590,7 +7530,7 @@ nsCSSFrameConstructor::ContentAppended(nsIContent* aContainer,
}
#endif
- return NS_OK;
+ return;
}
#ifdef MOZ_XUL
@@ -7633,17 +7573,17 @@ bool NotifyListBoxBody(nsPresContext* aPresContext,
}
#endif // MOZ_XUL
-nsresult
+void
nsCSSFrameConstructor::ContentInserted(nsIContent* aContainer,
nsIContent* aChild,
nsILayoutHistoryState* aFrameState,
bool aAllowLazyConstruction)
{
- return ContentRangeInserted(aContainer,
- aChild,
- aChild->GetNextSibling(),
- aFrameState,
- aAllowLazyConstruction);
+ ContentRangeInserted(aContainer,
+ aChild,
+ aChild->GetNextSibling(),
+ aFrameState,
+ aAllowLazyConstruction);
}
// ContentRangeInserted handles creating frames for a range of nodes that
@@ -7664,7 +7604,7 @@ nsCSSFrameConstructor::ContentInserted(nsIContent* aContainer,
// in the caption list, while skipping any nodes in the range being inserted
// (because when we treat the caption frames the other nodes have had their
// frames constructed but not yet inserted into the frame tree).
-nsresult
+void
nsCSSFrameConstructor::ContentRangeInserted(nsIContent* aContainer,
nsIContent* aStartChild,
nsIContent* aEndChild,
@@ -7721,7 +7661,7 @@ nsCSSFrameConstructor::ContentRangeInserted(nsIContent* aContainer,
// The insert case in NotifyListBoxBody
// doesn't use "old next sibling".
aStartChild, nullptr, nullptr, CONTENT_INSERTED)) {
- return NS_OK;
+ return;
}
} else {
// We don't handle a range insert to a listbox parent, issue single
@@ -7730,7 +7670,7 @@ nsCSSFrameConstructor::ContentRangeInserted(nsIContent* aContainer,
IssueSingleInsertNofications(aContainer, aStartChild, aEndChild,
aAllowLazyConstruction);
LAYOUT_PHASE_TEMP_REENTER();
- return NS_OK;
+ return;
}
}
#endif // MOZ_XUL
@@ -7745,7 +7685,7 @@ nsCSSFrameConstructor::ContentRangeInserted(nsIContent* aContainer,
if (aStartChild != docElement) {
// Not the root element; just bail out
- return NS_OK;
+ return;
}
NS_PRECONDITION(nullptr == mRootElementFrame,
@@ -7782,7 +7722,7 @@ nsCSSFrameConstructor::ContentRangeInserted(nsIContent* aContainer,
}
#endif
- return NS_OK;
+ return;
}
if (aContainer->HasFlag(NODE_IS_IN_SHADOW_TREE) &&
@@ -7795,10 +7735,10 @@ nsCSSFrameConstructor::ContentRangeInserted(nsIContent* aContainer,
//XXXsmaug This is super unefficient!
nsIContent* bindingParent = aContainer->GetBindingParent();
LAYOUT_PHASE_TEMP_EXIT();
- nsresult rv = RecreateFramesForContent(bindingParent, false,
- REMOVE_FOR_RECONSTRUCTION, nullptr);
+ RecreateFramesForContent(bindingParent, InsertionKind::Sync,
+ REMOVE_FOR_RECONSTRUCTION);
LAYOUT_PHASE_TEMP_REENTER();
- return rv;
+ return;
}
// Put 'parentFrame' inside a scope so we don't confuse it with
@@ -7809,7 +7749,7 @@ nsCSSFrameConstructor::ContentRangeInserted(nsIContent* aContainer,
// a parent. While its uncommon to change the structure of the default content itself, a label,
// for example, can be reframed by having its value attribute set or removed.
if (!parentFrame && !aContainer->IsActiveChildrenElement()) {
- return NS_OK;
+ return;
}
// Otherwise, we've got parent content. Find its frame.
@@ -7818,7 +7758,7 @@ nsCSSFrameConstructor::ContentRangeInserted(nsIContent* aContainer,
if (aAllowLazyConstruction &&
MaybeConstructLazily(CONTENTINSERT, aContainer, aStartChild)) {
- return NS_OK;
+ return;
}
}
@@ -7838,7 +7778,7 @@ nsCSSFrameConstructor::ContentRangeInserted(nsIContent* aContainer,
}
if (!insertion.mParentFrame) {
- return NS_OK;
+ return;
}
bool isAppend, isRangeInsertSafe;
@@ -7852,16 +7792,14 @@ nsCSSFrameConstructor::ContentRangeInserted(nsIContent* aContainer,
IssueSingleInsertNofications(aContainer, aStartChild, aEndChild,
aAllowLazyConstruction);
LAYOUT_PHASE_TEMP_REENTER();
- return NS_OK;
+ return;
}
- nsIContent* container = insertion.mParentFrame->GetContent();
-
nsIAtom* frameType = insertion.mParentFrame->GetType();
LAYOUT_PHASE_TEMP_EXIT();
if (MaybeRecreateForFrameset(insertion.mParentFrame, aStartChild, aEndChild)) {
LAYOUT_PHASE_TEMP_REENTER();
- return NS_OK;
+ return;
}
LAYOUT_PHASE_TEMP_REENTER();
@@ -7878,10 +7816,11 @@ nsCSSFrameConstructor::ContentRangeInserted(nsIContent* aContainer,
// and if so, proceed. But we'd have to extend nsFieldSetFrame
// to locate this legend in the inserted frames and extract it.
LAYOUT_PHASE_TEMP_EXIT();
- nsresult rv = RecreateFramesForContent(insertion.mParentFrame->GetContent(), false,
- REMOVE_FOR_RECONSTRUCTION, nullptr);
+ RecreateFramesForContent(insertion.mParentFrame->GetContent(),
+ InsertionKind::Sync,
+ REMOVE_FOR_RECONSTRUCTION);
LAYOUT_PHASE_TEMP_REENTER();
- return rv;
+ return;
}
// We should only get here with details when doing a single insertion because
@@ -7893,26 +7832,27 @@ nsCSSFrameConstructor::ContentRangeInserted(nsIContent* aContainer,
// expensive to recreate the entire details frame, but it's the simplest way
// to handle the insertion.
LAYOUT_PHASE_TEMP_EXIT();
- nsresult rv =
- RecreateFramesForContent(insertion.mParentFrame->GetContent(), false,
- REMOVE_FOR_RECONSTRUCTION, nullptr);
+ RecreateFramesForContent(insertion.mParentFrame->GetContent(),
+ InsertionKind::Sync,
+ REMOVE_FOR_RECONSTRUCTION);
LAYOUT_PHASE_TEMP_REENTER();
- return rv;
+ return;
}
// Don't construct kids of leaves
if (insertion.mParentFrame->IsLeaf()) {
// Clear lazy bits so we don't try to construct again.
ClearLazyBits(aStartChild, aEndChild);
- return NS_OK;
+ return;
}
if (insertion.mParentFrame->IsFrameOfType(nsIFrame::eMathML)) {
LAYOUT_PHASE_TEMP_EXIT();
- nsresult rv = RecreateFramesForContent(insertion.mParentFrame->GetContent(), false,
- REMOVE_FOR_RECONSTRUCTION, nullptr);
+ RecreateFramesForContent(insertion.mParentFrame->GetContent(),
+ InsertionKind::Sync,
+ REMOVE_FOR_RECONSTRUCTION);
LAYOUT_PHASE_TEMP_REENTER();
- return rv;
+ return;
}
nsFrameConstructorState state(mPresShell,
@@ -7962,7 +7902,7 @@ nsCSSFrameConstructor::ContentRangeInserted(nsIContent* aContainer,
// the placeholder frame.
if (insertion.mParentFrame->GetStateBits() & NS_FRAME_OUT_OF_FLOW) {
nsPlaceholderFrame* placeholderFrame =
- GetPlaceholderFrameFor(insertion.mParentFrame);
+ insertion.mParentFrame->GetPlaceholderFrame();
NS_ASSERTION(placeholderFrame, "No placeholder for out-of-flow?");
insertion.mParentFrame = placeholderFrame->GetParent();
} else {
@@ -7989,30 +7929,13 @@ nsCSSFrameConstructor::ContentRangeInserted(nsIContent* aContainer,
IssueSingleInsertNofications(aContainer, aStartChild, aEndChild,
aAllowLazyConstruction);
LAYOUT_PHASE_TEMP_REENTER();
- return NS_OK;
+ return;
}
- container = insertion.mParentFrame->GetContent();
frameType = insertion.mParentFrame->GetType();
}
}
- if (!prevSibling) {
- // We're inserting the new frames as the first child. See if the
- // parent has a :before pseudo-element
- nsIFrame* firstChild = insertion.mParentFrame->PrincipalChildList().FirstChild();
-
- if (firstChild &&
- nsLayoutUtils::IsGeneratedContentFor(container, firstChild,
- nsCSSPseudoElements::before)) {
- // Insert the new frames after the last continuation of the :before
- prevSibling = firstChild->GetTailContinuation();
- insertion.mParentFrame = prevSibling->GetParent()->GetContentInsertionFrame();
- // Don't change isAppend here; we'll can call AppendFrames as needed, and
- // the change to our prevSibling doesn't affect that.
- }
- }
-
FrameConstructionItemList items;
ParentType parentType = GetParentType(frameType);
FlattenedChildIterator iter(aContainer);
@@ -8057,7 +7980,7 @@ nsCSSFrameConstructor::ContentRangeInserted(nsIContent* aContainer,
if (WipeContainingBlock(state, containingBlock, insertion.mParentFrame, items,
isAppend, prevSibling)) {
LAYOUT_PHASE_TEMP_REENTER();
- return NS_OK;
+ return;
}
LAYOUT_PHASE_TEMP_REENTER();
@@ -8081,65 +8004,11 @@ nsCSSFrameConstructor::ContentRangeInserted(nsIContent* aContainer,
}
}
- // If the parent of our current prevSibling is different from the frame we'll
- // actually use as the parent, then the calculated insertion point is now
- // invalid and as it is unknown where to insert correctly we append instead
- // (bug 341858).
- // This can affect our prevSibling and isAppend, but should not have any
- // effect on the WipeContainingBlock above, since this should only happen
- // when neither parent is a ib-split frame and should not affect whitespace
- // handling inside table-related frames (and in fact, can only happen when
- // one of the parents is a table wrapper and one is an inner table or when the
- // parent is a fieldset or fieldset content frame). So it won't affect the
- // {ib} or XUL box cases in WipeContainingBlock(), and the table pseudo
- // handling will only be affected by us maybe thinking we're not inserting
- // at the beginning, whereas we really are. That would have made us reframe
- // unnecessarily, but that's ok.
- // XXXbz we should push our frame construction item code up higher, so we
- // know what our items are by the time we start figuring out previous
- // siblings
- if (prevSibling && frameItems.NotEmpty() &&
- frameItems.FirstChild()->GetParent() != prevSibling->GetParent()) {
-#ifdef DEBUG
- nsIFrame* frame1 = frameItems.FirstChild()->GetParent();
- nsIFrame* frame2 = prevSibling->GetParent();
- NS_ASSERTION(!IsFramePartOfIBSplit(frame1) &&
- !IsFramePartOfIBSplit(frame2),
- "Neither should be ib-split");
- NS_ASSERTION((frame1->GetType() == nsGkAtoms::tableFrame &&
- frame2->GetType() == nsGkAtoms::tableWrapperFrame) ||
- (frame1->GetType() == nsGkAtoms::tableWrapperFrame &&
- frame2->GetType() == nsGkAtoms::tableFrame) ||
- frame1->GetType() == nsGkAtoms::fieldSetFrame ||
- (frame1->GetParent() &&
- frame1->GetParent()->GetType() == nsGkAtoms::fieldSetFrame),
- "Unexpected frame types");
-#endif
- isAppend = true;
- nsIFrame* appendAfterFrame;
- insertion.mParentFrame =
- ::AdjustAppendParentForAfterContent(this, container,
- frameItems.FirstChild()->GetParent(),
- aStartChild, &appendAfterFrame);
- prevSibling = ::FindAppendPrevSibling(insertion.mParentFrame, appendAfterFrame);
- }
-
- if (haveFirstLineStyle && insertion.mParentFrame == containingBlock) {
+ if (haveFirstLineStyle && insertion.mParentFrame == containingBlock && isAppend) {
// It's possible that the new frame goes into a first-line
// frame. Look at it and see...
- if (isAppend) {
- // Use append logic when appending
- AppendFirstLineFrames(state, containingBlock->GetContent(),
- containingBlock, frameItems);
- }
- else {
- // Use more complicated insert logic when inserting
- // XXXbz this method is a no-op, so it's easy for the args being passed
- // here to make no sense without anyone noticing... If it ever stops
- // being a no-op, vet them carefully!
- InsertFirstLineFrames(state, container, containingBlock, &insertion.mParentFrame,
- prevSibling, frameItems);
- }
+ AppendFirstLineFrames(state, containingBlock->GetContent(),
+ containingBlock, frameItems);
}
// We might have captions; put them into the caption list of the
@@ -8222,32 +8091,35 @@ nsCSSFrameConstructor::ContentRangeInserted(nsIContent* aContainer,
#endif
#ifdef ACCESSIBILITY
- nsAccessibilityService* accService = nsIPresShell::AccService();
- if (accService) {
+ if (nsAccessibilityService* accService = nsIPresShell::AccService()) {
accService->ContentRangeInserted(mPresShell, aContainer,
aStartChild, aEndChild);
}
#endif
- return NS_OK;
+ return;
}
-nsresult
-nsCSSFrameConstructor::ContentRemoved(nsIContent* aContainer,
- nsIContent* aChild,
- nsIContent* aOldNextSibling,
- RemoveFlags aFlags,
- bool* aDidReconstruct,
- nsIContent** aDestroyedFramesFor)
-{
+void
+nsCSSFrameConstructor::ContentRemoved(nsIContent* aContainer,
+ nsIContent* aChild,
+ nsIContent* aOldNextSibling,
+ RemoveFlags aFlags,
+ bool* aDidReconstruct)
+{
+ MOZ_ASSERT(aChild);
+ MOZ_ASSERT(aDidReconstruct);
AUTO_LAYOUT_PHASE_ENTRY_POINT(mPresShell->GetPresContext(), FrameC);
NS_PRECONDITION(mUpdateCount != 0,
"Should be in an update while destroying frames");
*aDidReconstruct = false;
- if (aDestroyedFramesFor) {
- *aDestroyedFramesFor = aChild;
- }
+
+ // Only recreate sync if we're already in frame construction, that is,
+ // recreate async for XBL DOM changes, and normal content removals.
+ const InsertionKind insertionKind = (aFlags == REMOVE_FOR_RECONSTRUCTION)
+ ? InsertionKind::Sync
+ : InsertionKind::Async;
nsPresContext* presContext = mPresShell->GetPresContext();
MOZ_ASSERT(presContext, "Our presShell should have a valid presContext");
@@ -8261,7 +8133,7 @@ nsCSSFrameConstructor::ContentRemoved(nsIContent* aContainer,
// source is a fullscreen element, and we have code elsewhere to update
// scrollbars after fullscreen elements are removed -- specifically, it's
// part of the fullscreen cleanup code called by Element::UnbindFromTree.)
- presContext->UpdateViewportScrollbarStylesOverride();
+ presContext->UpdateViewportScrollStylesOverride();
}
// XXXldb Do we need to re-resolve style to handle the CSS2 + combinator and
@@ -8280,7 +8152,6 @@ nsCSSFrameConstructor::ContentRemoved(nsIContent* aContainer,
}
#endif
- nsresult rv = NS_OK;
nsIFrame* childFrame = aChild->GetPrimaryFrame();
if (!childFrame || childFrame->GetContent() != aChild) {
// XXXbz the GetContent() != aChild check is needed due to bug 135040.
@@ -8290,37 +8161,33 @@ nsCSSFrameConstructor::ContentRemoved(nsIContent* aContainer,
MOZ_ASSERT(!childFrame || !GetDisplayContentsStyleFor(aChild),
"display:contents nodes shouldn't have a frame");
if (!childFrame && GetDisplayContentsStyleFor(aChild)) {
- nsIFrame* ancestorFrame = nullptr;
- nsIContent* ancestor = aContainer;
- for (; ancestor; ancestor = ancestor->GetParent()) {
- ancestorFrame = ancestor->GetPrimaryFrame();
- if (ancestorFrame) {
- break;
- }
+ nsIContent* ancestor = aChild->GetFlattenedTreeParent();
+ MOZ_ASSERT(ancestor, "display: contents on the root?");
+ while (!ancestor->GetPrimaryFrame()) {
+ ancestor = ancestor->GetFlattenedTreeParent();
+ MOZ_ASSERT(ancestor, "we can't have a display: contents subtree root!");
}
- if (ancestorFrame) {
- nsIFrame* contentInsertion = ancestorFrame->GetContentInsertionFrame();
- if (ancestorFrame->GetGenConPseudos() ||
- (contentInsertion && contentInsertion->GetGenConPseudos())) {
- *aDidReconstruct = true;
- LAYOUT_PHASE_TEMP_EXIT();
- // XXXmats Can we recreate frames only for the ::after/::before content?
- // XXX Perhaps even only those that belong to the aChild sub-tree?
- RecreateFramesForContent(ancestor, false, aFlags, aDestroyedFramesFor);
- LAYOUT_PHASE_TEMP_REENTER();
- return NS_OK;
- }
+
+ nsIFrame* ancestorFrame = ancestor->GetPrimaryFrame();
+ if (ancestorFrame->GetProperty(nsIFrame::GenConProperty())) {
+ *aDidReconstruct = true;
+
+ // XXXmats Can we recreate frames only for the ::after/::before content?
+ // XXX Perhaps even only those that belong to the aChild sub-tree?
+ LAYOUT_PHASE_TEMP_EXIT();
+ RecreateFramesForContent(ancestor, insertionKind, aFlags);
+ LAYOUT_PHASE_TEMP_REENTER();
+ return;
}
FlattenedChildIterator iter(aChild);
for (nsIContent* c = iter.GetNextChild(); c; c = iter.GetNextChild()) {
if (c->GetPrimaryFrame() || GetDisplayContentsStyleFor(c)) {
LAYOUT_PHASE_TEMP_EXIT();
- rv = ContentRemoved(aChild, c, nullptr, aFlags, aDidReconstruct, aDestroyedFramesFor);
+ ContentRemoved(aChild, c, nullptr, aFlags, aDidReconstruct);
LAYOUT_PHASE_TEMP_REENTER();
- NS_ENSURE_SUCCESS(rv, rv);
if (aFlags != REMOVE_DESTROY_FRAMES && *aDidReconstruct) {
- return rv;
+ return;
}
}
}
@@ -8333,7 +8200,7 @@ nsCSSFrameConstructor::ContentRemoved(nsIContent* aContainer,
if (aFlags == REMOVE_DESTROY_FRAMES) {
CaptureStateForFramesOf(aChild, mTempFrameTreeState);
}
- return NS_OK;
+ return;
}
#endif // MOZ_XUL
@@ -8371,10 +8238,9 @@ nsCSSFrameConstructor::ContentRemoved(nsIContent* aContainer,
nsIContent* bindingParent = aContainer->GetBindingParent();
*aDidReconstruct = true;
LAYOUT_PHASE_TEMP_EXIT();
- nsresult rv = RecreateFramesForContent(bindingParent, false,
- aFlags, aDestroyedFramesFor);
+ RecreateFramesForContent(bindingParent, insertionKind, aFlags);
LAYOUT_PHASE_TEMP_REENTER();
- return rv;
+ return;
}
if (aFlags == REMOVE_DESTROY_FRAMES) {
@@ -8386,15 +8252,11 @@ nsCSSFrameConstructor::ContentRemoved(nsIContent* aContainer,
// See whether we need to remove more than just childFrame
LAYOUT_PHASE_TEMP_EXIT();
- nsIContent* container;
- if (MaybeRecreateContainerForFrameRemoval(childFrame, aFlags, &rv, &container)) {
- LAYOUT_PHASE_TEMP_REENTER();
- MOZ_ASSERT(container);
+ if (MaybeRecreateContainerForFrameRemoval(
+ childFrame, insertionKind, aFlags)) {
*aDidReconstruct = true;
- if (aDestroyedFramesFor) {
- *aDestroyedFramesFor = container;
- }
- return rv;
+ LAYOUT_PHASE_TEMP_REENTER();
+ return;
}
LAYOUT_PHASE_TEMP_REENTER();
@@ -8407,10 +8269,10 @@ nsCSSFrameConstructor::ContentRemoved(nsIContent* aContainer,
// Just reframe the parent, since framesets are weird like that.
*aDidReconstruct = true;
LAYOUT_PHASE_TEMP_EXIT();
- nsresult rv = RecreateFramesForContent(parentFrame->GetContent(), false,
- aFlags, aDestroyedFramesFor);
+ RecreateFramesForContent(parentFrame->GetContent(), insertionKind,
+ aFlags);
LAYOUT_PHASE_TEMP_REENTER();
- return rv;
+ return;
}
// If we're a child of MathML, then we should reframe the MathML content.
@@ -8421,10 +8283,9 @@ nsCSSFrameConstructor::ContentRemoved(nsIContent* aContainer,
if (possibleMathMLAncestor->IsFrameOfType(nsIFrame::eMathML)) {
*aDidReconstruct = true;
LAYOUT_PHASE_TEMP_EXIT();
- nsresult rv = RecreateFramesForContent(possibleMathMLAncestor->GetContent(),
- false, aFlags, aDestroyedFramesFor);
+ RecreateFramesForContent(parentFrame->GetContent(), insertionKind, aFlags);
LAYOUT_PHASE_TEMP_REENTER();
- return rv;
+ return;
}
// Undo XUL wrapping if it's no longer needed.
@@ -8438,15 +8299,14 @@ nsCSSFrameConstructor::ContentRemoved(nsIContent* aContainer,
!AnyKidsNeedBlockParent(childFrame->GetNextSibling())) {
*aDidReconstruct = true;
LAYOUT_PHASE_TEMP_EXIT();
- nsresult rv = RecreateFramesForContent(grandparentFrame->GetContent(), true,
- aFlags, aDestroyedFramesFor);
+ RecreateFramesForContent(grandparentFrame->GetContent(), insertionKind,
+ aFlags);
LAYOUT_PHASE_TEMP_REENTER();
- return rv;
+ return;
}
#ifdef ACCESSIBILITY
- nsAccessibilityService* accService = nsIPresShell::AccService();
- if (accService) {
+ if (nsAccessibilityService* accService = nsIPresShell::AccService()) {
accService->ContentRemoved(mPresShell, aChild);
}
#endif
@@ -8455,7 +8315,7 @@ nsCSSFrameConstructor::ContentRemoved(nsIContent* aContainer,
// :first-letter style applies.
nsIFrame* inflowChild = childFrame;
if (childFrame->GetStateBits() & NS_FRAME_OUT_OF_FLOW) {
- inflowChild = GetPlaceholderFrameFor(childFrame);
+ inflowChild = childFrame->GetPlaceholderFrame();
NS_ASSERTION(inflowChild, "No placeholder for out-of-flow?");
}
nsContainerFrame* containingBlock =
@@ -8485,7 +8345,7 @@ nsCSSFrameConstructor::ContentRemoved(nsIContent* aContainer,
// XXXbz the GetContent() != aChild check is needed due to bug 135040.
// Remove it once that's fixed.
ClearUndisplayedContentIn(aChild, aContainer);
- return NS_OK;
+ return;
}
parentFrame = childFrame->GetParent();
parentType = parentFrame->GetType();
@@ -8511,7 +8371,7 @@ nsCSSFrameConstructor::ContentRemoved(nsIContent* aContainer,
// Notify the parent frame that it should delete the frame
if (childFrame->GetStateBits() & NS_FRAME_OUT_OF_FLOW) {
- childFrame = GetPlaceholderFrameFor(childFrame);
+ childFrame = childFrame->GetPlaceholderFrame();
NS_ASSERTION(childFrame, "Missing placeholder frame for out of flow.");
parentFrame = childFrame->GetParent();
}
@@ -8549,6 +8409,9 @@ nsCSSFrameConstructor::ContentRemoved(nsIContent* aContainer,
// and hence it's adjacent to a block end.
// If aOldNextSibling is null, then the text node before the node being
// removed is the last node, and we don't need to worry about it.
+ //
+ // FIXME(emilio): This should probably use the lazy frame construction
+ // bits if possible instead of reframing it in place.
if (aOldNextSibling) {
nsIContent* prevSibling = aOldNextSibling->GetPreviousSibling();
if (prevSibling && prevSibling->GetPreviousSibling()) {
@@ -8575,7 +8438,7 @@ nsCSSFrameConstructor::ContentRemoved(nsIContent* aContainer,
#endif
}
- return rv;
+ return;
}
/**
@@ -8637,12 +8500,11 @@ nsCSSFrameConstructor::EnsureFrameForTextNode(nsGenericDOMDataNode* aContent)
return aContent->GetPrimaryFrame();
}
-nsresult
+void
nsCSSFrameConstructor::CharacterDataChanged(nsIContent* aContent,
CharacterDataChangeInfo* aInfo)
{
AUTO_LAYOUT_PHASE_ENTRY_POINT(mPresShell->GetPresContext(), FrameC);
- nsresult rv = NS_OK;
if ((aContent->HasFlag(NS_CREATE_FRAME_IF_NON_WHITESPACE) &&
!aContent->TextIsOnlyWhitespace()) ||
@@ -8654,10 +8516,10 @@ nsCSSFrameConstructor::CharacterDataChanged(nsIContent* aContent,
"Bit should never be set on generated content");
#endif
LAYOUT_PHASE_TEMP_EXIT();
- nsresult rv = RecreateFramesForContent(aContent, false,
- REMOVE_FOR_RECONSTRUCTION, nullptr);
+ RecreateFramesForContent(aContent, InsertionKind::Sync,
+ REMOVE_FOR_RECONSTRUCTION);
LAYOUT_PHASE_TEMP_REENTER();
- return rv;
+ return;
}
// Find the child frame
@@ -8705,8 +8567,6 @@ nsCSSFrameConstructor::CharacterDataChanged(nsIContent* aContent,
RecoverLetterFrames(block);
}
}
-
- return rv;
}
void
@@ -9155,7 +9015,7 @@ nsCSSFrameConstructor::ReplicateFixedFrames(nsPageContentFrame* aParentFrame)
// are within fixed frames, because that would cause duplicates on the new
// page - bug 389619)
for (nsIFrame* fixed = firstFixed; fixed; fixed = fixed->GetNextSibling()) {
- nsIFrame* prevPlaceholder = GetPlaceholderFrameFor(fixed);
+ nsIFrame* prevPlaceholder = fixed->GetPlaceholderFrame();
if (prevPlaceholder &&
nsLayoutUtils::IsProperAncestorFrame(prevCanvasFrame, prevPlaceholder)) {
// We want to use the same style as the primary style frame for
@@ -9320,7 +9180,8 @@ nsCSSFrameConstructor::MaybeRecreateFramesForElement(Element* aElement)
}
}
- RecreateFramesForContent(aElement, false, REMOVE_FOR_RECONSTRUCTION, nullptr);
+ RecreateFramesForContent(aElement, InsertionKind::Sync,
+ REMOVE_FOR_RECONSTRUCTION);
return nullptr;
}
@@ -9363,19 +9224,16 @@ FindPreviousNonWhitespaceSibling(nsIFrame* aFrame)
}
bool
-nsCSSFrameConstructor::MaybeRecreateContainerForFrameRemoval(nsIFrame* aFrame,
- RemoveFlags aFlags,
- nsresult* aResult,
- nsIContent** aDestroyedFramesFor)
+nsCSSFrameConstructor::MaybeRecreateContainerForFrameRemoval(
+ nsIFrame* aFrame,
+ InsertionKind aInsertionKind,
+ RemoveFlags aFlags)
{
NS_PRECONDITION(aFrame, "Must have a frame");
NS_PRECONDITION(aFrame->GetParent(), "Frame shouldn't be root");
- NS_PRECONDITION(aResult, "Null out param?");
NS_PRECONDITION(aFrame == aFrame->FirstContinuation(),
"aFrame not the result of GetPrimaryFrame()?");
- *aDestroyedFramesFor = nullptr;
-
if (IsFramePartOfIBSplit(aFrame)) {
// The removal functions can't handle removal of an {ib} split directly; we
// need to rebuild the containing block.
@@ -9388,44 +9246,44 @@ nsCSSFrameConstructor::MaybeRecreateContainerForFrameRemoval(nsIFrame* aFrame,
}
#endif
- *aResult = ReframeContainingBlock(aFrame, aFlags, aDestroyedFramesFor);
+ ReframeContainingBlock(aFrame, aInsertionKind, aFlags);
return true;
}
nsContainerFrame* insertionFrame = aFrame->GetContentInsertionFrame();
if (insertionFrame && insertionFrame->GetType() == nsGkAtoms::legendFrame &&
aFrame->GetParent()->GetType() == nsGkAtoms::fieldSetFrame) {
- // When we remove the legend for a fieldset, we should reframe
- // the fieldset to ensure another legend is used, if there is one
- *aResult = RecreateFramesForContent(aFrame->GetParent()->GetContent(), false,
- aFlags, aDestroyedFramesFor);
+ RecreateFramesForContent(aFrame->GetParent()->GetContent(), aInsertionKind,
+ aFlags);
return true;
}
- if (insertionFrame &&
- aFrame->GetParent()->GetType() == nsGkAtoms::detailsFrame) {
+ nsIFrame* inFlowFrame =
+ (aFrame->GetStateBits() & NS_FRAME_OUT_OF_FLOW) ?
+ aFrame->GetPlaceholderFrame() : aFrame;
+ MOZ_ASSERT(inFlowFrame, "How did that happen?");
+ MOZ_ASSERT(inFlowFrame == inFlowFrame->FirstContinuation(),
+ "placeholder for primary frame has previous continuations?");
+ nsIFrame* parent = inFlowFrame->GetParent();
+
+ if (parent && parent->GetType() == nsGkAtoms::detailsFrame) {
HTMLSummaryElement* summary =
- HTMLSummaryElement::FromContent(insertionFrame->GetContent());
+ HTMLSummaryElement::FromContent(aFrame->GetContent());
+ DetailsFrame* detailsFrame = static_cast<DetailsFrame*>(parent);
- if (summary && summary->IsMainSummary()) {
+ // Unlike adding summary element cases, we need to check children of the
+ // parent details frame since at this moment the summary element has been
+ // already removed from the parent details element's child list.
+ if (summary && detailsFrame->HasMainSummaryFrame(aFrame)) {
// When removing a summary, we should reframe the parent details frame to
// ensure that another summary is used or the default summary is
// generated.
- *aResult = RecreateFramesForContent(aFrame->GetParent()->GetContent(),
- false, REMOVE_FOR_RECONSTRUCTION,
- aDestroyedFramesFor);
+ RecreateFramesForContent(parent->GetContent(), aInsertionKind, aFlags);
return true;
}
}
// Now check for possibly needing to reconstruct due to a pseudo parent
- nsIFrame* inFlowFrame =
- (aFrame->GetStateBits() & NS_FRAME_OUT_OF_FLOW) ?
- GetPlaceholderFrameFor(aFrame) : aFrame;
- MOZ_ASSERT(inFlowFrame, "How did that happen?");
- MOZ_ASSERT(inFlowFrame == inFlowFrame->FirstContinuation(),
- "placeholder for primary frame has previous continuations?");
- nsIFrame* parent = inFlowFrame->GetParent();
// For the case of ruby pseudo parent, effectively, only pseudo rb/rt frame
// need to be checked here, since all other types of parent will be catched
// by "Check ruby containers" section below.
@@ -9443,10 +9301,7 @@ nsCSSFrameConstructor::MaybeRecreateContainerForFrameRemoval(nsIFrame* aFrame,
// Similar if we're a table-caption.
(inFlowFrame->IsTableCaption() &&
parent->GetChildList(nsIFrame::kCaptionList).FirstChild() == inFlowFrame)) {
- // We're the first or last frame in the pseudo. Need to reframe.
- // Good enough to recreate frames for |parent|'s content
- *aResult = RecreateFramesForContent(parent->GetContent(), true, aFlags,
- aDestroyedFramesFor);
+ RecreateFramesForContent(parent->GetContent(), aInsertionKind, aFlags);
return true;
}
}
@@ -9475,8 +9330,7 @@ nsCSSFrameConstructor::MaybeRecreateContainerForFrameRemoval(nsIFrame* aFrame,
#endif
// Good enough to recreate frames for aFrame's parent's content; even if
// aFrame's parent is a pseudo, that'll be the right content node.
- *aResult = RecreateFramesForContent(parent->GetContent(), true, aFlags,
- aDestroyedFramesFor);
+ RecreateFramesForContent(parent->GetContent(), aInsertionKind, aFlags);
return true;
}
}
@@ -9492,8 +9346,7 @@ nsCSSFrameConstructor::MaybeRecreateContainerForFrameRemoval(nsIFrame* aFrame,
// frames may be constructed or destroyed accordingly.
// 2. The type of the first child of a ruby frame determines
// whether a pseudo ruby base container should exist.
- *aResult = RecreateFramesForContent(parent->GetContent(), true, aFlags,
- aDestroyedFramesFor);
+ RecreateFramesForContent(parent->GetContent(), aInsertionKind, aFlags);
return true;
}
@@ -9516,8 +9369,7 @@ nsCSSFrameConstructor::MaybeRecreateContainerForFrameRemoval(nsIFrame* aFrame,
}
#endif // DEBUG
// Recreate frames for the flex container (the removed frame's parent)
- *aResult = RecreateFramesForContent(parent->GetContent(), true, aFlags,
- aDestroyedFramesFor);
+ RecreateFramesForContent(parent->GetContent(), aInsertionKind, aFlags);
return true;
}
@@ -9535,8 +9387,8 @@ nsCSSFrameConstructor::MaybeRecreateContainerForFrameRemoval(nsIFrame* aFrame,
}
#endif // DEBUG
// Recreate frames for the flex container (the removed frame's grandparent)
- *aResult = RecreateFramesForContent(parent->GetParent()->GetContent(), true,
- aFlags, aDestroyedFramesFor);
+ RecreateFramesForContent(parent->GetParent()->GetContent(), aInsertionKind,
+ aFlags);
return true;
}
@@ -9544,7 +9396,7 @@ nsCSSFrameConstructor::MaybeRecreateContainerForFrameRemoval(nsIFrame* aFrame,
if (aFrame->GetType() == nsGkAtoms::popupSetFrame) {
nsIRootBox* rootBox = nsIRootBox::GetRootBox(mPresShell);
if (rootBox && rootBox->GetPopupSetFrame() == aFrame) {
- *aResult = ReconstructDocElementHierarchy();
+ ReconstructDocElementHierarchy();
return true;
}
}
@@ -9556,8 +9408,7 @@ nsCSSFrameConstructor::MaybeRecreateContainerForFrameRemoval(nsIFrame* aFrame,
!inFlowFrame->GetNextSibling() &&
((parent->GetPrevContinuation() && !parent->GetPrevInFlow()) ||
(parent->GetNextContinuation() && !parent->GetNextInFlow()))) {
- *aResult = RecreateFramesForContent(parent->GetContent(), true, aFlags,
- aDestroyedFramesFor);
+ RecreateFramesForContent(parent->GetContent(), aInsertionKind, aFlags);
return true;
}
@@ -9593,24 +9444,26 @@ nsCSSFrameConstructor::MaybeRecreateContainerForFrameRemoval(nsIFrame* aFrame,
}
#endif
- *aResult = ReframeContainingBlock(parent, aFlags, aDestroyedFramesFor);
+ ReframeContainingBlock(parent, aInsertionKind, aFlags);
return true;
}
-nsresult
-nsCSSFrameConstructor::RecreateFramesForContent(nsIContent* aContent,
- bool aAsyncInsert,
- RemoveFlags aFlags,
- nsIContent** aDestroyedFramesFor)
+void
+nsCSSFrameConstructor::RecreateFramesForContent(nsIContent* aContent,
+ InsertionKind aInsertionKind,
+ RemoveFlags aFlags)
{
- NS_PRECONDITION(!aAsyncInsert || aContent->IsElement(),
- "Can only insert elements async");
+ MOZ_ASSERT(aInsertionKind != InsertionKind::Async || aContent->IsElement());
+ MOZ_ASSERT(aContent);
+
// If there is no document, we don't want to recreate frames for it. (You
// shouldn't generally be giving this method content without a document
// anyway).
// Rebuilding the frame tree can have bad effects, especially if it's the
// frame tree for chrome (see bug 157322).
- NS_ENSURE_TRUE(aContent->GetComposedDoc(), NS_ERROR_FAILURE);
+ if (NS_WARN_IF(!aContent->GetComposedDoc())) {
+ return;
+ }
// Is the frame ib-split? If so, we need to reframe the containing
// block *here*, rather than trying to remove and re-insert the
@@ -9636,8 +9489,8 @@ nsCSSFrameConstructor::RecreateFramesForContent(nsIContent* aContent,
if (frame) {
nsIFrame* nonGeneratedAncestor = nsLayoutUtils::GetNonGeneratedAncestor(frame);
if (nonGeneratedAncestor->GetContent() != aContent) {
- return RecreateFramesForContent(nonGeneratedAncestor->GetContent(), aAsyncInsert,
- aFlags, aDestroyedFramesFor);
+ return RecreateFramesForContent(nonGeneratedAncestor->GetContent(),
+ aInsertionKind, aFlags);
}
if (frame->GetStateBits() & NS_FRAME_ANONYMOUSCONTENTCREATOR_CONTENT) {
@@ -9657,8 +9510,8 @@ nsCSSFrameConstructor::RecreateFramesForContent(nsIContent* aContent,
if (ancestor->GetType() != nsGkAtoms::svgUseFrame) {
NS_ASSERTION(aContent->IsInNativeAnonymousSubtree(),
"Why is NS_FRAME_ANONYMOUSCONTENTCREATOR_CONTENT set?");
- return RecreateFramesForContent(ancestor->GetContent(), aAsyncInsert,
- aFlags, aDestroyedFramesFor);
+ return RecreateFramesForContent(ancestor->GetContent(), aInsertionKind,
+ aFlags);
}
}
@@ -9669,20 +9522,13 @@ nsCSSFrameConstructor::RecreateFramesForContent(nsIContent* aContent,
// with native anonymous content from the editor.
if (parent && parent->IsLeaf() && parentContent &&
parentContent != aContent) {
- return RecreateFramesForContent(parentContent, aAsyncInsert, aFlags,
- aDestroyedFramesFor);
+ return RecreateFramesForContent(parentContent, aInsertionKind, aFlags);
}
}
- nsresult rv = NS_OK;
- nsIContent* container;
- if (frame && MaybeRecreateContainerForFrameRemoval(frame, aFlags, &rv,
- &container)) {
- MOZ_ASSERT(container);
- if (aDestroyedFramesFor) {
- *aDestroyedFramesFor = container;
- }
- return rv;
+ if (frame &&
+ MaybeRecreateContainerForFrameRemoval(frame, aInsertionKind, aFlags)) {
+ return;
}
nsINode* containerNode = aContent->GetParentNode();
@@ -9694,47 +9540,44 @@ nsCSSFrameConstructor::RecreateFramesForContent(nsIContent* aContent,
// Need the nsIContent parent, which might be null here, since we need to
// pass it to ContentInserted and ContentRemoved.
+ //
+ // FIXME(emilio): Do we need a strong ref here?
nsCOMPtr<nsIContent> container = aContent->GetParent();
// Remove the frames associated with the content object.
bool didReconstruct;
nsIContent* nextSibling = aContent->IsRootOfAnonymousSubtree() ?
nullptr : aContent->GetNextSibling();
- const bool reconstruct = aFlags != REMOVE_DESTROY_FRAMES;
- RemoveFlags flags = reconstruct ? REMOVE_FOR_RECONSTRUCTION : aFlags;
- rv = ContentRemoved(container, aContent, nextSibling, flags,
- &didReconstruct, aDestroyedFramesFor);
- if (NS_FAILED(rv)) {
- return rv;
- }
- if (reconstruct && !didReconstruct) {
- // Now, recreate the frames associated with this content object. If
- // ContentRemoved triggered reconstruction, then we don't need to do this
- // because the frames will already have been built.
- if (aAsyncInsert) {
+ ContentRemoved(container, aContent, nextSibling, aFlags, &didReconstruct);
+ if (!didReconstruct) {
+ if (aInsertionKind == InsertionKind::Async) {
// XXXmats doesn't frame state need to be restored in this case too?
- RestyleManager()->PostRestyleEvent(
- aContent->AsElement(), nsRestyleHint(0), nsChangeHint_ReconstructFrame);
+ RestyleManager()->PostRestyleEvent(aContent->AsElement(),
+ nsRestyleHint(0),
+ nsChangeHint_ReconstructFrame);
} else {
- rv = ContentInserted(container, aContent, mTempFrameTreeState, false);
+ // Now, recreate the frames associated with this content object. If
+ // ContentRemoved triggered reconstruction, then we don't need to do this
+ // because the frames will already have been built.
+ ContentInserted(container, aContent, mTempFrameTreeState, false);
}
}
}
-
- return rv;
}
void
-nsCSSFrameConstructor::DestroyFramesFor(nsIContent* aContent,
- nsIContent** aDestroyedFramesFor)
+nsCSSFrameConstructor::DestroyFramesFor(nsIContent* aContent,
+ bool* aDidReconstruct)
{
MOZ_ASSERT(aContent && aContent->GetParentNode());
- bool didReconstruct;
nsIContent* nextSibling =
aContent->IsRootOfAnonymousSubtree() ? nullptr : aContent->GetNextSibling();
- ContentRemoved(aContent->GetParent(), aContent, nextSibling,
- REMOVE_DESTROY_FRAMES, &didReconstruct, aDestroyedFramesFor);
+ ContentRemoved(aContent->GetParent(),
+ aContent,
+ nextSibling,
+ REMOVE_DESTROY_FRAMES,
+ aDidReconstruct);
}
//////////////////////////////////////////////////////////////////////
@@ -10666,13 +10509,6 @@ nsCSSFrameConstructor::AddFCItemsForAnonymousContent(
{
for (uint32_t i = 0; i < aAnonymousItems.Length(); ++i) {
nsIContent* content = aAnonymousItems[i].mContent;
-#ifdef DEBUG
- nsIAnonymousContentCreator* creator = do_QueryFrame(aFrame);
- NS_ASSERTION(!creator || !creator->CreateFrameFor(content),
- "If you need to use CreateFrameFor, you need to call "
- "CreateAnonymousFrames manually and not follow the standard "
- "ProcessChildren() codepath for this frame");
-#endif
// Gecko-styled nodes should have no pending restyle flags.
MOZ_ASSERT_IF(!content->IsStyledByServo(),
!content->IsElement() ||
@@ -10690,24 +10526,111 @@ nsCSSFrameConstructor::AddFCItemsForAnonymousContent(
RefPtr<nsStyleContext> styleContext;
TreeMatchContext::AutoParentDisplayBasedStyleFixupSkipper
parentDisplayBasedStyleFixupSkipper(aState.mTreeMatchContext);
- if (aAnonymousItems[i].mStyleContext) {
- // If we have an explicit style context, that means that the anonymous
- // content creator had its own plan for the style, and doesn't need the
- // computed style obtained by cascading this content as a normal node.
- // This happens when a native anonymous node is used to implement a
- // pseudo-element. Allowing Servo to traverse these nodes would be wasted
- // work, so assert that we didn't do that.
- MOZ_ASSERT_IF(content->IsStyledByServo(), !content->HasServoData());
- styleContext = aAnonymousItems[i].mStyleContext.forget();
- } else {
- // If we don't have an explicit style context, that means we need the
- // ordinary computed values. Make sure we eagerly cascaded them when the
- // anonymous nodes were created.
- MOZ_ASSERT_IF(content->IsStyledByServo() && content->IsElement(),
- content->HasServoData());
- styleContext = ResolveStyleContext(aFrame, content, &aState);
+
+ // Make sure we eagerly performed the servo cascade when the anonymous
+ // nodes were created.
+ MOZ_ASSERT_IF(content->IsStyledByServo() && content->IsElement(),
+ content->AsElement()->HasServoData());
+
+ // Determine whether this NAC is pseudo-implementing.
+ nsIAtom* pseudo = nullptr;
+ if (content->IsElement()) {
+ auto pseudoType = content->AsElement()->GetPseudoElementType();
+ if (pseudoType != CSSPseudoElementType::NotPseudo) {
+ pseudo = nsCSSPseudoElements::GetPseudoAtom(pseudoType);
+ }
+ }
+
+ // Determine the appropriate parent style for this NAC, and if the NAC
+ // implements a pseudo-element, the appropriate originating element
+ // (that is to say, the element to the left of the ::pseudo-element in
+ // the selector). This is all rather tricky, and merits some discussion.
+ //
+ // First, it's important to note that author stylesheets generally do not
+ // apply to elements in native-anonymous subtrees. The exceptions to
+ // this are web-exposed pseudo-elements, where authors can style the
+ // pseudo-implementing NAC if the originating element is not itself in a NAC
+ // subtree.
+ //
+ // For this reason, it's very important that we avoid using a style parent
+ // that is inside a NAC subtree together with an originating element that
+ // is not inside a NAC subtree, since that would allow authors to
+ // explicitly inherit styles from internal elements, potentially making
+ // the NAC hierarchy observable. To ensure this, and generally simplify
+ // things, we always set the originating element to the style parent.
+ //
+ // As a consequence of the above, all web-exposed pseudo-elements (which,
+ // by definition, must have a content-accessible originating element) must
+ // also inherit style from that same content-accessible element. To avoid
+ // unintuitive behavior differences between NAC elements that do and don't
+ // correspond to web-exposed pseudo-elements, we follow this protocol for
+ // all NAC, pseudo-implementing or not.
+ //
+ // However, things get tricky with the <video> element, where we have a
+ // bunch of XBL-generated anonymous content descending from a native-
+ // anonymous XULElement. The XBL elements inherit style from their
+ // flattened tree parent, because that's how XBL works. But then we need
+ // to figure out what to do when one of those anonymous XBL elements
+ // (like an <input> element) generates its own (possibly pseudo-element-
+ // implementing) NAC.
+ //
+ // In this case, we inherit style from the XBL-generated NAC-creating
+ // element, rather than the <video> element. There are a number of good
+ // reasons for this. First, inheriting from the great-grandparent while
+ // the parent inherits from the grandparent would be bizarre at best.
+ // Second, exposing pseudo-elements from elements within our particular
+ // XBL implementation would allow content styles to (un)intentionally
+ // alter the video controls, which would be very bad. Third, our UA
+ // stylesheets have selectors like:
+ //
+ // input[type=range][orient=horizontal]::-moz-range-track
+ //
+ // and we need to make sure that the originating element is the <input>,
+ // not the <video>, because that's where the |orient| attribute lives.
+ //
+ // The upshot of all of this is that, to find the style parent (and
+ // originating element, if applicable), we walk up our parent chain to the
+ // first element that is not itself NAC (distinct from whether it happens
+ // to be in a NAC subtree).
+ //
+ // The one exception to all of this is scrollbar content, which we parent
+ // directly to the scrollframe. This is because the special-snowflake
+ // construction of scroll frames doesn't result in the placeholder frame
+ // being constructed until later, which means that GetInFlowParent() doesn't
+ // work right in the case of out-of-flow scrollframes.
+ //
+ // To implement all this, we need to pass the correct parent style context
+ // here because SetPrimaryFrame() may not have been called on the content
+ // yet and thus ResolveStyleContext can't find it otherwise.
+ //
+ // We don't need to worry about display:contents here, because such
+ // elements don't get a frame and thus can't generate NAC. But we do need
+ // to worry about anonymous boxes, which CorrectStyleParentFrame handles
+ // for us.
+ nsIFrame* inheritFrame = aFrame;
+ if (!content->IsNativeScrollbarContent()) {
+ while (inheritFrame->GetContent()->IsNativeAnonymous()) {
+ inheritFrame = inheritFrame->GetInFlowParent();
+ }
}
+ nsIFrame* styleParentFrame =
+ nsFrame::CorrectStyleParentFrame(inheritFrame, pseudo);
+ // The only way we can not have a style parent now is if inheritFrame is the
+ // canvas frame and we're the NAC parent for all the things added via
+ // nsIDocument::InsertAnonymousContent.
+ MOZ_ASSERT_IF(!styleParentFrame,
+ inheritFrame->GetType() == nsGkAtoms::canvasFrame);
+ // And that anonymous div has no pseudo.
+ MOZ_ASSERT_IF(!styleParentFrame, !pseudo);
+
+ Element* originating =
+ pseudo ? styleParentFrame->GetContent()->AsElement() : nullptr;
+ nsStyleContext* parentStyle =
+ styleParentFrame ? styleParentFrame->StyleContext() : nullptr;
+ styleContext =
+ ResolveStyleContext(parentStyle, content, &aState, originating);
+
nsTArray<nsIAnonymousContentCreator::ContentInfo>* anonChildren = nullptr;
if (!aAnonymousItems[i].mChildren.IsEmpty()) {
anonChildren = &aAnonymousItems[i].mChildren;
@@ -11034,151 +10957,6 @@ nsCSSFrameConstructor::AppendFirstLineFrames(
lineFrame, aFrameItems);
}
-// Special routine to handle inserting a new frame into a block
-// frame's child list. Takes care of placing the new frame into the
-// right place when first-line style is present.
-nsresult
-nsCSSFrameConstructor::InsertFirstLineFrames(
- nsFrameConstructorState& aState,
- nsIContent* aContent,
- nsIFrame* aBlockFrame,
- nsContainerFrame** aParentFrame,
- nsIFrame* aPrevSibling,
- nsFrameItems& aFrameItems)
-{
- nsresult rv = NS_OK;
- // XXXbz If you make this method actually do something, check to
- // make sure that the caller is passing what you expect. In
- // particular, which content is aContent? And audit the rest of
- // this code too; it makes bogus assumptions and may not build.
-#if 0
- nsIFrame* parentFrame = *aParentFrame;
- nsIFrame* newFrame = aFrameItems.childList;
- bool isInline = IsInlineOutside(newFrame);
-
- if (!aPrevSibling) {
- // Insertion will become the first frame. Two cases: we either
- // already have a first-line frame or we don't.
- nsIFrame* firstBlockKid = aBlockFrame->PrincipalChildList().FirstChild();
- if (firstBlockKid->GetType() == nsGkAtoms::lineFrame) {
- // We already have a first-line frame
- nsIFrame* lineFrame = firstBlockKid;
-
- if (isInline) {
- // Easy case: the new inline frame will go into the lineFrame.
- ReparentFrame(this, lineFrame, newFrame);
- InsertFrames(lineFrame, kPrincipalList, nullptr, newFrame);
-
- // Since the frame is going into the lineFrame, don't let it
- // go into the block too.
- aFrameItems.childList = nullptr;
- aFrameItems.lastChild = nullptr;
- }
- else {
- // Harder case: We are about to insert a block level element
- // before the first-line frame.
- // XXX need a method to steal away frames from the line-frame
- }
- }
- else {
- // We do not have a first-line frame
- if (isInline) {
- // We now need a first-line frame to contain the inline frame.
- nsIFrame* lineFrame = NS_NewFirstLineFrame(firstLineStyle);
-
- if (NS_SUCCEEDED(rv)) {
- // Lookup first-line style context
- nsStyleContext* parentStyle =
- nsFrame::CorrectStyleParentFrame(aBlockFrame,
- nsCSSPseudoElements::firstLine)->
- StyleContext();
- RefPtr<nsStyleContext> firstLineStyle =
- GetFirstLineStyle(aContent, parentStyle);
-
- // Initialize the line frame
- InitAndRestoreFrame(aState, aContent, aBlockFrame, lineFrame);
-
- // Make sure the caller inserts the lineFrame into the
- // blocks list of children.
- aFrameItems.childList = lineFrame;
- aFrameItems.lastChild = lineFrame;
-
- // Give the inline frames to the lineFrame <b>after</b>
- // reparenting them
- NS_ASSERTION(lineFrame->StyleContext() == firstLineStyle,
- "Bogus style context on line frame");
- ReparentFrame(aPresContext, lineFrame, newFrame);
- lineFrame->SetInitialChildList(kPrincipalList, newFrame);
- }
- }
- else {
- // Easy case: the regular insertion logic can insert the new
- // frame because it's a block frame.
- }
- }
- }
- else {
- // Insertion will not be the first frame.
- nsIFrame* prevSiblingParent = aPrevSibling->GetParent();
- if (prevSiblingParent == aBlockFrame) {
- // Easy case: The prev-siblings parent is the block
- // frame. Therefore the prev-sibling is not currently in a
- // line-frame. Therefore the new frame which is going after it,
- // regardless of type, is not going into a line-frame.
- }
- else {
- // If the prevSiblingParent is not the block-frame then it must
- // be a line-frame (if it were a letter-frame, that logic would
- // already have adjusted the prev-sibling to be the
- // letter-frame).
- if (isInline) {
- // Easy case: the insertion can go where the caller thinks it
- // should go (which is into prevSiblingParent).
- }
- else {
- // Block elements don't end up in line-frames, therefore
- // change the insertion point to aBlockFrame. However, there
- // might be more inline elements following aPrevSibling that
- // need to be pulled out of the line-frame and become children
- // of the block.
- nsIFrame* nextSibling = aPrevSibling->GetNextSibling();
- nsIFrame* nextLineFrame = prevSiblingParent->GetNextInFlow();
- if (nextSibling || nextLineFrame) {
- // Oy. We have work to do. Create a list of the new frames
- // that are going into the block by stripping them away from
- // the line-frame(s).
- if (nextSibling) {
- nsLineFrame* lineFrame = (nsLineFrame*) prevSiblingParent;
- nsFrameList tail = lineFrame->StealFramesAfter(aPrevSibling);
- // XXX do something with 'tail'
- }
-
- nsLineFrame* nextLineFrame = (nsLineFrame*) lineFrame;
- for (;;) {
- nextLineFrame = nextLineFrame->GetNextInFlow();
- if (!nextLineFrame) {
- break;
- }
- nsIFrame* kids = nextLineFrame->PrincipalChildList().FirstChild();
- }
- }
- else {
- // We got lucky: aPrevSibling was the last inline frame in
- // the line-frame.
- ReparentFrame(this, aBlockFrame, newFrame);
- InsertFrames(aBlockFrame, kPrincipalList,
- prevSiblingParent, newFrame);
- aFrameItems.childList = nullptr;
- aFrameItems.lastChild = nullptr;
- }
- }
- }
- }
-
-#endif
- return rv;
-}
-
//----------------------------------------------------------------------
// First-letter support
@@ -11500,7 +11278,7 @@ FindFirstLetterFrame(nsIFrame* aFrame, nsIFrame::ChildListID aListID)
return nullptr;
}
-nsresult
+void
nsCSSFrameConstructor::RemoveFloatingFirstLetterFrames(
nsIPresShell* aPresShell,
nsIFrame* aBlockFrame)
@@ -11512,7 +11290,7 @@ nsCSSFrameConstructor::RemoveFloatingFirstLetterFrames(
floatFrame =
::FindFirstLetterFrame(aBlockFrame, nsIFrame::kPushedFloatsList);
if (!floatFrame) {
- return NS_OK;
+ return;
}
}
@@ -11520,19 +11298,19 @@ nsCSSFrameConstructor::RemoveFloatingFirstLetterFrames(
// destroyed when we destroy the letter frame).
nsIFrame* textFrame = floatFrame->PrincipalChildList().FirstChild();
if (!textFrame) {
- return NS_OK;
+ return;
}
// Discover the placeholder frame for the letter frame
- nsPlaceholderFrame* placeholderFrame = GetPlaceholderFrameFor(floatFrame);
+ nsPlaceholderFrame* placeholderFrame = floatFrame->GetPlaceholderFrame();
if (!placeholderFrame) {
// Somethings really wrong
- return NS_OK;
+ return;
}
nsContainerFrame* parentFrame = placeholderFrame->GetParent();
if (!parentFrame) {
// Somethings really wrong
- return NS_OK;
+ return;
}
// Create a new text frame with the right style context that maps
@@ -11541,7 +11319,7 @@ nsCSSFrameConstructor::RemoveFloatingFirstLetterFrames(
nsStyleContext* parentSC = parentFrame->StyleContext();
nsIContent* textContent = textFrame->GetContent();
if (!textContent) {
- return NS_OK;
+ return;
}
RefPtr<nsStyleContext> newSC = aPresShell->StyleSet()->
ResolveStyleForText(textContent, parentSC);
@@ -11586,11 +11364,9 @@ nsCSSFrameConstructor::RemoveFloatingFirstLetterFrames(
if (offsetsNeedFixing) {
prevSibling->RemoveStateBits(TEXT_OFFSETS_NEED_FIXING);
}
-
- return NS_OK;
}
-nsresult
+void
nsCSSFrameConstructor::RemoveFirstLetterFrames(nsIPresShell* aPresShell,
nsContainerFrame* aFrame,
nsContainerFrame* aBlockFrame,
@@ -11663,11 +11439,9 @@ nsCSSFrameConstructor::RemoveFirstLetterFrames(nsIPresShell* aPresShell,
prevSibling = kid;
kid = kid->GetNextSibling();
}
-
- return NS_OK;
}
-nsresult
+void
nsCSSFrameConstructor::RemoveLetterFrames(nsIPresShell* aPresShell,
nsContainerFrame* aBlockFrame)
{
@@ -11676,20 +11450,16 @@ nsCSSFrameConstructor::RemoveLetterFrames(nsIPresShell* aPresShell,
nsContainerFrame* continuation = aBlockFrame;
bool stopLooking = false;
- nsresult rv;
do {
- rv = RemoveFloatingFirstLetterFrames(aPresShell, continuation);
- if (NS_SUCCEEDED(rv)) {
- rv = RemoveFirstLetterFrames(aPresShell,
- continuation, aBlockFrame, &stopLooking);
- }
+ RemoveFloatingFirstLetterFrames(aPresShell, continuation);
+ RemoveFirstLetterFrames(aPresShell, continuation, aBlockFrame,
+ &stopLooking);
if (stopLooking) {
break;
}
continuation =
static_cast<nsContainerFrame*>(continuation->GetNextContinuation());
} while (continuation);
- return rv;
}
// Fixup the letter frame situation for the given block
@@ -11732,7 +11502,7 @@ nsCSSFrameConstructor::RecoverLetterFrames(nsContainerFrame* aBlockFrame)
// listbox Widget Routines
-nsresult
+void
nsCSSFrameConstructor::CreateListBoxContent(nsContainerFrame* aParentFrame,
nsIFrame* aPrevFrame,
nsIContent* aChild,
@@ -11740,8 +11510,6 @@ nsCSSFrameConstructor::CreateListBoxContent(nsContainerFrame* aParentFrame,
bool aIsAppend)
{
#ifdef MOZ_XUL
- nsresult rv = NS_OK;
-
// Construct a new frame
if (nullptr != aParentFrame) {
nsFrameItems frameItems;
@@ -11762,7 +11530,7 @@ nsCSSFrameConstructor::CreateListBoxContent(nsContainerFrame* aParentFrame,
if (StyleDisplay::None == display->mDisplay) {
*aNewFrame = nullptr;
- return NS_OK;
+ return;
}
BeginUpdate();
@@ -11781,9 +11549,9 @@ nsCSSFrameConstructor::CreateListBoxContent(nsContainerFrame* aParentFrame,
if (newFrame) {
// Notify the parent frame
if (aIsAppend)
- rv = ((nsListBoxBodyFrame*)aParentFrame)->ListBoxAppendFrames(frameItems);
+ ((nsListBoxBodyFrame*)aParentFrame)->ListBoxAppendFrames(frameItems);
else
- rv = ((nsListBoxBodyFrame*)aParentFrame)->ListBoxInsertFrames(aPrevFrame, frameItems);
+ ((nsListBoxBodyFrame*)aParentFrame)->ListBoxInsertFrames(aPrevFrame, frameItems);
}
EndUpdate();
@@ -11798,10 +11566,6 @@ nsCSSFrameConstructor::CreateListBoxContent(nsContainerFrame* aParentFrame,
}
#endif
}
-
- return rv;
-#else
- return NS_ERROR_FAILURE;
#endif
}
@@ -12224,8 +11988,8 @@ nsCSSFrameConstructor::WipeContainingBlock(nsFrameConstructorState& aState,
if (aFrame->IsXULBoxFrame() &&
!(aFrame->GetStateBits() & NS_STATE_BOX_WRAPS_KIDS_IN_BLOCK) &&
aItems.AnyItemsNeedBlockParent()) {
- RecreateFramesForContent(aFrame->GetContent(), true,
- REMOVE_FOR_RECONSTRUCTION, nullptr);
+ RecreateFramesForContent(aFrame->GetContent(), InsertionKind::Async,
+ REMOVE_FOR_RECONSTRUCTION);
return true;
}
@@ -12244,8 +12008,8 @@ nsCSSFrameConstructor::WipeContainingBlock(nsFrameConstructorState& aState,
const bool isWebkitBox = IsFlexContainerForLegacyBox(aFrame, frameType);
if (aPrevSibling && IsAnonymousFlexOrGridItem(aPrevSibling) &&
iter.item().NeedsAnonFlexOrGridItem(aState, isWebkitBox)) {
- RecreateFramesForContent(aFrame->GetContent(), true,
- REMOVE_FOR_RECONSTRUCTION, nullptr);
+ RecreateFramesForContent(aFrame->GetContent(), InsertionKind::Async,
+ REMOVE_FOR_RECONSTRUCTION);
return true;
}
@@ -12256,8 +12020,9 @@ nsCSSFrameConstructor::WipeContainingBlock(nsFrameConstructorState& aState,
iter.SetToEnd();
iter.Prev();
if (iter.item().NeedsAnonFlexOrGridItem(aState, isWebkitBox)) {
- RecreateFramesForContent(aFrame->GetContent(), true,
- REMOVE_FOR_RECONSTRUCTION, nullptr);
+ RecreateFramesForContent(aFrame->GetContent(),
+ InsertionKind::Async,
+ REMOVE_FOR_RECONSTRUCTION);
return true;
}
}
@@ -12287,8 +12052,9 @@ nsCSSFrameConstructor::WipeContainingBlock(nsFrameConstructorState& aState,
isWebkitBox)) {
// We hit something that _doesn't_ need an anonymous flex item!
// Rebuild the flex container to bust it out.
- RecreateFramesForContent(containerFrame->GetContent(), true,
- REMOVE_FOR_RECONSTRUCTION, nullptr);
+ RecreateFramesForContent(containerFrame->GetContent(),
+ InsertionKind::Async,
+ REMOVE_FOR_RECONSTRUCTION);
return true;
}
@@ -12312,8 +12078,8 @@ nsCSSFrameConstructor::WipeContainingBlock(nsFrameConstructorState& aState,
// We want to optimize it better, and avoid reframing as much as
// possible. But given the cases above, and the fact that a ruby
// usually won't be very large, it should be fine to reframe it.
- RecreateFramesForContent(aFrame->GetContent(), true,
- REMOVE_FOR_RECONSTRUCTION, nullptr);
+ RecreateFramesForContent(aFrame->GetContent(), InsertionKind::Async,
+ REMOVE_FOR_RECONSTRUCTION);
return true;
}
@@ -12479,8 +12245,8 @@ nsCSSFrameConstructor::WipeContainingBlock(nsFrameConstructorState& aState,
if (!aItems.AllWantParentType(parentType)) {
// Reframing aFrame->GetContent() is good enough, since the content of
// table pseudo-frames is the ancestor content.
- RecreateFramesForContent(aFrame->GetContent(), true,
- REMOVE_FOR_RECONSTRUCTION, nullptr);
+ RecreateFramesForContent(aFrame->GetContent(), InsertionKind::Async,
+ REMOVE_FOR_RECONSTRUCTION);
return true;
}
}
@@ -12568,15 +12334,15 @@ nsCSSFrameConstructor::WipeContainingBlock(nsFrameConstructorState& aState,
static_cast<void*>(blockContent));
}
#endif
- RecreateFramesForContent(blockContent, true, REMOVE_FOR_RECONSTRUCTION,
- nullptr);
+ RecreateFramesForContent(blockContent, InsertionKind::Async,
+ REMOVE_FOR_RECONSTRUCTION);
return true;
}
-nsresult
-nsCSSFrameConstructor::ReframeContainingBlock(nsIFrame* aFrame,
- RemoveFlags aFlags,
- nsIContent** aDestroyedFramesFor)
+void
+nsCSSFrameConstructor::ReframeContainingBlock(nsIFrame* aFrame,
+ InsertionKind aInsertionKind,
+ RemoveFlags aFlags)
{
#ifdef DEBUG
@@ -12596,7 +12362,7 @@ nsCSSFrameConstructor::ReframeContainingBlock(nsIFrame* aFrame,
// don't ReframeContainingBlock, this will result in a crash
// if we remove a tree that's in reflow - see bug 121368 for testcase
NS_ERROR("Atemptted to nsCSSFrameConstructor::ReframeContainingBlock during a Reflow!!!");
- return NS_OK;
+ return;
}
// Get the first "normal" ancestor of the target frame.
@@ -12612,23 +12378,25 @@ nsCSSFrameConstructor::ReframeContainingBlock(nsIFrame* aFrame,
// so GetFloatContainingBlock(aFrame) has been removed
// And get the containingBlock's content
- nsCOMPtr<nsIContent> blockContent = containingBlock->GetContent();
- if (blockContent) {
+ if (nsIContent* blockContent = containingBlock->GetContent()) {
#ifdef DEBUG
if (gNoisyContentUpdates) {
printf(" ==> blockContent=%p\n", static_cast<void*>(blockContent));
}
#endif
- return RecreateFramesForContent(blockContent, true, aFlags, aDestroyedFramesFor);
+ RecreateFramesForContent(blockContent->AsElement(), aInsertionKind,
+ REMOVE_FOR_RECONSTRUCTION);
+ return;
}
}
// If we get here, we're screwed!
- return RecreateFramesForContent(mPresShell->GetDocument()->GetRootElement(),
- true, aFlags, nullptr);
+ RecreateFramesForContent(mPresShell->GetDocument()->GetRootElement(),
+ aInsertionKind,
+ REMOVE_FOR_RECONSTRUCTION);
}
-nsresult
+void
nsCSSFrameConstructor::GenerateChildFrames(nsContainerFrame* aFrame)
{
{
@@ -12662,8 +12430,6 @@ nsCSSFrameConstructor::GenerateChildFrames(nsContainerFrame* aFrame)
// call XBL constructors after the frames are created
mPresShell->GetDocument()->BindingManager()->ProcessAttachedQueue();
-
- return NS_OK;
}
//////////////////////////////////////////////////////////
diff --git a/layout/base/nsCSSFrameConstructor.h b/layout/base/nsCSSFrameConstructor.h
index 7d1b8d42f..abdfbf7ce 100644
--- a/layout/base/nsCSSFrameConstructor.h
+++ b/layout/base/nsCSSFrameConstructor.h
@@ -22,7 +22,7 @@
#include "nsCounterManager.h"
#include "nsIAnonymousContentCreator.h"
#include "nsFrameManager.h"
-#include "ScrollbarStyles.h"
+#include "ScrollStyles.h"
struct nsFrameItems;
class nsStyleContext;
@@ -48,7 +48,7 @@ class FlattenedChildIterator;
} // namespace dom
} // namespace mozilla
-class nsCSSFrameConstructor : public nsFrameManager
+class nsCSSFrameConstructor final : public nsFrameManager
{
public:
typedef mozilla::CSSPseudoElementType CSSPseudoElementType;
@@ -60,7 +60,7 @@ public:
nsCSSFrameConstructor(nsIDocument* aDocument, nsIPresShell* aPresShell);
~nsCSSFrameConstructor(void) {
- NS_ASSERTION(mUpdateCount == 0, "Dying in the middle of our own update?");
+ MOZ_ASSERT(mUpdateCount == 0, "Dying in the middle of our own update?");
}
// get the alternate text for a content node
@@ -78,7 +78,7 @@ public:
nsIFrame* ConstructRootFrame();
- nsresult ReconstructDocElementHierarchy();
+ void ReconstructDocElementHierarchy();
// Create frames for content nodes that are marked as needing frames. This
// should be called before ProcessPendingRestyles.
@@ -97,8 +97,8 @@ private:
// aChild is the child being inserted for inserts, and the first
// child being appended for appends.
bool MaybeConstructLazily(Operation aOperation,
- nsIContent* aContainer,
- nsIContent* aChild);
+ nsIContent* aContainer,
+ nsIContent* aChild);
// Issues a single ContentInserted for each child of aContainer in the range
// [aStartChild, aEndChild).
@@ -152,8 +152,8 @@ private:
// Returns true if parent was recreated due to frameset child, false otherwise.
bool MaybeRecreateForFrameset(nsIFrame* aParentFrame,
- nsIContent* aStartChild,
- nsIContent* aEndChild);
+ nsIContent* aStartChild,
+ nsIContent* aEndChild);
public:
/**
@@ -202,16 +202,16 @@ public:
// If aAllowLazyConstruction is true then frame construction of the new
// children can be done lazily.
- nsresult ContentAppended(nsIContent* aContainer,
- nsIContent* aFirstNewContent,
- bool aAllowLazyConstruction);
+ void ContentAppended(nsIContent* aContainer,
+ nsIContent* aFirstNewContent,
+ bool aAllowLazyConstruction);
// If aAllowLazyConstruction is true then frame construction of the new child
// can be done lazily.
- nsresult ContentInserted(nsIContent* aContainer,
- nsIContent* aChild,
- nsILayoutHistoryState* aFrameState,
- bool aAllowLazyConstruction);
+ void ContentInserted(nsIContent* aContainer,
+ nsIContent* aChild,
+ nsILayoutHistoryState* aFrameState,
+ bool aAllowLazyConstruction);
// Like ContentInserted but handles inserting the children of aContainer in
// the range [aStartChild, aEndChild). aStartChild must be non-null.
@@ -219,12 +219,17 @@ public:
// aStartChild. If aAllowLazyConstruction is true then frame construction of
// the new children can be done lazily. It is only allowed to be true when
// inserting a single node.
- nsresult ContentRangeInserted(nsIContent* aContainer,
- nsIContent* aStartChild,
- nsIContent* aEndChild,
- nsILayoutHistoryState* aFrameState,
- bool aAllowLazyConstruction);
+ void ContentRangeInserted(nsIContent* aContainer,
+ nsIContent* aStartChild,
+ nsIContent* aEndChild,
+ nsILayoutHistoryState* aFrameState,
+ bool aAllowLazyConstruction);
+public:
+ // FIXME(emilio): How important is it to keep the frame tree state around for
+ // REMOVE_DESTROY_FRAMES?
+ //
+ // Seems like otherwise we could just remove it.
enum RemoveFlags {
REMOVE_CONTENT, REMOVE_FOR_RECONSTRUCTION, REMOVE_DESTROY_FRAMES };
/**
@@ -243,15 +248,14 @@ public:
* only when aFlags == REMOVE_DESTROY_FRAMES, otherwise it will only be
* captured if we reconstructed frames for an ancestor.
*/
- nsresult ContentRemoved(nsIContent* aContainer,
- nsIContent* aChild,
- nsIContent* aOldNextSibling,
- RemoveFlags aFlags,
- bool* aDidReconstruct,
- nsIContent** aDestroyedFramesFor = nullptr);
+ void ContentRemoved(nsIContent* aContainer,
+ nsIContent* aChild,
+ nsIContent* aOldNextSibling,
+ RemoveFlags aFlags,
+ bool* aDidReconstruct);
- nsresult CharacterDataChanged(nsIContent* aContent,
- CharacterDataChangeInfo* aInfo);
+ void CharacterDataChanged(nsIContent* aContent,
+ CharacterDataChangeInfo* aInfo);
// If aContent is a text node that has been optimized away due to being
// whitespace next to a block boundary (or for some other reason), stop
@@ -260,8 +264,8 @@ public:
// Returns the frame for aContent if there is one.
nsIFrame* EnsureFrameForTextNode(nsGenericDOMDataNode* aContent);
- // generate the child frames and process bindings
- nsresult GenerateChildFrames(nsContainerFrame* aFrame);
+ // Generate the child frames and process bindings
+ void GenerateChildFrames(nsContainerFrame* aFrame);
// Should be called when a frame is going to be destroyed and
// WillDestroyFrameTree hasn't been called yet.
@@ -280,14 +284,10 @@ public:
/**
* Destroy the frames for aContent. Note that this may destroy frames
- * for an ancestor instead - aDestroyedFramesFor contains the content node
- * where frames were actually destroyed (which should be used in the
- * ContentInserted call to recreate frames). The frame tree state
- * is captured before the frames are destroyed and can be retrieved using
- * GetLastCapturedLayoutHistoryState().
+ * for an ancestor instead - aDidReconstruct contains whether a reconstruct
+ * was posted for any ancestor.
*/
- void DestroyFramesFor(nsIContent* aContent,
- nsIContent** aDestroyedFramesFor);
+ void DestroyFramesFor(nsIContent* aContent, bool* aDidReconstruct);
// Request to create a continuing frame. This method never returns null.
nsIFrame* CreateContinuingFrame(nsPresContext* aPresContext,
@@ -303,11 +303,11 @@ public:
*/
InsertionPoint GetInsertionPoint(nsIContent* aContainer, nsIContent* aChild);
- nsresult CreateListBoxContent(nsContainerFrame* aParentFrame,
- nsIFrame* aPrevFrame,
- nsIContent* aChild,
- nsIFrame** aResult,
- bool aIsAppend);
+ void CreateListBoxContent(nsContainerFrame* aParentFrame,
+ nsIFrame* aPrevFrame,
+ nsIContent* aChild,
+ nsIFrame** aResult,
+ bool aIsAppend);
// GetInitialContainingBlock() is deprecated in favor of GetRootElementFrame();
// nsIFrame* GetInitialContainingBlock() { return mRootElementFrame; }
@@ -322,15 +322,6 @@ public:
nsContainerFrame* GetDocElementContainingBlock()
{ return mDocElementContainingBlock; }
- /**
- * Return the layout history state that was captured in the last
- * ContentRemoved / RecreateFramesForContent call.
- */
- nsILayoutHistoryState* GetLastCapturedLayoutHistoryState()
- {
- return mTempFrameTreeState;
- }
-
private:
struct FrameConstructionItem;
class FrameConstructionItemList;
@@ -364,7 +355,8 @@ private:
already_AddRefed<nsStyleContext>
ResolveStyleContext(nsStyleContext* aParentStyleContext,
nsIContent* aContent,
- nsFrameConstructorState* aState);
+ nsFrameConstructorState* aState,
+ Element* aOriginatingElementOrNull = nullptr);
// Add the frame construction items for the given aContent and aParentFrame
// to the list. This might add more than one item in some rare cases.
@@ -418,14 +410,14 @@ private:
* @param [out] aNewContent the content node we create
* @param [out] aNewFrame the new frame we create
*/
- nsresult CreateAttributeContent(nsIContent* aParentContent,
- nsIFrame* aParentFrame,
- int32_t aAttrNamespace,
- nsIAtom* aAttrName,
- nsStyleContext* aStyleContext,
- nsCOMArray<nsIContent>& aGeneratedContent,
- nsIContent** aNewContent,
- nsIFrame** aNewFrame);
+ void CreateAttributeContent(nsIContent* aParentContent,
+ nsIFrame* aParentFrame,
+ int32_t aAttrNamespace,
+ nsIAtom* aAttrName,
+ nsStyleContext* aStyleContext,
+ nsCOMArray<nsIContent>& aGeneratedContent,
+ nsIContent** aNewContent,
+ nsIFrame** aNewFrame);
/**
* Create a text node containing the given string. If aText is non-null
@@ -463,11 +455,11 @@ private:
// aParentFrame. aPrevSibling must be the frame after which aFrameList is to
// be placed on aParentFrame's principal child list. It may be null if
// aFrameList is being added at the beginning of the child list.
- nsresult AppendFramesToParent(nsFrameConstructorState& aState,
- nsContainerFrame* aParentFrame,
- nsFrameItems& aFrameList,
- nsIFrame* aPrevSibling,
- bool aIsRecursiveCall = false);
+ void AppendFramesToParent(nsFrameConstructorState& aState,
+ nsContainerFrame* aParentFrame,
+ nsFrameItems& aFrameList,
+ nsIFrame* aPrevSibling,
+ bool aIsRecursiveCall = false);
// BEGIN TABLE SECTION
/**
@@ -1440,12 +1432,6 @@ private:
nsFrameItems& aFrameItems);
static bool AtLineBoundary(FCItemIterator& aIter);
- nsresult CreateAnonymousFrames(nsFrameConstructorState& aState,
- nsIContent* aParent,
- nsContainerFrame* aParentFrame,
- PendingBinding* aPendingBinding,
- nsFrameItems& aChildItems);
-
nsresult GetAnonymousContent(nsIContent* aParent,
nsIFrame* aParentFrame,
nsTArray<nsIAnonymousContentCreator::ContentInfo>& aAnonContent);
@@ -1697,7 +1683,7 @@ private:
// InitializeSelectFrame puts scrollFrame in aFrameItems if aBuildCombobox is false
// aBuildCombobox indicates if we are building a combobox that has a dropdown
// popup widget or not.
- nsresult
+ void
InitializeSelectFrame(nsFrameConstructorState& aState,
nsContainerFrame* aScrollFrame,
nsContainerFrame* aScrolledFrame,
@@ -1718,34 +1704,36 @@ private:
nsStyleContext* MaybeRecreateFramesForElement(Element* aElement);
/**
+ * Whether insertion should be done synchronously or asynchronously.
+ *
+ * Generally, insertion is synchronous if we're reconstructing something from
+ * frame construction/reconstruction, and async if we're removing stuff, like
+ * from ContentRemoved.
+ */
+ enum class InsertionKind
+ {
+ Sync,
+ Async,
+ };
+
+ /**
* Recreate frames for aContent.
* @param aContent the content to recreate frames for
- * @param aAsyncInsert if true then a restyle event will be posted to handle
- * the required ContentInserted call instead of doing it immediately.
* @param aFlags normally you want to pass REMOVE_FOR_RECONSTRUCTION here
- * @param aDestroyedFramesFor if non-null, it will contain the content that
- * was actually reframed - it may be different than aContent.
*/
- nsresult
- RecreateFramesForContent(nsIContent* aContent,
- bool aAsyncInsert,
- RemoveFlags aFlags,
- nsIContent** aDestroyedFramesFor);
+ void RecreateFramesForContent(nsIContent* aContent,
+ InsertionKind aInsertionKind,
+ RemoveFlags aFlags);
// If removal of aFrame from the frame tree requires reconstruction of some
// containing block (either of aFrame or of its parent) due to {ib} splits or
// table pseudo-frames, recreate the relevant frame subtree. The return value
- // indicates whether this happened. If this method returns true, *aResult is
- // the return value of ReframeContainingBlock or RecreateFramesForContent. If
- // this method returns false, the value of *aResult is not affected. aFrame
- // and aResult must not be null. aFrame must be the result of a
+ // indicates whether this happened. aFrame must be the result of a
// GetPrimaryFrame() call on a content node (which means its parent is also
- // not null). If this method returns true, aDestroyedFramesFor contains the
- // content that was reframed.
- bool MaybeRecreateContainerForFrameRemoval(nsIFrame* aFrame,
- RemoveFlags aFlags,
- nsresult* aResult,
- nsIContent** aDestroyedFramesFor);
+ // not null).
+ bool MaybeRecreateContainerForFrameRemoval(nsIFrame* aFrame,
+ InsertionKind aInsertionKind,
+ RemoveFlags aFlags);
nsIFrame* CreateContinuingOuterTableFrame(nsIPresShell* aPresShell,
nsPresContext* aPresContext,
@@ -1869,9 +1857,9 @@ private:
bool aIsAppend,
nsIFrame* aPrevSibling);
- nsresult ReframeContainingBlock(nsIFrame* aFrame,
- RemoveFlags aFlags,
- nsIContent** aReframeContent);
+ void ReframeContainingBlock(nsIFrame* aFrame,
+ InsertionKind aInsertionKind,
+ RemoveFlags aFlags);
//----------------------------------------
@@ -1925,18 +1913,18 @@ private:
void RecoverLetterFrames(nsContainerFrame* aBlockFrame);
//
- nsresult RemoveLetterFrames(nsIPresShell* aPresShell,
- nsContainerFrame* aBlockFrame);
+ void RemoveLetterFrames(nsIPresShell* aPresShell,
+ nsContainerFrame* aBlockFrame);
// Recursive helper for RemoveLetterFrames
- nsresult RemoveFirstLetterFrames(nsIPresShell* aPresShell,
- nsContainerFrame* aFrame,
- nsContainerFrame* aBlockFrame,
- bool* aStopLooking);
+ void RemoveFirstLetterFrames(nsIPresShell* aPresShell,
+ nsContainerFrame* aFrame,
+ nsContainerFrame* aBlockFrame,
+ bool* aStopLooking);
// Special remove method for those pesky floating first-letter frames
- nsresult RemoveFloatingFirstLetterFrames(nsIPresShell* aPresShell,
- nsIFrame* aBlockFrame);
+ void RemoveFloatingFirstLetterFrames(nsIPresShell* aPresShell,
+ nsIFrame* aBlockFrame);
// Capture state for the frame tree rooted at the frame associated with the
// content object, aContent
@@ -1967,71 +1955,53 @@ private:
nsContainerFrame* aBlockFrame,
nsFrameItems& aFrameItems);
- nsresult InsertFirstLineFrames(nsFrameConstructorState& aState,
- nsIContent* aContent,
- nsIFrame* aBlockFrame,
- nsContainerFrame** aParentFrame,
- nsIFrame* aPrevSibling,
- nsFrameItems& aFrameItems);
+ // The direction in which we should look for siblings.
+ enum class SiblingDirection
+ {
+ Forward,
+ Backward,
+ };
/**
- * Find the right frame to use for aContent when looking for sibling
- * frames for aTargetContent. If aPrevSibling is true, this
- * will look for last continuations, etc, as necessary. This calls
- * IsValidSibling as needed; if that returns false it returns null.
+ * Find the frame for the content immediately next to the one aIter points to,
+ * in the direction SiblingDirection indicates, following continuations if
+ * necessary.
*
- * @param aContent the content to search for frames
- * @param aTargetContent the content we're finding a sibling frame for
- * @param aTargetContentDisplay the CSS display enum for aTargetContent if
- * already known, UNSET_DISPLAY otherwise. It will be filled in
- * if needed.
- * @param aParentFrame the nearest ancestor frame, used internally for
- * finding ::after / ::before frames
- * @param aPrevSibling true if we're searching in reverse DOM order
- */
- nsIFrame* FindFrameForContentSibling(nsIContent* aContent,
- nsIContent* aTargetContent,
- mozilla::StyleDisplay& aTargetContentDisplay,
- nsContainerFrame* aParentFrame,
- bool aPrevSibling);
-
- /**
- * Find the frame for the content immediately preceding the one aIter
- * points to, following continuations if necessary. aIter is passed by
- * value on purpose, so as not to modify the caller's iterator.
+ * aIter is passed by const reference on purpose, so as not to modify the
+ * caller's iterator.
*
* @param aIter should be positioned such that aIter.GetPreviousChild()
* is the first content to search for frames
- * @param aTargetContent the content we're finding a sibling frame for
- * @param aTargetContentDisplay the CSS display enum for aTargetContent if
- * already known, UNSET_DISPLAY otherwise. It will be filled in
- * if needed.
- * @param aParentFrame the nearest ancestor frame, used inernally for
- * finding ::after / ::before frames
- */
- nsIFrame* FindPreviousSibling(mozilla::dom::FlattenedChildIterator aIter,
- nsIContent* aTargetContent,
- mozilla::StyleDisplay& aTargetContentDisplay,
- nsContainerFrame* aParentFrame);
-
- /**
- * Find the frame for the content node immediately following the one aIter
- * points to, following continuations if necessary. aIter is passed by value
- * on purpose, so as not to modify the caller's iterator.
- *
- * @param aIter should be positioned such that aIter.GetNextChild()
- * is the first content to search for frames
- * @param aTargetContent the content we're finding a sibling frame for
- * @param aTargetContentDisplay the CSS display enum for aTargetContent if
- * already known, UNSET_DISPLAY otherwise. It will be filled in
- * if needed.
- * @param aParentFrame the nearest ancestor frame, used inernally for
- * finding ::after / ::before frames
+ * @param aTargetContentDisplay the CSS display enum for the content aIter
+ * points to if already known, UNSET_DISPLAY otherwise. It will be
+ * filled in if needed.
*/
- nsIFrame* FindNextSibling(mozilla::dom::FlattenedChildIterator aIter,
- nsIContent* aTargetContent,
- mozilla::StyleDisplay& aTargetContentDisplay,
- nsContainerFrame* aParentFrame);
+ template<SiblingDirection>
+ nsIFrame* FindSibling(const mozilla::dom::FlattenedChildIterator& aIter,
+ mozilla::StyleDisplay& aTargetContentDisplay);
+
+ // Helper for the implementation of FindSibling.
+ template<SiblingDirection>
+ nsIFrame* FindSiblingInternal(
+ mozilla::dom::FlattenedChildIterator,
+ nsIContent* aTargetContent,
+ mozilla::StyleDisplay& aTargetContentDisplay);
+
+ // An alias of FindSibling<SiblingDirection::Forward>.
+ nsIFrame* FindNextSibling(const mozilla::dom::FlattenedChildIterator& aIter,
+ mozilla::StyleDisplay& aTargetContentDisplay);
+ // An alias of FindSibling<SiblingDirection::Backwards>.
+ nsIFrame* FindPreviousSibling(const mozilla::dom::FlattenedChildIterator& aIter,
+ mozilla::StyleDisplay& aTargetContentDisplay);
+
+ // Given a potential first-continuation sibling frame for aTargetContent,
+ // verify that it is an actual valid sibling for it, and return the
+ // appropriate continuation the new frame for aTargetContent should be
+ // inserted next to.
+ nsIFrame* AdjustSiblingFrame(nsIFrame* aSibling,
+ nsIContent* aTargetContent,
+ mozilla::StyleDisplay& aTargetContentDisplay,
+ SiblingDirection aDirection);
// Find the right previous sibling for an insertion. This also updates the
// parent frame to point to the correct continuation of the parent frame to
diff --git a/layout/base/nsCaret.cpp b/layout/base/nsCaret.cpp
index eca22f3ba..2194a01f3 100644
--- a/layout/base/nsCaret.cpp
+++ b/layout/base/nsCaret.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 sw=2 et tw=78: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/base/nsCaret.h b/layout/base/nsCaret.h
index 703b33529..66ad0d8cf 100644
--- a/layout/base/nsCaret.h
+++ b/layout/base/nsCaret.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 sw=2 et tw=78: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/base/nsChangeHint.h b/layout/base/nsChangeHint.h
index eb2709de6..4f176896b 100644
--- a/layout/base/nsChangeHint.h
+++ b/layout/base/nsChangeHint.h
@@ -225,7 +225,7 @@ enum nsChangeHint {
* scrollframe, this is instead equivalent to nsChangeHint_AllReflowHints
* (because the viewport always has an associated scrollframe).
*/
- nsChangeHint_CSSOverflowChange = 1 << 28,
+ nsChangeHint_ScrollbarChange = 1 << 28,
// IMPORTANT NOTE: When adding new hints, consider whether you need
// to add them to NS_HintsNotHandledForDescendantsIn() below. Please
@@ -316,7 +316,7 @@ inline nsChangeHint operator^=(nsChangeHint& aLeft, nsChangeHint aRight)
nsChangeHint_UpdatePostTransformOverflow | \
nsChangeHint_UpdateParentOverflow | \
nsChangeHint_ChildrenOnlyTransform | \
- nsChangeHint_CSSOverflowChange | \
+ nsChangeHint_ScrollbarChange | \
nsChangeHint_RecomputePosition | \
nsChangeHint_UpdateContainingBlock | \
nsChangeHint_AddOrRemoveTransform | \
diff --git a/layout/base/nsDisplayItemTypes.h b/layout/base/nsDisplayItemTypes.h
index e899245d0..7ea53e5f1 100644
--- a/layout/base/nsDisplayItemTypes.h
+++ b/layout/base/nsDisplayItemTypes.h
@@ -1,6 +1,5 @@
// IWYU pragma: private, include "nsDisplayList.h"
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: set ts=2 sw=2 et tw=78:
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp
index 73e991246..e2a41aa28 100644
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: set ts=2 sw=2 et tw=78:
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/layout/base/nsDisplayList.h b/layout/base/nsDisplayList.h
index 9eac132fa..2b4efd86e 100644
--- a/layout/base/nsDisplayList.h
+++ b/layout/base/nsDisplayList.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: set ts=2 sw=2 et tw=78:
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/layout/base/nsDocumentViewer.cpp b/layout/base/nsDocumentViewer.cpp
index df0f1266d..a0af38c28 100644
--- a/layout/base/nsDocumentViewer.cpp
+++ b/layout/base/nsDocumentViewer.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 sw=2 et tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -4327,7 +4326,7 @@ nsDocumentViewer::ShouldAttachToTopLevel()
if (nsIWidget::UsePuppetWidgets())
return true;
-#if defined(XP_WIN) || defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_ANDROID) || defined(MOZ_WIDGET_UIKIT)
+#if defined(XP_WIN) || defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_UIKIT)
// On windows, in the parent process we also attach, but just to
// chrome items
nsWindowType winType = mParentWidget->WindowType();
diff --git a/layout/base/nsFrameManager.cpp b/layout/base/nsFrameManager.cpp
index 97b022da8..be8cd7147 100644
--- a/layout/base/nsFrameManager.cpp
+++ b/layout/base/nsFrameManager.cpp
@@ -38,47 +38,17 @@
#include "nsIStatefulFrame.h"
#include "nsContainerFrame.h"
- #ifdef DEBUG
- //#define DEBUG_UNDISPLAYED_MAP
- //#define DEBUG_DISPLAY_CONTENTS_MAP
- #else
- #undef DEBUG_UNDISPLAYED_MAP
- #undef DEBUG_DISPLAY_CONTENTS_MAP
- #endif
+// #define DEBUG_UNDISPLAYED_MAP
+// #define DEBUG_DISPLAY_CONTENTS_MAP
using namespace mozilla;
using namespace mozilla::dom;
//----------------------------------------------------------------------
-struct PlaceholderMapEntry : public PLDHashEntryHdr {
- // key (the out of flow frame) can be obtained through placeholder frame
- nsPlaceholderFrame *placeholderFrame;
-};
-
-static bool
-PlaceholderMapMatchEntry(const PLDHashEntryHdr *hdr, const void *key)
-{
- const PlaceholderMapEntry *entry =
- static_cast<const PlaceholderMapEntry*>(hdr);
- NS_ASSERTION(entry->placeholderFrame->GetOutOfFlowFrame() !=
- (void*)0xdddddddd,
- "Dead placeholder in placeholder map");
- return entry->placeholderFrame->GetOutOfFlowFrame() == key;
-}
-
-static const PLDHashTableOps PlaceholderMapOps = {
- PLDHashTable::HashVoidPtrKeyStub,
- PlaceholderMapMatchEntry,
- PLDHashTable::MoveEntryStub,
- PLDHashTable::ClearEntryStub,
- nullptr
-};
-
nsFrameManagerBase::nsFrameManagerBase()
: mPresShell(nullptr)
, mRootFrame(nullptr)
- , mPlaceholderMap(&PlaceholderMapOps, sizeof(PlaceholderMapEntry))
, mUndisplayedMap(nullptr)
, mDisplayContentsMap(nullptr)
, mIsDestroyingFrames(false)
@@ -87,40 +57,49 @@ nsFrameManagerBase::nsFrameManagerBase()
//----------------------------------------------------------------------
-// XXXldb This seems too complicated for what I think it's doing, and it
-// should also be using PLDHashTable rather than plhash to use less memory.
+/**
+ * The undisplayed map is a class that maps a parent content node to the
+ * undisplayed content children, and their style contexts.
+ *
+ * The linked list of nodes holds strong references to the style contexts and
+ * the content.
+ */
+class nsFrameManagerBase::UndisplayedMap :
+ private nsClassHashtable<nsPtrHashKey<nsIContent>,
+ LinkedList<UndisplayedNode>>
+{
+ typedef nsClassHashtable<nsPtrHashKey<nsIContent>, LinkedList<UndisplayedNode>> base_type;
-class nsFrameManagerBase::UndisplayedMap {
public:
- explicit UndisplayedMap(uint32_t aNumBuckets = 16);
- ~UndisplayedMap(void);
+ UndisplayedMap();
+ ~UndisplayedMap();
UndisplayedNode* GetFirstNode(nsIContent* aParentContent);
- nsresult AddNodeFor(nsIContent* aParentContent,
- nsIContent* aChild, nsStyleContext* aStyle);
+ void AddNodeFor(nsIContent* aParentContent,
+ nsIContent* aChild,
+ nsStyleContext* aStyle);
- void RemoveNodeFor(nsIContent* aParentContent,
- UndisplayedNode* aNode);
+ void RemoveNodeFor(nsIContent* aParentContent, UndisplayedNode* aNode);
void RemoveNodesFor(nsIContent* aParentContent);
- UndisplayedNode* UnlinkNodesFor(nsIContent* aParentContent);
+
+ nsAutoPtr<LinkedList<UndisplayedNode>>
+ UnlinkNodesFor(nsIContent* aParentContent);
// Removes all entries from the hash table
- void Clear(void);
+ void Clear();
protected:
+ LinkedList<UndisplayedNode>* GetListFor(nsIContent* aParentContent);
+ LinkedList<UndisplayedNode>* GetOrCreateListFor(nsIContent* aParentContent);
+ void AppendNodeFor(UndisplayedNode* aNode, nsIContent* aParentContent);
/**
- * Gets the entry for the provided parent content. If the content
- * is a <xbl:children> element, |**aParentContent| is set to
- * the parent of the children element.
+ * Get the applicable parent for the map lookup. This is almost always the
+ * provided argument, except if it's a <xbl:children> element, in which case
+ * it's the parent of the children element.
*/
- PLHashEntry** GetEntryFor(nsIContent** aParentContent);
- void AppendNodeFor(UndisplayedNode* aNode,
- nsIContent* aParentContent);
-
- PLHashTable* mTable;
- PLHashEntry** mLastLookup;
+ nsIContent* GetApplicableParent(nsIContent* aParent);
};
//----------------------------------------------------------------------
@@ -138,14 +117,10 @@ nsFrameManager::Destroy()
// Destroy the frame hierarchy.
mPresShell->SetIgnoreFrameDestruction(true);
- // Unregister all placeholders before tearing down the frame tree
- nsFrameManager::ClearPlaceholderFrameMap();
-
if (mRootFrame) {
mRootFrame->Destroy();
mRootFrame = nullptr;
}
-
delete mUndisplayedMap;
mUndisplayedMap = nullptr;
delete mDisplayContentsMap;
@@ -156,58 +131,9 @@ nsFrameManager::Destroy()
//----------------------------------------------------------------------
-// Placeholder frame functions
-nsPlaceholderFrame*
-nsFrameManager::GetPlaceholderFrameFor(const nsIFrame* aFrame)
-{
- NS_PRECONDITION(aFrame, "null param unexpected");
-
- auto entry = static_cast<PlaceholderMapEntry*>
- (const_cast<PLDHashTable*>(&mPlaceholderMap)->Search(aFrame));
- if (entry) {
- return entry->placeholderFrame;
- }
-
- return nullptr;
-}
-
-void
-nsFrameManager::RegisterPlaceholderFrame(nsPlaceholderFrame* aPlaceholderFrame)
-{
- MOZ_ASSERT(aPlaceholderFrame, "null param unexpected");
- MOZ_ASSERT(nsGkAtoms::placeholderFrame == aPlaceholderFrame->GetType(),
- "unexpected frame type");
- auto entry = static_cast<PlaceholderMapEntry*>
- (mPlaceholderMap.Add(aPlaceholderFrame->GetOutOfFlowFrame()));
- MOZ_ASSERT(!entry->placeholderFrame,
- "Registering a placeholder for a frame that already has a placeholder!");
- entry->placeholderFrame = aPlaceholderFrame;
-}
-
-void
-nsFrameManager::UnregisterPlaceholderFrame(nsPlaceholderFrame* aPlaceholderFrame)
-{
- NS_PRECONDITION(aPlaceholderFrame, "null param unexpected");
- NS_PRECONDITION(nsGkAtoms::placeholderFrame == aPlaceholderFrame->GetType(),
- "unexpected frame type");
-
- mPlaceholderMap.Remove(aPlaceholderFrame->GetOutOfFlowFrame());
-}
-
-void
-nsFrameManager::ClearPlaceholderFrameMap()
-{
- for (auto iter = mPlaceholderMap.Iter(); !iter.Done(); iter.Next()) {
- auto entry = static_cast<PlaceholderMapEntry*>(iter.Get());
- entry->placeholderFrame->SetOutOfFlowFrame(nullptr);
- }
- mPlaceholderMap.Clear();
-}
-
-//----------------------------------------------------------------------
-
/* static */ nsStyleContext*
-nsFrameManager::GetStyleContextInMap(UndisplayedMap* aMap, nsIContent* aContent)
+nsFrameManager::GetStyleContextInMap(UndisplayedMap* aMap,
+ const nsIContent* aContent)
{
if (!aContent) {
return nullptr;
@@ -215,7 +141,7 @@ nsFrameManager::GetStyleContextInMap(UndisplayedMap* aMap, nsIContent* aContent)
nsIContent* parent = aContent->GetParentElementCrossingShadowRoot();
MOZ_ASSERT(parent || !aContent->GetParent(), "no non-elements");
for (UndisplayedNode* node = aMap->GetFirstNode(parent);
- node; node = node->mNext) {
+ node; node = node->getNext()) {
if (node->mContent == aContent)
return node->mStyle;
}
@@ -241,16 +167,16 @@ nsFrameManager::SetStyleContextInMap(UndisplayedMap* aMap,
nsIContent* aContent,
nsStyleContext* aStyleContext)
{
- NS_PRECONDITION(!aStyleContext->GetPseudo(),
- "Should only have actual elements here");
+ MOZ_ASSERT(!aStyleContext->GetPseudo(),
+ "Should only have actual elements here");
#if defined(DEBUG_UNDISPLAYED_MAP) || defined(DEBUG_DISPLAY_BOX_CONTENTS_MAP)
static int i = 0;
printf("SetStyleContextInMap(%d): p=%p \n", i++, (void *)aContent);
#endif
- NS_ASSERTION(!GetStyleContextInMap(aMap, aContent),
- "Already have an entry for aContent");
+ MOZ_ASSERT(!GetStyleContextInMap(aMap, aContent),
+ "Already have an entry for aContent");
nsIContent* parent = aContent->GetParentElementCrossingShadowRoot();
MOZ_ASSERT(parent || !aContent->GetParent(), "no non-elements");
@@ -287,7 +213,7 @@ nsFrameManager::ChangeStyleContextInMap(UndisplayedMap* aMap,
#endif
for (UndisplayedNode* node = aMap->GetFirstNode(aContent->GetParent());
- node; node = node->mNext) {
+ node; node = node->getNext()) {
if (node->mContent == aContent) {
node->mStyle = aStyleContext;
return;
@@ -306,25 +232,25 @@ nsFrameManager::ClearUndisplayedContentIn(nsIContent* aContent,
printf("ClearUndisplayedContent(%d): content=%p parent=%p --> ", i++, (void *)aContent, (void*)aParentContent);
#endif
- if (mUndisplayedMap) {
- UndisplayedNode* node = mUndisplayedMap->GetFirstNode(aParentContent);
- while (node) {
- if (node->mContent == aContent) {
- mUndisplayedMap->RemoveNodeFor(aParentContent, node);
+ if (!mUndisplayedMap) {
+ return;
+ }
+
+ for (UndisplayedNode* node = mUndisplayedMap->GetFirstNode(aParentContent);
+ node; node = node->getNext()) {
+ if (node->mContent == aContent) {
+ mUndisplayedMap->RemoveNodeFor(aParentContent, node);
#ifdef DEBUG_UNDISPLAYED_MAP
- printf( "REMOVED!\n");
+ printf( "REMOVED!\n");
#endif
-#ifdef DEBUG
- // make sure that there are no more entries for the same content
- nsStyleContext *context = GetUndisplayedContent(aContent);
- NS_ASSERTION(context == nullptr, "Found more undisplayed content data after removal");
-#endif
- return;
- }
- node = node->mNext;
+ // make sure that there are no more entries for the same content
+ MOZ_ASSERT(!GetUndisplayedContent(aContent),
+ "Found more undisplayed content data after removal");
+ return;
}
}
+
#ifdef DEBUG_UNDISPLAYED_MAP
printf( "not found.\n");
#endif
@@ -380,26 +306,25 @@ nsFrameManager::ClearDisplayContentsIn(nsIContent* aContent,
static int i = 0;
printf("ClearDisplayContents(%d): content=%p parent=%p --> ", i++, (void *)aContent, (void*)aParentContent);
#endif
-
- if (mDisplayContentsMap) {
- UndisplayedNode* node = mDisplayContentsMap->GetFirstNode(aParentContent);
- while (node) {
- if (node->mContent == aContent) {
- mDisplayContentsMap->RemoveNodeFor(aParentContent, node);
+
+ if (!mDisplayContentsMap) {
+ return;
+ }
+
+ for (UndisplayedNode* node = mDisplayContentsMap->GetFirstNode(aParentContent);
+ node; node = node->getNext()) {
+ if (node->mContent == aContent) {
+ mDisplayContentsMap->RemoveNodeFor(aParentContent, node);
#ifdef DEBUG_DISPLAY_CONTENTS_MAP
- printf( "REMOVED!\n");
-#endif
-#ifdef DEBUG
- // make sure that there are no more entries for the same content
- nsStyleContext* context = GetDisplayContentsStyleFor(aContent);
- NS_ASSERTION(context == nullptr, "Found more entries for aContent after removal");
+ printf( "REMOVED!\n");
#endif
- ClearAllDisplayContentsIn(aContent);
- ClearAllUndisplayedContentIn(aContent);
- return;
- }
- node = node->mNext;
+ // make sure that there are no more entries for the same content
+ MOZ_ASSERT(!GetDisplayContentsStyleFor(aContent),
+ "Found more entries for aContent after removal");
+ ClearAllDisplayContentsIn(aContent);
+ ClearAllUndisplayedContentIn(aContent);
+ return;
}
}
#ifdef DEBUG_DISPLAY_CONTENTS_MAP
@@ -416,14 +341,14 @@ nsFrameManager::ClearAllDisplayContentsIn(nsIContent* aParentContent)
#endif
if (mDisplayContentsMap) {
- UndisplayedNode* cur = mDisplayContentsMap->UnlinkNodesFor(aParentContent);
- while (cur) {
- UndisplayedNode* next = cur->mNext;
- cur->mNext = nullptr;
- ClearAllDisplayContentsIn(cur->mContent);
- ClearAllUndisplayedContentIn(cur->mContent);
- delete cur;
- cur = next;
+ nsAutoPtr<LinkedList<UndisplayedNode>> list =
+ mDisplayContentsMap->UnlinkNodesFor(aParentContent);
+ if (list) {
+ while (UndisplayedNode* node = list->popFirst()) {
+ ClearAllDisplayContentsIn(node->mContent);
+ ClearAllUndisplayedContentIn(node->mContent);
+ delete node;
+ }
}
}
@@ -495,7 +420,7 @@ nsFrameManager::RemoveFrame(ChildListID aListID,
aOldFrame->GetType() == nsGkAtoms::textFrame,
"Must remove first continuation.");
NS_ASSERTION(!(aOldFrame->GetStateBits() & NS_FRAME_OUT_OF_FLOW &&
- GetPlaceholderFrameFor(aOldFrame)),
+ aOldFrame->GetPlaceholderFrame()),
"Must call RemoveFrame on placeholder for out-of-flows.");
nsContainerFrame* parentFrame = aOldFrame->GetParent();
if (parentFrame->IsAbsoluteContainer() &&
@@ -654,182 +579,132 @@ nsFrameManager::RestoreFrameState(nsIFrame* aFrame,
//----------------------------------------------------------------------
-static PLHashNumber
-HashKey(void* key)
-{
- return NS_PTR_TO_INT32(key);
-}
-
-static int
-CompareKeys(void* key1, void* key2)
-{
- return key1 == key2;
-}
-
-//----------------------------------------------------------------------
-
-nsFrameManagerBase::UndisplayedMap::UndisplayedMap(uint32_t aNumBuckets)
+nsFrameManagerBase::UndisplayedMap::UndisplayedMap()
{
MOZ_COUNT_CTOR(nsFrameManagerBase::UndisplayedMap);
- mTable = PL_NewHashTable(aNumBuckets, (PLHashFunction)HashKey,
- (PLHashComparator)CompareKeys,
- (PLHashComparator)nullptr,
- nullptr, nullptr);
- mLastLookup = nullptr;
}
nsFrameManagerBase::UndisplayedMap::~UndisplayedMap(void)
{
MOZ_COUNT_DTOR(nsFrameManagerBase::UndisplayedMap);
Clear();
- PL_HashTableDestroy(mTable);
}
-PLHashEntry**
-nsFrameManagerBase::UndisplayedMap::GetEntryFor(nsIContent** aParentContent)
+void
+nsFrameManagerBase::UndisplayedMap::Clear()
{
- nsIContent* parentContent = *aParentContent;
-
- if (mLastLookup && (parentContent == (*mLastLookup)->key)) {
- return mLastLookup;
+ for (auto iter = Iter(); !iter.Done(); iter.Next()) {
+ auto* list = iter.UserData();
+ while (auto* node = list->popFirst()) {
+ delete node;
+ }
+ iter.Remove();
}
+}
+nsIContent*
+nsFrameManagerBase::UndisplayedMap::GetApplicableParent(nsIContent* aParent)
+{
// In the case of XBL default content, <xbl:children> elements do not get a
// frame causing a mismatch between the content tree and the frame tree.
// |GetEntryFor| is sometimes called with the content tree parent (which may
// be a <xbl:children> element) but the parent in the frame tree would be the
// insertion parent (parent of the <xbl:children> element). Here the children
// elements are normalized to the insertion parent to correct for the mismatch.
- if (parentContent && nsContentUtils::IsContentInsertionPoint(parentContent)) {
- parentContent = parentContent->GetParent();
- // Change the caller's pointer for the parent content to be the insertion parent.
- *aParentContent = parentContent;
+ if (aParent && aParent->IsActiveChildrenElement()) {
+ return aParent->GetParent();
}
- PLHashNumber hashCode = NS_PTR_TO_INT32(parentContent);
- PLHashEntry** entry = PL_HashTableRawLookup(mTable, hashCode, parentContent);
- if (*entry) {
- mLastLookup = entry;
- }
- return entry;
+ return aParent;
}
-UndisplayedNode*
-nsFrameManagerBase::UndisplayedMap::GetFirstNode(nsIContent* aParentContent)
+LinkedList<UndisplayedNode>*
+nsFrameManagerBase::UndisplayedMap::GetListFor(nsIContent* aParent)
{
- PLHashEntry** entry = GetEntryFor(&aParentContent);
- if (*entry) {
- return (UndisplayedNode*)((*entry)->value);
+ aParent = GetApplicableParent(aParent);
+
+ LinkedList<UndisplayedNode>* list;
+ if (Get(aParent, &list)) {
+ return list;
}
+
return nullptr;
}
+LinkedList<UndisplayedNode>*
+nsFrameManagerBase::UndisplayedMap::GetOrCreateListFor(nsIContent* aParent)
+{
+ aParent = GetApplicableParent(aParent);
+ return LookupOrAdd(aParent);
+}
+
+
+UndisplayedNode*
+nsFrameManagerBase::UndisplayedMap::GetFirstNode(nsIContent* aParentContent)
+{
+ auto* list = GetListFor(aParentContent);
+ return list ? list->getFirst() : nullptr;
+}
+
void
nsFrameManagerBase::UndisplayedMap::AppendNodeFor(UndisplayedNode* aNode,
nsIContent* aParentContent)
{
- PLHashEntry** entry = GetEntryFor(&aParentContent);
- if (*entry) {
- UndisplayedNode* node = (UndisplayedNode*)((*entry)->value);
- while (node->mNext) {
- if (node->mContent == aNode->mContent) {
- // We actually need to check this in optimized builds because
- // there are some callers that do this. See bug 118014, bug
- // 136704, etc.
- NS_NOTREACHED("node in map twice");
- delete aNode;
- return;
- }
- node = node->mNext;
- }
- node->mNext = aNode;
- }
- else {
- PLHashNumber hashCode = NS_PTR_TO_INT32(aParentContent);
- PL_HashTableRawAdd(mTable, entry, hashCode, aParentContent, aNode);
- mLastLookup = nullptr; // hashtable may have shifted bucket out from under us
+ LinkedList<UndisplayedNode>* list = GetOrCreateListFor(aParentContent);
+
+#ifdef DEBUG
+ for (UndisplayedNode* node = list->getFirst(); node; node = node->getNext()) {
+ // NOTE: In the original code there was a work around for this case, I want
+ // to check it still happens before hacking around it the same way.
+ MOZ_ASSERT(node->mContent != aNode->mContent,
+ "Duplicated content in undisplayed list!");
}
+#endif
+
+ list->insertBack(aNode);
}
-nsresult
+void
nsFrameManagerBase::UndisplayedMap::AddNodeFor(nsIContent* aParentContent,
- nsIContent* aChild,
+ nsIContent* aChild,
nsStyleContext* aStyle)
{
UndisplayedNode* node = new UndisplayedNode(aChild, aStyle);
-
AppendNodeFor(node, aParentContent);
- return NS_OK;
}
void
nsFrameManagerBase::UndisplayedMap::RemoveNodeFor(nsIContent* aParentContent,
UndisplayedNode* aNode)
{
- PLHashEntry** entry = GetEntryFor(&aParentContent);
- NS_ASSERTION(*entry, "content not in map");
- if (*entry) {
- if ((UndisplayedNode*)((*entry)->value) == aNode) { // first node
- if (aNode->mNext) {
- (*entry)->value = aNode->mNext;
- aNode->mNext = nullptr;
- }
- else {
- PL_HashTableRawRemove(mTable, entry, *entry);
- mLastLookup = nullptr; // hashtable may have shifted bucket out from under us
- }
- }
- else {
- UndisplayedNode* node = (UndisplayedNode*)((*entry)->value);
- while (node->mNext) {
- if (node->mNext == aNode) {
- node->mNext = aNode->mNext;
- aNode->mNext = nullptr;
- break;
- }
- node = node->mNext;
- }
- }
- }
+#ifdef DEBUG
+ auto list = GetListFor(aParentContent);
+ MOZ_ASSERT(list, "content not in map");
+ aNode->removeFrom(*list);
+#else
+ aNode->remove();
+#endif
delete aNode;
}
-UndisplayedNode*
+nsAutoPtr<LinkedList<UndisplayedNode>>
nsFrameManagerBase::UndisplayedMap::UnlinkNodesFor(nsIContent* aParentContent)
{
- PLHashEntry** entry = GetEntryFor(&aParentContent);
- NS_ASSERTION(entry, "content not in map");
- if (*entry) {
- UndisplayedNode* node = (UndisplayedNode*)((*entry)->value);
- NS_ASSERTION(node, "null node for non-null entry in UndisplayedMap");
- PL_HashTableRawRemove(mTable, entry, *entry);
- mLastLookup = nullptr; // hashtable may have shifted bucket out from under us
- return node;
- }
- return nullptr;
+ nsAutoPtr<LinkedList<UndisplayedNode>> list;
+ RemoveAndForget(GetApplicableParent(aParentContent), list);
+ return list;
}
void
nsFrameManagerBase::UndisplayedMap::RemoveNodesFor(nsIContent* aParentContent)
{
- delete UnlinkNodesFor(aParentContent);
-}
-
-static int
-RemoveUndisplayedEntry(PLHashEntry* he, int i, void* arg)
-{
- UndisplayedNode* node = (UndisplayedNode*)(he->value);
- delete node;
- // Remove and free this entry and continue enumerating
- return HT_ENUMERATE_REMOVE | HT_ENUMERATE_NEXT;
-}
-
-void
-nsFrameManagerBase::UndisplayedMap::Clear(void)
-{
- mLastLookup = nullptr;
- PL_HashTableEnumerateEntries(mTable, RemoveUndisplayedEntry, 0);
+ nsAutoPtr<LinkedList<UndisplayedNode>> list = UnlinkNodesFor(aParentContent);
+ if (list) {
+ while (auto* node = list->popFirst()) {
+ delete node;
+ }
+ }
}
uint32_t nsFrameManagerBase::sGlobalGenerationNumber;
diff --git a/layout/base/nsFrameManager.h b/layout/base/nsFrameManager.h
index 1b9148314..ae7477d3d 100644
--- a/layout/base/nsFrameManager.h
+++ b/layout/base/nsFrameManager.h
@@ -33,40 +33,25 @@ namespace mozilla {
* Node in a linked list, containing the style for an element that
* does not have a frame but whose parent does have a frame.
*/
-struct UndisplayedNode {
+struct UndisplayedNode : public LinkedListElement<UndisplayedNode>
+{
UndisplayedNode(nsIContent* aContent, nsStyleContext* aStyle)
- : mContent(aContent),
- mStyle(aStyle),
- mNext(nullptr)
+ : mContent(aContent)
+ , mStyle(aStyle)
{
MOZ_COUNT_CTOR(mozilla::UndisplayedNode);
}
- ~UndisplayedNode()
- {
- MOZ_COUNT_DTOR(mozilla::UndisplayedNode);
-
- // Delete mNext iteratively to avoid blowing up the stack (bug 460461).
- UndisplayedNode* cur = mNext;
- while (cur) {
- UndisplayedNode* next = cur->mNext;
- cur->mNext = nullptr;
- delete cur;
- cur = next;
- }
- }
+ ~UndisplayedNode() { MOZ_COUNT_DTOR(mozilla::UndisplayedNode); }
- nsCOMPtr<nsIContent> mContent;
- RefPtr<nsStyleContext> mStyle;
- UndisplayedNode* mNext;
+ nsCOMPtr<nsIContent> mContent;
+ RefPtr<nsStyleContext> mStyle;
};
} // namespace mozilla
/**
- * Frame manager interface. The frame manager serves two purposes:
- * <li>provides a service for mapping from content to frame and from
- * out-of-flow frame to placeholder frame.
+ * Frame manager interface. The frame manager serves one purpose:
* <li>handles structural modifications to the frame model. If the frame model
* lock can be acquired, then the changes are processed immediately; otherwise,
* they're queued and processed later.
@@ -94,15 +79,8 @@ public:
*/
void Destroy();
- // Placeholder frame functions
- nsPlaceholderFrame* GetPlaceholderFrameFor(const nsIFrame* aFrame);
- void RegisterPlaceholderFrame(nsPlaceholderFrame* aPlaceholderFrame);
- void UnregisterPlaceholderFrame(nsPlaceholderFrame* aPlaceholderFrame);
-
- void ClearPlaceholderFrameMap();
-
// Mapping undisplayed content
- nsStyleContext* GetUndisplayedContent(nsIContent* aContent)
+ nsStyleContext* GetUndisplayedContent(const nsIContent* aContent)
{
if (!mUndisplayedMap) {
return nullptr;
@@ -127,7 +105,7 @@ public:
/**
* Return the registered display:contents style context for aContent, if any.
*/
- nsStyleContext* GetDisplayContentsStyleFor(nsIContent* aContent)
+ nsStyleContext* GetDisplayContentsStyleFor(const nsIContent* aContent)
{
if (!mDisplayContentsMap) {
return nullptr;
@@ -207,7 +185,7 @@ public:
nsILayoutHistoryState* aState);
protected:
static nsStyleContext* GetStyleContextInMap(UndisplayedMap* aMap,
- nsIContent* aContent);
+ const nsIContent* aContent);
static mozilla::UndisplayedNode*
GetAllUndisplayedNodesInMapFor(UndisplayedMap* aMap,
nsIContent* aParentContent);
diff --git a/layout/base/nsFrameManagerBase.h b/layout/base/nsFrameManagerBase.h
index 757dce7e5..bb192b64f 100644
--- a/layout/base/nsFrameManagerBase.h
+++ b/layout/base/nsFrameManagerBase.h
@@ -53,7 +53,6 @@ protected:
// weak link, because the pres shell owns us
nsIPresShell* MOZ_NON_OWNING_REF mPresShell;
nsIFrame* mRootFrame;
- PLDHashTable mPlaceholderMap;
UndisplayedMap* mUndisplayedMap;
UndisplayedMap* mDisplayContentsMap;
bool mIsDestroyingFrames; // The frame manager is destroying some frame(s).
diff --git a/layout/base/nsFrameTraversal.cpp b/layout/base/nsFrameTraversal.cpp
index ab07d07df..0c6a655a2 100644
--- a/layout/base/nsFrameTraversal.cpp
+++ b/layout/base/nsFrameTraversal.cpp
@@ -83,6 +83,10 @@ protected:
virtual nsIFrame* GetNextSiblingInner(nsIFrame* aFrame);
virtual nsIFrame* GetPrevSiblingInner(nsIFrame* aFrame);
+ /**
+ * Return the placeholder frame for aFrame if it has one, otherwise return
+ * aFrame itself.
+ */
nsIFrame* GetPlaceholderFrame(nsIFrame* aFrame);
bool IsPopupFrame(nsIFrame* aFrame);
@@ -487,18 +491,11 @@ nsFrameIterator::GetPrevSiblingInner(nsIFrame* aFrame) {
nsIFrame*
nsFrameIterator::GetPlaceholderFrame(nsIFrame* aFrame)
{
- nsIFrame* result = aFrame;
- nsIPresShell *presShell = mPresContext->GetPresShell();
- if (presShell) {
- nsIFrame* placeholder = presShell->GetPlaceholderFrameFor(aFrame);
- if (placeholder)
- result = placeholder;
+ if (MOZ_LIKELY(!aFrame || !aFrame->HasAnyStateBits(NS_FRAME_OUT_OF_FLOW))) {
+ return aFrame;
}
-
- if (result != aFrame)
- result = GetPlaceholderFrame(result);
-
- return result;
+ nsIFrame* placeholder = aFrame->GetPlaceholderFrame();
+ return placeholder ? placeholder : aFrame;
}
bool
diff --git a/layout/base/nsIPresShell.h b/layout/base/nsIPresShell.h
index 865f5534c..cf19867ef 100644
--- a/layout/base/nsIPresShell.h
+++ b/layout/base/nsIPresShell.h
@@ -486,12 +486,6 @@ public:
virtual nsCanvasFrame* GetCanvasFrame() const = 0;
/**
- * Gets the placeholder frame associated with the specified frame. This is
- * a helper frame that forwards the request to the frame manager.
- */
- virtual nsIFrame* GetPlaceholderFrameFor(nsIFrame* aFrame) const = 0;
-
- /**
* Tell the pres shell that a frame needs to be marked dirty and needs
* Reflow. It's OK if this is an ancestor of the frame needing reflow as
* long as the ancestor chain between them doesn't cross a reflow root.
@@ -545,20 +539,12 @@ public:
virtual void NotifyCounterStylesAreDirty() = 0;
/**
- * Destroy the frames for aContent. Note that this may destroy frames
- * for an ancestor instead - aDestroyedFramesFor contains the content node
- * where frames were actually destroyed (which should be used in the
- * CreateFramesFor call). The frame tree state will be captured before
- * the frames are destroyed in the frame constructor.
- */
- virtual void DestroyFramesFor(nsIContent* aContent,
- nsIContent** aDestroyedFramesFor) = 0;
- /**
- * Create new frames for aContent. It will use the last captured layout
- * history state captured in the frame constructor to restore the state
- * in the new frame tree.
+ * Destroy the frames for aElement, and reconstruct them asynchronously if
+ * needed.
+ *
+ * Note that this may destroy frames for an ancestor instead.
*/
- virtual void CreateFramesFor(nsIContent* aContent) = 0;
+ virtual void DestroyFramesForAndRestyle(mozilla::dom::Element* aElement) = 0;
/**
* Recreates the frames for a node
@@ -977,7 +963,7 @@ public:
/**
* Reconstruct frames for all elements in the document
*/
- virtual nsresult ReconstructFrames() = 0;
+ virtual void ReconstructFrames() = 0;
/**
* Notify that a content node's state has changed
@@ -1725,10 +1711,6 @@ public:
void SyncWindowProperties(nsView* aView);
-#ifdef ANDROID
- virtual nsIDocument* GetTouchEventTargetDocument() = 0;
-#endif
-
protected:
friend class nsRefreshDriver;
diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp
index 9b204d734..ccdc5503f 100644
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 sw=2 et tw=78: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -912,11 +911,6 @@ ApplyRectMultiplier(nsRect aRect, float aMultiplier)
bool
nsLayoutUtils::UsesAsyncScrolling(nsIFrame* aFrame)
{
-#ifdef MOZ_WIDGET_ANDROID
- // We always have async scrolling for android
- return true;
-#endif
-
return AsyncPanZoomEnabled(aFrame);
}
@@ -1519,90 +1513,38 @@ nsLayoutUtils::GetChildListNameFor(nsIFrame* aChildFrame)
return id;
}
-/*static*/ nsIFrame*
-nsLayoutUtils::GetBeforeFrameForContent(nsIFrame* aFrame,
- const nsIContent* aContent)
-{
- // We need to call GetGenConPseudos() on the first continuation/ib-split.
- // Find it, for symmetry with GetAfterFrameForContent.
- nsContainerFrame* genConParentFrame =
- FirstContinuationOrIBSplitSibling(aFrame)->GetContentInsertionFrame();
- if (!genConParentFrame) {
- return nullptr;
- }
- nsTArray<nsIContent*>* prop = genConParentFrame->GetGenConPseudos();
- if (prop) {
- const nsTArray<nsIContent*>& pseudos(*prop);
- for (uint32_t i = 0; i < pseudos.Length(); ++i) {
- if (pseudos[i]->GetParent() == aContent &&
- pseudos[i]->NodeInfo()->NameAtom() == nsGkAtoms::mozgeneratedcontentbefore) {
- return pseudos[i]->GetPrimaryFrame();
- }
- }
- }
- // If the first child frame is a pseudo-frame, then try that.
- // Note that the frame we create for the generated content is also a
- // pseudo-frame and so don't drill down in that case.
- nsIFrame* childFrame = genConParentFrame->PrincipalChildList().FirstChild();
- if (childFrame &&
- childFrame->IsPseudoFrame(aContent) &&
- !childFrame->IsGeneratedContentFrame()) {
- return GetBeforeFrameForContent(childFrame, aContent);
- }
- return nullptr;
+static Element*
+GetPseudo(const nsIContent* aContent, nsIAtom* aPseudoProperty)
+{
+ MOZ_ASSERT(aPseudoProperty == nsGkAtoms::beforePseudoProperty ||
+ aPseudoProperty == nsGkAtoms::afterPseudoProperty);
+ return static_cast<Element*>(aContent->GetProperty(aPseudoProperty));
}
-/*static*/ nsIFrame*
-nsLayoutUtils::GetBeforeFrame(nsIFrame* aFrame)
+/*static*/ Element*
+nsLayoutUtils::GetBeforePseudo(const nsIContent* aContent)
{
- return GetBeforeFrameForContent(aFrame, aFrame->GetContent());
+ return GetPseudo(aContent, nsGkAtoms::beforePseudoProperty);
}
/*static*/ nsIFrame*
-nsLayoutUtils::GetAfterFrameForContent(nsIFrame* aFrame,
- const nsIContent* aContent)
-{
- // We need to call GetGenConPseudos() on the first continuation,
- // but callers are likely to pass the last.
- nsContainerFrame* genConParentFrame =
- FirstContinuationOrIBSplitSibling(aFrame)->GetContentInsertionFrame();
- if (!genConParentFrame) {
- return nullptr;
- }
- nsTArray<nsIContent*>* prop = genConParentFrame->GetGenConPseudos();
- if (prop) {
- const nsTArray<nsIContent*>& pseudos(*prop);
- for (uint32_t i = 0; i < pseudos.Length(); ++i) {
- if (pseudos[i]->GetParent() == aContent &&
- pseudos[i]->NodeInfo()->NameAtom() == nsGkAtoms::mozgeneratedcontentafter) {
- return pseudos[i]->GetPrimaryFrame();
- }
- }
- }
- // If the last child frame is a pseudo-frame, then try that.
- // Note that the frame we create for the generated content is also a
- // pseudo-frame and so don't drill down in that case.
- genConParentFrame = aFrame->GetContentInsertionFrame();
- if (!genConParentFrame) {
- return nullptr;
- }
- nsIFrame* lastParentContinuation =
- LastContinuationWithChild(static_cast<nsContainerFrame*>(
- LastContinuationOrIBSplitSibling(genConParentFrame)));
- nsIFrame* childFrame =
- lastParentContinuation->GetChildList(nsIFrame::kPrincipalList).LastChild();
- if (childFrame &&
- childFrame->IsPseudoFrame(aContent) &&
- !childFrame->IsGeneratedContentFrame()) {
- return GetAfterFrameForContent(childFrame->FirstContinuation(), aContent);
- }
- return nullptr;
+nsLayoutUtils::GetBeforeFrame(const nsIContent* aContent)
+{
+ Element* pseudo = GetBeforePseudo(aContent);
+ return pseudo ? pseudo->GetPrimaryFrame() : nullptr;
+}
+
+/*static*/ Element*
+nsLayoutUtils::GetAfterPseudo(const nsIContent* aContent)
+{
+ return GetPseudo(aContent, nsGkAtoms::afterPseudoProperty);
}
/*static*/ nsIFrame*
-nsLayoutUtils::GetAfterFrame(nsIFrame* aFrame)
+nsLayoutUtils::GetAfterFrame(const nsIContent* aContent)
{
- return GetAfterFrameForContent(aFrame, aFrame->GetContent());
+ Element* pseudo = GetAfterPseudo(aContent);
+ return pseudo ? pseudo->GetPrimaryFrame() : nullptr;
}
// static
@@ -1673,33 +1615,6 @@ nsLayoutUtils::GetFloatFromPlaceholder(nsIFrame* aFrame) {
}
// static
-bool
-nsLayoutUtils::IsGeneratedContentFor(nsIContent* aContent,
- nsIFrame* aFrame,
- nsIAtom* aPseudoElement)
-{
- NS_PRECONDITION(aFrame, "Must have a frame");
- NS_PRECONDITION(aPseudoElement, "Must have a pseudo name");
-
- if (!aFrame->IsGeneratedContentFrame()) {
- return false;
- }
- nsIFrame* parent = aFrame->GetParent();
- NS_ASSERTION(parent, "Generated content can't be root frame");
- if (parent->IsGeneratedContentFrame()) {
- // Not the root of the generated content
- return false;
- }
-
- if (aContent && parent->GetContent() != aContent) {
- return false;
- }
-
- return (aFrame->GetContent()->NodeInfo()->NameAtom() == nsGkAtoms::mozgeneratedcontentbefore) ==
- (aPseudoElement == nsCSSPseudoElements::before);
-}
-
-// static
nsIFrame*
nsLayoutUtils::GetCrossDocParentFrame(const nsIFrame* aFrame,
nsPoint* aExtraOffset)
@@ -2108,7 +2023,7 @@ nsLayoutUtils::GetNearestScrollableFrameForDirection(nsIFrame* aFrame,
for (nsIFrame* f = aFrame; f; f = nsLayoutUtils::GetCrossDocParentFrame(f)) {
nsIScrollableFrame* scrollableFrame = do_QueryFrame(f);
if (scrollableFrame) {
- ScrollbarStyles ss = scrollableFrame->GetScrollbarStyles();
+ ScrollStyles ss = scrollableFrame->GetScrollStyles();
uint32_t directions = scrollableFrame->GetPerceivedScrollingDirections();
if (aDirection == eVertical ?
(ss.mVertical != NS_STYLE_OVERFLOW_HIDDEN &&
@@ -2135,7 +2050,7 @@ nsLayoutUtils::GetNearestScrollableFrame(nsIFrame* aFrame, uint32_t aFlags)
return scrollableFrame;
}
} else {
- ScrollbarStyles ss = scrollableFrame->GetScrollbarStyles();
+ ScrollStyles ss = scrollableFrame->GetScrollStyles();
if ((aFlags & SCROLLABLE_INCLUDE_HIDDEN) ||
ss.mVertical != NS_STYLE_OVERFLOW_HIDDEN ||
ss.mHorizontal != NS_STYLE_OVERFLOW_HIDDEN) {
@@ -4427,8 +4342,7 @@ nsLayoutUtils::GetParentOrPlaceholderFor(nsIFrame* aFrame)
{
if ((aFrame->GetStateBits() & NS_FRAME_OUT_OF_FLOW)
&& !aFrame->GetPrevInFlow()) {
- return aFrame->PresContext()->PresShell()->FrameManager()->
- GetPlaceholderFrameFor(aFrame);
+ return aFrame->GetProperty(nsIFrame::PlaceholderFrameProperty());
}
return aFrame->GetParent();
}
@@ -8185,7 +8099,7 @@ UpdateCompositionBoundsForRCDRSF(ParentLayerRect& aCompBounds,
return false;
}
-#if defined(MOZ_WIDGET_ANDROID) || defined(MOZ_WIDGET_UIKIT)
+#if defined(MOZ_WIDGET_UIKIT)
nsIWidget* widget = rootFrame->GetNearestWidget();
#else
nsView* view = rootFrame->GetView();
@@ -8341,11 +8255,11 @@ nsLayoutUtils::CalculateScrollableRectForFrame(nsIScrollableFrame* aScrollableFr
contentBounds = aScrollableFrame->GetScrollRange();
nsPoint scrollPosition = aScrollableFrame->GetScrollPosition();
- if (aScrollableFrame->GetScrollbarStyles().mVertical == NS_STYLE_OVERFLOW_HIDDEN) {
+ if (aScrollableFrame->GetScrollStyles().mVertical == NS_STYLE_OVERFLOW_HIDDEN) {
contentBounds.y = scrollPosition.y;
contentBounds.height = 0;
}
- if (aScrollableFrame->GetScrollbarStyles().mHorizontal == NS_STYLE_OVERFLOW_HIDDEN) {
+ if (aScrollableFrame->GetScrollStyles().mHorizontal == NS_STYLE_OVERFLOW_HIDDEN) {
contentBounds.x = scrollPosition.x;
contentBounds.width = 0;
}
diff --git a/layout/base/nsLayoutUtils.h b/layout/base/nsLayoutUtils.h
index f4471ce74..21407511a 100644
--- a/layout/base/nsLayoutUtils.h
+++ b/layout/base/nsLayoutUtils.h
@@ -278,50 +278,26 @@ public:
static mozilla::layout::FrameChildListID GetChildListNameFor(nsIFrame* aChildFrame);
/**
- * GetBeforeFrameForContent returns the ::before frame for aContent, if
- * one exists. This is typically O(1). The frame passed in must be
- * the first-in-flow.
- *
- * @param aGenConParentFrame an ancestor of the ::before frame
- * @param aContent the content whose ::before is wanted
- * @return the ::before frame or nullptr if there isn't one
+ * Returns the ::before pseudo-element for aContent, if any.
*/
- static nsIFrame* GetBeforeFrameForContent(nsIFrame* aGenConParentFrame,
- const nsIContent* aContent);
+ static mozilla::dom::Element* GetBeforePseudo(const nsIContent* aContent);
/**
- * GetBeforeFrame returns the outermost ::before frame of the given frame, if
- * one exists. This is typically O(1). The frame passed in must be
- * the first-in-flow.
- *
- * @param aFrame the frame whose ::before is wanted
- * @return the :before frame or nullptr if there isn't one
+ * Returns the frame corresponding to the ::before pseudo-element for
+ * aContent, if any.
*/
- static nsIFrame* GetBeforeFrame(nsIFrame* aFrame);
+ static nsIFrame* GetBeforeFrame(const nsIContent* aContent);
/**
- * GetAfterFrameForContent returns the ::after frame for aContent, if one
- * exists. This will walk the in-flow chain of aGenConParentFrame to the
- * last-in-flow if needed. This function is typically O(N) in the number
- * of child frames, following in-flows, etc.
- *
- * @param aGenConParentFrame an ancestor of the ::after frame
- * @param aContent the content whose ::after is wanted
- * @return the ::after frame or nullptr if there isn't one
+ * Returns the ::after pseudo-element for aContent, if any.
*/
- static nsIFrame* GetAfterFrameForContent(nsIFrame* aGenConParentFrame,
- const nsIContent* aContent);
+ static mozilla::dom::Element* GetAfterPseudo(const nsIContent* aContent);
/**
- * GetAfterFrame returns the outermost ::after frame of the given frame, if one
- * exists. This will walk the in-flow chain to the last-in-flow if
- * needed. This function is typically O(N) in the number of child
- * frames, following in-flows, etc.
- *
- * @param aFrame the frame whose ::after is wanted
- * @return the :after frame or nullptr if there isn't one
+ * Returns the frame corresponding to the ::after pseudo-element for aContent,
+ * if any.
*/
- static nsIFrame* GetAfterFrame(nsIFrame* aFrame);
+ static nsIFrame* GetAfterFrame(const nsIContent* aContent);
/**
* Given a frame, search up the frame tree until we find an
@@ -379,23 +355,6 @@ public:
*/
static nsIFrame* GetRealPrimaryFrameFor(const nsIContent* aContent);
- /**
- * IsGeneratedContentFor returns true if aFrame is the outermost
- * frame for generated content of type aPseudoElement for aContent.
- * aFrame *might not* have the aPseudoElement pseudo-style! For example
- * it might be a table wrapper frame and the inner table frame might
- * have the pseudo-style.
- *
- * @param aContent the content node we're looking at. If this is
- * null, then we just assume that aFrame has the right content
- * pointer.
- * @param aFrame the frame we're looking at
- * @param aPseudoElement the pseudo type we're interested in
- * @return whether aFrame is the generated aPseudoElement frame for aContent
- */
- static bool IsGeneratedContentFor(nsIContent* aContent, nsIFrame* aFrame,
- nsIAtom* aPseudoElement);
-
#ifdef DEBUG
// TODO: remove, see bug 598468.
static bool gPreventAssertInCompareTreePosition;
diff --git a/layout/base/nsPresArena.cpp b/layout/base/nsPresArena.cpp
index 2b1f072df..8e7fb9374 100644
--- a/layout/base/nsPresArena.cpp
+++ b/layout/base/nsPresArena.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: set ts=2 sw=2 et tw=78:
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/layout/base/nsPresArena.h b/layout/base/nsPresArena.h
index 32407541e..00a54d68d 100644
--- a/layout/base/nsPresArena.h
+++ b/layout/base/nsPresArena.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: set ts=2 sw=2 et tw=78:
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/layout/base/nsPresArenaObjectList.h b/layout/base/nsPresArenaObjectList.h
index c226aa3b4..82ab98244 100644
--- a/layout/base/nsPresArenaObjectList.h
+++ b/layout/base/nsPresArenaObjectList.h
@@ -1,4 +1,3 @@
-/* vim: set shiftwidth=2 tabstop=8 autoindent cindent expandtab: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp
index 1d90b967a..f7be42b5f 100644
--- a/layout/base/nsPresContext.cpp
+++ b/layout/base/nsPresContext.cpp
@@ -1346,7 +1346,7 @@ nsPresContext::ScreenSizeInchesForFontInflation(bool* aChanged)
}
static bool
-CheckOverflow(const nsStyleDisplay* aDisplay, ScrollbarStyles* aStyles)
+CheckOverflow(const nsStyleDisplay* aDisplay, ScrollStyles* aStyles)
{
if (aDisplay->mOverflowX == NS_STYLE_OVERFLOW_VISIBLE &&
aDisplay->mScrollBehavior == NS_STYLE_SCROLL_BEHAVIOR_AUTO &&
@@ -1362,17 +1362,17 @@ CheckOverflow(const nsStyleDisplay* aDisplay, ScrollbarStyles* aStyles)
}
if (aDisplay->mOverflowX == NS_STYLE_OVERFLOW_CLIP) {
- *aStyles = ScrollbarStyles(NS_STYLE_OVERFLOW_HIDDEN,
+ *aStyles = ScrollStyles(NS_STYLE_OVERFLOW_HIDDEN,
NS_STYLE_OVERFLOW_HIDDEN, aDisplay);
} else {
- *aStyles = ScrollbarStyles(aDisplay);
+ *aStyles = ScrollStyles(aDisplay);
}
return true;
}
static nsIContent*
-GetPropagatedScrollbarStylesForViewport(nsPresContext* aPresContext,
- ScrollbarStyles *aStyles)
+GetPropagatedScrollStylesForViewport(nsPresContext* aPresContext,
+ ScrollStyles *aStyles)
{
nsIDocument* document = aPresContext->Document();
Element* docElement = document->GetRootElement();
@@ -1424,16 +1424,16 @@ GetPropagatedScrollbarStylesForViewport(nsPresContext* aPresContext,
}
nsIContent*
-nsPresContext::UpdateViewportScrollbarStylesOverride()
+nsPresContext::UpdateViewportScrollStylesOverride()
{
// Start off with our default styles, and then update them as needed.
- mViewportStyleScrollbar = ScrollbarStyles(NS_STYLE_OVERFLOW_AUTO,
+ mViewportStyleScrollbar = ScrollStyles(NS_STYLE_OVERFLOW_AUTO,
NS_STYLE_OVERFLOW_AUTO);
mViewportScrollbarOverrideNode = nullptr;
// Don't propagate the scrollbar state in printing or print preview.
if (!IsPaginated()) {
mViewportScrollbarOverrideNode =
- GetPropagatedScrollbarStylesForViewport(this, &mViewportStyleScrollbar);
+ GetPropagatedScrollStylesForViewport(this, &mViewportStyleScrollbar);
}
nsIDocument* document = Document();
@@ -1445,7 +1445,7 @@ nsPresContext::UpdateViewportScrollbarStylesOverride()
// affected across fullscreen change.
if (fullscreenElement != document->GetRootElement() &&
fullscreenElement != mViewportScrollbarOverrideNode) {
- mViewportStyleScrollbar = ScrollbarStyles(NS_STYLE_OVERFLOW_HIDDEN,
+ mViewportStyleScrollbar = ScrollStyles(NS_STYLE_OVERFLOW_HIDDEN,
NS_STYLE_OVERFLOW_HIDDEN);
}
}
@@ -1454,7 +1454,7 @@ nsPresContext::UpdateViewportScrollbarStylesOverride()
}
bool
-nsPresContext::ElementWouldPropagateScrollbarStyles(Element* aElement)
+nsPresContext::ElementWouldPropagateScrollStyles(Element* aElement)
{
MOZ_ASSERT(IsPaginated(), "Should only be called on paginated contexts");
if (aElement->GetParent() && !aElement->IsHTMLElement(nsGkAtoms::body)) {
@@ -1462,13 +1462,13 @@ nsPresContext::ElementWouldPropagateScrollbarStyles(Element* aElement)
return false;
}
- // Go ahead and just call GetPropagatedScrollbarStylesForViewport, but update
- // a dummy ScrollbarStyles we don't care about. It'll do a bit of extra work,
+ // Go ahead and just call GetPropagatedScrollStylesForViewport, but update
+ // a dummy ScrollStyles we don't care about. It'll do a bit of extra work,
// but saves us having to have more complicated code or more code duplication;
// in practice we will make this call quite rarely, because we checked for all
// the common cases above.
- ScrollbarStyles dummy(NS_STYLE_OVERFLOW_AUTO, NS_STYLE_OVERFLOW_AUTO);
- return GetPropagatedScrollbarStylesForViewport(this, &dummy) == aElement;
+ ScrollStyles dummy(NS_STYLE_OVERFLOW_AUTO, NS_STYLE_OVERFLOW_AUTO);
+ return GetPropagatedScrollStylesForViewport(this, &dummy) == aElement;
}
void
diff --git a/layout/base/nsPresContext.h b/layout/base/nsPresContext.h
index a2b9bb533..10908a604 100644
--- a/layout/base/nsPresContext.h
+++ b/layout/base/nsPresContext.h
@@ -35,7 +35,7 @@
#include "mozilla/AppUnits.h"
#include "prclist.h"
#include "nsThreadUtils.h"
-#include "ScrollbarStyles.h"
+#include "ScrollStyles.h"
#include "nsIMessageManager.h"
#include "mozilla/RestyleLogging.h"
#include "Units.h"
@@ -140,7 +140,7 @@ class nsPresContext : public nsIObserver,
public mozilla::SupportsWeakPtr<nsPresContext> {
public:
typedef mozilla::LangGroupFontPrefs LangGroupFontPrefs;
- typedef mozilla::ScrollbarStyles ScrollbarStyles;
+ typedef mozilla::ScrollStyles ScrollStyles;
typedef mozilla::StaticPresData StaticPresData;
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
@@ -716,19 +716,19 @@ public:
* @return if scroll was propagated from some content node, the content node
* it was propagated from.
*/
- nsIContent* UpdateViewportScrollbarStylesOverride();
+ nsIContent* UpdateViewportScrollStylesOverride();
/**
* Returns the cached result from the last call to
- * UpdateViewportScrollbarStylesOverride() -- i.e. return the node
+ * UpdateViewportScrollStylesOverride() -- i.e. return the node
* whose scrollbar styles we have propagated to the viewport (or nullptr if
* there is no such node).
*/
- nsIContent* GetViewportScrollbarStylesOverrideNode() const {
+ nsIContent* GetViewportScrollStylesOverrideNode() const {
return mViewportScrollbarOverrideNode;
}
- const ScrollbarStyles& GetViewportScrollbarStylesOverride() const
+ const ScrollStyles& GetViewportScrollStylesOverride() const
{
return mViewportStyleScrollbar;
}
@@ -737,7 +737,7 @@ public:
* Check whether the given element would propagate its scrollbar styles to the
* viewport in non-paginated mode. Must only be called if IsPaginated().
*/
- bool ElementWouldPropagateScrollbarStyles(mozilla::dom::Element* aElement);
+ bool ElementWouldPropagateScrollStyles(mozilla::dom::Element* aElement);
/**
* Set and get methods for controlling the background drawing
@@ -1312,13 +1312,13 @@ protected:
// This is a non-owning pointer. May be null. If non-null, it's guaranteed
// to be pointing to a node that's still alive, because we'll reset it in
- // UpdateViewportScrollbarStylesOverride() as part of the cleanup code
+ // UpdateViewportScrollStylesOverride() as part of the cleanup code
// when this node is removed from the document. (For <body> and the root node,
// this call happens in nsCSSFrameConstructor::ContentRemoved(). For
// fullscreen elements, it happens in the fullscreen-specific cleanup
// invoked by Element::UnbindFromTree().)
nsIContent* MOZ_NON_OWNING_REF mViewportScrollbarOverrideNode;
- ScrollbarStyles mViewportStyleScrollbar;
+ ScrollStyles mViewportStyleScrollbar;
uint8_t mFocusRingWidth;
diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp
index 0544a69a4..9ba4ff462 100644
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: set ts=2 sw=2 et tw=78:
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -198,10 +197,6 @@
#include "mozilla/StyleSheetInlines.h"
#include "mozilla/dom/ImageTracker.h"
-#ifdef ANDROID
-#include "nsIDocShellTreeOwner.h"
-#endif
-
#ifdef MOZ_TASK_TRACER
#include "GeckoTaskTracer.h"
using namespace mozilla::tasktracer;
@@ -2832,10 +2827,9 @@ PresShell::CancelAllPendingReflows()
}
void
-PresShell::DestroyFramesFor(nsIContent* aContent,
- nsIContent** aDestroyedFramesFor)
+PresShell::DestroyFramesForAndRestyle(Element* aElement)
{
- MOZ_ASSERT(aContent);
+ MOZ_ASSERT(aElement);
NS_ENSURE_TRUE_VOID(mPresContext);
if (!mDidInitialize) {
return;
@@ -2847,43 +2841,20 @@ PresShell::DestroyFramesFor(nsIContent* aContent,
++mChangeNestCount;
nsCSSFrameConstructor* fc = FrameConstructor();
+ bool didReconstruct;
fc->BeginUpdate();
- fc->DestroyFramesFor(aContent, aDestroyedFramesFor);
+ fc->DestroyFramesFor(aElement, &didReconstruct);
fc->EndUpdate();
- --mChangeNestCount;
-}
-
-void
-PresShell::CreateFramesFor(nsIContent* aContent)
-{
- NS_ENSURE_TRUE_VOID(mPresContext);
- if (!mDidInitialize) {
- // Nothing to do here. In fact, if we proceed and aContent is the
- // root we will crash.
- return;
- }
-
- // Don't call RecreateFramesForContent since that is not exported and we want
- // to keep the number of entrypoints down.
-
- NS_ASSERTION(mViewManager, "Should have view manager");
- MOZ_ASSERT(aContent);
-
- // Have to make sure that the content notifications are flushed before we
- // start messing with the frame model; otherwise we can get content doubling.
- mDocument->FlushPendingNotifications(Flush_ContentAndNotify);
+ auto changeHint = didReconstruct
+ ? nsChangeHint(0)
+ : nsChangeHint_ReconstructFrame;
- nsAutoScriptBlocker scriptBlocker;
-
- // Mark ourselves as not safe to flush while we're doing frame construction.
- ++mChangeNestCount;
-
- nsCSSFrameConstructor* fc = FrameConstructor();
- nsILayoutHistoryState* layoutState = fc->GetLastCapturedLayoutHistoryState();
- fc->BeginUpdate();
- fc->ContentInserted(aContent->GetParent(), aContent, layoutState, false);
- fc->EndUpdate();
+ // NOTE(emilio): eRestyle_Subtree is needed to force also a full subtree
+ // restyle for the content (in Stylo, where the existence of frames != the
+ // existence of styles).
+ mPresContext->RestyleManager()->PostRestyleEvent(
+ aElement, eRestyle_Subtree, changeHint);
--mChangeNestCount;
}
@@ -3360,7 +3331,7 @@ static void ScrollToShowRect(nsIScrollableFrame* aFrameAsScrollable,
aHorizontal.mWhenToScroll == nsIPresShell::SCROLL_IF_NOT_VISIBLE) {
lineSize = aFrameAsScrollable->GetLineScrollAmount();
}
- ScrollbarStyles ss = aFrameAsScrollable->GetScrollbarStyles();
+ ScrollStyles ss = aFrameAsScrollable->GetScrollStyles();
nsRect allowedRange(scrollPt, nsSize(0, 0));
bool needToScroll = false;
uint32_t directions = aFrameAsScrollable->GetPerceivedScrollingDirections();
@@ -3417,7 +3388,7 @@ static void ScrollToShowRect(nsIScrollableFrame* aFrameAsScrollable,
// a current smooth scroll operation.
if (needToScroll) {
nsIScrollableFrame::ScrollMode scrollMode = nsIScrollableFrame::INSTANT;
- bool autoBehaviorIsSmooth = (aFrameAsScrollable->GetScrollbarStyles().mScrollBehavior
+ bool autoBehaviorIsSmooth = (aFrameAsScrollable->GetScrollStyles().mScrollBehavior
== NS_STYLE_SCROLL_BEHAVIOR_SMOOTH);
bool smoothScroll = (aFlags & nsIPresShell::SCROLL_SMOOTH) ||
((aFlags & nsIPresShell::SCROLL_SMOOTH_AUTO) && autoBehaviorIsSmooth);
@@ -4448,14 +4419,14 @@ PresShell::NotifyCounterStylesAreDirty()
mFrameConstructor->EndUpdate();
}
-nsresult
-PresShell::ReconstructFrames(void)
+void
+PresShell::ReconstructFrames()
{
NS_PRECONDITION(!mFrameConstructor->GetRootFrame() || mDidInitialize,
"Must not have root frame before initial reflow");
if (!mDidInitialize || mIsDestroying) {
// Nothing to do here
- return NS_OK;
+ return;
}
nsCOMPtr<nsIPresShell> kungFuDeathGrip(this);
@@ -4465,16 +4436,14 @@ PresShell::ReconstructFrames(void)
mDocument->FlushPendingNotifications(Flush_ContentAndNotify);
if (mIsDestroying) {
- return NS_OK;
+ return;
}
nsAutoCauseReflowNotifier crNotifier(this);
mFrameConstructor->BeginUpdate();
- nsresult rv = mFrameConstructor->ReconstructDocElementHierarchy();
+ mFrameConstructor->ReconstructDocElementHierarchy();
VERIFY_STYLE_TREE;
mFrameConstructor->EndUpdate();
-
- return rv;
}
void
@@ -4602,12 +4571,6 @@ PresShell::StyleRuleRemoved(StyleSheet* aStyleSheet)
RecordStyleSheetChange(aStyleSheet);
}
-nsIFrame*
-PresShell::GetPlaceholderFrameFor(nsIFrame* aFrame) const
-{
- return mFrameConstructor->GetPlaceholderFrameFor(aFrame);
-}
-
nsresult
PresShell::RenderDocument(const nsRect& aRect, uint32_t aFlags,
nscolor aBackgroundColor,
@@ -4759,9 +4722,11 @@ PresShell::ClipListToRange(nsDisplayListBuilder *aBuilder,
frame->GetOffsets(frameStartOffset, frameEndOffset);
int32_t hilightStart =
- atStart ? std::max(aRange->StartOffset(), frameStartOffset) : frameStartOffset;
+ atStart ? std::max(static_cast<int32_t>(aRange->StartOffset()),
+ frameStartOffset) : frameStartOffset;
int32_t hilightEnd =
- atEnd ? std::min(aRange->EndOffset(), frameEndOffset) : frameEndOffset;
+ atEnd ? std::min(static_cast<int32_t>(aRange->EndOffset()),
+ frameEndOffset) : frameEndOffset;
if (hilightStart < hilightEnd) {
// determine the location of the start and end edges of the range.
nsPoint startPoint, endPoint;
@@ -7318,12 +7283,6 @@ PresShell::HandleEvent(nsIFrame* aFrame,
// if the mouse is being captured then retarget the mouse event at the
// document that is being captured.
retargetEventDoc = capturingContent->GetComposedDoc();
-#ifdef ANDROID
- } else if ((aEvent->mClass == eTouchEventClass) ||
- (aEvent->mClass == eMouseEventClass) ||
- (aEvent->mClass == eWheelEventClass)) {
- retargetEventDoc = GetTouchEventTargetDocument();
-#endif
}
if (retargetEventDoc) {
@@ -7877,38 +7836,6 @@ PresShell::HandleEvent(nsIFrame* aFrame,
return rv;
}
-#ifdef ANDROID
-nsIDocument*
-PresShell::GetTouchEventTargetDocument()
-{
- nsPresContext* context = GetPresContext();
- if (!context || !context->IsRoot()) {
- return nullptr;
- }
-
- nsCOMPtr<nsIDocShellTreeItem> shellAsTreeItem = context->GetDocShell();
- if (!shellAsTreeItem) {
- return nullptr;
- }
-
- nsCOMPtr<nsIDocShellTreeOwner> owner;
- shellAsTreeItem->GetTreeOwner(getter_AddRefs(owner));
- if (!owner) {
- return nullptr;
- }
-
- // now get the primary content shell (active tab)
- nsCOMPtr<nsIDocShellTreeItem> item;
- owner->GetPrimaryContentShell(getter_AddRefs(item));
- nsCOMPtr<nsIDocShell> childDocShell = do_QueryInterface(item);
- if (!childDocShell) {
- return nullptr;
- }
-
- return childDocShell->GetDocument();
-}
-#endif
-
#ifdef DEBUG
void
PresShell::ShowEventTargetDebug()
diff --git a/layout/base/nsPresShell.h b/layout/base/nsPresShell.h
index f20370d73..fbbcfc7ec 100644
--- a/layout/base/nsPresShell.h
+++ b/layout/base/nsPresShell.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: set ts=2 sw=2 et tw=78:
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -130,7 +129,6 @@ public:
virtual nsIPageSequenceFrame* GetPageSequenceFrame() const override;
virtual nsCanvasFrame* GetCanvasFrame() const override;
- virtual nsIFrame* GetPlaceholderFrameFor(nsIFrame* aFrame) const override;
virtual void FrameNeedsReflow(nsIFrame *aFrame, IntrinsicDirty aIntrinsicDirty,
nsFrameState aBitToAdd,
ReflowRootHandling aRootHandling =
@@ -140,9 +138,7 @@ public:
virtual bool IsSafeToFlush() const override;
virtual void FlushPendingNotifications(mozFlushType aType) override;
virtual void FlushPendingNotifications(mozilla::ChangesToFlush aType) override;
- virtual void DestroyFramesFor(nsIContent* aContent,
- nsIContent** aDestroyedFramesFor) override;
- virtual void CreateFramesFor(nsIContent* aContent) override;
+ virtual void DestroyFramesForAndRestyle(mozilla::dom::Element* aElement) override;
/**
* Recreates the frames for a node
@@ -200,7 +196,7 @@ public:
virtual void NotifyCounterStylesAreDirty() override;
- virtual nsresult ReconstructFrames(void) override;
+ virtual void ReconstructFrames(void) override;
virtual void Freeze() override;
virtual void Thaw() override;
virtual void FireOrClearDelayedEvents(bool aFireEvents) override;
@@ -759,9 +755,6 @@ protected:
virtual void SysColorChanged() override { mPresContext->SysColorChanged(); }
virtual void ThemeChanged() override { mPresContext->ThemeChanged(); }
virtual void BackingScaleFactorChanged() override { mPresContext->UIResolutionChanged(); }
-#ifdef ANDROID
- virtual nsIDocument* GetTouchEventTargetDocument() override;
-#endif
virtual void PausePainting() override;
virtual void ResumePainting() override;
diff --git a/layout/base/nsRefreshDriver.cpp b/layout/base/nsRefreshDriver.cpp
index c0d09d2a0..02838d764 100644
--- a/layout/base/nsRefreshDriver.cpp
+++ b/layout/base/nsRefreshDriver.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=8 autoindent cindent expandtab: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/base/nsRefreshDriver.h b/layout/base/nsRefreshDriver.h
index 4e839e764..e1dd5b6a9 100644
--- a/layout/base/nsRefreshDriver.h
+++ b/layout/base/nsRefreshDriver.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=8 autoindent cindent expandtab: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/base/nsStyleSheetService.cpp b/layout/base/nsStyleSheetService.cpp
index 676e46a50..722a82ed4 100644
--- a/layout/base/nsStyleSheetService.cpp
+++ b/layout/base/nsStyleSheetService.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/base/nsStyleSheetService.h b/layout/base/nsStyleSheetService.h
index 982e1a05a..1d27bf25d 100644
--- a/layout/base/nsStyleSheetService.h
+++ b/layout/base/nsStyleSheetService.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/base/tests/chrome/chrome.ini b/layout/base/tests/chrome/chrome.ini
index 2f6ca0ba8..56454d311 100644
--- a/layout/base/tests/chrome/chrome.ini
+++ b/layout/base/tests/chrome/chrome.ini
@@ -1,5 +1,4 @@
[DEFAULT]
-skip-if = os == 'android'
support-files =
animated.gif
blue-32x32.png
diff --git a/layout/base/tests/mochitest.ini b/layout/base/tests/mochitest.ini
index 405697977..fc616b1ef 100644
--- a/layout/base/tests/mochitest.ini
+++ b/layout/base/tests/mochitest.ini
@@ -1,6 +1,4 @@
[DEFAULT]
-# Android: SLOW_DIRECTORY;
-skip-if = toolkit == 'android'
support-files =
Ahem.ttf
border_radius_hit_testing_iframe.html
@@ -224,23 +222,18 @@ support-files = file_bug607529.html
skip-if = e10s # bug 1020135, nested oop iframes not supported
support-files = bug921928_event_target_iframe_apps_oop.html
[test_mozPaintCount.html]
-skip-if = toolkit == 'android'
[test_scroll_event_ordering.html]
[test_scroll_selection_into_view.html]
support-files=scroll_selection_into_view_window.html
[test_scroll_snapping.html]
-skip-if = buildapp == 'android' # bug 1041833
[test_scroll_snapping_scrollbars.html]
-skip-if = buildapp == 'android' # bug 1041833
[test_bug583889.html]
support-files = bug583889_inner1.html bug583889_inner2.html
[test_bug582771.html]
[test_bug968148.html]
support-files = bug968148_inner.html
[test_bug603550.html]
-skip-if = toolkit == 'android' #TIMED_OUT
[test_bug629838.html]
-skip-if = toolkit == 'android'
[test_bug646757.html]
[test_bug718809.html]
[test_bug725426.html]
@@ -270,13 +263,12 @@ support-files =
# because of bug 469208.
[test_bug332655-1.html]
-skip-if = toolkit == 'android'
[test_bug332655-2.html]
[test_bug499538-1.html]
[test_bug749186.html]
[test_bug644768.html]
[test_flush_on_paint.html]
-skip-if = true || (toolkit == 'android') || (toolkit == "cocoa") # Bug 688128, bug 539356
+skip-if = true || (toolkit == "cocoa") # Bug 688128, bug 539356
[test_getBoxQuads_convertPointRectQuad.html]
[test_bug687297.html]
support-files =
@@ -294,7 +286,7 @@ support-files = bug1080361_inner.html
[test_bug1093686.html]
support-files = bug1093686_inner.html
[test_bug1120705.html]
-skip-if = buildapp == 'android' || os == 'mac' || toolkit == 'gtk2' || toolkit == 'gtk3' # android does not have clickable scrollbars, mac does not have scrollbar down and up buttons, gtk may or may not have scrollbar buttons depending on theme
+skip-if = os == 'mac' || toolkit == 'gtk2' || toolkit == 'gtk3' # mac does not have scrollbar down and up buttons, gtk may or may not have scrollbar buttons depending on theme
[test_bug1153130.html]
support-files = bug1153130_inner.html
[test_bug1162990.html]
diff --git a/layout/base/tests/selection-utils.js b/layout/base/tests/selection-utils.js
index a14ff0d81..ed902e1cf 100644
--- a/layout/base/tests/selection-utils.js
+++ b/layout/base/tests/selection-utils.js
@@ -1,5 +1,4 @@
// -*- Mode: Javascript; tab-width: 2; indent-tabs-mode: nil; js-indent-level: 2 -*-
-// vim: set ts=2 sw=2 et tw=78:
function clearSelection(w)
{
var sel = (w ? w : window).getSelection();
diff --git a/layout/base/tests/test_reftests_with_caret.html b/layout/base/tests/test_reftests_with_caret.html
index d9b5d4a6c..062c605b9 100644
--- a/layout/base/tests/test_reftests_with_caret.html
+++ b/layout/base/tests/test_reftests_with_caret.html
@@ -189,20 +189,15 @@ var tests = [
function() {SpecialPowers.pushPrefEnv({'clear': [['layout.accessiblecaret.enabled']]}, nextTest);} ,
];
-if (navigator.appVersion.indexOf("Android") == -1 &&
- SpecialPowers.Services.appinfo.name != "B2G") {
- tests.push([ 'bug512295-1.html' , 'bug512295-1-ref.html' ]);
- tests.push([ 'bug512295-2.html' , 'bug512295-2-ref.html' ]);
- tests.push([ 'bug923376.html' , 'bug923376-ref.html' ]);
- tests.push(function() {SpecialPowers.pushPrefEnv({'set': [['layout.css.overflow-clip-box.enabled', true]]}, nextTest);});
- tests.push([ 'bug966992-1.html' , 'bug966992-1-ref.html' ]);
- tests.push([ 'bug966992-2.html' , 'bug966992-2-ref.html' ]);
- tests.push([ 'bug966992-3.html' , 'bug966992-3-ref.html' ]);
- tests.push(function() {SpecialPowers.pushPrefEnv({'clear': [['layout.css.overflow-clip-box.enabled']]}, nextTest);});
- tests.push([ 'bug1258308-1.html' , 'bug1258308-1-ref.html' ]); // maybe VK_END doesn't work on Android?
-} else {
- is(SpecialPowers.getIntPref("layout.spellcheckDefault"), 0, "Spellcheck should be turned off for this platform or this if..else check removed");
-}
+tests.push([ 'bug512295-1.html' , 'bug512295-1-ref.html' ]);
+tests.push([ 'bug512295-2.html' , 'bug512295-2-ref.html' ]);
+tests.push([ 'bug923376.html' , 'bug923376-ref.html' ]);
+tests.push(function() {SpecialPowers.pushPrefEnv({'set': [['layout.css.overflow-clip-box.enabled', true]]}, nextTest);});
+tests.push([ 'bug966992-1.html' , 'bug966992-1-ref.html' ]);
+tests.push([ 'bug966992-2.html' , 'bug966992-2-ref.html' ]);
+tests.push([ 'bug966992-3.html' , 'bug966992-3-ref.html' ]);
+tests.push(function() {SpecialPowers.pushPrefEnv({'clear': [['layout.css.overflow-clip-box.enabled']]}, nextTest);});
+tests.push([ 'bug1258308-1.html' , 'bug1258308-1-ref.html' ]);
if (navigator.platform.indexOf("Linux") >= 0 &&
SpecialPowers.Services.appinfo.name != "B2G") {
diff --git a/layout/build/moz.build b/layout/build/moz.build
index 70b075491..d7996af8d 100644
--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@@ -1,5 +1,4 @@
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -68,11 +67,6 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
LOCAL_INCLUDES += [
'/dom/system/mac',
]
-elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
- LOCAL_INCLUDES += [
- '/dom/system',
- '/dom/system/android',
- ]
elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
LOCAL_INCLUDES += [
'/widget/gtk',
diff --git a/layout/build/nsContentDLF.cpp b/layout/build/nsContentDLF.cpp
index 5c4cef210..b2b2a00c9 100644
--- a/layout/build/nsContentDLF.cpp
+++ b/layout/build/nsContentDLF.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: c++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 sw=2 et tw=78: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/build/nsLayoutModule.cpp b/layout/build/nsLayoutModule.cpp
index 8a078194c..3c6f5f3aa 100644
--- a/layout/build/nsLayoutModule.cpp
+++ b/layout/build/nsLayoutModule.cpp
@@ -116,9 +116,6 @@ using mozilla::dom::AudioChannelAgent;
#include "nsSystemPrincipal.h"
#include "nsNullPrincipal.h"
#include "nsNetCID.h"
-#if defined(MOZ_WIDGET_ANDROID)
-#include "nsHapticFeedback.h"
-#endif
#include "nsParserUtils.h"
#include "nsHTMLCanvasFrame.h"
@@ -253,9 +250,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(AudioChannelAgent)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsDeviceSensors)
-#if defined(ANDROID)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsHapticFeedback)
-#endif
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(ThirdPartyUtil, Init)
NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsIPowerManagerService,
PowerManagerService::GetInstance)
@@ -653,10 +647,6 @@ NS_DEFINE_NAMED_CID(NS_NULLPRINCIPAL_CID);
NS_DEFINE_NAMED_CID(THIRDPARTYUTIL_CID);
NS_DEFINE_NAMED_CID(NS_STRUCTUREDCLONECONTAINER_CID);
NS_DEFINE_NAMED_CID(NS_DEVICE_SENSORS_CID);
-
-#if defined(ANDROID)
-NS_DEFINE_NAMED_CID(NS_HAPTICFEEDBACK_CID);
-#endif
NS_DEFINE_NAMED_CID(NS_POWERMANAGERSERVICE_CID);
NS_DEFINE_NAMED_CID(OSFILECONSTANTSSERVICE_CID);
NS_DEFINE_NAMED_CID(UDPSOCKETCHILD_CID);
@@ -909,9 +899,6 @@ static const mozilla::Module::CIDEntry kLayoutCIDs[] = {
{ &kNS_SYSTEMPRINCIPAL_CID, false, nullptr, nsSystemPrincipalConstructor },
{ &kNS_NULLPRINCIPAL_CID, false, nullptr, nsNullPrincipalConstructor },
{ &kNS_DEVICE_SENSORS_CID, false, nullptr, nsDeviceSensorsConstructor },
-#if defined(ANDROID)
- { &kNS_HAPTICFEEDBACK_CID, false, nullptr, nsHapticFeedbackConstructor },
-#endif
{ &kTHIRDPARTYUTIL_CID, false, nullptr, ThirdPartyUtilConstructor },
{ &kNS_STRUCTUREDCLONECONTAINER_CID, false, nullptr, nsStructuredCloneContainerConstructor },
{ &kNS_POWERMANAGERSERVICE_CID, false, nullptr, nsIPowerManagerServiceConstructor, Module::ALLOW_IN_GPU_PROCESS },
@@ -1029,9 +1016,6 @@ static const mozilla::Module::ContractIDEntry kLayoutContracts[] = {
{ NS_SYSTEMPRINCIPAL_CONTRACTID, &kNS_SYSTEMPRINCIPAL_CID },
{ NS_NULLPRINCIPAL_CONTRACTID, &kNS_NULLPRINCIPAL_CID },
{ NS_DEVICE_SENSORS_CONTRACTID, &kNS_DEVICE_SENSORS_CID },
-#if defined(ANDROID)
- { "@mozilla.org/widget/hapticfeedback;1", &kNS_HAPTICFEEDBACK_CID },
-#endif
{ THIRDPARTYUTIL_CONTRACTID, &kTHIRDPARTYUTIL_CID },
{ NS_STRUCTUREDCLONECONTAINER_CONTRACTID, &kNS_STRUCTUREDCLONECONTAINER_CID },
{ POWERMANAGERSERVICE_CONTRACTID, &kNS_POWERMANAGERSERVICE_CID, Module::ALLOW_IN_GPU_PROCESS },
diff --git a/layout/build/nsLayoutStatics.cpp b/layout/build/nsLayoutStatics.cpp
index 6761931f6..014176f03 100644
--- a/layout/build/nsLayoutStatics.cpp
+++ b/layout/build/nsLayoutStatics.cpp
@@ -315,10 +315,7 @@ nsLayoutStatics::Initialize()
// creating the hidden DOM window to support some current stylo hacks. We
// should move initialization back here once those go away.
-#ifndef MOZ_WIDGET_ANDROID
- // On Android, we instantiate it when constructing AndroidBridge.
MediaPrefs::GetSingleton();
-#endif
return NS_OK;
}
@@ -423,8 +420,6 @@ nsLayoutStatics::Shutdown()
DisplayItemClip::Shutdown();
- CustomElementRegistry::XPCOMShutdown();
-
CacheObserver::Shutdown();
PromiseDebugging::Shutdown();
diff --git a/layout/forms/moz.build b/layout/forms/moz.build
index 50e364ce2..d3765c5f3 100644
--- a/layout/forms/moz.build
+++ b/layout/forms/moz.build
@@ -1,5 +1,4 @@
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/layout/forms/nsColorControlFrame.cpp b/layout/forms/nsColorControlFrame.cpp
index e0bae43a9..63aee814a 100644
--- a/layout/forms/nsColorControlFrame.cpp
+++ b/layout/forms/nsColorControlFrame.cpp
@@ -67,6 +67,7 @@ nsColorControlFrame::CreateAnonymousContent(nsTArray<ContentInfo>& aElements)
{
nsCOMPtr<nsIDocument> doc = mContent->GetComposedDoc();
mColorContent = doc->CreateHTMLElement(nsGkAtoms::div);
+ mColorContent->SetPseudoElementType(CSSPseudoElementType::mozColorSwatch);
// Mark the element to be native anonymous before setting any attributes.
mColorContent->SetIsNativeAnonymousRoot();
@@ -74,11 +75,7 @@ nsColorControlFrame::CreateAnonymousContent(nsTArray<ContentInfo>& aElements)
nsresult rv = UpdateColor();
NS_ENSURE_SUCCESS(rv, rv);
- CSSPseudoElementType pseudoType = CSSPseudoElementType::mozColorSwatch;
- RefPtr<nsStyleContext> newStyleContext = PresContext()->StyleSet()->
- ResolvePseudoElementStyle(mContent->AsElement(), pseudoType,
- StyleContext(), mColorContent->AsElement());
- if (!aElements.AppendElement(ContentInfo(mColorContent, newStyleContext))) {
+ if (!aElements.AppendElement(mColorContent)) {
return NS_ERROR_OUT_OF_MEMORY;
}
diff --git a/layout/forms/nsComboboxControlFrame.cpp b/layout/forms/nsComboboxControlFrame.cpp
index fd3db997a..9db6ae5e4 100644
--- a/layout/forms/nsComboboxControlFrame.cpp
+++ b/layout/forms/nsComboboxControlFrame.cpp
@@ -115,7 +115,7 @@ NS_IMPL_ISUPPORTS(nsComboButtonListener,
// static class data member for Bug 32920
nsComboboxControlFrame* nsComboboxControlFrame::sFocused = nullptr;
-nsContainerFrame*
+nsComboboxControlFrame*
NS_NewComboboxControlFrame(nsIPresShell* aPresShell, nsStyleContext* aContext, nsFrameState aStateFlags)
{
nsComboboxControlFrame* it = new (aPresShell) nsComboboxControlFrame(aContext);
@@ -249,6 +249,7 @@ nsComboboxControlFrame::~nsComboboxControlFrame()
//--------------------------------------------------------------
NS_QUERYFRAME_HEAD(nsComboboxControlFrame)
+ NS_QUERYFRAME_ENTRY(nsComboboxControlFrame)
NS_QUERYFRAME_ENTRY(nsIComboboxControlFrame)
NS_QUERYFRAME_ENTRY(nsIFormControlFrame)
NS_QUERYFRAME_ENTRY(nsIAnonymousContentCreator)
@@ -1350,16 +1351,9 @@ nsComboboxDisplayFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
}
nsIFrame*
-nsComboboxControlFrame::CreateFrameFor(nsIContent* aContent)
+nsComboboxControlFrame::CreateFrameForDisplayNode()
{
- NS_PRECONDITION(nullptr != aContent, "null ptr");
-
- NS_ASSERTION(mDisplayContent, "mDisplayContent can't be null!");
-
- if (mDisplayContent != aContent) {
- // We only handle the frames for mDisplayContent here
- return nullptr;
- }
+ MOZ_ASSERT(mDisplayContent);
// Get PresShell
nsIPresShell *shell = PresContext()->PresShell();
@@ -1384,7 +1378,7 @@ nsComboboxControlFrame::CreateFrameFor(nsIContent* aContent)
nsIFrame* textFrame = NS_NewTextFrame(shell, textStyleContext);
// initialize the text frame
- textFrame->Init(aContent, mDisplayFrame, nullptr);
+ textFrame->Init(mDisplayContent, mDisplayFrame, nullptr);
mDisplayContent->SetPrimaryFrame(textFrame);
nsFrameList textList(textFrame, textFrame);
diff --git a/layout/forms/nsComboboxControlFrame.h b/layout/forms/nsComboboxControlFrame.h
index d83726d81..9f5005f3c 100644
--- a/layout/forms/nsComboboxControlFrame.h
+++ b/layout/forms/nsComboboxControlFrame.h
@@ -54,9 +54,10 @@ class nsComboboxControlFrame final : public nsBlockFrame,
typedef mozilla::gfx::DrawTarget DrawTarget;
public:
- friend nsContainerFrame* NS_NewComboboxControlFrame(nsIPresShell* aPresShell,
- nsStyleContext* aContext,
- nsFrameState aFlags);
+ NS_DECL_QUERYFRAME_TARGET(nsComboboxControlFrame)
+ friend nsComboboxControlFrame* NS_NewComboboxControlFrame(nsIPresShell* aPresShell,
+ nsStyleContext* aContext,
+ nsFrameState aFlags);
friend class nsComboboxDisplayFrame;
explicit nsComboboxControlFrame(nsStyleContext* aContext);
@@ -69,7 +70,9 @@ public:
virtual nsresult CreateAnonymousContent(nsTArray<ContentInfo>& aElements) override;
virtual void AppendAnonymousContentTo(nsTArray<nsIContent*>& aElements,
uint32_t aFilter) override;
- virtual nsIFrame* CreateFrameFor(nsIContent* aContent) override;
+
+ nsIContent* GetDisplayNode() { return mDisplayContent; }
+ nsIFrame* CreateFrameForDisplayNode();
#ifdef ACCESSIBILITY
virtual mozilla::a11y::AccType AccessibleType() override;
diff --git a/layout/forms/nsGfxButtonControlFrame.cpp b/layout/forms/nsGfxButtonControlFrame.cpp
index 90da437f7..768abbc21 100644
--- a/layout/forms/nsGfxButtonControlFrame.cpp
+++ b/layout/forms/nsGfxButtonControlFrame.cpp
@@ -77,30 +77,6 @@ nsGfxButtonControlFrame::AppendAnonymousContentTo(nsTArray<nsIContent*>& aElemen
}
}
-// Create the text content used as label for the button.
-// The frame will be generated by the frame constructor.
-nsIFrame*
-nsGfxButtonControlFrame::CreateFrameFor(nsIContent* aContent)
-{
- nsIFrame * newFrame = nullptr;
-
- if (aContent == mTextContent) {
- nsContainerFrame* parentFrame = do_QueryFrame(mFrames.FirstChild());
-
- nsPresContext* presContext = PresContext();
- RefPtr<nsStyleContext> textStyleContext;
- textStyleContext = presContext->StyleSet()->
- ResolveStyleForText(mTextContent, mStyleContext);
-
- newFrame = NS_NewTextFrame(presContext->PresShell(), textStyleContext);
- // initialize the text frame
- newFrame->Init(mTextContent, parentFrame, nullptr);
- mTextContent->SetPrimaryFrame(newFrame);
- }
-
- return newFrame;
-}
-
NS_QUERYFRAME_HEAD(nsGfxButtonControlFrame)
NS_QUERYFRAME_ENTRY(nsIAnonymousContentCreator)
NS_QUERYFRAME_TAIL_INHERITING(nsHTMLButtonControlFrame)
diff --git a/layout/forms/nsGfxButtonControlFrame.h b/layout/forms/nsGfxButtonControlFrame.h
index d91fe3695..07072fdb5 100644
--- a/layout/forms/nsGfxButtonControlFrame.h
+++ b/layout/forms/nsGfxButtonControlFrame.h
@@ -42,7 +42,6 @@ public:
virtual nsresult CreateAnonymousContent(nsTArray<ContentInfo>& aElements) override;
virtual void AppendAnonymousContentTo(nsTArray<nsIContent*>& aElements,
uint32_t aFilter) override;
- virtual nsIFrame* CreateFrameFor(nsIContent* aContent) override;
virtual nsresult AttributeChanged(int32_t aNameSpaceID,
nsIAtom* aAttribute,
diff --git a/layout/forms/nsListControlFrame.cpp b/layout/forms/nsListControlFrame.cpp
index 7bd356a22..4daa470a9 100644
--- a/layout/forms/nsListControlFrame.cpp
+++ b/layout/forms/nsListControlFrame.cpp
@@ -614,17 +614,17 @@ nsListControlFrame::ReflowAsDropdown(nsPresContext* aPresContext,
nsHTMLScrollFrame::Reflow(aPresContext, aDesiredSize, state, aStatus);
}
-ScrollbarStyles
-nsListControlFrame::GetScrollbarStyles() const
+ScrollStyles
+nsListControlFrame::GetScrollStyles() const
{
// We can't express this in the style system yet; when we can, this can go away
- // and GetScrollbarStyles can be devirtualized
+ // and GetScrollStyles can be devirtualized
int32_t style = IsInDropDownMode() ? NS_STYLE_OVERFLOW_AUTO
: NS_STYLE_OVERFLOW_SCROLL;
if (GetWritingMode().IsVertical()) {
- return ScrollbarStyles(style, NS_STYLE_OVERFLOW_HIDDEN);
+ return ScrollStyles(style, NS_STYLE_OVERFLOW_HIDDEN);
} else {
- return ScrollbarStyles(NS_STYLE_OVERFLOW_HIDDEN, style);
+ return ScrollStyles(NS_STYLE_OVERFLOW_HIDDEN, style);
}
}
diff --git a/layout/forms/nsListControlFrame.h b/layout/forms/nsListControlFrame.h
index d8df9ebd6..fa939d6c8 100644
--- a/layout/forms/nsListControlFrame.h
+++ b/layout/forms/nsListControlFrame.h
@@ -106,7 +106,7 @@ public:
virtual nsresult SetFormProperty(nsIAtom* aName, const nsAString& aValue) override;
virtual void SetFocus(bool aOn = true, bool aRepaint = false) override;
- virtual mozilla::ScrollbarStyles GetScrollbarStyles() const override;
+ virtual mozilla::ScrollStyles GetScrollStyles() const override;
virtual bool ShouldPropagateComputedBSizeToScrolledContent() const override;
// for accessibility purposes
diff --git a/layout/forms/nsMeterFrame.cpp b/layout/forms/nsMeterFrame.cpp
index 1f3bd8022..6ef362820 100644
--- a/layout/forms/nsMeterFrame.cpp
+++ b/layout/forms/nsMeterFrame.cpp
@@ -75,14 +75,9 @@ nsMeterFrame::CreateAnonymousContent(nsTArray<ContentInfo>& aElements)
mBarDiv = doc->CreateHTMLElement(nsGkAtoms::div);
// Associate ::-moz-meter-bar pseudo-element to the anonymous child.
- CSSPseudoElementType pseudoType = CSSPseudoElementType::mozMeterBar;
- RefPtr<nsStyleContext> newStyleContext = PresContext()->StyleSet()->
- ResolvePseudoElementStyle(mContent->AsElement(), pseudoType,
- StyleContext(), mBarDiv->AsElement());
+ mBarDiv->SetPseudoElementType(CSSPseudoElementType::mozMeterBar);
- if (!aElements.AppendElement(ContentInfo(mBarDiv, newStyleContext))) {
- return NS_ERROR_OUT_OF_MEMORY;
- }
+ aElements.AppendElement(mBarDiv);
return NS_OK;
}
diff --git a/layout/forms/nsNumberControlFrame.cpp b/layout/forms/nsNumberControlFrame.cpp
index 9724109cb..64e3df0fe 100644
--- a/layout/forms/nsNumberControlFrame.cpp
+++ b/layout/forms/nsNumberControlFrame.cpp
@@ -325,27 +325,15 @@ nsresult
nsNumberControlFrame::MakeAnonymousElement(Element** aResult,
nsTArray<ContentInfo>& aElements,
nsIAtom* aTagName,
- CSSPseudoElementType aPseudoType,
- nsStyleContext* aParentContext)
+ CSSPseudoElementType aPseudoType)
{
// Get the NodeInfoManager and tag necessary to create the anonymous divs.
nsCOMPtr<nsIDocument> doc = mContent->GetComposedDoc();
RefPtr<Element> resultElement = doc->CreateHTMLElement(aTagName);
+ resultElement->SetPseudoElementType(aPseudoType);
- // If we legitimately fail this assertion and need to allow
- // non-pseudo-element anonymous children, then we'll need to add a branch
- // that calls ResolveStyleFor((*aResult)->AsElement(), aParentContext)") to
- // set newStyleContext.
- NS_ASSERTION(aPseudoType != CSSPseudoElementType::NotPseudo,
- "Expecting anonymous children to all be pseudo-elements");
// Associate the pseudo-element with the anonymous child
- RefPtr<nsStyleContext> newStyleContext =
- PresContext()->StyleSet()->ResolvePseudoElementStyle(mContent->AsElement(),
- aPseudoType,
- aParentContext,
- resultElement);
-
- if (!aElements.AppendElement(ContentInfo(resultElement, newStyleContext))) {
+ if (!aElements.AppendElement(resultElement)) {
return NS_ERROR_OUT_OF_MEMORY;
}
@@ -382,8 +370,7 @@ nsNumberControlFrame::CreateAnonymousContent(nsTArray<ContentInfo>& aElements)
rv = MakeAnonymousElement(getter_AddRefs(mOuterWrapper),
aElements,
nsGkAtoms::div,
- CSSPseudoElementType::mozNumberWrapper,
- mStyleContext);
+ CSSPseudoElementType::mozNumberWrapper);
NS_ENSURE_SUCCESS(rv, rv);
ContentInfo& outerWrapperCI = aElements.LastElement();
@@ -392,8 +379,7 @@ nsNumberControlFrame::CreateAnonymousContent(nsTArray<ContentInfo>& aElements)
rv = MakeAnonymousElement(getter_AddRefs(mTextField),
outerWrapperCI.mChildren,
nsGkAtoms::input,
- CSSPseudoElementType::mozNumberText,
- outerWrapperCI.mStyleContext);
+ CSSPseudoElementType::mozNumberText);
NS_ENSURE_SUCCESS(rv, rv);
mTextField->SetAttr(kNameSpaceID_None, nsGkAtoms::type,
@@ -442,8 +428,7 @@ nsNumberControlFrame::CreateAnonymousContent(nsTArray<ContentInfo>& aElements)
rv = MakeAnonymousElement(getter_AddRefs(mSpinBox),
outerWrapperCI.mChildren,
nsGkAtoms::div,
- CSSPseudoElementType::mozNumberSpinBox,
- outerWrapperCI.mStyleContext);
+ CSSPseudoElementType::mozNumberSpinBox);
NS_ENSURE_SUCCESS(rv, rv);
ContentInfo& spinBoxCI = outerWrapperCI.mChildren.LastElement();
@@ -452,16 +437,14 @@ nsNumberControlFrame::CreateAnonymousContent(nsTArray<ContentInfo>& aElements)
rv = MakeAnonymousElement(getter_AddRefs(mSpinUp),
spinBoxCI.mChildren,
nsGkAtoms::div,
- CSSPseudoElementType::mozNumberSpinUp,
- spinBoxCI.mStyleContext);
+ CSSPseudoElementType::mozNumberSpinUp);
NS_ENSURE_SUCCESS(rv, rv);
// Create the ::-moz-number-spin-down pseudo-element:
rv = MakeAnonymousElement(getter_AddRefs(mSpinDown),
spinBoxCI.mChildren,
nsGkAtoms::div,
- CSSPseudoElementType::mozNumberSpinDown,
- spinBoxCI.mStyleContext);
+ CSSPseudoElementType::mozNumberSpinDown);
return rv;
}
diff --git a/layout/forms/nsNumberControlFrame.h b/layout/forms/nsNumberControlFrame.h
index 47e32ad65..5396e7170 100644
--- a/layout/forms/nsNumberControlFrame.h
+++ b/layout/forms/nsNumberControlFrame.h
@@ -170,8 +170,7 @@ private:
nsresult MakeAnonymousElement(Element** aResult,
nsTArray<ContentInfo>& aElements,
nsIAtom* aTagName,
- CSSPseudoElementType aPseudoType,
- nsStyleContext* aParentContext);
+ CSSPseudoElementType aPseudoType);
class SyncDisabledStateEvent;
friend class SyncDisabledStateEvent;
diff --git a/layout/forms/nsProgressFrame.cpp b/layout/forms/nsProgressFrame.cpp
index 1e3519f0e..60c7abe42 100644
--- a/layout/forms/nsProgressFrame.cpp
+++ b/layout/forms/nsProgressFrame.cpp
@@ -72,12 +72,9 @@ nsProgressFrame::CreateAnonymousContent(nsTArray<ContentInfo>& aElements)
mBarDiv = doc->CreateHTMLElement(nsGkAtoms::div);
// Associate ::-moz-progress-bar pseudo-element to the anonymous child.
- CSSPseudoElementType pseudoType = CSSPseudoElementType::mozProgressBar;
- RefPtr<nsStyleContext> newStyleContext = PresContext()->StyleSet()->
- ResolvePseudoElementStyle(mContent->AsElement(), pseudoType,
- StyleContext(), mBarDiv->AsElement());
+ mBarDiv->SetPseudoElementType(CSSPseudoElementType::mozProgressBar);
- if (!aElements.AppendElement(ContentInfo(mBarDiv, newStyleContext))) {
+ if (!aElements.AppendElement(mBarDiv)) {
return NS_ERROR_OUT_OF_MEMORY;
}
diff --git a/layout/forms/nsRangeFrame.cpp b/layout/forms/nsRangeFrame.cpp
index 9370acb87..f1755e69f 100644
--- a/layout/forms/nsRangeFrame.cpp
+++ b/layout/forms/nsRangeFrame.cpp
@@ -119,13 +119,9 @@ nsRangeFrame::MakeAnonymousDiv(Element** aResult,
RefPtr<Element> resultElement = doc->CreateHTMLElement(nsGkAtoms::div);
// Associate the pseudo-element with the anonymous child.
- RefPtr<nsStyleContext> newStyleContext =
- PresContext()->StyleSet()->ResolvePseudoElementStyle(mContent->AsElement(),
- aPseudoType,
- StyleContext(),
- resultElement);
+ resultElement->SetPseudoElementType(aPseudoType);
- if (!aElements.AppendElement(ContentInfo(resultElement, newStyleContext))) {
+ if (!aElements.AppendElement(resultElement)) {
return NS_ERROR_OUT_OF_MEMORY;
}
diff --git a/layout/forms/nsTextControlFrame.cpp b/layout/forms/nsTextControlFrame.cpp
index fa64e3937..7e610f931 100644
--- a/layout/forms/nsTextControlFrame.cpp
+++ b/layout/forms/nsTextControlFrame.cpp
@@ -353,32 +353,12 @@ nsTextControlFrame::CreateAnonymousContent(nsTArray<ContentInfo>& aElements)
// Create the placeholder anonymous content if needed.
if (mUsePlaceholder) {
- nsIContent* placeholderNode = txtCtrl->CreatePlaceholderNode();
+ Element* placeholderNode = txtCtrl->CreatePlaceholderNode();
NS_ENSURE_TRUE(placeholderNode, NS_ERROR_OUT_OF_MEMORY);
// Associate ::placeholder pseudo-element with the placeholder node.
- CSSPseudoElementType pseudoType = CSSPseudoElementType::placeholder;
-
- // If this is a text input inside a number input then we want to use the
- // main number input as the source of style for the placeholder frame.
- nsIFrame* mainInputFrame = this;
- if (StyleContext()->GetPseudoType() == CSSPseudoElementType::mozNumberText) {
- do {
- mainInputFrame = mainInputFrame->GetParent();
- } while (mainInputFrame &&
- mainInputFrame->GetType() != nsGkAtoms::numberControlFrame);
- MOZ_ASSERT(mainInputFrame);
- }
-
- RefPtr<nsStyleContext> placeholderStyleContext =
- PresContext()->StyleSet()->ResolvePseudoElementStyle(
- mainInputFrame->GetContent()->AsElement(), pseudoType, StyleContext(),
- placeholderNode->AsElement());
-
- if (!aElements.AppendElement(ContentInfo(placeholderNode,
- placeholderStyleContext))) {
- return NS_ERROR_OUT_OF_MEMORY;
- }
+ placeholderNode->SetPseudoElementType(CSSPseudoElementType::placeholder);
+ aElements.AppendElement(placeholderNode);
if (!IsSingleLineTextControl()) {
// For textareas, UpdateValueDisplay doesn't initialize the visibility
@@ -779,7 +759,12 @@ nsTextControlFrame::SetSelectionInternal(nsIDOMNode *aStartNode,
// we have access to the node.
nsCOMPtr<nsINode> start = do_QueryInterface(aStartNode);
nsCOMPtr<nsINode> end = do_QueryInterface(aEndNode);
- nsresult rv = range->Set(start, aStartOffset, end, aEndOffset);
+ // XXXbz nsRange::SetStartAndEnd takes int32_t (and ranges generally work on
+ // int32_t), but we're passing uint32_t. The good news is that at this point
+ // our endpoints should really be within our length, so not really that big.
+ // And if they _are_ that big, SetStartAndEnd() will simply error out, which
+ // is not too bad for a case we don't expect to happen.
+ nsresult rv = range->SetStartAndEnd(start, aStartOffset, end, aEndOffset);
NS_ENSURE_SUCCESS(rv, rv);
// Get the selection, clear it and add the new range to it!
diff --git a/layout/forms/test/chrome.ini b/layout/forms/test/chrome.ini
index 32d862eec..87aadcdb2 100644
--- a/layout/forms/test/chrome.ini
+++ b/layout/forms/test/chrome.ini
@@ -1,5 +1,4 @@
[DEFAULT]
-skip-if = os == 'android'
support-files =
bug536567_iframe.html
bug536567_subframe.html
diff --git a/layout/forms/test/mochitest.ini b/layout/forms/test/mochitest.ini
index cc8519db7..ef1632a7a 100644
--- a/layout/forms/test/mochitest.ini
+++ b/layout/forms/test/mochitest.ini
@@ -9,58 +9,44 @@ support-files =
[test_bug345267.html]
[test_bug346043.html]
[test_bug348236.html]
-skip-if = toolkit == 'android' || e10s || os == 'mac' # mac(select form control popup behavior is different)
+skip-if = toolkit == e10s || os == 'mac' # mac(select form control popup behavior is different)
[test_bug353539.html]
[test_bug365410.html]
[test_bug378670.html]
-skip-if = toolkit == 'android' #TIMED_OUT
[test_bug402198.html]
[test_bug411236.html]
[test_bug446663.html]
-skip-if = toolkit == 'android'
[test_bug476308.html]
[test_bug477531.html]
[test_bug477700.html]
[test_bug478219.xhtml]
-skip-if = toolkit == 'android'
[test_bug534785.html]
[test_bug542914.html]
[test_bug549170.html]
[test_bug562447.html]
[test_bug563642.html]
[test_bug564115.html]
-skip-if = toolkit == 'android' #TIMED_OUT
[test_bug571352.html]
-skip-if = (os == 'mac' && os_version == '10.10') || toolkit == 'android' #TIMED_OUT # OS X 10.10 - bug 947690
+skip-if = (os == 'mac' && os_version == '10.10') # OS X 10.10 - bug 947690
[test_bug572406.html]
[test_bug572649.html]
-skip-if = toolkit == 'android' #TIMED_OUT
[test_bug595310.html]
[test_bug620936.html]
[test_bug644542.html]
-skip-if = toolkit == 'android' #TIMED_OUT
[test_bug672810.html]
-skip-if = toolkit == 'android'
[test_bug704049.html]
[test_bug717878_input_scroll.html]
[test_bug869314.html]
[test_bug903715.html]
-skip-if = toolkit == 'android' || e10s #select elements don't use an in-page popup on Android
[test_bug935876.html]
-# Bug 1023472 - Fails when pushed into a different chunk on Android
-skip-if = toolkit == 'android'
[test_bug957562.html]
[test_bug960277.html]
[test_bug961363.html]
-skip-if = toolkit == 'android' # Bug 1021644 - Fails when pushed into a different chunk on Android
[test_bug1111995.html]
[test_bug1301290.html]
-skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' # b2g(resizing textarea not available in b2g) b2g-debug(resizing textarea not available in b2g) b2g-desktop(resizing textarea not available in b2g)
[test_bug1305282.html]
[test_listcontrol_search.html]
-skip-if = toolkit == 'android' #select elements don't use an in-page popup on Android
[test_select_prevent_default.html]
[test_select_vertical.html]
-skip-if = e10s || toolkit == 'android' # Bug 1170129 - vertical <select> popup not implemented for e10s # <select> elements don't use an in-page popup on Android
+skip-if = e10s # Bug 1170129 - vertical <select> popup not implemented for e10s
[test_textarea_resize.html]
-skip-if = toolkit == 'android'
diff --git a/layout/forms/test/test_bug935876.html b/layout/forms/test/test_bug935876.html
index bb4090211..5df43e4f8 100644
--- a/layout/forms/test/test_bug935876.html
+++ b/layout/forms/test/test_bug935876.html
@@ -49,7 +49,6 @@ SimpleTest.waitForExplicitFinish();
const kIsWin = navigator.platform.indexOf("Win") == 0;
const kIsMac = navigator.platform.indexOf("Mac") == 0;
-const kIsAndroid = navigator.appVersion.indexOf("Android") != 0;
function runTests()
{
@@ -352,8 +351,7 @@ function runTests()
// Mac uses native popup for dropdown. Let's skip the tests for popup
// since it's not handled in nsListControlFrame.
- // Similarly, Android doesn't use popup for dropdown.
- if (kIsMac || kIsAndroid) {
+ if (kIsMac) {
finish();
return;
}
diff --git a/layout/generic/AspectRatio.h b/layout/generic/AspectRatio.h
index 0056c0620..5cb281c80 100644
--- a/layout/generic/AspectRatio.h
+++ b/layout/generic/AspectRatio.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/generic/DetailsFrame.cpp b/layout/generic/DetailsFrame.cpp
index 1d28bbe96..389a476cb 100644
--- a/layout/generic/DetailsFrame.cpp
+++ b/layout/generic/DetailsFrame.cpp
@@ -129,3 +129,12 @@ DetailsFrame::AppendAnonymousContentTo(nsTArray<nsIContent*>& aElements,
aElements.AppendElement(mDefaultSummary);
}
}
+
+bool
+DetailsFrame::HasMainSummaryFrame(nsIFrame* aSummaryFrame)
+{
+ nsIFrame* firstChild =
+ nsPlaceholderFrame::GetRealFrameFor(mFrames.FirstChild());
+
+ return aSummaryFrame == firstChild;
+}
diff --git a/layout/generic/DetailsFrame.h b/layout/generic/DetailsFrame.h
index 1eb4ea87b..cfaf4a6e4 100644
--- a/layout/generic/DetailsFrame.h
+++ b/layout/generic/DetailsFrame.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -54,6 +53,12 @@ public:
void AppendAnonymousContentTo(nsTArray<nsIContent*>& aElements,
uint32_t aFilter) override;
+ // Returns true if |aSummaryFrame| is the main summary (i.e. the first child
+ // of this details frame).
+ // This function is used when the summary element is removed from the parent
+ // details element since at that moment the summary element has been already
+ // removed from the details element children.
+ bool HasMainSummaryFrame(nsIFrame* aSummaryFrame);
private:
nsCOMPtr<nsIContent> mDefaultSummary;
diff --git a/layout/generic/FrameChildList.cpp b/layout/generic/FrameChildList.cpp
index 1d2fe25c0..f670f2481 100644
--- a/layout/generic/FrameChildList.cpp
+++ b/layout/generic/FrameChildList.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=8 autoindent cindent expandtab: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/generic/FrameChildList.h b/layout/generic/FrameChildList.h
index 8ccfa2ff8..ee75c74e9 100644
--- a/layout/generic/FrameChildList.h
+++ b/layout/generic/FrameChildList.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=8 autoindent cindent expandtab: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/generic/JustificationUtils.h b/layout/generic/JustificationUtils.h
index 1be36956b..1e8768acc 100644
--- a/layout/generic/JustificationUtils.h
+++ b/layout/generic/JustificationUtils.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/generic/ReflowInput.cpp b/layout/generic/ReflowInput.cpp
index e55b629e3..077c68b5b 100644
--- a/layout/generic/ReflowInput.cpp
+++ b/layout/generic/ReflowInput.cpp
@@ -1565,8 +1565,7 @@ ReflowInput::InitAbsoluteConstraints(nsPresContext* aPresContext,
// have been if it had been in the flow
nsHypotheticalPosition hypotheticalPos;
if ((iStartIsAuto && iEndIsAuto) || (bStartIsAuto && bEndIsAuto)) {
- nsIFrame* placeholderFrame =
- aPresContext->PresShell()->GetPlaceholderFrameFor(mFrame);
+ nsPlaceholderFrame* placeholderFrame = mFrame->GetPlaceholderFrame();
NS_ASSERTION(placeholderFrame, "no placeholder frame");
if (placeholderFrame->HasAnyStateBits(
diff --git a/layout/generic/ReflowOutput.cpp b/layout/generic/ReflowOutput.cpp
index 1c61484e7..bfe9e8258 100644
--- a/layout/generic/ReflowOutput.cpp
+++ b/layout/generic/ReflowOutput.cpp
@@ -1,4 +1,3 @@
-/* vim: set shiftwidth=2 tabstop=8 autoindent cindent expandtab: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/generic/RubyUtils.cpp b/layout/generic/RubyUtils.cpp
index 05dd25413..80b00b0d9 100644
--- a/layout/generic/RubyUtils.cpp
+++ b/layout/generic/RubyUtils.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/generic/RubyUtils.h b/layout/generic/RubyUtils.h
index 9bba89d0b..c717b8588 100644
--- a/layout/generic/RubyUtils.h
+++ b/layout/generic/RubyUtils.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/generic/ScrollVelocityQueue.cpp b/layout/generic/ScrollVelocityQueue.cpp
index 820e6cb5c..2ba019044 100644
--- a/layout/generic/ScrollVelocityQueue.cpp
+++ b/layout/generic/ScrollVelocityQueue.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=8 autoindent cindent expandtab: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/generic/ScrollVelocityQueue.h b/layout/generic/ScrollVelocityQueue.h
index ca0e5a83a..0da2dd835 100644
--- a/layout/generic/ScrollVelocityQueue.h
+++ b/layout/generic/ScrollVelocityQueue.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=8 autoindent cindent expandtab: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/generic/Selection.h b/layout/generic/Selection.h
index 5414d15c1..1e703b466 100644
--- a/layout/generic/Selection.h
+++ b/layout/generic/Selection.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -31,6 +30,9 @@ class nsHTMLCopyEncoder;
namespace mozilla {
class ErrorResult;
struct AutoPrepareFocusRange;
+namespace dom {
+class DocGroup;
+} // namespace dom
} // namespace mozilla
struct RangeData
@@ -73,6 +75,7 @@ public:
nsresult EndBatchChangesInternal(int16_t aReason = nsISelectionListener::NO_REASON);
nsIDocument* GetParentObject() const;
+ DocGroup* GetDocGroup() const;
// utility methods for scrolling the selection into view
nsPresContext* GetPresContext() const;
diff --git a/layout/generic/StickyScrollContainer.cpp b/layout/generic/StickyScrollContainer.cpp
index c5ed44e92..835937fa4 100644
--- a/layout/generic/StickyScrollContainer.cpp
+++ b/layout/generic/StickyScrollContainer.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/generic/StickyScrollContainer.h b/layout/generic/StickyScrollContainer.h
index 1d26982a9..5d6d5b63e 100644
--- a/layout/generic/StickyScrollContainer.h
+++ b/layout/generic/StickyScrollContainer.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/generic/TextOverflow.cpp b/layout/generic/TextOverflow.cpp
index b4d935fbf..3d78eaf91 100644
--- a/layout/generic/TextOverflow.cpp
+++ b/layout/generic/TextOverflow.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=8 autoindent cindent expandtab: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -306,8 +305,8 @@ TextOverflow::TextOverflow(nsDisplayListBuilder* aBuilder,
mCanHaveInlineAxisScrollbar = false;
if (mScrollableFrame) {
auto scrollbarStyle = mBlockWM.IsVertical() ?
- mScrollableFrame->GetScrollbarStyles().mVertical :
- mScrollableFrame->GetScrollbarStyles().mHorizontal;
+ mScrollableFrame->GetScrollStyles().mVertical :
+ mScrollableFrame->GetScrollStyles().mHorizontal;
mCanHaveInlineAxisScrollbar = scrollbarStyle != NS_STYLE_OVERFLOW_HIDDEN;
if (!mAdjustForPixelSnapping) {
// Scrolling to the end position can leave some text still overflowing due
diff --git a/layout/generic/TextOverflow.h b/layout/generic/TextOverflow.h
index 835b35be1..5c20ba68c 100644
--- a/layout/generic/TextOverflow.h
+++ b/layout/generic/TextOverflow.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=8 autoindent cindent expandtab: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/generic/crashtests/1381134-2.html b/layout/generic/crashtests/1381134-2.html
new file mode 100644
index 000000000..d3ac73507
--- /dev/null
+++ b/layout/generic/crashtests/1381134-2.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<script>
+addEventListener("DOMContentLoaded", () => {
+ [d1, d2] = document.getElementsByTagName("div");
+ [s1, s2] = document.getElementsByTagName("span")
+ d3 = document.createElement("div")
+ d4 = document.createElement("div")
+ d4.setAttribute("class", "grid")
+ d3.appendChild(d4)
+ d1.appendChild(document.createElement("span"))
+ setTimeout(() => {
+ d2.removeChild(s2)
+ setTimeout(() => {
+ d2.insertBefore(d3, s1)
+ }, 100)
+ }, 100)
+})
+</script>
+<style>
+.columns {
+ columns: 3;
+}
+.grid {
+ border:5px solid;
+ counter-reset: item;
+}
+.grid * { display:block; }
+span { display:contents; }
+span::before { content: counter(item) ":before"; }
+span::after { content: counter(item) ":after"; }
+</style>
+</head>
+<body>
+<div class=columns>
+<div class=grid>
+<c></c>
+<span><c></c></span>
+<span><c></c></span>
+</div>
+</div>
+</body>
+</html>
diff --git a/layout/generic/crashtests/1381134.html b/layout/generic/crashtests/1381134.html
new file mode 100644
index 000000000..a45fa04ec
--- /dev/null
+++ b/layout/generic/crashtests/1381134.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<script>
+addEventListener("DOMContentLoaded", () => {
+ [d1, d2] = document.getElementsByTagName("div");
+ [s1, s2] = document.getElementsByTagName("span")
+ d3 = document.createElement("div")
+ d4 = document.createElement("div")
+ d4.setAttribute("class", "grid")
+ d3.appendChild(d4)
+ d1.appendChild(document.createElement("span"))
+ setTimeout(() => {
+ d2.removeChild(s2)
+ setTimeout(() => {
+ d2.insertBefore(d3, s1)
+ }, 100)
+ }, 100)
+})
+</script>
+<style>
+.columns {
+ columns: 3;
+}
+.grid {
+ display: grid;
+ border:5px solid;
+ counter-reset: item;
+}
+span { display:contents; }
+span::before { content: counter(item) ":before"; }
+span::after { content: counter(item) ":after"; }
+</style>
+</head>
+<body>
+<div class=columns>
+<div class=grid>
+<c></c>
+<span><c></c></span>
+<span><c></c></span>
+</div>
+</div>
+</body>
+</html>
diff --git a/layout/generic/crashtests/crashtests.list b/layout/generic/crashtests/crashtests.list
index ab371429c..d44d7614c 100644
--- a/layout/generic/crashtests/crashtests.list
+++ b/layout/generic/crashtests/crashtests.list
@@ -25,7 +25,7 @@ load 321224.xul
load 322780-1.xul
load 323381-1.html
load 323381-2.html
-asserts-if(gtkWidget,1) asserts-if(Android&&asyncPan,1) asserts-if(winWidget,1) load 323386-1.html # Bug 718883
+asserts-if(gtkWidget,1) asserts-if(winWidget,1) load 323386-1.html # Bug 718883
load 323389-1.html
load 323389-2.html
load 323493-1.html
@@ -310,7 +310,7 @@ load 455171-3.html
load 455643-1.xhtml
load 457375.html
load 457380-1.html
-asserts-if(!Android,4) load 459968.html # bug 1067022
+asserts(4) load 459968.html # bug 1067022
load 460910-1.xml
load 461294-1.html
load 462968.xhtml
@@ -345,7 +345,7 @@ load 477928.html
load 478131-1.html
load 478170-1.html
load 478185-1.html
-asserts-if(!Android,0-1) load 479938-1.html # Bug 575011
+asserts(0-1) load 479938-1.html # Bug 575011
load 480345-1.html
load 481921.html
load 489462-1.html
@@ -473,8 +473,8 @@ load 700031.xhtml
load 718516.html
load 723108.html
load 724235.html
-skip-if(Android&&isDebugBuild) load 724978.xhtml # bug 1263300 - slow
-skip-if(Android&&isDebugBuild) load 730559.html # bug 1245634 - slow
+load 724978.xhtml
+load 730559.html
load 734777.html
load 737313-1.html
load 737313-2.html
@@ -500,7 +500,7 @@ load 786740-1.html
load 790260-1.html
asserts(1) test-pref(font.size.inflation.emPerLine,15) load 791601.xhtml # Bug 871327
test-pref(font.size.inflation.minTwips,120) load 794693.html
-asserts-if(!Android,4) load 798020-1.html
+asserts(4) load 798020-1.html
load 798235-1.html
load 799207-1.html
load 799207-2.html
@@ -532,7 +532,7 @@ load 842166.html
load 844529-1.html
load 847130.xhtml
load 847208.html
-asserts-if(Android,2) asserts-if(Android&&asyncPan,4) asserts-if(!Android,4) load 847209.html # bug 847368
+asserts(4) load 847209.html # bug 847368
load 847211-1.html
load 849603.html
asserts(0-12) load 850931.html # bug 569193
@@ -558,7 +558,7 @@ asserts(2-8) load 944909-1.html
load 946167-1.html
load 947158.html
load 949932.html
-asserts-if(Android,0-1) load 964078.html # bug 989718
+load 964078.html
load 970710.html
load 973701-1.xhtml
load 973701-2.xhtml
@@ -606,19 +606,19 @@ pref(layout.css.grid.enabled,true) load 1225376.html
pref(layout.css.grid.enabled,true) load 1225592.html
load 1229437-1.html
load 1229437-2.html
-pref(dom.details_element.enabled,true) load details-containing-only-text.html
-pref(dom.details_element.enabled,true) load details-display-none-summary-1.html
-pref(dom.details_element.enabled,true) load details-display-none-summary-2.html
-pref(dom.details_element.enabled,true) load details-display-none-summary-3.html
-pref(dom.details_element.enabled,true) load details-open-overflow-auto.html
-pref(dom.details_element.enabled,true) load details-open-overflow-hidden.html
-pref(dom.details_element.enabled,true) load details-three-columns.html
+load details-containing-only-text.html
+load details-display-none-summary-1.html
+load details-display-none-summary-2.html
+load details-display-none-summary-3.html
+load details-open-overflow-auto.html
+load details-open-overflow-hidden.html
+load details-three-columns.html
load first-letter-638937-1.html
load first-letter-638937-2.html
load flex-nested-abspos-1.html
pref(dom.meta-viewport.enabled,true) test-pref(font.size.inflation.emPerLine,15) asserts(0-100) load font-inflation-762332.html # bug 762332
load outline-on-frameset.xhtml
-pref(dom.details_element.enabled,true) load summary-position-out-of-flow.html
+load summary-position-out-of-flow.html
load text-overflow-bug666751-1.html
load text-overflow-bug666751-2.html
load text-overflow-bug670564.xhtml
@@ -626,7 +626,7 @@ load text-overflow-bug671796.xhtml
load text-overflow-bug713610.html
load text-overflow-form-elements.html
load text-overflow-iframe.html
-asserts-if(Android,2-4) asserts-if(!Android,4) load 1225005.html # bug 682647 and bug 448083
+asserts(4) load 1225005.html # bug 682647 and bug 448083
load 1233191.html
asserts(2) load 1272983-1.html # bug 586628
asserts(2) load 1272983-2.html # bug 586628
@@ -642,4 +642,6 @@ load 1278461-1.html
load 1278461-2.html
load 1304441.html
load 1316649.html
+load 1381134.html
+load 1381134-2.html
load 1633434.html
diff --git a/layout/generic/moz.build b/layout/generic/moz.build
index b830470a3..199b3c679 100644
--- a/layout/generic/moz.build
+++ b/layout/generic/moz.build
@@ -1,5 +1,4 @@
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/layout/generic/nsAbsoluteContainingBlock.cpp b/layout/generic/nsAbsoluteContainingBlock.cpp
index 068681692..326468c07 100644
--- a/layout/generic/nsAbsoluteContainingBlock.cpp
+++ b/layout/generic/nsAbsoluteContainingBlock.cpp
@@ -339,17 +339,9 @@ nsAbsoluteContainingBlock::DoMarkFramesDirty(bool aMarkAllDirty)
// Given an out-of-flow frame, this method returns the parent frame of
// its placeholder frame, if that parent is a nsContainerFrame.
static nsContainerFrame*
-GetPlaceholderContainer(nsPresContext* aPresContext,
- nsIFrame* aPositionedFrame)
+GetPlaceholderContainer(nsIFrame* aPositionedFrame)
{
- MOZ_ASSERT(aPositionedFrame, "need non-null frame");
- MOZ_ASSERT(aPositionedFrame->HasAnyStateBits(NS_FRAME_OUT_OF_FLOW),
- "expecting abspos frame");
- MOZ_ASSERT(aPresContext && aPresContext == aPositionedFrame->PresContext(),
- "need non-null pres context which matches our frame");
-
- nsIFrame* placeholder =
- aPresContext->PresShell()->GetPlaceholderFrameFor(aPositionedFrame);
+ nsIFrame* placeholder = aPositionedFrame->GetPlaceholderFrame();
if (!placeholder) {
return nullptr;
@@ -558,8 +550,7 @@ nsAbsoluteContainingBlock::ResolveSizeDependentOffsets(
aOffsets->IEnd(outerWM) - aMargin.IStartEnd(outerWM) -
aKidSize.ISize(outerWM);
} else if (aKidReflowInput.mFlags.mIOffsetsNeedCSSAlign) {
- placeholderContainer = GetPlaceholderContainer(aPresContext,
- aKidReflowInput.mFrame);
+ placeholderContainer = GetPlaceholderContainer(aKidReflowInput.mFrame);
nscoord offset = OffsetToAlignedStaticPos(aKidReflowInput, aKidSize,
logicalCBSizeOuterWM,
placeholderContainer,
@@ -580,8 +571,7 @@ nsAbsoluteContainingBlock::ResolveSizeDependentOffsets(
aKidSize.BSize(outerWM);
} else if (aKidReflowInput.mFlags.mBOffsetsNeedCSSAlign) {
if (!placeholderContainer) {
- placeholderContainer = GetPlaceholderContainer(aPresContext,
- aKidReflowInput.mFrame);
+ placeholderContainer = GetPlaceholderContainer(aKidReflowInput.mFrame);
}
nscoord offset = OffsetToAlignedStaticPos(aKidReflowInput, aKidSize,
logicalCBSizeOuterWM,
@@ -656,8 +646,7 @@ nsAbsoluteContainingBlock::ReflowAbsoluteFrame(nsIFrame* aDelegat
// due to the multiple coordinate spaces in play, we use a convenience flag
// to simply have the child's ReflowInput give it a static position at its
// abs.pos. CB origin, and then we'll align & offset it from there.
- nsIFrame* placeholder =
- aPresContext->PresShell()->GetPlaceholderFrameFor(aKidFrame);
+ nsIFrame* placeholder = aKidFrame->GetPlaceholderFrame();
if (placeholder && placeholder->GetParent() == aDelegatingFrame) {
rsFlags |= ReflowInput::STATIC_POS_IS_CB_ORIGIN;
}
@@ -669,8 +658,8 @@ nsAbsoluteContainingBlock::ReflowAbsoluteFrame(nsIFrame* aDelegat
// Get the border values
WritingMode outerWM = aReflowInput.GetWritingMode();
- const LogicalMargin border(outerWM,
- aReflowInput.mStyleBorder->GetComputedBorder());
+ const LogicalMargin border(outerWM, aDelegatingFrame->GetUsedBorder());
+
LogicalMargin margin =
kidReflowInput.ComputedLogicalMargin().ConvertTo(outerWM, wm);
diff --git a/layout/generic/nsAtomicContainerFrame.h b/layout/generic/nsAtomicContainerFrame.h
index 7acac86de..98a9855a3 100644
--- a/layout/generic/nsAtomicContainerFrame.h
+++ b/layout/generic/nsAtomicContainerFrame.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/generic/nsBlockFrame.cpp b/layout/generic/nsBlockFrame.cpp
index 41437c8f8..152b3d06a 100644
--- a/layout/generic/nsBlockFrame.cpp
+++ b/layout/generic/nsBlockFrame.cpp
@@ -4336,8 +4336,7 @@ CheckPlaceholderInLine(nsIFrame* aBlock, nsLineBox* aLine, nsFloatCache* aFC)
"float in a line should never be a continuation");
NS_ASSERTION(!(aFC->mFloat->GetStateBits() & NS_FRAME_IS_PUSHED_FLOAT),
"float in a line should never be a pushed float");
- nsIFrame* ph = aBlock->PresContext()->FrameManager()->
- GetPlaceholderFrameFor(aFC->mFloat->FirstInFlow());
+ nsIFrame* ph = aFC->mFloat->FirstInFlow()->GetPlaceholderFrame();
for (nsIFrame* f = ph; f; f = f->GetParent()) {
if (f->GetParent() == aBlock)
return aLine->Contains(f);
@@ -4939,9 +4938,8 @@ nsBlockFrame::DrainSelfPushedFloats()
if (f->GetPrevContinuation()) {
// FIXME
} else {
- nsPlaceholderFrame *placeholder =
- presContext->FrameManager()->GetPlaceholderFrameFor(f);
- nsIFrame *floatOriginalParent = presContext->PresShell()->
+ nsPlaceholderFrame* placeholder = f->GetPlaceholderFrame();
+ nsIFrame* floatOriginalParent = presContext->PresShell()->
FrameConstructor()->GetFloatContainingBlock(placeholder);
if (floatOriginalParent != this) {
// This is a first continuation that was pushed from one of our
@@ -5565,7 +5563,7 @@ FindChildContaining(nsBlockFrame* aFrame, nsIFrame* aFindFrame)
return nullptr;
if (!(child->GetStateBits() & NS_FRAME_OUT_OF_FLOW))
break;
- aFindFrame = aFrame->PresContext()->FrameManager()->GetPlaceholderFrameFor(child);
+ aFindFrame = child->GetPlaceholderFrame();
}
return child;
@@ -6846,9 +6844,8 @@ nsBlockFrame::ChildIsDirty(nsIFrame* aChild)
AddStateBits(NS_BLOCK_LOOK_FOR_DIRTY_FRAMES);
} else {
NS_ASSERTION(aChild->IsFloating(), "should be a float");
- nsIFrame *thisFC = FirstContinuation();
- nsIFrame *placeholderPath =
- PresContext()->FrameManager()->GetPlaceholderFrameFor(aChild);
+ nsIFrame* thisFC = FirstContinuation();
+ nsIFrame* placeholderPath = aChild->GetPlaceholderFrame();
// SVG code sometimes sends FrameNeedsReflow notifications during
// frame destruction, leading to null placeholders, but we're safe
// ignoring those.
diff --git a/layout/generic/nsContainerFrame.cpp b/layout/generic/nsContainerFrame.cpp
index 47afed9de..835ba9b26 100644
--- a/layout/generic/nsContainerFrame.cpp
+++ b/layout/generic/nsContainerFrame.cpp
@@ -1891,12 +1891,10 @@ nsContainerFrame::RenumberFrameAndDescendants(int32_t* aOrdinal,
}
// Do not renumber list for summary elements.
- if (HTMLDetailsElement::IsDetailsEnabled()) {
- HTMLSummaryElement* summary =
- HTMLSummaryElement::FromContent(kid->GetContent());
- if (summary && summary->IsMainSummary()) {
- return false;
- }
+ HTMLSummaryElement* summary =
+ HTMLSummaryElement::FromContent(kid->GetContent());
+ if (summary && summary->IsMainSummary()) {
+ return false;
}
bool kidRenumberedABullet = false;
diff --git a/layout/generic/nsDirection.h b/layout/generic/nsDirection.h
index 07c4ab07a..a786ba6d4 100644
--- a/layout/generic/nsDirection.h
+++ b/layout/generic/nsDirection.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 sw=2 et tw=78: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/generic/nsFirstLetterFrame.cpp b/layout/generic/nsFirstLetterFrame.cpp
index 426e3caa7..a038c4869 100644
--- a/layout/generic/nsFirstLetterFrame.cpp
+++ b/layout/generic/nsFirstLetterFrame.cpp
@@ -319,8 +319,7 @@ nsFirstLetterFrame::CreateContinuationForFloatingParent(nsPresContext* aPresCont
*aContinuation = nullptr;
nsIPresShell* presShell = aPresContext->PresShell();
- nsPlaceholderFrame* placeholderFrame =
- presShell->FrameManager()->GetPlaceholderFrameFor(this);
+ nsPlaceholderFrame* placeholderFrame = GetPlaceholderFrame();
nsContainerFrame* parent = placeholderFrame->GetParent();
nsIFrame* continuation = presShell->FrameConstructor()->
diff --git a/layout/generic/nsFlexContainerFrame.cpp b/layout/generic/nsFlexContainerFrame.cpp
index a03d777e7..8a393c3fe 100644
--- a/layout/generic/nsFlexContainerFrame.cpp
+++ b/layout/generic/nsFlexContainerFrame.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
/* This Source Code is subject to the terms of the Mozilla Public License
* version 2.0 (the "License"). You can obtain a copy of the License at
diff --git a/layout/generic/nsFlexContainerFrame.h b/layout/generic/nsFlexContainerFrame.h
index ac2cc72f6..9edcb8797 100644
--- a/layout/generic/nsFlexContainerFrame.h
+++ b/layout/generic/nsFlexContainerFrame.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
/* This Source Code is subject to the terms of the Mozilla Public License
* version 2.0 (the "License"). You can obtain a copy of the License at
diff --git a/layout/generic/nsFontInflationData.cpp b/layout/generic/nsFontInflationData.cpp
index 831658c9e..2e3c704c7 100644
--- a/layout/generic/nsFontInflationData.cpp
+++ b/layout/generic/nsFontInflationData.cpp
@@ -1,4 +1,3 @@
-/* vim: set shiftwidth=2 tabstop=8 autoindent cindent expandtab: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/generic/nsFontInflationData.h b/layout/generic/nsFontInflationData.h
index e8c457620..627f34cbb 100644
--- a/layout/generic/nsFontInflationData.h
+++ b/layout/generic/nsFontInflationData.h
@@ -1,4 +1,3 @@
-/* vim: set shiftwidth=2 tabstop=8 autoindent cindent expandtab: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index 5296126ac..5d05b7103 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -634,8 +634,7 @@ nsFrame::DestroyFrom(nsIFrame* aDestructRoot)
nsIPresShell *shell = presContext->GetPresShell();
if (mState & NS_FRAME_OUT_OF_FLOW) {
- nsPlaceholderFrame* placeholder =
- shell->FrameManager()->GetPlaceholderFrameFor(this);
+ nsPlaceholderFrame* placeholder = GetPlaceholderFrame();
NS_ASSERTION(!placeholder || (aDestructRoot != this),
"Don't call Destroy() on OOFs, call Destroy() on the placeholder.");
NS_ASSERTION(!placeholder ||
@@ -643,7 +642,6 @@ nsFrame::DestroyFrom(nsIFrame* aDestructRoot)
"Placeholder relationship should have been torn down already; "
"this might mean we have a stray placeholder in the tree.");
if (placeholder) {
- shell->FrameManager()->UnregisterPlaceholderFrame(placeholder);
placeholder->SetOutOfFlowFrame(nullptr);
}
}
@@ -8091,9 +8089,8 @@ int32_t
nsFrame::GetLineNumber(nsIFrame *aFrame, bool aLockScroll, nsIFrame** aContainingBlock)
{
NS_ASSERTION(aFrame, "null aFrame");
- nsFrameManager* frameManager = aFrame->PresContext()->FrameManager();
- nsIFrame *blockFrame = aFrame;
- nsIFrame *thisBlock;
+ nsIFrame* blockFrame = aFrame;
+ nsIFrame* thisBlock;
nsAutoLineIterator it;
nsresult result = NS_ERROR_FAILURE;
while (NS_FAILED(result) && blockFrame)
@@ -8106,7 +8103,7 @@ nsFrame::GetLineNumber(nsIFrame *aFrame, bool aLockScroll, nsIFrame** aContainin
// abspos continuations don't have placeholders, get the fif
thisBlock = thisBlock->FirstInFlow();
}
- thisBlock = frameManager->GetPlaceholderFrameFor(thisBlock);
+ thisBlock = thisBlock->GetPlaceholderFrame();
if (!thisBlock)
return -1;
}
@@ -8936,6 +8933,8 @@ GetIBSplitSiblingForAnonymousBlock(const nsIFrame* aFrame)
*
* Also skip anonymous scrolled-content parents; inherit directly from the
* outer scroll frame.
+ *
+ * Also skip NAC parents if the child frame is NAC.
*/
static nsIFrame*
GetCorrectedParent(const nsIFrame* aFrame)
@@ -8961,6 +8960,32 @@ GetCorrectedParent(const nsIFrame* aFrame)
if (pseudo == nsCSSAnonBoxes::tableWrapper) {
pseudo = aFrame->PrincipalChildList().FirstChild()->StyleContext()->GetPseudo();
}
+
+ // Prevent NAC from inheriting NAC. This partially duplicates the logic
+ // implemented in nsCSSFrameConstructor::AddFCItemsForAnonymousContent, and is
+ // necessary so that restyle inherits style contexts in the same way as the
+ // initial styling performed in frame construction.
+ //
+ // It would be nice to put it in CorrectStyleParentFrame and therefore share
+ // it, but that would lose the information of whether the _child_ is NAC,
+ // since CorrectStyleParentFrame only knows about the prospective _parent_.
+ // This duplication and complexity will go away when we fully switch to the
+ // Servo style system, where all this can be handled much more naturally.
+ //
+ // We need to take special care not to disrupt the style inheritance of frames
+ // whose content is NAC but who implement a pseudo (like an anonymous
+ // box, or a non-NAC-backed pseudo like ::first-line) that does not match the
+ // one that the NAC implements, if any.
+ nsIContent* content = aFrame->GetContent();
+ Element* element =
+ content && content->IsElement() ? content->AsElement() : nullptr;
+ if (element && element->IsNativeAnonymous() && !element->IsNativeScrollbarContent() &&
+ element->GetPseudoElementType() == aFrame->StyleContext()->GetPseudoType()) {
+ while (parent->GetContent() && parent->GetContent()->IsNativeAnonymous()) {
+ parent = parent->GetInFlowParent();
+ }
+ }
+
return nsFrame::CorrectStyleParentFrame(parent, pseudo);
}
@@ -9030,7 +9055,9 @@ nsStyleContext*
nsFrame::DoGetParentStyleContext(nsIFrame** aProviderFrame) const
{
*aProviderFrame = nullptr;
- nsFrameManager* fm = PresContext()->FrameManager();
+
+ // Handle display:contents and the root frame, when there's no parent frame
+ // to inherit from.
if (MOZ_LIKELY(mContent)) {
nsIContent* parentContent = mContent->GetFlattenedTreeParent();
if (MOZ_LIKELY(parentContent)) {
@@ -9044,6 +9071,7 @@ nsFrame::DoGetParentStyleContext(nsIFrame** aProviderFrame) const
/* if next is true then it's really a request for the table frame's
parent context, see nsTable[Outer]Frame::GetParentStyleContext. */
pseudo == nsCSSAnonBoxes::tableWrapper) {
+ nsFrameManager* fm = PresContext()->FrameManager();
nsStyleContext* sc = fm->GetDisplayContentsStyleFor(parentContent);
if (MOZ_UNLIKELY(sc)) {
return sc;
@@ -9080,7 +9108,7 @@ nsFrame::DoGetParentStyleContext(nsIFrame** aProviderFrame) const
// We're an out-of-flow frame. For out-of-flow frames, we must
// resolve underneath the placeholder's parent. The placeholder is
// reached from the first-in-flow.
- nsIFrame* placeholder = fm->GetPlaceholderFrameFor(FirstInFlow());
+ nsIFrame* placeholder = FirstInFlow()->GetPlaceholderFrame();
if (!placeholder) {
NS_NOTREACHED("no placeholder frame for out-of-flow frame");
*aProviderFrame = GetCorrectedParent(this);
@@ -9160,7 +9188,7 @@ nsIFrame::IsFocusable(int32_t *aTabIndex, bool aWithMouse)
// will be enough to make them keyboard scrollable.
nsIScrollableFrame *scrollFrame = do_QueryFrame(this);
if (scrollFrame &&
- !scrollFrame->GetScrollbarStyles().IsHiddenInBothDirections() &&
+ !scrollFrame->GetScrollStyles().IsHiddenInBothDirections() &&
!scrollFrame->GetScrollRange().IsEqualEdges(nsRect(0, 0, 0, 0))) {
// Scroll bars will be used for overflow
isFocusable = true;
@@ -9995,19 +10023,16 @@ nsIFrame::IsPseudoStackingContextFromStyle() {
Element*
nsIFrame::GetPseudoElement(CSSPseudoElementType aType)
{
- nsIFrame* frame = nullptr;
+ if (!mContent) {
+ return nullptr;
+ }
if (aType == CSSPseudoElementType::before) {
- frame = nsLayoutUtils::GetBeforeFrame(this);
- } else if (aType == CSSPseudoElementType::after) {
- frame = nsLayoutUtils::GetAfterFrame(this);
+ return nsLayoutUtils::GetBeforePseudo(mContent);
}
- if (frame) {
- nsIContent* content = frame->GetContent();
- if (content->IsElement()) {
- return content->AsElement();
- }
+ if (aType == CSSPseudoElementType::after) {
+ return nsLayoutUtils::GetAfterPseudo(mContent);
}
return nullptr;
diff --git a/layout/generic/nsGfxScrollFrame.cpp b/layout/generic/nsGfxScrollFrame.cpp
index dd1b15f77..d1053da86 100644
--- a/layout/generic/nsGfxScrollFrame.cpp
+++ b/layout/generic/nsGfxScrollFrame.cpp
@@ -211,10 +211,32 @@ nsHTMLScrollFrame::GetType() const
namespace mozilla {
+enum class ShowScrollbar : uint8_t
+{
+ Auto,
+ Always,
+ Never,
+};
+
+static ShowScrollbar
+ShouldShowScrollbar(uint8_t aOverflow)
+{
+ switch (aOverflow) {
+ case NS_STYLE_OVERFLOW_SCROLL:
+ return ShowScrollbar::Always;
+ case NS_STYLE_OVERFLOW_HIDDEN:
+ return ShowScrollbar::Never;
+ default:
+ case NS_STYLE_OVERFLOW_AUTO:
+ return ShowScrollbar::Auto;
+ }
+}
+
struct MOZ_STACK_CLASS ScrollReflowInput {
const ReflowInput& mReflowInput;
nsBoxLayoutState mBoxState;
- ScrollbarStyles mStyles;
+ ShowScrollbar mHScrollbar;
+ ShowScrollbar mVScrollbar;
nsMargin mComputedBorder;
// === Filled in by ReflowScrolledFrame ===
@@ -235,12 +257,15 @@ struct MOZ_STACK_CLASS ScrollReflowInput {
bool mShowVScrollbar;
ScrollReflowInput(nsIScrollableFrame* aFrame,
- const ReflowInput& aState) :
- mReflowInput(aState),
+ const ReflowInput& aState)
+ : mReflowInput(aState)
// mBoxState is just used for scrollbars so we don't need to
// worry about the reflow depth here
- mBoxState(aState.mFrame->PresContext(), aState.mRenderingContext, 0),
- mStyles(aFrame->GetScrollbarStyles()) {
+ , mBoxState(aState.mFrame->PresContext(), aState.mRenderingContext, 0)
+ {
+ ScrollStyles styles = aFrame->GetScrollStyles();
+ mHScrollbar = ShouldShowScrollbar(styles.mHorizontal);
+ mVScrollbar = ShouldShowScrollbar(styles.mVertical);
}
};
@@ -328,8 +353,8 @@ nsHTMLScrollFrame::TryLayout(ScrollReflowInput* aState,
bool aAssumeHScroll, bool aAssumeVScroll,
bool aForce)
{
- if ((aState->mStyles.mVertical == NS_STYLE_OVERFLOW_HIDDEN && aAssumeVScroll) ||
- (aState->mStyles.mHorizontal == NS_STYLE_OVERFLOW_HIDDEN && aAssumeHScroll)) {
+ if ((aState->mVScrollbar == ShowScrollbar::Never && aAssumeVScroll) ||
+ (aState->mHScrollbar == ShowScrollbar::Never && aAssumeHScroll)) {
NS_ASSERTION(!aForce, "Shouldn't be forcing a hidden scrollbar to show!");
return false;
}
@@ -399,9 +424,9 @@ nsHTMLScrollFrame::TryLayout(ScrollReflowInput* aState,
nscoord oneDevPixel = aState->mBoxState.PresContext()->DevPixelsToAppUnits(1);
// If the style is HIDDEN then we already know that aAssumeHScroll is false
- if (aState->mStyles.mHorizontal != NS_STYLE_OVERFLOW_HIDDEN) {
+ if (aState->mHScrollbar != ShowScrollbar::Never) {
bool wantHScrollbar =
- aState->mStyles.mHorizontal == NS_STYLE_OVERFLOW_SCROLL ||
+ aState->mHScrollbar == ShowScrollbar::Always ||
scrolledRect.XMost() >= visualScrollPortSize.width + oneDevPixel ||
scrolledRect.x <= -oneDevPixel;
if (scrollPortSize.width < hScrollbarMinSize.width)
@@ -411,9 +436,9 @@ nsHTMLScrollFrame::TryLayout(ScrollReflowInput* aState,
}
// If the style is HIDDEN then we already know that aAssumeVScroll is false
- if (aState->mStyles.mVertical != NS_STYLE_OVERFLOW_HIDDEN) {
+ if (aState->mVScrollbar != ShowScrollbar::Never) {
bool wantVScrollbar =
- aState->mStyles.mVertical == NS_STYLE_OVERFLOW_SCROLL ||
+ aState->mVScrollbar == ShowScrollbar::Always ||
scrolledRect.YMost() >= visualScrollPortSize.height + oneDevPixel ||
scrolledRect.y <= -oneDevPixel;
if (scrollPortSize.height < vScrollbarMinSize.height)
@@ -597,19 +622,20 @@ nsHTMLScrollFrame::ReflowScrolledFrame(ScrollReflowInput* aState,
bool
nsHTMLScrollFrame::GuessHScrollbarNeeded(const ScrollReflowInput& aState)
{
- if (aState.mStyles.mHorizontal != NS_STYLE_OVERFLOW_AUTO)
- // no guessing required
- return aState.mStyles.mHorizontal == NS_STYLE_OVERFLOW_SCROLL;
-
+ if (aState.mHScrollbar != ShowScrollbar::Auto) {
+ // No guessing required
+ return aState.mHScrollbar == ShowScrollbar::Always;
+ }
return mHelper.mHasHorizontalScrollbar;
}
bool
nsHTMLScrollFrame::GuessVScrollbarNeeded(const ScrollReflowInput& aState)
{
- if (aState.mStyles.mVertical != NS_STYLE_OVERFLOW_AUTO)
- // no guessing required
- return aState.mStyles.mVertical == NS_STYLE_OVERFLOW_SCROLL;
+ if (aState.mVScrollbar != ShowScrollbar::Auto) {
+ // No guessing required
+ return aState.mVScrollbar == ShowScrollbar::Always;
+ }
// If we've had at least one non-initial reflow, then just assume
// the state of the vertical scrollbar will be what we determined
@@ -684,8 +710,8 @@ nsHTMLScrollFrame::ReflowContents(ScrollReflowInput* aState,
// XXX Is this check really sufficient to catch all the incremental cases
// where the ideal case doesn't have a scrollbar?
if ((aState->mReflowedContentsWithHScrollbar || aState->mReflowedContentsWithVScrollbar) &&
- aState->mStyles.mVertical != NS_STYLE_OVERFLOW_SCROLL &&
- aState->mStyles.mHorizontal != NS_STYLE_OVERFLOW_SCROLL) {
+ aState->mVScrollbar != ShowScrollbar::Always &&
+ aState->mHScrollbar != ShowScrollbar::Always) {
nsSize insideBorderSize =
ComputeInsideBorderSize(aState,
nsSize(kidDesiredSize.Width(), kidDesiredSize.Height()));
@@ -725,8 +751,8 @@ nsHTMLScrollFrame::ReflowContents(ScrollReflowInput* aState,
// enable and force the layout to stick even if it's inconsistent.
// This just happens sometimes.
TryLayout(aState, &kidDesiredSize,
- aState->mStyles.mHorizontal != NS_STYLE_OVERFLOW_HIDDEN,
- aState->mStyles.mVertical != NS_STYLE_OVERFLOW_HIDDEN,
+ aState->mHScrollbar != ShowScrollbar::Never,
+ aState->mVScrollbar != ShowScrollbar::Never,
true);
}
@@ -782,7 +808,7 @@ nsHTMLScrollFrame::PlaceScrollArea(ScrollReflowInput& aState,
nscoord
nsHTMLScrollFrame::GetIntrinsicVScrollbarWidth(nsRenderingContext *aRenderingContext)
{
- ScrollbarStyles ss = GetScrollbarStyles();
+ ScrollStyles ss = GetScrollStyles();
if (ss.mVertical != NS_STYLE_OVERFLOW_SCROLL || !mHelper.mVScrollbarBox)
return 0;
@@ -982,10 +1008,10 @@ nsHTMLScrollFrame::AdjustForPerspective(nsRect& aScrollableOverflow)
}
void
-nsHTMLScrollFrame::Reflow(nsPresContext* aPresContext,
- ReflowOutput& aDesiredSize,
+nsHTMLScrollFrame::Reflow(nsPresContext* aPresContext,
+ ReflowOutput& aDesiredSize,
const ReflowInput& aReflowInput,
- nsReflowStatus& aStatus)
+ nsReflowStatus& aStatus)
{
MarkInReflow();
DO_GLOBAL_REFLOW_COUNT("nsHTMLScrollFrame");
@@ -996,10 +1022,12 @@ nsHTMLScrollFrame::Reflow(nsPresContext* aPresContext,
ScrollReflowInput state(this, aReflowInput);
// sanity check: ensure that if we have no scrollbar, we treat it
// as hidden.
- if (!mHelper.mVScrollbarBox || mHelper.mNeverHasVerticalScrollbar)
- state.mStyles.mVertical = NS_STYLE_OVERFLOW_HIDDEN;
- if (!mHelper.mHScrollbarBox || mHelper.mNeverHasHorizontalScrollbar)
- state.mStyles.mHorizontal = NS_STYLE_OVERFLOW_HIDDEN;
+ if (!mHelper.mVScrollbarBox || mHelper.mNeverHasVerticalScrollbar) {
+ state.mVScrollbar = ShowScrollbar::Never;
+ }
+ if (!mHelper.mHScrollbarBox || mHelper.mNeverHasHorizontalScrollbar) {
+ state.mHScrollbar = ShowScrollbar::Never;
+ }
//------------ Handle Incremental Reflow -----------------
bool reflowHScrollbar = true;
@@ -1026,6 +1054,15 @@ nsHTMLScrollFrame::Reflow(nsPresContext* aPresContext,
reflowScrollCorner = showResizer == mHelper.mCollapsedResizer;
mHelper.mCollapsedResizer = !showResizer;
}
+
+ // Hide the scrollbar when the scrollbar-width is set to none.
+ // This is only needed for root element because scrollbars of non-
+ // root elements with "scrollbar-width: none" is already suppressed
+ // in ScrollFrameHelper::CreateAnonymousContent.
+ if (this->StyleUserInterface()->mScrollbarWidth == StyleScrollbarWidth::None) {
+ state.mVScrollbar = ShowScrollbar::Never;
+ state.mHScrollbar = ShowScrollbar::Never;
+ }
}
nsRect oldScrollAreaBounds = mHelper.mScrollPort;
@@ -1133,7 +1170,7 @@ nsHTMLScrollFrame::AccessibleType()
// Create an accessible regardless of focusable state because the state can be
// changed during frame life cycle without any notifications to accessibility.
if (mContent->IsRootOfNativeAnonymousSubtree() ||
- GetScrollbarStyles().IsHiddenInBothDirections()) {
+ GetScrollStyles().IsHiddenInBothDirections()) {
return a11y::eNoType;
}
@@ -1266,21 +1303,6 @@ ScrollFrameHelper::HandleScrollbarStyleSwitching()
}
}
-#if defined(MOZ_WIDGET_ANDROID)
-static bool IsFocused(nsIContent* aContent)
-{
- // Some content elements, like the GetContent() of a scroll frame
- // for a text input field, are inside anonymous subtrees, but the focus
- // manager always reports a non-anonymous element as the focused one, so
- // walk up the tree until we reach a non-anonymous element.
- while (aContent && aContent->IsInAnonymousSubtree()) {
- aContent = aContent->GetParent();
- }
-
- return aContent ? nsContentUtils::IsFocusedContent(aContent) : false;
-}
-#endif
-
void
ScrollFrameHelper::SetScrollableByAPZ(bool aScrollable)
{
@@ -1307,7 +1329,7 @@ ScrollFrameHelper::WantAsyncScroll() const
return true;
}
- ScrollbarStyles styles = GetScrollbarStylesFromFrame();
+ ScrollStyles styles = GetScrollStylesFromFrame();
nscoord oneDevPixel = GetScrolledFrame()->PresContext()->AppUnitsPerDevPixel();
nsRect scrollRange = GetScrollRange();
bool isVScrollable = (scrollRange.height >= oneDevPixel) &&
@@ -1315,12 +1337,8 @@ ScrollFrameHelper::WantAsyncScroll() const
bool isHScrollable = (scrollRange.width >= oneDevPixel) &&
(styles.mHorizontal != NS_STYLE_OVERFLOW_HIDDEN);
-#if defined(MOZ_WIDGET_ANDROID)
- // Mobile platforms need focus to scroll.
- bool canScrollWithoutScrollbars = IsFocused(mOuter->GetContent());
-#else
+ // Desktop platforms don't need focus to scroll.
bool canScrollWithoutScrollbars = true;
-#endif
// The check for scroll bars was added in bug 825692 to prevent layerization
// of text inputs for performance reasons.
@@ -1562,7 +1580,7 @@ nsXULScrollFrame::GetXULPrefSize(nsBoxLayoutState& aState)
nsSize pref = mHelper.mScrolledFrame->GetXULPrefSize(aState);
- ScrollbarStyles styles = GetScrollbarStyles();
+ ScrollStyles styles = GetScrollStyles();
// scrolled frames don't have their own margins
@@ -1595,7 +1613,7 @@ nsXULScrollFrame::GetXULMinSize(nsBoxLayoutState& aState)
nsSize min = mHelper.mScrolledFrame->GetXULMinSizeForScrollArea(aState);
- ScrollbarStyles styles = GetScrollbarStyles();
+ ScrollStyles styles = GetScrollStyles();
if (mHelper.mVScrollbarBox &&
styles.mVertical == NS_STYLE_OVERFLOW_SCROLL) {
@@ -2481,7 +2499,7 @@ bool ScrollFrameHelper::IsAlwaysActive() const
// If we're overflow:hidden, then start as inactive until
// we get scrolled manually.
- ScrollbarStyles styles = GetScrollbarStylesFromFrame();
+ ScrollStyles styles = GetScrollStylesFromFrame();
return (styles.mHorizontal != NS_STYLE_OVERFLOW_HIDDEN &&
styles.mVertical != NS_STYLE_OVERFLOW_HIDDEN);
}
@@ -3812,21 +3830,21 @@ static void HandleScrollPref(nsIScrollable *aScrollable, int32_t aOrientation,
}
}
-ScrollbarStyles
-ScrollFrameHelper::GetScrollbarStylesFromFrame() const
+ScrollStyles
+ScrollFrameHelper::GetScrollStylesFromFrame() const
{
nsPresContext* presContext = mOuter->PresContext();
if (!presContext->IsDynamic() &&
!(mIsRoot && presContext->HasPaginatedScrolling())) {
- return ScrollbarStyles(NS_STYLE_OVERFLOW_HIDDEN, NS_STYLE_OVERFLOW_HIDDEN);
+ return ScrollStyles(NS_STYLE_OVERFLOW_HIDDEN, NS_STYLE_OVERFLOW_HIDDEN);
}
if (!mIsRoot) {
const nsStyleDisplay* disp = mOuter->StyleDisplay();
- return ScrollbarStyles(disp);
+ return ScrollStyles(disp);
}
- ScrollbarStyles result = presContext->GetViewportScrollbarStylesOverride();
+ ScrollStyles result = presContext->GetViewportScrollStylesOverride();
nsCOMPtr<nsISupports> container = presContext->GetContainerWeak();
nsCOMPtr<nsIScrollable> scrollable = do_QueryInterface(container);
if (scrollable) {
@@ -3995,7 +4013,7 @@ ScrollFrameHelper::ScrollBy(nsIntPoint aDelta,
nsPoint newPos = mDestination + nsPoint(aDelta.x*deltaMultiplier.width, aDelta.y*deltaMultiplier.height);
if (aSnap == nsIScrollableFrame::ENABLE_SNAP) {
- ScrollbarStyles styles = GetScrollbarStylesFromFrame();
+ ScrollStyles styles = GetScrollStylesFromFrame();
if (styles.mScrollSnapTypeY != NS_STYLE_SCROLL_SNAP_TYPE_NONE ||
styles.mScrollSnapTypeX != NS_STYLE_SCROLL_SNAP_TYPE_NONE) {
nscoord appUnitsPerDevPixel = mOuter->PresContext()->AppUnitsPerDevPixel();
@@ -4395,24 +4413,30 @@ ScrollFrameHelper::CreateAnonymousContent(
nsIScrollableFrame *scrollable = do_QueryFrame(mOuter);
- // If we're the scrollframe for the root, then we want to construct
- // our scrollbar frames no matter what. That way later dynamic
- // changes to propagated overflow styles will show or hide
- // scrollbars on the viewport without requiring frame reconstruction
- // of the viewport (good!).
bool canHaveHorizontal;
bool canHaveVertical;
- if (!mIsRoot) {
- ScrollbarStyles styles = scrollable->GetScrollbarStyles();
- canHaveHorizontal = styles.mHorizontal != NS_STYLE_OVERFLOW_HIDDEN;
- canHaveVertical = styles.mVertical != NS_STYLE_OVERFLOW_HIDDEN;
+ if (mIsRoot) {
+ // If we're the scrollframe for the root, then we want to construct
+ // our scrollbar frames no matter what. That way, later dynamic
+ // changes to propagated overflow styles will show or hide
+ // scrollbars on the viewport without requiring frame reconstruction
+ // of the viewport (which is a Good Thing(tm)!).
+ canHaveHorizontal = true;
+ canHaveVertical = true;
+ } else {
+ if (mOuter->StyleUserInterface()->mScrollbarWidth == StyleScrollbarWidth::None) {
+ // If scrollbar-width is none, don't generate scrollbars.
+ canHaveHorizontal = false;
+ canHaveVertical = false;
+ } else {
+ ScrollStyles styles = scrollable->GetScrollStyles();
+ canHaveHorizontal = styles.mHorizontal != NS_STYLE_OVERFLOW_HIDDEN;
+ canHaveVertical = styles.mVertical != NS_STYLE_OVERFLOW_HIDDEN;
+ }
if (!canHaveHorizontal && !canHaveVertical && !isResizable) {
// Nothing to do.
return NS_OK;
}
- } else {
- canHaveHorizontal = true;
- canHaveVertical = true;
}
// The anonymous <div> used by <inputs> never gets scrollbars.
@@ -5085,7 +5109,7 @@ nsXULScrollFrame::XULLayout(nsBoxLayoutState& aState)
(if we're the viewport and we added or removed a scrollbar).
**************/
- ScrollbarStyles styles = GetScrollbarStyles();
+ ScrollStyles styles = GetScrollStyles();
// Look at our style do we always have vertical or horizontal scrollbars?
if (styles.mHorizontal == NS_STYLE_OVERFLOW_SCROLL)
@@ -5390,7 +5414,7 @@ bool
ScrollFrameHelper::ComputeCustomOverflow(nsOverflowAreas& aOverflowAreas)
{
nsIScrollableFrame* sf = do_QueryFrame(mOuter);
- ScrollbarStyles ss = sf->GetScrollbarStyles();
+ ScrollStyles ss = sf->GetScrollStyles();
// Reflow when the change in overflow leads to one of our scrollbars
// changing or might require repositioning the scrolled content due to
@@ -6112,7 +6136,7 @@ ComputeScrollSnapInfo(const ScrollFrameHelper& aScrollFrame)
{
ScrollSnapInfo result;
- ScrollbarStyles styles = aScrollFrame.GetScrollbarStylesFromFrame();
+ ScrollStyles styles = aScrollFrame.GetScrollStylesFromFrame();
if (styles.mScrollSnapTypeY == NS_STYLE_SCROLL_SNAP_TYPE_NONE &&
styles.mScrollSnapTypeX == NS_STYLE_SCROLL_SNAP_TYPE_NONE) {
diff --git a/layout/generic/nsGfxScrollFrame.h b/layout/generic/nsGfxScrollFrame.h
index 296867856..41957d5e5 100644
--- a/layout/generic/nsGfxScrollFrame.h
+++ b/layout/generic/nsGfxScrollFrame.h
@@ -55,7 +55,7 @@ public:
ScrollFrameHelper(nsContainerFrame* aOuter, bool aIsRoot);
~ScrollFrameHelper();
- mozilla::ScrollbarStyles GetScrollbarStylesFromFrame() const;
+ mozilla::ScrollStyles GetScrollStylesFromFrame() const;
// If a child frame was added or removed on the scrollframe,
// reload our child frame list.
@@ -775,8 +775,8 @@ public:
virtual nsIFrame* GetScrolledFrame() const override {
return mHelper.GetScrolledFrame();
}
- virtual mozilla::ScrollbarStyles GetScrollbarStyles() const override {
- return mHelper.GetScrollbarStylesFromFrame();
+ virtual mozilla::ScrollStyles GetScrollStyles() const override {
+ return mHelper.GetScrollStylesFromFrame();
}
virtual uint32_t GetScrollbarVisibility() const override {
return mHelper.GetScrollbarVisibility();
@@ -1199,8 +1199,8 @@ public:
virtual nsIFrame* GetScrolledFrame() const override {
return mHelper.GetScrolledFrame();
}
- virtual mozilla::ScrollbarStyles GetScrollbarStyles() const override {
- return mHelper.GetScrollbarStylesFromFrame();
+ virtual mozilla::ScrollStyles GetScrollStyles() const override {
+ return mHelper.GetScrollStylesFromFrame();
}
virtual uint32_t GetScrollbarVisibility() const override {
return mHelper.GetScrollbarVisibility();
diff --git a/layout/generic/nsGridContainerFrame.cpp b/layout/generic/nsGridContainerFrame.cpp
index d7120d91e..0af05be50 100644
--- a/layout/generic/nsGridContainerFrame.cpp
+++ b/layout/generic/nsGridContainerFrame.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
/* This Source Code is subject to the terms of the Mozilla Public License
* version 2.0 (the "License"). You can obtain a copy of the License at
* http://mozilla.org/MPL/2.0/. */
diff --git a/layout/generic/nsGridContainerFrame.h b/layout/generic/nsGridContainerFrame.h
index c9163b95c..1275305b6 100644
--- a/layout/generic/nsGridContainerFrame.h
+++ b/layout/generic/nsGridContainerFrame.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
/* This Source Code is subject to the terms of the Mozilla Public License
* version 2.0 (the "License"). You can obtain a copy of the License at
* http://mozilla.org/MPL/2.0/. */
diff --git a/layout/generic/nsHTMLParts.h b/layout/generic/nsHTMLParts.h
index b11d49e08..97edaf75c 100644
--- a/layout/generic/nsHTMLParts.h
+++ b/layout/generic/nsHTMLParts.h
@@ -11,6 +11,7 @@
#include "nscore.h"
#include "nsISupports.h"
#include "nsIFrame.h"
+class nsComboboxControlFrame;
class nsIAtom;
class nsNodeInfoManager;
class nsIContent;
@@ -160,7 +161,7 @@ nsIFrame*
NS_NewNativeSelectControlFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
nsContainerFrame*
NS_NewListControlFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
-nsContainerFrame*
+nsComboboxControlFrame*
NS_NewComboboxControlFrame(nsIPresShell* aPresShell, nsStyleContext* aContext, nsFrameState aFlags);
nsIFrame*
NS_NewProgressFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
diff --git a/layout/generic/nsIAnonymousContentCreator.h b/layout/generic/nsIAnonymousContentCreator.h
index e7d4399b6..5167178b8 100644
--- a/layout/generic/nsIAnonymousContentCreator.h
+++ b/layout/generic/nsIAnonymousContentCreator.h
@@ -34,12 +34,7 @@ public:
mContent(aContent)
{}
- ContentInfo(nsIContent* aContent, nsStyleContext* aStyleContext) :
- mContent(aContent), mStyleContext(aStyleContext)
- {}
-
nsIContent* mContent;
- RefPtr<nsStyleContext> mStyleContext;
nsTArray<ContentInfo> mChildren;
};
@@ -66,18 +61,12 @@ public:
* Appends "native" anonymous children created by CreateAnonymousContent()
* to the given content list depending on the filter.
*
- * @see nsIContent::GetChildren for set of values used for filter.
+ * @see nsIContent::GetChildren for set of values used for filter. Currently,
+ * eSkipPlaceholderContent is the only flag that any implementation of
+ * this method heeds.
*/
virtual void AppendAnonymousContentTo(nsTArray<nsIContent*>& aElements,
uint32_t aFilter) = 0;
-
- /**
- * Implementations can override this method to create special frames for the
- * anonymous content returned from CreateAnonymousContent.
- * By default this method returns nullptr, which means the default frame
- * is created.
- */
- virtual nsIFrame* CreateFrameFor(nsIContent* aContent) { return nullptr; }
};
#endif
diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h
index b3606d0b4..bc5a5fe97 100644
--- a/layout/generic/nsIFrame.h
+++ b/layout/generic/nsIFrame.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 sw=2 et tw=78: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -83,6 +82,7 @@ class nsLineList_iterator;
class nsAbsoluteContainingBlock;
class nsIContent;
class nsContainerFrame;
+class nsPlaceholderFrame;
struct nsPeekOffsetStruct;
struct nsPoint;
@@ -722,6 +722,23 @@ public:
* Accessor functions for geometric parent.
*/
nsContainerFrame* GetParent() const { return mParent; }
+
+ /**
+ * Gets the parent of a frame, using the parent of the placeholder for
+ * out-of-flow frames.
+ */
+ inline nsContainerFrame* GetInFlowParent();
+
+ /**
+ * Return the placeholder for this frame (which must be out-of-flow).
+ * @note this will only return non-null if |this| is the first-in-flow
+ * although we don't assert that here for legacy reasons.
+ */
+ inline nsPlaceholderFrame* GetPlaceholderFrame() const {
+ MOZ_ASSERT(HasAnyStateBits(NS_FRAME_OUT_OF_FLOW));
+ return GetProperty(PlaceholderFrameProperty());
+ }
+
/**
* Set this frame's parent to aParent.
* If the frame may have moved into or out of a scrollframe's
@@ -1041,6 +1058,8 @@ public:
NS_DECLARE_FRAME_PROPERTY_SMALL_VALUE(BidiDataProperty, mozilla::FrameBidiData)
+ NS_DECLARE_FRAME_PROPERTY_WITHOUT_DTOR(PlaceholderFrameProperty, nsPlaceholderFrame)
+
mozilla::FrameBidiData GetBidiData()
{
return GetProperty(BidiDataProperty());
@@ -1056,10 +1075,6 @@ public:
return GetBidiData().embeddingLevel;
}
- nsTArray<nsIContent*>* GetGenConPseudos() {
- return GetProperty(GenConProperty());
- }
-
/**
* Return the distance between the border edge of the frame and the
* margin edge of the frame. Like GetRect(), returns the dimensions
diff --git a/layout/generic/nsIFrameInlines.h b/layout/generic/nsIFrameInlines.h
index eb9a7202a..b5b0b481a 100644
--- a/layout/generic/nsIFrameInlines.h
+++ b/layout/generic/nsIFrameInlines.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 sw=2 et tw=78: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -8,8 +7,10 @@
#define nsIFrameInlines_h___
#include "nsContainerFrame.h"
+#include "nsPlaceholderFrame.h"
#include "nsStyleStructInlines.h"
#include "nsCSSAnonBoxes.h"
+#include "nsFrameManager.h"
bool
nsIFrame::IsFlexItem() const
@@ -160,4 +161,15 @@ nsIFrame::BaselineBOffset(mozilla::WritingMode aWM,
return SynthesizeBaselineBOffsetFromBorderBox(aWM, aBaselineGroup);
}
+nsContainerFrame*
+nsIFrame::GetInFlowParent()
+{
+ if (GetStateBits() & NS_FRAME_OUT_OF_FLOW) {
+ nsIFrame* ph = FirstContinuation()->GetProperty(nsIFrame::PlaceholderFrameProperty());
+ return ph->GetParent();
+ }
+
+ return GetParent();
+}
+
#endif
diff --git a/layout/generic/nsIScrollableFrame.h b/layout/generic/nsIScrollableFrame.h
index b7e3caf46..4ad45a528 100644
--- a/layout/generic/nsIScrollableFrame.h
+++ b/layout/generic/nsIScrollableFrame.h
@@ -12,7 +12,7 @@
#include "nsCoord.h"
#include "DisplayItemClip.h"
-#include "ScrollbarStyles.h"
+#include "ScrollStyles.h"
#include "mozilla/Maybe.h"
#include "mozilla/gfx/Point.h"
#include "nsIScrollbarMediator.h"
@@ -63,7 +63,7 @@ public:
* or NS_STYLE_OVERFLOW_AUTO) governing the horizontal and vertical
* scrollbars for this frame.
*/
- virtual mozilla::ScrollbarStyles GetScrollbarStyles() const = 0;
+ virtual mozilla::ScrollStyles GetScrollStyles() const = 0;
enum { HORIZONTAL = 0x01, VERTICAL = 0x02 };
/**
diff --git a/layout/generic/nsImageFrame.cpp b/layout/generic/nsImageFrame.cpp
index 2646125c9..d6f47f2e4 100644
--- a/layout/generic/nsImageFrame.cpp
+++ b/layout/generic/nsImageFrame.cpp
@@ -1854,7 +1854,7 @@ nsImageFrame::ShouldDisplaySelection()
int32_t thisOffset = parentContent->IndexOf(mContent);
nsCOMPtr<nsIDOMNode> parentNode = do_QueryInterface(parentContent);
nsCOMPtr<nsIDOMNode> rangeNode;
- int32_t rangeOffset;
+ uint32_t rangeOffset;
nsCOMPtr<nsIDOMRange> range;
selection->GetRangeAt(0,getter_AddRefs(range));
if (range)
@@ -1862,12 +1862,16 @@ nsImageFrame::ShouldDisplaySelection()
range->GetStartContainer(getter_AddRefs(rangeNode));
range->GetStartOffset(&rangeOffset);
- if (parentNode && rangeNode && (rangeNode == parentNode) && rangeOffset == thisOffset)
- {
+ if (parentNode && rangeNode && rangeNode == parentNode &&
+ static_cast<int32_t>(rangeOffset) == thisOffset) {
range->GetEndContainer(getter_AddRefs(rangeNode));
range->GetEndOffset(&rangeOffset);
- if ((rangeNode == parentNode) && (rangeOffset == (thisOffset +1))) //+1 since that would mean this whole content is selected only
- return false; //do not allow nsFrame do draw any further selection
+ // +1 since that would mean this whole content is selected only
+ if (rangeNode == parentNode &&
+ static_cast<int32_t>(rangeOffset) == thisOffset + 1) {
+ // Do not allow nsFrame do draw any further selection
+ return false;
+ }
}
}
}
diff --git a/layout/generic/nsPlaceholderFrame.cpp b/layout/generic/nsPlaceholderFrame.cpp
index f234b2f2d..f8678dcbd 100644
--- a/layout/generic/nsPlaceholderFrame.cpp
+++ b/layout/generic/nsPlaceholderFrame.cpp
@@ -156,16 +156,15 @@ nsPlaceholderFrame::DestroyFrom(nsIFrame* aDestructRoot)
{
nsIFrame* oof = mOutOfFlowFrame;
if (oof) {
- // Unregister out-of-flow frame
- nsFrameManager* fm = PresContext()->GetPresShell()->FrameManager();
- fm->UnregisterPlaceholderFrame(this);
mOutOfFlowFrame = nullptr;
+ oof->DeleteProperty(nsIFrame::PlaceholderFrameProperty());
// If aDestructRoot is not an ancestor of the out-of-flow frame,
// then call RemoveFrame on it here.
// Also destroy it here if it's a popup frame. (Bug 96291)
if ((GetStateBits() & PLACEHOLDER_FOR_POPUP) ||
!nsLayoutUtils::IsProperAncestorFrame(aDestructRoot, oof)) {
ChildListID listId = nsLayoutUtils::GetChildListNameFor(oof);
+ nsFrameManager* fm = PresContext()->GetPresShell()->FrameManager();
fm->RemoveFrame(listId, oof);
}
// else oof will be destroyed by its parent
diff --git a/layout/generic/nsPluginFrame.cpp b/layout/generic/nsPluginFrame.cpp
index 6e9e072e7..442f8ca26 100644
--- a/layout/generic/nsPluginFrame.cpp
+++ b/layout/generic/nsPluginFrame.cpp
@@ -84,11 +84,6 @@ using mozilla::DefaultXDisplay;
#include <winuser.h>
#endif
-#ifdef MOZ_WIDGET_ANDROID
-#include "AndroidBridge.h"
-#include "GLContext.h"
-#endif
-
#include "mozilla/dom/TabChild.h"
#include "ClientLayerManager.h"
@@ -938,55 +933,6 @@ nsDisplayPluginReadback::GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap)
return GetDisplayItemBounds(aBuilder, this, mFrame);
}
-#ifdef MOZ_WIDGET_ANDROID
-
-class nsDisplayPluginVideo : public nsDisplayItem {
-public:
- nsDisplayPluginVideo(nsDisplayListBuilder* aBuilder, nsIFrame* aFrame, nsNPAPIPluginInstance::VideoInfo* aVideoInfo)
- : nsDisplayItem(aBuilder, aFrame), mVideoInfo(aVideoInfo)
- {
- MOZ_COUNT_CTOR(nsDisplayPluginVideo);
- }
-#ifdef NS_BUILD_REFCNT_LOGGING
- virtual ~nsDisplayPluginVideo() {
- MOZ_COUNT_DTOR(nsDisplayPluginVideo);
- }
-#endif
-
- virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder,
- bool* aSnap) override;
-
- NS_DISPLAY_DECL_NAME("PluginVideo", TYPE_PLUGIN_VIDEO)
-
- virtual already_AddRefed<Layer> BuildLayer(nsDisplayListBuilder* aBuilder,
- LayerManager* aManager,
- const ContainerLayerParameters& aContainerParameters) override
- {
- return static_cast<nsPluginFrame*>(mFrame)->BuildLayer(aBuilder, aManager, this, aContainerParameters);
- }
-
- virtual LayerState GetLayerState(nsDisplayListBuilder* aBuilder,
- LayerManager* aManager,
- const ContainerLayerParameters& aParameters) override
- {
- return LAYER_ACTIVE;
- }
-
- nsNPAPIPluginInstance::VideoInfo* VideoInfo() { return mVideoInfo; }
-
-private:
- nsNPAPIPluginInstance::VideoInfo* mVideoInfo;
-};
-
-nsRect
-nsDisplayPluginVideo::GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap)
-{
- *aSnap = false;
- return GetDisplayItemBounds(aBuilder, this, mFrame);
-}
-
-#endif
-
nsRect
nsDisplayPlugin::GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap)
{
@@ -1138,9 +1084,6 @@ nsPluginFrame::IsOpaque() const
{
#if defined(XP_MACOSX)
return false;
-#elif defined(MOZ_WIDGET_ANDROID)
- // We don't know, so just assume transparent
- return false;
#else
if (mInstanceOwner && mInstanceOwner->UseAsyncRendering()) {
@@ -1239,29 +1182,12 @@ nsPluginFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
nsDisplayItem::ForceActiveLayers()) {
state = LAYER_ACTIVE;
}
- // We don't need this on Android, and it just confuses things
-#if !MOZ_WIDGET_ANDROID
if (aBuilder->IsPaintingToWindow() &&
state == LAYER_ACTIVE &&
IsTransparentMode()) {
aLists.Content()->AppendNewToTop(new (aBuilder)
nsDisplayPluginReadback(aBuilder, this));
}
-#endif
-
-#if MOZ_WIDGET_ANDROID
- if (aBuilder->IsPaintingToWindow() &&
- state == LAYER_ACTIVE) {
-
- nsTArray<nsNPAPIPluginInstance::VideoInfo*> videos;
- mInstanceOwner->GetVideos(videos);
-
- for (uint32_t i = 0; i < videos.Length(); i++) {
- aLists.Content()->AppendNewToTop(new (aBuilder)
- nsDisplayPluginVideo(aBuilder, this, videos[i]));
- }
- }
-#endif
aLists.Content()->AppendNewToTop(new (aBuilder)
nsDisplayPlugin(aBuilder, this));
@@ -1399,10 +1325,6 @@ nsPluginFrame::GetLayerState(nsDisplayListBuilder* aBuilder,
if (!mInstanceOwner)
return LAYER_NONE;
-#ifdef MOZ_WIDGET_ANDROID
- // We always want a layer on Honeycomb and later
- return LAYER_ACTIVE;
-#else
if (mInstanceOwner->NeedsScrollImageLayer()) {
return LAYER_ACTIVE;
}
@@ -1412,7 +1334,6 @@ nsPluginFrame::GetLayerState(nsDisplayListBuilder* aBuilder,
}
return LAYER_ACTIVE_FORCE;
-#endif
}
class PluginFrameDidCompositeObserver final : public ClientLayerManager::
@@ -1529,32 +1450,6 @@ nsPluginFrame::BuildLayer(nsDisplayListBuilder* aBuilder,
}
lm->AddDidCompositeObserver(mDidCompositeObserver.get());
}
-#ifdef MOZ_WIDGET_ANDROID
- } else if (aItem->GetType() == nsDisplayItem::TYPE_PLUGIN_VIDEO) {
- nsDisplayPluginVideo* videoItem = reinterpret_cast<nsDisplayPluginVideo*>(aItem);
- nsNPAPIPluginInstance::VideoInfo* videoInfo = videoItem->VideoInfo();
-
- RefPtr<ImageContainer> container = mInstanceOwner->GetImageContainerForVideo(videoInfo);
- if (!container)
- return nullptr;
-
- if (!layer) {
- // Initialize ImageLayer
- layer = aManager->CreateImageLayer();
- if (!layer)
- return nullptr;
- }
-
- ImageLayer* imglayer = static_cast<ImageLayer*>(layer.get());
- imglayer->SetContainer(container);
-
- layer->SetContentFlags(IsOpaque() ? Layer::CONTENT_OPAQUE : 0);
-
- // Set the offset and size according to the video dimensions
- r.MoveBy(videoInfo->mDimensions.TopLeft());
- size.width = videoInfo->mDimensions.width;
- size.height = videoInfo->mDimensions.height;
-#endif
} else {
NS_ASSERTION(aItem->GetType() == nsDisplayItem::TYPE_PLUGIN_READBACK,
"Unknown item type");
@@ -1603,20 +1498,7 @@ nsPluginFrame::PaintPlugin(nsDisplayListBuilder* aBuilder,
nsRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, const nsRect& aPluginRect)
{
-#if defined(MOZ_WIDGET_ANDROID)
- if (mInstanceOwner) {
- gfxRect frameGfxRect =
- PresContext()->AppUnitsToGfxUnits(aPluginRect);
- gfxRect dirtyGfxRect =
- PresContext()->AppUnitsToGfxUnits(aDirtyRect);
-
- gfxContext* ctx = aRenderingContext.ThebesContext();
-
- mInstanceOwner->Paint(ctx, frameGfxRect, dirtyGfxRect);
- return;
- }
-#else
-# if defined(DEBUG)
+#if defined(DEBUG)
// On Desktop, we should have built a layer as we no longer support in-process
// plugins or synchronous painting. We can only get here for windowed plugins
// (which draw themselves), or via some error/unload state.
@@ -1625,7 +1507,6 @@ nsPluginFrame::PaintPlugin(nsDisplayListBuilder* aBuilder,
mInstanceOwner->GetWindow(window);
MOZ_ASSERT(!window || window->type == NPWindowTypeWindow);
}
-# endif
#endif
}
diff --git a/layout/generic/nsRubyBaseContainerFrame.cpp b/layout/generic/nsRubyBaseContainerFrame.cpp
index 566dee14f..91bbf5de8 100644
--- a/layout/generic/nsRubyBaseContainerFrame.cpp
+++ b/layout/generic/nsRubyBaseContainerFrame.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
/* This Source Code is subject to the terms of the Mozilla Public License
* version 2.0 (the "License"). You can obtain a copy of the License at
* http://mozilla.org/MPL/2.0/. */
diff --git a/layout/generic/nsRubyBaseContainerFrame.h b/layout/generic/nsRubyBaseContainerFrame.h
index 7e8c449d3..8428788f2 100644
--- a/layout/generic/nsRubyBaseContainerFrame.h
+++ b/layout/generic/nsRubyBaseContainerFrame.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
/* This Source Code is subject to the terms of the Mozilla Public License
* version 2.0 (the "License"). You can obtain a copy of the License at
* http://mozilla.org/MPL/2.0/. */
diff --git a/layout/generic/nsRubyBaseFrame.cpp b/layout/generic/nsRubyBaseFrame.cpp
index 668bf77fd..35dff0961 100644
--- a/layout/generic/nsRubyBaseFrame.cpp
+++ b/layout/generic/nsRubyBaseFrame.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
/* This Source Code is subject to the terms of the Mozilla Public License
* version 2.0 (the "License"). You can obtain a copy of the License at
* http://mozilla.org/MPL/2.0/. */
diff --git a/layout/generic/nsRubyBaseFrame.h b/layout/generic/nsRubyBaseFrame.h
index b6dde1029..ed66a4079 100644
--- a/layout/generic/nsRubyBaseFrame.h
+++ b/layout/generic/nsRubyBaseFrame.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
/* This Source Code is subject to the terms of the Mozilla Public License
* version 2.0 (the "License"). You can obtain a copy of the License at
* http://mozilla.org/MPL/2.0/. */
diff --git a/layout/generic/nsRubyContentFrame.cpp b/layout/generic/nsRubyContentFrame.cpp
index c7f0774bb..62c37676b 100644
--- a/layout/generic/nsRubyContentFrame.cpp
+++ b/layout/generic/nsRubyContentFrame.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
/* This Source Code is subject to the terms of the Mozilla Public License
* version 2.0 (the "License"). You can obtain a copy of the License at
* http://mozilla.org/MPL/2.0/. */
diff --git a/layout/generic/nsRubyContentFrame.h b/layout/generic/nsRubyContentFrame.h
index 05f8a566d..91a20ac9f 100644
--- a/layout/generic/nsRubyContentFrame.h
+++ b/layout/generic/nsRubyContentFrame.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
/* This Source Code is subject to the terms of the Mozilla Public License
* version 2.0 (the "License"). You can obtain a copy of the License at
* http://mozilla.org/MPL/2.0/. */
diff --git a/layout/generic/nsRubyFrame.cpp b/layout/generic/nsRubyFrame.cpp
index 31e0e2277..797b00fcf 100644
--- a/layout/generic/nsRubyFrame.cpp
+++ b/layout/generic/nsRubyFrame.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
/* This Source Code is subject to the terms of the Mozilla Public License
* version 2.0 (the "License"). You can obtain a copy of the License at
* http://mozilla.org/MPL/2.0/. */
diff --git a/layout/generic/nsRubyFrame.h b/layout/generic/nsRubyFrame.h
index c1fc7a303..0f9d16714 100644
--- a/layout/generic/nsRubyFrame.h
+++ b/layout/generic/nsRubyFrame.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
/* This Source Code is subject to the terms of the Mozilla Public License
* version 2.0 (the "License"). You can obtain a copy of the License at
* http://mozilla.org/MPL/2.0/. */
diff --git a/layout/generic/nsRubyTextContainerFrame.cpp b/layout/generic/nsRubyTextContainerFrame.cpp
index e91f1151f..29bb65605 100644
--- a/layout/generic/nsRubyTextContainerFrame.cpp
+++ b/layout/generic/nsRubyTextContainerFrame.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
/* This Source Code is subject to the terms of the Mozilla Public License
* version 2.0 (the "License"). You can obtain a copy of the License at
* http://mozilla.org/MPL/2.0/. */
diff --git a/layout/generic/nsRubyTextContainerFrame.h b/layout/generic/nsRubyTextContainerFrame.h
index 1ce93db9b..4c6044527 100644
--- a/layout/generic/nsRubyTextContainerFrame.h
+++ b/layout/generic/nsRubyTextContainerFrame.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
/* This Source Code is subject to the terms of the Mozilla Public License
* version 2.0 (the "License"). You can obtain a copy of the License at
* http://mozilla.org/MPL/2.0/. */
diff --git a/layout/generic/nsRubyTextFrame.cpp b/layout/generic/nsRubyTextFrame.cpp
index 2848cb6fc..15c0e3439 100644
--- a/layout/generic/nsRubyTextFrame.cpp
+++ b/layout/generic/nsRubyTextFrame.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
/* This Source Code is subject to the terms of the Mozilla Public License
* version 2.0 (the "License"). You can obtain a copy of the License at
* http://mozilla.org/MPL/2.0/. */
diff --git a/layout/generic/nsRubyTextFrame.h b/layout/generic/nsRubyTextFrame.h
index 83c24d49d..c1d65ad41 100644
--- a/layout/generic/nsRubyTextFrame.h
+++ b/layout/generic/nsRubyTextFrame.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
/* This Source Code is subject to the terms of the Mozilla Public License
* version 2.0 (the "License"). You can obtain a copy of the License at
* http://mozilla.org/MPL/2.0/. */
diff --git a/layout/generic/nsSelection.cpp b/layout/generic/nsSelection.cpp
index 5ccb2d8bf..ba7f48403 100644
--- a/layout/generic/nsSelection.cpp
+++ b/layout/generic/nsSelection.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 sw=2 et tw=78: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -1788,8 +1787,7 @@ nsFrameSelection::TakeFocus(nsIContent* aNewFocus,
RefPtr<nsRange> newRange = new nsRange(aNewFocus);
- newRange->SetStart(aNewFocus, aContentOffset);
- newRange->SetEnd(aNewFocus, aContentOffset);
+ newRange->CollapseTo(aNewFocus, aContentOffset);
mDomSelections[index]->AddRange(newRange);
mBatching = batching;
mChangesDuringBatching = changes;
@@ -3352,10 +3350,11 @@ nsFrameSelection::CreateAndAddRange(nsINode *aParentNode, int32_t aOffset)
RefPtr<nsRange> range = new nsRange(aParentNode);
// Set range around child at given offset
- nsresult result = range->SetStart(aParentNode, aOffset);
- if (NS_FAILED(result)) return result;
- result = range->SetEnd(aParentNode, aOffset+1);
- if (NS_FAILED(result)) return result;
+ nsresult rv = range->SetStartAndEnd(aParentNode, aOffset,
+ aParentNode, aOffset + 1);
+ if (NS_WARN_IF(NS_FAILED(rv))) {
+ return rv;
+ }
int8_t index = GetIndexFromSelectionType(SelectionType::eNormal);
if (!mDomSelections[index])
@@ -3521,6 +3520,18 @@ Selection::GetParentObject() const
return nullptr;
}
+DocGroup*
+Selection::GetDocGroup() const
+{
+ nsIPresShell* shell = GetPresShell();
+ if (!shell) {
+ return nullptr;
+ }
+
+ nsIDocument* doc = shell->GetDocument();
+ return doc ? doc->GetDocGroup() : nullptr;
+}
+
NS_IMPL_CYCLE_COLLECTION_CLASS(Selection)
NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(Selection)
@@ -3780,13 +3791,12 @@ Selection::SubtractRange(RangeData* aRange, nsRange* aSubtract,
// We need to add a new RangeData to the output, running from
// the end of aSubtract to the end of range
RefPtr<nsRange> postOverlap = new nsRange(aSubtract->GetEndParent());
-
- rv =
- postOverlap->SetStart(aSubtract->GetEndParent(), aSubtract->EndOffset());
- NS_ENSURE_SUCCESS(rv, rv);
- rv =
- postOverlap->SetEnd(range->GetEndParent(), range->EndOffset());
- NS_ENSURE_SUCCESS(rv, rv);
+ rv = postOverlap->SetStartAndEnd(
+ aSubtract->GetEndParent(), aSubtract->EndOffset(),
+ range->GetEndParent(), range->EndOffset());
+ if (NS_WARN_IF(NS_FAILED(rv))) {
+ return rv;
+ }
if (!postOverlap->Collapsed()) {
if (!aOutput->InsertElementAt(0, RangeData(postOverlap)))
return NS_ERROR_OUT_OF_MEMORY;
@@ -3799,12 +3809,12 @@ Selection::SubtractRange(RangeData* aRange, nsRange* aSubtract,
// the start of the range to the start of aSubtract
RefPtr<nsRange> preOverlap = new nsRange(range->GetStartParent());
- nsresult rv =
- preOverlap->SetStart(range->GetStartParent(), range->StartOffset());
- NS_ENSURE_SUCCESS(rv, rv);
- rv =
- preOverlap->SetEnd(aSubtract->GetStartParent(), aSubtract->StartOffset());
- NS_ENSURE_SUCCESS(rv, rv);
+ rv = preOverlap->SetStartAndEnd(
+ range->GetStartParent(), range->StartOffset(),
+ aSubtract->GetStartParent(), aSubtract->StartOffset());
+ if (NS_WARN_IF(NS_FAILED(rv))) {
+ return rv;
+ }
if (!preOverlap->Collapsed()) {
if (!aOutput->InsertElementAt(0, RangeData(preOverlap)))
@@ -4120,13 +4130,15 @@ Selection::GetType(int16_t* aType)
static inline bool
RangeMatchesBeginPoint(nsRange* aRange, nsINode* aNode, int32_t aOffset)
{
- return aRange->GetStartParent() == aNode && aRange->StartOffset() == aOffset;
+ return aRange->GetStartParent() == aNode &&
+ static_cast<int32_t>(aRange->StartOffset()) == aOffset;
}
static inline bool
RangeMatchesEndPoint(nsRange* aRange, nsINode* aNode, int32_t aOffset)
{
- return aRange->GetEndParent() == aNode && aRange->EndOffset() == aOffset;
+ return aRange->GetEndParent() == aNode &&
+ static_cast<int32_t>(aRange->EndOffset()) == aOffset;
}
// Selection::EqualsRangeAtPoint
@@ -5186,12 +5198,7 @@ Selection::Collapse(nsINode& aParentNode, uint32_t aOffset, ErrorResult& aRv)
}
RefPtr<nsRange> range = new nsRange(parentNode);
- result = range->SetEnd(parentNode, aOffset);
- if (NS_FAILED(result)) {
- aRv.Throw(result);
- return;
- }
- result = range->SetStart(parentNode, aOffset);
+ result = range->CollapseTo(parentNode, aOffset);
if (NS_FAILED(result)) {
aRv.Throw(result);
return;
@@ -5579,11 +5586,8 @@ Selection::Extend(nsINode& aParentNode, uint32_t aOffset, ErrorResult& aRv)
return;
}
SetDirection(eDirNext);
- res = difRange->SetEnd(range->GetEndParent(), range->EndOffset());
- nsresult tmp = difRange->SetStart(focusNode, focusOffset);
- if (NS_FAILED(tmp)) {
- res = tmp;
- }
+ res = difRange->SetStartAndEnd(focusNode, focusOffset,
+ range->GetEndParent(), range->EndOffset());
if (NS_FAILED(res)) {
aRv.Throw(res);
return;
@@ -5611,11 +5615,8 @@ Selection::Extend(nsINode& aParentNode, uint32_t aOffset, ErrorResult& aRv)
}
else if (result3 <= 0 && result2 >= 0) {//a,2,1 or a2,1 or a,21 or a21
//deselect from 2 to 1
- res = difRange->SetEnd(focusNode, focusOffset);
- difRange->SetStart(aParentNode, aOffset, aRv);
- if (aRv.Failed()) {
- return;
- }
+ res = difRange->SetStartAndEnd(&aParentNode, aOffset,
+ focusNode, focusOffset);
if (NS_FAILED(res)) {
aRv.Throw(res);
return;
@@ -5678,11 +5679,8 @@ Selection::Extend(nsINode& aParentNode, uint32_t aOffset, ErrorResult& aRv)
}
else if (result2 <= 0 && result3 >= 0) {//1,2,a or 12,a or 1,2a or 12a
//deselect from 1 to 2
- difRange->SetEnd(aParentNode, aOffset, aRv);
- res = difRange->SetStart(focusNode, focusOffset);
- if (aRv.Failed()) {
- return;
- }
+ res = difRange->SetStartAndEnd(focusNode, focusOffset,
+ &aParentNode, aOffset);
if (NS_FAILED(res)) {
aRv.Throw(res);
return;
@@ -5713,15 +5711,9 @@ Selection::Extend(nsINode& aParentNode, uint32_t aOffset, ErrorResult& aRv)
}
//deselect from a to 1
if (focusNode != anchorNode || focusOffset!= anchorOffset) {//if collapsed diff dont do anything
- res = difRange->SetStart(anchorNode, anchorOffset);
- nsresult tmp = difRange->SetEnd(focusNode, focusOffset);
- if (NS_FAILED(tmp)) {
- res = tmp;
- }
- tmp = SetAnchorFocusToRange(range);
- if (NS_FAILED(tmp)) {
- res = tmp;
- }
+ res = difRange->SetStartAndEnd(anchorNode, anchorOffset,
+ focusNode, focusOffset);
+ nsresult tmp = SetAnchorFocusToRange(range);
if (NS_FAILED(res)) {
aRv.Throw(res);
return;
@@ -5746,11 +5738,9 @@ Selection::Extend(nsINode& aParentNode, uint32_t aOffset, ErrorResult& aRv)
return;
}
SetDirection(eDirPrevious);
- res = difRange->SetEnd(focusNode, focusOffset);
- nsresult tmp = difRange->SetStart(range->GetStartParent(), range->StartOffset());
- if (NS_FAILED(tmp)) {
- res = tmp;
- }
+ res = difRange->SetStartAndEnd(
+ range->GetStartParent(), range->StartOffset(),
+ focusNode, focusOffset);
if (NS_FAILED(res)) {
aRv.Throw(res);
return;
diff --git a/layout/generic/nsTextFrame.cpp b/layout/generic/nsTextFrame.cpp
index a93c71b28..07e7a3655 100644
--- a/layout/generic/nsTextFrame.cpp
+++ b/layout/generic/nsTextFrame.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -1383,8 +1382,7 @@ BuildTextRuns(DrawTarget* aDrawTarget, nsTextFrame* aForFrame,
nsIFrame* lineContainerChild = aForFrame;
if (!aLineContainer) {
if (aForFrame->IsFloatingFirstLetterChild()) {
- lineContainerChild = aForFrame->PresContext()->PresShell()->
- GetPlaceholderFrameFor(aForFrame->GetParent());
+ lineContainerChild = aForFrame->GetParent()->GetPlaceholderFrame();
}
aLineContainer = FindLineContainer(lineContainerChild);
} else {
diff --git a/layout/generic/test/mochitest.ini b/layout/generic/test/mochitest.ini
index 33dacddab..78d6f2b19 100644
--- a/layout/generic/test/mochitest.ini
+++ b/layout/generic/test/mochitest.ini
@@ -1,5 +1,4 @@
[DEFAULT]
-skip-if = toolkit == 'android' #CRASH_DUMP, RANDOM, ONLY IN CHUNK 10
support-files =
../../reftests/backgrounds/blue-32x32.png
../../reftests/backgrounds/fuchsia-32x32.png
diff --git a/layout/inspector/inDOMUtils.cpp b/layout/inspector/inDOMUtils.cpp
index b53cb66e3..800201ce2 100644
--- a/layout/inspector/inDOMUtils.cpp
+++ b/layout/inspector/inDOMUtils.cpp
@@ -48,7 +48,8 @@
#include "nsCSSProps.h"
#include "nsCSSValue.h"
#include "nsColor.h"
-#include "nsStyleSet.h"
+#include "mozilla/StyleSetHandle.h"
+#include "mozilla/StyleSetHandleInlines.h"
#include "nsStyleUtil.h"
#include "nsQueryObject.h"
@@ -77,7 +78,7 @@ inDOMUtils::GetAllStyleSheets(nsIDOMDocument *aDocument, uint32_t *aLength,
{
NS_ENSURE_ARG_POINTER(aDocument);
- nsTArray<RefPtr<CSSStyleSheet>> sheets;
+ nsTArray<RefPtr<StyleSheet>> sheets;
nsCOMPtr<nsIDocument> document = do_QueryInterface(aDocument);
MOZ_ASSERT(document);
@@ -85,15 +86,8 @@ inDOMUtils::GetAllStyleSheets(nsIDOMDocument *aDocument, uint32_t *aLength,
// Get the agent, then user and finally xbl sheets in the style set.
nsIPresShell* presShell = document->GetShell();
- if (presShell && presShell->StyleSet()->IsServo()) {
- // XXXheycam ServoStyleSets don't have the ability to expose their
- // sheets in a script-accessible way yet.
- NS_ERROR("stylo: ServoStyleSets cannot expose their sheets to script yet");
- return NS_ERROR_FAILURE;
- }
-
if (presShell) {
- nsStyleSet* styleSet = presShell->StyleSet()->AsGecko();
+ StyleSetHandle styleSet = presShell->StyleSet();
SheetType sheetType = SheetType::Agent;
for (int32_t i = 0; i < styleSet->SheetCount(sheetType); i++) {
sheets.AppendElement(styleSet->StyleSheetAt(sheetType, i));
@@ -102,24 +96,26 @@ inDOMUtils::GetAllStyleSheets(nsIDOMDocument *aDocument, uint32_t *aLength,
for (int32_t i = 0; i < styleSet->SheetCount(sheetType); i++) {
sheets.AppendElement(styleSet->StyleSheetAt(sheetType, i));
}
- AutoTArray<CSSStyleSheet*, 32> xblSheetArray;
- styleSet->AppendAllXBLStyleSheets(xblSheetArray);
-
- // The XBL stylesheet array will quite often be full of duplicates. Cope:
- nsTHashtable<nsPtrHashKey<CSSStyleSheet>> sheetSet;
- for (CSSStyleSheet* sheet : xblSheetArray) {
- if (!sheetSet.Contains(sheet)) {
- sheetSet.PutEntry(sheet);
- sheets.AppendElement(sheet);
+ if (styleSet->IsGecko()) {
+ AutoTArray<CSSStyleSheet*, 32> xblSheetArray;
+ styleSet->AsGecko()->AppendAllXBLStyleSheets(xblSheetArray);
+
+ // The XBL stylesheet array will quite often be full of duplicates. Cope:
+ nsTHashtable<nsPtrHashKey<CSSStyleSheet>> sheetSet;
+ for (CSSStyleSheet* sheet : xblSheetArray) {
+ if (!sheetSet.Contains(sheet)) {
+ sheetSet.PutEntry(sheet);
+ sheets.AppendElement(sheet);
+ }
}
+ } else {
+ NS_WARNING("stylo: XBL style sheets not supported yet");
}
}
// Get the document sheets.
- for (int32_t i = 0; i < document->GetNumberOfStyleSheets(); i++) {
- // XXXheycam ServoStyleSets don't have the ability to expose their
- // sheets in a script-accessible way yet.
- sheets.AppendElement(document->GetStyleSheetAt(i)->AsGecko());
+ for (size_t i = 0; i < document->SheetCount(); i++) {
+ sheets.AppendElement(document->SheetAt(i));
}
nsISupports** ret = static_cast<nsISupports**>(moz_xmalloc(sheets.Length() *
diff --git a/layout/inspector/inDeepTreeWalker.cpp b/layout/inspector/inDeepTreeWalker.cpp
index a0c504980..e043fbcab 100644
--- a/layout/inspector/inDeepTreeWalker.cpp
+++ b/layout/inspector/inDeepTreeWalker.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 sw=2 et tw=79: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/inspector/moz.build b/layout/inspector/moz.build
index bbf808292..3bc757a56 100644
--- a/layout/inspector/moz.build
+++ b/layout/inspector/moz.build
@@ -1,5 +1,4 @@
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/layout/inspector/nsFontFaceList.cpp b/layout/inspector/nsFontFaceList.cpp
index 5f9b0ecb4..67bf3dc48 100644
--- a/layout/inspector/nsFontFaceList.cpp
+++ b/layout/inspector/nsFontFaceList.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/inspector/tests/chrome/chrome.ini b/layout/inspector/tests/chrome/chrome.ini
index ef4b74bda..d6f57343f 100644
--- a/layout/inspector/tests/chrome/chrome.ini
+++ b/layout/inspector/tests/chrome/chrome.ini
@@ -1,5 +1,4 @@
[DEFAULT]
-skip-if = os == 'android'
support-files = GentiumPlus-R.woff
[test_bug467669.css]
diff --git a/layout/inspector/tests/chrome/test_bug727834.css b/layout/inspector/tests/chrome/test_bug727834.css
index f21f7a54c..f675bc3f4 100644
--- a/layout/inspector/tests/chrome/test_bug727834.css
+++ b/layout/inspector/tests/chrome/test_bug727834.css
@@ -1,4 +1,3 @@
-/* vim: set ts=2 et sw=2 tw=80: */
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
diff --git a/layout/inspector/tests/chrome/test_bug727834.xul b/layout/inspector/tests/chrome/test_bug727834.xul
index dde8e1b03..764d285ce 100644
--- a/layout/inspector/tests/chrome/test_bug727834.xul
+++ b/layout/inspector/tests/chrome/test_bug727834.xul
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
<!--
-vim: set ts=2 et sw=2 tw=80:
Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/
-->
diff --git a/layout/inspector/tests/test_bug522601.xhtml b/layout/inspector/tests/test_bug522601.xhtml
index 7c5a9e79c..c49f2fa83 100644
--- a/layout/inspector/tests/test_bug522601.xhtml
+++ b/layout/inspector/tests/test_bug522601.xhtml
@@ -237,6 +237,8 @@ addLoadEvent(function() {
testFunc(walkerAnon, "previousNode", $("display"), "step back to root (anon)");
testFunc(walkerAnon, "previousNode", null, "step back past root (anon)");
+ //XXXsmaug update this test for Shadow DOM v1! bug 1421539
+ /*if (Element.prototype.createShadowRoot) {
var shadowdiv = document.querySelector('#test-shadow');
var shadowRoot = shadowdiv.createShadowRoot();
var h = document.createElement("header");
@@ -266,6 +268,7 @@ addLoadEvent(function() {
SimpleTest.finish();
});
+ }*/
]]>
</script>
diff --git a/layout/ipc/moz.build b/layout/ipc/moz.build
index 919a9df7a..2711432fd 100644
--- a/layout/ipc/moz.build
+++ b/layout/ipc/moz.build
@@ -1,5 +1,4 @@
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/layout/mathml/moz.build b/layout/mathml/moz.build
index 07dd446a3..e05825785 100644
--- a/layout/mathml/moz.build
+++ b/layout/mathml/moz.build
@@ -1,5 +1,4 @@
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/layout/mathml/tests/stretchy-and-large-operators.html b/layout/mathml/tests/stretchy-and-large-operators.html
index 13fe14aa7..0632c46d8 100644
--- a/layout/mathml/tests/stretchy-and-large-operators.html
+++ b/layout/mathml/tests/stretchy-and-large-operators.html
@@ -1,5 +1,4 @@
<!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- -->
-<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: -->
<!DOCTYPE html>
<html>
<head>
diff --git a/layout/media/Makefile.in b/layout/media/Makefile.in
new file mode 100644
index 000000000..86d9b181d
--- /dev/null
+++ b/layout/media/Makefile.in
@@ -0,0 +1,11 @@
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+include $(topsrcdir)/config/rules.mk
+
+ifeq (WINNT,$(OS_TARGET))
+symbols.def: symbols.def.in $(GLOBAL_DEPS)
+ $(call py_action,preprocessor,$(ACDEFINES) $< -o $@)
+endif
diff --git a/layout/media/moz.build b/layout/media/moz.build
index 3602d767e..9ea465319 100644
--- a/layout/media/moz.build
+++ b/layout/media/moz.build
@@ -1,5 +1,4 @@
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -7,16 +6,23 @@
with Files('**'):
BUG_COMPONENT = ('Core', 'Video/Audio')
-# media/webrtc/signaling/test/common.build uses the gkmedias library,
-# expecting at least some of what it contains to be linked, but not libxul,
-# so we need to keep an independent pseudo-library, as well as the OS_LIBS
-# on Windows for them to propagate there.
-Library('gkmedias')
+if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
+ GeckoSharedLibrary('gkmedias', linkage=None)
+ USE_LIBS += [
+ 'nspr',
+ ]
+else:
+ # media/webrtc/signaling/test/common.build uses the gkmedias library,
+ # expecting at least some of what it contains to be linked, but not libxul,
+ # so we need to keep an independent pseudo-library, as well as the OS_LIBS
+ # on Windows for them to propagate there.
+ Library('gkmedias')
if CONFIG['MOZ_WEBRTC']:
DIRS += ['webrtc']
if CONFIG['OS_TARGET'] == 'WINNT':
+ DEFFILE = 'symbols.def'
OS_LIBS += [
'usp10',
'ole32',
diff --git a/layout/media/symbols.def.in b/layout/media/symbols.def.in
new file mode 100644
index 000000000..6e2364f51
--- /dev/null
+++ b/layout/media/symbols.def.in
@@ -0,0 +1,678 @@
+;+# This Source Code Form is subject to the terms of the Mozilla Public
+;+# License, v. 2.0. If a copy of the MPL was not distributed with this
+;+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+LIBRARY gkmedias.dll
+EXPORTS
+nestegg_destroy
+nestegg_duration
+nestegg_free_packet
+nestegg_init
+nestegg_offset_seek
+nestegg_packet_count
+nestegg_packet_discard_padding
+nestegg_packet_data
+nestegg_packet_duration
+nestegg_packet_encryption
+nestegg_packet_has_keyframe
+nestegg_packet_iv
+nestegg_packet_track
+nestegg_packet_tstamp
+nestegg_read_packet
+nestegg_read_reset
+nestegg_track_audio_params
+nestegg_track_codec_data
+nestegg_track_codec_data_count
+nestegg_track_codec_id
+nestegg_track_content_enc_key_id
+nestegg_track_count
+nestegg_get_cue_point
+nestegg_track_seek
+nestegg_track_type
+nestegg_track_video_params
+nestegg_tstamp_scale
+nestegg_has_cues
+nestegg_sniff
+#ifdef MOZ_WEBM_ENCODER
+writeSimpleBlock
+writeHeader
+writeSegmentInformation
+writeVideoTrack
+writeAudioTrack
+Ebml_Serialize
+Ebml_SerializeUnsigned
+Ebml_StartSubElement
+Ebml_EndSubElement
+#endif
+vpx_codec_control_
+vpx_codec_dec_init_ver
+vpx_codec_decode
+vpx_codec_destroy
+vpx_codec_err_to_string
+vpx_codec_get_frame
+vpx_codec_peek_stream_info
+vpx_codec_vp8_dx
+vpx_codec_vp9_dx
+vpx_img_free
+vpx_codec_enc_config_set
+vpx_codec_enc_init_ver
+vpx_codec_vp8_cx
+vpx_codec_vp9_cx
+vpx_img_set_rect
+vpx_img_wrap
+vpx_codec_get_cx_data
+vpx_codec_enc_config_default
+vpx_img_alloc
+vpx_codec_encode
+#ifdef MOZ_WEBRTC
+vpx_codec_set_frame_buffer_functions
+vpx_codec_enc_init_multi_ver
+#endif
+#ifdef MOZ_AV1
+aom_codec_av1_dx
+aom_codec_dec_init_ver
+aom_codec_decode
+aom_codec_destroy
+aom_codec_err_to_string
+aom_codec_get_frame
+aom_codec_peek_stream_info
+aom_img_alloc
+aom_img_free
+#endif
+#ifdef MOZ_VORBIS
+ogg_page_bos
+ogg_page_granulepos
+ogg_page_serialno
+ogg_set_mem_functions
+ogg_stream_check
+ogg_stream_clear
+ogg_stream_eos
+ogg_stream_flush
+ogg_stream_init
+ogg_stream_packetin
+ogg_stream_packetout
+ogg_stream_pagein
+ogg_stream_pageout
+ogg_stream_reset
+ogg_sync_buffer
+ogg_sync_clear
+ogg_sync_init
+ogg_sync_pageseek
+ogg_sync_reset
+ogg_sync_wrote
+vorbis_analysis
+vorbis_analysis_blockout
+vorbis_analysis_buffer
+vorbis_analysis_init
+vorbis_analysis_headerout
+vorbis_analysis_wrote
+vorbis_block_clear
+vorbis_block_init
+vorbis_comment_add_tag
+vorbis_comment_clear
+vorbis_comment_init
+vorbis_dsp_clear
+vorbis_encode_init_vbr
+vorbis_info_clear
+vorbis_info_init
+vorbis_packet_blocksize
+vorbis_synthesis
+vorbis_synthesis_blockin
+vorbis_synthesis_headerin
+vorbis_synthesis_init
+vorbis_synthesis_pcmout
+vorbis_synthesis_read
+vorbis_synthesis_restart
+#endif
+moz_speex_resampler_init
+moz_speex_resampler_destroy
+moz_speex_resampler_process_float
+moz_speex_resampler_process_interleaved_float
+moz_speex_resampler_process_interleaved_int
+moz_speex_resampler_set_rate
+moz_speex_resampler_get_rate
+moz_speex_resampler_get_ratio
+moz_speex_resampler_get_input_latency
+moz_speex_resampler_get_output_latency
+moz_speex_resampler_skip_zeros
+moz_speex_resampler_set_skip_frac_num
+moz_speex_resampler_reset_mem
+cubeb_destroy
+#ifdef MOZ_WEBRTC
+cubeb_device_collection_destroy
+cubeb_enumerate_devices
+#endif
+cubeb_init
+cubeb_get_backend_id
+cubeb_get_max_channel_count
+cubeb_get_min_latency
+cubeb_get_preferred_sample_rate
+cubeb_set_log_callback
+cubeb_stream_destroy
+cubeb_stream_get_position
+cubeb_stream_init
+cubeb_stream_start
+cubeb_stream_stop
+cubeb_stream_get_latency
+cubeb_stream_set_volume
+cubeb_stream_set_panning
+cubeb_stream_get_current_device
+cubeb_stream_device_destroy
+cubeb_stream_register_device_changed_callback
+th_comment_clear
+th_comment_init
+th_decode_alloc
+th_decode_free
+th_decode_headerin
+th_decode_packetin
+th_decode_ycbcr_out
+th_granule_frame
+th_info_clear
+th_info_init
+th_packet_isheader
+th_packet_iskeyframe
+th_setup_free
+opus_decoder_create
+opus_decoder_destroy
+opus_decoder_ctl
+opus_decoder_get_nb_samples
+opus_decode
+opus_decode_float
+opus_get_version_string
+opus_multistream_decoder_create
+opus_multistream_decoder_ctl
+opus_multistream_decoder_destroy
+opus_multistream_decode_float
+opus_multistream_decode
+opus_packet_get_nb_frames
+opus_packet_get_samples_per_frame
+opus_encoder_create
+opus_encoder_destroy
+opus_encoder_ctl
+opus_encode
+opus_encode_float
+#ifdef MOZ_WEBRTC
+opus_custom_mode_create
+opus_packet_parse
+opus_packet_get_nb_channels
+downmix_int
+tonality_analysis_init
+run_analysis
+#endif
+#ifndef MOZ_NATIVE_PNG
+MOZ_APNG_get_first_frame_is_hidden
+MOZ_APNG_get_next_frame_blend_op
+MOZ_APNG_get_next_frame_delay_den
+MOZ_APNG_get_next_frame_delay_num
+MOZ_APNG_get_next_frame_dispose_op
+MOZ_APNG_set_prog_frame_fn
+MOZ_APNG_get_next_frame_height
+MOZ_APNG_get_next_frame_width
+MOZ_APNG_get_next_frame_x_offset
+MOZ_APNG_get_next_frame_y_offset
+MOZ_APNG_set_acTL
+MOZ_APNG_set_first_frame_is_hidden
+MOZ_APNG_set_num_plays
+MOZ_APNG_write_frame_head
+MOZ_APNG_write_frame_tail
+MOZ_PNG_cr_info_str
+MOZ_PNG_cr_read_str
+MOZ_PNG_cr_write_str
+MOZ_PNG_dest_read_str
+MOZ_PNG_dest_write_str
+MOZ_PNG_free_data
+MOZ_PNG_get_channels
+MOZ_PNG_get_cHRM
+MOZ_PNG_get_gAMA
+MOZ_PNG_get_IHDR
+MOZ_PNG_get_iCCP
+MOZ_PNG_get_io_ptr
+MOZ_PNG_get_progressive_ptr
+MOZ_PNG_get_sRGB
+MOZ_PNG_get_tRNS
+MOZ_PNG_get_valid
+MOZ_PNG_longjmp
+MOZ_PNG_process_data
+MOZ_PNG_process_data_pause
+MOZ_PNG_progressive_combine_row
+MOZ_PNG_read_update_info
+MOZ_PNG_set_cHRM
+MOZ_PNG_set_crc_action
+MOZ_PNG_set_gAMA
+MOZ_PNG_set_gamma
+MOZ_PNG_set_gray_to_rgb
+MOZ_PNG_set_expand
+MOZ_PNG_set_IHDR
+MOZ_PNG_set_interlace_handling
+MOZ_PNG_set_longjmp_fn
+MOZ_PNG_set_progressive_read_fn
+MOZ_PNG_set_scale_16
+MOZ_PNG_set_write_fn
+MOZ_PNG_write_end
+MOZ_PNG_write_info
+MOZ_PNG_write_row
+#endif
+png_set_option
+png_error
+#ifndef MOZ_NATIVE_JPEG
+jpeg_calc_output_dimensions
+jpeg_consume_input
+jpeg_CreateCompress
+jpeg_CreateDecompress
+jpeg_destroy_compress
+jpeg_destroy_decompress
+jpeg_finish_compress
+jpeg_finish_decompress
+jpeg_finish_output
+jpeg_has_multiple_scans
+jpeg_input_complete
+jpeg_read_header
+jpeg_read_scanlines
+jpeg_resync_to_restart
+jpeg_save_markers
+jpeg_set_defaults
+jpeg_set_quality
+jpeg_start_compress
+jpeg_start_decompress
+jpeg_start_output
+jpeg_std_error
+jpeg_write_scanlines
+jpeg_write_raw_data
+jpeg_stdio_dest
+jpeg_abort
+jpeg_abort_decompress
+jpeg_read_raw_data
+#endif
+WebPDemuxDelete
+WebPDemuxGetChunk
+WebPDemuxGetFrame
+WebPDemuxGetI
+WebPDemuxInternal
+WebPDemuxNextFrame
+WebPDemuxReleaseChunkIterator
+WebPDemuxReleaseIterator
+WebPFreeDecBuffer
+WebPIDecGetRGB
+WebPIDelete
+WebPINewDecoder
+WebPIUpdate
+WebPInitDecBufferInternal
+qcms_enable_iccv4
+qcms_data_from_unicode_path
+qcms_data_from_path
+qcms_profile_create_rgb_with_gamma
+qcms_profile_from_memory
+qcms_profile_from_path
+qcms_profile_from_unicode_path
+qcms_profile_get_color_space
+qcms_profile_get_rendering_intent
+qcms_profile_is_bogus
+qcms_profile_precache_output_transform
+qcms_profile_release
+qcms_profile_sRGB
+qcms_transform_create
+qcms_transform_data
+qcms_transform_release
+MOZ_XMLCheckQName
+MOZ_XMLIsLetter
+MOZ_XMLIsNCNameChar
+MOZ_XMLTranslateEntity
+MOZ_XML_ExternalEntityParserCreate
+MOZ_XML_GetBase
+MOZ_XML_GetCurrentByteIndex
+MOZ_XML_GetCurrentColumnNumber
+MOZ_XML_GetCurrentLineNumber
+MOZ_XML_GetErrorCode
+MOZ_XML_GetIdAttributeIndex
+MOZ_XML_GetMismatchedTag
+MOZ_XML_GetSpecifiedAttributeCount
+MOZ_XML_Parse
+MOZ_XML_ParserCreate_MM
+MOZ_XML_ParserFree
+MOZ_XML_ResumeParser
+MOZ_XML_SetBase
+MOZ_XML_SetCdataSectionHandler
+MOZ_XML_SetCharacterDataHandler
+MOZ_XML_SetCommentHandler
+MOZ_XML_SetDefaultHandlerExpand
+MOZ_XML_SetDoctypeDeclHandler
+MOZ_XML_SetElementHandler
+MOZ_XML_SetExternalEntityRefHandler
+MOZ_XML_SetExternalEntityRefHandlerArg
+MOZ_XML_SetNamespaceDeclHandler
+MOZ_XML_SetNotationDeclHandler
+MOZ_XML_SetParamEntityParsing
+MOZ_XML_SetProcessingInstructionHandler
+MOZ_XML_SetReturnNSTriplet
+MOZ_XML_SetUnparsedEntityDeclHandler
+MOZ_XML_SetUserData
+MOZ_XML_SetXmlDeclHandler
+MOZ_XML_StopParser
+#ifdef MOZ_TREE_CAIRO
+_moz_cairo_append_path
+_moz_cairo_arc
+_moz_cairo_arc_negative
+_moz_cairo_clip
+_moz_cairo_clip_extents
+_moz_cairo_clip_preserve
+_moz_cairo_close_path
+_moz_cairo_copy_clip_rectangle_list
+_moz_cairo_copy_path
+_moz_cairo_copy_path_flat
+_moz_cairo_create
+_moz_cairo_curve_to
+_moz_cairo_d2d_create_device
+_moz_cairo_d2d_create_device_from_d3d10device
+_moz_cairo_d2d_device_get_device
+_moz_cairo_d2d_get_dc
+_moz_cairo_d2d_get_image_surface_cache_usage
+_moz_cairo_d2d_get_surface_vram_usage
+_moz_cairo_d2d_present_backbuffer
+_moz_cairo_d2d_release_dc
+_moz_cairo_d2d_scroll
+_moz_cairo_d2d_surface_create
+_moz_cairo_d2d_surface_create_for_handle
+_moz_cairo_d2d_surface_create_for_hwnd
+_moz_cairo_d2d_surface_create_for_texture
+_moz_cairo_d2d_surface_get_height
+_moz_cairo_d2d_surface_get_texture
+_moz_cairo_d2d_surface_get_width
+_moz_cairo_debug_reset_static_data
+_moz_cairo_destroy
+_moz_cairo_device_to_user
+_moz_cairo_device_to_user_distance
+_moz_cairo_dwrite_font_face_create_for_dwrite_fontface
+_moz_cairo_dwrite_get_cleartype_rendering_mode
+_moz_cairo_dwrite_scaled_font_allow_manual_show_glyphs
+_moz_cairo_dwrite_scaled_font_get_force_GDI_classic
+_moz_cairo_dwrite_scaled_font_set_force_GDI_classic
+_moz_cairo_dwrite_set_cleartype_params
+_moz_cairo_fill
+_moz_cairo_fill_extents
+_moz_cairo_fill_preserve
+_moz_cairo_font_face_destroy
+_moz_cairo_font_options_create
+_moz_cairo_font_options_destroy
+_moz_cairo_font_options_get_antialias
+_moz_cairo_font_options_get_hint_metrics
+_moz_cairo_font_options_set_antialias
+_moz_cairo_format_stride_for_width
+_moz_cairo_get_antialias
+_moz_cairo_get_current_point
+_moz_cairo_get_dash
+_moz_cairo_get_dash_count
+_moz_cairo_get_fill_rule
+_moz_cairo_get_font_matrix
+_moz_cairo_get_font_options
+_moz_cairo_get_group_target
+_moz_cairo_get_line_cap
+_moz_cairo_get_line_join
+_moz_cairo_get_line_width
+_moz_cairo_get_matrix
+_moz_cairo_get_miter_limit
+_moz_cairo_get_operator
+_moz_cairo_get_scaled_font
+_moz_cairo_get_source
+_moz_cairo_get_target
+_moz_cairo_glyph_extents
+_moz_cairo_glyph_path
+_moz_cairo_identity_matrix
+_moz_cairo_image_surface_create
+_moz_cairo_image_surface_create_for_data
+_moz_cairo_image_surface_get_data
+_moz_cairo_image_surface_get_format
+_moz_cairo_image_surface_get_height
+_moz_cairo_image_surface_get_stride
+_moz_cairo_image_surface_get_width
+_moz_cairo_in_fill
+_moz_cairo_in_stroke
+_moz_cairo_line_to
+_moz_cairo_mask
+_moz_cairo_mask_surface
+_moz_cairo_matrix_init
+_moz_cairo_matrix_init_identity
+_moz_cairo_matrix_init_scale
+_moz_cairo_matrix_init_translate
+_moz_cairo_matrix_invert
+_moz_cairo_matrix_multiply
+_moz_cairo_matrix_rotate
+_moz_cairo_matrix_scale
+_moz_cairo_matrix_transform_distance
+_moz_cairo_matrix_transform_point
+_moz_cairo_matrix_translate
+_moz_cairo_move_to
+_moz_cairo_new_path
+_moz_cairo_new_sub_path
+_moz_cairo_null_surface_create
+_moz_cairo_paint
+_moz_cairo_paint_with_alpha
+_moz_cairo_path_destroy
+_moz_cairo_path_extents
+_moz_cairo_pattern_add_color_stop_rgba
+_moz_cairo_pattern_create_for_surface
+_moz_cairo_pattern_create_linear
+_moz_cairo_pattern_create_radial
+_moz_cairo_pattern_create_rgba
+_moz_cairo_pattern_destroy
+_moz_cairo_pattern_get_color_stop_count
+_moz_cairo_pattern_get_color_stop_rgba
+_moz_cairo_pattern_get_extend
+_moz_cairo_pattern_get_filter
+_moz_cairo_pattern_get_linear_points
+_moz_cairo_pattern_get_matrix
+_moz_cairo_pattern_get_radial_circles
+_moz_cairo_pattern_get_rgba
+_moz_cairo_pattern_get_surface
+_moz_cairo_pattern_get_type
+_moz_cairo_pattern_reference
+_moz_cairo_pattern_set_extend
+_moz_cairo_pattern_set_filter
+_moz_cairo_pattern_set_matrix
+_moz_cairo_pattern_status
+_moz_cairo_pdf_surface_create_for_stream
+_moz_cairo_pop_group
+_moz_cairo_pop_group_to_source
+_moz_cairo_push_group
+_moz_cairo_push_group_with_content
+_moz_cairo_rectangle
+_moz_cairo_rectangle_list_destroy
+_moz_cairo_reference
+_moz_cairo_release_device
+_moz_cairo_reset_clip
+_moz_cairo_restore
+_moz_cairo_rotate
+_moz_cairo_save
+_moz_cairo_scale
+_moz_cairo_scaled_font_create
+_moz_cairo_scaled_font_destroy
+_moz_cairo_scaled_font_get_font_matrix
+_moz_cairo_scaled_font_get_font_options
+_moz_cairo_scaled_font_get_type
+_moz_cairo_scaled_font_glyph_extents
+_moz_cairo_scaled_font_reference
+_moz_cairo_scaled_font_status
+_moz_cairo_set_antialias
+_moz_cairo_set_dash
+_moz_cairo_set_fill_rule
+_moz_cairo_set_font_face
+_moz_cairo_set_font_options
+_moz_cairo_set_font_size
+_moz_cairo_set_line_cap
+_moz_cairo_set_line_join
+_moz_cairo_set_line_width
+_moz_cairo_set_matrix
+_moz_cairo_set_miter_limit
+_moz_cairo_set_operator
+_moz_cairo_set_scaled_font
+_moz_cairo_set_source
+_moz_cairo_set_source_rgba
+_moz_cairo_set_source_surface
+_moz_cairo_show_glyphs
+_moz_cairo_status
+_moz_cairo_status_to_string
+_moz_cairo_stroke
+_moz_cairo_stroke_extents
+_moz_cairo_stroke_preserve
+_moz_cairo_surface_attach_snapshot
+_moz_cairo_surface_create_similar
+_moz_cairo_surface_destroy
+_moz_cairo_surface_finish
+_moz_cairo_surface_flush
+_moz_cairo_surface_get_content
+_moz_cairo_surface_get_device_offset
+_moz_cairo_surface_get_reference_count
+_moz_cairo_surface_get_subpixel_antialiasing
+_moz_cairo_surface_get_type
+_moz_cairo_surface_get_user_data
+_moz_cairo_surface_mark_dirty
+_moz_cairo_surface_mark_dirty_rectangle
+_moz_cairo_surface_reference
+_moz_cairo_surface_set_device_offset
+_moz_cairo_surface_set_fallback_resolution
+_moz_cairo_surface_set_subpixel_antialiasing
+_moz_cairo_surface_set_user_data
+_moz_cairo_surface_show_page
+_moz_cairo_surface_status
+_moz_cairo_tee_surface_add
+_moz_cairo_tee_surface_create
+_moz_cairo_tee_surface_index
+_moz_cairo_transform
+_moz_cairo_translate
+_moz_cairo_user_to_device
+_moz_cairo_user_to_device_distance
+_moz_cairo_win32_font_face_create_for_logfontw
+_moz_cairo_win32_font_face_create_for_logfontw_hfont
+_moz_cairo_win32_get_dc_with_clip
+_moz_cairo_win32_get_system_text_quality
+#ifdef NS_PRINTING
+_moz_cairo_win32_printing_surface_create
+#endif
+_moz_cairo_win32_scaled_font_select_font
+_moz_cairo_win32_surface_create
+_moz_cairo_win32_surface_create_with_alpha
+_moz_cairo_win32_surface_create_with_d3dsurface9
+_moz_cairo_win32_surface_create_with_ddb
+_moz_cairo_win32_surface_create_with_dib
+_moz_cairo_win32_surface_get_dc
+_moz_cairo_win32_surface_get_height
+_moz_cairo_win32_surface_get_image
+_moz_cairo_win32_surface_get_width
+_moz_cairo_win32_surface_set_can_convert_to_dib
+#ifdef MOZ_TREE_PIXMAN
+_moz_pixman_image_composite32
+_moz_pixman_image_create_bits
+_moz_pixman_image_set_filter
+_moz_pixman_image_set_transform
+_moz_pixman_image_unref
+_moz_pixman_transform_from_pixman_f_transform
+_moz_pixman_transform_invert
+_moz_pixman_region32_reset
+_moz_pixman_region32_init
+_moz_pixman_region32_init_rect
+_moz_pixman_region32_init_rects
+_moz_pixman_region32_init_with_extents
+_moz_pixman_region32_fini
+_moz_pixman_region32_translate
+_moz_pixman_region32_copy
+_moz_pixman_region32_intersect
+_moz_pixman_region32_intersect_rect
+_moz_pixman_region32_union
+_moz_pixman_region32_union_rect
+_moz_pixman_region32_subtract
+_moz_pixman_region32_inverse
+_moz_pixman_region32_contains_point
+_moz_pixman_region32_contains_rectangle
+_moz_pixman_region32_not_empty
+_moz_pixman_region32_extents
+_moz_pixman_region32_n_rects
+_moz_pixman_region32_rectangles
+_moz_pixman_region32_equal
+_moz_pixman_region32_selfcheck
+_moz_pixman_region32_reset
+_moz_pixman_region32_clear
+#endif
+#endif
+hb_blob_create
+hb_blob_destroy
+hb_blob_get_data
+hb_blob_get_empty
+hb_blob_get_length
+hb_blob_reference
+hb_buffer_add_utf16
+hb_buffer_create
+hb_buffer_destroy
+hb_buffer_get_glyph_infos
+hb_buffer_get_glyph_positions
+hb_buffer_reverse
+hb_buffer_set_cluster_level
+hb_buffer_set_direction
+hb_buffer_set_language
+hb_buffer_set_script
+hb_buffer_set_unicode_funcs
+hb_face_create_for_tables
+hb_face_destroy
+hb_face_reference
+hb_font_create
+hb_font_destroy
+hb_font_funcs_create
+hb_font_funcs_set_glyph_contour_point_func
+hb_font_funcs_set_glyph_extents_func
+hb_font_funcs_set_glyph_func
+hb_font_funcs_set_glyph_h_advance_func
+hb_font_funcs_set_glyph_h_kerning_func
+hb_font_funcs_set_glyph_h_origin_func
+hb_font_funcs_set_glyph_v_origin_func
+hb_font_funcs_set_glyph_v_advance_func
+hb_font_funcs_set_nominal_glyph_func
+hb_font_funcs_set_variation_glyph_func
+hb_font_set_funcs
+hb_font_set_ppem
+hb_font_set_scale
+hb_language_from_string
+hb_ot_layout_collect_lookups
+hb_ot_layout_feature_get_lookups
+hb_ot_layout_has_positioning
+hb_ot_layout_has_substitution
+hb_ot_layout_language_find_feature
+hb_ot_layout_language_get_feature_indexes
+hb_ot_layout_language_get_feature_tags
+hb_ot_layout_language_get_required_feature_index
+hb_ot_layout_lookup_collect_glyphs
+hb_ot_layout_script_get_language_tags
+hb_ot_layout_table_choose_script
+hb_ot_layout_table_find_script
+hb_ot_layout_table_get_script_tags
+hb_ot_math_get_constant
+hb_ot_math_get_glyph_assembly
+hb_ot_math_get_glyph_italics_correction
+hb_ot_math_get_glyph_variants
+hb_ot_math_has_data
+hb_ot_tag_to_language
+hb_ot_tag_to_script
+hb_ot_tags_from_script
+hb_set_add
+hb_set_clear
+hb_set_create
+hb_set_destroy
+hb_set_get_population
+hb_set_has
+hb_set_intersect
+hb_set_is_empty
+hb_set_next
+hb_shape
+hb_unicode_funcs_create
+hb_unicode_funcs_get_empty
+hb_unicode_funcs_set_combining_class_func
+hb_unicode_funcs_set_compose_func
+hb_unicode_funcs_set_decompose_func
+hb_unicode_funcs_set_eastasian_width_func
+hb_unicode_funcs_set_general_category_func
+hb_unicode_funcs_set_mirroring_func
+hb_unicode_funcs_set_script_func
+BrotliDecoderCreateInstance
+BrotliDecoderDecompress
+BrotliDecoderDecompressStream
+BrotliDecoderDestroyInstance
+BrotliDecoderIsFinished
+BrotliDecoderStateCleanup
+BrotliDecoderStateInit
diff --git a/layout/media/webrtc/moz.build b/layout/media/webrtc/moz.build
index 051c6bfd9..5c4cb2cee 100644
--- a/layout/media/webrtc/moz.build
+++ b/layout/media/webrtc/moz.build
@@ -1,5 +1,4 @@
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/layout/moz.build b/layout/moz.build
index 450c75862..6333c0d40 100644
--- a/layout/moz.build
+++ b/layout/moz.build
@@ -1,5 +1,4 @@
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/layout/printing/PrintTranslator.cpp b/layout/printing/PrintTranslator.cpp
index 0bda505ba..7bfee3694 100644
--- a/layout/printing/PrintTranslator.cpp
+++ b/layout/printing/PrintTranslator.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/printing/PrintTranslator.h b/layout/printing/PrintTranslator.h
index 92d8bbed2..a80429401 100644
--- a/layout/printing/PrintTranslator.h
+++ b/layout/printing/PrintTranslator.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/printing/ipc/PRemotePrintJob.ipdl b/layout/printing/ipc/PRemotePrintJob.ipdl
index f6c1de895..3a6083e21 100644
--- a/layout/printing/ipc/PRemotePrintJob.ipdl
+++ b/layout/printing/ipc/PRemotePrintJob.ipdl
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/printing/ipc/RemotePrintJobChild.cpp b/layout/printing/ipc/RemotePrintJobChild.cpp
index ffc3c2455..3221defa2 100644
--- a/layout/printing/ipc/RemotePrintJobChild.cpp
+++ b/layout/printing/ipc/RemotePrintJobChild.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/printing/ipc/RemotePrintJobChild.h b/layout/printing/ipc/RemotePrintJobChild.h
index a316815ea..1a1795ef2 100644
--- a/layout/printing/ipc/RemotePrintJobChild.h
+++ b/layout/printing/ipc/RemotePrintJobChild.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/printing/ipc/RemotePrintJobParent.cpp b/layout/printing/ipc/RemotePrintJobParent.cpp
index d49927da3..7005bab5a 100644
--- a/layout/printing/ipc/RemotePrintJobParent.cpp
+++ b/layout/printing/ipc/RemotePrintJobParent.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/printing/ipc/RemotePrintJobParent.h b/layout/printing/ipc/RemotePrintJobParent.h
index 752ef601e..6f1a78bc1 100644
--- a/layout/printing/ipc/RemotePrintJobParent.h
+++ b/layout/printing/ipc/RemotePrintJobParent.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/printing/moz.build b/layout/printing/moz.build
index 745c45c4b..869464919 100644
--- a/layout/printing/moz.build
+++ b/layout/printing/moz.build
@@ -1,5 +1,4 @@
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/layout/printing/nsPrintEngine.cpp b/layout/printing/nsPrintEngine.cpp
index 67208447a..d232b669b 100644
--- a/layout/printing/nsPrintEngine.cpp
+++ b/layout/printing/nsPrintEngine.cpp
@@ -1004,7 +1004,7 @@ nsPrintEngine::GetCurrentPrintSettings(nsIPrintSettings * *aCurrentPrintSettings
nsresult
nsPrintEngine::CheckForPrinters(nsIPrintSettings* aPrintSettings)
{
-#if defined(XP_MACOSX) || defined(ANDROID)
+#if defined(XP_MACOSX)
// Mac doesn't support retrieving a printer list.
return NS_OK;
#else
@@ -2450,13 +2450,17 @@ CloneRangeToSelection(nsRange* aRange, nsIDocument* aDoc,
NS_ENSURE_TRUE_VOID(newStart && newEnd);
nsCOMPtr<nsINode> newStartNode = do_QueryInterface(newStart);
- NS_ENSURE_TRUE_VOID(newStartNode);
+ nsCOMPtr<nsINode> newEndNode = do_QueryInterface(newEnd);
+ if (NS_WARN_IF(!newStartNode) || NS_WARN_IF(!newEndNode)) {
+ return;
+ }
RefPtr<nsRange> range = new nsRange(newStartNode);
- nsresult rv = range->SetStart(newStartNode, startOffset);
- NS_ENSURE_SUCCESS_VOID(rv);
- rv = range->SetEnd(newEnd, endOffset);
- NS_ENSURE_SUCCESS_VOID(rv);
+ nsresult rv =
+ range->SetStartAndEnd(newStartNode, startOffset, newEndNode, endOffset);
+ if (NS_WARN_IF(NS_FAILED(rv))) {
+ return;
+ }
aSelection->AddRange(range);
}
diff --git a/layout/reftests/abs-pos/reftest-stylo.list b/layout/reftests/abs-pos/reftest-stylo.list
deleted file mode 100644
index e6988eb1e..000000000
--- a/layout/reftests/abs-pos/reftest-stylo.list
+++ /dev/null
@@ -1,69 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== font-size-wrap.html font-size-wrap.html
-== abs-pos-auto-margin-1.html abs-pos-auto-margin-1.html
-fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&!layersGPUAccelerated&&!azureSkia,73,1) == auto-offset-inline-block-1.html auto-offset-inline-block-1.html
-# bug 696670
-== fieldset-1.html fieldset-1.html
-== table-1.html table-1.html
-== table-2.html table-2.html
-== table-3.html table-3.html
-== table-caption-1.html table-caption-1.html
-== table-caption-2.html table-caption-2.html
-== table-caption-3.html table-caption-3.html
-== table-caption-4.html table-caption-4.html
-skip-if((B2G&&browserIsRemote)||Mulet) == table-caption-5.html table-caption-5.html
-# TODO: change to == when bug 967870 is is
-# Initial mulet triage: parity with B2G/B2G Desktop
-== table-cell-1.html table-cell-1.html
-== table-cell-2.html table-cell-2.html
-== table-cell-3.html table-cell-3.html
-== table-cell-4.html table-cell-4.html
-== table-cell-5.html table-cell-5.html
-== table-cell-6.html table-cell-6.html
-== table-cell-7.html table-cell-7.html
-skip-if((B2G&&browserIsRemote)||Mulet) == table-cell-8.html table-cell-8.html
-# TODO: change to == when bug 967870 is is
-# Initial mulet triage: parity with B2G/B2G Desktop
-== table-row-1.html table-row-1.html
-== table-row-2.html table-row-2.html
-== table-row-3.html table-row-3.html
-== table-row-4.html table-row-4.html
-== table-row-5.html table-row-5.html
-== table-row-6.html table-row-6.html
-== table-row-7.html table-row-7.html
-== table-row-group-1.html table-row-group-1.html
-== table-row-group-2.html table-row-group-2.html
-== table-row-group-3.html table-row-group-3.html
-== table-row-group-4.html table-row-group-4.html
-== table-row-group-5.html table-row-group-5.html
-== table-row-group-6.html table-row-group-6.html
-== table-row-group-7.html table-row-group-7.html
-== table-header-group-1.html table-header-group-1.html
-== table-header-group-2.html table-header-group-2.html
-== table-header-group-3.html table-header-group-3.html
-== table-header-group-4.html table-header-group-4.html
-== table-header-group-5.html table-header-group-5.html
-== table-header-group-6.html table-header-group-6.html
-== table-header-group-7.html table-header-group-7.html
-# == table-footer-group-1.html table-footer-group-1.html
-== table-footer-group-2.html table-footer-group-2.html
-== table-footer-group-3.html table-footer-group-3.html
-== table-footer-group-4.html table-footer-group-4.html
-== table-footer-group-5.html table-footer-group-5.html
-== table-footer-group-6.html table-footer-group-6.html
-== table-footer-group-7.html table-footer-group-7.html
-== continuation-positioned-inline-1.html continuation-positioned-inline-1.html
-== continuation-positioned-inline-2.html continuation-positioned-inline-2.html
-== scrollframe-1.html scrollframe-1.html
-fails == scrollframe-2.html scrollframe-2-ref.html #bug #bug
-# Initial mulet triage: parity with B2G/B2G Desktop
-fuzzy-if(gtkWidget,1,8) == select-1.html select-1.html
-fails fuzzy-if(gtkWidget,1,8) == select-1-dynamic.html select-1-dynamic.html
-== select-2.html select-2.html
-fuzzy-if(gtkWidget,1,19) fuzzy-if(Android||B2G,17,726) fuzzy-if(asyncPan&&!layersGPUAccelerated,102,98) fuzzy-if(browserIsRemote&&winWidget,102,107) == select-3.html select-3.html
-== multi-column-1.html multi-column-1.html
-== button-1.html button-1.html
-== button-2.html button-2.html
-== relative-row-animation-1.html relative-row-animation-1.html
-fuzzy-if(Android,12,50) == fixed-pos-auto-offset-1a.html fixed-pos-auto-offset-1a.html
-fuzzy-if(Android,12,50) == fixed-pos-auto-offset-1b.html fixed-pos-auto-offset-1b.html
diff --git a/layout/reftests/abs-pos/reftest.list b/layout/reftests/abs-pos/reftest.list
index e4c41c4e3..d4d1b57ca 100644
--- a/layout/reftests/abs-pos/reftest.list
+++ b/layout/reftests/abs-pos/reftest.list
@@ -49,14 +49,14 @@ fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&!layersGPUAccelerated&&!azur
== continuation-positioned-inline-1.html continuation-positioned-inline-ref.html
== continuation-positioned-inline-2.html continuation-positioned-inline-ref.html
== scrollframe-1.html scrollframe-1-ref.html
-fuzzy-if(gtkWidget,1,1) fuzzy-if(Android,9,185) fuzzy-if(asyncPan&&!layersGPUAccelerated,140,144) == scrollframe-2.html scrollframe-2-ref.html #bug 756530
+fuzzy-if(gtkWidget,1,1) fuzzy-if(asyncPan&&!layersGPUAccelerated,140,144) == scrollframe-2.html scrollframe-2-ref.html #bug 756530
fuzzy-if(gtkWidget,1,8) == select-1.html select-1-ref.html
fuzzy-if(gtkWidget,1,8) == select-1-dynamic.html select-1-ref.html
== select-2.html select-2-ref.html
-fuzzy-if(gtkWidget,1,19) fuzzy-if(Android,17,726) fuzzy-if(asyncPan&&!layersGPUAccelerated,110,114) fuzzy-if(browserIsRemote&&winWidget,110,114) == select-3.html select-3-ref.html
+fuzzy-if(gtkWidget,1,19) fuzzy-if(asyncPan&&!layersGPUAccelerated,110,114) fuzzy-if(browserIsRemote&&winWidget,110,114) == select-3.html select-3-ref.html
== multi-column-1.html multi-column-1-ref.html
== button-1.html button-1-ref.html
== button-2.html button-2-ref.html
== relative-row-animation-1.html relative-row-animation-1-ref.html
-fuzzy-if(Android,12,50) == fixed-pos-auto-offset-1a.html fixed-pos-auto-offset-1-ref.html
-fuzzy-if(Android,12,50) == fixed-pos-auto-offset-1b.html fixed-pos-auto-offset-1-ref.html
+== fixed-pos-auto-offset-1a.html fixed-pos-auto-offset-1-ref.html
+== fixed-pos-auto-offset-1b.html fixed-pos-auto-offset-1-ref.html
diff --git a/layout/reftests/async-scrolling/reftest-stylo.list b/layout/reftests/async-scrolling/reftest-stylo.list
deleted file mode 100644
index b59ee28fd..000000000
--- a/layout/reftests/async-scrolling/reftest-stylo.list
+++ /dev/null
@@ -1,59 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-skip-if(!asyncPan) == bg-fixed-1.html bg-fixed-1.html
-skip-if(!asyncPan) == bg-fixed-cover-1.html bg-fixed-cover-1.html
-skip-if(!asyncPan) == bg-fixed-cover-2.html bg-fixed-cover-2.html
-skip-if(!asyncPan) == bg-fixed-cover-3.html bg-fixed-cover-3.html
-skip-if(!asyncPan) == bg-fixed-child.html bg-fixed-child.html
-skip-if(!asyncPan) == bg-fixed-child-clip-1.html bg-fixed-child-clip-1.html
-skip-if(!asyncPan) == bg-fixed-child-clip-2.html bg-fixed-child-clip-2.html
-fuzzy(1,246) fuzzy-if(skiaContent,2,160) fuzzy-if(browserIsRemote&&d2d,53,185) skip-if(!asyncPan) == bg-fixed-child-mask.html bg-fixed-child-mask.html
-skip-if(!asyncPan) == bg-fixed-in-opacity.html bg-fixed-in-opacity.html
-skip-if(!asyncPan) == bg-fixed-child-no-culling.html bg-fixed-child-no-culling.html
-skip fuzzy-if(B2G,2,5366) fuzzy-if(Android,2,4000) fuzzy-if(browserIsRemote&&cocoaWidget,2,179524) fuzzy-if(browserIsRemote&&winWidget,1,74590) skip-if(!asyncPan) == bg-fixed-transformed-image.html bg-fixed-transformed-image.html
-skip-if(!asyncPan) == element-1.html element-1.html
-pref(layers.force-active,true) skip-if(!asyncPan) == iframe-1.html iframe-1.html
-skip-if(!asyncPan) == nested-1.html nested-1.html
-skip-if(!asyncPan) == nested-2.html nested-2.html
-skip-if(!asyncPan) == position-fixed-1.html position-fixed-1.html
-skip-if(!asyncPan) == position-fixed-2.html position-fixed-2.html
-skip-if(!asyncPan) == position-fixed-body.html position-fixed-body.html
-skip-if(!asyncPan) == position-fixed-cover-1.html position-fixed-cover-1.html
-skip-if(!asyncPan) == position-fixed-cover-2.html position-fixed-cover-2.html
-skip-if(!asyncPan) == position-fixed-cover-3.html position-fixed-cover-3.html
-fuzzy-if(Android,5,4) skip-if(!asyncPan) == position-fixed-transformed-1.html position-fixed-transformed-1.html
-skip-if(!asyncPan) == split-layers-1.html split-layers-1.html
-skip-if(!asyncPan) == split-layers-multi-scrolling-1.html split-layers-multi-scrolling-1.html
-fuzzy-if(skiaContent,2,240000) fuzzy-if(browserIsRemote&&!skiaContent&&(cocoaWidget||winWidget),1,240000) skip-if(!asyncPan) == split-opacity-layers-1.html split-opacity-layers-1.html
-skip-if(!asyncPan) == sticky-pos-scrollable-1.html sticky-pos-scrollable-1.html
-skip-if(!asyncPan) == fixed-pos-scrollable-1.html fixed-pos-scrollable-1.html
-skip-if(!asyncPan) == culling-1.html culling-1.html
-skip-if(!asyncPan) == position-fixed-iframe-1.html position-fixed-iframe-1.html
-skip-if(!asyncPan) == position-fixed-iframe-2.html position-fixed-iframe-2.html
-fuzzy-if(skiaContent||(browserIsRemote&&cocoaWidget),1,10000) skip-if(!asyncPan) == position-fixed-in-scroll-container.html position-fixed-in-scroll-container.html
-skip-if(!asyncPan) == position-fixed-inside-sticky-1.html position-fixed-inside-sticky-1.html
-skip-if(!asyncPan) == group-opacity-surface-size-1.html group-opacity-surface-size-1.html
-skip-if(!asyncPan) == position-sticky-transformed.html position-sticky-transformed.html
-skip-if(!asyncPan) == offscreen-prerendered-active-opacity.html offscreen-prerendered-active-opacity.html
-fuzzy-if(Android,6,4) skip-if(!asyncPan) == offscreen-clipped-blendmode-1.html offscreen-clipped-blendmode-1.html
-fuzzy-if(Android,6,4) skip-if(!asyncPan) == offscreen-clipped-blendmode-2.html offscreen-clipped-blendmode-2.html
-fuzzy-if(Android,6,4) skip == offscreen-clipped-blendmode-3.html offscreen-clipped-blendmode-3.html
-# bug 1251588 - wrong AGR on mix-blend-mode item
-fuzzy-if(Android,6,4) skip-if(!asyncPan) == offscreen-clipped-blendmode-4.html offscreen-clipped-blendmode-4.html
-fuzzy-if(Android,7,4) skip-if(!asyncPan) == perspective-scrolling-1.html perspective-scrolling-1.html
-fuzzy-if(Android,7,4) skip-if(!asyncPan) == perspective-scrolling-2.html perspective-scrolling-2.html
-fuzzy-if(Android,7,4) skip-if(!asyncPan) == perspective-scrolling-3.html perspective-scrolling-3.html
-fuzzy-if(Android,7,4) skip-if(!asyncPan) == perspective-scrolling-4.html perspective-scrolling-4.html
-pref(apz.disable_for_scroll_linked_effects,true) skip-if(!asyncPan) == disable-apz-for-sle-pages.html disable-apz-for-sle-pages.html
-fuzzy-if(browserIsRemote&&d2d,1,19) skip-if(!asyncPan) == background-blend-mode-1.html background-blend-mode-1.html
-skip-if(Android||!asyncPan) == opaque-fractional-displayport-1.html opaque-fractional-displayport-1.html
-skip-if(Android||!asyncPan) == opaque-fractional-displayport-2.html opaque-fractional-displayport-2.html
-
-# for the following tests, we want to disable the low-precision buffer
-# as it will expand the displayport beyond what the test specifies in
-# its reftest-displayport attributes, and interfere with where we expect
-# checkerboarding to occur
-default-preferences pref(layers.low-precision-buffer,false)
-skip-if(!asyncPan) == checkerboard-1.html checkerboard-1.html
-skip-if(!asyncPan) == checkerboard-2.html checkerboard-2.html
-skip-if(!asyncPan) == checkerboard-3.html checkerboard-3.html
-default-preferences
diff --git a/layout/reftests/async-scrolling/reftest.list b/layout/reftests/async-scrolling/reftest.list
index d2d5e5f03..4202301a6 100644
--- a/layout/reftests/async-scrolling/reftest.list
+++ b/layout/reftests/async-scrolling/reftest.list
@@ -9,7 +9,7 @@ fuzzy(1,246) fuzzy-if(skiaContent,2,160) fuzzy-if(browserIsRemote&&d2d,53,185) s
skip-if(!asyncPan) == bg-fixed-in-opacity.html bg-fixed-in-opacity-ref.html
skip-if(!asyncPan) == bg-fixed-child-no-culling-1.html bg-fixed-child-no-culling-1-ref.html
skip-if(!asyncPan) == bg-fixed-child-no-culling-2.html bg-fixed-child-no-culling-2-ref.html
-fuzzy-if(Android,2,4000) fuzzy-if(browserIsRemote&&cocoaWidget,2,179524) fuzzy-if(browserIsRemote&&winWidget,1,74590) fuzzy-if(gtkWidget&&layersGPUAccelerated,1,3528) skip-if(!asyncPan) == bg-fixed-transformed-image.html bg-fixed-transformed-image-ref.html
+fuzzy-if(browserIsRemote&&cocoaWidget,2,179524) fuzzy-if(browserIsRemote&&winWidget,1,74590) fuzzy-if(gtkWidget&&layersGPUAccelerated,1,3528) skip-if(!asyncPan) == bg-fixed-transformed-image.html bg-fixed-transformed-image-ref.html
skip-if(!asyncPan) == element-1.html element-1-ref.html
pref(layers.force-active,true) skip-if(!asyncPan) == iframe-1.html iframe-1-ref.html
skip-if(!asyncPan) == nested-1.html nested-1-ref.html
@@ -20,7 +20,7 @@ skip-if(!asyncPan) == position-fixed-body.html position-fixed-body-ref.html
skip-if(!asyncPan) == position-fixed-cover-1.html position-fixed-cover-1-ref.html
skip-if(!asyncPan) == position-fixed-cover-2.html position-fixed-cover-2-ref.html
skip-if(!asyncPan) == position-fixed-cover-3.html position-fixed-cover-3-ref.html
-fuzzy-if(Android,5,4) skip-if(!asyncPan) == position-fixed-transformed-1.html position-fixed-transformed-1-ref.html
+skip-if(!asyncPan) == position-fixed-transformed-1.html position-fixed-transformed-1-ref.html
skip-if(!asyncPan) == split-layers-1.html split-layers-1-ref.html
skip-if(!asyncPan) == split-layers-multi-scrolling-1.html split-layers-multi-scrolling-1-ref.html
fuzzy-if(skiaContent,2,240000) fuzzy-if(browserIsRemote&&!skiaContent&&(cocoaWidget||winWidget),1,240000) skip-if(!asyncPan) == split-opacity-layers-1.html split-opacity-layers-1-ref.html
@@ -37,18 +37,18 @@ skip-if(!asyncPan) == position-fixed-inside-sticky-2.html position-fixed-inside-
fuzzy(1,60000) skip-if(!asyncPan) == group-opacity-surface-size-1.html group-opacity-surface-size-1-ref.html
skip-if(!asyncPan) == position-sticky-transformed.html position-sticky-transformed-ref.html
skip-if(!asyncPan) == offscreen-prerendered-active-opacity.html offscreen-prerendered-active-opacity-ref.html
-fuzzy-if(Android,6,4) fuzzy-if(skiaContent&&!Android,1,34) skip-if(!asyncPan) == offscreen-clipped-blendmode-1.html offscreen-clipped-blendmode-ref.html
-fuzzy-if(Android,6,4) skip-if(!asyncPan) == offscreen-clipped-blendmode-2.html offscreen-clipped-blendmode-ref.html
-fuzzy-if(Android,6,4) skip == offscreen-clipped-blendmode-3.html offscreen-clipped-blendmode-ref.html # bug 1251588 - wrong AGR on mix-blend-mode item
-fuzzy-if(Android,6,4) skip-if(!asyncPan) == offscreen-clipped-blendmode-4.html offscreen-clipped-blendmode-ref.html
-fuzzy-if(Android,7,4) skip-if(!asyncPan) == perspective-scrolling-1.html perspective-scrolling-1-ref.html
-fuzzy-if(Android,7,4) skip-if(!asyncPan) == perspective-scrolling-2.html perspective-scrolling-2-ref.html
-fuzzy-if(Android,7,4) skip-if(!asyncPan) == perspective-scrolling-3.html perspective-scrolling-3-ref.html
-fuzzy-if(Android,7,4) skip-if(!asyncPan) == perspective-scrolling-4.html perspective-scrolling-4-ref.html
+fuzzy-if(skiaContent,1,34) skip-if(!asyncPan) == offscreen-clipped-blendmode-1.html offscreen-clipped-blendmode-ref.html
+skip-if(!asyncPan) == offscreen-clipped-blendmode-2.html offscreen-clipped-blendmode-ref.html
+skip == offscreen-clipped-blendmode-3.html offscreen-clipped-blendmode-ref.html # bug 1251588 - wrong AGR on mix-blend-mode item
+skip-if(!asyncPan) == offscreen-clipped-blendmode-4.html offscreen-clipped-blendmode-ref.html
+skip-if(!asyncPan) == perspective-scrolling-1.html perspective-scrolling-1-ref.html
+skip-if(!asyncPan) == perspective-scrolling-2.html perspective-scrolling-2-ref.html
+skip-if(!asyncPan) == perspective-scrolling-3.html perspective-scrolling-3-ref.html
+skip-if(!asyncPan) == perspective-scrolling-4.html perspective-scrolling-4-ref.html
pref(apz.disable_for_scroll_linked_effects,true) skip-if(!asyncPan) == disable-apz-for-sle-pages.html disable-apz-for-sle-pages-ref.html
fuzzy-if(browserIsRemote&&d2d,1,19) skip-if(!asyncPan) == background-blend-mode-1.html background-blend-mode-1-ref.html
-skip-if(Android||!asyncPan) != opaque-fractional-displayport-1.html about:blank
-skip-if(Android||!asyncPan) != opaque-fractional-displayport-2.html about:blank
+skip-if(!asyncPan) != opaque-fractional-displayport-1.html about:blank
+skip-if(!asyncPan) != opaque-fractional-displayport-2.html about:blank
# for the following tests, we want to disable the low-precision buffer
# as it will expand the displayport beyond what the test specifies in
diff --git a/layout/reftests/backgrounds/background-referrer.sjs b/layout/reftests/backgrounds/background-referrer.sjs
index 7ead6e20e..1d5b90b2e 100644
--- a/layout/reftests/backgrounds/background-referrer.sjs
+++ b/layout/reftests/backgrounds/background-referrer.sjs
@@ -52,10 +52,7 @@ function handleRequest(request, response)
// Test url looks like:
// http://localhost:port/timestamp/number/background-referrer.html
- // Except in Android, where it looks like:
- // http://A.B.C.D:port/timestamp/number/background-referrer.html
- // where A.B.C.D is the IP address of the box the reftest HTTP server is
- // running on. And maybe that will change. So just test for ending in
+ // Maybe that will change. So just test for ending in
// "/background-referrer.html".
if (/\/background-referrer.html$/.test(referrer))
{
diff --git a/layout/reftests/backgrounds/gradient/reftest-stylo.list b/layout/reftests/backgrounds/gradient/reftest-stylo.list
deleted file mode 100644
index bd0a664dd..000000000
--- a/layout/reftests/backgrounds/gradient/reftest-stylo.list
+++ /dev/null
@@ -1,4 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== scaled-color-stop-position.html scaled-color-stop-position.html
-== color-stop-clamp-interpolation.html color-stop-clamp-interpolation.html
-== linear-gradient-repeated.html linear-gradient-repeated.html
diff --git a/layout/reftests/backgrounds/reftest-stylo.list b/layout/reftests/backgrounds/reftest-stylo.list
deleted file mode 100644
index a0a370fac..000000000
--- a/layout/reftests/backgrounds/reftest-stylo.list
+++ /dev/null
@@ -1,215 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-include gradient/reftest-stylo.list
-include vector/reftest-stylo.list
-
-skip-if(B2G||Mulet) == layers-stacking-order.xhtml layers-stacking-order.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == layers-layer-count-cascade-1.xhtml layers-layer-count-cascade-1.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-== layers-layer-count-inheritance-1.xhtml layers-layer-count-inheritance-1.xhtml
-== layers-layer-count-cascade-2.xhtml layers-layer-count-cascade-2.xhtml
-== layers-layer-count-inheritance-2.xhtml layers-layer-count-inheritance-2.xhtml
-fuzzy-if(Android,9,600000) fuzzy-if(skiaContent,1,5000) == viewport-translucent-color-1.html viewport-translucent-color-1.html
-fuzzy-if(skiaContent,1,5000) == viewport-translucent-color-2.html viewport-translucent-color-2.html
-fuzzy-if(skiaContent,1,5000) == viewport-translucent-color-3.html viewport-translucent-color-3.html
-== viewport-translucent-color-ref.html viewport-translucent-color-ref.html
-fuzzy-if(skiaContent,1,10000) == iframe-translucent-color-1.html iframe-translucent-color-1.html
-fuzzy-if(skiaContent,1,1024) == translucent-color-1.html translucent-color-1.html
-fuzzy-if(skiaContent,1,1024) == translucent-color-2.html translucent-color-2.html
-fuzzy-if(skiaContent,1,1024) == translucent-color-3.html translucent-color-3.html
-== translucent-color-ref.html translucent-color-ref.html
-skip-if(B2G||Mulet) == root-element-display-none-1.html root-element-display-none-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== continuous-inline-1a.html continuous-inline-1a.html
-== continuous-inline-1b.html continuous-inline-1b.html
-== continuous-inline-1c.html continuous-inline-1c.html
-== continuous-inline-1d.html continuous-inline-1d.html
-== continuous-inline-2a.html continuous-inline-2a.html
-== continuous-inline-2b.html continuous-inline-2b.html
-== continuous-inline-3.html continuous-inline-3.html
-skip-if(B2G||Mulet) == continuous-inline-4a.html continuous-inline-4a.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == continuous-inline-4b.html continuous-inline-4b.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== continuous-inline-5a.html continuous-inline-5a.html
-== continuous-inline-5b.html continuous-inline-5b.html
-== background-redraw-237766.html background-redraw-237766.html
-
-== background-clip-1.html background-clip-1.html
-== background-clip-2.html background-clip-2.html
-
-skip-if(B2G||Mulet) == background-position-1a.html background-position-1a.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== background-position-1b.html background-position-1b.html
-== background-position-1c.html background-position-1c.html
-skip-if(B2G||Mulet) == background-position-1d.html background-position-1d.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== background-position-1e.html background-position-1e.html
-== background-position-1f.html background-position-1f.html
-== background-position-2a.html background-position-2a.html
-== background-position-2b.html background-position-2b.html
-== background-position-2c.html background-position-2c.html
-== background-position-2d.html background-position-2d.html
-== background-position-3a.html background-position-3a.html
-== background-position-3b.html background-position-3b.html
-== background-position-3c.html background-position-3c.html
-== background-position-3d.html background-position-3d.html
-== background-position-4a.html background-position-4a.html
-== background-position-4b.html background-position-4b.html
-== background-position-4c.html background-position-4c.html
-== background-position-4d.html background-position-4d.html
-== background-position-4e.html background-position-4e.html
-== background-position-5.html background-position-5.html
-== background-position-6a.html background-position-6a.html
-== background-position-6b.html background-position-6b.html
-== background-position-7.html background-position-7.html
-== background-position-8.html background-position-8.html
-
-== background-size-auto-auto.html background-size-auto-auto.html
-== background-size-auto.html background-size-auto.html
-== background-size-contain.html background-size-contain.html
-== background-size-cover.html background-size-cover.html
-== background-size-auto-length.html background-size-auto-length.html
-== background-size-length-auto.html background-size-length-auto.html
-== background-size-length.html background-size-length.html
-== background-size-auto-percent.html background-size-auto-percent.html
-== background-size-percent-auto.html background-size-percent-auto.html
-== background-size-percent.html background-size-percent.html
-== background-size-length-percent.html background-size-length-percent.html
-== background-size-percent-length.html background-size-percent-length.html
-== background-size-percent-percent.html background-size-percent-percent.html
-== background-size-length-length.html background-size-length-length.html
-skip-if(B2G||Mulet) == background-size-percent-percent-stretch.html background-size-percent-percent-stretch.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-== background-size-body-percent-percent.html background-size-body-percent-percent.html
-== background-size-body-percent-percent-no-repeat.html background-size-body-percent-percent-no-repeat.html
-== background-size-body-percent-percent-not-fixed.html background-size-body-percent-percent-not-fixed.html
-== background-size-body-cover.html background-size-body-cover.html
-== background-size-body-cover-no-repeat.html background-size-body-cover-no-repeat.html
-== background-size-body-cover-not-fixed.html background-size-body-cover-not-fixed.html
-== background-size-body-cover-not-fixed.html background-size-body-cover-not-fixed.html
-
-# relies on reftest window having greater height than width
-== background-size-body-contain.html background-size-body-contain.html
-== background-size-body-contain-no-repeat.html background-size-body-contain-no-repeat.html
-== background-size-body-contain-not-fixed.html background-size-body-contain-not-fixed.html
-== background-size-body-cover-not-fixed.html background-size-body-cover-not-fixed.html
-
-== background-size-body-percent-percent-overflow.html background-size-body-percent-percent-overflow.html
-
-== background-size-zoom-no-repeat.html background-size-zoom-no-repeat.html
-
-== background-size-contain-clip-padding.html background-size-contain-clip-padding.html
-== background-size-contain-clip-border.html background-size-contain-clip-border.html
-== background-size-contain-position-fifty-fifty.html background-size-contain-position-fifty-fifty.html
-== background-size-contain-clip-padding-origin-border.html background-size-contain-clip-padding-origin-border.html
-== background-size-contain-clip-padding-origin-border-padding.html background-size-contain-clip-padding-origin-border-padding.html
-
-skip-if(B2G||Mulet) == background-layers-1a.html background-layers-1a.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-fuzzy-if(OSX,1,324) == background-layers-1b.html background-layers-1b.html
-
-# box-decoration-break's effect on backgrounds is touchy and hard to test due to stretching
-# artifacts and the difficulty of covering exact lines, so just make sure
-# background-size results in a different rendering when present.
-pref(layout.css.box-decoration-break.enabled,true) == background-size-cover-slice.html background-size-cover-slice.html
-pref(layout.css.box-decoration-break.enabled,true) == background-size-cover-clone.html background-size-cover-clone.html
-
-# ...and make sure each rendering with background-size is different from the
-# other
-pref(layout.css.box-decoration-break.enabled,true) == background-size-cover-slice.html background-size-cover-slice.html
-
-random-if(OSX==1010) == background-size-monster-ch.html background-size-monster-ch.html
-# bug 1129300
-random-if(OSX==1010) == background-size-monster-cm.html background-size-monster-cm.html
-# bug 1129300
-random-if(OSX==1010) == background-size-monster-em.html background-size-monster-em.html
-# bug 1129300
-random-if(OSX==1010) == background-size-monster-ex.html background-size-monster-ex.html
-# bug 1129300
-random-if(OSX==1010) == background-size-monster-inches.html background-size-monster-inches.html
-# bug 1129300
-random-if(OSX==1010) == background-size-monster-mm.html background-size-monster-mm.html
-# bug 1129300
-random-if(OSX==1010) == background-size-monster-pc.html background-size-monster-pc.html
-# bug 1129300
-random-if(OSX==1010) == background-size-monster-pt.html background-size-monster-pt.html
-# bug 1129300
-random-if(OSX==1010) == background-size-monster-px.html background-size-monster-px.html
-# bug 1129300
-random-if(OSX==1010) == background-size-monster-rem.html background-size-monster-rem.html
-# bug 1129300
-
-# There seems to be a pixel-snapping problem here, where the repeated background
-# image isn't being snapped at its boundaries. Note that the boundaries within
-# the image aren't the issue, because they're being obscured to avoid sampling
-# algorithm dependencies (at least assuming the sampling algorithm in use
-# doesn't sample too far astray from the boundaries).
-== background-size-zoom-repeat.html background-size-zoom-repeat.html
-
-# -moz-default-background-color and -moz-default-color (bug 591341)
-== background-moz-default-background-color.html background-moz-default-background-color.html
-
-random-if(B2G||Mulet) == fixed-bg-with-transform-outside-viewport-1.html fixed-bg-with-transform-outside-viewport-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fuzzy(2,83) == fixed-bg-border-radius.html fixed-bg-border-radius.html
-random == fixed-bg-inside-transform.html fixed-bg-inside-transform.html
-
-HTTP == root-background-1.html root-background-1.html
-HTTP == root-background-1.html root-background-1.html
-
-random-if(B2G||Mulet) == really-big-background.html really-big-background.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== body-background.html body-background.html
-== table-background.html table-background.html
-== table-background-print.html table-background-print.html
-== div-background.html div-background.html
-
-== background-repeat-1-ref.html background-repeat-1-ref.html
-
-== multi-background-clip-content-border.html multi-background-clip-content-border.html
-
-HTTP == background-referrer.html background-referrer.html
-
-== attachment-scroll-positioning-1.html attachment-scroll-positioning-1.html
-== attachment-local-positioning-1.html attachment-local-positioning-1.html
-== attachment-local-positioning-2.html attachment-local-positioning-2.html
-== attachment-local-positioning-3.html attachment-local-positioning-3.html
-== attachment-local-positioning-4.html attachment-local-positioning-4.html
-== attachment-local-positioning-5.html attachment-local-positioning-5.html
-
-== attachment-local-clipping-color-1.html attachment-local-clipping-color-1.html
-== attachment-local-clipping-color-2.html attachment-local-clipping-color-2.html
-# Same ref as the previous test.
-== attachment-local-clipping-color-3.html attachment-local-clipping-color-3.html
-fails fuzzy-if(skiaContent,1,300) == attachment-local-clipping-color-4.html attachment-local-clipping-color-4.html
-fails fuzzy-if(skiaContent,1,400) == attachment-local-clipping-color-5.html attachment-local-clipping-color-5.html
-== attachment-local-clipping-color-6.html attachment-local-clipping-color-6.html
-
-== attachment-local-clipping-image-1.html attachment-local-clipping-image-1.html
-== attachment-local-clipping-image-2.html attachment-local-clipping-image-2.html
-# Same ref as the previous test.
-== attachment-local-clipping-image-3.html attachment-local-clipping-image-3.html
-# The next three tests are fuzzy due to bug 1128229.
-fails fuzzy-if(skiaContent,64,1300) == attachment-local-clipping-image-4.html attachment-local-clipping-image-4.html
-fails fuzzy-if(skiaContent,64,1300) == attachment-local-clipping-image-5.html attachment-local-clipping-image-5.html
-== attachment-local-clipping-image-6.html attachment-local-clipping-image-6.html
-
-fuzzy-if(skiaContent,1,8) == background-multiple-with-border-radius.html background-multiple-with-border-radius.html
-== background-repeat-large-area.html background-repeat-large-area.html
-
-fuzzy-if(skiaContent,31,474) == background-tiling-zoom-1.html background-tiling-zoom-1.html
-
-skip-if(!cocoaWidget) == background-repeat-resampling.html background-repeat-resampling.html
-
-skip pref(layout.css.background-clip-text.enabled,true) fuzzy-if(winWidget,102,2032) fuzzy-if(skiaContent,102,2595) == background-clip-text-1a.html background-clip-text-1a.html
-fails pref(layout.css.background-clip-text.enabled,true) fuzzy-if(winWidget,102,2032) fuzzy-if(skiaContent,102,2595) == background-clip-text-1b.html background-clip-text-1b.html
-fails pref(layout.css.background-clip-text.enabled,true) fuzzy-if(winWidget,102,2032) fuzzy-if(skiaContent,102,2595) == background-clip-text-1c.html background-clip-text-1c.html
-fails pref(layout.css.background-clip-text.enabled,true) fuzzy-if(winWidget,102,2032) fuzzy-if(skiaContent,102,2595) == background-clip-text-1d.html background-clip-text-1d.html
-fails pref(layout.css.background-clip-text.enabled,true) fuzzy-if(winWidget,102,2032) fuzzy-if(skiaContent,102,2595) == background-clip-text-1e.html background-clip-text-1e.html
-skip pref(layout.css.background-clip-text.enabled,false) == background-clip-text-1a.html background-clip-text-1a.html
-
-pref(layout.css.background-clip-text.enabled,true) == background-clip-text-2.html background-clip-text-2.html
diff --git a/layout/reftests/backgrounds/reftest.list b/layout/reftests/backgrounds/reftest.list
index ff9826eae..0e989b5bf 100644
--- a/layout/reftests/backgrounds/reftest.list
+++ b/layout/reftests/backgrounds/reftest.list
@@ -6,7 +6,7 @@ include vector/reftest.list
== layers-layer-count-inheritance-1.xhtml layers-layer-count-1-ref.xhtml
== layers-layer-count-cascade-2.xhtml layers-layer-count-2-ref.xhtml
== layers-layer-count-inheritance-2.xhtml layers-layer-count-2-ref.xhtml
-fuzzy-if(Android,9,600000) fuzzy-if(skiaContent,1,5000) == viewport-translucent-color-1.html viewport-translucent-color-ref.html
+fuzzy-if(skiaContent,1,5000) == viewport-translucent-color-1.html viewport-translucent-color-ref.html
fuzzy-if(skiaContent,1,5000) == viewport-translucent-color-2.html viewport-translucent-color-ref.html
fuzzy-if(skiaContent,1,5000) == viewport-translucent-color-3.html viewport-translucent-color-ref.html
!= viewport-translucent-color-ref.html about:blank
diff --git a/layout/reftests/backgrounds/vector/empty/reftest-stylo.list b/layout/reftests/backgrounds/vector/empty/reftest-stylo.list
deleted file mode 100644
index a690d7e1e..000000000
--- a/layout/reftests/backgrounds/vector/empty/reftest-stylo.list
+++ /dev/null
@@ -1,27 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== tall--contain--height.html tall--contain--height.html
-== tall--contain--width.html tall--contain--width.html
-== wide--contain--height.html wide--contain--height.html
-== wide--contain--width.html wide--contain--width.html
-
-# These tests fail because of integer overflow; see bug 894555.
-== tall--cover--height.html tall--cover--height.html
-== tall--cover--width.html tall--cover--width.html
-== wide--cover--height.html wide--cover--height.html
-== wide--cover--width.html wide--cover--width.html
-
-== zero-height-ratio-contain.html zero-height-ratio-contain.html
-== zero-height-ratio-cover.html zero-height-ratio-cover.html
-== zero-height-ratio-auto-auto.html zero-height-ratio-auto-auto.html
-== zero-height-ratio-auto-5px.html zero-height-ratio-auto-5px.html
-== zero-height-ratio-5px-auto.html zero-height-ratio-5px-auto.html
-== zero-width-ratio-contain.html zero-width-ratio-contain.html
-== zero-width-ratio-cover.html zero-width-ratio-cover.html
-== zero-width-ratio-auto-auto.html zero-width-ratio-auto-auto.html
-== zero-width-ratio-auto-5px.html zero-width-ratio-auto-5px.html
-== zero-width-ratio-5px-auto.html zero-width-ratio-5px-auto.html
-== zero-ratio-no-dimensions-contain.html zero-ratio-no-dimensions-contain.html
-== zero-ratio-no-dimensions-cover.html zero-ratio-no-dimensions-cover.html
-== zero-ratio-no-dimensions-auto-5px.html zero-ratio-no-dimensions-auto-5px.html
-== zero-ratio-no-dimensions-5px-auto.html zero-ratio-no-dimensions-5px-auto.html
-== zero-ratio-no-dimensions-auto-auto.html zero-ratio-no-dimensions-auto-auto.html
diff --git a/layout/reftests/backgrounds/vector/reftest-stylo.list b/layout/reftests/backgrounds/vector/reftest-stylo.list
deleted file mode 100644
index 977ef718b..000000000
--- a/layout/reftests/backgrounds/vector/reftest-stylo.list
+++ /dev/null
@@ -1,256 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-include empty/reftest-stylo.list
-
-################################################################################
-# For reference (although the wide--32px-auto* tests/names were changed to
-# avoid viewBox-directed scaling to make the scaled height less than the wide-
-# tests height):
-#
-# for ORIENTATION in tall wide; do for SIZE in 32px-auto auto-32px auto contain cover; do for VIMAGE in *.svg; do cat template.html | sed -e "s/SIZE/$(echo $SIZE | sed -e 's/-/ /')/g" | sed -e "s/VIMAGE/$VIMAGE/g" | sed -e "s/TALLWIDE/$ORIENTATION/g" | sed -e "s/ORIENTATION/$(if [ "$ORIENTATION" = "tall" ]; then echo 'width: 256px; height: 768px'; else echo 'width: 768px; height: 256px'; fi)/g" > $ORIENTATION--$SIZE--$(echo $VIMAGE | sed -e 's/.svg//').html; echo "== $ORIENTATION--$SIZE--$(echo $VIMAGE | sed -e 's/.svg//').html ###" >> reftest-stylo.list; done; echo >> reftest-stylo.list; done; done;
-#
-################################################################################
-
-== tall--32px-auto--nonpercent-width-nonpercent-height.html tall--32px-auto--nonpercent-width-nonpercent-height.html
-== tall--32px-auto--nonpercent-width-nonpercent-height-viewbox.html tall--32px-auto--nonpercent-width-nonpercent-height-viewbox.html
-== tall--32px-auto--nonpercent-width-omitted-height.html tall--32px-auto--nonpercent-width-omitted-height.html
-skip-if(B2G||Mulet) == tall--32px-auto--nonpercent-width-omitted-height-viewbox.html tall--32px-auto--nonpercent-width-omitted-height-viewbox.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == tall--32px-auto--nonpercent-width-percent-height.html tall--32px-auto--nonpercent-width-percent-height.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== tall--32px-auto--nonpercent-width-percent-height-viewbox.html tall--32px-auto--nonpercent-width-percent-height-viewbox.html
-skip-if(B2G||Mulet) == tall--32px-auto--omitted-width-nonpercent-height.html tall--32px-auto--omitted-width-nonpercent-height.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== tall--32px-auto--omitted-width-nonpercent-height-viewbox.html tall--32px-auto--omitted-width-nonpercent-height-viewbox.html
-== tall--32px-auto--omitted-width-omitted-height.html tall--32px-auto--omitted-width-omitted-height.html
-== tall--32px-auto--omitted-width-omitted-height-viewbox.html tall--32px-auto--omitted-width-omitted-height-viewbox.html
-skip-if(B2G||Mulet) == tall--32px-auto--omitted-width-percent-height.html tall--32px-auto--omitted-width-percent-height.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == tall--32px-auto--omitted-width-percent-height-viewbox.html tall--32px-auto--omitted-width-percent-height-viewbox.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== tall--32px-auto--percent-width-nonpercent-height.html tall--32px-auto--percent-width-nonpercent-height.html
-== tall--32px-auto--percent-width-nonpercent-height-viewbox.html tall--32px-auto--percent-width-nonpercent-height-viewbox.html
-== tall--32px-auto--percent-width-omitted-height.html tall--32px-auto--percent-width-omitted-height.html
-skip-if(B2G||Mulet) == tall--32px-auto--percent-width-omitted-height-viewbox.html tall--32px-auto--percent-width-omitted-height-viewbox.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== tall--32px-auto--percent-width-percent-height.html tall--32px-auto--percent-width-percent-height.html
-skip-if(B2G||Mulet) == tall--32px-auto--percent-width-percent-height-viewbox.html tall--32px-auto--percent-width-percent-height-viewbox.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-== tall--auto-32px--nonpercent-width-nonpercent-height.html tall--auto-32px--nonpercent-width-nonpercent-height.html
-== tall--auto-32px--nonpercent-width-nonpercent-height-viewbox.html tall--auto-32px--nonpercent-width-nonpercent-height-viewbox.html
-skip-if(B2G||Mulet) == tall--auto-32px--nonpercent-width-omitted-height.html tall--auto-32px--nonpercent-width-omitted-height.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== tall--auto-32px--nonpercent-width-omitted-height-viewbox.html tall--auto-32px--nonpercent-width-omitted-height-viewbox.html
-skip-if(B2G||Mulet) == tall--auto-32px--nonpercent-width-percent-height.html tall--auto-32px--nonpercent-width-percent-height.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== tall--auto-32px--nonpercent-width-percent-height-viewbox.html tall--auto-32px--nonpercent-width-percent-height-viewbox.html
-== tall--auto-32px--omitted-width-nonpercent-height.html tall--auto-32px--omitted-width-nonpercent-height.html
-== tall--auto-32px--omitted-width-nonpercent-height-viewbox.html tall--auto-32px--omitted-width-nonpercent-height-viewbox.html
-== tall--auto-32px--omitted-width-omitted-height.html tall--auto-32px--omitted-width-omitted-height.html
-== tall--auto-32px--omitted-width-omitted-height-viewbox.html tall--auto-32px--omitted-width-omitted-height-viewbox.html
-== tall--auto-32px--omitted-width-percent-height.html tall--auto-32px--omitted-width-percent-height.html
-== tall--auto-32px--omitted-width-percent-height-viewbox.html tall--auto-32px--omitted-width-percent-height-viewbox.html
-== tall--auto-32px--percent-width-nonpercent-height.html tall--auto-32px--percent-width-nonpercent-height.html
-== tall--auto-32px--percent-width-nonpercent-height-viewbox.html tall--auto-32px--percent-width-nonpercent-height-viewbox.html
-== tall--auto-32px--percent-width-omitted-height.html tall--auto-32px--percent-width-omitted-height.html
-== tall--auto-32px--percent-width-omitted-height-viewbox.html tall--auto-32px--percent-width-omitted-height-viewbox.html
-== tall--auto-32px--percent-width-percent-height.html tall--auto-32px--percent-width-percent-height.html
-== tall--auto-32px--percent-width-percent-height-viewbox.html tall--auto-32px--percent-width-percent-height-viewbox.html
-
-skip-if(B2G||Mulet) == tall--auto--nonpercent-width-nonpercent-height.html tall--auto--nonpercent-width-nonpercent-height.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== tall--auto--nonpercent-width-nonpercent-height-viewbox.html tall--auto--nonpercent-width-nonpercent-height-viewbox.html
-== tall--auto--nonpercent-width-omitted-height.html tall--auto--nonpercent-width-omitted-height.html
-== tall--auto--nonpercent-width-omitted-height-viewbox.html tall--auto--nonpercent-width-omitted-height-viewbox.html
-== tall--auto--nonpercent-width-percent-height.html tall--auto--nonpercent-width-percent-height.html
-== tall--auto--nonpercent-width-percent-height-viewbox.html tall--auto--nonpercent-width-percent-height-viewbox.html
-== tall--auto--omitted-width-nonpercent-height.html tall--auto--omitted-width-nonpercent-height.html
-== tall--auto--omitted-width-nonpercent-height-viewbox.html tall--auto--omitted-width-nonpercent-height-viewbox.html
-== tall--auto--omitted-width-omitted-height.html tall--auto--omitted-width-omitted-height.html
-skip-if(B2G||Mulet) == tall--auto--omitted-width-omitted-height-viewbox.html tall--auto--omitted-width-omitted-height-viewbox.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== tall--auto--omitted-width-percent-height.html tall--auto--omitted-width-percent-height.html
-== tall--auto--omitted-width-percent-height-viewbox.html tall--auto--omitted-width-percent-height-viewbox.html
-== tall--auto--percent-width-nonpercent-height.html tall--auto--percent-width-nonpercent-height.html
-== tall--auto--percent-width-nonpercent-height-viewbox.html tall--auto--percent-width-nonpercent-height-viewbox.html
-== tall--auto--percent-width-omitted-height.html tall--auto--percent-width-omitted-height.html
-== tall--auto--percent-width-omitted-height-viewbox.html tall--auto--percent-width-omitted-height-viewbox.html
-== tall--auto--percent-width-percent-height.html tall--auto--percent-width-percent-height.html
-== tall--auto--percent-width-percent-height-viewbox.html tall--auto--percent-width-percent-height-viewbox.html
-
-== tall--contain--nonpercent-width-nonpercent-height.html tall--contain--nonpercent-width-nonpercent-height.html
-== tall--contain--nonpercent-width-nonpercent-height-viewbox.html tall--contain--nonpercent-width-nonpercent-height-viewbox.html
-skip-if(B2G||Mulet) == tall--contain--nonpercent-width-omitted-height.html tall--contain--nonpercent-width-omitted-height.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == tall--contain--nonpercent-width-omitted-height-viewbox.html tall--contain--nonpercent-width-omitted-height-viewbox.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== tall--contain--nonpercent-width-percent-height.html tall--contain--nonpercent-width-percent-height.html
-== tall--contain--nonpercent-width-percent-height-viewbox.html tall--contain--nonpercent-width-percent-height-viewbox.html
-== tall--contain--omitted-width-nonpercent-height.html tall--contain--omitted-width-nonpercent-height.html
-== tall--contain--omitted-width-nonpercent-height-viewbox.html tall--contain--omitted-width-nonpercent-height-viewbox.html
-== tall--contain--omitted-width-omitted-height.html tall--contain--omitted-width-omitted-height.html
-== tall--contain--omitted-width-omitted-height-viewbox.html tall--contain--omitted-width-omitted-height-viewbox.html
-== tall--contain--omitted-width-percent-height.html tall--contain--omitted-width-percent-height.html
-== tall--contain--omitted-width-percent-height-viewbox.html tall--contain--omitted-width-percent-height-viewbox.html
-== tall--contain--percent-width-nonpercent-height.html tall--contain--percent-width-nonpercent-height.html
-== tall--contain--percent-width-nonpercent-height-viewbox.html tall--contain--percent-width-nonpercent-height-viewbox.html
-== tall--contain--percent-width-omitted-height.html tall--contain--percent-width-omitted-height.html
-== tall--contain--percent-width-omitted-height-viewbox.html tall--contain--percent-width-omitted-height-viewbox.html
-== tall--contain--percent-width-percent-height.html tall--contain--percent-width-percent-height.html
-== tall--contain--percent-width-percent-height-viewbox.html tall--contain--percent-width-percent-height-viewbox.html
-== tall--cover--nonpercent-width-nonpercent-height.html tall--cover--nonpercent-width-nonpercent-height.html
-== tall--cover--nonpercent-width-nonpercent-height-viewbox.html tall--cover--nonpercent-width-nonpercent-height-viewbox.html
-== tall--cover--nonpercent-width-nonpercent-height--crisp.html tall--cover--nonpercent-width-nonpercent-height--crisp.html
-== tall--cover--nonpercent-width-nonpercent-height-viewbox--crisp.html tall--cover--nonpercent-width-nonpercent-height-viewbox--crisp.html
-== tall--cover--nonpercent-width-omitted-height.html tall--cover--nonpercent-width-omitted-height.html
-== tall--cover--nonpercent-width-omitted-height-viewbox.html tall--cover--nonpercent-width-omitted-height-viewbox.html
-== tall--cover--nonpercent-width-percent-height.html tall--cover--nonpercent-width-percent-height.html
-== tall--cover--nonpercent-width-percent-height-viewbox.html tall--cover--nonpercent-width-percent-height-viewbox.html
-== tall--cover--omitted-width-nonpercent-height.html tall--cover--omitted-width-nonpercent-height.html
-== tall--cover--omitted-width-nonpercent-height-viewbox.html tall--cover--omitted-width-nonpercent-height-viewbox.html
-== tall--cover--omitted-width-omitted-height.html tall--cover--omitted-width-omitted-height.html
-== tall--cover--omitted-width-omitted-height-viewbox.html tall--cover--omitted-width-omitted-height-viewbox.html
-== tall--cover--omitted-width-percent-height.html tall--cover--omitted-width-percent-height.html
-== tall--cover--omitted-width-percent-height-viewbox.html tall--cover--omitted-width-percent-height-viewbox.html
-== tall--cover--percent-width-nonpercent-height.html tall--cover--percent-width-nonpercent-height.html
-== tall--cover--percent-width-nonpercent-height-viewbox.html tall--cover--percent-width-nonpercent-height-viewbox.html
-== tall--cover--percent-width-omitted-height.html tall--cover--percent-width-omitted-height.html
-== tall--cover--percent-width-omitted-height-viewbox.html tall--cover--percent-width-omitted-height-viewbox.html
-== tall--cover--percent-width-percent-height.html tall--cover--percent-width-percent-height.html
-== tall--cover--percent-width-percent-height-viewbox.html tall--cover--percent-width-percent-height-viewbox.html
-
-== wide--12px-auto--nonpercent-width-nonpercent-height.html wide--12px-auto--nonpercent-width-nonpercent-height.html
-== wide--12px-auto--nonpercent-width-nonpercent-height-viewbox.html wide--12px-auto--nonpercent-width-nonpercent-height-viewbox.html
-skip-if(B2G||Mulet) == wide--12px-auto--nonpercent-width-omitted-height.html wide--12px-auto--nonpercent-width-omitted-height.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == wide--12px-auto--nonpercent-width-omitted-height-viewbox.html wide--12px-auto--nonpercent-width-omitted-height-viewbox.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== wide--12px-auto--nonpercent-width-percent-height.html wide--12px-auto--nonpercent-width-percent-height.html
-== wide--12px-auto--nonpercent-width-percent-height-viewbox.html wide--12px-auto--nonpercent-width-percent-height-viewbox.html
-skip-if(B2G||Mulet) == wide--12px-auto--omitted-width-nonpercent-height.html wide--12px-auto--omitted-width-nonpercent-height.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == wide--12px-auto--omitted-width-nonpercent-height-viewbox.html wide--12px-auto--omitted-width-nonpercent-height-viewbox.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== wide--12px-auto--omitted-width-omitted-height.html wide--12px-auto--omitted-width-omitted-height.html
-== wide--12px-auto--omitted-width-omitted-height-viewbox.html wide--12px-auto--omitted-width-omitted-height-viewbox.html
-== wide--12px-auto--omitted-width-percent-height.html wide--12px-auto--omitted-width-percent-height.html
-== wide--12px-auto--omitted-width-percent-height-viewbox.html wide--12px-auto--omitted-width-percent-height-viewbox.html
-== wide--12px-auto--percent-width-nonpercent-height.html wide--12px-auto--percent-width-nonpercent-height.html
-== wide--12px-auto--percent-width-nonpercent-height-viewbox.html wide--12px-auto--percent-width-nonpercent-height-viewbox.html
-== wide--12px-auto--percent-width-omitted-height.html wide--12px-auto--percent-width-omitted-height.html
-skip-if(B2G||Mulet) == wide--12px-auto--percent-width-omitted-height-viewbox.html wide--12px-auto--percent-width-omitted-height-viewbox.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == wide--12px-auto--percent-width-percent-height.html wide--12px-auto--percent-width-percent-height.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== wide--12px-auto--percent-width-percent-height-viewbox.html wide--12px-auto--percent-width-percent-height-viewbox.html
-
-== wide--auto-32px--nonpercent-width-nonpercent-height.html wide--auto-32px--nonpercent-width-nonpercent-height.html
-== wide--auto-32px--nonpercent-width-nonpercent-height-viewbox.html wide--auto-32px--nonpercent-width-nonpercent-height-viewbox.html
-== wide--auto-32px--nonpercent-width-omitted-height.html wide--auto-32px--nonpercent-width-omitted-height.html
-== wide--auto-32px--nonpercent-width-omitted-height-viewbox.html wide--auto-32px--nonpercent-width-omitted-height-viewbox.html
-skip-if(B2G||Mulet) == wide--auto-32px--nonpercent-width-percent-height.html wide--auto-32px--nonpercent-width-percent-height.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== wide--auto-32px--nonpercent-width-percent-height-viewbox.html wide--auto-32px--nonpercent-width-percent-height-viewbox.html
-== wide--auto-32px--omitted-width-nonpercent-height.html wide--auto-32px--omitted-width-nonpercent-height.html
-== wide--auto-32px--omitted-width-nonpercent-height-viewbox.html wide--auto-32px--omitted-width-nonpercent-height-viewbox.html
-== wide--auto-32px--omitted-width-omitted-height.html wide--auto-32px--omitted-width-omitted-height.html
-== wide--auto-32px--omitted-width-omitted-height-viewbox.html wide--auto-32px--omitted-width-omitted-height-viewbox.html
-== wide--auto-32px--omitted-width-percent-height.html wide--auto-32px--omitted-width-percent-height.html
-== wide--auto-32px--omitted-width-percent-height-viewbox.html wide--auto-32px--omitted-width-percent-height-viewbox.html
-== wide--auto-32px--percent-width-nonpercent-height.html wide--auto-32px--percent-width-nonpercent-height.html
-== wide--auto-32px--percent-width-nonpercent-height-viewbox.html wide--auto-32px--percent-width-nonpercent-height-viewbox.html
-== wide--auto-32px--percent-width-omitted-height.html wide--auto-32px--percent-width-omitted-height.html
-== wide--auto-32px--percent-width-omitted-height-viewbox.html wide--auto-32px--percent-width-omitted-height-viewbox.html
-== wide--auto-32px--percent-width-percent-height.html wide--auto-32px--percent-width-percent-height.html
-== wide--auto-32px--percent-width-percent-height-viewbox.html wide--auto-32px--percent-width-percent-height-viewbox.html
-
-skip-if(B2G||Mulet) == wide--auto--nonpercent-width-nonpercent-height.html wide--auto--nonpercent-width-nonpercent-height.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == wide--auto--nonpercent-width-nonpercent-height-viewbox.html wide--auto--nonpercent-width-nonpercent-height-viewbox.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== wide--auto--nonpercent-width-omitted-height.html wide--auto--nonpercent-width-omitted-height.html
-== wide--auto--nonpercent-width-omitted-height-viewbox.html wide--auto--nonpercent-width-omitted-height-viewbox.html
-== wide--auto--nonpercent-width-percent-height.html wide--auto--nonpercent-width-percent-height.html
-skip-if(B2G||Mulet) == wide--auto--nonpercent-width-percent-height-viewbox.html wide--auto--nonpercent-width-percent-height-viewbox.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== wide--auto--omitted-width-nonpercent-height.html wide--auto--omitted-width-nonpercent-height.html
-== wide--auto--omitted-width-nonpercent-height-viewbox.html wide--auto--omitted-width-nonpercent-height-viewbox.html
-== wide--auto--omitted-width-omitted-height.html wide--auto--omitted-width-omitted-height.html
-skip-if(B2G||Mulet) == wide--auto--omitted-width-omitted-height-viewbox.html wide--auto--omitted-width-omitted-height-viewbox.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== wide--auto--omitted-width-percent-height.html wide--auto--omitted-width-percent-height.html
-== wide--auto--omitted-width-percent-height-viewbox.html wide--auto--omitted-width-percent-height-viewbox.html
-== wide--auto--percent-width-nonpercent-height.html wide--auto--percent-width-nonpercent-height.html
-== wide--auto--percent-width-nonpercent-height-viewbox.html wide--auto--percent-width-nonpercent-height-viewbox.html
-== wide--auto--percent-width-omitted-height.html wide--auto--percent-width-omitted-height.html
-== wide--auto--percent-width-omitted-height-viewbox.html wide--auto--percent-width-omitted-height-viewbox.html
-== wide--auto--percent-width-percent-height.html wide--auto--percent-width-percent-height.html
-== wide--auto--percent-width-percent-height-viewbox.html wide--auto--percent-width-percent-height-viewbox.html
-
-== wide--contain--nonpercent-width-nonpercent-height.html wide--contain--nonpercent-width-nonpercent-height.html
-== wide--contain--nonpercent-width-nonpercent-height-viewbox.html wide--contain--nonpercent-width-nonpercent-height-viewbox.html
-skip-if(B2G||Mulet) == wide--contain--nonpercent-width-omitted-height.html wide--contain--nonpercent-width-omitted-height.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== wide--contain--nonpercent-width-omitted-height-viewbox.html wide--contain--nonpercent-width-omitted-height-viewbox.html
-== wide--contain--nonpercent-width-percent-height.html wide--contain--nonpercent-width-percent-height.html
-== wide--contain--nonpercent-width-percent-height-viewbox.html wide--contain--nonpercent-width-percent-height-viewbox.html
-== wide--contain--omitted-width-nonpercent-height.html wide--contain--omitted-width-nonpercent-height.html
-== wide--contain--omitted-width-nonpercent-height-viewbox.html wide--contain--omitted-width-nonpercent-height-viewbox.html
-== wide--contain--omitted-width-omitted-height.html wide--contain--omitted-width-omitted-height.html
-== wide--contain--omitted-width-omitted-height-viewbox.html wide--contain--omitted-width-omitted-height-viewbox.html
-== wide--contain--omitted-width-percent-height.html wide--contain--omitted-width-percent-height.html
-== wide--contain--omitted-width-percent-height-viewbox.html wide--contain--omitted-width-percent-height-viewbox.html
-== wide--contain--percent-width-nonpercent-height.html wide--contain--percent-width-nonpercent-height.html
-== wide--contain--percent-width-nonpercent-height-viewbox.html wide--contain--percent-width-nonpercent-height-viewbox.html
-== wide--contain--percent-width-omitted-height.html wide--contain--percent-width-omitted-height.html
-== wide--contain--percent-width-omitted-height-viewbox.html wide--contain--percent-width-omitted-height-viewbox.html
-== wide--contain--percent-width-percent-height.html wide--contain--percent-width-percent-height.html
-== wide--contain--percent-width-percent-height-viewbox.html wide--contain--percent-width-percent-height-viewbox.html
-
-== wide--cover--nonpercent-width-nonpercent-height.html wide--cover--nonpercent-width-nonpercent-height.html
-skip-if(B2G||Mulet) == wide--cover--nonpercent-width-nonpercent-height-viewbox.html wide--cover--nonpercent-width-nonpercent-height-viewbox.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== wide--cover--nonpercent-width-omitted-height.html wide--cover--nonpercent-width-omitted-height.html
-== wide--cover--nonpercent-width-omitted-height-viewbox.html wide--cover--nonpercent-width-omitted-height-viewbox.html
-== wide--cover--nonpercent-width-percent-height.html wide--cover--nonpercent-width-percent-height.html
-== wide--cover--nonpercent-width-percent-height-viewbox.html wide--cover--nonpercent-width-percent-height-viewbox.html
-== wide--cover--omitted-width-nonpercent-height.html wide--cover--omitted-width-nonpercent-height.html
-skip-if(B2G||Mulet) == wide--cover--omitted-width-nonpercent-height-viewbox.html wide--cover--omitted-width-nonpercent-height-viewbox.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== wide--cover--omitted-width-omitted-height.html wide--cover--omitted-width-omitted-height.html
-== wide--cover--omitted-width-omitted-height-viewbox.html wide--cover--omitted-width-omitted-height-viewbox.html
-== wide--cover--omitted-width-percent-height.html wide--cover--omitted-width-percent-height.html
-== wide--cover--omitted-width-percent-height-viewbox.html wide--cover--omitted-width-percent-height-viewbox.html
-== wide--cover--percent-width-nonpercent-height.html wide--cover--percent-width-nonpercent-height.html
-== wide--cover--percent-width-nonpercent-height-viewbox.html wide--cover--percent-width-nonpercent-height-viewbox.html
-== wide--cover--percent-width-omitted-height.html wide--cover--percent-width-omitted-height.html
-== wide--cover--percent-width-omitted-height-viewbox.html wide--cover--percent-width-omitted-height-viewbox.html
-== wide--cover--percent-width-percent-height.html wide--cover--percent-width-percent-height.html
-== wide--cover--percent-width-percent-height-viewbox.html wide--cover--percent-width-percent-height-viewbox.html
-
-== diagonal-percentage-vector-background.html diagonal-percentage-vector-background.html
-== no-aspect-ratio-wide.html no-aspect-ratio-wide.html
diff --git a/layout/reftests/bidi/dirAuto/reftest-stylo.list b/layout/reftests/bidi/dirAuto/reftest-stylo.list
deleted file mode 100644
index 991841fee..000000000
--- a/layout/reftests/bidi/dirAuto/reftest-stylo.list
+++ /dev/null
@@ -1,120 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== bdi-auto-dir-default.html bdi-auto-dir-default.html
-== dir_auto-set-contained-dir-L.html dir_auto-set-contained-dir-L.html
-== dir_auto-set-contained-dir-R.html dir_auto-set-contained-dir-R.html
-== dir_auto-set-contained-invalid-dir-L.html dir_auto-set-contained-invalid-dir-L.html
-== dir_auto-set-contained-invalid-dir-R.html dir_auto-set-contained-invalid-dir-R.html
-== dir_auto-unset-contained-dir-L.html dir_auto-unset-contained-dir-L.html
-== dir_auto-unset-contained-dir-R.html dir_auto-unset-contained-dir-R.html
-== dynamicDirAuto-setLTR-Auto1.html dynamicDirAuto-setLTR-Auto1.html
-== dynamicDirAuto-setLTR-Auto2.html dynamicDirAuto-setLTR-Auto2.html
-== dynamicDirAuto-setLTR-Auto3.html dynamicDirAuto-setLTR-Auto3.html
-== dynamicDirAuto-setLTR-Auto4.html dynamicDirAuto-setLTR-Auto4.html
-== dynamicDirAuto-setLTR-Auto5.html dynamicDirAuto-setLTR-Auto5.html
-== dynamicDirAuto-setLTR-Auto6.html dynamicDirAuto-setLTR-Auto6.html
-== dynamicDirAuto-setLTR-LTR1.html dynamicDirAuto-setLTR-LTR1.html
-== dynamicDirAuto-setLTR-LTR2.html dynamicDirAuto-setLTR-LTR2.html
-== dynamicDirAuto-setLTR-LTR3.html dynamicDirAuto-setLTR-LTR3.html
-== dynamicDirAuto-setLTR-LTR4.html dynamicDirAuto-setLTR-LTR4.html
-== dynamicDirAuto-setLTR-LTR5.html dynamicDirAuto-setLTR-LTR5.html
-== dynamicDirAuto-setLTR-LTR6.html dynamicDirAuto-setLTR-LTR6.html
-== dynamicDirAuto-setLTR-LTR7.html dynamicDirAuto-setLTR-LTR7.html
-== dynamicDirAuto-setLTR-LTR8.html dynamicDirAuto-setLTR-LTR8.html
-== dynamicDirAuto-setLTR-RTL1.html dynamicDirAuto-setLTR-RTL1.html
-== dynamicDirAuto-setLTR-RTL2.html dynamicDirAuto-setLTR-RTL2.html
-== dynamicDirAuto-setLTR-RTL3.html dynamicDirAuto-setLTR-RTL3.html
-== dynamicDirAuto-setLTR-RTL4.html dynamicDirAuto-setLTR-RTL4.html
-== dynamicDirAuto-setLTR-RTL5.html dynamicDirAuto-setLTR-RTL5.html
-== dynamicDirAuto-setLTR-RTL6.html dynamicDirAuto-setLTR-RTL6.html
-== dynamicDirAuto-setLTR-RTL7.html dynamicDirAuto-setLTR-RTL7.html
-== dynamicDirAuto-setLTR-RTL8.html dynamicDirAuto-setLTR-RTL8.html
-== dynamicDirAuto-setLTR-NoDir1.html dynamicDirAuto-setLTR-NoDir1.html
-== dynamicDirAuto-setLTR-NoDir2.html dynamicDirAuto-setLTR-NoDir2.html
-== dynamicDirAuto-setLTR-NoDir3.html dynamicDirAuto-setLTR-NoDir3.html
-== dynamicDirAuto-setLTR-NoDir4.html dynamicDirAuto-setLTR-NoDir4.html
-== dynamicDirAuto-setLTR-NoDir5.html dynamicDirAuto-setLTR-NoDir5.html
-== dynamicDirAuto-setLTR-NoDir6.html dynamicDirAuto-setLTR-NoDir6.html
-== dynamicDirAuto-setLTR-NoDir7.html dynamicDirAuto-setLTR-NoDir7.html
-== dynamicDirAuto-setLTR-NoDir8.html dynamicDirAuto-setLTR-NoDir8.html
-== dynamicDirAuto-setLTR-InvalidDir1.html dynamicDirAuto-setLTR-InvalidDir1.html
-== dynamicDirAuto-setLTR-InvalidDir2.html dynamicDirAuto-setLTR-InvalidDir2.html
-== dynamicDirAuto-setLTR-InvalidDir3.html dynamicDirAuto-setLTR-InvalidDir3.html
-== dynamicDirAuto-setLTR-InvalidDir4.html dynamicDirAuto-setLTR-InvalidDir4.html
-== dynamicDirAuto-setLTR-InvalidDir5.html dynamicDirAuto-setLTR-InvalidDir5.html
-== dynamicDirAuto-setLTR-InvalidDir6.html dynamicDirAuto-setLTR-InvalidDir6.html
-== dynamicDirAuto-setLTR-InvalidDir7.html dynamicDirAuto-setLTR-InvalidDir7.html
-== dynamicDirAuto-setLTR-InvalidDir7.html dynamicDirAuto-setLTR-InvalidDir7.html
-== dynamicDirAuto-setRTL-Auto1.html dynamicDirAuto-setRTL-Auto1.html
-== dynamicDirAuto-setRTL-Auto2.html dynamicDirAuto-setRTL-Auto2.html
-== dynamicDirAuto-setRTL-Auto3.html dynamicDirAuto-setRTL-Auto3.html
-== dynamicDirAuto-setRTL-Auto4.html dynamicDirAuto-setRTL-Auto4.html
-== dynamicDirAuto-setRTL-Auto5.html dynamicDirAuto-setRTL-Auto5.html
-== dynamicDirAuto-setRTL-Auto6.html dynamicDirAuto-setRTL-Auto6.html
-== dynamicDirAuto-setRTL-LTR1.html dynamicDirAuto-setRTL-LTR1.html
-== dynamicDirAuto-setRTL-LTR2.html dynamicDirAuto-setRTL-LTR2.html
-== dynamicDirAuto-setRTL-LTR3.html dynamicDirAuto-setRTL-LTR3.html
-== dynamicDirAuto-setRTL-LTR4.html dynamicDirAuto-setRTL-LTR4.html
-== dynamicDirAuto-setRTL-LTR5.html dynamicDirAuto-setRTL-LTR5.html
-== dynamicDirAuto-setRTL-LTR6.html dynamicDirAuto-setRTL-LTR6.html
-== dynamicDirAuto-setRTL-LTR7.html dynamicDirAuto-setRTL-LTR7.html
-== dynamicDirAuto-setRTL-LTR8.html dynamicDirAuto-setRTL-LTR8.html
-== dynamicDirAuto-setRTL-RTL1.html dynamicDirAuto-setRTL-RTL1.html
-== dynamicDirAuto-setRTL-RTL2.html dynamicDirAuto-setRTL-RTL2.html
-== dynamicDirAuto-setRTL-RTL3.html dynamicDirAuto-setRTL-RTL3.html
-== dynamicDirAuto-setRTL-RTL4.html dynamicDirAuto-setRTL-RTL4.html
-== dynamicDirAuto-setRTL-RTL5.html dynamicDirAuto-setRTL-RTL5.html
-== dynamicDirAuto-setRTL-RTL6.html dynamicDirAuto-setRTL-RTL6.html
-== dynamicDirAuto-setRTL-RTL7.html dynamicDirAuto-setRTL-RTL7.html
-== dynamicDirAuto-setRTL-RTL8.html dynamicDirAuto-setRTL-RTL8.html
-== dynamicDirAuto-setRTL-NoDir1.html dynamicDirAuto-setRTL-NoDir1.html
-== dynamicDirAuto-setRTL-NoDir2.html dynamicDirAuto-setRTL-NoDir2.html
-== dynamicDirAuto-setRTL-NoDir3.html dynamicDirAuto-setRTL-NoDir3.html
-== dynamicDirAuto-setRTL-NoDir4.html dynamicDirAuto-setRTL-NoDir4.html
-== dynamicDirAuto-setRTL-NoDir5.html dynamicDirAuto-setRTL-NoDir5.html
-== dynamicDirAuto-setRTL-NoDir6.html dynamicDirAuto-setRTL-NoDir6.html
-== dynamicDirAuto-setRTL-NoDir7.html dynamicDirAuto-setRTL-NoDir7.html
-== dynamicDirAuto-setRTL-NoDir8.html dynamicDirAuto-setRTL-NoDir8.html
-== dynamicDirAuto-setRTL-InvalidDir1.html dynamicDirAuto-setRTL-InvalidDir1.html
-== dynamicDirAuto-setRTL-InvalidDir2.html dynamicDirAuto-setRTL-InvalidDir2.html
-== dynamicDirAuto-setRTL-InvalidDir3.html dynamicDirAuto-setRTL-InvalidDir3.html
-== dynamicDirAuto-setRTL-InvalidDir4.html dynamicDirAuto-setRTL-InvalidDir4.html
-== dynamicDirAuto-setRTL-InvalidDir5.html dynamicDirAuto-setRTL-InvalidDir5.html
-== dynamicDirAuto-setRTL-InvalidDir6.html dynamicDirAuto-setRTL-InvalidDir6.html
-== dynamicDirAuto-setRTL-InvalidDir7.html dynamicDirAuto-setRTL-InvalidDir7.html
-== dynamicDirAuto-setRTL-InvalidDir8.html dynamicDirAuto-setRTL-InvalidDir8.html
-== dynamicDirAuto-addLTR-Auto.html dynamicDirAuto-addLTR-Auto.html
-== dynamicDirAuto-addRTL-Auto.html dynamicDirAuto-addRTL-Auto.html
-== dynamicDirAuto-ChangeText-LTR1.html dynamicDirAuto-ChangeText-LTR1.html
-== dynamicDirAuto-ChangeText-LTR2.html dynamicDirAuto-ChangeText-LTR2.html
-== dynamicDirAuto-ChangeText-LTR3.html dynamicDirAuto-ChangeText-LTR3.html
-== dynamicDirAuto-ChangeText-LTR4.html dynamicDirAuto-ChangeText-LTR4.html
-== dynamicDirAuto-ChangeText-LTR5.html dynamicDirAuto-ChangeText-LTR5.html
-== dynamicDirAuto-ChangeText-LTR6.html dynamicDirAuto-ChangeText-LTR6.html
-== dynamicDirAuto-ChangeText-LTR7.html dynamicDirAuto-ChangeText-LTR7.html
-== dynamicDirAuto-ChangeText-LTR8.html dynamicDirAuto-ChangeText-LTR8.html
-== dynamicDirAuto-ChangeText-LTR9.html dynamicDirAuto-ChangeText-LTR9.html
-== dynamicDirAuto-ChangeText-LTR10.html dynamicDirAuto-ChangeText-LTR10.html
-== dynamicDirAuto-ChangeText-RTL1.html dynamicDirAuto-ChangeText-RTL1.html
-== dynamicDirAuto-ChangeText-RTL2.html dynamicDirAuto-ChangeText-RTL2.html
-fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&!layersGPUAccelerated&&!azureSkia,30,1) == dynamicDirAuto-ChangeText-RTL3.html dynamicDirAuto-ChangeText-RTL3.html
-fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&!layersGPUAccelerated&&!azureSkia,30,1) == dynamicDirAuto-ChangeText-RTL4.html dynamicDirAuto-ChangeText-RTL4.html
-fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&!layersGPUAccelerated&&!azureSkia,30,1) == dynamicDirAuto-ChangeText-RTL5.html dynamicDirAuto-ChangeText-RTL5.html
-fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&!layersGPUAccelerated&&!azureSkia,30,1) == dynamicDirAuto-ChangeText-RTL6.html dynamicDirAuto-ChangeText-RTL6.html
-== dynamicDirAuto-ChangeText-RTL7.html dynamicDirAuto-ChangeText-RTL7.html
-== dynamicDirAuto-ChangeText-RTL8.html dynamicDirAuto-ChangeText-RTL8.html
-== dynamicDirAuto-ChangeText-RTL9.html dynamicDirAuto-ChangeText-RTL9.html
-== dynamicDirAuto-ChangeText-RTL10.html dynamicDirAuto-ChangeText-RTL10.html
-== dynamicDirAuto-DeleteText-LTR1.html dynamicDirAuto-DeleteText-LTR1.html
-== dynamicDirAuto-DeleteText-LTR2.html dynamicDirAuto-DeleteText-LTR2.html
-== dynamicDirAuto-DeleteText-LTR3.html dynamicDirAuto-DeleteText-LTR3.html
-== dynamicDirAuto-DeleteText-RTL1.html dynamicDirAuto-DeleteText-RTL1.html
-== dynamicDirAuto-DeleteText-RTL2.html dynamicDirAuto-DeleteText-RTL2.html
-== dynamicDirAuto-DeleteText-RTL3.html dynamicDirAuto-DeleteText-RTL3.html
-== 839886-1.html 839886-1.html
-== 859093-1.html 859093-1.html
-== 889742-1.html 889742-1.html
-== 1103348-1.html 1103348-1.html
-== 1169267-delete-add-1a.html 1169267-delete-add-1a.html
-== 1169267-delete-add-1b.html 1169267-delete-add-1b.html
-== 1169267-delete-add-2a.html 1169267-delete-add-2a.html
-== 1169267-delete-add-2b.html 1169267-delete-add-2b.html
diff --git a/layout/reftests/bidi/numeral/reftest-stylo.list b/layout/reftests/bidi/numeral/reftest-stylo.list
deleted file mode 100644
index b3cf247da..000000000
--- a/layout/reftests/bidi/numeral/reftest-stylo.list
+++ /dev/null
@@ -1,121 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-pref(bidi.numeral,0) == arabic-1.html arabic-1.html
-pref(bidi.numeral,1) == arabic-1.html arabic-1.html
-pref(bidi.numeral,2) == arabic-1.html arabic-1.html
-pref(bidi.numeral,3) == arabic-1.html arabic-1.html
-pref(bidi.numeral,4) == arabic-1.html arabic-1.html
-skip pref(bidi.numeral,0) == arabic-2.html arabic-2.html
-skip pref(bidi.numeral,1) == arabic-2.html arabic-2.html
-skip pref(bidi.numeral,2) == arabic-2.html arabic-2.html
-skip pref(bidi.numeral,3) == arabic-2.html arabic-2.html
-skip pref(bidi.numeral,4) == arabic-2.html arabic-2.html
-pref(bidi.numeral,0) == arabic-3.html arabic-3.html
-pref(bidi.numeral,1) == arabic-3.html arabic-3.html
-pref(bidi.numeral,2) == arabic-3.html arabic-3.html
-pref(bidi.numeral,3) == arabic-3.html arabic-3.html
-pref(bidi.numeral,4) == arabic-3.html arabic-3.html
-pref(bidi.numeral,0) == arabic-4.html arabic-4.html
-pref(bidi.numeral,1) == arabic-4.html arabic-4.html
-pref(bidi.numeral,2) == arabic-4.html arabic-4.html
-pref(bidi.numeral,3) == arabic-4.html arabic-4.html
-pref(bidi.numeral,4) == arabic-4.html arabic-4.html
-pref(bidi.numeral,0) == arabic-5.html arabic-5.html
-pref(bidi.numeral,1) == arabic-5.html arabic-5.html
-pref(bidi.numeral,2) == arabic-5.html arabic-5.html
-pref(bidi.numeral,3) == arabic-5.html arabic-5.html
-pref(bidi.numeral,4) == arabic-5.html arabic-5.html
-pref(bidi.numeral,0) == bug441782-1.html bug441782-1.html
-pref(bidi.numeral,1) == bug441782-1.html bug441782-1.html
-pref(bidi.numeral,2) == bug441782-1.html bug441782-1.html
-pref(bidi.numeral,3) == bug441782-1.html bug441782-1.html
-pref(bidi.numeral,4) == bug441782-1.html bug441782-1.html
-pref(bidi.numeral,0) == bug441782-2.html bug441782-2.html
-pref(bidi.numeral,1) == bug441782-2.html bug441782-2.html
-pref(bidi.numeral,2) == bug441782-2.html bug441782-2.html
-pref(bidi.numeral,3) == bug441782-2.html bug441782-2.html
-pref(bidi.numeral,4) == bug441782-2.html bug441782-2.html
-pref(bidi.numeral,0) == bug441782-3.html bug441782-3.html
-fails-if(winWidget&&!layersGPUAccelerated&&!(/^Windows\x20NT\x205\.1/.test(http.oscpu))&&!skiaContent) fuzzy-if(winWidget&&!d2d&&d3d11,13,1) pref(bidi.numeral,1) == bug441782-3.html bug441782-3.html
-fails-if(winWidget&&!layersGPUAccelerated&&!(/^Windows\x20NT\x205\.1/.test(http.oscpu))&&!skiaContent) fuzzy-if(winWidget&&!d2d&&d3d11,13,1) pref(bidi.numeral,2) == bug441782-3.html bug441782-3.html
-fails-if(winWidget&&!layersGPUAccelerated&&!(/^Windows\x20NT\x205\.1/.test(http.oscpu))&&!skiaContent) fuzzy-if(winWidget&&!d2d&&d3d11,13,1) pref(bidi.numeral,3) == bug441782-3.html bug441782-3.html
-pref(bidi.numeral,4) == bug441782-3.html bug441782-3.html
-pref(bidi.numeral,0) == bug441782-4.html bug441782-4.html
-pref(bidi.numeral,1) == bug441782-4.html bug441782-4.html
-pref(bidi.numeral,2) == bug441782-4.html bug441782-4.html
-pref(bidi.numeral,3) == bug441782-4.html bug441782-4.html
-pref(bidi.numeral,4) == bug441782-4.html bug441782-4.html
-pref(bidi.numeral,0) == bug441782-5.html bug441782-5.html
-pref(bidi.numeral,1) == bug441782-5.html bug441782-5.html
-pref(bidi.numeral,2) == bug441782-5.html bug441782-5.html
-pref(bidi.numeral,3) == bug441782-5.html bug441782-5.html
-pref(bidi.numeral,4) == bug441782-5.html bug441782-5.html
-pref(bidi.numeral,0) == bug467672-1.html bug467672-1.html
-pref(bidi.numeral,1) == bug467672-1.html bug467672-1.html
-pref(bidi.numeral,2) == bug467672-1.html bug467672-1.html
-pref(bidi.numeral,3) == bug467672-1.html bug467672-1.html
-pref(bidi.numeral,4) == bug467672-1.html bug467672-1.html
-pref(bidi.numeral,5) == bug467672-1.html bug467672-1.html
-pref(bidi.numeral,6) == bug467672-1.html bug467672-1.html
-pref(bidi.numeral,0) == bug467672-2.html bug467672-2.html
-pref(bidi.numeral,1) == bug467672-2.html bug467672-2.html
-pref(bidi.numeral,2) == bug467672-2.html bug467672-2.html
-pref(bidi.numeral,3) == bug467672-2.html bug467672-2.html
-pref(bidi.numeral,4) == bug467672-2.html bug467672-2.html
-pref(bidi.numeral,5) == bug467672-2.html bug467672-2.html
-pref(bidi.numeral,6) == bug467672-2.html bug467672-2.html
-pref(bidi.numeral,0) == bug467672-3.html bug467672-3.html
-pref(bidi.numeral,1) == bug467672-3.html bug467672-3.html
-pref(bidi.numeral,2) == bug467672-3.html bug467672-3.html
-pref(bidi.numeral,3) == bug467672-3.html bug467672-3.html
-pref(bidi.numeral,4) == bug467672-3.html bug467672-3.html
-pref(bidi.numeral,5) == bug467672-3.html bug467672-3.html
-pref(bidi.numeral,6) == bug467672-3.html bug467672-3.html
-pref(bidi.numeral,0) == bug467672-4.html bug467672-4.html
-pref(bidi.numeral,1) == bug467672-4.html bug467672-4.html
-pref(bidi.numeral,2) == bug467672-4.html bug467672-4.html
-pref(bidi.numeral,3) == bug467672-4.html bug467672-4.html
-pref(bidi.numeral,4) == bug467672-4.html bug467672-4.html
-pref(bidi.numeral,5) == bug467672-4.html bug467672-4.html
-pref(bidi.numeral,6) == bug467672-4.html bug467672-4.html
-pref(bidi.numeral,0) == bug467672-5.html bug467672-5.html
-pref(bidi.numeral,1) == bug467672-5.html bug467672-5.html
-pref(bidi.numeral,2) == bug467672-5.html bug467672-5.html
-pref(bidi.numeral,3) == bug467672-5.html bug467672-5.html
-pref(bidi.numeral,4) == bug467672-5.html bug467672-5.html
-pref(bidi.numeral,5) == bug467672-5.html bug467672-5.html
-pref(bidi.numeral,6) == bug467672-5.html bug467672-5.html
-pref(bidi.numeral,0) == persian-1.html persian-1.html
-pref(bidi.numeral,1) == persian-1.html persian-1.html
-pref(bidi.numeral,2) == persian-1.html persian-1.html
-pref(bidi.numeral,3) == persian-1.html persian-1.html
-pref(bidi.numeral,4) == persian-1.html persian-1.html
-pref(bidi.numeral,5) == persian-1.html persian-1.html
-pref(bidi.numeral,6) == persian-1.html persian-1.html
-skip pref(bidi.numeral,0) == persian-2.html persian-2.html
-skip pref(bidi.numeral,1) == persian-2.html persian-2.html
-skip pref(bidi.numeral,2) == persian-2.html persian-2.html
-skip pref(bidi.numeral,3) == persian-2.html persian-2.html
-skip pref(bidi.numeral,4) == persian-2.html persian-2.html
-skip pref(bidi.numeral,5) == persian-2.html persian-2.html
-skip pref(bidi.numeral,6) == persian-2.html persian-2.html
-pref(bidi.numeral,0) == persian-3.html persian-3.html
-pref(bidi.numeral,1) == persian-3.html persian-3.html
-pref(bidi.numeral,2) == persian-3.html persian-3.html
-pref(bidi.numeral,3) == persian-3.html persian-3.html
-pref(bidi.numeral,4) == persian-3.html persian-3.html
-pref(bidi.numeral,5) == persian-3.html persian-3.html
-pref(bidi.numeral,6) == persian-3.html persian-3.html
-pref(bidi.numeral,0) == persian-4.html persian-4.html
-pref(bidi.numeral,1) == persian-4.html persian-4.html
-pref(bidi.numeral,2) == persian-4.html persian-4.html
-pref(bidi.numeral,3) == persian-4.html persian-4.html
-pref(bidi.numeral,4) == persian-4.html persian-4.html
-pref(bidi.numeral,5) == persian-4.html persian-4.html
-pref(bidi.numeral,6) == persian-4.html persian-4.html
-pref(bidi.numeral,0) == persian-5.html persian-5.html
-pref(bidi.numeral,1) == persian-5.html persian-5.html
-pref(bidi.numeral,2) == persian-5.html persian-5.html
-pref(bidi.numeral,3) == persian-5.html persian-5.html
-pref(bidi.numeral,4) == persian-5.html persian-5.html
-pref(bidi.numeral,5) == persian-5.html persian-5.html
-pref(bidi.numeral,6) == persian-5.html persian-5.html
diff --git a/layout/reftests/bidi/reftest-stylo.list b/layout/reftests/bidi/reftest-stylo.list
deleted file mode 100644
index d0a854e7f..000000000
--- a/layout/reftests/bidi/reftest-stylo.list
+++ /dev/null
@@ -1,183 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-include dirAuto/reftest-stylo.list
-include numeral/reftest-stylo.list
-== bdi-element.html bdi-element.html
-== bidi-000.html bidi-000.html
-== bidi-001.html bidi-001.html
-== bidi-001-j.html bidi-001-j.html
-== bidi-001-v.html bidi-001-v.html
-== bidi-002.html bidi-002.html
-== bidi-003.html bidi-003.html
-== bidi-004.html bidi-004.html
-== bidi-004-j.html bidi-004-j.html
-== bidi-005.html bidi-005.html
-random-if(cocoaWidget) == bidi-006.html bidi-006.html
-# bug 734313
-random-if(cocoaWidget) == bidi-006-j.html bidi-006-j.html
-# bug 734313
-== bidiSVG-01.svg bidiSVG-01.svg
-== bidiSVG-02.svg bidiSVG-02.svg
-skip == bidiSVG-03.svg bidiSVG-03.svg
-== bidiSVG-04.svg bidiSVG-04.svg
-== bidiSVG-05.svg bidiSVG-05.svg
-random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) HTTP(..) == bidiMirroring.svg bidiMirroring.svg
-# test for glyph mirroring in right-to-left text
-== mirroring-01.html mirroring-01.html
-# quote marks are not supposed to mirror, but Unicode 5.0 said they should, so some systems do it
-random-if(cocoaWidget) == mirroring-02.html mirroring-02.html
-== mirroring-03.html mirroring-03.html
-== mixedChartype-00.html mixedChartype-00.html
-== mixedChartype-00-j.html mixedChartype-00-j.html
-== mixedChartype-01.html mixedChartype-01.html
-== mixedChartype-01-j.html mixedChartype-01-j.html
-== mixedChartype-02.html mixedChartype-02.html
-== mixedChartype-02-j.html mixedChartype-02-j.html
-== mixedChartype-03.html mixedChartype-03.html
-== mixedChartype-03-j.html mixedChartype-03-j.html
-== unicode-bidi-anonymous-001.html unicode-bidi-anonymous-001.html
-== unicode-bidi-anonymous-002.html unicode-bidi-anonymous-002.html
-== unicode-bidi-isolate-basic.html unicode-bidi-isolate-basic.html
-== unicode-bidi-isolate-aharon.html unicode-bidi-isolate-aharon.html
-fails fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&!layersGPUAccelerated&&!azureSkia,73,1) fuzzy-if(skiaContent,104,32) == unicode-bidi-plaintext.html unicode-bidi-plaintext.html
-== unicode-bidi-plaintext-textarea-1.html unicode-bidi-plaintext-textarea-1.html
-== unicode-bidi-plaintext-textarea-2.html unicode-bidi-plaintext-textarea-2.html
-== unicode-bidi-plaintext-textarea-3.html unicode-bidi-plaintext-textarea-3.html
-== unicode-bidi-plaintext-textarea-4.html unicode-bidi-plaintext-textarea-4.html
-== with-first-letter-1a.html with-first-letter-1a.html
-== with-first-letter-1b.html with-first-letter-1b.html
-random-if(cocoaWidget) == with-first-letter-2a.html with-first-letter-2a.html
-# bug 734313
-random-if(cocoaWidget) == with-first-letter-2b.html with-first-letter-2b.html
-# bug 734313
-== 83958-1a.html 83958-1a.html
-== 83958-1b.html 83958-1b.html
-== 83958-1c.html 83958-1c.html
-fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&!layersGPUAccelerated&&!azureSkia,111,7) == 83958-2a.html 83958-2a.html
-fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&!layersGPUAccelerated&&!azureSkia,111,7) == 83958-2b.html 83958-2b.html
-== 115921-1.html 115921-1.html
-== 115921-2.html 115921-2.html
-== 151407-1.html 151407-1.html
-== 151407-1a.html 151407-1a.html
-== 151407-2-ltr.html 151407-2-ltr.html
-== 151407-2-rtl.html 151407-2-rtl.html
-== 151407-2-auto.html 151407-2-auto.html
-== 151407-2-empty.html 151407-2-empty.html
-== 151407-2-foopy.html 151407-2-foopy.html
-== 151407-3-ltr.html 151407-3-ltr.html
-== 151407-3-rtl.html 151407-3-rtl.html
-== 151407-3-auto.html 151407-3-auto.html
-== 151407-3-foopy.html 151407-3-foopy.html
-== 229367-1.html 229367-1.html
-== 229367-2.html 229367-2.html
-== 229367-3.html 229367-3.html
-== 258928-1.html 258928-1.html
-== 263359-1.html 263359-1.html
-== 263359-1a.html 263359-1a.html
-== 263359-1b.html 263359-1b.html
-== 263359-2.html 263359-2.html
-== 263359-3.html 263359-3.html
-== 263359-4.html 263359-4.html
-random-if(winWidget) fuzzy-if(skiaContent,1,1700) == 267459-1.html 267459-1.html
-# depends on windows version, see bug 590101
-fuzzy-if(skiaContent,1,1100) == 267459-2.html 267459-2.html
-== 299065-1.html 299065-1.html
-random-if(winWidget) == 305643-1.html 305643-1.html
-# depends on windows version, see bug 590101
-== 332655-1.html 332655-1.html
-== 332655-2.html 332655-2.html
-== 381279-1.html 381279-1.html
-== 386339.html 386339.html
-== 409375.html 409375.html
-== 413542-1.html 413542-1.html
-== 413542-2.html 413542-2.html
-random-if((B2G&&browserIsRemote)||Mulet) == 413928-1.html 413928-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-random-if((B2G&&browserIsRemote)||Mulet) == 413928-2.html 413928-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 425338-1a.html 425338-1a.html
-== 425338-1b.html 425338-1b.html
-skip == 489517-1.html 489517-1.html
-== 489887-1.html 489887-1.html
-== 492231-1.html 492231-1.html
-== 496006-1.html 496006-1.html
-== 503269-1.html 503269-1.html
-== 503957-1.html 503957-1.html
-== 525740-1.html 525740-1.html
-== 536963-1.html 536963-1.html
-== 562169-1.html 562169-1.html
-== 562169-1a.html 562169-1a.html
-== 562169-2.html 562169-2.html
-== 562169-2a.html 562169-2a.html
-== 562169-3.html 562169-3.html
-== 562169-3a.html 562169-3a.html
-skip == 562169-4.html 562169-4.html
-== 588739-1.html 588739-1.html
-== 588739-2.html 588739-2.html
-== 588739-3.html 588739-3.html
-== 612843-1.html 612843-1.html
-== 613149-1a.html 613149-1a.html
-== 613149-1b.html 613149-1b.html
-fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&!layersGPUAccelerated&&!azureSkia,36,2) == 613149-2a.html 613149-2a.html
-fuzzy-if(Android,24,1) fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&!layersGPUAccelerated&&!azureSkia,36,2) == 613149-2b.html 613149-2b.html
-== 613157-1.html 613157-1.html
-fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&!layersGPUAccelerated&&!azureSkia,255,6) == 613157-2.html 613157-2.html
-== 662288-1.html 662288-1.html
-skip == 670226-1.html 670226-1.html
-== 676245-1.html 676245-1.html
-skip-if(B2G||Mulet) fuzzy-if(skiaContent,1,3) == 698291-1.html 698291-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 698706-1.html 698706-1.html
-== 704837-1.html 704837-1.html
-== 712600-1.html 712600-1.html
-== 712600-2.html 712600-2.html
-skip == 712600-2-dyn.html 712600-2-dyn.html
-== 712600-3.html 712600-3.html
-== 718236-1.html 718236-1.html
-== 718236-2.html 718236-2.html
-== 718236-3.html 718236-3.html
-skip-if(B2G||Mulet) == 726420-1.html 726420-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 726460-1.html 726460-1.html
-== 729047-1.html 729047-1.html
-== 730562-1.html 730562-1.html
-== 746987-1.html 746987-1.html
-== 746987-2.html 746987-2.html
-== 746987-3.html 746987-3.html
-== 746987-4.html 746987-4.html
-== 779003-1.html 779003-1.html
-== 779003-1-dynamic.html 779003-1-dynamic.html
-== 817406-1.html 817406-1.html
-== 817406-2.html 817406-2.html
-== 817406-3.html 817406-3.html
-== 817406-4.html 817406-4.html
-== 847242-1.html 847242-1.html
-skip-if((B2G&&browserIsRemote)||Mulet) fuzzy-if(xulRuntime.widgetToolkit=="gtk3",1,11) == 869833-1.xul 869833-1.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 922530-1.html 922530-1.html
-== 922550-1.html 922550-1.html
-== 1067268-1.html 1067268-1.html
-== 1069941-inline-bidi-border-1.html 1069941-inline-bidi-border-1.html
-== 1069941-inline-bidi-margin-1.html 1069941-inline-bidi-margin-1.html
-skip-if(B2G||Mulet) == 1155359-1.xul 1155359-1.xul
-== 1157726-1.html 1157726-1.html
-skip == 1161752.html 1161752.html
-== 1161752-5-embed.html 1161752-5-embed.html
-== brackets-1a-ltr.html brackets-1a-ltr.html
-== brackets-1a-rtl.html brackets-1a-rtl.html
-== brackets-1b-ltr.html brackets-1b-ltr.html
-== brackets-1b-rtl.html brackets-1b-rtl.html
-== brackets-1c-ltr.html brackets-1c-ltr.html
-== brackets-1c-rtl.html brackets-1c-rtl.html
-== brackets-2a-ltr.html brackets-2a-ltr.html
-fuzzy-if(Android,254,557) == brackets-2a-rtl.html brackets-2a-rtl.html
-== brackets-2b-ltr.html brackets-2b-ltr.html
-== brackets-2b-rtl.html brackets-2b-rtl.html
-== brackets-2c-ltr.html brackets-2c-ltr.html
-fuzzy-if(Android,254,231) == brackets-2c-rtl.html brackets-2c-rtl.html
-== brackets-3a-ltr.html brackets-3a-ltr.html
-== brackets-3a-rtl.html brackets-3a-rtl.html
-== brackets-3b-ltr.html brackets-3b-ltr.html
-== brackets-3b-rtl.html brackets-3b-rtl.html
-== 1217833-1.html 1217833-1.html
-== 1217833-2.html 1217833-2.html
-== 1231175-1.html 1231175-1.html
diff --git a/layout/reftests/bidi/reftest.list b/layout/reftests/bidi/reftest.list
index 5044e657f..a8e445aec 100644
--- a/layout/reftests/bidi/reftest.list
+++ b/layout/reftests/bidi/reftest.list
@@ -109,7 +109,7 @@ random-if(winWidget) == 305643-1.html 305643-1-ref.html # depends on windows ver
== 613149-1a.html 613149-1-ref.html
== 613149-1b.html 613149-1-ref.html
fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&!layersGPUAccelerated&&!azureSkia,36,2) == 613149-2a.html 613149-2-ref.html
-fuzzy-if(Android,24,1) fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&!layersGPUAccelerated&&!azureSkia,36,2) == 613149-2b.html 613149-2-ref.html
+fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&!layersGPUAccelerated&&!azureSkia,36,2) == 613149-2b.html 613149-2-ref.html
== 613157-1.html 613157-1-ref.html
fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&!layersGPUAccelerated&&!azureSkia,255,6) == 613157-2.html 613157-2-ref.html
== 662288-1.html 662288-1-ref.html
@@ -157,11 +157,11 @@ fuzzy-if(xulRuntime.widgetToolkit=="gtk3",1,11) == 869833-1.xul 869833-1-ref.xul
== brackets-1c-ltr.html brackets-1c-ltr-ref.html
== brackets-1c-rtl.html brackets-1c-rtl-ref.html
== brackets-2a-ltr.html brackets-2a-ltr-ref.html
-fuzzy-if(Android,254,557) == brackets-2a-rtl.html brackets-2a-rtl-ref.html
+== brackets-2a-rtl.html brackets-2a-rtl-ref.html
== brackets-2b-ltr.html brackets-2b-ltr-ref.html
== brackets-2b-rtl.html brackets-2b-rtl-ref.html
== brackets-2c-ltr.html brackets-2c-ltr-ref.html
-fuzzy-if(Android,254,231) == brackets-2c-rtl.html brackets-2c-rtl-ref.html
+== brackets-2c-rtl.html brackets-2c-rtl-ref.html
== brackets-3a-ltr.html brackets-3a-ltr-ref.html
== brackets-3a-rtl.html brackets-3a-rtl-ref.html
== brackets-3b-ltr.html brackets-3b-ltr-ref.html
diff --git a/layout/reftests/border-dotted/reftest-stylo.list b/layout/reftests/border-dotted/reftest-stylo.list
deleted file mode 100644
index 23436b7ff..000000000
--- a/layout/reftests/border-dotted/reftest-stylo.list
+++ /dev/null
@@ -1,13 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# Composing dotted/dashed border rendering and not-filled or not-unfilled mask
-# matches to full-filled box, using fuzzyy because of anti-aliasing.
-# These check filled and unfilled regions with solid opaque color,
-# so difference less than 80 is ignorable.
-== border-dotted-interaction.html border-dotted-interaction.html
-== border-dotted-no-radius.html border-dotted-no-radius.html
-== border-dotted-radius.html border-dotted-radius.html
-== border-dashed-no-radius.html border-dashed-no-radius.html
-== border-dashed-radius.html border-dashed-radius.html
-== border-mixed.html border-mixed.html
-== border-dashed-non-integer.html border-dashed-non-integer.html
-== border-dashed-radius-zoom.html border-dashed-radius-zoom.html
diff --git a/layout/reftests/border-image/reftest-stylo.list b/layout/reftests/border-image/reftest-stylo.list
deleted file mode 100644
index 0af21ac44..000000000
--- a/layout/reftests/border-image/reftest-stylo.list
+++ /dev/null
@@ -1,95 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== solid-image-1.html solid-image-1.html
-== solid-image-1a.html solid-image-1a.html
-== solid-image-2.html solid-image-2.html
-== solid-image-2a.html solid-image-2a.html
-== multicolor-image-1.html multicolor-image-1.html
-# This is fuzzy temporarily until bug 1044702 makes it possible to use source
-# clipping on Windows. (Any other fix would have a significant perf cost.)
-fuzzy-if(winWidget,1,1) == multicolor-image-2.html multicolor-image-2.html
-== multicolor-image-3.html multicolor-image-3.html
-== multicolor-image-4.html multicolor-image-4.html
-== multicolor-image-5.html multicolor-image-5.html
-== transparent-image-1.html transparent-image-1.html
-== repeat-image-1.html repeat-image-1.html
-== 470250-1.html 470250-1.html
-random == 470250-2.html 470250-2.html
-== different-h-v-1.html different-h-v-1.html
-== different-h-v-2.html different-h-v-2.html
-== different-h-v-1.html different-h-v-1.html
-== center-scaling-1.html center-scaling-1.html
-fails-if(Android||B2G) fails-if(usesRepeatResampling) == center-scaling-2.html center-scaling-2.html
-# Android/B2G: very different scaling (blurriness) on some sides
-fails-if(Android||B2G) fails-if(usesRepeatResampling) == center-scaling-3.html center-scaling-3.html
-# Android/B2G: very different scaling (blurriness) on some sides
-== center-scaling-4t.html center-scaling-4t.html
-== center-scaling-4r.html center-scaling-4r.html
-== center-scaling-4b.html center-scaling-4b.html
-== center-scaling-4l.html center-scaling-4l.html
-== center-scaling-4tb.html center-scaling-4tb.html
-== center-scaling-4lr.html center-scaling-4lr.html
-== side-scaling-1h.html side-scaling-1h.html
-== side-scaling-1v.html side-scaling-1v.html
-== border-image-width-1a.html border-image-width-1a.html
-== border-image-width-1b.html border-image-width-1b.html
-== border-image-width-1c.html border-image-width-1c.html
-== border-image-width-large.html border-image-width-large.html
-== border-image-outset-1a.html border-image-outset-1a.html
-== border-image-outset-1b.html border-image-outset-1b.html
-== border-image-outset-1c.html border-image-outset-1c.html
-skip == border-image-nofill-1.html border-image-nofill-1.html
-== border-image-outset-resize-1.html border-image-outset-resize-1.html
-fuzzy-if(asyncPan&&!layersGPUAccelerated,121,447) == border-image-outset-move-1.html border-image-outset-move-1.html
-== border-image-style-none.html border-image-style-none.html
-== border-image-style-none-length.html border-image-style-none-length.html
-== border-image-style-none-auto.html border-image-style-none-auto.html
-
-# border images with gradients
-== border-image-linear-gradient.html border-image-linear-gradient.html
-skip fuzzy-if(skiaContent,1,350) == border-image-linear-gradient-slice-1.html border-image-linear-gradient-slice-1.html
-fuzzy-if(OSX,1,10595) == border-image-linear-gradient-slice-2.html border-image-linear-gradient-slice-2.html
-fuzzy-if(skiaContent,1,2500) == border-image-linear-gradient-slice-fill-1.html border-image-linear-gradient-slice-fill-1.html
-skip fuzzy-if(OSX,1,25771) fuzzy-if(skiaContent,1,300) == border-image-linear-gradient-slice-fill-2.html border-image-linear-gradient-slice-fill-2.html
-fuzzy-if(OSX,5,1676) == border-image-linear-gradient-width.html border-image-linear-gradient-width.html
-fuzzy-if(OSX,1,15000) == border-image-linear-gradient-slice-width.html border-image-linear-gradient-slice-width.html
-fuzzy-if(OSX,1,6000) == border-image-linear-gradient-outset.html border-image-linear-gradient-outset.html
-fuzzy-if(skiaContent,1,400) == border-image-linear-gradient-repeat-repeat-1.html border-image-linear-gradient-repeat-repeat-1.html
-fuzzy-if(skiaContent,1,300) == border-image-linear-gradient-repeat-round-1.html border-image-linear-gradient-repeat-round-1.html
-== border-image-linear-gradient-repeat-repeat-2.html border-image-linear-gradient-repeat-repeat-2.html
-fuzzy-if(skiaContent,1,2000) == border-image-linear-gradient-repeat-round-2.html border-image-linear-gradient-repeat-round-2.html
-== border-image-linear-gradient-repeat-repeat-3.html border-image-linear-gradient-repeat-repeat-3.html
-== border-image-linear-gradient-repeat-round-3.html border-image-linear-gradient-repeat-round-3.html
-
-== border-image-radial-gradient.html border-image-radial-gradient.html
-fuzzy-if(skiaContent,2,20) == border-image-radial-gradient-slice-1.html border-image-radial-gradient-slice-1.html
-fuzzy-if(OSX,2,4472) == border-image-radial-gradient-slice-2.html border-image-radial-gradient-slice-2.html
-== border-image-radial-gradient-slice-fill-1.html border-image-radial-gradient-slice-fill-1.html
-skip fuzzy-if(OSX,2,4478) fuzzy-if(skiaContent,2,120) == border-image-radial-gradient-slice-fill-2.html border-image-radial-gradient-slice-fill-2.html
-fails fuzzy-if(skiaContent,1,2) == border-image-radial-gradient-width.html border-image-radial-gradient-width.html
-== border-image-radial-gradient-slice-width.html border-image-radial-gradient-slice-width.html
-
-# OS X failures tracked in bug 957025
-== border-image-repeating-linear-gradient.html border-image-repeating-linear-gradient.html
-fails-if(OSX) fuzzy-if(skiaContent,3,3157) == border-image-repeating-linear-gradient-slice-fill-2.html border-image-repeating-linear-gradient-slice-fill-2.html
-fails-if(OSX) fuzzy-if(skiaContent,3,20000) == border-image-repeating-linear-gradient-repeat-round-2.html border-image-repeating-linear-gradient-repeat-round-2.html
-
-== border-image-repeating-radial-gradient.html border-image-repeating-radial-gradient.html
-fuzzy-if(skiaContent,3,362) == border-image-repeating-radial-gradient-slice-1.html border-image-repeating-radial-gradient-slice-1.html
-fuzzy-if(skiaContent,3,437) == border-image-repeating-radial-gradient-slice-2.html border-image-repeating-radial-gradient-slice-2.html
-fuzzy-if(skiaContent,3,964) == border-image-repeating-radial-gradient-slice-fill-1.html border-image-repeating-radial-gradient-slice-fill-1.html
-fails-if(OSX) fuzzy-if(skiaContent,3,887) == border-image-repeating-radial-gradient-slice-fill-2.html border-image-repeating-radial-gradient-slice-fill-2.html
-skip == border-image-repeating-radial-gradient-width.html border-image-repeating-radial-gradient-width.html
-fails fails-if(OSX) fuzzy-if(skiaContent,4,16462) == border-image-repeating-radial-gradient-slice-width.html border-image-repeating-radial-gradient-slice-width.html
-== border-image-repeating-radial-gradient-repeat-repeat-2.html border-image-repeating-radial-gradient-repeat-repeat-2.html
-fails-if(OSX) fuzzy-if(skiaContent,2,952) == border-image-repeating-radial-gradient-repeat-round-2.html border-image-repeating-radial-gradient-repeat-round-2.html
-
-# border-image-source (-moz-)element
-fuzzy-if(B2G,151,5809) == border-image-element.html border-image-element.html
-
-# svg-as-border-image
-== svg-as-border-image-1a.html svg-as-border-image-1a.html
-== svg-as-border-image-1b.html svg-as-border-image-1b.html
-== svg-as-border-image-1c.html svg-as-border-image-1c.html
-== svg-as-border-image-2.html svg-as-border-image-2.html
-== svg-as-border-image-3.html svg-as-border-image-3.html
-== svg-as-border-image-4.html svg-as-border-image-4.html
diff --git a/layout/reftests/border-image/reftest.list b/layout/reftests/border-image/reftest.list
index b6204be15..382150433 100644
--- a/layout/reftests/border-image/reftest.list
+++ b/layout/reftests/border-image/reftest.list
@@ -17,8 +17,8 @@ fuzzy-if(winWidget,1,1) == multicolor-image-2.html multicolor-image-2-ref.html
!= different-h-v-2.html different-h-v-ref.html
!= different-h-v-1.html different-h-v-2.html
== center-scaling-1.html center-scaling-1-ref.html
-fails-if(Android) fails-if(usesRepeatResampling) == center-scaling-2.html center-scaling-2-ref.html # Android: very different scaling (blurriness) on some sides
-fails-if(Android) fails-if(usesRepeatResampling) == center-scaling-3.html center-scaling-3-ref.html # Android: very different scaling (blurriness) on some sides
+fails-if(usesRepeatResampling) == center-scaling-2.html center-scaling-2-ref.html
+fails-if(usesRepeatResampling) == center-scaling-3.html center-scaling-3-ref.html
== center-scaling-4t.html center-scaling-4t-ref.html
== center-scaling-4r.html center-scaling-4r-ref.html
== center-scaling-4b.html center-scaling-4b-ref.html
diff --git a/layout/reftests/border-radius/reftest-stylo.list b/layout/reftests/border-radius/reftest-stylo.list
deleted file mode 100644
index f19a311ef..000000000
--- a/layout/reftests/border-radius/reftest-stylo.list
+++ /dev/null
@@ -1,117 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# really basic tests that square, circular, and elliptical border and
-# outline radius are not the same thing
-== border-square.html border-square.html
-== border-circle.html border-circle.html
-== border-ellips.html border-ellips.html
-== border-square.html border-square.html
-== border-square.html border-square.html
-== border-circle.html border-circle.html
-
-== outline-square.html outline-square.html
-== outline-circle.html outline-circle.html
-== outline-ellips.html outline-ellips.html
-== outline-square.html outline-square.html
-== outline-square.html outline-square.html
-== outline-circle.html outline-circle.html
-== border-value-interpret.html border-value-interpret.html
-== curved-borders-all-styles.html curved-borders-all-styles.html
-# no way to generate reference for dotted/dashed/inset/outset
-# ridge/groove borders
-
-# percent units
-== percent-1.html percent-1.html
-fuzzy-if(skiaContent,1,342) == percent-2.html percent-2.html
-fuzzy-if(skiaContent,1,343) == percent-3.html percent-3.html
-
-# more serious tests, using SVG reference
-== border-circle-2.html border-circle-2.html
-fuzzy-if(gtkWidget,14,280) fuzzy-if(cocoaWidget,4,582) fuzzy-if(Android||B2G,36,264) fuzzy-if(d2d,51,323) fuzzy-if(winWidget&&!d2d,16,377) fuzzy-if(skiaContent,52,377) == curved-stripe-border.html curved-stripe-border.html
-# bug 459945
-
-# Corners
-== corner-1.html corner-1.html
-# bottom corners different radius than top corners
-skip fuzzy-if(gtkWidget,23,5) fuzzy-if(winWidget&&!d2d,23,5) fuzzy-if(d2d,32,8) fuzzy-if(Android||B2G,10,8) == corner-2.html corner-2.html
-# right corners different radius than left corners; see bug 500804
-fuzzy-if(gtkWidget,3,10) fuzzy-if(winWidget&&!d2d,3,10) fuzzy-if(d2d,15,32) fuzzy-if(Android||B2G,3,15) fuzzy-if(skiaContent,3,100) == corner-3.html corner-3.html
-fails fuzzy-if(skiaContent,1,2728) == corner-4.html corner-4.html
-
-# Test that radii too long are reduced
-== border-reduce-height.html border-reduce-height.html
-
-# Tests for border clipping
-== clipping-1.html clipping-1.html
-# background color should completely fill box; bug 466572
-== clipping-2.html clipping-2.html
-# background color clipped to inner/outer border, can't get
-# great tests for this due to antialiasing problems described in bug 466572
-fuzzy-if(skiaContent,1,13) == clipping-3.html clipping-3.html
-# edge of border-radius clips an underlying object's background
-
-# Tests for clipping the contents of replaced elements and overflow!=visible
-== clipping-4-ref.html clipping-4-ref.html
-fuzzy-if(true,1,20) fuzzy-if(d2d,64,196) fuzzy-if(cocoaWidget,1,180) fuzzy-if(Android,140,237) == clipping-4-canvas.html clipping-4-canvas.html
-# bug 732535
-fuzzy-if(Android,5,54) fuzzy-if(/^Windows\x20NT\x206\.2/.test(http.oscpu),1,10) == clipping-4-image.html clipping-4-image.html
-fuzzy-if(/^Windows\x20NT\x206\.2/.test(http.oscpu),1,10) fuzzy-if(skiaContent,1,77) == clipping-4-overflow-hidden.html clipping-4-overflow-hidden.html
-== clipping-5-canvas.html clipping-5-canvas.html
-fuzzy-if(/^Windows\x20NT\x206\.2/.test(http.oscpu),1,5) == clipping-5-image.html clipping-5-image.html
-fuzzy-if(/^Windows\x20NT\x206\.2/.test(http.oscpu),1,5) fuzzy-if(skiaContent,1,77) == clipping-5-overflow-hidden.html clipping-5-overflow-hidden.html
-fuzzy-if(/^Windows\x20NT\x206\.2/.test(http.oscpu),1,5) fuzzy-if(Android,5,21) fuzzy-if(skiaContent,1,77) == clipping-5-refi.html clipping-5-refi.html
-fuzzy-if(true,1,7) fuzzy-if(d2d,48,94) fuzzy-if(cocoaWidget,1,99) fuzzy-if(Android,99,115) fuzzy-if(skiaContent,1,77) == clipping-5-refc.html clipping-5-refc.html
-# bug 732535
-fuzzy-if(winWidget,105,71) fuzzy-if(Android,8,469) == clipping-6.html clipping-6.html
-# PaintedLayer and MaskLayer with transforms that aren't identical
-fuzzy-if(true,2,29) fuzzy-if(d2d,46,50) fuzzy-if(Android,255,586) fuzzy-if(skiaContent,16,27) == clipping-7.html clipping-7.html
-# ColorLayer and MaskLayer with transforms that aren't identical. Reference image rendered without using layers (which causes fuzzy failures).
-fuzzy-if(/^Windows\x20NT\x206\.2/.test(http.oscpu),1,5) == clipping-and-zindex-1.html clipping-and-zindex-1.html
-fuzzy-if(cocoaWidget,1,4) == intersecting-clipping-1-canvas.html intersecting-clipping-1-canvas.html
-== intersecting-clipping-1-image.html intersecting-clipping-1-image.html
-== intersecting-clipping-1-overflow-hidden.html intersecting-clipping-1-overflow-hidden.html
-fuzzy-if(Android,5,105) fuzzy-if(d2d,1,20) fuzzy-if(skiaContent,1,135) == intersecting-clipping-1-refi.html intersecting-clipping-1-refi.html
-fuzzy-if(true,1,33) fuzzy-if(d2d,48,350) fuzzy-if(cocoaWidget,1,332) fuzzy-if(Android,124,440) fuzzy-if(skiaContent,1,135) == intersecting-clipping-1-refc.html intersecting-clipping-1-refc.html
-# bug 732535
-
-# Inheritance
-== inherit-1.html inherit-1.html
-# border-radius shouldn't inherit
-
-# Table elements
-== table-collapse-1.html table-collapse-1.html
-# border-radius is ignored on internal table elements
-# when border-collapse: collapse
-
-fails fuzzy-if(azureQuartz,1,3) skip-if(B2G||Mulet) fuzzy-if(skiaContent,1,116) == invalidate-1a.html invalidate-1a.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails fuzzy-if(azureQuartz,1,3) skip-if(B2G||Mulet) fuzzy-if(skiaContent,1,117) == invalidate-1b.html invalidate-1b.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-# test that border-radius is reduced for scrollbars
-skip-if(B2G||Mulet) fails-if(Android) fuzzy-if(asyncPan&&!layersGPUAccelerated,12,12) fuzzy-if(browserIsRemote&&layersGPUAccelerated&&/^Windows\x20NT\x206\.1/.test(http.oscpu),12,12) fuzzy-if(skiaContent,1,50) == scrollbar-clamping-1.html scrollbar-clamping-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) fails-if(Android) == scrollbar-clamping-2.html scrollbar-clamping-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-# Test for bad corner joins.
-fails fuzzy-if(true,1,1) == corner-joins-1.xhtml corner-joins-1.xhtml
-fails skip-if(B2G||Mulet) random-if(winWidget) fuzzy-if(skiaContent,255,610) HTTP(..) == corner-joins-2.xhtml corner-joins-2.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-skip-if(B2G||Mulet) fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu)||/^Windows\x20NT\x206\.2/.test(http.oscpu),1,20) fuzzy-if(d2d,64,157) fuzzy-if(Android,166,400) fuzzy-if(skiaContent,64,70) == scroll-1.html scroll-1.html
-# see bug 732535 #Bug 959166
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-== transforms-1.html transforms-1.html
-
-== zero-radius-clip-1.html zero-radius-clip-1.html
-
-== iframe-1.html iframe-1.html
-
-# Test for antialiasing gaps between background and border
-fuzzy-if(gtkWidget,1,9) fuzzy-if(winWidget&&!d2d,1,9) fuzzy-if(d2d,5,40) fuzzy-if(Android||B2G||skiaContent,1,9) == curved-border-background-nogap.html curved-border-background-nogap.html
-
-== color-layer-1a.html color-layer-1a.html
-
-== corner-split.html corner-split.html
-# bug 1185636
diff --git a/layout/reftests/border-radius/reftest.list b/layout/reftests/border-radius/reftest.list
index e199a4aea..4b2d2f4ee 100644
--- a/layout/reftests/border-radius/reftest.list
+++ b/layout/reftests/border-radius/reftest.list
@@ -24,12 +24,12 @@ fuzzy-if(skiaContent,1,343) == percent-3.html percent-3-ref.html
# more serious tests, using SVG reference
== border-circle-2.html border-circle-2-ref.xhtml
-fuzzy-if(gtkWidget,14,280) fuzzy-if(cocoaWidget,4,582) fuzzy-if(Android,36,264) fuzzy-if(d2d,51,323) fuzzy-if(winWidget&&!d2d,16,377) fuzzy-if(skiaContent,52,377) == curved-stripe-border.html curved-stripe-border-ref.svg # bug 459945
+fuzzy-if(gtkWidget,14,280) fuzzy-if(cocoaWidget,4,582) fuzzy-if(d2d,51,323) fuzzy-if(winWidget&&!d2d,16,377) fuzzy-if(skiaContent,52,377) == curved-stripe-border.html curved-stripe-border-ref.svg # bug 459945
# Corners
== corner-1.html corner-1-ref.svg # bottom corners different radius than top corners
-fuzzy-if(gtkWidget,23,5) fuzzy-if(winWidget&&!d2d,23,5) fuzzy-if(d2d,32,8) fuzzy-if(Android,10,8) == corner-2.html corner-2-ref.svg # right corners different radius than left corners; see bug 500804
-fuzzy-if(gtkWidget,3,10) fuzzy-if(winWidget&&!d2d,3,10) fuzzy-if(d2d,15,32) fuzzy-if(Android,3,15) fuzzy-if(skiaContent,3,100) == corner-3.html corner-3-ref.svg
+fuzzy-if(gtkWidget,23,5) fuzzy-if(winWidget&&!d2d,23,5) fuzzy-if(d2d,32,8) == corner-2.html corner-2-ref.svg # right corners different radius than left corners; see bug 500804
+fuzzy-if(gtkWidget,3,10) fuzzy-if(winWidget&&!d2d,3,10) fuzzy-if(d2d,15,32) fuzzy-if(skiaContent,3,100) == corner-3.html corner-3-ref.svg
fuzzy-if(skiaContent,1,2728) == corner-4.html corner-4-ref.svg
# Test that radii too long are reduced
@@ -43,22 +43,22 @@ fuzzy-if(skiaContent,1,13) == clipping-3.html clipping-3-ref.xhtml # edge of bor
# Tests for clipping the contents of replaced elements and overflow!=visible
!= clipping-4-ref.html clipping-4-notref.html
-fuzzy-if(true,1,20) fuzzy-if(d2d,64,196) fuzzy-if(cocoaWidget,1,180) fuzzy-if(Android,140,237) == clipping-4-canvas.html clipping-4-ref.html # bug 732535
-fuzzy-if(Android,5,54) fuzzy-if(/^Windows\x20NT\x206\.2/.test(http.oscpu),1,10) fuzzy-if(skiaContent,1,140) == clipping-4-image.html clipping-4-ref.html
+fuzzy-if(true,1,20) fuzzy-if(d2d,64,196) fuzzy-if(cocoaWidget,1,180) == clipping-4-canvas.html clipping-4-ref.html # bug 732535
+fuzzy-if(/^Windows\x20NT\x206\.2/.test(http.oscpu),1,10) fuzzy-if(skiaContent,1,140) == clipping-4-image.html clipping-4-ref.html
fuzzy-if(/^Windows\x20NT\x206\.2/.test(http.oscpu),1,10) fuzzy-if(skiaContent,1,77) == clipping-4-overflow-hidden.html clipping-4-ref.html
== clipping-5-canvas.html clipping-5-refc.html
fuzzy-if(/^Windows\x20NT\x206\.2/.test(http.oscpu),1,5) == clipping-5-image.html clipping-5-refi.html
fuzzy-if(/^Windows\x20NT\x206\.2/.test(http.oscpu),1,5) fuzzy-if(skiaContent,1,77) == clipping-5-overflow-hidden.html clipping-5-ref.html
-fuzzy-if(/^Windows\x20NT\x206\.2/.test(http.oscpu),1,5) fuzzy-if(Android,5,21) fuzzy-if(skiaContent,1,77) == clipping-5-refi.html clipping-5-ref.html
-fuzzy-if(true,1,7) fuzzy-if(d2d,48,94) fuzzy-if(cocoaWidget,1,99) fuzzy-if(Android,99,115) fuzzy-if(skiaContent,1,77) == clipping-5-refc.html clipping-5-ref.html # bug 732535
-fuzzy-if(winWidget,105,71) fuzzy-if(Android,8,469) == clipping-6.html clipping-6-ref.html # PaintedLayer and MaskLayer with transforms that aren't identical
-fuzzy-if(true,2,29) fuzzy-if(d2d,46,50) fuzzy-if(Android,255,586) fuzzy-if(skiaContent,19,29) == clipping-7.html clipping-7-ref.html # ColorLayer and MaskLayer with transforms that aren't identical. Reference image rendered without using layers (which causes fuzzy failures).
+fuzzy-if(/^Windows\x20NT\x206\.2/.test(http.oscpu),1,5) fuzzy-if(skiaContent,1,77) == clipping-5-refi.html clipping-5-ref.html
+fuzzy-if(true,1,7) fuzzy-if(d2d,48,94) fuzzy-if(cocoaWidget,1,99) fuzzy-if(skiaContent,1,77) == clipping-5-refc.html clipping-5-ref.html # bug 732535
+fuzzy-if(winWidget,105,71) == clipping-6.html clipping-6-ref.html # PaintedLayer and MaskLayer with transforms that aren't identical
+fuzzy-if(true,2,29) fuzzy-if(d2d,46,50) fuzzy-if(skiaContent,19,29) == clipping-7.html clipping-7-ref.html # ColorLayer and MaskLayer with transforms that aren't identical. Reference image rendered without using layers (which causes fuzzy failures).
fuzzy-if(/^Windows\x20NT\x206\.2/.test(http.oscpu),1,5) == clipping-and-zindex-1.html clipping-and-zindex-1-ref.html
fuzzy-if(cocoaWidget,1,4) == intersecting-clipping-1-canvas.html intersecting-clipping-1-refc.html
== intersecting-clipping-1-image.html intersecting-clipping-1-refi.html
== intersecting-clipping-1-overflow-hidden.html intersecting-clipping-1-ref.html
-fuzzy-if(Android,5,105) fuzzy-if(d2d,1,20) fuzzy-if(skiaContent,1,250) == intersecting-clipping-1-refi.html intersecting-clipping-1-ref.html
-fuzzy-if(true,1,33) fuzzy-if(d2d,48,350) fuzzy-if(cocoaWidget,1,332) fuzzy-if(Android,124,440) fuzzy-if(skiaContent,1,135) == intersecting-clipping-1-refc.html intersecting-clipping-1-ref.html # bug 732535
+fuzzy-if(d2d,1,20) fuzzy-if(skiaContent,1,250) == intersecting-clipping-1-refi.html intersecting-clipping-1-ref.html
+fuzzy-if(true,1,33) fuzzy-if(d2d,48,350) fuzzy-if(cocoaWidget,1,332) fuzzy-if(skiaContent,1,135) == intersecting-clipping-1-refc.html intersecting-clipping-1-ref.html # bug 732535
# Inheritance
== inherit-1.html inherit-1-ref.html # border-radius shouldn't inherit
@@ -71,14 +71,14 @@ fuzzy-if(azureQuartz,1,3) fuzzy-if(skiaContent,1,116) == invalidate-1a.html inva
fuzzy-if(azureQuartz,1,3) fuzzy-if(skiaContent,1,117) == invalidate-1b.html invalidate-1-ref.html
# test that border-radius is reduced for scrollbars
-fails-if(Android) fuzzy-if(asyncPan&&!layersGPUAccelerated,12,12) fuzzy-if(browserIsRemote&&layersGPUAccelerated&&/^Windows\x20NT\x206\.1/.test(http.oscpu),12,12) fuzzy-if(skiaContent&&!Android,1,50) fuzzy-if(gtkWidget&&layersGPUAccelerated,12,12) == scrollbar-clamping-1.html scrollbar-clamping-1-ref.html
-fails-if(Android) == scrollbar-clamping-2.html scrollbar-clamping-2-ref.html
+fuzzy-if(asyncPan&&!layersGPUAccelerated,12,12) fuzzy-if(browserIsRemote&&layersGPUAccelerated&&/^Windows\x20NT\x206\.1/.test(http.oscpu),12,12) fuzzy-if(skiaContent,1,50) fuzzy-if(gtkWidget&&layersGPUAccelerated,12,12) == scrollbar-clamping-1.html scrollbar-clamping-1-ref.html
+== scrollbar-clamping-2.html scrollbar-clamping-2-ref.html
# Test for bad corner joins.
fuzzy-if(true,1,1) == corner-joins-1.xhtml corner-joins-1-ref.xhtml
fuzzy(255,20) random-if(winWidget) fuzzy-if(skiaContent,255,610) HTTP(..) == corner-joins-2.xhtml corner-joins-2-ref.xhtml
-fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu)||/^Windows\x20NT\x206\.2/.test(http.oscpu),1,20) fuzzy-if(d2d,64,157) fuzzy-if(Android,166,400) fuzzy-if(skiaContent,64,70) == scroll-1.html scroll-1-ref.html # see bug 732535 #Bug 959166
+fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu)||/^Windows\x20NT\x206\.2/.test(http.oscpu),1,20) fuzzy-if(d2d,64,157) fuzzy-if(skiaContent,64,70) == scroll-1.html scroll-1-ref.html # see bug 732535 #Bug 959166
== transforms-1.html transforms-1-ref.html
@@ -87,7 +87,7 @@ fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu)||/^Windows\x20NT\x206\.2/.te
== iframe-1.html iframe-1-ref.html
# Test for antialiasing gaps between background and border
-fuzzy-if(gtkWidget,1,9) fuzzy-if(winWidget&&!d2d,1,9) fuzzy-if(d2d,5,40) fuzzy-if(Android||skiaContent,1,9) == curved-border-background-nogap.html curved-border-background-nogap-ref.html
+fuzzy-if(gtkWidget,1,9) fuzzy-if(winWidget&&!d2d,1,9) fuzzy-if(d2d,5,40) fuzzy-if(skiaContent,1,9) == curved-border-background-nogap.html curved-border-background-nogap-ref.html
== color-layer-1a.html color-layer-1-ref.html
diff --git a/layout/reftests/box-ordinal/reftest-stylo.list b/layout/reftests/box-ordinal/reftest-stylo.list
deleted file mode 100644
index 81276fa5a..000000000
--- a/layout/reftests/box-ordinal/reftest-stylo.list
+++ /dev/null
@@ -1,15 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== box-ordinal-with-out-of-flow-1.html box-ordinal-with-out-of-flow-1.html
-skip-if((B2G&&browserIsRemote)||Mulet) == dynamic-1-remove-to-none-grouped.xul dynamic-1-remove-to-none-grouped.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == dynamic-1-add-to-one-grouped.xul dynamic-1-add-to-one-grouped.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == dynamic-1-remove-to-one-grouped-1.xul dynamic-1-remove-to-one-grouped-1.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == dynamic-1-remove-to-one-grouped-2.xul dynamic-1-remove-to-one-grouped-2.xul
-# bug 575500
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == dynamic-1-add-to-two-grouped-1.xul dynamic-1-add-to-two-grouped-1.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == dynamic-1-add-to-two-grouped-2.xul dynamic-1-add-to-two-grouped-2.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
diff --git a/layout/reftests/box-properties/reftest-stylo.list b/layout/reftests/box-properties/reftest-stylo.list
deleted file mode 100644
index b25f1258e..000000000
--- a/layout/reftests/box-properties/reftest-stylo.list
+++ /dev/null
@@ -1,37 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== outline-radius-percent-1.html outline-radius-percent-1.html
-== min-width-1.html min-width-1.html
-== min-height-1.html min-height-1.html
-== max-width-1.html max-width-1.html
-== max-height-1.html max-height-1.html
-== width-special-values-block.html width-special-values-block.html
-== width-special-values-float.html width-special-values-float.html
-random == width-special-values-image-block.html width-special-values-image-block.html
-== width-special-values-image.html width-special-values-image.html
-== width-special-values-block-intrinsic.html width-special-values-block-intrinsic.html
-== width-special-values-float-intrinsic.html width-special-values-float-intrinsic.html
-skip == minmax-width-special-values-block-intrinsic.html minmax-width-special-values-block-intrinsic.html
-skip == width-special-values-cell-auto.html width-special-values-cell-auto.html
-== width-special-values-cell-fixed.html width-special-values-cell-fixed.html
-== box-sizing-1.html box-sizing-1.html
-== box-sizing-2.html box-sizing-2.html
-== box-sizing-3.html box-sizing-3.html
-== box-sizing-4.html box-sizing-4.html
-== box-sizing-minmax-height.html box-sizing-minmax-height.html
-== box-sizing-minmax-width.html box-sizing-minmax-width.html
-== box-sizing-mozbox-minmax-height.html box-sizing-mozbox-minmax-height.html
-skip == abspos-non-replaced-width-offset-margin.html abspos-non-replaced-width-offset-margin.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip == abspos-replaced-width-offset-margin.html abspos-replaced-width-offset-margin.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) HTTP(..) == CSS21-t100301.xhtml CSS21-t100301.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-random-if(B2G||Mulet) == CSS21-t100303.xhtml CSS21-t100303.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-random-if(B2G||Mulet) == CSS21-t100303-simple.xhtml CSS21-t100303-simple.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-random-if(B2G||Mulet) == CSS21-t100801-vertical-align.xhtml CSS21-t100801-vertical-align.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-== clip-auto.html clip-auto.html
-== clip-rect-auto.html clip-rect-auto.html
-== width-rounding.html width-rounding.html
diff --git a/layout/reftests/box-shadow/reftest-stylo.list b/layout/reftests/box-shadow/reftest-stylo.list
deleted file mode 100644
index 7082972ff..000000000
--- a/layout/reftests/box-shadow/reftest-stylo.list
+++ /dev/null
@@ -1,57 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== boxshadow-basic.html boxshadow-basic.html
-== boxshadow-blur.html boxshadow-blur.html
-== boxshadow-blur.html boxshadow-blur.html
-random == boxshadow-blur-2.html boxshadow-blur-2.html
-# fixedpoint division in blur code makes this fail
-random == boxshadow-blur-2.html boxshadow-blur-2.html
-# fixedpoint division in blur code makes this fail
-== boxshadow-multiple.html boxshadow-multiple.html
-== boxshadow-spread.html boxshadow-spread.html
-== tableboxshadow-basic.html tableboxshadow-basic.html
-== tableboxshadow-trshadow.html tableboxshadow-trshadow.html
-== tableboxshadow-tdshadow.html tableboxshadow-tdshadow.html
-== boxshadow-rounding.html boxshadow-rounding.html
-fails-if(Android||B2G||Mulet) == boxshadow-button.html boxshadow-button.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(Android||B2G||Mulet) == boxshadow-fileupload.html boxshadow-fileupload.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== boxshadow-inner-basic.html boxshadow-inner-basic.html
-random-if(layersGPUAccelerated) == boxshadow-mixed.html boxshadow-mixed.html
-random-if(d2d) fuzzy-if(B2G,12,18) == boxshadow-rounded-spread.html boxshadow-rounded-spread.html
-skip-if((B2G&&browserIsRemote)||Mulet) fuzzy-if(skiaContent,1,50) HTTP(..) == boxshadow-dynamic.xul boxshadow-dynamic.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-random-if(d2d) == boxshadow-onecorner.html boxshadow-onecorner.html
-skip random-if(d2d) == boxshadow-twocorners.html boxshadow-twocorners.html
-random-if(d2d) == boxshadow-threecorners.html boxshadow-threecorners.html
-skip == boxshadow-skiprect.html boxshadow-skiprect.html
-== boxshadow-opacity.html boxshadow-opacity.html
-== boxshadow-color-rounding.html boxshadow-color-rounding.html
-== boxshadow-color-rounding-middle.html boxshadow-color-rounding-middle.html
-fuzzy-if(OSX==1010,1,24) fuzzy-if(d2d,16,568) == boxshadow-large-border-radius.html boxshadow-large-border-radius.html
-# Bug 1209649
-fuzzy-if(d2d,2,1080) == boxshadow-border-radius-int.html boxshadow-border-radius-int.html
-== boxshadow-inset-neg-spread.html boxshadow-inset-neg-spread.html
-== boxshadow-inset-neg-spread2.html boxshadow-inset-neg-spread2.html
-== boxshadow-rotated.html boxshadow-rotated.html
-# Bug 1211264
-== boxshadow-inset-large-border-radius.html boxshadow-inset-large-border-radius.html
-
-# fuzzy due to blur going inside, but as long as it's essentially black instead of a light gray its ok.
-== boxshadow-inset-large-offset.html boxshadow-inset-large-offset.html
-
-== overflow-not-scrollable-1.html overflow-not-scrollable-1.html
-== overflow-not-scrollable-1.html overflow-not-scrollable-1.html
-== overflow-not-scrollable-2.html overflow-not-scrollable-2.html
-fails-if(B2G||Mulet) == 611574-1.html 611574-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip fails-if(B2G||Mulet) == 611574-2.html 611574-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fuzzy-if(winWidget,5,30) fuzzy-if(skiaContent,16,10) == fieldset.html fieldset.html
-# minor anti-aliasing problem on Windows
-fails fuzzy-if(winWidget,5,30) fuzzy-if(skiaContent,16,10) == fieldset-inset.html fieldset-inset.html
-# minor anti-aliasing problem on Windows
-== 1178575.html 1178575.html
-== 1178575-2.html 1178575-2.html
-== 1212823-1.html 1212823-1.html
-== boxshadow-large-offset.html boxshadow-large-offset.html
diff --git a/layout/reftests/box-shadow/reftest.list b/layout/reftests/box-shadow/reftest.list
index a1091b4b2..8f6229943 100644
--- a/layout/reftests/box-shadow/reftest.list
+++ b/layout/reftests/box-shadow/reftest.list
@@ -9,8 +9,8 @@ random != boxshadow-blur-2.html boxshadow-blur-2-notref.html # fixedpoint divisi
== tableboxshadow-trshadow.html tableboxshadow-trshadow-ref.html
== tableboxshadow-tdshadow.html tableboxshadow-tdshadow-ref.html
== boxshadow-rounding.html boxshadow-rounding-ref.html
-fails-if(Android) == boxshadow-button.html boxshadow-button-ref.html
-fails-if(Android) == boxshadow-fileupload.html boxshadow-fileupload-ref.html
+== boxshadow-button.html boxshadow-button-ref.html
+== boxshadow-fileupload.html boxshadow-fileupload-ref.html
== boxshadow-inner-basic.html boxshadow-inner-basic-ref.svg
random-if(layersGPUAccelerated) == boxshadow-mixed.html boxshadow-mixed-ref.html
random-if(d2d) == boxshadow-rounded-spread.html boxshadow-rounded-spread-ref.html
diff --git a/layout/reftests/box-sizing/reftest-stylo.list b/layout/reftests/box-sizing/reftest-stylo.list
deleted file mode 100644
index 14f284397..000000000
--- a/layout/reftests/box-sizing/reftest-stylo.list
+++ /dev/null
@@ -1,17 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== intrinsic-1a.html intrinsic-1a.html
-== intrinsic-1b.html intrinsic-1b.html
-== intrinsic-1c.html intrinsic-1c.html
-== intrinsic-1d.html intrinsic-1d.html
-== intrinsic-1e.html intrinsic-1e.html
-== intrinsic-1f.html intrinsic-1f.html
-== intrinsic-1g.html intrinsic-1g.html
-== intrinsic-1h.html intrinsic-1h.html
-== intrinsic-1i.html intrinsic-1i.html
-== intrinsic-1j.html intrinsic-1j.html
-== intrinsic-1k.html intrinsic-1k.html
-== intrinsic-1l.html intrinsic-1l.html
-== intrinsic-1m.html intrinsic-1m.html
-== intrinsic-1n.html intrinsic-1n.html
-== intrinsic-1o.html intrinsic-1o.html
-== computed-size-reporting.html computed-size-reporting.html
diff --git a/layout/reftests/box/reftest-stylo.list b/layout/reftests/box/reftest-stylo.list
deleted file mode 100644
index e8328f173..000000000
--- a/layout/reftests/box/reftest-stylo.list
+++ /dev/null
@@ -1,14 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== flexbox-abspos-container-1a.html flexbox-abspos-container-1a.html
-== flexbox-abspos-container-1b.html flexbox-abspos-container-1b.html
-== flexbox-abspos-container-1c.html flexbox-abspos-container-1c.html
-== flexbox-abspos-container-1d.html flexbox-abspos-container-1d.html
-== flexbox-abspos-container-2.html flexbox-abspos-container-2.html
-== flexbox-attributes-no-box-horizontal.xhtml flexbox-attributes-no-box-horizontal.xhtml
-== flexbox-attributes-no-box-vertical.xhtml flexbox-attributes-no-box-vertical.xhtml
-skip-if(B2G||Mulet) == flexbox-attributes-no-input-horizontal.xhtml flexbox-attributes-no-input-horizontal.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == flexbox-attributes-no-input-vertical.xhtml flexbox-attributes-no-input-vertical.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-== flexbox-child-is-abspos-container-1.html flexbox-child-is-abspos-container-1.html
-== flexbox-child-is-abspos-container-2.html flexbox-child-is-abspos-container-2.html
diff --git a/layout/reftests/bugs/1066554-1.html b/layout/reftests/bugs/1066554-1.html
index bb0a97f96..f4df207a1 100644
--- a/layout/reftests/bugs/1066554-1.html
+++ b/layout/reftests/bugs/1066554-1.html
@@ -7,15 +7,17 @@
<script>
function insertShadowSVG() {
var x = document.getElementById("x");
- x.createShadowRoot();
- x.shadowRoot.innerHTML =
- '<svg width="50px" height="10px"> \
- <switch> \
- <foreignObject width="50px" height="50px"> \
- <div style="width: 100px; height: 10px; background: red;"></div> \
- </foreignObject> \
- </switch> \
- </svg>';
+ if (x.createShadowRoot) {
+ x.createShadowRoot();
+ x.shadowRoot.innerHTML =
+ '<svg width="50px" height="10px"> \
+ <switch> \
+ <foreignObject width="50px" height="50px"> \
+ <div style="width: 100px; height: 10px; background: red;"></div> \
+ </foreignObject> \
+ </switch> \
+ </svg>';
+ }
document.documentElement.removeAttribute("class");
}
window.addEventListener("MozReftestInvalidate", insertShadowSVG, false);
diff --git a/layout/reftests/bugs/1133905-1-h-rtl.html b/layout/reftests/bugs/1133905-1-h-rtl.html
deleted file mode 100644
index bc53a95ca..000000000
--- a/layout/reftests/bugs/1133905-1-h-rtl.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=325">
-<style> html { direction: rtl; } </style>
-</head>
-<body>
-<div style="width: 9000px;"></div>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-1-h.html b/layout/reftests/bugs/1133905-1-h.html
deleted file mode 100644
index b7d476e3a..000000000
--- a/layout/reftests/bugs/1133905-1-h.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=325">
-</head>
-<body>
-<div style="width: 9000px;"></div>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-1-rtl.html b/layout/reftests/bugs/1133905-1-rtl.html
deleted file mode 100644
index d3b3e6437..000000000
--- a/layout/reftests/bugs/1133905-1-rtl.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=325">
-<style> html { direction: rtl; } </style>
-</head>
-<body>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-1-v-rtl.html b/layout/reftests/bugs/1133905-1-v-rtl.html
deleted file mode 100644
index 1ebb54b4c..000000000
--- a/layout/reftests/bugs/1133905-1-v-rtl.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=325">
-<style> html { direction: rtl; } </style>
-</head>
-<body>
-<div style="height: 8228px;"></div>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-1-v.html b/layout/reftests/bugs/1133905-1-v.html
deleted file mode 100644
index ab19f5663..000000000
--- a/layout/reftests/bugs/1133905-1-v.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=325">
-</head>
-<body>
-<div style="height: 8228px;"></div>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-1-vh-rtl.html b/layout/reftests/bugs/1133905-1-vh-rtl.html
deleted file mode 100644
index 1a0dc8999..000000000
--- a/layout/reftests/bugs/1133905-1-vh-rtl.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=325">
-<style> html { direction: rtl; } </style>
-</head>
-<body>
-<div style="height: 8228px; width: 9000px;"></div>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-1-vh.html b/layout/reftests/bugs/1133905-1-vh.html
deleted file mode 100644
index 4546fc7cc..000000000
--- a/layout/reftests/bugs/1133905-1-vh.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=325">
-</head>
-<body>
-<div style="height: 8228px; width: 9000px;"></div>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-1.html b/layout/reftests/bugs/1133905-1.html
deleted file mode 100644
index d8c804463..000000000
--- a/layout/reftests/bugs/1133905-1.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=325">
-</head>
-<body>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-2-h-rtl.html b/layout/reftests/bugs/1133905-2-h-rtl.html
deleted file mode 100644
index a4c48921a..000000000
--- a/layout/reftests/bugs/1133905-2-h-rtl.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=125">
-<style> html { direction: rtl; } </style>
-</head>
-<body>
-<div style="width: 9000px;"></div>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-2-h.html b/layout/reftests/bugs/1133905-2-h.html
deleted file mode 100644
index 8ed979684..000000000
--- a/layout/reftests/bugs/1133905-2-h.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=125">
-</head>
-<body>
-<div style="width: 9000px;"></div>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-2-rtl.html b/layout/reftests/bugs/1133905-2-rtl.html
deleted file mode 100644
index cf131bc68..000000000
--- a/layout/reftests/bugs/1133905-2-rtl.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=125">
-<style> html { direction: rtl; } </style>
-</head>
-<body>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-2-v-rtl.html b/layout/reftests/bugs/1133905-2-v-rtl.html
deleted file mode 100644
index 4752999f7..000000000
--- a/layout/reftests/bugs/1133905-2-v-rtl.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=125">
-<style> html { direction: rtl; } </style>
-</head>
-<body>
-<div style="height: 4787px;"></div>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-2-v.html b/layout/reftests/bugs/1133905-2-v.html
deleted file mode 100644
index 036b44956..000000000
--- a/layout/reftests/bugs/1133905-2-v.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=125">
-</head>
-<body>
-<div style="height: 4787px;"></div>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-2-vh-rtl.html b/layout/reftests/bugs/1133905-2-vh-rtl.html
deleted file mode 100644
index c1214f53a..000000000
--- a/layout/reftests/bugs/1133905-2-vh-rtl.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=125">
-<style> html { direction: rtl; } </style>
-</head>
-<body>
-<div style="height: 4787px; width: 9000px;"></div>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-2-vh.html b/layout/reftests/bugs/1133905-2-vh.html
deleted file mode 100644
index 23fd52590..000000000
--- a/layout/reftests/bugs/1133905-2-vh.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=125">
-</head>
-<body>
-<div style="height: 4787px; width: 9000px;"></div>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-2.html b/layout/reftests/bugs/1133905-2.html
deleted file mode 100644
index 7e306fd41..000000000
--- a/layout/reftests/bugs/1133905-2.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=125">
-</head>
-<body>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-3-h-rtl.html b/layout/reftests/bugs/1133905-3-h-rtl.html
deleted file mode 100644
index ca60b948b..000000000
--- a/layout/reftests/bugs/1133905-3-h-rtl.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=525">
-<style> html { direction: rtl; } </style>
-</head>
-<body>
-<div style="width: 9000px;"></div>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-3-h.html b/layout/reftests/bugs/1133905-3-h.html
deleted file mode 100644
index 82d858394..000000000
--- a/layout/reftests/bugs/1133905-3-h.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=525">
-</head>
-<body>
-<div style="width: 9000px;"></div>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-3-rtl.html b/layout/reftests/bugs/1133905-3-rtl.html
deleted file mode 100644
index 8d4976e69..000000000
--- a/layout/reftests/bugs/1133905-3-rtl.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=525">
-<style> html { direction: rtl; } </style>
-</head>
-<body>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-3-v-rtl.html b/layout/reftests/bugs/1133905-3-v-rtl.html
deleted file mode 100644
index ef03d4ea9..000000000
--- a/layout/reftests/bugs/1133905-3-v-rtl.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=525">
-<style> html { direction: rtl; } </style>
-</head>
-<body>
-<div style="height: 13972px;"></div>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-3-v.html b/layout/reftests/bugs/1133905-3-v.html
deleted file mode 100644
index 4a9b03df1..000000000
--- a/layout/reftests/bugs/1133905-3-v.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=525">
-</head>
-<body>
-<div style="height: 13972px;"></div>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-3-vh-rtl.html b/layout/reftests/bugs/1133905-3-vh-rtl.html
deleted file mode 100644
index 4aac4b510..000000000
--- a/layout/reftests/bugs/1133905-3-vh-rtl.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=525">
-<style> html { direction: rtl; } </style>
-</head>
-<body>
-<div style="height: 13972px; width: 9000px;"></div>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-3-vh.html b/layout/reftests/bugs/1133905-3-vh.html
deleted file mode 100644
index 5078c227e..000000000
--- a/layout/reftests/bugs/1133905-3-vh.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=525">
-</head>
-<body>
-<div style="height: 13972px; width: 9000px;"></div>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-3.html b/layout/reftests/bugs/1133905-3.html
deleted file mode 100644
index 244f0a505..000000000
--- a/layout/reftests/bugs/1133905-3.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=525">
-</head>
-<body>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-4-h-rtl.html b/layout/reftests/bugs/1133905-4-h-rtl.html
deleted file mode 100644
index ca2609c98..000000000
--- a/layout/reftests/bugs/1133905-4-h-rtl.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=725">
-<style> html { direction: rtl; } </style>
-</head>
-<body>
-<div style="width: 9000px;"></div>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-4-h.html b/layout/reftests/bugs/1133905-4-h.html
deleted file mode 100644
index 1de143625..000000000
--- a/layout/reftests/bugs/1133905-4-h.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=725">
-</head>
-<body>
-<div style="width: 9000px;"></div>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-4-rtl.html b/layout/reftests/bugs/1133905-4-rtl.html
deleted file mode 100644
index badae3b37..000000000
--- a/layout/reftests/bugs/1133905-4-rtl.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=725">
-<style> html { direction: rtl; } </style>
-</head>
-<body>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-4-v-rtl.html b/layout/reftests/bugs/1133905-4-v-rtl.html
deleted file mode 100644
index b3264e4ac..000000000
--- a/layout/reftests/bugs/1133905-4-v-rtl.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=725">
-<style> html { direction: rtl; } </style>
-</head>
-<body>
-<div style="height: 20000px;"></div>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-4-v.html b/layout/reftests/bugs/1133905-4-v.html
deleted file mode 100644
index 00100b7db..000000000
--- a/layout/reftests/bugs/1133905-4-v.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=725">
-</head>
-<body>
-<div style="height: 20000px;"></div>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-4-vh-rtl.html b/layout/reftests/bugs/1133905-4-vh-rtl.html
deleted file mode 100644
index cdb1ae155..000000000
--- a/layout/reftests/bugs/1133905-4-vh-rtl.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=725">
-<style> html { direction: rtl; } </style>
-</head>
-<body>
-<div style="height: 20000px; width: 9000px;"></div>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-4-vh.html b/layout/reftests/bugs/1133905-4-vh.html
deleted file mode 100644
index d27d438ba..000000000
--- a/layout/reftests/bugs/1133905-4-vh.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=725">
-</head>
-<body>
-<div style="height: 20000px; width: 9000px;"></div>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-4.html b/layout/reftests/bugs/1133905-4.html
deleted file mode 100644
index f4f139807..000000000
--- a/layout/reftests/bugs/1133905-4.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=725">
-</head>
-<body>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-5-h-rtl.html b/layout/reftests/bugs/1133905-5-h-rtl.html
deleted file mode 100644
index 494456d7d..000000000
--- a/layout/reftests/bugs/1133905-5-h-rtl.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=925">
-<style> html { direction: rtl; } </style>
-</head>
-<body>
-<div style="width: 9000px;"></div>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-5-h.html b/layout/reftests/bugs/1133905-5-h.html
deleted file mode 100644
index a5199516d..000000000
--- a/layout/reftests/bugs/1133905-5-h.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=925">
-</head>
-<body>
-<div style="width: 9000px;"></div>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-5-rtl.html b/layout/reftests/bugs/1133905-5-rtl.html
deleted file mode 100644
index 5125d8d13..000000000
--- a/layout/reftests/bugs/1133905-5-rtl.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=925">
-<style> html { direction: rtl; } </style>
-</head>
-<body>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-5-v-rtl.html b/layout/reftests/bugs/1133905-5-v-rtl.html
deleted file mode 100644
index b4cb88f3b..000000000
--- a/layout/reftests/bugs/1133905-5-v-rtl.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=925">
-<style> html { direction: rtl; } </style>
-</head>
-<body>
-<div style="height: 26117px;"></div>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-5-v.html b/layout/reftests/bugs/1133905-5-v.html
deleted file mode 100644
index fdacf664f..000000000
--- a/layout/reftests/bugs/1133905-5-v.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=925">
-</head>
-<body>
-<div style="height: 26117px;"></div>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-5-vh-rtl.html b/layout/reftests/bugs/1133905-5-vh-rtl.html
deleted file mode 100644
index f8ed5e938..000000000
--- a/layout/reftests/bugs/1133905-5-vh-rtl.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=925">
-<style> html { direction: rtl; } </style>
-</head>
-<body>
-<div style="height: 26117px; width: 9000px;"></div>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-5-vh.html b/layout/reftests/bugs/1133905-5-vh.html
deleted file mode 100644
index 055fd7ce8..000000000
--- a/layout/reftests/bugs/1133905-5-vh.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=925">
-</head>
-<body>
-<div style="height: 26117px; width: 9000px;"></div>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-5.html b/layout/reftests/bugs/1133905-5.html
deleted file mode 100644
index 5b8c41983..000000000
--- a/layout/reftests/bugs/1133905-5.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=925">
-</head>
-<body>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-6-h-rtl.html b/layout/reftests/bugs/1133905-6-h-rtl.html
deleted file mode 100644
index a391dfb54..000000000
--- a/layout/reftests/bugs/1133905-6-h-rtl.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=1325">
-<style> html { direction: rtl; } </style>
-</head>
-<body>
-<div style="width: 9000px;"></div>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-6-h.html b/layout/reftests/bugs/1133905-6-h.html
deleted file mode 100644
index 4d097f9e4..000000000
--- a/layout/reftests/bugs/1133905-6-h.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=1325">
-</head>
-<body>
-<div style="width: 9000px;"></div>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-6-rtl.html b/layout/reftests/bugs/1133905-6-rtl.html
deleted file mode 100644
index 60babfcf4..000000000
--- a/layout/reftests/bugs/1133905-6-rtl.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=1325">
-<style> html { direction: rtl; } </style>
-</head>
-<body>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-6-v-rtl.html b/layout/reftests/bugs/1133905-6-v-rtl.html
deleted file mode 100644
index e7b477aaa..000000000
--- a/layout/reftests/bugs/1133905-6-v-rtl.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=1325">
-<style> html { direction: rtl; } </style>
-</head>
-<body>
-<div style="height: 37412px;"></div>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-6-v.html b/layout/reftests/bugs/1133905-6-v.html
deleted file mode 100644
index 56398e3c2..000000000
--- a/layout/reftests/bugs/1133905-6-v.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=1325">
-</head>
-<body>
-<div style="height: 37412px;"></div>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-6-vh-rtl.html b/layout/reftests/bugs/1133905-6-vh-rtl.html
deleted file mode 100644
index bf6a75e47..000000000
--- a/layout/reftests/bugs/1133905-6-vh-rtl.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=1325">
-<style> html { direction: rtl; } </style>
-</head>
-<body>
-<div style="height: 37412px; width: 9000px;"></div>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-6-vh.html b/layout/reftests/bugs/1133905-6-vh.html
deleted file mode 100644
index 1009c5ee7..000000000
--- a/layout/reftests/bugs/1133905-6-vh.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=1325">
-</head>
-<body>
-<div style="height: 37412px; width: 9000px;"></div>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-6.html b/layout/reftests/bugs/1133905-6.html
deleted file mode 100644
index 867e9b082..000000000
--- a/layout/reftests/bugs/1133905-6.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=1325">
-</head>
-<body>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-ref-h-rtl.html b/layout/reftests/bugs/1133905-ref-h-rtl.html
deleted file mode 100644
index ca2609c98..000000000
--- a/layout/reftests/bugs/1133905-ref-h-rtl.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=725">
-<style> html { direction: rtl; } </style>
-</head>
-<body>
-<div style="width: 9000px;"></div>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-ref-h.html b/layout/reftests/bugs/1133905-ref-h.html
deleted file mode 100644
index 1de143625..000000000
--- a/layout/reftests/bugs/1133905-ref-h.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=725">
-</head>
-<body>
-<div style="width: 9000px;"></div>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-ref-rtl.html b/layout/reftests/bugs/1133905-ref-rtl.html
deleted file mode 100644
index badae3b37..000000000
--- a/layout/reftests/bugs/1133905-ref-rtl.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=725">
-<style> html { direction: rtl; } </style>
-</head>
-<body>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-ref-v-rtl.html b/layout/reftests/bugs/1133905-ref-v-rtl.html
deleted file mode 100644
index b3264e4ac..000000000
--- a/layout/reftests/bugs/1133905-ref-v-rtl.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=725">
-<style> html { direction: rtl; } </style>
-</head>
-<body>
-<div style="height: 20000px;"></div>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-ref-v.html b/layout/reftests/bugs/1133905-ref-v.html
deleted file mode 100644
index 00100b7db..000000000
--- a/layout/reftests/bugs/1133905-ref-v.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=725">
-</head>
-<body>
-<div style="height: 20000px;"></div>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-ref-vh-rtl.html b/layout/reftests/bugs/1133905-ref-vh-rtl.html
deleted file mode 100644
index cdb1ae155..000000000
--- a/layout/reftests/bugs/1133905-ref-vh-rtl.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=725">
-<style> html { direction: rtl; } </style>
-</head>
-<body>
-<div style="height: 20000px; width: 9000px;"></div>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-ref-vh.html b/layout/reftests/bugs/1133905-ref-vh.html
deleted file mode 100644
index d27d438ba..000000000
--- a/layout/reftests/bugs/1133905-ref-vh.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=725">
-</head>
-<body>
-<div style="height: 20000px; width: 9000px;"></div>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/1133905-ref.html b/layout/reftests/bugs/1133905-ref.html
deleted file mode 100644
index f4f139807..000000000
--- a/layout/reftests/bugs/1133905-ref.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta name="viewport" content="width=725">
-</head>
-<body>
-</body>
-</html>
-
diff --git a/layout/reftests/bugs/reftest-stylo.list b/layout/reftests/bugs/reftest-stylo.list
deleted file mode 100644
index fd8b788f0..000000000
--- a/layout/reftests/bugs/reftest-stylo.list
+++ /dev/null
@@ -1,2380 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# Please keep this list sorted by bug number (but feel free to use a
-# logical order for the tests for each bug).
-== 105-1.html 105-1.html
-== 647-1.html 647-1.html
-== 9458-basic-1.html 9458-basic-1.html
-== 9458-valign-1.html 9458-valign-1.html
-== 9458-valign-2.html 9458-valign-2.html
-== 9458-height-1.html 9458-height-1.html
-== 9458-height-2.html 9458-height-2.html
-== 9458-width-1a.html 9458-width-1a.html
-== 9458-width-1b.html 9458-width-1b.html
-== 9458-width-2a.html 9458-width-2a.html
-== 9458-width-2b.html 9458-width-2b.html
-== 9458-zorder-1.html 9458-zorder-1.html
-== 9458-zorder-2.html 9458-zorder-2.html
-== 9458-zorder-3.html 9458-zorder-3.html
-== 9458-zorder-4.html 9458-zorder-4.html
-== 9458-zorder-5.html 9458-zorder-5.html
-== 10036-1.html 10036-1.html
-skip-if(!cocoaWidget) HTTP(..) == 10209-1.html 10209-1.html
-# Bug 667079
-HTTP(..) == 10209-2.html 10209-2.html
-asserts(2) skip-if(!cocoaWidget) HTTP(..) == 10209-3.html 10209-3.html
-# Assertions: bug 666606, skip because of bug 667079
-== 18217-basic-1.html 18217-basic-1.html
-== 18217-basic-2a.html 18217-basic-2a.html
-== 18217-basic-2b.html 18217-basic-2b.html
-== 18217-valign-1.html 18217-valign-1.html
-== 18217-height-1.html 18217-height-1.html
-== 18217-height-2.html 18217-height-2.html
-== 18217-width-1a.html 18217-width-1a.html
-== 18217-width-1b.html 18217-width-1b.html
-== 18217-width-2a.html 18217-width-2a.html
-== 18217-width-2b.html 18217-width-2b.html
-== 18217-zorder-1.html 18217-zorder-1.html
-== 18217-zorder-2.html 18217-zorder-2.html
-== 18217-zorder-3.html 18217-zorder-3.html
-== 18217-zorder-4.html 18217-zorder-4.html
-== 18217-zorder-5.html 18217-zorder-5.html
-== 23604-1.html 23604-1.html
-== 23604-2.html 23604-2.html
-== 24998-1.html 24998-1.html
-== 25888-1l.html 25888-1l.html
-== 25888-1l.html 25888-1l.html
-== 25888-1r.html 25888-1r.html
-== 25888-1r.html 25888-1r.html
-== 25888-2l.html 25888-2l.html
-== 25888-2r.html 25888-2r.html
-== 25888-3l.html 25888-3l.html
-== 25888-3r.html 25888-3r.html
-== 25888-1l-block.html 25888-1l-block.html
-== 25888-1l-block.html 25888-1l-block.html
-== 25888-1r-block.html 25888-1r-block.html
-== 25888-1r-block.html 25888-1r-block.html
-== 25888-2l-block.html 25888-2l-block.html
-== 25888-2r-block.html 25888-2r-block.html
-== 25888-3l-block.html 25888-3l-block.html
-== 25888-3r-block.html 25888-3r-block.html
-skip-if(B2G||Mulet) == 28811-1a.html 28811-1a.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails fuzzy-if(gtkWidget,6,26200) == 28811-1b.html 28811-1b.html
-# Bug 1128229
-skip-if(B2G||Mulet) == 28811-2a.html 28811-2a.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails fuzzy-if(gtkWidget,6,26200) == 28811-2b.html 28811-2b.html
-# Bug 1128229
-== 40596-1a.html 40596-1a.html
-== 40596-1b.html 40596-1b.html
-== 40596-1c.html 40596-1c.html
-== 40596-1d.html 40596-1d.html
-== 40596-1e.html 40596-1e.html
-== 40596-1f.html 40596-1f.html
-== 40596-1g.html 40596-1g.html
-== 40596-1h.html 40596-1h.html
-== 40596-1i.html 40596-1i.html
-== 40596-1j.html 40596-1j.html
-== 50630-1a.html 50630-1a.html
-== 50630-1b.html 50630-1b.html
-== 50630-1c.html 50630-1c.html
-== 50630-2.html 50630-2.html
-== 50630-3.html 50630-3.html
-== 50630-4.html 50630-4.html
-== 50630-4.html 50630-4.html
-== 50630-5.html 50630-5.html
-== 67752-1.html 67752-1.html
-== 67752-2.html 67752-2.html
-== 68061-1.xml 68061-1.xml
-== 68061-2.xml 68061-2.xml
-== 76331-1.html 76331-1.html
-random == 81947-1.html 81947-1.html
-== 82711-1.html 82711-1.html
-== 82711-2.html 82711-2.html
-== 82711-3.html 82711-3.html
-== 82711-1-ref.html 82711-1-ref.html
-== 82711-1-ref.html 82711-1-ref.html
-== 82711-2-ref.html 82711-2-ref.html
-== 84400-1.html 84400-1.html
-fuzzy-if(skiaContent,2,13) == 84400-2.html 84400-2.html
-== 97777-1.html 97777-1.html
-== 97777-2.html 97777-2.html
-== 98223-1.html 98223-1.html
-== 98223-2.html 98223-2.html
-== 99850-1a.html 99850-1a.html
-random == 99850-1b.html 99850-1b.html
-# bug 471629
-== 99850-1c.html 99850-1c.html
-== 99850-1d.html 99850-1d.html
-== 105030-1.html 105030-1.html
-== 109735-1.html 109735-1.html
-== 116882-1.html 116882-1.html
-== 120834-1a.html 120834-1a.html
-== 120834-2a.html 120834-2a.html
-== 120834-2b.html 120834-2b.html
-== 120834-2c.html 120834-2c.html
-== 120834-2d.html 120834-2d.html
-== 120834-2e.html 120834-2e.html
-== 120834-2f.html 120834-2f.html
-== 120834-2g.html 120834-2g.html
-== 120834-2h.html 120834-2h.html
-== 120834-2i.html 120834-2i.html
-== 120834-2j.html 120834-2j.html
-== 124903-1.html 124903-1.html
-== 128896.html 128896.html
-== 130767-1.html 130767-1.html
-== 134706-1-left-scrollframe.html 134706-1-left-scrollframe.html
-== 134706-1-left-table.html 134706-1-left-table.html
-== 134706-1-right-scrollframe.html 134706-1-right-scrollframe.html
-== 134706-1-right-table.html 134706-1-right-table.html
-== 134706-2-left-scrollframe.html 134706-2-left-scrollframe.html
-== 134706-2-left-table.html 134706-2-left-table.html
-== 134706-2-right-scrollframe.html 134706-2-right-scrollframe.html
-== 134706-2-right-table.html 134706-2-right-table.html
-== 134706-3-left-scrollframe.html 134706-3-left-scrollframe.html
-== 134706-3-left-table.html 134706-3-left-table.html
-== 134706-3-right-scrollframe.html 134706-3-right-scrollframe.html
-== 134706-3-right-table.html 134706-3-right-table.html
-== 134706-4.html 134706-4.html
-== 134706-5.html 134706-5.html
-== 134706-6.html 134706-6.html
-== 134706-6b.html 134706-6b.html
-== 134706-6c.html 134706-6c.html
-== 134706-7.html 134706-7.html
-== 139550-1a.html 139550-1a.html
-== 139550-1b.html 139550-1b.html
-== 142233-1.html 142233-1.html
-== 144004-1.html 144004-1.html
-== 144004-2.html 144004-2.html
-== 144004-3.html 144004-3.html
-== 163504-1a.html 163504-1a.html
-random == 163504-1b.html 163504-1b.html
-== 163504-2a.html 163504-2a.html
-== 163504-2b.html 163504-2b.html
-== 167496-1.html 167496-1.html
-== 169749-1.html 169749-1.html
-== 172073-1.html 172073-1.html
-== 175190-1.html 175190-1.html
-== 179596-1a.html 179596-1a.html
-== 179596-1b.html 179596-1b.html
-== 179596-2.html 179596-2.html
-== 179596-2.html 179596-2.html
-== 179596-2.html 179596-2.html
-== 180085-1.html 180085-1.html
-# fix for 180085 reverted in bug 1010675
-== 180085-2.html 180085-2.html
-# fix for 180085 reverted in bug 1010675
-skip == 185388-1.html 185388-1.html
-== 186317-1.html 186317-1.html
-== 192902-1.html 192902-1.html
-skip-if(B2G||Mulet) == 192767-01.xul 192767-01.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == 192767-02.xul 192767-02.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == 192767-03.xul 192767-03.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == 192767-04.xul 192767-04.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == 192767-05.xul 192767-05.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == 192767-06.xul 192767-06.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == 192767-07.xul 192767-07.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == 192767-21.xul 192767-21.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == 192767-22.xul 192767-22.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == 192767-23.xul 192767-23.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == 192767-24.xul 192767-24.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == 192767-25.xul 192767-25.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == 192767-26.xul 192767-26.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == 192767-27.xul 192767-27.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == 192767-01.xul 192767-01.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == 192767-02.xul 192767-02.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(Android&&!asyncPan) skip-if(B2G||Mulet) == 192767-03.xul 192767-03.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == 192767-04.xul 192767-04.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == 192767-05.xul 192767-05.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(Android&&!asyncPan) skip-if(B2G||Mulet) == 192767-06.xul 192767-06.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(Android&&!asyncPan) skip-if(B2G||Mulet) == 192767-07.xul 192767-07.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == 192767-11.xul 192767-11.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == 192767-12.xul 192767-12.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(Android&&!asyncPan) skip-if(B2G||Mulet) == 192767-13.xul 192767-13.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == 192767-14.xul 192767-14.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == 192767-15.xul 192767-15.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(Android&&!asyncPan) skip-if(B2G||Mulet) == 192767-16.xul 192767-16.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(Android&&!asyncPan) skip-if(B2G||Mulet) == 192767-17.xul 192767-17.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 200774-1.html 200774-1.html
-== 201215-1.html 201215-1.html
-== 201293-1a.html 201293-1a.html
-== 201293-1b.html 201293-1b.html
-== 201293-1c.html 201293-1c.html
-== 201293-1d.html 201293-1d.html
-== 203727.html 203727.html
-== 206516-1.html 206516-1.html
-== 206631-1.html 206631-1.html
-== 206802.html 206802.html
-== 210094-1a.html 210094-1a.html
-== 210094-1b.html 210094-1b.html
-== 210094-1c.html 210094-1c.html
-== 210876-1.html 210876-1.html
-== 211931-1.html 211931-1.html
-skip == 212563-1.html 212563-1.html
-skip fuzzy-if(skiaContent,1,5) == 212563-2.html 212563-2.html
-== 213834-1.html 213834-1.html
-== 214077-1a.html 214077-1a.html
-== 214077-1b.html 214077-1b.html
-== 218473-1.html 218473-1.html
-skip-if((B2G&&browserIsRemote)||Mulet) fuzzy-if(skiaContent,1,4) == 220165-1.svg 220165-1.svg
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 223809-1.html 223809-1.html
-== 228856-1.html 228856-1.html
-== 228856-2.html 228856-2.html
-== 229591-1.html 229591-1.html
-# == 231823-1.html 231823-1.html
-== 232990-1a.xhtml 232990-1a.xhtml
-skip-if((B2G&&browserIsRemote)||Mulet) == 232990-1b.xhtml 232990-1b.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 233094-1.html 233094-1.html
-== 233094-2a.html 233094-2a.html
-== 233094-2b.html 233094-2b.html
-== 233094-2c.html 233094-2c.html
-random == 234686-1.html 234686-1.html
-random == 234686-2.html 234686-2.html
-random == 234686-3.html 234686-3.html
-random == 234686-4.html 234686-4.html
-random == 234686-5.html 234686-5.html
-random == 234686-6.html 234686-6.html
-random == 234686-7.html 234686-7.html
-# == 234686-8.html 234686-8.html
-random == 234686-9.html 234686-9.html
-random == 234686-10.html 234686-10.html
-random == 234686-11.html 234686-11.html
-random == 234686-12.html 234686-12.html
-random == 234686-13.html 234686-13.html
-random == 234686-14.html 234686-14.html
-random == 234686-15.html 234686-15.html
-random == 234686-16.html 234686-16.html
-random == 234686-17.html 234686-17.html
-random == 234686-18.html 234686-18.html
-random == 234686-19.html 234686-19.html
-skip-if(B2G||Mulet) == 234964-1.html 234964-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 234964-2.html 234964-2.html
-== 235593-1.html 235593-1.html
-== 236539-1.html 236539-1.html
-== 240029-1.html 240029-1.html
-== 240470-1.html 240470-1.html
-skip-if(B2G||Mulet) == 240933-1.html 240933-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(Android||B2G||Mulet) == 240933-2.html 240933-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 243266-1.html 243266-1.html
-== 243302-1.html 243302-1.html
-skip-if(B2G||Mulet||(Android&&asyncPan)) == 243519-1.html 243519-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 243519-2.html 243519-2.html
-== 243519-3.html 243519-3.html
-== 243519-4a.html 243519-4a.html
-== 243519-4b.html 243519-4b.html
-== 243519-4c.html 243519-4c.html
-== 243519-4d.html 243519-4d.html
-== 243519-4e.html 243519-4e.html
-== 243519-4f.html 243519-4f.html
-== 243519-5a.html 243519-5a.html
-== 243519-5b.html 243519-5b.html
-== 243519-5c.html 243519-5c.html
-== 243519-5d.html 243519-5d.html
-== 243519-6.html 243519-6.html
-skip-if(B2G||Mulet) == 243519-7.html 243519-7.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 243519-8.svg 243519-8.svg
-== 243519-9a.html 243519-9a.html
-== 243519-9b.html 243519-9b.html
-== 243519-9c.html 243519-9c.html
-== 243519-9d.html 243519-9d.html
-== 243519-9e.html 243519-9e.html
-== 243519-9f.html 243519-9f.html
-== 244135-1.html 244135-1.html
-== 244135-2.html 244135-2.html
-== 244932-1.html 244932-1.html
-== 246669-1.html 246669-1.html
-skip-if(B2G||Mulet) == 249141.xul 249141.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip == 249982-1.html 249982-1.html
-== 252920-1.html 252920-1.html
-== 253701-1.html 253701-1.html
-fuzzy-if(skiaContent,1,5) == 255820-1.html 255820-1.html
-== 260406-1.html 260406-1.html
-skip-if((B2G&&browserIsRemote)||Mulet) == 261826-1.xul 261826-1.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 262151-1.html 262151-1.html
-skip == 262998-1.html 262998-1.html
-== 267353-1.html 267353-1.html
-== 269908-1.html 269908-1.html
-== 269908-2.html 269908-2.html
-== 269908-3.html 269908-3.html
-== 269908-4.html 269908-4.html
-== 269908-5.html 269908-5.html
-== 271747-1a.html 271747-1a.html
-== 271747-1b.html 271747-1b.html
-skip-if((B2G&&browserIsRemote)||Mulet) == 272646-1.xul 272646-1.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == 272646-2a.xul 272646-2a.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == 272646-2b.xul 272646-2b.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == 272646-2c.xul 272646-2c.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) fuzzy-if(Android,3,50) fuzzy-if(skiaContent,1,133) == 273681-1.html 273681-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 278266-1a.html 278266-1a.html
-== 278266-1b.html 278266-1b.html
-== 280708-1a.html 280708-1a.html
-== 280708-1b.html 280708-1b.html
-== 281241-1.html 281241-1.html
-== 281241-2.xhtml 281241-2.xhtml
-== 283686-1.html 283686-1.html
-== 283686-2.html 283686-2.html
-== 283686-3.html 283686-3.html
-== 289384-1.xhtml 289384-1.xhtml
-# fails random-if(d2d) fuzzy-if(Android,8,1439) skip-if((B2G&&browserIsRemote)||Mulet) HTTP == 289480.html#top 289480.html#top
-# basically-verbatim acid2 test, HTTP for a 404 page -- bug 578114 for the d2d failures
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 290129-1.html 290129-1.html
-skip-if(B2G||Mulet) == 291078-1.html 291078-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 291078-2.html 291078-2.html
-== 291262-1.html 291262-1.html
-== 294306-1.html 294306-1.html
-== 294306-1.html 294306-1.html
-== 296361-1.html 296361-1.html
-== 296904-1.html 296904-1.html
-skip-if(B2G||Mulet) == 299136-1.html 299136-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 299837-1.html 299837-1.html
-skip-if((B2G&&browserIsRemote)||Mulet) == 299837-2.xul 299837-2.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-random-if(d2d) skip-if((B2G&&browserIsRemote)||Mulet) == 299837-3.xul 299837-3.xul
-# bug 587631, 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 300691-1a.html 300691-1a.html
-== 300691-1b.html 300691-1b.html
-== 300691-1c.html 300691-1c.html
-== 300691-1d.html 300691-1d.html
-== 300691-1e.html 300691-1e.html
-== 300691-1f.html 300691-1f.html
-skip-if(B2G||Mulet) == 301726-1.html 301726-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) fails-if(Android) == 301726-2.html 301726-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 302379.html 302379.html
-== 306630-1.html 306630-1.html
-== 306660-1.html 306660-1.html
-== 306660-2.html 306660-2.html
-== 306660-3.html 306660-3.html
-skip-if(B2G||Mulet) == 307076-1.html 307076-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 307102-1.html 307102-1.html
-== 307102-2.html 307102-2.html
-== 307102-3.html 307102-3.html
-== 307102-4.html 307102-4.html
-== 308406-1.html 308406-1.html
-== 308406-2.html 308406-2.html
-== 309550-1.html 309550-1.html
-skip-if((B2G&&browserIsRemote)||Mulet) == 309914-1.xul 309914-1.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 311366-unknown-inline-1.html 311366-unknown-inline-1.html
-== 311366-unknown-block-1.html 311366-unknown-block-1.html
-== 311366-unknown-block-3.html 311366-unknown-block-3.html
-== 311366-unknown-block-2.html 311366-unknown-block-2.html
-== 311366-unknown-inline-2.html 311366-unknown-inline-2.html
-== 311822-1.html 311822-1.html
-== 311822-1.html 311822-1.html
-== 315620-1a.html 315620-1a.html
-== 315620-1b.html 315620-1b.html
-== 315620-2a.xhtml 315620-2a.xhtml
-== 315620-2b.xhtml 315620-2b.xhtml
-== 315920-1a.html 315920-1a.html
-== 315920-1b.html 315920-1b.html
-== 315920-1c.html 315920-1c.html
-== 315920-1d.html 315920-1d.html
-== 315920-2a.html 315920-2a.html
-== 315920-2b.html 315920-2b.html
-== 315920-2c.html 315920-2c.html
-== 315920-3a.html 315920-3a.html
-== 315920-3b.html 315920-3b.html
-== 315920-3c.html 315920-3c.html
-== 315920-3d.html 315920-3d.html
-== 315920-3e.html 315920-3e.html
-== 315920-3f.html 315920-3f.html
-== 315920-4.html 315920-4.html
-fuzzy-if(skiaContent,1,1468) == 315920-5.html 315920-5.html
-== 315920-6.html 315920-6.html
-== 315920-7a.html 315920-7a.html
-== 315920-7b.html 315920-7b.html
-== 315920-7c.html 315920-7c.html
-== 315920-8a.html 315920-8a.html
-== 315920-8b.html 315920-8b.html
-== 315920-9.html 315920-9.html
-== 315920-10.html 315920-10.html
-== 315920-11.html 315920-11.html
-== 315920-12a.html 315920-12a.html
-== 315920-12b.html 315920-12b.html
-== 315920-12c.html 315920-12c.html
-== 315920-13a.html 315920-13a.html
-== 315920-13b.html 315920-13b.html
-== 315920-14.html 315920-14.html
-== 315920-15.html 315920-15.html
-== 315920-16.html 315920-16.html
-== 315920-17.html 315920-17.html
-== 315920-18a.html 315920-18a.html
-== 315920-18b.html 315920-18b.html
-== 315920-18c.html 315920-18c.html
-== 315920-18d.html 315920-18d.html
-== 315920-18e.html 315920-18e.html
-== 315920-18f.html 315920-18f.html
-== 315920-18g.html 315920-18g.html
-== 315920-18h.html 315920-18h.html
-== 315920-18i.html 315920-18i.html
-== 315920-19.html 315920-19.html
-== 315920-20.svg 315920-20.svg
-== 315920-21.svg 315920-21.svg
-== 315920-22.html 315920-22.html
-== 315920-23.html 315920-23.html
-== 315920-24.html 315920-24.html
-== 315920-25.html 315920-25.html
-== 315920-26.html 315920-26.html
-== 315920-27.html 315920-27.html
-== 315920-28a.html 315920-28a.html
-== 315920-28b.html 315920-28b.html
-== 315920-28c.html 315920-28c.html
-== 315920-29a.html 315920-29a.html
-== 315920-29b.html 315920-29b.html
-== 315920-30.html 315920-30.html
-== 316057-1.html 316057-1.html
-== 320979-1.html 320979-1.html
-== 321402-1.html 321402-1.html
-== 321402-2.html 321402-2.html
-skip-if((B2G&&browserIsRemote)||Mulet) == 321402-3.xul 321402-3.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == 321402-4.xul 321402-4.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == 321402-5.xul 321402-5.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == 321402-6.xul 321402-6.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 321738-1.html 321738-1.html
-== 322436-1.html 322436-1.html
-== 322461-1.xml 322461-1.xml
-skip == 323656-1.html 323656-1.html
-== 323656-2.html 323656-2.html
-== 323656-3.html 323656-3.html
-== 323656-4.html 323656-4.html
-== 323656-5.svg 323656-5.svg
-== 323656-6.html 323656-6.html
-fuzzy-if(Android,2,140) == 325292-1.html 325292-1.html
-== 325486-1.html 325486-1.html
-== 328111-1.html 328111-1.html
-random == 328829-1.xhtml 328829-1.xhtml
-# bug 369046 (intermittent)
-== 328829-2.xhtml 328829-2.xhtml
-== 329359-1.html 329359-1.html
-== 331809-1.html 331809-1.html
-# bug 580499 is blacked out
-== 332360.html 332360.html
-== 332360-ltr.html 332360-ltr.html
-== 332360-width.html 332360-width.html
-== 332360-width-ltr.html 332360-width-ltr.html
-skip-if(B2G||Mulet) == 332557-1.html 332557-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 332975-1.html 332975-1.html
-== 333970-1.html 333970-1.html
-== 334829-1a.xhtml 334829-1a.xhtml
-== 334829-1b.xhtml 334829-1b.xhtml
-== 335628-1.html 335628-1.html
-skip skip-if((B2G&&browserIsRemote)||Mulet) == 335628-2.xul 335628-2.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == 336096-1.xul 336096-1.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 336147-1.html 336147-1.html
-skip-if(B2G||Mulet) == 336153-1.html 336153-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 338251-p.html 338251-p.html
-== 338251-p-oh.html 338251-p-oh.html
-== 338251-pre.html 338251-pre.html
-== 338251-pre-oh.html 338251-pre-oh.html
-fuzzy-if(skiaContent,2,3) == 339289-1.html 339289-1.html
-== 341043-1a.html 341043-1a.html
-== 341043-1b.html 341043-1b.html
-# == 343538-1.html 343538-1.html
-== 343540-1.html 343540-1.html
-== 345267-1a.html 345267-1a.html
-== 345267-1b.html 345267-1b.html
-== 345267-1c.html 345267-1c.html
-== 345267-1d.html 345267-1d.html
-== 345563-sub.xhtml 345563-sub.xhtml
-skip-if((B2G&&browserIsRemote)||Mulet) == 346189-1.xul 346189-1.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 346774-1a.html 346774-1a.html
-== 346774-1b.html 346774-1b.html
-== 346774-1c.html 346774-1c.html
-== 347348-1.xhtml 347348-1.xhtml
-== 347496-1.xhtml 347496-1.xhtml
-== 347912-1.html 347912-1.html
-skip-if((B2G&&browserIsRemote)||Mulet) == 348049-1.xhtml 348049-1.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 348516-1.html 348516-1.html
-== 348516-2.html 348516-2.html
-== 348516-2.html 348516-2.html
-random == 348516-3.html 348516-3.html
-== 348597-1.html 348597-1.html
-== 348809-1a.html 348809-1a.html
-== 348809-1b.html 348809-1b.html
-== 348809-1c.html 348809-1c.html
-== 348809-1d.html 348809-1d.html
-== 348809-1e.html 348809-1e.html
-== 348809-1f.html 348809-1f.html
-== 348809-2a.html 348809-2a.html
-== 348809-2b.html 348809-2b.html
-== 348809-2c.html 348809-2c.html
-== 348809-2d.html 348809-2d.html
-== 348809-2e.html 348809-2e.html
-== 348809-2f.html 348809-2f.html
-== 348809-2g.html 348809-2g.html
-== 348809-2h.html 348809-2h.html
-== 349695-1a.html 349695-1a.html
-== 349695-1b.html 349695-1b.html
-# fails with CoreText rendering due to clipping of one subpixel-antialiasing pixel at end of text
-random-if(cocoaWidget) == 350506-1.html 350506-1.html
-== 351641-1a.html 351641-1a.html
-== 351641-1b.html 351641-1b.html
-== 351641-2a.html 351641-2a.html
-== 351641-2b.html 351641-2b.html
-== 352980-1a.html 352980-1a.html
-== 352980-1b.html 352980-1b.html
-== 352980-1c.html 352980-1c.html
-== 352980-1d.html 352980-1d.html
-== 352980-1e.html 352980-1e.html
-== 352980-1f.html 352980-1f.html
-== 352980-1g.html 352980-1g.html
-== 352980-1h.html 352980-1h.html
-== 352980-1i.html 352980-1i.html
-== 352980-1j.html 352980-1j.html
-== 352980-1k.html 352980-1k.html
-== 352980-1l.html 352980-1l.html
-== 352980-2a.html 352980-2a.html
-== 352980-2b.html 352980-2b.html
-== 352980-2c.html 352980-2c.html
-== 352980-2d.html 352980-2d.html
-== 352980-2e.html 352980-2e.html
-== 352980-2f.html 352980-2f.html
-== 352980-3a.html 352980-3a.html
-== 352980-3b.html 352980-3b.html
-== 352980-3c.html 352980-3c.html
-== 352980-3d.html 352980-3d.html
-== 352980-3e.html 352980-3e.html
-== 352980-3f.html 352980-3f.html
-== 355548-1.xml 355548-1.xml
-== 355548-2.xml 355548-2.xml
-== 355548-3.xml 355548-3.xml
-== 355548-4.xml 355548-4.xml
-== 355548-5.xml 355548-5.xml
-== 356774-1.html 356774-1.html
-== 356775-1.html 356775-1.html
-== 359869-1.html 359869-1.html
-== 359903-1.html 359903-1.html
-# erosion of padding removed in bug 1010675
-== 359903-2.html 359903-2.html
-# erosion of padding removed in bug 1010675
-== 360065-1.html 360065-1.html
-== 360746-1.html 360746-1.html
-== 360757-1a.html 360757-1a.html
-== 360757-1b.html 360757-1b.html
-== 361091-1.html 361091-1.html
-== 362594-1a.html 362594-1a.html
-== 362594-1b.html 362594-1b.html
-== 362594-1c.html 362594-1c.html
-== 362594-2a.html 362594-2a.html
-== 362594-2a.html 362594-2a.html
-== 362594-2b.html 362594-2b.html
-== 362594-2b.html 362594-2b.html
-fails fuzzy-if(skiaContent,2,4) == 362594-2c.html 362594-2c.html
-== 362901-1.html 362901-1.html
-== 363247-1.html 363247-1.html
-== 363329-1.html 363329-1.html
-== 363329-2.html 363329-2.html
-== 363370-1.html 363370-1.html
-== 363402-1.html 363402-1.html
-== 363637-1.html 363637-1.html
-skip-if(Android) == 363706-1.html 363706-1.html
-== 363706-1.html 363706-1.html
-== 363728-1.html 363728-1.html
-== 363728-2.html 363728-2.html
-skip-if(B2G||Mulet) fuzzy-if(skiaContent,2,11) == 363858-1.html 363858-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == 363858-2.html 363858-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == 363858-3.html 363858-3.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == 363858-4.html 363858-4.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fuzzy-if(OSX>=1008,45,2) fuzzy-if(winWidget,114,1) == 363858-5a.html 363858-5a.html
-== 363858-5b.html 363858-5b.html
-fuzzy-if(OSX>=1008,45,2) fuzzy-if(winWidget,114,1) == 363858-6a.html 363858-6a.html
-== 363858-6b.html 363858-6b.html
-== 363874.html 363874.html
-== 363874-max-width.html 363874-max-width.html
-== 364066-1.html 364066-1.html
-== 364079-1.html 364079-1.html
-== 364318-1.xhtml 364318-1.xhtml
-== 364861-1.html 364861-1.html
-skip-if(B2G||Mulet) == 364862-1.html 364862-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == 364968-1.xul 364968-1.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 364989-1.html 364989-1.html
-== 365173-1.html 365173-1.html
-skip skip-if((B2G&&browserIsRemote)||Mulet) == 366207-1.xul 366207-1.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == 366616-1.xul 366616-1.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 367220-1.html 367220-1.html
-== 367247-s-visible.html 367247-s-visible.html
-== 367247-s-hidden.html 367247-s-hidden.html
-skip-if(B2G||Mulet) fails-if(Android) == 367247-s-auto.html 367247-s-auto.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 367247-l-visible.html 367247-l-visible.html
-skip-if(B2G||Mulet) fails-if(Android&&!asyncPan) == 367247-l-hidden.html 367247-l-hidden.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip == 367247-l-scroll.html 367247-l-scroll.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 367332-1a.html 367332-1a.html
-skip == 367332-1b.html 367332-1b.html
-== 367332-1c.html 367332-1c.html
-== 367332-1d.html 367332-1d.html
-== 367332-1e.html 367332-1e.html
-== 367332-1f.html 367332-1f.html
-== 367332-1g.html 367332-1g.html
-== 367375-1.html 367375-1.html
-== 367375-2.html 367375-2.html
-== 367489-1.html 367489-1.html
-== 367504-margin-1.html 367504-margin-1.html
-== 367504-float-1.html 367504-float-1.html
-== 367612-1a.html 367612-1a.html
-== 367612-1b.html 367612-1b.html
-== 367612-1c.html 367612-1c.html
-== 367612-1d.html 367612-1d.html
-== 367612-1e.html 367612-1e.html
-== 367612-1f.html 367612-1f.html
-== 367612-1g.html 367612-1g.html
-skip-if(B2G||Mulet) random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) fuzzy-if(winWidget,5,2) fuzzy-if(skiaContent,1,28) == 368020-1.html 368020-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 368020-2.html 368020-2.html
-== 368020-3.html 368020-3.html
-pref(layout.css.box-decoration-break.enabled,true) == 368020-5.html 368020-5.html
-== 368155-1.xhtml 368155-1.xhtml
-asserts(4) == 368155-negative-margins-1.html 368155-negative-margins-1.html
-# bug 387205 / bug 457397
-# we can't test this because there's antialiasing involved, and our comparison
-# is too exact
-# == 368247-1.html 368247-1.html
-== 368247-2.html 368247-2.html
-== 368504-1.html 368504-1.html
-== 368504-2.html 368504-2.html
-== 368504-3a.html 368504-3a.html
-== 368504-3b.html 368504-3b.html
-== 368504-4.html 368504-4.html
-== 368504-5.html 368504-5.html
-== 368504-6.html 368504-6.html
-== 368622-1.html 368622-1.html
-== 368651-1.html 368651-1.html
-== 369361-1.html 369361-1.html
-== 369361-2.html 369361-2.html
-skip-if((B2G&&browserIsRemote)||Mulet) == 369882.xul 369882.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 369975-1.html 369975-1.html
-== 370353-1.html 370353-1.html
-== 370422-1.html 370422-1.html
-== 370525-1.html 370525-1.html
-== 370525-1.html 370525-1.html
-== 370525-2.html 370525-2.html
-== 370525-2.html 370525-2.html
-== 370525-rowspan-1a.html 370525-rowspan-1a.html
-== 370525-rowspan-1b.html 370525-rowspan-1b.html
-== 370525-rowspan-1c.html 370525-rowspan-1c.html
-== 370525-rowspan-2a.html 370525-rowspan-2a.html
-== 370525-rowspan-2b.html 370525-rowspan-2b.html
-== 370525-rowspan-3.html 370525-rowspan-3.html
-== 370525-rowspan-4.html 370525-rowspan-4.html
-== 370525-sib.html 370525-sib.html
-== 370586-1.xhtml 370586-1.xhtml
-skip == 370629-1.html 370629-1.html
-# bug 1060869
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == 370629-2.html 370629-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 370692-1.xhtml 370692-1.xhtml
-== 371041-1.html 371041-1.html
-== 371043-1.html 371043-1.html
-random == 371354-1.html 371354-1.html
-== 371483-1.html 371483-1.html
-# assertion test
-fails-if(Android&&!asyncPan) == 371561-1.html 371561-1.html
-skip-if((B2G&&browserIsRemote)||Mulet) == 371681-1.xhtml 371681-1.xhtml
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 371925-1a.html 371925-1a.html
-== 371925-1b.html 371925-1b.html
-skip-if(B2G||Mulet) == 372037-1.html 372037-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 372062-1.html 372062-1.html
-== 372063-1.html 372063-1.html
-== 372323-1.xhtml 372323-1.xhtml
-== 372553-1.html 372553-1.html
-== 372632-1.html 372632-1.html
-== 372768-1.html 372768-1.html
-== 373295-1.html 373295-1.html
-== 373298-1.html 373298-1.html
-skip-if(B2G||Mulet) fails-if(Android) == 373381-1.html 373381-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) fails-if(Android) fuzzy-if(skiaContent,2,40) == 373381-2.html 373381-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) fails-if(Android) random-if(d2d) == 373381-3.html 373381-3.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) fails-if(Android) == 373381-4.html 373381-4.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 373383-1.html 373383-1.html
-== 373433-1.html 373433-1.html
-skip-if((B2G&&browserIsRemote)||Mulet) == 373533-1.xhtml 373533-1.xhtml
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == 373533-2.xhtml 373533-2.xhtml
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == 373533-3.xhtml 373533-3.xhtml
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == 374038-1.xul 374038-1.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == 374038-2.xul 374038-2.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-random-if(d2d) skip-if((B2G&&browserIsRemote)||Mulet) == 374719-1.xul 374719-1.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 374927-1.html 374927-1.html
-# Was broken by patch for bug 368600; fails until bug 400776 is fixed
-== 375508-1.html 375508-1.html
-== 375716-1.html 375716-1.html
-== 375827-1.html 375827-1.html
-== 376375-1.html 376375-1.html
-skip == 376484-1.html 376484-1.html
-== 376532-1.html 376532-1.html
-skip-if(B2G||Mulet) fails-if(Android) == 376532-2.html 376532-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) fails-if(Android) == 376532-3.html 376532-3.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 377603-1.html 377603-1.html
-== 377918.html 377918.html
-== 378535-1.html 378535-1.html
-skip-if(B2G||Mulet) == 378933-1.html 378933-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == 378935-1.html 378935-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip == 378937-1.html 378937-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 379178-xhtml.xhtml 379178-xhtml.xhtml
-== 379178-html.html 379178-html.html
-== 379178-svg.svg 379178-svg.svg
-fuzzy-if(skiaContent,1,500) == 379316-1.html 379316-1.html
-skip-if(B2G||Mulet) fails-if(Android) random-if(cocoaWidget) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fuzzy-if(winWidget,1,180) fuzzy-if(gtkWidget,1,191) fuzzy-if(skiaContent,8,500) == 379316-2.html 379316-2.html
-# bug 379786
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 379328-1.html 379328-1.html
-== 379349-1a.xhtml 379349-1a.xhtml
-# fuzzy because of different border rendering approach in bug 1185636
-== 379349-1b.xhtml 379349-1b.xhtml
-== 379349-1c.xhtml 379349-1c.xhtml
-== 379349-2a.xhtml 379349-2a.xhtml
-skip == 379349-2b.xhtml 379349-2b.xhtml
-skip-if(B2G||Mulet) fuzzy-if(Android,2,140) == 379349-3a.xhtml 379349-3a.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) fuzzy-if(Android,2,140) == 379349-3b.xhtml 379349-3b.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 379361-1.html 379361-1.html
-== 379361-2.html 379361-2.html
-== 379361-3.html 379361-3.html
-== 379461-1.xhtml 379461-1.xhtml
-== 379461-2.xhtml 379461-2.xhtml
-skip == 379461-3-container-xhtml.html 379461-3-container-xhtml.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip == 379461-3-container-xhtml.html 379461-3-container-xhtml.html
-# there is a scrollbar
-# Initial mulet triage: parity with B2G/B2G Desktop
-fuzzy-if(skiaContent,1,5) == 380004-1.html 380004-1.html
-fuzzy-if(skiaContent,2,5) == 380227-1.html 380227-1.html
-== 380825-1.html 380825-1.html
-== 380842-1.html 380842-1.html
-== 381130-1.html 381130-1.html
-fails fuzzy-if(skiaContent,2,5) == 381507-1.html 381507-1.html
-skip == 381746-1.html 381746-1.html
-== 382600-1.html 382600-1.html
-== 382916-1.html 382916-1.html
-== 383035-1.html 383035-1.html
-== 383035-2.html 383035-2.html
-== 383488-1.html 383488-1.html
-== 383551-1.html 383551-1.html
-fuzzy-if(B2G,68,26) == 383883-1.html 383883-1.html
-fuzzy-if(B2G,68,26) == 383883-2.html 383883-2.html
-fuzzy-if(B2G,68,26) == 383883-3.html 383883-3.html
-fuzzy-if(B2G,68,26) == 383883-4.html 383883-4.html
-fuzzy-if(B2G,68,26) == 383884-1.html 383884-1.html
-== 383885-1.html 383885-1.html
-== 384322-1.html 384322-1.html
-== 384576-1.html 384576-1.html
-== 384762-1.html 384762-1.html
-== 384876-1.html 384876-1.html
-== 385533-1.html 385533-1.html
-# assertion test
-HTTP(..) == 385569-1a.html 385569-1a.html
-HTTP(..) == 385569-1b.html 385569-1b.html
-== 385607-1.html 385607-1.html
-== 385823-1.html 385823-1.html
-== 385823-2a.html 385823-2a.html
-== 385823-2b.html 385823-2b.html
-== 385823-2c.html 385823-2c.html
-fuzzy-if(skiaContent,2,11) == 385870-1.html 385870-1.html
-fuzzy-if(skiaContent,2,3) == 385870-2.html 385870-2.html
-== 386014-1a.html 386014-1a.html
-== 386014-1b.html 386014-1b.html
-== 386014-1c.html 386014-1c.html
-== 386065-1.html 386065-1.html
-== 386065-2.html 386065-2.html
-skip == 386147-1.html 386147-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip == 386147-1.html 386147-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 386310-1a.html 386310-1a.html
-== 386310-1b.html 386310-1b.html
-== 386310-1c.html 386310-1c.html
-== 386310-1d.html 386310-1d.html
-== 386401-1.html 386401-1.html
-== 386401-2.html 386401-2.html
-== 386401-3.html 386401-3.html
-== 386470-1a.html 386470-1a.html
-skip == 386470-1b.html 386470-1b.html
-== 386470-1c.html 386470-1c.html
-== 386920-1.html 386920-1.html
-== 387201-1.html 387201-1.html
-== 387201-2.html 387201-2.html
-# Really an assertion test rather than a rendering test
-== 387201-3.html 387201-3.html
-# Really an assertion test rather than a rendering test
-== 387227-1.html 387227-1.html
-== 387227-2.html 387227-2.html
-== 387344-1.html 387344-1.html
-# scrolling rowgroups were removed in bug 28800
-== 387876-1.html 387876-1.html
-== 387876-2.html 387876-2.html
-== 387876-3a.html 387876-3a.html
-== 387876-3b.html 387876-3b.html
-== 388026-1.html 388026-1.html
-== 389074-1.html 389074-1.html
-== 389224-1.html 389224-1.html
-== 389224-2.html 389224-2.html
-skip-if(B2G||Mulet) == 389468-1.html 389468-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 389623-1.html 389623-1.html
-skip-if((B2G&&browserIsRemote)||Mulet) == 389636-1.html 389636-1.html
-# assertion test
-# bug 975911
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 389924-1a.html 389924-1a.html
-== 389924-1b.html 389924-1b.html
-== 389924-1a.html 389924-1a.html
-== 390318-1a.html 390318-1a.html
-== 390318-1b.html 390318-1b.html
-== 390318-1c.html 390318-1c.html
-== 390318-1d.html 390318-1d.html
-== 390318-1e.html 390318-1e.html
-== 390318-1f.html 390318-1f.html
-skip-if(!winWidget) == 391045.html 391045.html
-# windows-specific Uniscribe bug, trailing period is matched against different fonts on Mac/Linux (see 396137)
-== 391140-1.html 391140-1.html
-== 391412-1a.html 391412-1a.html
-== 391412-1b.html 391412-1b.html
-== 391909-1.html 391909-1.html
-skip-if(Android) == 391979.html 391979.html
-== 391994-1.html 391994-1.html
-== 392047.html 392047.html
-== 392435-1.html 392435-1.html
-== 393330-1.html 393330-1.html
-== 393490-1.html 393490-1.html
-skip-if((B2G&&browserIsRemote)||Mulet) == 393517-1.xhtml 393517-1.xhtml
-# crash test
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-fuzzy-if(skiaContent,1,600) == 393649-1.html 393649-1.html
-== 393655-1.html 393655-1.html
-== 393655-2.html 393655-2.html
-== 393655-3.html 393655-3.html
-== 393655-4.html 393655-4.html
-== 393655-5.html 393655-5.html
-== 393671-1.html 393671-1.html
-== 393671-2.html 393671-2.html
-== 393671-3.html 393671-3.html
-== 393760-1.xml 393760-1.xml
-fuzzy-if(skiaContent,1,400) == 393760-2.xml 393760-2.xml
-== 394111-1.html 394111-1.html
-# Really an assertion test rather than a rendering test
-== 394534-1.html 394534-1.html
-skip == 394676-1.xhtml 394676-1.xhtml
-# bug 975911
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 395107-1.html 395107-1.html
-== 395107-2.html 395107-2.html
-fuzzy-if(skiaContent,1,118) == 395107-3.html 395107-3.html
-== 395107-4.html 395107-4.html
-== 395107-5.html 395107-5.html
-== 395130-1.html 395130-1.html
-== 395130-2.html 395130-2.html
-skip-if((B2G&&browserIsRemote)||Mulet) == 395331-1.xml 395331-1.xml
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 395390-1.html 395390-1.html
-== 396286-1.html 396286-1.html
-# crash test
-fuzzy-if(Android,5,283) == 397428-1.html 397428-1.html
-== 397844-1.xhtml 397844-1.xhtml
-== 398092-1.html 398092-1.html
-== 398101-1.html 398101-1.html
-== 398144-1.html 398144-1.html
-fuzzy-if(skiaContent,2,21) == 398682-1.html 398682-1.html
-== 398797-1a.html 398797-1a.html
-== 398797-1b.html 398797-1b.html
-skip == 398797-1c.html 398797-1c.html
-== 398797-1d.html 398797-1d.html
-== 399209-1.html 399209-1.html
-== 399209-2.html 399209-2.html
-== 399258-1.html 399258-1.html
-== 399384-1.html 399384-1.html
-random-if(gtkWidget) == 399636-standards-css.html 399636-standards-css.html
-# bug 429022
-random-if(gtkWidget) == 399636-standards-html.html 399636-standards-html.html
-# bug 429022
-random-if(gtkWidget) == 399636-quirks-css.html 399636-quirks-css.html
-# bug 429022
-# We can't rely on this test working on platforms other than Windows and
-# Mac because they need not have a font called "Symbol".
-fails-if(winWidget) fails-if(cocoaWidget) random-if(!cocoaWidget&&!winWidget) == 399636-quirks-html.html 399636-quirks-html.html
-# windows failure bug 429017, mac failure bug 429019
-== 400081-1.html 400081-1.html
-== 400171-1a.html 400171-1a.html
-== 400171-1b.html 400171-1b.html
-== 400171-1c.html 400171-1c.html
-== 400171-2a.html 400171-2a.html
-== 400171-2b.html 400171-2b.html
-== 400171-2c.html 400171-2c.html
-== 400421-1.html 400421-1.html
-== 400813-1.html 400813-1.html
-== 400826-1.html 400826-1.html
-skip-if((B2G&&browserIsRemote)||Mulet) == 401946-1.xul 401946-1.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 402338-1.html 402338-1.html
-== 402567-1.html 402567-1.html
-== 402567-2.html 402567-2.html
-== 402567-3.html 402567-3.html
-fails skip-if(B2G||Mulet) fuzzy-if(gtkWidget,2,40) == 402567-4.html 402567-4.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails fuzzy-if(skiaContent,2,5) == 402629-1.html 402629-1.html
-fails fuzzy-if(skiaContent,2,5) == 402629-2.html 402629-2.html
-fails fuzzy-if(skiaContent,2,5) == 402629-3.html 402629-3.html
-skip-if(B2G||Mulet) == 402807-1.html 402807-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 402940-1.html 402940-1.html
-== 402940-1b.html 402940-1b.html
-== 402940-2.html 402940-2.html
-== 402940-3.html 402940-3.html
-== 402950-1.html 402950-1.html
-== 403129-1.html 403129-1.html
-== 403129-2.html 403129-2.html
-== 403129-3.html 403129-3.html
-== 403129-4.html 403129-4.html
-random == 403134-1.html 403134-1.html
-# bug 405377
-skip-if(B2G||Mulet) == 403181-1.xml 403181-1.xml
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 403249-1a.html 403249-1a.html
-== 403249-1b.html 403249-1b.html
-== 403249-2a.html 403249-2a.html
-== 403249-2b.html 403249-2b.html
-== 403328-1.html 403328-1.html
-== 403426-1.html 403426-1.html
-== 403455-1.html 403455-1.html
-skip-if((B2G&&browserIsRemote)||Mulet) == 403505-1.xml 403505-1.xml
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-#== 403519-1.html 403519-1.html
-# Fails on Mac, see also discussion in bug
-== 403519-2.html 403519-2.html
-== 403656-1.html 403656-1.html
-== 403656-2.html 403656-2.html
-== 403656-3.html 403656-3.html
-fails skip == 403656-4.html 403656-4.html
-== 403656-5.html 403656-5.html
-#== 403657-1.html 403657-1.html
-# Fails depending on the fonts...
-== 403733-1.html 403733-1.html
-skip == 403962-1.xhtml 403962-1.xhtml
-== 404030-1.html 404030-1.html
-== 404030-1-notref.html 404030-1-notref.html
-== 404030-1-notref2.html 404030-1-notref2.html
-fuzzy-if(skiaContent,2,4) == 404123-1.html 404123-1.html
-== 404123-2.html 404123-2.html
-== 404123-3.html 404123-3.html
-# may fail "randomly" on OS X, doesn't seem to be rendering usefully anyhow - bug 602469
-random-if(cocoaWidget) skip-if((B2G&&browserIsRemote)||Mulet) HTTP(..) == 404149-1.xul 404149-1.xul
-# HTTP for fonts directory access
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 404180-1.html 404180-1.html
-== 404301-1.html 404301-1.html
-== 404309-1a.html 404309-1a.html
-== 404309-1b.html 404309-1b.html
-# Disabled due to compartments for now.
-#== data:application/xml,<foo/> data:application/xml,<foo/>
-# ensure we pretty-print this XML instead of letting it appear blank (test for bug 404419)
-fuzzy-if(Android,8,50) == 404553-1.html 404553-1.html
-# assertion test, also tests that marquee binding is applied correctly
-== 404666-1.html 404666-1.html
-== 404666-2.html 404666-2.html
-== 405186-1.xhtml 405186-1.xhtml
-== 405305-1.html 405305-1.html
-== 405380-1.html 405380-1.html
-== 405517-1.xhtml 405517-1.xhtml
-== 405577-1.html 405577-1.html
-== 405584-1.html 405584-1.html
-# == 405952-1.html 405952-1.html
-== 406484-1.html 406484-1.html
-== 406568-1.html 406568-1.html
-== 407016-1-a.html 407016-1-a.html
-== 407016-1-b.html 407016-1-b.html
-== 407078-1.html 407078-1.html
-== 407095-1.html 407095-1.html
-fuzzy-if(Android,13,9) == 407111-1.html 407111-1.html
-# Bug 1128229
-== 407227-1.html 407227-1.html
-== 407243-1.html 407243-1.html
-== 407419-1.html 407419-1.html
-== 407937-1.html 407937-1.html
-== 408493-1.html 408493-1.html
-== 408493-2.html 408493-2.html
-== 408656-1a.html 408656-1a.html
-== 408656-1b.html 408656-1b.html
-== 408656-1c.html 408656-1c.html
-== 408782-1a.html 408782-1a.html
-== 408782-1b.html 408782-1b.html
-== 408782-2a.html 408782-2a.html
-== 408782-2b.html 408782-2b.html
-== 409084-1a.html 409084-1a.html
-== 409084-1b.html 409084-1b.html
-== 409089-1.html 409089-1.html
-== 409089-2.html 409089-2.html
-== 409089-3.html 409089-3.html
-fuzzy-if(winWidget,123,1600) == 409659-1a.html 409659-1a.html
-# Bug 1128229
-== 409659-1b.html 409659-1b.html
-== 409659-1c.html 409659-1c.html
-fuzzy-if(winWidget,123,1900) == 409659-1d.html 409659-1d.html
-# Bug 1128229
-== 410621-1.html 410621-1.html
-== 411059-1.html 411059-1.html
-== 411334-1.xml 411334-1.xml
-== 411367-1.html 411367-1.html
-== 411367-2.html 411367-2.html
-== 411367-3.html 411367-3.html
-== 411585-1.html 411585-1.html
-== 411585-2.html 411585-2.html
-skip == 411585-3.html 411585-3.html
-# bug 426909
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 411792-1.html 411792-1.html
-== 412093-1.html 412093-1.html
-== 412352-1.html 412352-1.html
-== 412352-2.html 412352-2.html
-== 412607-1a.html 412607-1a.html
-== 412607-1b.html 412607-1b.html
-skip-if(B2G||Mulet) random-if(Android) == 412679-1.html 412679-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) fuzzy-if(skiaContent,1,17) == 412679-2.html 412679-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 413027-1.html 413027-1.html
-== 413027-2.html 413027-2.html
-== 413027-3.html 413027-3.html
-== 413286-1a.html 413286-1a.html
-== 413286-1b.html 413286-1b.html
-== 413286-1c.html 413286-1c.html
-== 413286-2a.html 413286-2a.html
-== 413286-2b.html 413286-2b.html
-== 413286-2c.html 413286-2c.html
-== 413286-3.html 413286-3.html
-== 413286-4a.html 413286-4a.html
-== 413286-4b.html 413286-4b.html
-== 413286-5.html 413286-5.html
-== 413286-6.html 413286-6.html
-skip skip-if(cocoaWidget) == 413292-1.html 413292-1.html
-# disabling due to failure loading on some mac tinderboxes. See bug 432954
-fuzzy-if(B2G||Mulet||Android,11,17) == 413361-1.html 413361-1.html
-# bug 1128229
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 413840-background-unchanged.html 413840-background-unchanged.html
-== 413840-ltr-offsets.html 413840-ltr-offsets.html
-== 413840-rtl-offsets.html 413840-rtl-offsets.html
-== 413840-pushed-line-bullet.html 413840-pushed-line-bullet.html
-== 413840-bullet-first-line.html 413840-bullet-first-line.html
-== 413982.html 413982.html
-== 414123.xhtml 414123.xhtml
-== 414638.html 414638.html
-== 414851-1.html 414851-1.html
-== 416106-1.xhtml 416106-1.xhtml
-== 416752-1.html 416752-1.html
-== 417178-1.html 417178-1.html
-== 417246-1.html 417246-1.html
-skip-if(B2G||Mulet) == 417676.html 417676.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-asserts(1) == 418574-1.html 418574-1.html
-# bug 478135
-asserts(1) == 418574-2.html 418574-2.html
-# bug 478135
-== 418766-1a.html 418766-1a.html
-== 418766-1b.html 418766-1b.html
-== 419060.html 419060.html
-== 419285-1.html 419285-1.html
-== 419531-1.html 419531-1.html
-== 420069-1.html 420069-1.html
-== 420069-2.html 420069-2.html
-== 420351-1.html 420351-1.html
-skip-if((B2G&&browserIsRemote)||Mulet) == 420790-1.xhtml 420790-1.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 421069.html 421069.html
-== 421069.html 421069.html
-== 421069-ref.html 421069-ref.html
-skip-if((B2G&&browserIsRemote)||Mulet) == 421203-1.xul 421203-1.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == 421203-2.xul 421203-2.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == 421203-3.xul 421203-3.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == 421203-4.xul 421203-4.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == 421203-5.xul 421203-5.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == 421203-6.xul 421203-6.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == 421234-1.html 421234-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 421239-1.html 421239-1.html
-== 421239-2.html 421239-2.html
-== 421419-1.html 421419-1.html
-== 421436-1a.html 421436-1a.html
-== 421436-1b.html 421436-1b.html
-fuzzy-if(skiaContent,1,5) == 421632-1.html 421632-1.html
-== 421710-1.html 421710-1.html
-skip-if(B2G||Mulet) fails-if(Android) fails-if(usesRepeatResampling) == 421885-1.xml 421885-1.xml
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 421955-1.html 421955-1.html
-skip-if(B2G||Mulet) == 422249-1.html 422249-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 422394-1.html 422394-1.html
-== 422678-1.html 422678-1.html
-== 423130-1.html 423130-1.html
-== 423385-1.html 423385-1.html
-== 423599-1.html 423599-1.html
-== 423676-1.html 423676-1.html
-== 423823-1.html 423823-1.html
-# scrolling rowgroups were removed in bug 28800
-skip-if(B2G||Mulet) == 424074-1.xul 424074-1.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) fails-if(Android) == 424074-1.xul 424074-1.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-random-if(gtkWidget) skip-if((B2G&&browserIsRemote)||Mulet) == 424074-1-ref2.xul 424074-1-ref2.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 424236-1.html 424236-1.html
-== 424236-2.html 424236-2.html
-== 424236-3.html 424236-3.html
-== 424236-4.html 424236-4.html
-== 424236-5.html 424236-5.html
-== 424236-6.html 424236-6.html
-== 424236-7.html 424236-7.html
-== 424236-8.html 424236-8.html
-== 424236-9.html 424236-9.html
-== 424236-10.html 424236-10.html
-== 424236-11.html 424236-11.html
-== 424434-1.html 424434-1.html
-== 424465-1.html 424465-1.html
-== 424631-1.html 424631-1.html
-== 424710-1.html 424710-1.html
-skip-if(B2G||Mulet) fuzzy-if(skiaContent,1,160000) == 424766-1.html 424766-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 425972-1.html 425972-1.html
-== 425972-2.html 425972-2.html
-== 425972-1.html 425972-1.html
-== 426629-1.html 426629-1.html
-asserts(3) == 427017-1.xhtml 427017-1.xhtml
-# crash test (needs reftest-print). existing assertions are bug 457400.
-== 427129-scrollframe.html 427129-scrollframe.html
-== 427129-table.html 427129-table.html
-== 427129-image.html 427129-image.html
-== 427129-table-caption.html 427129-table-caption.html
-fuzzy-if(skiaContent,1,60) == 427370-1.html 427370-1.html
-== 427730-1.html 427730-1.html
-== 428278.html 428278.html
-== 428423-1a.html 428423-1a.html
-== 428423-1b.html 428423-1b.html
-== 428521-1a.html 428521-1a.html
-== 428521-1b.html 428521-1b.html
-== 428521-1c.html 428521-1c.html
-== 428810-1a-ltr.html 428810-1a-ltr.html
-== 428810-1b-ltr.html 428810-1b-ltr.html
-== 428810-1c-ltr.html 428810-1c-ltr.html
-== 428810-1d-ltr.html 428810-1d-ltr.html
-# bug 179596
-== 428810-1-ltr-ref.html 428810-1-ltr-ref.html
-== 428810-2a-ltr.html 428810-2a-ltr.html
-== 428810-2b-ltr.html 428810-2b-ltr.html
-== 428810-2e-ltr.html 428810-2e-ltr.html
-# bug 179596
-skip == 428810-2f-ltr.html 428810-2f-ltr.html
-== 428810-2-ltr-ref.html 428810-2-ltr-ref.html
-== 428810-3a-ltr.html 428810-3a-ltr.html
-== 428810-3b-ltr.html 428810-3b-ltr.html
-== 428810-3e-ltr.html 428810-3e-ltr.html
-# bug 179596
-== 428810-3f-ltr.html 428810-3f-ltr.html
-== 428810-3-ltr-ref.html 428810-3-ltr-ref.html
-== 428810-1a-rtl.html 428810-1a-rtl.html
-== 428810-1b-rtl.html 428810-1b-rtl.html
-== 428810-1c-rtl.html 428810-1c-rtl.html
-== 428810-1d-rtl.html 428810-1d-rtl.html
-# bug 179596
-== 428810-1-rtl-ref.html 428810-1-rtl-ref.html
-== 428810-1-rtl-ref.html 428810-1-rtl-ref.html
-== 428810-2a-rtl.html 428810-2a-rtl.html
-== 428810-2b-rtl.html 428810-2b-rtl.html
-== 428810-2e-rtl.html 428810-2e-rtl.html
-# bug 179596
-== 428810-2f-rtl.html 428810-2f-rtl.html
-== 428810-2-rtl-ref.html 428810-2-rtl-ref.html
-== 428810-2-rtl-ref.html 428810-2-rtl-ref.html
-== 428810-3a-rtl.html 428810-3a-rtl.html
-== 428810-3b-rtl.html 428810-3b-rtl.html
-== 428810-3e-rtl.html 428810-3e-rtl.html
-# bug 179596
-skip == 428810-3f-rtl.html 428810-3f-rtl.html
-skip == 428810-3-rtl-ref.html 428810-3-rtl-ref.html
-skip == 428810-3-rtl-ref.html 428810-3-rtl-ref.html
-== 428810-1a-ltr-insets.html 428810-1a-ltr-insets.html
-== 428810-1b-ltr-insets.html 428810-1b-ltr-insets.html
-== 428810-1c-ltr-insets.html 428810-1c-ltr-insets.html
-== 428810-1d-ltr-insets.html 428810-1d-ltr-insets.html
-# bug 179596
-== 428810-1-ltr-insets-ref.html 428810-1-ltr-insets-ref.html
-== 428810-2a-ltr-insets.html 428810-2a-ltr-insets.html
-== 428810-2b-ltr-insets.html 428810-2b-ltr-insets.html
-== 428810-2e-ltr-insets.html 428810-2e-ltr-insets.html
-# bug 179596
-== 428810-2f-ltr-insets.html 428810-2f-ltr-insets.html
-== 428810-2-ltr-insets-ref.html 428810-2-ltr-insets-ref.html
-== 428810-3a-ltr-insets.html 428810-3a-ltr-insets.html
-== 428810-3b-ltr-insets.html 428810-3b-ltr-insets.html
-== 428810-3e-ltr-insets.html 428810-3e-ltr-insets.html
-# bug 179596
-== 428810-3f-ltr-insets.html 428810-3f-ltr-insets.html
-== 428810-3-ltr-insets-ref.html 428810-3-ltr-insets-ref.html
-== 428810-1a-rtl-insets.html 428810-1a-rtl-insets.html
-== 428810-1b-rtl-insets.html 428810-1b-rtl-insets.html
-== 428810-1c-rtl-insets.html 428810-1c-rtl-insets.html
-== 428810-1d-rtl-insets.html 428810-1d-rtl-insets.html
-# bug 179596
-== 428810-1-rtl-insets-ref.html 428810-1-rtl-insets-ref.html
-== 428810-1-rtl-insets-ref.html 428810-1-rtl-insets-ref.html
-== 428810-2a-rtl-insets.html 428810-2a-rtl-insets.html
-== 428810-2b-rtl-insets.html 428810-2b-rtl-insets.html
-== 428810-2e-rtl-insets.html 428810-2e-rtl-insets.html
-# bug 179596
-== 428810-2f-rtl-insets.html 428810-2f-rtl-insets.html
-== 428810-2-rtl-insets-ref.html 428810-2-rtl-insets-ref.html
-== 428810-2-rtl-insets-ref.html 428810-2-rtl-insets-ref.html
-== 428810-3a-rtl-insets.html 428810-3a-rtl-insets.html
-== 428810-3b-rtl-insets.html 428810-3b-rtl-insets.html
-== 428810-3e-rtl-insets.html 428810-3e-rtl-insets.html
-# bug 179596
-== 428810-3f-rtl-insets.html 428810-3f-rtl-insets.html
-== 428810-3-rtl-insets-ref.html 428810-3-rtl-insets-ref.html
-== 428810-3-rtl-insets-ref.html 428810-3-rtl-insets-ref.html
-skip-if(B2G||Mulet) == 430412-1.html 430412-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 430813-1.html 430813-1.html
-== 430813-2.html 430813-2.html
-== 430813-3.html 430813-3.html
-== 431341-1.html 431341-1.html
-== 431341-2.html 431341-2.html
-== 431520-1.html 431520-1.html
-== 431948-1.html 431948-1.html
-== 433640-1.html 433640-1.html
-== 433700.html 433700.html
-== 436356-1.html 436356-1.html
-== 436356-2.html 436356-2.html
-== 438537-1.html 438537-1.html
-== 438981-1.xhtml 438981-1.xhtml
-== 438987-1.html 438987-1.html
-fuzzy-if(skiaContent,1,3280) == 438987-2a.html 438987-2a.html
-fuzzy-if(skiaContent,1,3280) == 438987-2b.html 438987-2b.html
-fuzzy-if(skiaContent,1,3280) == 438987-2c.html 438987-2c.html
-skip == about:blank about:blank
-# check that backgrounds work at all
-== 439004-1.html 439004-1.html
-== 439639-1.html 439639-1.html
-== 439910.html 439910.html
-== 440112.html 440112.html
-== 440149-1.html 440149-1.html
-== 441259-1.html 441259-1.html
-== 441259-2.html 441259-2.html
-# bug 441400
-fuzzy-if(skiaContent,1,3) == 442542-1.html 442542-1.html
-== 444015-1.html 444015-1.html
-== 444375-1.html 444375-1.html
-== 444928-1.html 444928-1.html
-== 444928-2.html 444928-2.html
-== 444928-3.html 444928-3.html
-skip random == 445004-1.html 445004-1.html
-# bug 472268
-== 445142-1a.html 445142-1a.html
-== 445142-1b.html 445142-1b.html
-== 445142-1c.html 445142-1c.html
-== 445142-2a.html 445142-2a.html
-== 445142-2b.html 445142-2b.html
-fails-if(usesRepeatResampling) == 446100-1a.html 446100-1a.html
-skip-if(B2G||Mulet) fails-if(Android) fails-if(usesRepeatResampling) == 446100-1b.html 446100-1b.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) fails-if(Android) fails-if(usesRepeatResampling) == 446100-1c.html 446100-1c.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(usesRepeatResampling) == 446100-1d.html 446100-1d.html
-fails-if(usesRepeatResampling) == 446100-1e.html 446100-1e.html
-== 446100-1f.html 446100-1f.html
-fails-if(usesRepeatResampling) skip-if(B2G||Mulet) fails-if(Android) == 446100-1g.html 446100-1g.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 446100-1h.html 446100-1h.html
-skip-if(B2G||Mulet) == 447749-1.html 447749-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 448193.html 448193.html
-== 449149-1a.html 449149-1a.html
-== 449149-1b.html 449149-1b.html
-# Retry the above with XBL scopes
-test-pref(dom.use_xbl_scopes_for_remote_xul,true) == 449149-1a.html 449149-1a.html
-test-pref(dom.use_xbl_scopes_for_remote_xul,true) == 449149-1b.html 449149-1b.html
-== 449149-2.html 449149-2.html
-== 449171-1.html 449171-1.html
-== 449362-1.html 449362-1.html
-== 449519-1.html 449519-1.html
-== 450670-1.html 450670-1.html
-== 451168-1.html 451168-1.html
-== 451876-1.html 451876-1.html
-== 451876-2.html 451876-2.html
-== 452915-1.html 452915-1.html
-== 452964-1.html 452964-1.html
-== 454361.html 454361.html
-== 455105-1.html 455105-1.html
-== 455105-2.html 455105-2.html
-== 455171-5.html 455171-5.html
-== 455280-1.xhtml 455280-1.xhtml
-skip-if(B2G||Mulet) == 455826-1.html 455826-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) fails-if(cocoaWidget) fails-if(Android) == 456147.xul 456147.xul
-# bug 458047
-# Initial mulet triage: parity with B2G/B2G Desktop
-fuzzy-if(Android||B2G,11,41) fuzzy-if(winWidget||gtkWidget,4,6) fuzzy-if(d2d,4,69) == 456219-1a.html 456219-1a.html
-# bug 1128229
-fails fuzzy-if(Android||B2G,11,41) fuzzy-if(winWidget||gtkWidget,4,6) fuzzy-if(d2d,4,69) == 456219-1b.html 456219-1b.html
-# bug 1128229
-fails fuzzy-if(Android||B2G,11,41) fuzzy-if(winWidget||gtkWidget,4,6) fuzzy-if(d2d,4,69) == 456219-1c.html 456219-1c.html
-# bug 1128229
-fuzzy-if(skiaContent,1,45) == 456219-2.html 456219-2.html
-skip == 456330-1.gif 456330-1.gif
-== 456484-1.html 456484-1.html
-== 457398-1.html 457398-1.html
-== 457398-2.html 457398-2.html
-skip-if(B2G||Mulet) == 458296-1a.html 458296-1a.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == 458296-1b.html 458296-1b.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == 458296-1c.html 458296-1c.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == 458296-1d.html 458296-1d.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 458487-1a.html 458487-1a.html
-== 458487-1b.html 458487-1b.html
-== 458487-1c.html 458487-1c.html
-== 458487-1d.html 458487-1d.html
-== 458487-1e.html 458487-1e.html
-== 458487-1f.html 458487-1f.html
-== 458487-1g.html 458487-1g.html
-== 458487-1h.html 458487-1h.html
-== 458487-2.html 458487-2.html
-== 458487-3.html 458487-3.html
-== 458487-4a.html 458487-4a.html
-== 458487-4b.html 458487-4b.html
-== 458487-4c.html 458487-4c.html
-== 458487-5a.html 458487-5a.html
-== 458487-5b.html 458487-5b.html
-fuzzy-if(skiaContent,1,5) == 459443-1.html 459443-1.html
-== 459613-1.html 459613-1.html
-== 460012-1.html 460012-1.html
-== 461266-1.html 461266-1.html
-fuzzy-if(skiaContent,1,12000) == 461512-1.html 461512-1.html
-== 462844-1.html 462844-1.html
-== 462844-2.html 462844-2.html
-== 462844-3.html 462844-3.html
-== 462844-4.html 462844-4.html
-== 463204-1.html 463204-1.html
-skip-if((B2G&&browserIsRemote)||Mulet) == 463217-1.xul 463217-1.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == 463952-1.html 463952-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 464811-1.html 464811-1.html
-== 465574-1.html 465574-1.html
-# bug 421436
-== 466258-1.html 466258-1.html
-== 466395-1.html 466395-1.html
-skip == 466395-2.html 466395-2.html
-== 467084-1.html 467084-1.html
-== 467084-2.html 467084-2.html
-== 467444-1.html 467444-1.html
-== 467460-1.html 467460-1.html
-skip-if((B2G&&browserIsRemote)||Mulet) == 468473-1.xul 468473-1.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == 468546-1.xhtml 468546-1.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 471356-1.html 471356-1.html
-skip-if((B2G&&browserIsRemote)||Mulet) == 471594-1.xhtml 471594-1.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-fuzzy(255,15) skip-if((B2G&&browserIsRemote)||Mulet) == 472020-1a.xul 472020-1a.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == 472020-1b.xul 472020-1b.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == 472020-2.xul 472020-2.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == 472500-1.xul 472500-1.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 472769-1a.html 472769-1a.html
-== 472769-1b.html 472769-1b.html
-== 472769-2.html 472769-2.html
-== 472769-3.html 472769-3.html
-skip-if((B2G&&browserIsRemote)||Mulet) == 473847-1.xul 473847-1.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) fuzzy-if(skiaContent,1,16) == 474336-1.xul 474336-1.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == 474417-1.html 474417-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip fuzzy-if(skiaContent,1,5) == 474472-1.html 474472-1.html
-== 475986-1a.html 475986-1a.html
-== 475986-1b.html 475986-1b.html
-== 475986-1c.html 475986-1c.html
-== 475986-1d.html 475986-1d.html
-== 475986-1e.html 475986-1e.html
-== 475986-1f.html 475986-1f.html
-== 475986-2a.html 475986-2a.html
-== 475986-2b.html 475986-2b.html
-== 475986-2c.html 475986-2c.html
-== 475986-2d.html 475986-2d.html
-== 475986-2e.html 475986-2e.html
-== 475986-2f.html 475986-2f.html
-== 475986-3a.html 475986-3a.html
-== 475986-3b.html 475986-3b.html
-== 475986-4.html 475986-4.html
-== 475986-1-ref.html 475986-1-ref.html
-== 475986-1-ref.html 475986-1-ref.html
-== 475986-2-ref.html 475986-2-ref.html
-skip-if(B2G||Mulet) == 476063-1.html 476063-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == 476063-2.html 476063-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == 476063-3.html 476063-3.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == 476063-4.xhtml 476063-4.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 476357-1.html 476357-1.html
-== 476598-1a.html 476598-1a.html
-== 476598-1a.html 476598-1a.html
-== 476598-1b.html 476598-1b.html
-== 476598-1b.html 476598-1b.html
-== 476598-1-ref.html 476598-1-ref.html
-== 476856-1.html 476856-1.html
-random-if(d2d) skip-if((B2G&&browserIsRemote)||Mulet) == 478377-1.xul 478377-1.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 478614-1.html 478614-1.html
-== 478614-2.html 478614-2.html
-== 478614-3.html 478614-3.html
-== 478614-4.html 478614-4.html
-== 478614-5.html 478614-5.html
-== 478614-6.html 478614-6.html
-== 478614-7.html 478614-7.html
-skip-if(B2G||Mulet) == 478811-1.html 478811-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 478811-2.html 478811-2.html
-== 478811-3.html 478811-3.html
-== 478811-4.html 478811-4.html
-== 478956-1a.html 478956-1a.html
-== 478956-1b.html 478956-1b.html
-== 480017-1.html 480017-1.html
-== 480880-1a.html 480880-1a.html
-== 480880-1b.html 480880-1b.html
-fails skip == 480880-1c.html 480880-1c.html
-fails skip == 480880-1d.html 480880-1d.html
-fails skip == 480880-1e.html 480880-1e.html
-== 480880-2a.html 480880-2a.html
-== 480880-2b.html 480880-2b.html
-== 480880-2c.html 480880-2c.html
-skip-if(B2G||Mulet) fails-if(Android) == 481024-1a.html 481024-1a.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) fails-if(Android) == 481024-1b.html 481024-1b.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) fails-if(Android) == 481024-1c.html 481024-1c.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 481024-1d.html 481024-1d.html
-== 481024-1e.html 481024-1e.html
-== 481948-1.html 481948-1.html
-skip == 481948-2.html 481948-2.html
-skip == 481948-3.html 481948-3.html
-# questionable test, see bug 488364
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 482398-1.html 482398-1.html
-random-if(d2d) skip-if((B2G&&browserIsRemote)||Mulet) == 482592-1a.xhtml 482592-1a.xhtml
-# bug 586771
-# Initial mulet triage: parity with B2G/B2G Desktop
-random-if(d2d) skip-if((B2G&&browserIsRemote)||Mulet) == 482592-1b.xhtml 482592-1b.xhtml
-# bug 586771
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails random-if(winWidget) fuzzy-if(skiaContent,1,5) == 482659-1a.html 482659-1a.html
-fails fuzzy-if(skiaContent,1,5) == 482659-1b.html 482659-1b.html
-fails skip fuzzy-if(skiaContent,1,5) == 482659-1c.html 482659-1c.html
-fails skip fuzzy-if(skiaContent,1,5) == 482659-1d.html 482659-1d.html
-skip-if((B2G&&browserIsRemote)||Mulet) == 483565.xul 483565.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 484256-1.html 484256-1.html
-== 484256-2.html 484256-2.html
-== 485012-1.html 485012-1.html
-== 485275-1.html 485275-1.html
-== 485275-1.svg 485275-1.svg
-== 486052-1.html 486052-1.html
-== 486052-2a.html 486052-2a.html
-== 486052-2b.html 486052-2b.html
-== 486052-2c.html 486052-2c.html
-== 486052-2d.html 486052-2d.html
-== 486052-2e.html 486052-2e.html
-== 486052-2f.html 486052-2f.html
-== 486052-2g.html 486052-2g.html
-== 486065-1.html 486065-1.html
-skip-if((B2G&&browserIsRemote)||Mulet) == 486848-1.xul 486848-1.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 487539-1.html 487539-1.html
-== 488390-1.html 488390-1.html
-== 488649-1.html 488649-1.html
-== 488685-1.html 488685-1.html
-== 488692-1.html 488692-1.html
-== 489868-1.svg 489868-1.svg
-== 490173-1.html 490173-1.html
-== 490173-2.html 490173-2.html
-== 490176-1.html 490176-1.html
-== 490177-1.svg 490177-1.svg
-== 490182-1a.html 490182-1a.html
-== 490182-1b.html 490182-1b.html
-pref(browser.display.focus_ring_width,1) == 491180-1.html 491180-1.html
-pref(browser.display.focus_ring_width,1) == 491180-2.html 491180-2.html
-skip-if((B2G&&browserIsRemote)||Mulet) == 491323-1.xul 491323-1.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == 492239-1.xul 492239-1.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 492661-1.html 492661-1.html
-== 493968-1.html 493968-1.html
-== 494667-1.html 494667-1.html
-== 494667-2.html 494667-2.html
-== 495274-1.html 495274-1.html
-skip-if((B2G&&browserIsRemote)||Mulet) == 495354-1a.xhtml 495354-1a.xhtml
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == 495354-1b.xhtml 495354-1b.xhtml
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 495385-1a.html 495385-1a.html
-== 495385-1b.html 495385-1b.html
-== 495385-1c.html 495385-1c.html
-== 495385-1d.html 495385-1d.html
-== 495385-1e.html 495385-1e.html
-== 495385-1f.html 495385-1f.html
-== 495385-2a.html 495385-2a.html
-== 495385-2b.html 495385-2b.html
-== 495385-2c.html 495385-2c.html
-random == 495385-2d.html 495385-2d.html
-== 495385-2e.html 495385-2e.html
-pref(dom.use_xbl_scopes_for_remote_xul,true) skip-if((B2G&&browserIsRemote)||Mulet) == 495385-2f.xhtml 495385-2f.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 495385-2g.html 495385-2g.html
-== 495385-2h.html 495385-2h.html
-== 495385-2i.html 495385-2i.html
-== 495385-3.html 495385-3.html
-== 495385-4.html 495385-4.html
-== 495385-5.html 495385-5.html
-== 496032-1.html 496032-1.html
-== 496840-1.html 496840-1.html
-skip-if((B2G&&browserIsRemote)||Mulet) fuzzy-if(skiaContent,1,17000) == 498228-1.xul 498228-1.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 501037.html 501037.html
-== 501257-1a.html 501257-1a.html
-== 501257-1b.html 501257-1b.html
-== 501257-1.xhtml 501257-1.xhtml
-== 501627-1.html 501627-1.html
-== 502288-1.html 502288-1.html
-skip-if(B2G||Mulet) == 502447-1.html 502447-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 502795-1.html 502795-1.html
-== 502942-1.html 502942-1.html
-== 503364-1a.html 503364-1a.html
-== 503364-1b.html 503364-1b.html
-# Reftest for bug 503531 marked as failing; should be re-enabled when
-# bug 607548 gets resolved.
-random == 503531-1.html 503531-1.html
-== 504032-1.html 504032-1.html
-== 505743-1.html 505743-1.html
-skip-if(B2G||Mulet) fuzzy-if(Android,5,2800) == 506481-1.html 506481-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 507187-1.html 507187-1.html
-== 507487-1.html 507487-1.html
-== 507487-2.xhtml 507487-2.xhtml
-== 507762-1.html 507762-1.html
-== 507762-2.html 507762-2.html
-== 507762-3.html 507762-3.html
-== 507762-4.html 507762-4.html
-skip-if(B2G||Mulet) random-if(cocoaWidget) == 508816-1.xul 508816-1.xul
-# Bug 631982
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == 508816-2.html 508816-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-# skip-if((B2G&&browserIsRemote)||Mulet) == 508908-1.xul 508908-1.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 508919-1.xhtml 508919-1.xhtml
-== 509155-1.xhtml 509155-1.xhtml
-fails skip-if(B2G||Mulet) fuzzy-if(Android,5,1656) fuzzy-if(skiaContent,1,1200) == 512410.html 512410.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 512631-1.html 512631-1.html
-== 513153-1a.html 513153-1a.html
-== 513153-1b.html 513153-1b.html
-== 513153-2a.html 513153-2a.html
-== 513153-2b.html 513153-2b.html
-skip-if((B2G&&browserIsRemote)||Mulet) == 513318-1.xul 513318-1.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) fails-if(Android&&(!asyncPan)) == 513318-2.xul 513318-2.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 514917-1.html 514917-1.html
-HTTP(..) == 518172-1a.html 518172-1a.html
-fuzzy-if(winWidget,73,133) fuzzy-if(cocoaWidget,103,133) HTTP(..) == 518172-1b.html 518172-1b.html
-HTTP(..) == 518172-2a.html 518172-2a.html
-fuzzy-if(winWidget,73,133) fuzzy-if(cocoaWidget,103,133) HTTP(..) == 518172-2b.html 518172-2b.html
-== 520421-1.html 520421-1.html
-== 520563-1.xhtml 520563-1.xhtml
-fuzzy-if(skiaContent,1,3) == 521525-1.html 521525-1.html
-== 521525-2.html 521525-2.html
-== 521539-1.html 521539-1.html
-== 521542-1.xhtml 521542-1.xhtml
-== 521602.html 521602.html
-== 521685-1.html 521685-1.html
-== 522632-1.html 522632-1.html
-== 523096-1.html 523096-1.html
-random-if(d2d) == 523468-1.html 523468-1.html
-== 524175-1.html 524175-1.html
-fails fuzzy-if(skiaContent,1,50) == 526463-1.html 526463-1.html
-== 527464-1.html 527464-1.html
-== 528038-1a.html 528038-1a.html
-== 528038-1b.html 528038-1b.html
-== 528038-1c.html 528038-1c.html
-== 528038-1d.html 528038-1d.html
-== 528038-1e.html 528038-1e.html
-== 528038-1f.html 528038-1f.html
-== 528038-2.html 528038-2.html
-== 528096-1.html 528096-1.html
-== 530686-1.html 530686-1.html
-== 531098-1.html 531098-1.html
-fuzzy-if(Android,2,48) == 531200-1.html 531200-1.html
-== 531371-1.html 531371-1.html
-== 534526-1a.html 534526-1a.html
-== 534526-1b.html 534526-1b.html
-== 534804-1.html 534804-1.html
-== 534808-1.html 534808-1.html
-== 534808-2.html 534808-2.html
-fails-if(OSX==1007) == 534919-1.html 534919-1.html
-# Bug 705044
-random == 536061.html 536061.html
-# fixedpoint division in blur code makes this fail
-== 537471-1.html 537471-1.html
-skip-if((B2G&&browserIsRemote)||Mulet) == 537507-1.xul 537507-1.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == 537507-2.html 537507-2.html
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 538909-1.html 538909-1.html
-== 538935-1.html 538935-1.html
-== 539226-1.html 539226-1.html
-== 539323-1.html 539323-1.html
-== 539323-2.html 539323-2.html
-== 539323-3.html 539323-3.html
-== 539880-1.html 539880-1.html
-== 539880-1-dynamic.html 539880-1-dynamic.html
-skip == 539949-1.html#test2 539949-1.html#test2
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 541382-1.html 541382-1.html
-skip random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)||!haveTestPlugin) == 541406-1.html 541406-1.html
-needs-focus == 542116-1.html 542116-1.html
-needs-focus == 542116-2.html 542116-2.html
-needs-focus == 542116-3.html 542116-3.html
-== 542317-1.html 542317-1.html
-== 542620-1.html 542620-1.html
-== 545049-1.html 545049-1.html
-== 546033-1.html 546033-1.html
-skip random-if(!haveTestPlugin) == 546071-1.html 546071-1.html
-== 549184-1.html 549184-1.html
-== 550325-1.html 550325-1.html
-== 550325-2.html 550325-2.html
-== 550325-3.html 550325-3.html
-== 550716-1.html 550716-1.html
-skip-if(B2G||Mulet) fuzzy-if(Android,12,300) == 551463-1.html 551463-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 551699-1.html 551699-1.html
-== 552334-1.html 552334-1.html
-# Bug 553571 was specific to MS Indic shaping behavior and Win7 font support;
-# the test is not currently relevant under harfbuzz shaping.
-# Keeping it here for the record, and because we may evolve HB's dotted-circle
-# behavior further in the future, which could make this become relevant again.
-# Marked "random" rather than "fails" because it may (spuriously) appear to pass
-# on B2G or Android devices that completely lack any Sinhala font support.
-random == 553571-1.html 553571-1.html
-# expect dotted circle in test, not in ref: "fails" under harfbuzz, which doesn't consider the sequence invalid
-fuzzy-if(!contentSameGfxBackendAsCanvas,128,91) random-if(d2d) skip-if(azureSkiaGL) fuzzy-if(skiaContent,32,150) == 555388-1.html 555388-1.html
-== 556661-1.html 556661-1.html
-# fuzzy-if(skiaContent,2,5) == 557087-1.html 557087-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-# fails-if(Android) fuzzy-if(skiaContent,2,5) == 557087-2.html 557087-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 557736-1.html 557736-1.html
-skip-if((B2G&&browserIsRemote)||Mulet) == 558011-1.xul 558011-1.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 559284-1.html 559284-1.html
-skip-if(B2G||Mulet) fails-if(Android) == 560455-1.xul 560455-1.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-fuzzy-if(skiaContent,2,5) == 561981-1.html 561981-1.html
-== 561981-2.html 561981-2.html
-fuzzy-if(skiaContent,1,5) == 561981-3.html 561981-3.html
-== 561981-4.html 561981-4.html
-fuzzy-if(skiaContent,1,5) == 561981-5.html 561981-5.html
-== 561981-6.html 561981-6.html
-fuzzy-if(skiaContent,1,5) == 561981-7.html 561981-7.html
-== 561981-8.html 561981-8.html
-== 562835-1.html 562835-1.html
-== 562835-2.html 562835-2.html
-skip-if(B2G||Mulet) fuzzy-if(Android,2,48) == 563584-1.html 563584-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) fuzzy-if(Android,2,48) == 563584-2.html 563584-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) fuzzy-if(Android,4,180) == 563584-3.html 563584-3.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) fuzzy-if(Android,4,180) == 563584-4.html 563584-4.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fuzzy-if(Android,2,48) == 563584-5.html 563584-5.html
-test-pref(layout.float-fragments-inside-column.enabled,false) == 563584-6-columns.html 563584-6-columns.html
-test-pref(layout.float-fragments-inside-column.enabled,true) == 563584-6-columns.html 563584-6-columns.html
-skip-if(B2G||Mulet) fuzzy-if(Android,2,48) == 563584-6-printing.html 563584-6-printing.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) fuzzy-if(Android,2,48) == 563584-7.html 563584-7.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-# FIXME: It would be nice to have variants of these -8 tests for the
-# table narrowing quirk causing a change to mIsTopOfPage (though I'm not
-# entirely sure our behavior is the right one, either).
-skip-if(B2G||Mulet) fuzzy-if(Android,2,48) == 563584-8a.html 563584-8a.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) fuzzy-if(Android,2,48) == 563584-8b.html 563584-8b.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) fuzzy-if(Android,4,180) == 563584-8c.html 563584-8c.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) fuzzy-if(Android,4,180) == 563584-8d.html 563584-8d.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 563584-9a.html 563584-9a.html
-== 563584-9b.html 563584-9b.html
-== 563584-9c.html 563584-9c.html
-== 563584-9d.html 563584-9d.html
-fuzzy-if(Android,2,48) == 563584-10a.html 563584-10a.html
-fuzzy-if(Android,2,48) == 563584-10b.html 563584-10b.html
-fuzzy-if(Android,2,48) == 563584-11.html 563584-11.html
-== 563884-1.html 563884-1.html
-== 564002-1.html 564002-1.html
-== 564054-1.html 564054-1.html
-skip-if(B2G||Mulet) fails-if(Android) random-if(layersGPUAccelerated) fuzzy-if(skiaContent,1,1200) == 564991-1.html 564991-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 565819-1.html 565819-1.html
-== 565819-2.html 565819-2.html
-needs-focus == 568441.html 568441.html
-skip-if(B2G||Mulet) == 569006-1.html 569006-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 571281-1a.html 571281-1a.html
-== 571281-1b.html 571281-1b.html
-== 571281-1c.html 571281-1c.html
-== 571347-1a.html 571347-1a.html
-== 571347-1b.html 571347-1b.html
-== 571347-2a.html 571347-2a.html
-== 571347-2b.html 571347-2b.html
-== 571347-2c.html 571347-2c.html
-== 571347-2d.html 571347-2d.html
-== 571347-3.html 571347-3.html
-== 572598-1.html 572598-1.html
-== 574898-1.html 574898-1.html
-# 574907 is a windows-only issue, result on other platforms depends on details of font support
-random-if(!winWidget) fails-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu)&&d2d) == 574907-1.html 574907-1.html
-# Bug 1258240
-random-if(!winWidget) fails-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu)&&d2d) == 574907-2.html 574907-2.html
-# Bug 1258240
-# 574907-3 only worked under directwrite, and even there it now depends on the rendering mode; marking as random for now
-random-if(!winWidget) fails-if(winWidget&&!d2d) random-if(winWidget&&d2d) == 574907-3.html 574907-3.html
-== 577838-1.html 577838-1.html
-== 577838-2.html 577838-2.html
-== 579323-1.html 579323-1.html
-== 579349-1.html 579349-1.html
-== 579655-1.html 579655-1.html
-skip-if(!haveTestPlugin) skip-if(B2G||Mulet) fails-if(Android) == 579808-1.html 579808-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails skip-if(B2G||Mulet) fails-if(Android) random-if(layersGPUAccelerated) fuzzy-if(skiaContent,1,10000) == 579985-1.html 579985-1.html
-# bug 623452 for WinXP; this bug was only for a regression in BasicLayers anyway
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) skip-if(Android) == 580160-1.html 580160-1.html
-# bug 920927 for Android; issues without the test-plugin
-# Initial mulet triage: parity with B2G/B2G Desktop
-fuzzy-if(asyncPan&&!layersGPUAccelerated,255,33) HTTP(..) == 580863-1.html 580863-1.html
-fails skip-if(B2G||Mulet) fails-if(Android) random-if(layersGPUAccelerated) fuzzy-if(skiaContent,1,6436) == 581317-1.html 581317-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 581579-1.html 581579-1.html
-== 582037-1a.html 582037-1a.html
-== 582037-1b.html 582037-1b.html
-skip-if(B2G||Mulet) fuzzy-if(Android,3,256) == 582037-2a.html 582037-2a.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) fuzzy-if(Android,3,256) == 582037-2b.html 582037-2b.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-asserts(1-2) == 582146-1.html 582146-1.html
-skip-if(B2G||Mulet) == 582476-1.svg 582476-1.svg
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 584400-dash-length.svg 584400-dash-length.svg
-== 584699-1.html 584699-1.html
-fuzzy-if(Android,2,48) == 585598-2.xhtml 585598-2.xhtml
-== 586400-1.html 586400-1.html
-skip-if(B2G||Mulet) fuzzy-if(d2d,52,1051) fuzzy-if(OSX==1008,129,1068) == 586683-1.html 586683-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 589615-1a.xhtml 589615-1a.xhtml
-== 589615-1b.html 589615-1b.html
-== 589672-1.html 589672-1.html
-== 589682-1.html 589682-1.html
-skip == 593243-1.html 593243-1.html
-# bug 593168
-skip == 593243-2.html 593243-2.html
-# bug 593168
-== 593544-1.html 593544-1.html
-random-if(Android) == 594333-1.html 594333-1.html
-fuzzy-if(B2G,1,40000) == 594624-1.html 594624-1.html
-== 594737-1.html 594737-1.html
-fails fuzzy-if(skiaContent,1,80) == 597721-1.html 597721-1.html
-skip == 598726-1.html 598726-1.html
-# Fails on Windows, bug 782196
-== 599113-1.html 599113-1.html
-fails skip fails-if(!haveTestPlugin) == 599476.html 599476.html
-== 599882-1a.html 599882-1a.html
-== 599882-1b.html 599882-1b.html
-== 599882-2.html 599882-2.html
-== 600045-1.html 600045-1.html
-skip-if(B2G||Mulet) == 600803-1.html 600803-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 600974-1.html 600974-1.html
-== 600974-2.html 600974-2.html
-== 600974-3.html 600974-3.html
-== 602200-1.html 602200-1.html
-== 602200-2.html 602200-2.html
-fuzzy-if(Android,8,20) == 602200-3.html 602200-3.html
-== 602200-4.html 602200-4.html
-== 603423-1.html 603423-1.html
-== 604737.html 604737.html
-fails skip == 605138-1.html 605138-1.html
-== 605157-1.xhtml 605157-1.xhtml
-== 607267-1.html 607267-1.html
-== 608636-1.html 608636-1.html
-== 608756-1a.html 608756-1a.html
-== 608756-1b.html 608756-1b.html
-== 608756-2.html 608756-2.html
-fuzzy-if(Android,4,196) == 609272-1.html 609272-1.html
-needs-focus == 613433-1.html 613433-1.html
-needs-focus == 613433-1.html 613433-1.html
-needs-focus == 613433-1.html 613433-1.html
-needs-focus == 613433-2.html 613433-2.html
-needs-focus == 613433-2.html 613433-2.html
-needs-focus == 613433-2.html 613433-2.html
-needs-focus == 613433-3.html 613433-3.html
-needs-focus == 613433-3.html 613433-3.html
-needs-focus == 613433-3.html 613433-3.html
-== 614272-1.svg 614272-1.svg
-HTTP(..) == 615121-1.html 615121-1.html
-HTTP(..) == 615121-2.html 615121-2.html
-== 617242-1.html 617242-1.html
-== 618071.html 618071.html
-== 619117-1.html 619117-1.html
-HTTP(..) == 619511-1.html 619511-1.html
-skip-if(Android) HTTP(..) == 621253-1-externalFilter.html 621253-1-externalFilter.html
-skip-if(Android) == 621253-1-internalFilter.html 621253-1-internalFilter.html
-HTTP(..) == 621253-2-externalFilter.html 621253-2-externalFilter.html
-== 621253-2-internalFilter.html 621253-2-internalFilter.html
-skip-if(B2G||Mulet) random-if(winWidget) fuzzy-if(OSX==1008,19,17) == 621918-1.svg 621918-1.svg
-# 1-pixel diacritic positioning discrepancy in rotated text (may depend on platform fonts)
-# Initial mulet triage: parity with B2G/B2G Desktop
-random-if(winWidget) HTTP(..) == 621918-2.svg 621918-2.svg
-# same 1px issue as above, and HTTP(..) for filters.svg, used to mask antialiasing issues where glyphs touch
-fuzzy-if(d2d,5,1) == 622585-1.html 622585-1.html
-# bug 789402
-fuzzy-if(Android,8,300) fuzzy-if(skiaContent,1,40000) == 625409-1.html 625409-1.html
-== 627393-1.html 627393-1.html
-fails fuzzy-if(skiaContent,1,500) == 630835-1.html 630835-1.html
-== 631352-1.html 631352-1.html
-skip-if(!haveTestPlugin) skip-if(B2G||Mulet) fails-if(Android) fuzzy-if(winWidget&&!layersGPUAccelerated,102,535) fuzzy-if(skiaContent,102,11000) == 632423-1.html 632423-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(Android||B2G||Mulet) random-if(winWidget||OSX==1010) == 632781-verybig.html 632781-verybig.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 632781-normalsize.html 632781-normalsize.html
-fuzzy-if(d2d&&/^Windows\x20NT\x206\.2/.test(http.oscpu),1,559) fuzzy-if(!isDebugBuild&&gtkWidget&&/^Linux\x20i686/.test(http.oscpu),102,140) == 633344-1.html 633344-1.html
-# bug 1103623, Linux32 from GCC update
-fuzzy-if(skiaContent,1,500) == 634232-1.html 634232-1.html
-fuzzy-if(skiaContent,3,120000) == 635302-1.html 635302-1.html
-fuzzy-if(gtkWidget,1,70) skip-if(B2G||Mulet) fails-if(Android) fuzzy-if(skiaContent,1,300) == 635373-1.html 635373-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) random-if(d2d) fails-if(Android) fuzzy-if(winWidget&&!d2d,20,118) fuzzy-if(skiaContent,2,550) == 635373-2.html 635373-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) random-if(d2d) fails-if(Android) fuzzy-if(winWidget&&!d2d,20,116) fuzzy-if(skiaContent,2,650) == 635373-3.html 635373-3.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-HTTP(..) == 635639-1.html 635639-1.html
-HTTP(..) == 635639-2.html 635639-2.html
-random == 637597-1.html 637597-1.html
-# bug 637597 was never really fixed!
-fuzzy-if(Android,8,500) == 637852-1.html 637852-1.html
-fuzzy-if(Android,8,500) == 637852-2.html 637852-2.html
-fuzzy-if(Android,8,500) == 637852-3.html 637852-3.html
-skip-if(B2G||Mulet) == 641770-1.html 641770-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 641856-1.html 641856-1.html
-== 645491-1.html 645491-1.html
-== 645647-1.html 645647-1.html
-== 645647-2.html 645647-2.html
-== 645768-1.html 645768-1.html
-fails fails-if(layersGPUAccelerated&&cocoaWidget) fuzzy-if(!layersGPUAccelerated,41,260) fuzzy-if(skiaContent,49,11000) == 650228-1.html 650228-1.html
-# Quartz alpha blending doesn't match GL alpha blending
-needs-focus == 652301-1a.html 652301-1a.html
-needs-focus == 652301-1b.html 652301-1b.html
-fuzzy-if(skiaContent,2,5) == 652775-1.html 652775-1.html
-fuzzy-if(skiaContent,1,5) == 653930-1.html 653930-1.html
-HTTP(..) == 654057-1.html 654057-1.html
-fails-if(layersGPUAccelerated&&cocoaWidget&&!skiaContent) == 654950-1.html 654950-1.html
-# Quartz alpha blending doesn't match GL alpha blending
-== 655549-1.html 655549-1.html
-== 655836-1.html 655836-1.html
-== 656875.html 656875.html
-== 658952.html 658952.html
-fuzzy-if(skiaContent,1,3500) == 660682-1.html 660682-1.html
-fuzzy-if(d2d,1,256) skip-if((B2G&&browserIsRemote)||Mulet) skip-if(Android) fuzzy-if(skiaContent,1,68000) == 664127-1.xul 664127-1.xul
-# B2G: bug 974780. Android: Intermittent failures - bug 1019131
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == 665597-1.html 665597-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == 665597-2.html 665597-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == 668319-1.xul 668319-1.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == 669015-1.xul 669015-1.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(azureSkiaGL) == 670442-1.html 670442-1.html
-== 670467-1.html 670467-1.html
-== 670467-2.html 670467-2.html
-== 690164-1.html 690164-1.html
-== 690643-1.html 690643-1.html
-== 691087-1.html 691087-1.html
-== 691571-1.html 691571-1.html
-fails fuzzy-if(skiaContent,1,200) == 696307-1.html 696307-1.html
-fuzzy-if(skiaContent,1,550) == 696739-1.html 696739-1.html
-needs-focus == 703186-1.html 703186-1.html
-needs-focus == 703186-2.html 703186-2.html
-needs-focus == 703186-1.html 703186-1.html
-== 711359-1.html 711359-1.html
-== 712849-1.html 712849-1.html
-== 713856-static.html 713856-static.html
-== 713856-dynamic.html 713856-dynamic.html
-== 714519-1-as.html 714519-1-as.html
-== 714519-1-q.html 714519-1-q.html
-== 714519-2-as.html 714519-2-as.html
-== 714519-2-q.html 714519-2-q.html
-skip-if(B2G||Mulet) fuzzy-if(true,1,21) fuzzy-if(d2d,68,173) fuzzy-if(cocoaWidget,1,170) == 718521.html 718521.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 720987.html 720987.html
-== 722888-1.html 722888-1.html
-== 722923-1.html 722923-1.html
-== 723484-1.html 723484-1.html
-random-if(Android||(B2G&&browserIsRemote)||Mulet) == 728983-1.html 728983-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == 729143-1.html 729143-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 731521-1.html 731521-1.html
-needs-focus == 731726-1.html 731726-1.html
-== 735481-1.html 735481-1.html
-fails fuzzy-if(cocoaWidget,1,300000) fuzzy-if(skiaContent,2,300000) == 745934-1.html 745934-1.html
-== 748692-1a.html 748692-1a.html
-== 748692-1b.html 748692-1b.html
-skip-if(B2G||Mulet) == 748803-1.html 748803-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 750551-1.html 750551-1.html
-skip-if(B2G||Mulet) == 751012-1a.html 751012-1a.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == 751012-1b.html 751012-1b.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-random-if(Android) == 753329-1.html 753329-1.html
-fails == 758561-1.html 758561-1.html
-fuzzy-if(true,1,90) fuzzy-if(skiaContent,1,320) == 759036-1.html 759036-1.html
-fuzzy-if(true,17,5886) == 759036-2.html 759036-2.html
-== 776265-1a.html 776265-1a.html
-== 776265-1b.html 776265-1b.html
-== 776265-1c.html 776265-1c.html
-== 776265-1d.html 776265-1d.html
-== 776265-2a.html 776265-2a.html
-== 776265-2b.html 776265-2b.html
-== 776265-2c.html 776265-2c.html
-== 776265-2d.html 776265-2d.html
-== 776443-1.html 776443-1.html
-== 776443-2.html 776443-2.html
-== 786254-1.html 786254-1.html
-== 787947-1.html 787947-1.html
-== 796847-1.svg 796847-1.svg
-fails fuzzy-if(azureQuartz,73,542) fuzzy-if(skiaContent,1,2500) == 797797-1.html 797797-1.html
-# 'opacity:N' and rgba(,,,N) text don't match precisely
-fuzzy-if(azureQuartz,68,586) fuzzy-if(skiaContent,2,2310) == 797797-2.html 797797-2.html
-# 'opacity:N' and rgba(,,,N) text don't match precisely
-== 801994-1.html 801994-1.html
-== 804323-1.html 804323-1.html
-fuzzy-if(Android,8,608) == 811301-1.html 811301-1.html
-== 812824-1.html 812824-1.html
-== 814677.html 814677.html
-skip-if(B2G||Mulet) == 814952-1.html 814952-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) fuzzy-if(Android,4,400) == 815593-1.html 815593-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 816359-1.html 816359-1.html
-== 816458-1.html 816458-1.html
-fuzzy-if(skiaContent,1,5) == 816948-1.html 816948-1.html
-== 817019-1.html 817019-1.html
-skip-if(B2G||Mulet) fuzzy-if(skiaContent,1,5) == 818276-1.html 818276-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-random == 825999.html 825999.html
-== 827577-1a.html 827577-1a.html
-== 827577-1b.html 827577-1b.html
-== 827799-1.html 827799-1.html
-== 829958.html 829958.html
-== 836844-1.html 836844-1.html
-== 841192-1.html 841192-1.html
-== 844178.html 844178.html
-fuzzy-if(OSX,1,364) fuzzy-if(skiaContent,1,320) == 846144-1.html 846144-1.html
-== 847850-1.html 847850-1.html
-== 848421-1.html 848421-1.html
-random-if(B2G||Mulet) == 849407-1.html 849407-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 849996-1.html 849996-1.html
-skip-if((B2G&&browserIsRemote)||Mulet) == 858803-1.html 858803-1.html
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 860242-1.html 860242-1.html
-== 860370.html 860370.html
-== 871338-1.html 871338-1.html
-== 875060-1.html 875060-1.html
-== 883987-1a.html 883987-1a.html
-== 883987-1b.html 883987-1b.html
-== 883987-1c.html 883987-1c.html
-== 883987-1d.html 883987-1d.html
-== 883987-1e.html 883987-1e.html
-== 883987-1f.html 883987-1f.html
-== 890495-1.html 890495-1.html
-== 894931-1.html 894931-1.html
-== 897491-1.html 897491-1.html
-== 897491-2.html 897491-2.html
-fuzzy-if(Android,5,10000) == 902330-1.html 902330-1.html
-fuzzy-if(Android,8,400) == 906199-1.html 906199-1.html
-== 921716-1.html 921716-1.html
-== 926155-1.html 926155-1.html
-fuzzy-if(cocoaWidget,1,40) == 928607-1.html 928607-1.html
-fails fuzzy-if(skiaContent,1,3) == 931464-1.html 931464-1.html
-== 931853.html 931853.html
-== 931853-quirks.html 931853-quirks.html
-fuzzy-if(OSX==1006,2,30) skip-if((B2G&&browserIsRemote)||Mulet) == 933264-1.html 933264-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 936670-1.svg 936670-1.svg
-== 941940-1.html 941940-1.html
-== 942017.html 942017.html
-# bug 942017
-fuzzy-if(Android,1,1) fuzzy-if(B2G,1,7) fuzzy-if(skiaContent,1,160000) == 942672-1.html 942672-1.html
-== 953334-win32-clipping.html 953334-win32-clipping.html
-fuzzy-if(skiaContent,1,5) == 956513-1.svg 956513-1.svg
-== 944291-1.html 944291-1.html
-== 950436-1.html 950436-1.html
-== 957770-1.svg 957770-1.svg
-== 960277-1.html 960277-1.html
-fuzzy-if(skiaContent,1,80) == 961887-1.html 961887-1.html
-== 961887-2.html 961887-2.html
-== 961887-3.html 961887-3.html
-fails pref(layout.css.overflow-clip-box.enabled,true) fuzzy(50,145) fuzzy-if(asyncPan&&!layersGPUAccelerated,102,3712) == 966992-1.html 966992-1.html
-skip-if(Android) == 966510-1.html 966510-1.html
-# scrollable elements other than the root probably won't work well on android until bug 776030 is fixed
-skip-if(Android) == 966510-2.html 966510-2.html
-# same as above
-fuzzy-if(skiaContent,1,123) == 978911-1.svg 978911-1.svg
-skip == 983084-1.html 983084-1.html
-skip == 983084-2.html 983084-2.html
-skip == 983084-3.html 983084-3.html
-== 983691-1.html 983691-1.html
-HTTP(..) == 983985-1.html 983985-1.html
-HTTP(..) == 983985-2.html 983985-2.html
-== 985303-1a.html 985303-1a.html
-== 985303-1b.html 985303-1b.html
-== 987680-1.html 987680-1.html
-fuzzy-if(d2d,1,36) == 991046-1.html 991046-1.html
-pref(layout.css.overflow-clip-box.enabled,true) fuzzy-if(skiaContent,2,845) == 992447.html 992447.html
-== 1003425-1.html 1003425-1.html
-== 1003425-2.html 1003425-2.html
-== 1005405-1.html 1005405-1.html
-== 1012640-1.html 1012640-1.html
-fuzzy-if(/^Windows\x20NT\x205\.1/.test(http.oscpu),255,1) == 1013054-1.html 1013054-1.html
-== 1018522-1.html 1018522-1.html
-== 1021564-1.html 1021564-1.html
-== 1021564-2.html 1021564-2.html
-== 1021564-3.html 1021564-3.html
-== 1021564-4.html 1021564-4.html
-pref(browser.display.use_document_fonts,0) == 1022481-1.html 1022481-1.html
-fuzzy-if(d2d,1,125200) fuzzy-if(skiaContent,1,126000) == 1022612-1.html 1022612-1.html
-== 1024473-1.html 1024473-1.html
-fuzzy-if(skiaContent,1,24000) == 1025914-1.html 1025914-1.html
-== 1042104-1.html 1042104-1.html
-== 1043537-1.html 1043537-1.html
-== 1044198-1.html 1044198-1.html
-== 1049499-1.html 1049499-1.html
-== 1050493-1.html 1050493-1.html
-== 1050788-1.html 1050788-1.html
-== 1053035-1-flex.html 1053035-1-flex.html
-test-pref(layout.css.grid.enabled,true) == 1053035-1-grid.html 1053035-1-grid.html
-== 1059167-1.html 1059167-1.html
-== 1059498-1.html 1059498-1.html
-== 1059498-2.html 1059498-2.html
-== 1059498-3.html 1059498-3.html
-skip-if(Mulet) == 1062108-1.html 1062108-1.html
-# Bug 1139893: font rounding failure, tracked in bug 1141535
-fuzzy-if(Mulet,1,5) == 1062792-1.html 1062792-1.html
-== 1062963-floatmanager-reflow.html 1062963-floatmanager-reflow.html
-skip == 1066554-1.html 1066554-1.html
-== 1069716-1.html 1069716-1.html
-== 1078262-1.html 1078262-1.html
-test-pref(layout.testing.overlay-scrollbars.always-visible,false) == 1081072-1.html 1081072-1.html
-== 1081185-1.html 1081185-1.html
-== 1097437-1.html 1097437-1.html
-== 1103258-1.html 1103258-1.html
-# assertion crash test with layers culling test
-== 1105137-1.html 1105137-1.html
-fuzzy-if(d2d,36,304) fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu)&&d2d,127,701) HTTP(..) == 1116480-1-fakeitalic-overflow.html 1116480-1-fakeitalic-overflow.html
-skip == 1111753-1.html 1111753-1.html
-== 1114526-1.html 1114526-1.html
-fuzzy-if(skiaContent,1,800000) == 1119117-1a.html 1119117-1a.html
-fuzzy-if(skiaContent,1,800000) == 1119117-1b.html 1119117-1b.html
-== 1120431-1.html 1120431-1.html
-== 1120431-2.html 1120431-2.html
-== 1121748-1.html 1121748-1.html
-== 1121748-2.html 1121748-2.html
-== 1127107-1a-nowrap.html 1127107-1a-nowrap.html
-== 1127107-1b-pre.html 1127107-1b-pre.html
-== 1127107-2-capitalize.html 1127107-2-capitalize.html
-== 1127679-1a-inline-flex-relpos.html 1127679-1a-inline-flex-relpos.html
-== 1128354-1.html 1128354-1.html
-== 1130231-1-button-padding-rtl.html 1130231-1-button-padding-rtl.html
-== 1130231-2-button-padding-rtl.html 1130231-2-button-padding-rtl.html
-skip-if(!B2G) == 1133905-1.html 1133905-1.html
-skip-if(!B2G) == 1133905-2.html 1133905-2.html
-skip-if(!B2G) == 1133905-3.html 1133905-3.html
-skip-if(!B2G) == 1133905-4.html 1133905-4.html
-skip-if(!B2G) == 1133905-5.html 1133905-5.html
-skip-if(!B2G) == 1133905-6.html 1133905-6.html
-skip-if(!B2G) == 1133905-1-v.html 1133905-1-v.html
-skip-if(!B2G) == 1133905-2-v.html 1133905-2-v.html
-skip-if(!B2G) == 1133905-3-v.html 1133905-3-v.html
-skip-if(!B2G) == 1133905-4-v.html 1133905-4-v.html
-skip-if(!B2G) fuzzy-if(B2G,61,336) == 1133905-5-v.html 1133905-5-v.html
-skip-if(!B2G) fuzzy-if(B2G,77,287) == 1133905-6-v.html 1133905-6-v.html
-skip-if(!B2G) == 1133905-1-h.html 1133905-1-h.html
-skip-if(!B2G) == 1133905-2-h.html 1133905-2-h.html
-skip-if(!B2G) == 1133905-3-h.html 1133905-3-h.html
-skip-if(!B2G) == 1133905-4-h.html 1133905-4-h.html
-skip-if(!B2G) == 1133905-5-h.html 1133905-5-h.html
-skip-if(!B2G) == 1133905-6-h.html 1133905-6-h.html
-skip-if(!B2G) == 1133905-1-vh.html 1133905-1-vh.html
-skip-if(!B2G) == 1133905-2-vh.html 1133905-2-vh.html
-skip-if(!B2G) == 1133905-3-vh.html 1133905-3-vh.html
-skip-if(!B2G) == 1133905-4-vh.html 1133905-4-vh.html
-skip-if(!B2G) fuzzy-if(B2G,102,720) == 1133905-5-vh.html 1133905-5-vh.html
-skip-if(!B2G) fuzzy-if(B2G,102,945) == 1133905-6-vh.html 1133905-6-vh.html
-skip-if(!B2G) == 1133905-1-rtl.html 1133905-1-rtl.html
-skip-if(!B2G) == 1133905-2-rtl.html 1133905-2-rtl.html
-skip-if(!B2G) == 1133905-3-rtl.html 1133905-3-rtl.html
-skip-if(!B2G) == 1133905-4-rtl.html 1133905-4-rtl.html
-skip-if(!B2G) == 1133905-5-rtl.html 1133905-5-rtl.html
-skip-if(!B2G) == 1133905-6-rtl.html 1133905-6-rtl.html
-skip-if(!B2G) fuzzy-if(B2G,21,175) == 1133905-1-v-rtl.html 1133905-1-v-rtl.html
-skip-if(!B2G) fuzzy-if(B2G,20,174) == 1133905-2-v-rtl.html 1133905-2-v-rtl.html
-skip-if(!B2G) fuzzy-if(B2G,64,181) == 1133905-3-v-rtl.html 1133905-3-v-rtl.html
-skip-if(!B2G) == 1133905-4-v-rtl.html 1133905-4-v-rtl.html
-skip-if(!B2G) fuzzy-if(B2G,33,180) == 1133905-5-v-rtl.html 1133905-5-v-rtl.html
-skip-if(!B2G) fuzzy-if(B2G,77,219) == 1133905-6-v-rtl.html 1133905-6-v-rtl.html
-skip-if(!B2G) == 1133905-1-h-rtl.html 1133905-1-h-rtl.html
-skip-if(!B2G) == 1133905-2-h-rtl.html 1133905-2-h-rtl.html
-skip-if(!B2G) == 1133905-3-h-rtl.html 1133905-3-h-rtl.html
-skip-if(!B2G) == 1133905-4-h-rtl.html 1133905-4-h-rtl.html
-skip-if(!B2G) == 1133905-5-h-rtl.html 1133905-5-h-rtl.html
-skip-if(!B2G) == 1133905-6-h-rtl.html 1133905-6-h-rtl.html
-skip-if(!B2G) fuzzy-if(B2G,21,175) == 1133905-1-vh-rtl.html 1133905-1-vh-rtl.html
-skip-if(!B2G) fuzzy-if(B2G,62,176) == 1133905-2-vh-rtl.html 1133905-2-vh-rtl.html
-skip-if(!B2G) fuzzy-if(B2G,23,176) == 1133905-3-vh-rtl.html 1133905-3-vh-rtl.html
-skip-if(!B2G) == 1133905-4-vh-rtl.html 1133905-4-vh-rtl.html
-skip-if(!B2G) fuzzy-if(B2G,102,577) == 1133905-5-vh-rtl.html 1133905-5-vh-rtl.html
-skip-if(!B2G) fuzzy-if(B2G,102,877) == 1133905-6-vh-rtl.html 1133905-6-vh-rtl.html
-skip-if(B2G||Mulet) == 1150021-1.xul 1150021-1.xul
-== 1151145-1.html 1151145-1.html
-== 1151306-1.html 1151306-1.html
-== 1153845-1.html 1153845-1.html
-== 1155828-1.html 1155828-1.html
-== 1156129-1.html 1156129-1.html
-pref(dom.use_xbl_scopes_for_remote_xul,true) HTTP(..) == 1157127-1.html 1157127-1.html
-== 1169331-1.html 1169331-1.html
-fuzzy-if(gtkWidget,6,79) == 1174332-1.html 1174332-1.html
-== 1179078-1.html 1179078-1.html
-== 1179288-1.html 1179288-1.html
-== 1190635-1.html 1190635-1.html
-== 1202512-1.html 1202512-1.html
-== 1202512-2.html 1202512-2.html
-== 1207326-1.html 1207326-1.html
-== 1209603-1.html 1209603-1.html
-== 1209994-1.html 1209994-1.html
-== 1209994-2.html 1209994-2.html
-== 1209994-3.html 1209994-3.html
-== 1209994-4.html 1209994-4.html
-== 1222226-1.html 1222226-1.html
-pref(layout.css.overflow-clip-box.enabled,true) == 1226278.html 1226278.html
-== 1230466.html 1230466.html
-random-if(gtkWidget) == 1238243-1.html 1238243-1.html
-# may fail on Linux, depending on Korean fonts available
-random-if(OSX==1006) == 1238243-2.html 1238243-2.html
-# fails on 10.6 with default fonts because filler has a visible glyph
-fuzzy(100,2000) == 1239564.html 1239564.html
-== 1242172-1.html 1242172-1.html
-== 1242172-2.html 1242172-2.html
-== 1242781.html 1242781.html
-== 1263845.html 1263845.html
-== 1260543-1.html 1260543-1.html
-== 1272997-1.html 1272997-1.html
-random-if(!winWidget) == 1273154-1.html 1273154-1.html
-# depends on Windows font
-random-if(!winWidget) == 1273154-2.html 1273154-2.html
-# depends on Windows font
-== 1274368-1.html 1274368-1.html
-== 1276161-1a.html 1276161-1a.html
-== 1276161-1b.html 1276161-1b.html
-== 1276161-1a.html 1276161-1a.html
-== 1275411-1.html 1275411-1.html
-== 1315632-1.html 1315632-1-ref.html
-
-HTTP == 652991-1a.html 652991-1a.html
-HTTP == 652991-1b.html 652991-1b.html
-HTTP == 652991-2.html 652991-2.html
-HTTP == 652991-3.html 652991-3.html
diff --git a/layout/reftests/bugs/reftest.list b/layout/reftests/bugs/reftest.list
index d6f58a9c2..4fb75edab 100644
--- a/layout/reftests/bugs/reftest.list
+++ b/layout/reftests/bugs/reftest.list
@@ -173,18 +173,18 @@ random == 99850-1b.html 99850-1-ref.html # bug 471629
== 192767-27.xul 192767-37.xul
!= 192767-01.xul 192767-21.xul
!= 192767-02.xul 192767-22.xul
-fails-if(Android&&!asyncPan) != 192767-03.xul 192767-23.xul
+!= 192767-03.xul 192767-23.xul
!= 192767-04.xul 192767-24.xul
!= 192767-05.xul 192767-25.xul
-fails-if(Android&&!asyncPan) != 192767-06.xul 192767-26.xul
-fails-if(Android&&!asyncPan) != 192767-07.xul 192767-27.xul
+!= 192767-06.xul 192767-26.xul
+!= 192767-07.xul 192767-27.xul
!= 192767-11.xul 192767-31.xul
!= 192767-12.xul 192767-32.xul
-fails-if(Android&&!asyncPan) != 192767-13.xul 192767-33.xul
+!= 192767-13.xul 192767-33.xul
!= 192767-14.xul 192767-34.xul
!= 192767-15.xul 192767-35.xul
-fails-if(Android&&!asyncPan) != 192767-16.xul 192767-36.xul
-fails-if(Android&&!asyncPan) != 192767-17.xul 192767-37.xul
+!= 192767-16.xul 192767-36.xul
+!= 192767-17.xul 192767-37.xul
!= 200774-1.html about:blank
== 201215-1.html 201215-1-ref.html
== 201293-1a.html 201293-1-ref.html
@@ -244,10 +244,10 @@ fuzzy-if(skiaContent,4,2) == 236539-1.html 236539-1-ref.html
== 240029-1.html 240029-1-ref.html
== 240470-1.html 240470-1-ref.html
== 240933-1.html 240933-1-ref.html
-skip-if(Android) == 240933-2.html 240933-2-ref.html
+== 240933-2.html 240933-2-ref.html
== 243266-1.html 243266-1-ref.html
== 243302-1.html 243302-1-ref.html
-skip-if(Android&&asyncPan) == 243519-1.html 243519-1-ref.html
+== 243519-1.html 243519-1-ref.html
== 243519-2.html 243519-2-ref.html
== 243519-3.html 243519-3-ref.html
== 243519-4a.html 243519-4-ref.html
@@ -294,7 +294,7 @@ fuzzy-if(skiaContent,1,5) == 262998-1.html 262998-1-ref.html
== 272646-2a.xul 272646-2-ref.xul
== 272646-2b.xul 272646-2-ref.xul
== 272646-2c.xul 272646-2-ref.xul
-fuzzy-if(Android,3,50) fuzzy-if(skiaContent,1,133) == 273681-1.html 273681-1-ref.html
+fuzzy-if(skiaContent,1,133) == 273681-1.html 273681-1-ref.html
== 278266-1a.html 278266-1-ref.html
== 278266-1b.html 278266-1-ref.html
== 280708-1a.html 280708-1-ref.html
@@ -305,7 +305,7 @@ fuzzy-if(Android,3,50) fuzzy-if(skiaContent,1,133) == 273681-1.html 273681-1-ref
== 283686-2.html 283686-2-ref.html
== 283686-3.html about:blank
== 289384-1.xhtml 289384-ref.xhtml
-random-if(d2d) fuzzy-if(Android,8,1439) HTTP == 289480.html#top 289480-ref.html # basically-verbatim acid2 test, HTTP for a 404 page -- bug 578114 for the d2d failures
+random-if(d2d) HTTP == 289480.html#top 289480-ref.html # basically-verbatim acid2 test, HTTP for a 404 page -- bug 578114 for the d2d failures
== 290129-1.html 290129-1-ref.html
== 291078-1.html 291078-1-ref.html
== 291078-2.html 291078-2-ref.html
@@ -325,7 +325,7 @@ random-if(d2d) == 299837-3.xul 299837-3-ref.xul # bug 587631
== 300691-1e.html 300691-1-ref.html
== 300691-1f.html 300691-1-ref.html
== 301726-1.html 301726-1-ref.html
-fails-if(Android) != 301726-2.html 301726-2-ref.html
+!= 301726-2.html 301726-2-ref.html
== 302379.html 302379-ref.html
== 306630-1.html 306630-1-ref.html
== 306660-1.html 306660-1-ref.html
@@ -425,7 +425,7 @@ fuzzy-if(skiaContent,1,1468) == 315920-5.html 315920-5-ref.html
== 323656-4.html 323656-4-ref.html
== 323656-5.svg 323656-5-ref.svg
== 323656-6.html 323656-6-ref.html
-fuzzy-if(Android,2,140) == 325292-1.html 325292-1-ref.html
+== 325292-1.html 325292-1-ref.html
== 325486-1.html 325486-1-ref.html
== 328111-1.html 328111-1-ref.html
random == 328829-1.xhtml 328829-1-ref.xhtml # bug 369046 (intermittent)
@@ -549,11 +549,11 @@ fuzzy-if(skiaContent,2,4) == 362594-2c.html 362594-2-standards-ref.html
== 363370-1.html 363370-1-ref.html
== 363402-1.html 363402-1-ref.html
== 363637-1.html 363637-1-ref.html
-skip-if(Android) == 363706-1.html 363706-1-ref.html
+== 363706-1.html 363706-1-ref.html
!= 363706-1.html about:blank
== 363728-1.html 363728-1-ref.html
== 363728-2.html 363728-2-ref.html
-fuzzy-if(skiaContent||Android,4,11) == 363858-1.html 363858-1-ref.html
+fuzzy-if(skiaContent,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
@@ -576,9 +576,9 @@ fuzzy-if(OSX>=1008,45,2) fuzzy-if(winWidget,114,1) == 363858-6a.html 363858-6-re
== 367220-1.html 367220-1-ref.html
== 367247-s-visible.html 367247-s-hidden.html
== 367247-s-hidden.html 367247-s-auto.html
-fails-if(Android) != 367247-s-auto.html 367247-s-scroll.html
+!= 367247-s-auto.html 367247-s-scroll.html
!= 367247-l-visible.html 367247-l-hidden.html
-fails-if(Android&&!asyncPan) != 367247-l-hidden.html 367247-l-scroll.html
+!= 367247-l-hidden.html 367247-l-scroll.html
== 367247-l-scroll.html 367247-l-auto.html
== 367332-1a.html 367332-1-ref.html
== 367332-1b.html 367332-1-ref.html
@@ -644,7 +644,7 @@ asserts(4) == 368155-negative-margins-1.html 368155-negative-margins-1-ref.html
== 371043-1.html 371043-1-ref.html
== 371354-1.html 371354-1-ref.html
== 371483-1.html about:blank # assertion test
-fails-if(Android&&!asyncPan) == 371561-1.html 371561-1-ref.html
+== 371561-1.html 371561-1-ref.html
!= 371681-1.xhtml about:blank
== 371925-1a.html 371925-1-ref.html
== 371925-1b.html 371925-1-ref.html
@@ -657,10 +657,10 @@ fails-if(Android&&!asyncPan) == 371561-1.html 371561-1-ref.html
== 372768-1.html 372768-1-ref.html
== 373295-1.html 373295-1-ref.html
== 373298-1.html 373298-1-ref.html
-fails-if(Android) == 373381-1.html 373381-1-ref.html
-fails-if(Android) fuzzy-if(skiaContent&&!Android,2,40) == 373381-2.html 373381-2-ref.html
-fails-if(Android) random-if(d2d) == 373381-3.html 373381-3-ref.html
-fails-if(Android) == 373381-4.html 373381-4-ref.html
+== 373381-1.html 373381-1-ref.html
+fuzzy-if(skiaContent,2,40) == 373381-2.html 373381-2-ref.html
+random-if(d2d) == 373381-3.html 373381-3-ref.html
+== 373381-4.html 373381-4-ref.html
== 373383-1.html 373383-1-ref.html
== 373433-1.html 373433-1-ref.html
== 373533-1.xhtml about:blank
@@ -676,8 +676,8 @@ fails == 374927-1.html 374927-1-ref.html # Was broken by patch for bug 368600; f
== 376375-1.html 376375-1-ref.html
== 376484-1.html 376484-1-ref.html
== 376532-1.html 376532-1-ref.html
-fails-if(Android) != 376532-2.html 376532-2-ref.html
-fails-if(Android) != 376532-3.html 376532-3-ref.html
+!= 376532-2.html 376532-2-ref.html
+!= 376532-3.html 376532-3-ref.html
== 377603-1.html 377603-1-ref.html
== 377918.html 377918-ref.html
== 378535-1.html 378535-1-ref.html
@@ -688,7 +688,7 @@ fails-if(Android) != 376532-3.html 376532-3-ref.html
== 379178-html.html 379178-html-ref.html
== 379178-svg.svg 379178-svg-ref.svg
fuzzy-if(skiaContent,1,500) == 379316-1.html 379316-1-ref.html
-fails-if(Android) random-if(cocoaWidget) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fuzzy-if(winWidget,1,180) fuzzy-if(gtkWidget,1,191) fuzzy-if(skiaContent,8,500) == 379316-2.html 379316-2-ref.html # bug 379786
+random-if(cocoaWidget) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fuzzy-if(winWidget,1,180) fuzzy-if(gtkWidget,1,191) fuzzy-if(skiaContent,8,500) == 379316-2.html 379316-2-ref.html # bug 379786
== 379328-1.html 379328-1-ref.html
== 379349-1a.xhtml 379349-1-ref.xhtml
# fuzzy because of different border rendering approach in bug 1185636
@@ -696,15 +696,15 @@ fuzzy(37,20) == 379349-1b.xhtml 379349-1-ref.xhtml
fuzzy(37,20) == 379349-1c.xhtml 379349-1-ref.xhtml
== 379349-2a.xhtml 379349-2-ref.xhtml
== 379349-2b.xhtml 379349-2-ref.xhtml
-fuzzy-if(Android,2,140) == 379349-3a.xhtml 379349-3-ref.xhtml
-fuzzy-if(Android,2,140) == 379349-3b.xhtml 379349-3-ref.xhtml
+== 379349-3a.xhtml 379349-3-ref.xhtml
+== 379349-3b.xhtml 379349-3-ref.xhtml
== 379361-1.html 379361-1-ref.html
== 379361-2.html 379361-2-ref.html
== 379361-3.html 379361-3-ref.html
== 379461-1.xhtml 379461-1.html
== 379461-2.xhtml 379461-2.html
== 379461-3-container-xhtml.html 379461-3-container-html.html
-fails-if(Android&&!asyncPan) != 379461-3-container-xhtml.html 379461-3-container-blank.html # there is a scrollbar
+!= 379461-3-container-xhtml.html 379461-3-container-blank.html # there is a scrollbar
fuzzy-if(skiaContent,1,5) == 380004-1.html 380004-1-ref.html
fuzzy-if(skiaContent,2,5) == 380227-1.html 380227-1-ref.html
== 380825-1.html 380825-1-ref.html
@@ -787,7 +787,7 @@ skip-if(!winWidget) == 391045.html 391045-ref.html # windows-specific Uniscribe
== 391412-1a.html 391412-1-ref.html
== 391412-1b.html 391412-1-ref.html
== 391909-1.html 391909-1-ref.html
-skip-if(Android) == 391979.html 391979-ref.html
+== 391979.html 391979-ref.html
== 391994-1.html 391994-1-ref.html
== 392047.html 392047-ref.html
== 392435-1.html 392435-1-ref.html
@@ -809,7 +809,7 @@ fuzzy-if(skiaContent,1,500) fuzzy-if(/^Windows\x20NT\x205\.1/.test(http.oscpu),2
== 394534-1.html 394534-1-ref.html
== 394676-1.xhtml 394676-1-ref.xhtml
== 395107-1.html 395107-1-ref.html
-fuzzy-if(Android,4,2) == 395107-2.html 395107-2-ref.html # bug 1309533 fuzzy after test rebucketed
+== 395107-2.html 395107-2-ref.html # bug 1309533 fuzzy after test rebucketed
fuzzy-if(skiaContent,1,118) == 395107-3.html 395107-3-ref.html
== 395107-4.html 395107-4-ref.html
== 395107-5.html 395107-5-ref.html
@@ -818,7 +818,7 @@ fuzzy-if(skiaContent,1,118) == 395107-3.html 395107-3-ref.html
== 395331-1.xml 395331-1-ref.xml
== 395390-1.html 395390-1-ref.html
== 396286-1.html about:blank # crash test
-fuzzy-if(Android,5,283) == 397428-1.html 397428-1-ref.html
+== 397428-1.html 397428-1-ref.html
== 397844-1.xhtml 397844-1-ref.xhtml
== 398092-1.html 398092-1-ref.html
== 398101-1.html 398101-1-ref.html
@@ -901,7 +901,7 @@ random-if(cocoaWidget) HTTP(..) == 404149-1.xul 404149-1-ref.xul # HTTP for font
== 404309-1b.html 404309-1-ref.html
# Disabled due to compartments for now.
#!= data:application/xml,<foo/> data:text/plain, # ensure we pretty-print this XML instead of letting it appear blank (test for bug 404419)
-fuzzy-if(Android,8,50) == 404553-1.html 404553-1-ref.html # assertion test, also tests that marquee binding is applied correctly
+== 404553-1.html 404553-1-ref.html # assertion test, also tests that marquee binding is applied correctly
== 404666-1.html 404666-1-ref.html
== 404666-2.html 404666-2-ref.html
== 405186-1.xhtml about:blank
@@ -917,7 +917,7 @@ fuzzy-if(Android,8,50) == 404553-1.html 404553-1-ref.html # assertion test, als
== 407016-1-b.html 407016-1-ref.html
== 407078-1.html 407078-1-ref.html
== 407095-1.html 407095-1-ref.html
-fuzzy-if(Android,13,9) == 407111-1.html 407111-1-ref.html # Bug 1128229
+== 407111-1.html 407111-1-ref.html # Bug 1128229
== 407227-1.html 407227-1-ref.html
== 407243-1.html 407243-1-ref.html
== 407419-1.html 407419-1-ref.html
@@ -955,7 +955,7 @@ fails == 411585-3.html 411585-3-ref.html # bug 426909
== 412352-2.html 412352-2-ref.html
== 412607-1a.html 412607-1-ref.html
== 412607-1b.html 412607-1-ref.html
-random-if(Android) == 412679-1.html 412679-1-ref.html
+== 412679-1.html 412679-1-ref.html
fuzzy-if(skiaContent,1,17) == 412679-2.html 412679-2-ref.html
== 413027-1.html 413027-1-ref.html
fails == 413027-2.html 413027-2-ref.html
@@ -972,7 +972,7 @@ fuzzy-if(/^Windows\x20NT\x205\.1/.test(http.oscpu),22,4) == 413286-2b.html 41328
== 413286-5.html 413286-5-ref.html
== 413286-6.html 413286-6-ref.html
skip-if(cocoaWidget) == 413292-1.html 413292-1-ref.html # disabling due to failure loading on some mac tinderboxes. See bug 432954
-fuzzy-if(Android,11,17) == 413361-1.html 413361-1-ref.html # bug 1128229
+== 413361-1.html 413361-1-ref.html # bug 1128229
== 413840-background-unchanged.html 413840-background-unchanged-ref.html
== 413840-ltr-offsets.html 413840-ltr-offsets-ref.html
== 413840-rtl-offsets.html 413840-rtl-offsets-ref.html
@@ -1015,7 +1015,7 @@ asserts(1) == 418574-2.html 418574-2-ref.html # bug 478135
== 421436-1b.html 421436-1-ref.html
fuzzy-if(skiaContent,1,5) == 421632-1.html 421632-1-ref.html
!= 421710-1.html about:blank
-fails-if(Android) fails-if(usesRepeatResampling) == 421885-1.xml 421885-1-ref.xml
+fails-if(usesRepeatResampling) == 421885-1.xml 421885-1-ref.xml
== 421955-1.html 421955-1-ref.html
== 422249-1.html 422249-1-ref.html
== 422394-1.html 422394-1-ref.html
@@ -1026,7 +1026,7 @@ random-if(gtkWidget) == 423599-1.html 423599-1-ref.html # bug 1309095
== 423676-1.html 423676-1-ref.html
fails == 423823-1.html 423823-1-ref.html # scrolling rowgroups were removed in bug 28800
== 424074-1.xul 424074-1-ref.xul
-fails-if(Android) != 424074-1.xul 424074-1-ref2.xul
+!= 424074-1.xul 424074-1-ref2.xul
random-if(gtkWidget) == 424074-1-ref2.xul 424074-1-ref3.xul
== 424236-1.html 424236-1-ref.html
== 424236-2.html 424236-2-ref.html
@@ -1166,12 +1166,12 @@ random == 445004-1.html 445004-1-ref.html # bug 472268
== 445142-2a.html 445142-2-ref.html
== 445142-2b.html 445142-2-ref.html
fails-if(usesRepeatResampling) == 446100-1a.html about:blank
-fails-if(Android) fails-if(usesRepeatResampling) == 446100-1b.html about:blank
-fails-if(Android) fails-if(usesRepeatResampling) == 446100-1c.html about:blank
+fails-if(usesRepeatResampling) == 446100-1b.html about:blank
+fails-if(usesRepeatResampling) == 446100-1c.html about:blank
fails-if(usesRepeatResampling) == 446100-1d.html about:blank
fails-if(usesRepeatResampling) == 446100-1e.html about:blank
== 446100-1f.html about:blank
-fails-if(usesRepeatResampling) fails-if(Android) == 446100-1g.html about:blank
+fails-if(usesRepeatResampling) == 446100-1g.html about:blank
== 446100-1h.html about:blank
== 447749-1.html 447749-1-ref.html
fuzzy(127,2) == 448193.html 448193-ref.html
@@ -1196,10 +1196,10 @@ test-pref(dom.use_xbl_scopes_for_remote_xul,true) != 449149-1b.html about:blank
== 455171-5.html 455171-5-ref.html
== 455280-1.xhtml 455280-1-ref.xhtml
== 455826-1.html 455826-1-ref.html
-fails-if(cocoaWidget) fails-if(Android) == 456147.xul 456147-ref.html # bug 458047
-fuzzy-if(Android,11,41) fuzzy-if(winWidget||gtkWidget,4,6) fuzzy-if(d2d,4,69) == 456219-1a.html 456219-1-ref.html # bug 1128229
-fuzzy-if(Android,11,41) fuzzy-if(winWidget||gtkWidget,4,6) fuzzy-if(d2d,4,69) == 456219-1b.html 456219-1-ref.html # bug 1128229
-fuzzy-if(Android,11,41) fuzzy-if(winWidget||gtkWidget,4,6) fuzzy-if(d2d,4,69) == 456219-1c.html 456219-1-ref.html # bug 1128229
+fails-if(cocoaWidget) == 456147.xul 456147-ref.html # bug 458047
+fuzzy-if(winWidget||gtkWidget,4,6) fuzzy-if(d2d,4,69) == 456219-1a.html 456219-1-ref.html # bug 1128229
+fuzzy-if(winWidget||gtkWidget,4,6) fuzzy-if(d2d,4,69) == 456219-1b.html 456219-1-ref.html # bug 1128229
+fuzzy-if(winWidget||gtkWidget,4,6) fuzzy-if(d2d,4,69) == 456219-1c.html 456219-1-ref.html # bug 1128229
fuzzy-if(skiaContent,1,45) == 456219-2.html 456219-2-ref.html
== 456330-1.gif 456330-1-ref.png
== 456484-1.html 456484-1-ref.html
@@ -1313,14 +1313,14 @@ random-if(d2d) == 478377-1.xul 478377-1-ref.xul
== 480880-2a.html about:blank
== 480880-2b.html about:blank
== 480880-2c.html about:blank
-fails-if(Android) == 481024-1a.html 481024-1-ref.html
-fails-if(Android) == 481024-1b.html 481024-1-ref.html
-fails-if(Android) == 481024-1c.html 481024-1-ref.html
+== 481024-1a.html 481024-1-ref.html
+== 481024-1b.html 481024-1-ref.html
+== 481024-1c.html 481024-1-ref.html
== 481024-1d.html 481024-1-ref.html
== 481024-1e.html 481024-1-ref.html
!= 481948-1.html 481948-1-ref.html
!= 481948-2.html 481948-2-ref.html
-fails-if(Android) random-if(winWidget) fails-if(gtkWidget) == 481948-3.html 481948-3-ref.html # questionable test, see bug 488364
+random-if(winWidget) fails-if(gtkWidget) == 481948-3.html 481948-3-ref.html # questionable test, see bug 488364
== 482398-1.html 482398-1-ref.html
random-if(d2d) == 482592-1a.xhtml 482592-1-ref.html # bug 586771
random-if(d2d) == 482592-1b.xhtml 482592-1-ref.html # bug 586771
@@ -1404,7 +1404,7 @@ fuzzy-if(gtkWidget,1,2) == 502447-1.html 502447-1-ref.html #Bug 1315834
needs-focus fails == 503531-1.html 503531-1-ref.html
== 504032-1.html 504032-1-ref.html
== 505743-1.html about:blank
-fuzzy-if(Android,5,2800) == 506481-1.html 506481-1-ref.html
+== 506481-1.html 506481-1-ref.html
== 507187-1.html 507187-1-ref.html
== 507487-1.html 507487-1-ref.html
== 507487-2.xhtml 507487-2-ref.xhtml
@@ -1417,14 +1417,14 @@ random-if(cocoaWidget) == 508816-1.xul 508816-1-ref.xul # Bug 631982
== 508908-1.xul 508908-1-ref.xul
== 508919-1.xhtml 508919-1-ref.xhtml
== 509155-1.xhtml 509155-1-ref.xhtml
-fuzzy-if(Android,5,1656) fuzzy-if(skiaContent,1,1200) == 512410.html 512410-ref.html
+fuzzy-if(skiaContent,1,1200) == 512410.html 512410-ref.html
== 512631-1.html 512631-1-ref.html
== 513153-1a.html 513153-1-ref.html
== 513153-1b.html 513153-1-ref.html
== 513153-2a.html 513153-2-ref.html
== 513153-2b.html 513153-2-ref.html
== 513318-1.xul 513318-1-ref.xul
-fails-if(Android&&(!asyncPan)) != 513318-2.xul 513318-2-ref.xul
+!= 513318-2.xul 513318-2-ref.xul
== 514917-1.html 514917-1-ref.html
HTTP(..) == 518172-1a.html 518172-a-ref.html
fuzzy-if(winWidget,73,133) fuzzy-if(cocoaWidget,103,133) HTTP(..) == 518172-1b.html 518172-b-ref.html
@@ -1454,7 +1454,7 @@ fuzzy-if(skiaContent,1,50) == 526463-1.html 526463-1-ref.html
== 528096-1.html 528096-1-ref.html
== 530686-1.html 530686-1-ref.html
== 531098-1.html 531098-1-ref.html
-fuzzy-if(Android,2,48) == 531200-1.html 531200-1-ref.html
+== 531200-1.html 531200-1-ref.html
== 531371-1.html 531371-1-ref.html
== 534526-1a.html 534526-1-ref.html
== 534526-1b.html 534526-1-ref.html
@@ -1474,7 +1474,7 @@ random == 536061.html 536061-ref.html # fixedpoint division in blur code makes t
== 539323-3.html 539323-3-ref.html
== 539880-1.html 539880-1-ref.html
== 539880-1-dynamic.html 539880-1-ref.html
-fuzzy-if(Android,12,1000) == 539949-1.html#test2 539949-1-ref.html#test2
+== 539949-1.html#test2 539949-1-ref.html#test2
== 541382-1.html 541382-1-ref.html
random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)||!haveTestPlugin) == 541406-1.html 541406-1-ref.html
needs-focus != 542116-1.html 542116-1-ref.html
@@ -1490,24 +1490,22 @@ random-if(!haveTestPlugin) == 546071-1.html 546071-1-ref.html
== 550325-2.html 550325-1-ref.html
== 550325-3.html 550325-1-ref.html
== 550716-1.html 550716-1-ref.html
-fuzzy-if(Android,12,300) == 551463-1.html 551463-1-ref.html
+== 551463-1.html 551463-1-ref.html
== 551699-1.html 551699-1-ref.html
== 552334-1.html 552334-1-ref.html
# Bug 553571 was specific to MS Indic shaping behavior and Win7 font support;
# the test is not currently relevant under harfbuzz shaping.
# Keeping it here for the record, and because we may evolve HB's dotted-circle
# behavior further in the future, which could make this become relevant again.
-# Marked "random" rather than "fails" because it may (spuriously) appear to pass
-# on Android devices that completely lack any Sinhala font support.
-random != 553571-1.html 553571-1-notref.html # expect dotted circle in test, not in ref: "fails" under harfbuzz, which doesn't consider the sequence invalid
+!= 553571-1.html 553571-1-notref.html # expect dotted circle in test, not in ref: "fails" under harfbuzz, which doesn't consider the sequence invalid
fuzzy-if(!contentSameGfxBackendAsCanvas,128,91) random-if(d2d) skip-if(azureSkiaGL) fuzzy-if(skiaContent,32,150) == 555388-1.html 555388-1-ref.html
== 556661-1.html 556661-1-ref.html
fuzzy-if(skiaContent,4,5) == 557087-1.html 557087-ref.html
-fails-if(Android) fuzzy-if(skiaContent&&!Android,2,5) == 557087-2.html 557087-ref.html
+fuzzy-if(skiaContent,2,5) == 557087-2.html 557087-ref.html
== 557736-1.html 557736-1-ref.html
!= 558011-1.xul 558011-1-ref.xul
== 559284-1.html 559284-1-ref.html
-fails-if(Android) == 560455-1.xul 560455-1-ref.xul
+== 560455-1.xul 560455-1-ref.xul
fuzzy-if(skiaContent,2,5) == 561981-1.html 561981-1-ref.html
== 561981-2.html 561981-2-ref.html
fuzzy-if(skiaContent,1,5) == 561981-3.html 561981-3-ref.html
@@ -1518,33 +1516,33 @@ fuzzy-if(skiaContent,1,5) == 561981-7.html 561981-7-ref.html
== 561981-8.html 561981-8-ref.html
== 562835-1.html 562835-ref.html
== 562835-2.html 562835-ref.html
-fuzzy-if(Android,2,48) == 563584-1.html 563584-1-ref.html
-fuzzy-if(Android,2,48) == 563584-2.html 563584-2-ref.html
-fuzzy-if(Android,4,180) == 563584-3.html 563584-3-ref.html
-fuzzy-if(Android,4,180) == 563584-4.html 563584-4-ref.html
-fuzzy-if(Android,2,48) == 563584-5.html 563584-5-ref.html
+== 563584-1.html 563584-1-ref.html
+== 563584-2.html 563584-2-ref.html
+== 563584-3.html 563584-3-ref.html
+== 563584-4.html 563584-4-ref.html
+== 563584-5.html 563584-5-ref.html
test-pref(layout.float-fragments-inside-column.enabled,false) == 563584-6-columns.html 563584-6-columns-ref.html
test-pref(layout.float-fragments-inside-column.enabled,true) == 563584-6-columns.html 563584-6-columns-ref-enabled.html
-fuzzy-if(Android,2,48) == 563584-6-printing.html 563584-6-printing-ref.html
-fuzzy-if(Android,2,48) == 563584-7.html 563584-7-ref.html
+== 563584-6-printing.html 563584-6-printing-ref.html
+== 563584-7.html 563584-7-ref.html
# FIXME: It would be nice to have variants of these -8 tests for the
# table narrowing quirk causing a change to mIsTopOfPage (though I'm not
# entirely sure our behavior is the right one, either).
-fuzzy-if(Android,2,48) == 563584-8a.html 563584-8a-ref.html
-fuzzy-if(Android,2,48) == 563584-8b.html 563584-8b-ref.html
-fuzzy-if(Android,4,180) == 563584-8c.html 563584-8c-ref.html
-fuzzy-if(Android,4,180) == 563584-8d.html 563584-8d-ref.html
+== 563584-8a.html 563584-8a-ref.html
+== 563584-8b.html 563584-8b-ref.html
+== 563584-8c.html 563584-8c-ref.html
+== 563584-8d.html 563584-8d-ref.html
== 563584-9a.html 563584-9a-ref.html
== 563584-9b.html 563584-9b-ref.html
== 563584-9c.html 563584-9cd-ref.html
== 563584-9d.html 563584-9cd-ref.html
-fuzzy-if(Android,2,48) == 563584-10a.html 563584-10-ref.html
-fuzzy-if(Android,2,48) == 563584-10b.html 563584-10-ref.html
-fuzzy-if(Android,2,48) == 563584-11.html 563584-11-ref.html
+== 563584-10a.html 563584-10-ref.html
+== 563584-10b.html 563584-10-ref.html
+== 563584-11.html 563584-11-ref.html
== 563884-1.html 563884-1-ref.html
== 564002-1.html 564002-1-ref.html
== 564054-1.html 564054-1-ref.html
-fails-if(Android) random-if(layersGPUAccelerated) fuzzy-if(skiaContent,1,1200) == 564991-1.html 564991-1-ref.html
+random-if(layersGPUAccelerated) fuzzy-if(skiaContent,1,1200) == 564991-1.html 564991-1-ref.html
== 565819-1.html 565819-ref.html
== 565819-2.html 565819-ref.html
needs-focus == 568441.html 568441-ref.html
@@ -1571,35 +1569,35 @@ random-if(!winWidget) fails-if(winWidget&&!dwrite) random-if(winWidget&&dwrite)
== 579323-1.html 579323-1-ref.html
== 579349-1.html 579349-1-ref.html
== 579655-1.html 579655-1-ref.html
-skip-if(!haveTestPlugin) fails-if(Android) == 579808-1.html 579808-1-ref.html
-fails-if(Android) random-if(layersGPUAccelerated) fuzzy-if(skiaContent,1,10000) == 579985-1.html 579985-1-ref.html # bug 623452 for WinXP; this bug was only for a regression in BasicLayers anyway
-skip-if(Android) == 580160-1.html 580160-1-ref.html # bug 920927 for Android; issues without the test-plugin
+skip-if(!haveTestPlugin) == 579808-1.html 579808-1-ref.html
+random-if(layersGPUAccelerated) fuzzy-if(skiaContent,1,10000) == 579985-1.html 579985-1-ref.html # bug 623452 for WinXP; this bug was only for a regression in BasicLayers anyway
+== 580160-1.html 580160-1-ref.html
fuzzy-if(asyncPan&&!layersGPUAccelerated,255,141) HTTP(..) == 580863-1.html 580863-1-ref.html
-fails-if(Android) random-if(layersGPUAccelerated) fuzzy-if(skiaContent,1,6436) == 581317-1.html 581317-1-ref.html
+random-if(layersGPUAccelerated) fuzzy-if(skiaContent,1,6436) == 581317-1.html 581317-1-ref.html
== 581579-1.html 581579-1-ref.html
== 582037-1a.html 582037-1-ref.html
== 582037-1b.html 582037-1-ref.html
-fuzzy-if(Android,3,256) == 582037-2a.html 582037-2-ref.html
-fuzzy-if(Android,3,256) == 582037-2b.html 582037-2-ref.html
+== 582037-2a.html 582037-2-ref.html
+== 582037-2b.html 582037-2-ref.html
asserts(1-2) == 582146-1.html about:blank
== 582476-1.svg 582476-1-ref.svg
== 584400-dash-length.svg 584400-dash-length-ref.svg
== 584699-1.html 584699-1-ref.html
-fuzzy-if(Android,2,48) == 585598-2.xhtml 585598-2-ref.xhtml
+== 585598-2.xhtml 585598-2-ref.xhtml
== 586400-1.html 586400-1-ref.html
fuzzy-if(d2d,52,1051) fuzzy-if(OSX==1008,129,1068) == 586683-1.html 586683-1-ref.html
== 589615-1a.xhtml 589615-1-ref.html
== 589615-1b.html 589615-1-ref.html
== 589672-1.html 589672-1-ref.html
!= 589682-1.html 589682-1-notref.html
-pref(dom.meta-viewport.enabled,true) skip-if(Android) == 593243-1.html 593243-1-ref.html # bug 593168
-pref(dom.meta-viewport.enabled,true) skip-if(Android) == 593243-2.html 593243-2-ref.html # bug 593168
+pref(dom.meta-viewport.enabled,true) == 593243-1.html 593243-1-ref.html # bug 593168
+pref(dom.meta-viewport.enabled,true) == 593243-2.html 593243-2-ref.html # bug 593168
== 593544-1.html 593544-1-ref.html
-random-if(Android) == 594333-1.html 594333-1-ref.html
+== 594333-1.html 594333-1-ref.html
== 594624-1.html 594624-1-ref.html
== 594737-1.html 594737-1-ref.html
fuzzy-if(skiaContent,1,80) == 597721-1.html 597721-1-ref.html
-random-if(winWidget) fuzzy-if(Android,38,539) fuzzy-if(skiaContent,1,480) needs-focus == 598726-1.html 598726-1-ref.html # Fails on Windows, bug 782196
+random-if(winWidget) fuzzy-if(skiaContent,1,480) needs-focus == 598726-1.html 598726-1-ref.html # Fails on Windows, bug 782196
== 599113-1.html 599113-1-ref.html
fails-if(!haveTestPlugin) == 599476.html 599476-ref.html
== 599882-1a.html 599882-1-ref.html
@@ -1612,7 +1610,7 @@ fails-if(!haveTestPlugin) == 599476.html 599476-ref.html
== 600974-3.html 600974-1-ref.html
== 602200-1.html 602200-1-ref.html
== 602200-2.html 602200-2-ref.html
-fuzzy-if(Android,8,20) == 602200-3.html 602200-3-ref.html
+== 602200-3.html 602200-3-ref.html
== 602200-4.html 602200-4-ref.html
== 603423-1.html 603423-1-ref.html
== 604737.html 604737-ref.html
@@ -1623,7 +1621,7 @@ fuzzy-if(Android,8,20) == 602200-3.html 602200-3-ref.html
== 608756-1a.html 608756-1-ref.html
== 608756-1b.html 608756-1-ref.html
== 608756-2.html 608756-2-ref.html
-fuzzy-if(Android,4,196) == 609272-1.html 609272-1-ref.html
+== 609272-1.html 609272-1-ref.html
needs-focus skip-if(/^Linux\x20i686/.test(http.oscpu)) == 613433-1.html 613433-1-ref.html # bug 1292460 - doesn't get the focus it needs if it's first in a chunk
needs-focus skip-if(/^Linux\x20i686/.test(http.oscpu)) == 613433-1.html 613433-2-ref.html # bug 1292460 - doesn't get the focus it needs if it's first in a chunk
needs-focus skip-if(/^Linux\x20i686/.test(http.oscpu)) == 613433-1.html 613433-3-ref.html # bug 1292460 - doesn't get the focus it needs if it's first in a chunk
@@ -1640,32 +1638,32 @@ HTTP(..) != 615121-2.html 615121-2-notref.html
!= 618071.html 618071-notref.html
== 619117-1.html 619117-1-ref.html
HTTP(..) == 619511-1.html 619511-1-ref.html
-skip-if(Android) HTTP(..) == 621253-1-externalFilter.html 621253-1-ref.html
-skip-if(Android) == 621253-1-internalFilter.html 621253-1-ref.html
+HTTP(..) == 621253-1-externalFilter.html 621253-1-ref.html
+== 621253-1-internalFilter.html 621253-1-ref.html
HTTP(..) == 621253-2-externalFilter.html 621253-2-ref.html
== 621253-2-internalFilter.html 621253-2-ref.html
random-if(winWidget) fuzzy-if(OSX==1008,19,17) == 621918-1.svg 621918-1-ref.svg # 1-pixel diacritic positioning discrepancy in rotated text (may depend on platform fonts)
random-if(winWidget) HTTP(..) == 621918-2.svg 621918-2-ref.svg # same 1px issue as above, and HTTP(..) for filters.svg, used to mask antialiasing issues where glyphs touch
fuzzy-if(d2d,5,1) == 622585-1.html 622585-1-ref.html # bug 789402
-fuzzy-if(Android,8,300) fuzzy-if(skiaContent,1,40000) == 625409-1.html 625409-1-ref.html
+fuzzy-if(skiaContent,1,40000) == 625409-1.html 625409-1-ref.html
== 627393-1.html about:blank
fuzzy-if(skiaContent,1,500) == 630835-1.html about:blank
== 631352-1.html 631352-1-ref.html
-skip-if(!haveTestPlugin) fails-if(Android) fuzzy-if(winWidget&&!layersGPUAccelerated,102,535) fuzzy-if(skiaContent&&!Android,102,11000) == 632423-1.html 632423-1-ref.html
-skip-if(Android) random-if(winWidget||OSX==1010) == 632781-verybig.html 632781-ref.html
+skip-if(!haveTestPlugin) fuzzy-if(winWidget&&!layersGPUAccelerated,102,535) fuzzy-if(skiaContent,102,11000) == 632423-1.html 632423-1-ref.html
+random-if(winWidget||OSX==1010) == 632781-verybig.html 632781-ref.html
== 632781-normalsize.html 632781-ref.html
fuzzy-if(d2d&&/^Windows\x20NT\x206\.2/.test(http.oscpu),1,559) fuzzy-if(!isDebugBuild&&gtkWidget&&/^Linux\x20i686/.test(http.oscpu),102,140) == 633344-1.html 633344-1-ref.html # bug 1103623, Linux32 from GCC update
fuzzy-if(skiaContent,1,500) == 634232-1.html 634232-1-ref.html
fuzzy-if(skiaContent,3,120000) == 635302-1.html 635302-1-ref.html
-fuzzy(1,68) fuzzy-if(gtkWidget,1,70) fails-if(Android) fuzzy-if(skiaContent&&!Android,1,300) == 635373-1.html 635373-1-ref.html
-random-if(d2d) fails-if(Android) fuzzy-if(winWidget&&!d2d,20,118) fuzzy-if(skiaContent&&!Android,2,550) == 635373-2.html 635373-2-ref.html
-random-if(d2d) fails-if(Android) fuzzy-if(winWidget&&!d2d,20,116) fuzzy-if(skiaContent&&!Android,2,650) == 635373-3.html 635373-3-ref.html
+fuzzy(1,68) fuzzy-if(gtkWidget,1,70) fuzzy-if(skiaContent,1,300) == 635373-1.html 635373-1-ref.html
+random-if(d2d) fuzzy-if(winWidget&&!d2d,20,118) fuzzy-if(skiaContent,2,550) == 635373-2.html 635373-2-ref.html
+random-if(d2d) fuzzy-if(winWidget&&!d2d,20,116) fuzzy-if(skiaContent,2,650) == 635373-3.html 635373-3-ref.html
HTTP(..) == 635639-1.html 635639-1-ref.html
HTTP(..) == 635639-2.html 635639-2-ref.html
random == 637597-1.html 637597-1-ref.html # bug 637597 was never really fixed!
-fuzzy-if(Android,8,500) == 637852-1.html 637852-1-ref.html
-fuzzy-if(Android,8,500) == 637852-2.html 637852-2-ref.html
-fuzzy-if(Android,8,500) == 637852-3.html 637852-3-ref.html
+== 637852-1.html 637852-1-ref.html
+== 637852-2.html 637852-2-ref.html
+== 637852-3.html 637852-3-ref.html
== 641770-1.html 641770-1-ref.html
== 641856-1.html 641856-1-ref.html
== 645491-1.html 645491-1-ref.html
@@ -1684,7 +1682,7 @@ fuzzy-if(skiaContent,1,4500) == 654950-1.html 654950-1-ref.html # Quartz alpha b
!= 656875.html about:blank
== 658952.html 658952-ref.html
fuzzy-if(skiaContent,1,3500) == 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
+fuzzy-if(d2d,1,256) fuzzy-if(skiaContent,1,68000) == 664127-1.xul 664127-1-ref.xul
== 665597-1.html 665597-1-ref.html
== 665597-2.html 665597-2-ref.html
== 668319-1.xul about:blank
@@ -1714,7 +1712,7 @@ fuzzy-if(true,1,21) fuzzy-if(d2d,68,173) fuzzy-if(cocoaWidget,1,170) == 718521.h
== 722888-1.html 722888-1-ref.html
fuzzy(1,40000) == 722923-1.html 722923-1-ref.html
== 723484-1.html 723484-1-ref.html
-random-if(Android) == 728983-1.html 728983-1-ref.html
+== 728983-1.html 728983-1-ref.html
== 729143-1.html 729143-1-ref.html
== 731521-1.html 731521-1-ref.html
needs-focus == 731726-1.html 731726-1-ref.html
@@ -1726,7 +1724,7 @@ fuzzy-if(cocoaWidget,1,300000) fuzzy-if(skiaContent,2,300000) == 745934-1.html 7
== 750551-1.html 750551-1-ref.html
== 751012-1a.html 751012-1-ref.html
== 751012-1b.html 751012-1-ref.html
-random-if(Android) == 753329-1.html about:blank
+== 753329-1.html about:blank
== 758561-1.html 758561-1-ref.html
fuzzy-if(true,1,90) fuzzy-if(skiaContent,1,320) == 759036-1.html 759036-1-ref.html
fuzzy-if(true,17,5886) == 759036-2.html 759036-2-ref.html
@@ -1747,11 +1745,11 @@ fuzzy(40,875) fuzzy-if(azureQuartz,73,542) fuzzy-if(skiaContent,1,2500) == 79779
fuzzy(40,850) fuzzy-if(azureQuartz,68,586) fuzzy-if(skiaContent,2,2310) == 797797-2.html 797797-2-ref.html # 'opacity:N' and rgba(,,,N) text don't match precisely
== 801994-1.html 801994-1-ref.html
== 804323-1.html 804323-1-ref.html
-fuzzy-if(Android,8,608) == 811301-1.html 811301-1-ref.html
+== 811301-1.html 811301-1-ref.html
== 812824-1.html 812824-1-ref.html
== 814677.html 814677-ref.html
== 814952-1.html 814952-1-ref.html
-fuzzy-if(Android,4,400) == 815593-1.html 815593-1-ref.html
+== 815593-1.html 815593-1-ref.html
== 816359-1.html 816359-1-ref.html
== 816458-1.html 816458-1-ref.html
fuzzy-if(skiaContent,1,5) == 816948-1.html 816948-1-ref.html
@@ -1785,8 +1783,8 @@ fuzzy-if(OSX,1,364) fuzzy-if(skiaContent,1,320) == 846144-1.html 846144-1-ref.ht
== 894931-1.html 894931-1-ref.html
== 897491-1.html 897491-1-ref.html
== 897491-2.html 897491-2-ref.html
-fuzzy(2,10000) fuzzy-if(Android,5,10000) == 902330-1.html 902330-1-ref.html
-fuzzy-if(Android,8,400) == 906199-1.html 906199-1-ref.html
+fuzzy(2,10000) == 902330-1.html 902330-1-ref.html
+== 906199-1.html 906199-1-ref.html
== 921716-1.html 921716-1-ref.html
== 926155-1.html 926155-1-ref.html
fuzzy-if(cocoaWidget,1,40) == 928607-1.html 928607-1-ref.html
@@ -1797,7 +1795,7 @@ fuzzy-if(OSX==1006,2,30) == 933264-1.html 933264-1-ref.html
== 936670-1.svg 936670-1-ref.svg
== 941940-1.html 941940-1-ref.html
fails == 942017.html 942017-ref.html # bug 942017
-fuzzy-if(Android,1,1) fuzzy-if(skiaContent,1,160000) == 942672-1.html 942672-1-ref.html
+fuzzy-if(skiaContent,1,160000) == 942672-1.html 942672-1-ref.html
== 953334-win32-clipping.html 953334-win32-clipping-ref.html
fuzzy-if(skiaContent,1,5) == 956513-1.svg 956513-1-ref.svg
== 944291-1.html 944291-1-ref.html
@@ -1808,8 +1806,8 @@ fuzzy-if(skiaContent,1,80) == 961887-1.html 961887-1-ref.html
== 961887-2.html 961887-2-ref.html
== 961887-3.html 961887-3-ref.html
pref(layout.css.overflow-clip-box.enabled,true) fuzzy(50,145) fuzzy-if(asyncPan&&!layersGPUAccelerated,102,3712) == 966992-1.html 966992-1-ref.html
-skip-if(Android) == 966510-1.html 966510-1-ref.html # scrollable elements other than the root probably won't work well on android until bug 776030 is fixed
-skip-if(Android) == 966510-2.html 966510-2-ref.html # same as above
+== 966510-1.html 966510-1-ref.html
+== 966510-2.html 966510-2-ref.html
fuzzy-if(skiaContent,1,123) == 978911-1.svg 978911-1-ref.svg
== 983084-1.html 983084-1-ref.html
== 983084-2.html 983084-2-ref.html
@@ -1851,7 +1849,7 @@ test-pref(layout.css.grid.enabled,true) == 1053035-1-grid.html 1053035-1-ref.htm
== 1062108-1.html 1062108-1-ref.html
== 1062792-1.html 1062792-1-ref.html
== 1062963-floatmanager-reflow.html 1062963-floatmanager-reflow-ref.html
-test-pref(dom.webcomponents.enabled,true) == 1066554-1.html 1066554-1-ref.html
+test-pref(dom.webcomponents.enabled,true) fails-if(stylo||styloVsGecko) == 1066554-1.html 1066554-1-ref.html
== 1069716-1.html 1069716-1-ref.html
== 1078262-1.html about:blank
test-pref(layout.testing.overlay-scrollbars.always-visible,false) == 1081072-1.html 1081072-1-ref.html
@@ -1875,57 +1873,6 @@ fuzzy-if(skiaContent,1,800000) == 1119117-1b.html 1119117-1-ref.html
== 1128354-1.html 1128354-1-ref.html
== 1130231-1-button-padding-rtl.html 1130231-1-button-padding-rtl-ref.html
== 1130231-2-button-padding-rtl.html 1130231-2-button-padding-rtl-ref.html
-# The 1133905-*.html reftests only make sense on platforms where both APZ and
-# <meta viewport> are enabled.
-# (Note: bug 1308702 covers these tests' failures on Android)
-skip-if(!Android) == 1133905-1.html 1133905-ref.html
-skip-if(!Android) == 1133905-2.html 1133905-ref.html
-skip-if(!Android) == 1133905-3.html 1133905-ref.html
-skip-if(!Android) == 1133905-4.html 1133905-ref.html
-skip-if(!Android) == 1133905-5.html 1133905-ref.html
-skip-if(!Android) == 1133905-6.html 1133905-ref.html
-skip-if(!Android) fails-if(Android) == 1133905-1-v.html 1133905-ref-v.html
-skip-if(!Android) fails-if(Android) == 1133905-2-v.html 1133905-ref-v.html
-skip-if(!Android) fails-if(Android) == 1133905-3-v.html 1133905-ref-v.html
-skip-if(!Android) == 1133905-4-v.html 1133905-ref-v.html
-skip-if(!Android) fails-if(Android) == 1133905-5-v.html 1133905-ref-v.html
-skip-if(!Android) fails-if(Android) == 1133905-6-v.html 1133905-ref-v.html
-skip-if(!Android) == 1133905-1-h.html 1133905-ref-h.html
-skip-if(!Android) == 1133905-2-h.html 1133905-ref-h.html
-skip-if(!Android) == 1133905-3-h.html 1133905-ref-h.html
-skip-if(!Android) == 1133905-4-h.html 1133905-ref-h.html
-skip-if(!Android) == 1133905-5-h.html 1133905-ref-h.html
-skip-if(!Android) == 1133905-6-h.html 1133905-ref-h.html
-skip-if(!Android) fails-if(Android) == 1133905-1-vh.html 1133905-ref-vh.html
-skip-if(!Android) fails-if(Android) == 1133905-2-vh.html 1133905-ref-vh.html
-skip-if(!Android) fails-if(Android) == 1133905-3-vh.html 1133905-ref-vh.html
-skip-if(!Android) == 1133905-4-vh.html 1133905-ref-vh.html
-skip-if(!Android) fails-if(Android) == 1133905-5-vh.html 1133905-ref-vh.html
-skip-if(!Android) fails-if(Android) == 1133905-6-vh.html 1133905-ref-vh.html
-skip-if(!Android) == 1133905-1-rtl.html 1133905-ref-rtl.html
-skip-if(!Android) == 1133905-2-rtl.html 1133905-ref-rtl.html
-skip-if(!Android) == 1133905-3-rtl.html 1133905-ref-rtl.html
-skip-if(!Android) == 1133905-4-rtl.html 1133905-ref-rtl.html
-skip-if(!Android) == 1133905-5-rtl.html 1133905-ref-rtl.html
-skip-if(!Android) == 1133905-6-rtl.html 1133905-ref-rtl.html
-skip-if(!Android) fails-if(Android) == 1133905-1-v-rtl.html 1133905-ref-v-rtl.html
-skip-if(!Android) fails-if(Android) == 1133905-2-v-rtl.html 1133905-ref-v-rtl.html
-skip-if(!Android) fails-if(Android) == 1133905-3-v-rtl.html 1133905-ref-v-rtl.html
-skip-if(!Android) == 1133905-4-v-rtl.html 1133905-ref-v-rtl.html
-skip-if(!Android) fails-if(Android) == 1133905-5-v-rtl.html 1133905-ref-v-rtl.html
-skip-if(!Android) fails-if(Android) == 1133905-6-v-rtl.html 1133905-ref-v-rtl.html
-skip-if(!Android) == 1133905-1-h-rtl.html 1133905-ref-h-rtl.html
-skip-if(!Android) == 1133905-2-h-rtl.html 1133905-ref-h-rtl.html
-skip-if(!Android) == 1133905-3-h-rtl.html 1133905-ref-h-rtl.html
-skip-if(!Android) == 1133905-4-h-rtl.html 1133905-ref-h-rtl.html
-skip-if(!Android) == 1133905-5-h-rtl.html 1133905-ref-h-rtl.html
-skip-if(!Android) == 1133905-6-h-rtl.html 1133905-ref-h-rtl.html
-skip-if(!Android) fails-if(Android) == 1133905-1-vh-rtl.html 1133905-ref-vh-rtl.html
-skip-if(!Android) fails-if(Android) == 1133905-2-vh-rtl.html 1133905-ref-vh-rtl.html
-skip-if(!Android) fails-if(Android) == 1133905-3-vh-rtl.html 1133905-ref-vh-rtl.html
-skip-if(!Android) == 1133905-4-vh-rtl.html 1133905-ref-vh-rtl.html
-skip-if(!Android) fails-if(Android) == 1133905-5-vh-rtl.html 1133905-ref-vh-rtl.html
-skip-if(!Android) fails-if(Android) == 1133905-6-vh-rtl.html 1133905-ref-vh-rtl.html
== 1150021-1.xul 1150021-1-ref.xul
== 1151145-1.html 1151145-1-ref.html
== 1151306-1.html 1151306-1-ref.html
@@ -1933,7 +1880,7 @@ skip-if(!Android) fails-if(Android) == 1133905-6-vh-rtl.html 1133905-ref-vh-rtl.
== 1155828-1.html 1155828-1-ref.html
== 1156129-1.html 1156129-1-ref.html
pref(dom.use_xbl_scopes_for_remote_xul,true) HTTP(..) == 1157127-1.html 1157127-1-ref.html
-fuzzy-if(Android,2,5) == 1169331-1.html 1169331-1-ref.html
+== 1169331-1.html 1169331-1-ref.html
fuzzy(1,74) fails-if(gtkWidget) == 1174332-1.html 1174332-1-ref.html # bug 1312658
== 1179078-1.html 1179078-1-ref.html
== 1179288-1.html 1179288-1-ref.html
@@ -1973,15 +1920,15 @@ fuzzy(8,1900) == 1291528.html 1291528-ref.html
# should be same. |fuzzy()| here allows the difference in border, but not
# background color.
fuzzy(255,1000) skip-if(!cocoaWidget) == 1294102-1.html 1294102-1-ref.html
-random-if(Android) fuzzy-if(skiaContent,15,50) == 1295466-1.xhtml 1295466-1-ref.xhtml #bug 982547
-fuzzy-if(Android,27,874) fuzzy-if(gtkWidget,14,29) == 1313772.xhtml 1313772-ref.xhtml # Bug 1128229
+fuzzy-if(skiaContent,15,50) == 1295466-1.xhtml 1295466-1-ref.xhtml #bug 982547
+fuzzy-if(gtkWidget,14,29) == 1313772.xhtml 1313772-ref.xhtml # Bug 1128229
fuzzy(2,320000) == 1315113-1.html 1315113-1-ref.html
fuzzy(2,20000) == 1315113-2.html 1315113-2-ref.html
== 1315632-1.html 1315632-1-ref.html
fails == 1316719-1a.html 1316719-1-ref.html
fails == 1316719-1b.html 1316719-1-ref.html
fails == 1316719-1c.html 1316719-1-ref.html
-skip-if(Android) != 1318769-1.html 1318769-1-ref.html
+!= 1318769-1.html 1318769-1-ref.html
HTTP == 652991-1a.html 652991-1-ref.html
HTTP == 652991-1b.html 652991-1-ref.html
diff --git a/layout/reftests/canvas/reftest-stylo.list b/layout/reftests/canvas/reftest-stylo.list
deleted file mode 100644
index 221205a9b..000000000
--- a/layout/reftests/canvas/reftest-stylo.list
+++ /dev/null
@@ -1,122 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== default-size.html default-size.html
-skip-if(B2G||Mulet) fuzzy-if(Android,8,1000) == size-1.html size-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-== empty-transaction-1.html empty-transaction-1.html
-
-== image-rendering-test.html image-rendering-test.html
-== image-shadow.html image-shadow.html
-
-skip-if(B2G||Mulet) asserts-if(cocoaWidget,0-2) == size-change-1.html size-change-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-random-if(cocoaWidget) == subpixel-1.html subpixel-1.html
-# see bug 1192616, re-enable once we're off the pandaboards
-
-== text-ltr-left.html text-ltr-left.html
-== text-ltr-right.html text-ltr-right.html
-== text-rtl-left.html text-rtl-left.html
-== text-rtl-right.html text-rtl-right.html
-
-== text-ltr-start.html text-ltr-start.html
-== text-ltr-end.html text-ltr-end.html
-== text-ltr-left.html text-ltr-left.html
-== text-rtl-start.html text-rtl-start.html
-== text-rtl-end.html text-rtl-end.html
-== text-rtl-left.html text-rtl-left.html
-
-== text-ltr-left.html text-ltr-left.html
-
-== text-ltr-alignment-test.html text-ltr-alignment-test.html
-== text-rtl-alignment-test.html text-rtl-alignment-test.html
-
-fuzzy-if((B2G||Mulet)&&azureSkiaGL,1,256) == text-horzline-with-bottom.html text-horzline-with-bottom.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fuzzy-if((B2G||Mulet)&&azureSkiaGL,1,256) fails-if(azureSkia&&OSX>=1008) == text-horzline-with-top.html text-horzline-with-top.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-== text-big-stroke.html text-big-stroke.html
-== text-big-stroke.html text-big-stroke.html
-
-== text-context-state-test.html text-context-state-test.html
-== text-font-inherit.html text-font-inherit.html
-== text-space-replace-test.html text-space-replace-test.html
-
-== text-no-frame-test.html text-no-frame-test.html
-== text-no-frame-2-test.html text-no-frame-2-test.html
-fuzzy-if(azureSkiaGL,10,400) == text-not-in-doc-test.html text-not-in-doc-test.html
-
-== text-bidi-ltr-test.html text-bidi-ltr-test.html
-== text-bidi-ltr-test.html text-bidi-ltr-test.html
-# for bug 698185
-== text-bidi-rtl-test.html text-bidi-rtl-test.html
-
-skip-if(B2G||Mulet) == text-font-lang.html text-font-lang.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-== text-measure.html text-measure.html
-== text-small-caps-1.html text-small-caps-1.html
-
-random-if(!d2d) == text-subpixel-1.html text-subpixel-1.html
-
-== strokeText-path.html strokeText-path.html
-
-# check that emoji character renders as something non-blank (for Apple Color Emoji font, bug 715798)
-# apparently fails on some 10.7 systems for unknown reasons, bug 804522.
-## Currently fails most places due to partial backout of bug 808288, see bug 837461.
-## (Marking "random" rather than "fails" because it would pass for people
-## if they have an Emoji font installed when running the tests.)
-## WAS: random-if(OSX==1007) == text-emoji.html text-emoji.html
-# With Skia canvas on OS X (bug 932958) it fails even on 10.8 and 10.10.
-random-if(cocoaWidget&&azureSkia) random-if(!cocoaWidget||OSX==1006||OSX==1007) == text-emoji.html text-emoji.html
-
-# azure quartz uses CGDrawLinearGradient instead of DrawShading
-# so we have less control over degenerate behaviour as tested by this
-# test
-skip == linear-gradient-1a.html linear-gradient-1a.html
-
-# this passes with cairo on 10.7 and 10.8 but not with azure for reasons unknown
-skip == linear-gradient-1b.html linear-gradient-1b.html
-
-== zero-dimensions.html zero-dimensions.html
-
-== evenodd-fill-sanity.html evenodd-fill-sanity.html
-== evenodd-fill-1.html evenodd-fill-1.html
-== evenodd-fill-1.html evenodd-fill-1.html
-random-if(azureSkiaGL) == evenodd-fill-2.html evenodd-fill-2.html
-== evenodd-fill-3.html evenodd-fill-3.html
-
-== dash-sanity.html dash-sanity.html
-fuzzy-if(azureSkia||skiaContent,9,470) random-if(Android) == dash-1.html dash-1.html
-# Bug 668412 (really is android-specific, not IPC-specific)
-
-== ctm-sanity.html ctm-sanity.html
-== ctm-singular-sanity.html ctm-singular-sanity.html
-== ctm-1.html ctm-1.html
-
-fails-if(azureQuartz&&OSX==1006) == 672646-alpha-radial-gradient.html 672646-alpha-radial-gradient.html
-# Bug 673333
-== 674003-alpha-radial-gradient-superlum.html 674003-alpha-radial-gradient-superlum.html
-
-== 693610-1.html 693610-1.html
-# bug 693610: multiple glyph runs should not be overprinted
-
-== 726951-shadow-clips.html 726951-shadow-clips.html
-
-== transformed-clip.html transformed-clip.html
-fuzzy-if(azureSkia,1,15) fuzzy-if(skiaContent,1,20) == transformed-gradient.html transformed-gradient.html
-== transformed-path.html transformed-path.html
-
-== 749467-1.html 749467-1.html
-
-# You get a little bit of rounding fuzz on OSX from transforming the paths between user space and device space
-fuzzy-if(azureQuartz,2,128) fuzzy-if(d2d,12,21) fuzzy-if(skiaContent,12,7) fuzzy-if(d2d&&/^Windows\x20NT\x2010\.0/.test(http.oscpu),2,141) == 784573-1.html 784573-1.html
-
-== 802658-1.html 802658-1.html
-== 1074733-1.html 1074733-1.html
-fuzzy-if(Mulet,45,2) == 1107096-invisibles.html 1107096-invisibles.html
-== 1151821-1.html 1151821-1.html
-== 1201272-1.html 1201272-1.html
-== 1224976-1.html 1224976-1.html
-== 1238795-1.html 1238795-1.html
diff --git a/layout/reftests/canvas/reftest.list b/layout/reftests/canvas/reftest.list
index f32ca360b..797d338a5 100644
--- a/layout/reftests/canvas/reftest.list
+++ b/layout/reftests/canvas/reftest.list
@@ -1,5 +1,5 @@
== default-size.html default-size-ref.html
-fuzzy-if(Android,8,1000) == size-1.html size-1-ref.html
+== size-1.html size-1-ref.html
== empty-transaction-1.html empty-transaction-1-ref.html
@@ -66,10 +66,10 @@ random-if(cocoaWidget&&azureSkia) random-if(!cocoaWidget||OSX==1006||OSX==1007)
# azure quartz uses CGDrawLinearGradient instead of DrawShading
# so we have less control over degenerate behaviour as tested by this
# test
-fails-if((azureSkia&&!azureSkiaGL)||azureQuartz||(azureSkiaGL&&Android)) == linear-gradient-1a.html linear-gradient-1-ref.html
+fails-if((azureSkia&&!azureSkiaGL)||azureQuartz) == linear-gradient-1a.html linear-gradient-1-ref.html
# this passes with cairo on 10.7 and 10.8 but not with azure for reasons unknown
-fails-if((azureSkia&&!azureSkiaGL)||azureQuartz||(azureSkiaGL&&Android)) == linear-gradient-1b.html linear-gradient-1-ref.html
+fails-if((azureSkia&&!azureSkiaGL)||azureQuartz) == linear-gradient-1b.html linear-gradient-1-ref.html
== zero-dimensions.html zero-dimensions-ref.html
@@ -77,7 +77,7 @@ fails-if((azureSkia&&!azureSkiaGL)||azureQuartz||(azureSkiaGL&&Android)) == line
== evenodd-fill-1.html evenodd-fill-ref.html
== dash-sanity.html data:text/html,<body>Pass
-fuzzy-if(azureSkia||skiaContent,9,470) random-if(Android) == dash-1.html dash-1-ref.svg # Bug 668412 (really is android-specific, not IPC-specific)
+fuzzy-if(azureSkia||skiaContent,9,470) == dash-1.html dash-1-ref.svg
== ctm-sanity.html data:text/html,<body>Pass
== ctm-singular-sanity.html data:text/html,<body>Pass
diff --git a/layout/reftests/columns/reftest-stylo.list b/layout/reftests/columns/reftest-stylo.list
deleted file mode 100644
index bf2e1dfa7..000000000
--- a/layout/reftests/columns/reftest-stylo.list
+++ /dev/null
@@ -1,44 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== basic-1.html basic-1.html
-== pref-width-1a.html pref-width-1a.html
-== pref-width-1b.html pref-width-1b.html
-== pref-width-1c.html pref-width-1c.html
-== min-width-1a.html min-width-1a.html
-== min-width-1b.html min-width-1b.html
-== min-width-1c.html min-width-1c.html
-== min-width-2.html min-width-2.html
-== column-balancing-overflow-000.html column-balancing-overflow-000.html
-== column-balancing-overflow-001.html column-balancing-overflow-001.html
-skip == column-balancing-overflow-002.html column-balancing-overflow-002.html
-== column-balancing-overflow-003.html column-balancing-overflow-003.html
-== column-balancing-overflow-004.html column-balancing-overflow-004.html
-== column-balancing-overflow-005.html column-balancing-overflow-005.html
-== column-balancing-000.html column-balancing-000.html
-== column-balancing-001.html column-balancing-001.html
-== column-balancing-002.html column-balancing-002.html
-== column-balancing-003.html column-balancing-003.html
-== column-balancing-004.html column-balancing-004.html
-== column-box-alignment-rtl.html column-box-alignment-rtl.html
-HTTP(..) == columnfill-balance.html columnfill-balance.html
-fuzzy-if(OSX,32,1000) HTTP(..) == columnfill-auto.html columnfill-auto.html
-HTTP(..) == columnfill-auto-2.html columnfill-auto-2.html
-HTTP(..) == columnfill-auto-3.html columnfill-auto-3.html
-skip-if(B2G||Mulet) == columnrule-basic.html columnrule-basic.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == columnrule-complex.html columnrule-complex.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== columnrule-linestyles.html columnrule-linestyles.html
-== columnrule-padding.html columnrule-padding.html
-skip-if(B2G||Mulet) == columnfill-overflow.html columnfill-overflow.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== margin-collapsing-bug616722-1.html margin-collapsing-bug616722-1.html
-== margin-collapsing-bug616722-2.html margin-collapsing-bug616722-2.html
-== column-balancing-nested-000.html column-balancing-nested-000.html
-== column-balancing-nested-001.html column-balancing-nested-001.html
-== columnrule-overflow.html columnrule-overflow.html
-== columns-table-caption-000.html columns-table-caption-000.html
-== positioning-transforms-bug1112501.html positioning-transforms-bug1112501.html
-skip fuzzy-if(browserIsRemote&&winWidget,121,221) == fieldset-columns-001.html fieldset-columns-001.html
diff --git a/layout/reftests/counter-style/reftest-stylo.list b/layout/reftests/counter-style/reftest-stylo.list
deleted file mode 100644
index d2dfc7820..000000000
--- a/layout/reftests/counter-style/reftest-stylo.list
+++ /dev/null
@@ -1,38 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== system-cyclic.html system-cyclic.html
-== system-fixed.html system-fixed.html
-== system-symbolic.html system-symbolic.html
-== system-alphabetic.html system-alphabetic.html
-== system-numeric.html system-numeric.html
-== system-additive.html system-additive.html
-== system-extends.html system-extends.html
-== system-cyclic-invalid.html system-cyclic-invalid.html
-== system-fixed-invalid.html system-fixed-invalid.html
-== system-symbolic-invalid.html system-symbolic-invalid.html
-== system-alphabetic-invalid.html system-alphabetic-invalid.html
-== system-numeric-invalid.html system-numeric-invalid.html
-== system-additive-invalid.html system-additive-invalid.html
-== system-extends-invalid.html system-extends-invalid.html
-== descriptor-negative.html descriptor-negative.html
-== descriptor-prefix.html descriptor-prefix.html
-fails-if(B2G||Mulet) == descriptor-suffix.html descriptor-suffix.html
-# B2G kerning
-# Initial mulet triage: parity with B2G/B2G Desktop
-== descriptor-range.html descriptor-range.html
-== descriptor-pad.html descriptor-pad.html
-== descriptor-fallback.html descriptor-fallback.html
-== descriptor-symbols.html descriptor-symbols.html
-== descriptor-negative-invalid.html descriptor-negative-invalid.html
-== descriptor-prefix-invalid.html descriptor-prefix-invalid.html
-== descriptor-suffix-invalid.html descriptor-suffix-invalid.html
-== descriptor-range-invalid.html descriptor-range-invalid.html
-== descriptor-pad-invalid.html descriptor-pad-invalid.html
-== descriptor-fallback.html descriptor-fallback.html
-== descriptor-symbols-invalid.html descriptor-symbols-invalid.html
-== name-case-sensitivity.html name-case-sensitivity.html
-== dependent-builtin.html dependent-builtin.html
-== redefine-builtin.html redefine-builtin.html
-skip == redefine-attr-mapping.html redefine-attr-mapping.html
-== disclosure-styles.html disclosure-styles.html
-== symbols-function.html symbols-function.html
-== symbols-function-invalid.html symbols-function-invalid.html
diff --git a/layout/reftests/counters/reftest-stylo.list b/layout/reftests/counters/reftest-stylo.list
deleted file mode 100644
index 3f75ad9e8..000000000
--- a/layout/reftests/counters/reftest-stylo.list
+++ /dev/null
@@ -1,85 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== counter-name-case-sensitive.html counter-name-case-sensitive.html
-== t1202-counter-00-b-test.html t1202-counter-00-b-test.html
-== t1202-counter-01-b-test.html t1202-counter-01-b-test.html
-== t1202-counter-02-b-test.html t1202-counter-02-b-test.html
-== t1202-counter-03-b-test.html t1202-counter-03-b-test.html
-== t1202-counter-04-b-test.html t1202-counter-04-b-test.html
-== t1202-counter-05-b-test.html t1202-counter-05-b-test.html
-== t1202-counter-06-b-test.html t1202-counter-06-b-test.html
-== t1202-counter-07-b-test.html t1202-counter-07-b-test.html
-skip == t1202-counter-08-b-test.html t1202-counter-08-b-test.html
-== t1202-counter-09-b-test.html t1202-counter-09-b-test.html
-== t1202-counter-10-b-test.html t1202-counter-10-b-test.html
-== t1202-counter-11-b-test.html t1202-counter-11-b-test.html
-== t1202-counter-12-b-test.html t1202-counter-12-b-test.html
-== t1202-counter-13-b-test.html t1202-counter-13-b-test.html
-== t1202-counter-14-b-test.html t1202-counter-14-b-test.html
-== t1202-counter-15-b-test.html t1202-counter-15-b-test.html
-== t1202-counter-16-f-test.html t1202-counter-16-f-test.html
-== t1202-counters-00-b-test.html t1202-counters-00-b-test.html
-== t1202-counters-01-b-test.html t1202-counters-01-b-test.html
-== t1202-counters-02-b-test.html t1202-counters-02-b-test.html
-== t1202-counters-03-b-test.html t1202-counters-03-b-test.html
-== t1202-counters-04-b-test.html t1202-counters-04-b-test.html
-== t1202-counters-05-b-test.html t1202-counters-05-b-test.html
-skip == t1202-counters-06-b-test.html t1202-counters-06-b-test.html
-== t1202-counters-07-b-test.html t1202-counters-07-b-test.html
-== t1202-counters-08-b-test.html t1202-counters-08-b-test.html
-== t1202-counters-09-b-test.html t1202-counters-09-b-test.html
-== t1202-counters-10-b-test.html t1202-counters-10-b-test.html
-== t1202-counters-11-b-test.html t1202-counters-11-b-test.html
-== t1202-counters-12-b-test.html t1202-counters-12-b-test.html
-== t1202-counters-13-b-test.html t1202-counters-13-b-test.html
-== t1202-counters-14-b-test.html t1202-counters-14-b-test.html
-== t1202-counters-15-b-test.html t1202-counters-15-b-test.html
-== t1202-counters-16-c-test.html t1202-counters-16-c-test.html
-== t1202-counters-17-d-test.html t1202-counters-17-d-test.html
-== t1202-counters-18-f-test.html t1202-counters-18-f-test.html
-== t1204-implied-00-b-test.html t1204-implied-00-b-test.html
-== t1204-implied-01-c-test.html t1204-implied-01-c-test.html
-== t1204-implied-02-d-test.html t1204-implied-02-d-test.html
-== t1204-increment-00-c-o-test.html t1204-increment-00-c-o-test.html
-== t1204-increment-01-c-o-test.html t1204-increment-01-c-o-test.html
-== t1204-increment-02-c-o-test.html t1204-increment-02-c-o-test.html
-== t1204-multiple-00-c-test.html t1204-multiple-00-c-test.html
-== t1204-multiple-01-c-test.html t1204-multiple-01-c-test.html
-== t1204-order-00-c-test.html t1204-order-00-c-test.html
-== t1204-order-01-d-test.html t1204-order-01-d-test.html
-== t1204-reset-00-c-o-test.html t1204-reset-00-c-o-test.html
-== t1204-reset-01-c-o-test.html t1204-reset-01-c-o-test.html
-== t1204-reset-02-c-o-test.html t1204-reset-02-c-o-test.html
-== t1204-root-e-test.html t1204-root-e-test.html
-== t120401-scope-00-b-test.html t120401-scope-00-b-test.html
-== t120401-scope-01-c-test.html t120401-scope-01-c-test.html
-== t120401-scope-02-c-test.html t120401-scope-02-c-test.html
-== t120401-scope-03-c-test.html t120401-scope-03-c-test.html
-== t120401-scope-04-d-test.html t120401-scope-04-d-test.html
-== t120403-content-none-00-c-test.html t120403-content-none-00-c-test.html
-== t120403-display-none-00-c-test.html t120403-display-none-00-c-test.html
-== t120403-visibility-00-c-test.html t120403-visibility-00-c-test.html
-== text-boundaries-subpixel.html text-boundaries-subpixel.html
-skip == counter-hebrew-test.html counter-hebrew-test.html
-== counters-hebrew-test.html counters-hebrew-test.html
-fails-if(xulRuntime.XPCOMABI.match(/arm/)) == counter-reset-integer-range.html counter-reset-integer-range.html
-# bug 989718
-== counter-ua-limits-00.html counter-ua-limits-00.html
-== counter-ua-limits-01.html counter-ua-limits-01.html
-fails-if(xulRuntime.XPCOMABI.match(/arm/)) == counter-ua-limits-02.html counter-ua-limits-02.html
-# bug 989718
-== counter-ua-limits-03.html counter-ua-limits-03.html
-== counter-ua-limits-list-00.html counter-ua-limits-list-00.html
-== counter-ua-limits-list-01.html counter-ua-limits-list-01.html
-== multiple-thai-counters.html multiple-thai-counters.html
-== counter-suffix.html counter-suffix.html
-== counter-cjk-decimal.html counter-cjk-decimal.html
-== counter-japanese-informal.html counter-japanese-informal.html
-== counter-japanese-formal.html counter-japanese-formal.html
-== counter-korean-hangul-formal.html counter-korean-hangul-formal.html
-== counter-korean-hanja-informal.html counter-korean-hanja-informal.html
-== counter-korean-hanja-formal.html counter-korean-hanja-formal.html
-== counter-simp-chinese-informal.html counter-simp-chinese-informal.html
-== counter-simp-chinese-formal.html counter-simp-chinese-formal.html
-== counter-trad-chinese-informal.html counter-trad-chinese-informal.html
-== counter-trad-chinese-formal.html counter-trad-chinese-formal.html
-== counter-ethiopic-numeric.html counter-ethiopic-numeric.html
diff --git a/layout/reftests/css-animations/reftest-stylo.list b/layout/reftests/css-animations/reftest-stylo.list
deleted file mode 100644
index fcff4eff6..000000000
--- a/layout/reftests/css-animations/reftest-stylo.list
+++ /dev/null
@@ -1,34 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== screen-animations.html screen-animations.html
-== screen-animations.html screen-animations.html
-== print-no-animations.html print-no-animations.html
-# reftest harness doesn't actually make pres context non-dynamic for reftest-print tests
-== print-no-animations.html print-no-animations.html
-# reftest harness doesn't actually make pres context non-dynamic for reftest-print tests
-== animate-opacity.html animate-opacity.html
-== animate-preserves3d.html animate-preserves3d.html
-== in-visibility-hidden-animation.html in-visibility-hidden-animation.html
-== in-visibility-hidden-animation-pseudo-element.html in-visibility-hidden-animation-pseudo-element.html
-== partially-out-of-view-animation.html partially-out-of-view-animation.html
-== animate-display-table-opacity.html animate-display-table-opacity.html
-# We need to run 100% opacity test case when OMTA is disabled to check that the animation creates a stacking context even if the animation is not running on the compositor
-test-pref(layers.offmainthreadcomposition.async-animations,false) == stacking-context-opacity-1-animation.html stacking-context-opacity-1-animation.html
-# We need to run transform:none test case when OMTA is disabled to check that the animation creates a stacking context even if the animation is not running on the compositor
-test-pref(layers.offmainthreadcomposition.async-animations,false) == stacking-context-transform-none-animation.html stacking-context-transform-none-animation.html
-== stacking-context-lose-opacity-1.html stacking-context-lose-opacity-1.html
-== stacking-context-lose-transform-none.html stacking-context-lose-transform-none.html
-== stacking-context-opacity-1-animation.html stacking-context-opacity-1-animation.html
-== stacking-context-opacity-1-with-fill-backwards.html stacking-context-opacity-1-with-fill-backwards.html
-== stacking-context-opacity-1-with-fill-forwards.html stacking-context-opacity-1-with-fill-forwards.html
-== stacking-context-paused-on-opacity-1.html stacking-context-paused-on-opacity-1.html
-== stacking-context-paused-on-transform-none.html stacking-context-paused-on-transform-none.html
-== stacking-context-transform-none-animation.html stacking-context-transform-none-animation.html
-== stacking-context-transform-none-animation-on-svg.html stacking-context-transform-none-animation-on-svg.html
-== stacking-context-transform-none-animation-with-backface-visibility.html stacking-context-transform-none-animation-with-backface-visibility.html
-== stacking-context-transform-none-animation-with-preserve-3d.html stacking-context-transform-none-animation-with-preserve-3d.html
-== stacking-context-transform-none-with-fill-backwards.html stacking-context-transform-none-with-fill-backwards.html
-== stacking-context-transform-none-with-fill-forwards.html stacking-context-transform-none-with-fill-forwards.html
-== stacking-context-opacity-1-in-delay.html stacking-context-opacity-1-in-delay.html
-# bug 1278136 and bug 1279403
-== stacking-context-transform-none-in-delay.html stacking-context-transform-none-in-delay.html
-# bug 1278136 and bug 1279403
diff --git a/layout/reftests/css-blending/reftest-stylo.list b/layout/reftests/css-blending/reftest-stylo.list
deleted file mode 100644
index 72f64c015..000000000
--- a/layout/reftests/css-blending/reftest-stylo.list
+++ /dev/null
@@ -1,101 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-pref(layout.css.mix-blend-mode.enabled,true) == blend-canvas.html blend-canvas.html
-pref(layout.css.mix-blend-mode.enabled,true) == blend-constant-background-color.html blend-constant-background-color.html
-pref(layout.css.mix-blend-mode.enabled,true) == blend-gradient-background-color.html blend-gradient-background-color.html
-pref(layout.css.mix-blend-mode.enabled,true) == blend-image.html blend-image.html
-pref(layout.css.mix-blend-mode.enabled,true) == blend-difference-stacking.html blend-difference-stacking.html
-
-fails fuzzy-if(skiaContent,1,30000) pref(layout.css.background-blend-mode.enabled,true) == background-blending-alpha.html background-blending-alpha.html
-pref(layout.css.background-blend-mode.enabled,true) == background-blending-gradient-color.html background-blending-gradient-color.html
-fails fuzzy-if(azureSkiaGL,3,7597) fuzzy-if(cocoaWidget,3,7597) fuzzy-if(d2d,1,3800) fuzzy-if(d3d11,1,4200) fuzzy-if(skiaContent,2,9450) pref(layout.css.background-blend-mode.enabled,true) == background-blending-gradient-gradient.html background-blending-gradient-gradient.html
-fuzzy-if(azureSkiaGL,2,7174) fuzzy-if(azureQuartz,2,7174) pref(layout.css.background-blend-mode.enabled,true) == background-blending-gradient-image.html background-blending-gradient-image.html
-fails fuzzy-if(azureQuartz,2,10000) fuzzy-if(azureSkia||d2d||gtkWidget,1,10000) pref(layout.css.background-blend-mode.enabled,true) == background-blending-image-color-jpg.html background-blending-image-color-jpg.html
-pref(layout.css.background-blend-mode.enabled,true) == background-blending-image-color-png.html background-blending-image-color-png.html
-skip == background-blending-image-color-svg.html background-blending-image-color-svg.html
-fuzzy-if(azureSkiaGL,2,7174) fuzzy-if(azureQuartz,2,7174) pref(layout.css.background-blend-mode.enabled,true) == background-blending-image-gradient.html background-blending-image-gradient.html
-pref(layout.css.background-blend-mode.enabled,true) == background-blending-image-image.html background-blending-image-image.html
-pref(layout.css.background-blend-mode.enabled,true) == background-blending-isolation.html background-blending-isolation.html
-pref(layout.css.background-blend-mode.enabled,true) == background-blending-list-repeat.html background-blending-list-repeat.html
-pref(layout.css.background-blend-mode.enabled,true) == background-blending-multiple-images.html background-blending-multiple-images.html
-
-pref(layout.css.background-blend-mode.enabled,true) == background-blending-color-burn.html background-blending-color-burn.html
-pref(layout.css.background-blend-mode.enabled,true) == background-blending-color-dodge.html background-blending-color-dodge.html
-# need to investigate why these tests are fuzzy - first suspect is a possible color space conversion on some platforms; same for mix-blend-mode tests
-fails fuzzy-if(azureQuartz,2,8000) fuzzy-if(azureSkia||gtkWidget,2,9600) fuzzy-if(d2d,1,8000) pref(layout.css.background-blend-mode.enabled,true) == background-blending-color.html background-blending-color.html
-pref(layout.css.background-blend-mode.enabled,true) == background-blending-darken.html background-blending-darken.html
-pref(layout.css.background-blend-mode.enabled,true) == background-blending-difference.html background-blending-difference.html
-fails fuzzy-if(skiaContent,1,1600) pref(layout.css.background-blend-mode.enabled,true) == background-blending-exclusion.html background-blending-exclusion.html
-fuzzy-if(cocoaWidget||d2d,1,1600) pref(layout.css.background-blend-mode.enabled,true) == background-blending-hard-light.html background-blending-hard-light.html
-fails fuzzy-if(azureQuartz,2,8000) fuzzy-if(d2d,1,9600) fuzzy-if(azureSkia||gtkWidget,2,9600) pref(layout.css.background-blend-mode.enabled,true) == background-blending-hue.html background-blending-hue.html
-pref(layout.css.background-blend-mode.enabled,true) == background-blending-lighten.html background-blending-lighten.html
-fails fuzzy-if(azureQuartz,2,8000) fuzzy-if(d2d,1,8000) fuzzy-if(azureSkia||gtkWidget,2,9600) pref(layout.css.background-blend-mode.enabled,true) == background-blending-luminosity.html background-blending-luminosity.html
-pref(layout.css.background-blend-mode.enabled,true) == background-blending-multiply.html background-blending-multiply.html
-pref(layout.css.background-blend-mode.enabled,true) == background-blending-normal.html background-blending-normal.html
-fails fuzzy-if(azureSkia||gtkWidget,1,1600) pref(layout.css.background-blend-mode.enabled,true) == background-blending-overlay.html background-blending-overlay.html
-fails fuzzy-if(d2d,1,1600) fuzzy-if(azureSkia||gtkWidget,2,12800) fuzzy-if(OSX==1006,1,1600) pref(layout.css.background-blend-mode.enabled,true) == background-blending-saturation.html background-blending-saturation.html
-fails fuzzy-if(d2d||azureSkia||gtkWidget,1,1600) pref(layout.css.background-blend-mode.enabled,true) == background-blending-screen.html background-blending-screen.html
-fails fuzzy-if(azureQuartz,1,1600) fuzzy-if(d2d||azureSkia||gtkWidget,10,4800) pref(layout.css.background-blend-mode.enabled,true) == background-blending-soft-light.html background-blending-soft-light.html
-
-fails fuzzy-if(azureQuartz,2,40000) fuzzy-if(azureSkia||d2d||gtkWidget,1,40000) pref(layout.css.background-blend-mode.enabled,true) == background-blending-image-color-959674.html background-blending-image-color-959674.html
-
-#fuzzy due to inconsistencies in rounded rect cliping between parent and child; may be related to antialiasing. Between platforms, the max difference is the same, and the number of different pixels is either 36 or 37. (Win, Mac and Lin)
-pref(layout.css.mix-blend-mode.enabled,true) == mix-blend-mode-952051.html mix-blend-mode-952051.html
-
-fuzzy-if(d3d11,49,200) pref(layout.css.mix-blend-mode.enabled,true) pref(layout.css.filters.enabled,true) == mix-blend-mode-and-filter.html mix-blend-mode-and-filter.html
-fuzzy-if(d3d11,1,3) pref(layout.css.mix-blend-mode.enabled,true) pref(layout.css.filters.enabled,true) == mix-blend-mode-and-filter.svg mix-blend-mode-and-filter.svg
-
-pref(layout.css.mix-blend-mode.enabled,true) == mix-blend-mode-child-of-blended-has-opacity.html mix-blend-mode-child-of-blended-has-opacity.html
-
-pref(layout.css.mix-blend-mode.enabled,true) == mix-blend-mode-nested-976533.html mix-blend-mode-nested-976533.html
-pref(layout.css.mix-blend-mode.enabled,true) == mix-blend-mode-culling-1207041.html mix-blend-mode-culling-1207041.html
-pref(layout.css.mix-blend-mode.enabled,true) == mix-blend-mode-dest-alpha-1135271.html mix-blend-mode-dest-alpha-1135271.html
-== clipped-mixblendmode-containing-unclipped-stuff.html clipped-mixblendmode-containing-unclipped-stuff.html
-fuzzy(1,6800) == clipped-opacity-containing-unclipped-mixblendmode.html clipped-opacity-containing-unclipped-mixblendmode.html
-
-# Test plan 5.3.1 Blending between the background layers and the background color for an element with background-blend-mode
-# Test 9
-pref(layout.css.background-blend-mode.enabled,true) == background-blending-image-color-svg-as-data-uri.html background-blending-image-color-svg-as-data-uri.html
-# Test 10
-pref(layout.css.background-blend-mode.enabled,true) == background-blending-image-color-gif.html background-blending-image-color-gif.html
-pref(layout.css.background-blend-mode.enabled,true) == background-blending-image-color-transform3d.html background-blending-image-color-transform3d.html
-
-# Test plan 5.3.2 Background layers do not blend with content outside the background (or behind the element) - tests 2 and 3
-pref(layout.css.background-blend-mode.enabled,true) == background-blending-isolation-parent-child-color.html background-blending-isolation-parent-child-color.html
-pref(layout.css.background-blend-mode.enabled,true) == background-blending-isolation-parent-child-image.html background-blending-isolation-parent-child-image.html
-
-# Test plan 5.3.6 background-blend-mode for an element with background-position
-pref(layout.css.background-blend-mode.enabled,true) == background-blending-background-position-percentage.html background-blending-background-position-percentage.html
-
-# Test plan 5.3.7 background-blend-mode for an element with background-size
-pref(layout.css.background-blend-mode.enabled,true) == background-blending-background-size-contain.html background-blending-background-size-contain.html
-pref(layout.css.background-blend-mode.enabled,true) == background-blending-background-size-cover.html background-blending-background-size-cover.html
-pref(layout.css.background-blend-mode.enabled,true) == background-blending-background-size-percentage.html background-blending-background-size-percentage.html
-pref(layout.css.background-blend-mode.enabled,true) == background-blending-background-size-pixels.html background-blending-background-size-pixels.html
-
-# Test plan 5.3.8 background-blend-mode for an element with background-repeat
-# Tests 2 and 3 are not added because space and round are not currently supported
-pref(layout.css.background-blend-mode.enabled,true) == background-blending-background-repeat-no-repeat.html background-blending-background-repeat-no-repeat.html
-
-# Test plan 5.3.9 background-blend-mode for an element with background-clip
-pref(layout.css.background-blend-mode.enabled,true) == background-blending-background-clip-content-box.html background-blending-background-clip-content-box.html
-pref(layout.css.background-blend-mode.enabled,true) == background-blending-background-clip-padding-box.html background-blending-background-clip-padding-box.html
-
-# Test plan 5.3.10 background-blend-mode for an element with background-origin
-pref(layout.css.background-blend-mode.enabled,true) == background-blending-background-origin-border-box.html background-blending-background-origin-border-box.html
-pref(layout.css.background-blend-mode.enabled,true) == background-blending-background-origin-content-box.html background-blending-background-origin-content-box.html
-
-# Test plan 5.3.11 background-blend-mode for an element with background-attachement
-pref(layout.css.background-blend-mode.enabled,true) == background-blending-background-attachement-fixed.html background-blending-background-attachement-fixed.html
-pref(layout.css.background-blend-mode.enabled,true) == background-blending-background-attachement-fixed-scroll.html background-blending-background-attachement-fixed-scroll.html
-
-pref(layout.css.background-blend-mode.enabled,true) == background-blend-mode-body-image.html background-blend-mode-body-image.html
-fuzzy-if(Android,4,768) fuzzy-if(gtkWidget,1,132) fuzzy-if(skiaContent,1,800) pref(layout.css.background-blend-mode.enabled,true) == background-blend-mode-body-transparent-image.html background-blend-mode-body-transparent-image.html
-
-pref(layout.css.background-blend-mode.enabled,true) == background-blending-moz-element.html background-blending-moz-element.html
-
-fuzzy(1,40000) pref(layout.css.background-blend-mode.enabled,true) == mix-blend-mode-soft-light.html mix-blend-mode-soft-light.html
-
-# Test plan 4.4.2 element with isolation:isolate creates an isolated group for blended children
-pref(layout.css.isolation.enabled,true) == blend-isolation.html blend-isolation.html
-
-pref(layout.css.background-blend-mode.enabled,true) == bug1281593.html bug1281593.html
diff --git a/layout/reftests/css-blending/reftest.list b/layout/reftests/css-blending/reftest.list
index c0e1e6e35..56cb17dae 100644
--- a/layout/reftests/css-blending/reftest.list
+++ b/layout/reftests/css-blending/reftest.list
@@ -88,7 +88,7 @@ pref(layout.css.background-blend-mode.enabled,true) == background-blending-backg
pref(layout.css.background-blend-mode.enabled,true) == background-blending-background-attachement-fixed-scroll.html background-blending-background-attachement-fixed-scroll-ref.html
pref(layout.css.background-blend-mode.enabled,true) == background-blend-mode-body-image.html background-blend-mode-body-image-ref.html
-fuzzy-if(Android,4,768) fuzzy-if(gtkWidget,1,132) fuzzy-if(skiaContent,1,800) pref(layout.css.background-blend-mode.enabled,true) == background-blend-mode-body-transparent-image.html background-blend-mode-body-transparent-image-ref.html
+fuzzy-if(gtkWidget,1,132) fuzzy-if(skiaContent,1,800) pref(layout.css.background-blend-mode.enabled,true) == background-blend-mode-body-transparent-image.html background-blend-mode-body-transparent-image-ref.html
pref(layout.css.background-blend-mode.enabled,true) == background-blending-moz-element.html background-blending-moz-element-ref.html
diff --git a/layout/reftests/css-break/reftest-stylo.list b/layout/reftests/css-break/reftest-stylo.list
deleted file mode 100644
index 4bc15ab56..000000000
--- a/layout/reftests/css-break/reftest-stylo.list
+++ /dev/null
@@ -1,13 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-default-preferences pref(layout.css.box-decoration-break.enabled,true)
-
-== box-decoration-break-1.html box-decoration-break-1.html
-== box-decoration-break-with-inset-box-shadow-1.html box-decoration-break-with-inset-box-shadow-1.html
-fuzzy-if(Android,10,3673) fuzzy-if(skiaContent,32,254) == box-decoration-break-with-outset-box-shadow-1.html box-decoration-break-with-outset-box-shadow-1.html
-random-if(!gtkWidget) HTTP(..) == box-decoration-break-border-image.html box-decoration-break-border-image.html
-== box-decoration-break-block-border-padding.html box-decoration-break-block-border-padding.html
-== box-decoration-break-block-margin.html box-decoration-break-block-margin.html
-fails fuzzy-if(!Android,1,5) fuzzy-if(Android,8,6627) fuzzy-if(skiaContent,1,24) == box-decoration-break-first-letter.html box-decoration-break-first-letter.html
-== box-decoration-break-with-bidi.html box-decoration-break-with-bidi.html
-== box-decoration-break-bug-1235152.html box-decoration-break-bug-1235152.html
-== box-decoration-break-bug-1249913.html box-decoration-break-bug-1249913.html
diff --git a/layout/reftests/css-break/reftest.list b/layout/reftests/css-break/reftest.list
index 5b53e56da..caf3bb60a 100644
--- a/layout/reftests/css-break/reftest.list
+++ b/layout/reftests/css-break/reftest.list
@@ -2,11 +2,11 @@ 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) == box-decoration-break-with-inset-box-shadow-1.html box-decoration-break-with-inset-box-shadow-1-ref.html
-fuzzy(16,460) fuzzy-if(Android,10,3673) fuzzy-if(skiaContent,32,254) fuzzy-if(winWidget,32,152) == box-decoration-break-with-outset-box-shadow-1.html box-decoration-break-with-outset-box-shadow-1-ref.html
+fuzzy(16,460) fuzzy-if(skiaContent,32,254) fuzzy-if(winWidget,32,152) == box-decoration-break-with-outset-box-shadow-1.html box-decoration-break-with-outset-box-shadow-1-ref.html
random-if(!gtkWidget) HTTP(..) == 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
== box-decoration-break-block-margin.html box-decoration-break-block-margin-ref.html
-fuzzy-if(!Android,1,62) fuzzy-if(Android,8,6627) == box-decoration-break-first-letter.html box-decoration-break-first-letter-ref.html #Bug 1313773
+fuzzy(1,62) == box-decoration-break-first-letter.html box-decoration-break-first-letter-ref.html #Bug 1313773
== box-decoration-break-with-bidi.html box-decoration-break-with-bidi-ref.html
== box-decoration-break-bug-1235152.html box-decoration-break-bug-1235152-ref.html
== box-decoration-break-bug-1249913.html box-decoration-break-bug-1249913-ref.html
diff --git a/layout/reftests/css-calc/reftest-stylo.list b/layout/reftests/css-calc/reftest-stylo.list
deleted file mode 100644
index 9a3006f3e..000000000
--- a/layout/reftests/css-calc/reftest-stylo.list
+++ /dev/null
@@ -1,3 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== background-image-gradient-1.html background-image-gradient-1.html
-== line-height-1.html line-height-1.html
diff --git a/layout/reftests/css-charset/reftest-stylo.list b/layout/reftests/css-charset/reftest-stylo.list
deleted file mode 100644
index 34bce869d..000000000
--- a/layout/reftests/css-charset/reftest-stylo.list
+++ /dev/null
@@ -1,11 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== test-attribute.html test-attribute.html
-== test-charset-quotes.html test-charset-quotes.html
-== test-charset-leading-space.html test-charset-leading-space.html
-== test-charset-trailing-space.html test-charset-trailing-space.html
-== test-charset-utf-16-le-no-bom.html test-charset-utf-16-le-no-bom.html
-== test-charset-utf-16-le-bom.html test-charset-utf-16-le-bom.html
-== test-charset-utf-16-bom-le.html test-charset-utf-16-bom-le.html
-== test-charset-utf-16-be-no-bom.html test-charset-utf-16-be-no-bom.html
-== test-charset-utf-16-be-bom.html test-charset-utf-16-be-bom.html
-== test-charset-utf-16-bom-be.html test-charset-utf-16-bom-be.html
diff --git a/layout/reftests/css-default/reftest-stylo.list b/layout/reftests/css-default/reftest-stylo.list
deleted file mode 100644
index 37682d461..000000000
--- a/layout/reftests/css-default/reftest-stylo.list
+++ /dev/null
@@ -1,3 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# submit button default tests
-include submit-button/reftest-stylo.list
diff --git a/layout/reftests/css-default/submit-button/reftest-stylo.list b/layout/reftests/css-default/submit-button/reftest-stylo.list
deleted file mode 100644
index d2ce67afc..000000000
--- a/layout/reftests/css-default/submit-button/reftest-stylo.list
+++ /dev/null
@@ -1,12 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== default-submit-button-1.html default-submit-button-1.html
-== default-submit-button-2.html default-submit-button-2.html
-== default-submit-button-3.html default-submit-button-3.html
-== default-submit-button-4.html default-submit-button-4.html
-== default-submit-button-5.html default-submit-button-5.html
-== default-submit-button-6.html default-submit-button-6.html
-== default-submit-button-7.html default-submit-button-7.html
-
-== default-multiple-submit-1.html default-multiple-submit-1.html
-== default-multiple-submit-2.html default-multiple-submit-2.html
-
diff --git a/layout/reftests/css-disabled/button/reftest-stylo.list b/layout/reftests/css-disabled/button/reftest-stylo.list
deleted file mode 100644
index ae9af02ea..000000000
--- a/layout/reftests/css-disabled/button/reftest-stylo.list
+++ /dev/null
@@ -1,14 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== button-fieldset-1.html button-fieldset-1.html
-fails-if(B2G||Mulet) fuzzy-if(skiaContent,1,7) == button-fieldset-2.html button-fieldset-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(B2G||Mulet) fuzzy-if(skiaContent,1,7) == button-fieldset-3.html button-fieldset-3.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails fuzzy-if(skiaContent,1,7) == button-fieldset-4.html button-fieldset-4.html
-== button-fieldset-legend-1.html button-fieldset-legend-1.html
-fails-if(B2G||Mulet) == button-fieldset-legend-2.html button-fieldset-legend-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(B2G||Mulet) == button-fieldset-legend-3.html button-fieldset-legend-3.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== button-fieldset-legend-4.html button-fieldset-legend-4.html
-== button-fieldset-legend-5.html button-fieldset-legend-5.html
diff --git a/layout/reftests/css-disabled/fieldset/reftest-stylo.list b/layout/reftests/css-disabled/fieldset/reftest-stylo.list
deleted file mode 100644
index ce458358f..000000000
--- a/layout/reftests/css-disabled/fieldset/reftest-stylo.list
+++ /dev/null
@@ -1,12 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== fieldset-enabled.html fieldset-enabled.html
-fuzzy-if(skiaContent,2,5) == fieldset-disabled.html fieldset-disabled.html
-== fieldset-fieldset-1.html fieldset-fieldset-1.html
-fuzzy-if(skiaContent,1,11) == fieldset-fieldset-2.html fieldset-fieldset-2.html
-fuzzy-if(skiaContent,1,11) == fieldset-fieldset-3.html fieldset-fieldset-3.html
-fails fuzzy-if(skiaContent,1,11) == fieldset-fieldset-4.html fieldset-fieldset-4.html
-== fieldset-legend-1.html fieldset-legend-1.html
-== fieldset-legend-2.html fieldset-legend-2.html
-== fieldset-legend-3.html fieldset-legend-3.html
-== fieldset-legend-4.html fieldset-legend-4.html
-== fieldset-legend-5.html fieldset-legend-5.html
diff --git a/layout/reftests/css-disabled/input/reftest-stylo.list b/layout/reftests/css-disabled/input/reftest-stylo.list
deleted file mode 100644
index 1098da7ea..000000000
--- a/layout/reftests/css-disabled/input/reftest-stylo.list
+++ /dev/null
@@ -1,10 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== input-fieldset-1.html input-fieldset-1.html
-fuzzy-if(skiaContent,1,7) == input-fieldset-2.html input-fieldset-2.html
-fuzzy-if(skiaContent,1,7) == input-fieldset-3.html input-fieldset-3.html
-fails fuzzy-if(skiaContent,1,7) == input-fieldset-4.html input-fieldset-4.html
-== input-fieldset-legend-1.html input-fieldset-legend-1.html
-== input-fieldset-legend-2.html input-fieldset-legend-2.html
-== input-fieldset-legend-3.html input-fieldset-legend-3.html
-== input-fieldset-legend-4.html input-fieldset-legend-4.html
-== input-fieldset-legend-5.html input-fieldset-legend-5.html
diff --git a/layout/reftests/css-disabled/label/reftest-stylo.list b/layout/reftests/css-disabled/label/reftest-stylo.list
deleted file mode 100644
index d6630943f..000000000
--- a/layout/reftests/css-disabled/label/reftest-stylo.list
+++ /dev/null
@@ -1,2 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== label.html label.html
diff --git a/layout/reftests/css-disabled/object/reftest-stylo.list b/layout/reftests/css-disabled/object/reftest-stylo.list
deleted file mode 100644
index 95bf97bca..000000000
--- a/layout/reftests/css-disabled/object/reftest-stylo.list
+++ /dev/null
@@ -1,2 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== object.html object.html
diff --git a/layout/reftests/css-disabled/output/reftest-stylo.list b/layout/reftests/css-disabled/output/reftest-stylo.list
deleted file mode 100644
index 68e7140dd..000000000
--- a/layout/reftests/css-disabled/output/reftest-stylo.list
+++ /dev/null
@@ -1,2 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== output.html output.html
diff --git a/layout/reftests/css-disabled/reftest-stylo.list b/layout/reftests/css-disabled/reftest-stylo.list
deleted file mode 100644
index 126670dbf..000000000
--- a/layout/reftests/css-disabled/reftest-stylo.list
+++ /dev/null
@@ -1,9 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-include fieldset/reftest-stylo.list
-include input/reftest-stylo.list
-include button/reftest-stylo.list
-include textarea/reftest-stylo.list
-include select/reftest-stylo.list
-include object/reftest-stylo.list
-include label/reftest-stylo.list
-include output/reftest-stylo.list
diff --git a/layout/reftests/css-disabled/select/reftest-stylo.list b/layout/reftests/css-disabled/select/reftest-stylo.list
deleted file mode 100644
index b9b5740c7..000000000
--- a/layout/reftests/css-disabled/select/reftest-stylo.list
+++ /dev/null
@@ -1,14 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== select-fieldset-1.html select-fieldset-1.html
-fails-if(Android||B2G||Mulet) fuzzy-if(skiaContent,2,17) == select-fieldset-2.html select-fieldset-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(Android||B2G||Mulet) fuzzy-if(skiaContent,2,17) == select-fieldset-3.html select-fieldset-3.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(Android) fuzzy-if(skiaContent,2,13) == select-fieldset-4.html select-fieldset-4.html
-== select-fieldset-legend-1.html select-fieldset-legend-1.html
-fails-if(Android||B2G||Mulet) fuzzy-if(skiaContent,2,6) == select-fieldset-legend-2.html select-fieldset-legend-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(Android||B2G||Mulet) fuzzy-if(skiaContent,2,8) == select-fieldset-legend-3.html select-fieldset-legend-3.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fuzzy-if(skiaContent,2,12) == select-fieldset-legend-4.html select-fieldset-legend-4.html
-fuzzy-if(skiaContent,2,5) == select-fieldset-legend-5.html select-fieldset-legend-5.html
diff --git a/layout/reftests/css-disabled/select/reftest.list b/layout/reftests/css-disabled/select/reftest.list
index 700f06471..484311046 100644
--- a/layout/reftests/css-disabled/select/reftest.list
+++ b/layout/reftests/css-disabled/select/reftest.list
@@ -1,9 +1,9 @@
-fuzzy-if(Android,12,1) == select-fieldset-1.html select-fieldset-ref.html
-fails-if(Android) fuzzy-if(skiaContent&&!Android,2,17) == select-fieldset-2.html select-fieldset-ref-disabled.html
-fails-if(Android) fuzzy-if(skiaContent&&!Android,2,17) == select-fieldset-3.html select-fieldset-ref-disabled.html
-fails-if(Android) fuzzy-if(skiaContent&&!Android,2,13) == select-fieldset-4.html select-fieldset-ref.html
+== select-fieldset-1.html select-fieldset-ref.html
+fuzzy-if(skiaContent,2,17) == select-fieldset-2.html select-fieldset-ref-disabled.html
+fuzzy-if(skiaContent,2,17) == select-fieldset-3.html select-fieldset-ref-disabled.html
+fuzzy-if(skiaContent,2,13) == select-fieldset-4.html select-fieldset-ref.html
== select-fieldset-legend-1.html select-fieldset-legend-ref-1.html
-fails-if(Android) fuzzy-if(skiaContent&&!Android,2,6) == select-fieldset-legend-2.html select-fieldset-legend-ref-2.html
-fails-if(Android) fuzzy-if(skiaContent&&!Android,2,8) == select-fieldset-legend-3.html select-fieldset-legend-ref-3.html
+fuzzy-if(skiaContent,2,6) == select-fieldset-legend-2.html select-fieldset-legend-ref-2.html
+fuzzy-if(skiaContent,2,8) == select-fieldset-legend-3.html select-fieldset-legend-ref-3.html
fuzzy-if(skiaContent,2,12) == select-fieldset-legend-4.html select-fieldset-legend-ref-4.html
fuzzy-if(skiaContent,2,5) == select-fieldset-legend-5.html select-fieldset-legend-ref-5.html
diff --git a/layout/reftests/css-disabled/textarea/reftest-stylo.list b/layout/reftests/css-disabled/textarea/reftest-stylo.list
deleted file mode 100644
index 46e598475..000000000
--- a/layout/reftests/css-disabled/textarea/reftest-stylo.list
+++ /dev/null
@@ -1,10 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-fuzzy-if(skiaContent,1,10) == textarea-fieldset-1.html textarea-fieldset-1.html
-== textarea-fieldset-2.html textarea-fieldset-2.html
-== textarea-fieldset-3.html textarea-fieldset-3.html
-== textarea-fieldset-4.html textarea-fieldset-4.html
-fuzzy-if(skiaContent,1,5) == textarea-fieldset-legend-1.html textarea-fieldset-legend-1.html
-fuzzy-if(skiaContent,1,5) == textarea-fieldset-legend-2.html textarea-fieldset-legend-2.html
-fuzzy-if(skiaContent,1,5) == textarea-fieldset-legend-3.html textarea-fieldset-legend-3.html
-fuzzy-if(skiaContent,1,5) == textarea-fieldset-legend-4.html textarea-fieldset-legend-4.html
-fuzzy-if(skiaContent,1,5) == textarea-fieldset-legend-5.html textarea-fieldset-legend-5.html
diff --git a/layout/reftests/css-display/display-contents-shadow-dom-1-ref.html b/layout/reftests/css-display/display-contents-shadow-dom-1-ref.html
index f57822901..6e6dad233 100644
--- a/layout/reftests/css-display/display-contents-shadow-dom-1-ref.html
+++ b/layout/reftests/css-display/display-contents-shadow-dom-1-ref.html
@@ -45,8 +45,6 @@ span { color:blue; }
<span style="color:green">R</span>
<div></div>
<b style="color:green">V</b>
- <b style="color:green">W</b>
- <b style="color:green">X</b>
<!-- <b style="color:green">Y</b> -->
</body>
</html>
diff --git a/layout/reftests/css-display/display-contents-shadow-dom-1.html b/layout/reftests/css-display/display-contents-shadow-dom-1.html
index f5e49a192..6c0f297f9 100644
--- a/layout/reftests/css-display/display-contents-shadow-dom-1.html
+++ b/layout/reftests/css-display/display-contents-shadow-dom-1.html
@@ -51,8 +51,6 @@ div.after::after {content: " Y";}
<div id="hostT" class="c">T</div>
<div id="hostU"><span class="c">U</span></div>
<div id="hostV" class="c" style="color:red"><b class="c" style="color:inherit">V</b></div>
- <div id="hostW" class="c" style="color:red"><b class="c" style="color:inherit">W</b></div>
- <span id="hostX" style="color:red"><b class="c" style="color:inherit">X</b></span>
<!-- TODO(bug 1021572?) <div id="hostY" class="c" style="color:red"><b>Y</b></div> -->
<script>
@@ -76,38 +74,40 @@ div.after::after {content: " Y";}
return e;
}
- document.body.offsetHeight;
-
- shadow("host1").innerHTML = '<content></content> c';
- shadow("host2").innerHTML = 'a <content style="display:contents"></content> c';
- shadow("host3").innerHTML = 'a <content style="display:contents"></content>';
- shadow("host4").innerHTML = '<content style="display:contents"></content>';
- shadow("host5").innerHTML = 'a <content style="display:contents"></content>';
- shadow("host6").innerHTML = '<z style="color:blue; display:contents"><content></content></z> c';
- shadow("host7").innerHTML = 'a <content style="display:contents"></content> c';
- shadow("host8").innerHTML = 'a <z style="color:blue; display:contents"><content style="display:contents"></z></content>';
- shadow("host9").innerHTML = '<content style="display:contents"></content>';
- shadow("hostA").innerHTML = 'a <content style="display:contents"></content>';
- shadow("hostB").innerHTML = 'a <content select=".c"></content> <content select=".b"></content> B';
- shadow("hostC").innerHTML = 'A <content select=".c"></content> <content select=".b"></content> B';
- shadow("hostD").innerHTML = 'A <content select=".c"></content> <content select=".b"></content> B <content select=".b"></content>';
- shadow("hostE").innerHTML = 'A <content select=".c"></content> <content select=".b"></content> B';
- shadow("hostF").innerHTML = '<content select=".c"></content> <content select=".b"></content> B';
- shadow("hostG").innerHTML = '<content select=".b"></content>';
- shadow("hostH").innerHTML = '<content select=".b"></content>';
- shadow("hostI").innerHTML = 'A<content select=".b"></content>';
- shadow("hostJ").innerHTML = 'A<content select=".b"></content>';
- shadow("hostK").innerHTML = '<content select=".b"></content>';
- shadow("hostL").innerHTML = '<content select=".b"></content>';
- shadow("hostM").innerHTML = '<content select="b"></content><content select="i"></content>';
- shadow("hostN").innerHTML = '<content select="b"></content><content select="i"></content>';
- shadow("hostO").innerHTML = '<content select="b"></content><content select="i"></content>';
- shadow("hostP").innerHTML = '<content select="b"></content><content select="i"></content>';
- shadow("hostQ").innerHTML = '<content select="b"></content><content select="i"></content>';
- shadow("hostR").innerHTML = '<content select="span"></content>';
- shadow("hostW").innerHTML = '<z style="color:red"><content select="b"></content></z>';
- shadow("hostX").innerHTML = '<z style="color:red"><content select="b"></content></z>';
- // TODO(bug 1021572?) shadow("hostY").innerHTML = '<content select="b"><style scoped>:scope{color:green}</style></content>';
+ function run() {
+ document.body.offsetHeight;
+
+ shadow("host1").innerHTML = '<content></content> c';
+ shadow("host2").innerHTML = 'a <content style="display:contents"></content> c';
+ shadow("host3").innerHTML = 'a <content style="display:contents"></content>';
+ shadow("host4").innerHTML = '<content style="display:contents"></content>';
+ shadow("host5").innerHTML = 'a <content style="display:contents"></content>';
+ shadow("host6").innerHTML = '<z style="color:blue; display:contents"><content></content></z> c';
+ shadow("host7").innerHTML = 'a <content style="display:contents"></content> c';
+ shadow("host8").innerHTML = 'a <z style="color:blue; display:contents"><content style="display:contents"></z></content>';
+ shadow("host9").innerHTML = '<content style="display:contents"></content>';
+ shadow("hostA").innerHTML = 'a <content style="display:contents"></content>';
+ shadow("hostB").innerHTML = 'a <content select=".c"></content> <content select=".b"></content> B';
+ shadow("hostC").innerHTML = 'A <content select=".c"></content> <content select=".b"></content> B';
+ shadow("hostD").innerHTML = 'A <content select=".c"></content> <content select=".b"></content> B <content select=".b"></content>';
+ shadow("hostE").innerHTML = 'A <content select=".c"></content> <content select=".b"></content> B';
+ shadow("hostF").innerHTML = '<content select=".c"></content> <content select=".b"></content> B';
+ shadow("hostG").innerHTML = '<content select=".b"></content>';
+ shadow("hostH").innerHTML = '<content select=".b"></content>';
+ shadow("hostI").innerHTML = 'A<content select=".b"></content>';
+ shadow("hostJ").innerHTML = 'A<content select=".b"></content>';
+ shadow("hostK").innerHTML = '<content select=".b"></content>';
+ shadow("hostL").innerHTML = '<content select=".b"></content>';
+ shadow("hostM").innerHTML = '<content select="b"></content><content select="i"></content>';
+ shadow("hostN").innerHTML = '<content select="b"></content><content select="i"></content>';
+ shadow("hostO").innerHTML = '<content select="b"></content><content select="i"></content>';
+ shadow("hostP").innerHTML = '<content select="b"></content><content select="i"></content>';
+ shadow("hostQ").innerHTML = '<content select="b"></content><content select="i"></content>';
+ shadow("hostR").innerHTML = '<content select="span"></content>';
+ shadow("hostW").innerHTML = '<z style="color:red"><content select="b"></content></z>';
+ shadow("hostX").innerHTML = '<z style="color:red"><content select="b"></content></z>';
+ // TODO(bug 1021572?) shadow("hostY").innerHTML = '<content select="b"><style scoped>:scope{color:green}</style></content>';
+ }
function tweak() {
document.body.offsetHeight;
@@ -222,15 +222,18 @@ div.after::after {content: " Y";}
shadow("hostT");
shadow("hostU");
shadow("hostV").innerHTML = '<z style="color:green"><content select="b"></content></z>';
- shadow("hostW").innerHTML = '<z style="color:green"><content select="b"></content></z>';
- shadow("hostX").innerHTML = '<z style="color:green"><content select="b"></content></z>';
document.body.offsetHeight;
document.documentElement.removeAttribute("class");
},0);
}
- window.addEventListener("MozReftestInvalidate", tweak, false);
+ if (document.body.createShadowRoot) {
+ run();
+ window.addEventListener("MozReftestInvalidate", tweak, false);
+ } else {
+ document.documentElement.removeAttribute("class");
+ }
</script>
</body>
</html>
diff --git a/layout/reftests/css-display/reftest-stylo.list b/layout/reftests/css-display/reftest-stylo.list
deleted file mode 100644
index 8f7e66498..000000000
--- a/layout/reftests/css-display/reftest-stylo.list
+++ /dev/null
@@ -1,37 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# Tests for CSS Display spec features.
-# http://dev.w3.org/csswg/css-display
-
-fuzzy-if(Android,8,604) pref(layout.css.display-contents.enabled,true) == display-contents-acid.html display-contents-acid.html
-random pref(layout.css.display-contents.enabled,true) == display-contents-acid-dyn-1.html display-contents-acid-dyn-1.html
-random pref(layout.css.display-contents.enabled,true) == display-contents-acid-dyn-2.html display-contents-acid-dyn-2.html
-random pref(layout.css.display-contents.enabled,true) == display-contents-acid-dyn-3.html display-contents-acid-dyn-3.html
-pref(layout.css.display-contents.enabled,true) == display-contents-generated-content.html display-contents-generated-content.html
-pref(layout.css.display-contents.enabled,true) == display-contents-generated-content-2.html display-contents-generated-content-2.html
-pref(layout.css.display-contents.enabled,true) == display-contents-style-inheritance-1.html display-contents-style-inheritance-1.html
-skip pref(layout.css.display-contents.enabled,true) == display-contents-style-inheritance-1-stylechange.html display-contents-style-inheritance-1-stylechange.html
-skip pref(layout.css.display-contents.enabled,true) fuzzy-if(winWidget,12,100) == display-contents-style-inheritance-1-dom-mutations.html display-contents-style-inheritance-1-dom-mutations.html
-pref(layout.css.display-contents.enabled,true) == display-contents-tables.xhtml display-contents-tables.xhtml
-pref(layout.css.display-contents.enabled,true) == display-contents-tables-2.xhtml display-contents-tables-2.xhtml
-pref(layout.css.display-contents.enabled,true) == display-contents-tables-3.xhtml display-contents-tables-3.xhtml
-pref(layout.css.display-contents.enabled,true) == display-contents-visibility-hidden.html display-contents-visibility-hidden.html
-pref(layout.css.display-contents.enabled,true) == display-contents-visibility-hidden-2.html display-contents-visibility-hidden-2.html
-random pref(layout.css.display-contents.enabled,true) == display-contents-495385-2d.html display-contents-495385-2d.html
-skip-if(B2G||Mulet) fuzzy-if(Android,7,3935) pref(layout.css.display-contents.enabled,true) == display-contents-xbl.xhtml display-contents-xbl.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-# fuzzy-if(Android,7,1186) pref(layout.css.display-contents.enabled,true) pref(dom.webcomponents.enabled,true) == display-contents-shadow-dom-1.html display-contents-shadow-dom-1.html
-skip-if(B2G||Mulet) pref(layout.css.display-contents.enabled,true) == display-contents-xbl-2.xul display-contents-xbl-2.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) asserts(1) pref(layout.css.display-contents.enabled,true) == display-contents-xbl-3.xul display-contents-xbl-3.xul
-# bug 1089223
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip pref(layout.css.display-contents.enabled,true) == display-contents-xbl-4.xul display-contents-xbl-4.xul
-# fails (not just asserts) due to bug 1089223
-asserts(0-1) fuzzy-if(Android,8,3216) pref(layout.css.display-contents.enabled,true) == display-contents-fieldset.html display-contents-fieldset.html
-# bug 1089223
-skip-if(B2G||Mulet) asserts(1) pref(layout.css.display-contents.enabled,true) == display-contents-xbl-5.xul display-contents-xbl-5.xul
-# bug 1089223
-# Initial mulet triage: parity with B2G/B2G Desktop
-pref(layout.css.display-contents.enabled,true) == display-contents-list-item-child.html display-contents-list-item-child.html
-pref(layout.css.display-contents.enabled,true) == display-contents-writing-mode-1.html display-contents-writing-mode-1.html
-pref(layout.css.display-contents.enabled,true) == display-contents-writing-mode-2.html display-contents-writing-mode-2.html
diff --git a/layout/reftests/css-display/reftest.list b/layout/reftests/css-display/reftest.list
index 00f46a80b..933ea2d3b 100644
--- a/layout/reftests/css-display/reftest.list
+++ b/layout/reftests/css-display/reftest.list
@@ -1,10 +1,10 @@
# Tests for CSS Display spec features.
# http://dev.w3.org/csswg/css-display
-fuzzy-if(Android,8,604) pref(layout.css.display-contents.enabled,true) == display-contents-acid.html display-contents-acid-ref.html
-fuzzy-if(Android,8,604) pref(layout.css.display-contents.enabled,true) == display-contents-acid-dyn-1.html display-contents-acid-ref.html
-fuzzy-if(Android,8,604) pref(layout.css.display-contents.enabled,true) == display-contents-acid-dyn-2.html display-contents-acid-ref.html
-fuzzy-if(Android,8,604) pref(layout.css.display-contents.enabled,true) == display-contents-acid-dyn-3.html display-contents-acid-ref.html
+pref(layout.css.display-contents.enabled,true) == display-contents-acid.html display-contents-acid-ref.html
+pref(layout.css.display-contents.enabled,true) == display-contents-acid-dyn-1.html display-contents-acid-ref.html
+pref(layout.css.display-contents.enabled,true) == display-contents-acid-dyn-2.html display-contents-acid-ref.html
+pref(layout.css.display-contents.enabled,true) == display-contents-acid-dyn-3.html display-contents-acid-ref.html
pref(layout.css.display-contents.enabled,true) == display-contents-generated-content.html display-contents-generated-content-ref.html
pref(layout.css.display-contents.enabled,true) == display-contents-generated-content-2.html display-contents-generated-content-ref.html
pref(layout.css.display-contents.enabled,true) == display-contents-style-inheritance-1.html display-contents-style-inheritance-1-ref.html
@@ -16,12 +16,12 @@ pref(layout.css.display-contents.enabled,true) == display-contents-tables-3.xhtm
pref(layout.css.display-contents.enabled,true) == display-contents-visibility-hidden.html display-contents-visibility-hidden-ref.html
pref(layout.css.display-contents.enabled,true) == display-contents-visibility-hidden-2.html display-contents-visibility-hidden-ref.html
pref(layout.css.display-contents.enabled,true) == display-contents-495385-2d.html display-contents-495385-2d-ref.html
-fuzzy-if(Android,7,3935) pref(layout.css.display-contents.enabled,true) == display-contents-xbl.xhtml display-contents-xbl-ref.html
-fuzzy-if(Android,7,1186) pref(layout.css.display-contents.enabled,true) pref(dom.webcomponents.enabled,true) == display-contents-shadow-dom-1.html display-contents-shadow-dom-1-ref.html
+pref(layout.css.display-contents.enabled,true) == display-contents-xbl.xhtml display-contents-xbl-ref.html
+pref(layout.css.display-contents.enabled,true) pref(dom.webcomponents.enabled,true) == display-contents-shadow-dom-1.html display-contents-shadow-dom-1-ref.html
pref(layout.css.display-contents.enabled,true) == display-contents-xbl-2.xul display-contents-xbl-2-ref.xul
asserts(1) pref(layout.css.display-contents.enabled,true) == display-contents-xbl-3.xul display-contents-xbl-3-ref.xul # bug 1089223
skip pref(layout.css.display-contents.enabled,true) == display-contents-xbl-4.xul display-contents-xbl-4-ref.xul # fails (not just asserts) due to bug 1089223
-asserts(0-1) fuzzy-if(Android,8,3216) pref(layout.css.display-contents.enabled,true) == display-contents-fieldset.html display-contents-fieldset-ref.html # bug 1089223
+asserts(0-1) pref(layout.css.display-contents.enabled,true) == display-contents-fieldset.html display-contents-fieldset-ref.html # bug 1089223
asserts(1) pref(layout.css.display-contents.enabled,true) == display-contents-xbl-5.xul display-contents-xbl-3-ref.xul # bug 1089223
pref(layout.css.display-contents.enabled,true) == display-contents-list-item-child.html display-contents-list-item-child-ref.html
pref(layout.css.display-contents.enabled,true) == display-contents-dyn-insert-text.html display-contents-dyn-insert-text-ref.html
diff --git a/layout/reftests/css-enabled/button/reftest-stylo.list b/layout/reftests/css-enabled/button/reftest-stylo.list
deleted file mode 100644
index 1ff75682f..000000000
--- a/layout/reftests/css-enabled/button/reftest-stylo.list
+++ /dev/null
@@ -1,14 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-fuzzy-if(skiaContent,1,3) == button-fieldset-1.html button-fieldset-1.html
-fails-if(B2G||Mulet) == button-fieldset-2.html button-fieldset-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(B2G||Mulet) fuzzy-if(skiaContent,1,7) == button-fieldset-3.html button-fieldset-3.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails fuzzy-if(skiaContent,1,7) == button-fieldset-4.html button-fieldset-4.html
-== button-fieldset-legend-1.html button-fieldset-legend-1.html
-fails-if(B2G||Mulet) fuzzy-if(skiaContent,2,4) == button-fieldset-legend-2.html button-fieldset-legend-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(B2G||Mulet) fuzzy-if(skiaContent,1,3) == button-fieldset-legend-3.html button-fieldset-legend-3.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fuzzy-if(skiaContent,2,9) == button-fieldset-legend-4.html button-fieldset-legend-4.html
-fuzzy-if(skiaContent,2,5) == button-fieldset-legend-5.html button-fieldset-legend-5.html
diff --git a/layout/reftests/css-enabled/fieldset/reftest-stylo.list b/layout/reftests/css-enabled/fieldset/reftest-stylo.list
deleted file mode 100644
index 6e4ec501f..000000000
--- a/layout/reftests/css-enabled/fieldset/reftest-stylo.list
+++ /dev/null
@@ -1,12 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== fieldset-enabled.html fieldset-enabled.html
-== fieldset-disabled.html fieldset-disabled.html
-== fieldset-fieldset-1.html fieldset-fieldset-1.html
-== fieldset-fieldset-2.html fieldset-fieldset-2.html
-fuzzy-if(skiaContent,1,11) == fieldset-fieldset-3.html fieldset-fieldset-3.html
-fails fuzzy-if(skiaContent,1,11) == fieldset-fieldset-4.html fieldset-fieldset-4.html
-== fieldset-legend-1.html fieldset-legend-1.html
-fuzzy-if(skiaContent,1,2) == fieldset-legend-2.html fieldset-legend-2.html
-fuzzy-if(skiaContent,2,5) == fieldset-legend-3.html fieldset-legend-3.html
-fuzzy-if(skiaContent,2,9) == fieldset-legend-4.html fieldset-legend-4.html
-fuzzy-if(skiaContent,2,5) == fieldset-legend-5.html fieldset-legend-5.html
diff --git a/layout/reftests/css-enabled/input/reftest-stylo.list b/layout/reftests/css-enabled/input/reftest-stylo.list
deleted file mode 100644
index 724e9cd7a..000000000
--- a/layout/reftests/css-enabled/input/reftest-stylo.list
+++ /dev/null
@@ -1,10 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== input-fieldset-1.html input-fieldset-1.html
-== input-fieldset-2.html input-fieldset-2.html
-fuzzy-if(skiaContent,1,7) == input-fieldset-3.html input-fieldset-3.html
-fails fuzzy-if(skiaContent,1,7) == input-fieldset-4.html input-fieldset-4.html
-== input-fieldset-legend-1.html input-fieldset-legend-1.html
-fuzzy-if(skiaContent,2,4) == input-fieldset-legend-2.html input-fieldset-legend-2.html
-fuzzy-if(skiaContent,2,5) == input-fieldset-legend-3.html input-fieldset-legend-3.html
-fuzzy-if(skiaContent,2,9) == input-fieldset-legend-4.html input-fieldset-legend-4.html
-fuzzy-if(skiaContent,2,5) == input-fieldset-legend-5.html input-fieldset-legend-5.html
diff --git a/layout/reftests/css-enabled/label/reftest-stylo.list b/layout/reftests/css-enabled/label/reftest-stylo.list
deleted file mode 100644
index d6630943f..000000000
--- a/layout/reftests/css-enabled/label/reftest-stylo.list
+++ /dev/null
@@ -1,2 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== label.html label.html
diff --git a/layout/reftests/css-enabled/object/reftest-stylo.list b/layout/reftests/css-enabled/object/reftest-stylo.list
deleted file mode 100644
index 95bf97bca..000000000
--- a/layout/reftests/css-enabled/object/reftest-stylo.list
+++ /dev/null
@@ -1,2 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== object.html object.html
diff --git a/layout/reftests/css-enabled/optgroup/reftest-stylo.list b/layout/reftests/css-enabled/optgroup/reftest-stylo.list
deleted file mode 100644
index 49d455343..000000000
--- a/layout/reftests/css-enabled/optgroup/reftest-stylo.list
+++ /dev/null
@@ -1,2 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-fuzzy-if(skiaContent,1,2) == optgroup-fieldset-1.html optgroup-fieldset-1.html
diff --git a/layout/reftests/css-enabled/option/reftest-stylo.list b/layout/reftests/css-enabled/option/reftest-stylo.list
deleted file mode 100644
index 113e2240e..000000000
--- a/layout/reftests/css-enabled/option/reftest-stylo.list
+++ /dev/null
@@ -1,2 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== option-fieldset-1.html option-fieldset-1.html
diff --git a/layout/reftests/css-enabled/output/reftest-stylo.list b/layout/reftests/css-enabled/output/reftest-stylo.list
deleted file mode 100644
index 68e7140dd..000000000
--- a/layout/reftests/css-enabled/output/reftest-stylo.list
+++ /dev/null
@@ -1,2 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== output.html output.html
diff --git a/layout/reftests/css-enabled/reftest-stylo.list b/layout/reftests/css-enabled/reftest-stylo.list
deleted file mode 100644
index 09a1adf4e..000000000
--- a/layout/reftests/css-enabled/reftest-stylo.list
+++ /dev/null
@@ -1,11 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-include fieldset/reftest-stylo.list
-include input/reftest-stylo.list
-include button/reftest-stylo.list
-include textarea/reftest-stylo.list
-include select/reftest-stylo.list
-include option/reftest-stylo.list
-include optgroup/reftest-stylo.list
-include object/reftest-stylo.list
-include label/reftest-stylo.list
-include output/reftest-stylo.list
diff --git a/layout/reftests/css-enabled/select/reftest-stylo.list b/layout/reftests/css-enabled/select/reftest-stylo.list
deleted file mode 100644
index 67824bf0a..000000000
--- a/layout/reftests/css-enabled/select/reftest-stylo.list
+++ /dev/null
@@ -1,14 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== select-fieldset-1.html select-fieldset-1.html
-fails-if(B2G||Mulet) fuzzy-if(skiaContent,1,9) == select-fieldset-2.html select-fieldset-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(B2G||Mulet) == select-fieldset-3.html select-fieldset-3.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails fuzzy-if(skiaContent,1,9) == select-fieldset-4.html select-fieldset-4.html
-== select-fieldset-legend-1.html select-fieldset-legend-1.html
-fails-if(B2G||Mulet) fuzzy-if(skiaContent,2,4) == select-fieldset-legend-2.html select-fieldset-legend-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(B2G||Mulet) fuzzy-if(skiaContent,2,5) == select-fieldset-legend-3.html select-fieldset-legend-3.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fuzzy-if(skiaContent,2,9) == select-fieldset-legend-4.html select-fieldset-legend-4.html
-fuzzy-if(skiaContent,2,5) == select-fieldset-legend-5.html select-fieldset-legend-5.html
diff --git a/layout/reftests/css-enabled/textarea/reftest-stylo.list b/layout/reftests/css-enabled/textarea/reftest-stylo.list
deleted file mode 100644
index 9a65675f5..000000000
--- a/layout/reftests/css-enabled/textarea/reftest-stylo.list
+++ /dev/null
@@ -1,10 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-fuzzy-if(skiaContent,1,5) == textarea-fieldset-1.html textarea-fieldset-1.html
-fuzzy-if(skiaContent,1,5) == textarea-fieldset-2.html textarea-fieldset-2.html
-== textarea-fieldset-3.html textarea-fieldset-3.html
-== textarea-fieldset-4.html textarea-fieldset-4.html
-fuzzy-if(skiaContent,1,5) == textarea-fieldset-legend-1.html textarea-fieldset-legend-1.html
-fuzzy-if(skiaContent,1,5) == textarea-fieldset-legend-2.html textarea-fieldset-legend-2.html
-fuzzy-if(skiaContent,1,5) == textarea-fieldset-legend-3.html textarea-fieldset-legend-3.html
-fuzzy-if(skiaContent,1,5) == textarea-fieldset-legend-4.html textarea-fieldset-legend-4.html
-fuzzy-if(skiaContent,1,10) == textarea-fieldset-legend-5.html textarea-fieldset-legend-5.html
diff --git a/layout/reftests/css-gradients/reftest-stylo.list b/layout/reftests/css-gradients/reftest-stylo.list
deleted file mode 100644
index 2adcd4cdc..000000000
--- a/layout/reftests/css-gradients/reftest-stylo.list
+++ /dev/null
@@ -1,169 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-fails fuzzy-if(!contentSameGfxBackendAsCanvas,4,88500) fuzzy-if(azureSkiaGL||skiaContent,4,89700) fuzzy-if(azureQuartz,1,34792) == linear-1a.html linear-1a.html
-fails fuzzy-if(!contentSameGfxBackendAsCanvas,4,88500) fuzzy-if(azureSkiaGL||skiaContent,4,89700) fuzzy-if(azureQuartz,1,34792) == linear-1b.html linear-1b.html
-fails fuzzy-if(!contentSameGfxBackendAsCanvas,2,88500) fuzzy-if(azureSkiaGL,2,89997) fuzzy-if(azureQuartz,1,11469) fuzzy-if(skiaContent,1,16000) == linear-keywords-1a.html linear-keywords-1a.html
-fails fuzzy-if(!contentSameGfxBackendAsCanvas,2,88500) fuzzy-if(azureSkiaGL,2,89997) fuzzy-if(azureQuartz,1,11985) fuzzy-if(skiaContent,1,16000) == linear-keywords-1b.html linear-keywords-1b.html
-fuzzy-if(!contentSameGfxBackendAsCanvas,2,88500) fuzzy-if(azureQuartz,1,10230) fuzzy-if(skiaContent,1,18000) == linear-percent.html linear-percent.html
-fails fuzzy-if(!contentSameGfxBackendAsCanvas,4,92400) fuzzy-if(azureSkiaGL||skiaContent,3,143400) fuzzy-if(azureQuartz,1,27827) fuzzy-if(Android,4,93000) == linear-mix.html linear-mix.html
-== linear-diagonal-1a.html linear-diagonal-1a.html
-== linear-diagonal-1b.html linear-diagonal-1b.html
-== linear-diagonal-1c.html linear-diagonal-1c.html
-== linear-diagonal-2a.html linear-diagonal-2a.html
-== linear-diagonal-2b.html linear-diagonal-2b.html
-== linear-diagonal-2c.html linear-diagonal-2c.html
-== linear-diagonal-3a.html linear-diagonal-3a.html
-== linear-diagonal-3b.html linear-diagonal-3b.html
-== linear-diagonal-3c.html linear-diagonal-3c.html
-== linear-diagonal-4a.html linear-diagonal-4a.html
-== linear-diagonal-4b.html linear-diagonal-4b.html
-== linear-diagonal-4c.html linear-diagonal-4c.html
-== linear-premul.html linear-premul.html
-
-# these tests uses a similar gradient over different bounds. It's perfectly
-# reasonable to expect implementations to give slightly different results
-# if the gradients are not being normalized. Skia uses a lookup table for
-# gradients so it will have less precision when drawing a larger gradient
-fails fuzzy-if(skiaContent,4,16000) == linear-diagonal-5a.html linear-diagonal-5a.html
-fails fuzzy-if(azureQuartz&&OSX==1006,2,11657) fuzzy-if(skiaContent,8,20000) == linear-diagonal-6a.html linear-diagonal-6a.html
-fails fuzzy-if(skiaContent,8,20000) == linear-diagonal-7a.html linear-diagonal-7a.html
-fails fuzzy-if(azureQuartz&&OSX==1006,2,11443) fuzzy-if(skiaContent,4,16000) == linear-diagonal-8a.html linear-diagonal-8a.html
-
-fails fuzzy-if(cocoaWidget,4,29437) fuzzy-if(skiaContent,2,1700) == linear-diagonal-9a.html linear-diagonal-9a.html
-== linear-flipped-1.html linear-flipped-1.html
-== linear-position-1a.html linear-position-1a.html
-== linear-repeat-1a.html linear-repeat-1a.html
-fails-if(d2d) == linear-repeat-1b.html linear-repeat-1b.html
-# bug 582236
-== linear-repeat-1c.html linear-repeat-1c.html
-fails-if(d2d) == linear-repeat-1d.html linear-repeat-1d.html
-# bug 582236
-== linear-repeat-1e.html linear-repeat-1e.html
-fails-if(d2d) == linear-repeat-1f.html linear-repeat-1f.html
-# bug 582236
-fails-if(d2d) == linear-repeat-1g.html linear-repeat-1g.html
-# bug 582236
-fuzzy-if(skiaContent,1,500) == linear-rotated-1.html linear-rotated-1.html
-fuzzy-if(OSX,1,45000) fuzzy-if(winWidget,1,36000) == linear-size-1a.html linear-size-1a.html
-== linear-stops-1a.html linear-stops-1a.html
-== linear-stops-1b.html linear-stops-1b.html
-== linear-stops-1c.html linear-stops-1c.html
-== linear-stops-1d.html linear-stops-1d.html
-== linear-stops-1e.html linear-stops-1e.html
-== linear-stops-1f.html linear-stops-1f.html
-fails fuzzy-if(!contentSameGfxBackendAsCanvas,3,88500) fuzzy-if(azureSkiaGL||skiaContent,3,89700) fuzzy-if(azureQuartz,1,22367) == linear-vertical-1a.html linear-vertical-1a.html
-fails fuzzy-if(!contentSameGfxBackendAsCanvas,3,88500) fuzzy-if(azureSkiaGL||skiaContent,3,89700) fuzzy-if(azureQuartz,1,22367) == linear-vertical-1b.html linear-vertical-1b.html
-fails fuzzy-if(!contentSameGfxBackendAsCanvas,3,88500) fuzzy-if(azureSkiaGL||skiaContent,3,89700) fuzzy-if(azureQuartz,2,26777) == linear-vertical-1c.html linear-vertical-1c.html
-fails fuzzy-if(!contentSameGfxBackendAsCanvas,3,88500) fuzzy-if(azureSkiaGL||skiaContent,3,89700) fuzzy-if(azureQuartz,2,26777) == linear-vertical-1d.html linear-vertical-1d.html
-fails fuzzy-if(!contentSameGfxBackendAsCanvas,3,88500) fuzzy-if(azureSkiaGL||skiaContent,3,89700) fuzzy-if(azureQuartz,1,22367) == linear-vertical-1e.html linear-vertical-1e.html
-== linear-vertical-subpixel-1.html linear-vertical-subpixel-1.html
-== linear-viewport.html linear-viewport.html
-skip fails-if(OSX==1010&&!skiaContent) fuzzy-if(Android,4,248) == linear-zero-length-1a.html linear-zero-length-1a.html
-fails-if(OSX==1010&&!skiaContent) fuzzy-if(Android,4,248) == linear-zero-length-1b.html linear-zero-length-1b.html
-fails-if(OSX==1010&&!skiaContent) fuzzy-if(Android,4,248) == linear-zero-length-1c.html linear-zero-length-1c.html
-== nostops.html nostops.html
-== onestop.html onestop.html
-fails fuzzy-if(!contentSameGfxBackendAsCanvas,1,5884) fuzzy-if(cocoaWidget,9,87824) fuzzy-if(azureSkiaGL,6,88024) random-if(d2d) fuzzy-if(skiaContent,4,6000) == radial-1a.html radial-1a.html
-fails fuzzy-if(!contentSameGfxBackendAsCanvas,1,5884) fuzzy-if(cocoaWidget,9,87824) fuzzy-if(azureSkiaGL,6,88024) random-if(d2d) fuzzy-if(skiaContent,4,6000) == radial-1b.html radial-1b.html
-fails fuzzy-if(!contentSameGfxBackendAsCanvas,1,5884) fuzzy-if(cocoaWidget,9,87824) fuzzy-if(azureSkiaGL,6,88024) random-if(d2d) fuzzy-if(skiaContent,4,6000) == radial-1c.html radial-1c.html
-fuzzy-if(cocoaWidget,5,89041) fuzzy-if(azureSkiaGL,4,90000) == radial-2a.html radial-2a.html
-fuzzy-if(cocoaWidget,5,89041) fuzzy-if(azureSkiaGL,4,90000) == radial-2b.html radial-2b.html
-fuzzy-if(cocoaWidget,5,89041) fuzzy-if(azureSkiaGL,4,90000) == radial-2c.html radial-2c.html
-fuzzy-if(cocoaWidget,5,89041) fuzzy-if(azureSkiaGL,4,90000) == radial-2d.html radial-2d.html
-fuzzy-if(cocoaWidget,5,89041) fuzzy-if(azureSkiaGL,4,90000) == radial-2e.html radial-2e.html
-fuzzy-if(cocoaWidget,5,89041) fuzzy-if(azureSkiaGL,4,90000) == radial-2f.html radial-2f.html
-== radial-position-1a.html radial-position-1a.html
-fails fuzzy-if(cocoaWidget,1,28) fuzzy-if(winWidget,1,18) fuzzy-if(skiaContent,1,50) == radial-position-1b.html radial-position-1b.html
-fuzzy-if(cocoaWidget,4,22317) fuzzy-if(Android,8,771) == radial-shape-closest-corner-1a.html radial-shape-closest-corner-1a.html
-fails fuzzy-if(cocoaWidget,4,22608) fuzzy-if((/^Windows\x20NT\x2010\.0/.test(http.oscpu)||/^Windows\x20NT\x206\./.test(http.oscpu))&&d2d,1,336) fuzzy-if(Android,8,787) fuzzy-if(B2G,1,242) fuzzy-if(skiaContent,2,300) == radial-shape-closest-corner-1b.html radial-shape-closest-corner-1b.html
-fuzzy-if(azureQuartz,2,41171) fuzzy-if(Android,8,771) == radial-shape-closest-corner-1c.html radial-shape-closest-corner-1c.html
-fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu)||/^Windows\x20NT\x206\.2/.test(http.oscpu),1,5) fuzzy-if(Android,17,3880) == radial-shape-closest-side-1a.html radial-shape-closest-side-1a.html
-fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu)||/^Windows\x20NT\x206\.2/.test(http.oscpu),1,5) fuzzy-if(Android,17,3880) == radial-shape-closest-side-1b.html radial-shape-closest-side-1b.html
-fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu)||/^Windows\x20NT\x206\.2/.test(http.oscpu),1,5) fuzzy-if(Android,17,3880) == radial-shape-closest-side-1c.html radial-shape-closest-side-1c.html
-fuzzy-if(Android,8,771) == radial-shape-farthest-corner-1a.html radial-shape-farthest-corner-1a.html
-fails-if(gtkWidget&&/x86_64-/.test(xulRuntime.XPCOMABI)) fuzzy(1,1569) fuzzy-if(cocoaWidget,2,41281) fuzzy-if(Android,8,1091) fuzzy-if(skiaContent,2,500) == radial-shape-farthest-corner-1b.html radial-shape-farthest-corner-1b.html
-fuzzy-if(Android,8,771) == radial-shape-farthest-corner-1c.html radial-shape-farthest-corner-1c.html
-fuzzy-if(Android,17,13320) == radial-shape-farthest-side-1a.html radial-shape-farthest-side-1a.html
-fuzzy-if(Android,17,13320) == radial-shape-farthest-side-1b.html radial-shape-farthest-side-1b.html
-fuzzy-if(Android,17,13320) == radial-shape-farthest-side-1c.html radial-shape-farthest-side-1c.html
-== radial-size-1a.html radial-size-1a.html
-== radial-size-1b.html radial-size-1b.html
-fuzzy-if(Android,4,248) == radial-zero-length-1a.html radial-zero-length-1a.html
-fuzzy-if(Android,4,248) == radial-zero-length-1b.html radial-zero-length-1b.html
-fuzzy-if(Android,4,248) == radial-zero-length-1c.html radial-zero-length-1c.html
-fuzzy-if(Android,4,248) == radial-zero-length-1d.html radial-zero-length-1d.html
-fuzzy-if(Android,4,248) == radial-zero-length-1e.html radial-zero-length-1e.html
-fuzzy-if(Android,4,248) == radial-zero-length-1f.html radial-zero-length-1f.html
-fuzzy-if(Android,4,248) == radial-zero-length-1g.html radial-zero-length-1g.html
-fuzzy-if(Android,4,248) == radial-zero-length-1h.html radial-zero-length-1h.html
-fuzzy-if(Android,4,248) == radial-zero-length-1i.html radial-zero-length-1i.html
-fuzzy-if(Android,4,248) == radial-zero-length-1j.html radial-zero-length-1j.html
-== radial-premul.html radial-premul.html
-== repeated-final-stop-1.html repeated-final-stop-1.html
-== repeating-linear-1a.html repeating-linear-1a.html
-== repeating-linear-1b.html repeating-linear-1b.html
-== repeating-linear-2a.html repeating-linear-2a.html
-fuzzy-if(d2d,127,2612) == repeating-radial-1a.html repeating-radial-1a.html
-== repeating-radial-1b.html repeating-radial-1b.html
-fuzzy-if(d2d,127,2612) == repeating-radial-1c.html repeating-radial-1c.html
-== repeating-radial-1d.html repeating-radial-1d.html
-fuzzy-if(d2d,127,2612) == repeating-radial-1e.html repeating-radial-1e.html
-== repeating-radial-1f.html repeating-radial-1f.html
-== repeating-radial-2a.html repeating-radial-2a.html
-== repeating-radial-2b.html repeating-radial-2b.html
-fails fuzzy-if(skiaContent,18,600) == twostops-1a.html twostops-1a.html
-fails fuzzy-if(skiaContent,18,600) == twostops-1b.html twostops-1b.html
-fails fuzzy-if(skiaContent,226,600) == twostops-1c.html twostops-1c.html
-fails fuzzy-if(skiaContent,141,300) == twostops-1d.html twostops-1d.html
-fails fuzzy-if(skiaContent,73,900) == twostops-1e.html twostops-1e.html
-fails fuzzy-if(skiaContent,18,600) == twostops-1f.html twostops-1f.html
-fails fuzzy-if(skiaContent,18,600) == twostops-1g.html twostops-1g.html
-
-# from http://www.xanthir.com/:4bhipd by way of http://a-ja.net/newgrad.html
-fuzzy-if(!contentSameGfxBackendAsCanvas,3,20000) fuzzy-if(azureSkiaGL||skiaContent&&layersGPUAccelerated,8,20000) fuzzy-if(azureQuartz&&OSX==1006,1,4646) == aja-linear-1a.html aja-linear-1a.html
-== aja-linear-1b.html aja-linear-1b.html
-# bug 526694
-fuzzy-if(!contentSameGfxBackendAsCanvas,3,20000) fuzzy-if(azureSkiaGL||skiaContent,8,20000) fuzzy-if(azureQuartz&&OSX==1006,1,4646) == aja-linear-1c.html aja-linear-1c.html
-skip fuzzy-if(!contentSameGfxBackendAsCanvas,3,20000) fuzzy-if(azureSkiaGL||skiaContent,8,20000) fuzzy-if(azureQuartz&&OSX==1006,1,4646) == aja-linear-1d.html aja-linear-1d.html
-fails fuzzy-if(!contentSameGfxBackendAsCanvas,3,20000) fuzzy-if(azureSkiaGL||skiaContent,8,20000) fuzzy-if(azureQuartz&&OSX==1006,1,4646) == aja-linear-1e.html aja-linear-1e.html
-fails fuzzy-if(!contentSameGfxBackendAsCanvas,3,20000) fuzzy-if(azureSkiaGL||skiaContent,8,20000) fuzzy-if(azureQuartz&&OSX==1006,1,4646) == aja-linear-1f.html aja-linear-1f.html
-fails fuzzy-if(!contentSameGfxBackendAsCanvas,3,20000) fuzzy-if(azureSkiaGL||skiaContent,8,20000) fuzzy-if(azureQuartz&&OSX==1006,1,4646) == aja-linear-1g.html aja-linear-1g.html
-fails fuzzy-if(!contentSameGfxBackendAsCanvas,2,20000) fuzzy-if(azureSkiaGL||skiaContent,8,20000) fuzzy-if(azureQuartz&&OSX==1006,1,4667) == aja-linear-2a.html aja-linear-2a.html
-fuzzy-if(!contentSameGfxBackendAsCanvas,2,20000) fuzzy-if(azureSkiaGL,8,20000) fuzzy-if(azureQuartz&&OSX==1006,1,4667) == aja-linear-2b.html aja-linear-2b.html
-== aja-linear-2c.html aja-linear-2c.html
-# bug 522607
-fails-if(!d2d&&!(skiaContent&&winWidget)) fuzzy-if(skiaContent&&!winWidget,1,200) == aja-linear-2d.html aja-linear-2d.html
-# bug 526694
-skip fuzzy-if(!contentSameGfxBackendAsCanvas,2,19999) fuzzy-if(azureSkiaGL||skiaContent,8,20000) fuzzy-if(azureQuartz,1,10553) == aja-linear-3a.html aja-linear-3a.html
-fuzzy-if(!contentSameGfxBackendAsCanvas,2,19999) fuzzy-if(azureSkiaGL||skiaContent,8,20000) fuzzy-if(azureQuartz,1,10553) == aja-linear-3b.html aja-linear-3b.html
-fails fuzzy-if(!contentSameGfxBackendAsCanvas,4,20000) fuzzy-if(azureSkiaGL||skiaContent,8,20000) fuzzy-if(azureQuartz&&OSX==1006,1,8655) == aja-linear-4a.html aja-linear-4a.html
-fails fuzzy-if(!contentSameGfxBackendAsCanvas,4,20000) fuzzy-if(azureSkiaGL||skiaContent,8,20000) fuzzy-if(azureQuartz&&OSX==1006,1,8655) == aja-linear-4b.html aja-linear-4b.html
-fails fuzzy-if(!contentSameGfxBackendAsCanvas,4,20000) fuzzy-if(azureSkiaGL||skiaContent,8,20000) fuzzy-if(azureQuartz&&OSX==1006,2,7878) == aja-linear-5a.html aja-linear-5a.html
-fails fuzzy-if(!contentSameGfxBackendAsCanvas,2,16500) fuzzy-if(azureSkiaGL||skiaContent,8,20000) fuzzy-if(azureQuartz,2,10163) == aja-linear-6a.html aja-linear-6a.html
-# bug 526708
-== aja-linear-6b.html aja-linear-6b.html
-# bug 522607
-skip-if(B2G||Mulet) fuzzy-if(Android,6,10576) == height-dependence-1.html height-dependence-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) fuzzy-if(cocoaWidget,1,40000) fuzzy-if(Android,6,10576) == height-dependence-2.html height-dependence-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) fuzzy-if(Android,6,10576) == height-dependence-3.html height-dependence-3.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-== linear-onestopposition-1.html linear-onestopposition-1.html
-fuzzy-if(d2d,47,400) == linear-onestopposition-1.html linear-onestopposition-1.html
-# d2d interpolates the hard stop
-== radial-onestopposition-1a.html radial-onestopposition-1a.html
-== radial-onestopposition-1b.html radial-onestopposition-1b.html
-== radial-onestopposition-1c.html radial-onestopposition-1c.html
-== repeating-linear-onestopposition-1.html repeating-linear-onestopposition-1.html
-== repeating-radial-onestopposition-1a.html repeating-radial-onestopposition-1a.html
-== repeating-radial-onestopposition-1b.html repeating-radial-onestopposition-1b.html
-== repeating-radial-onestopposition-1c.html repeating-radial-onestopposition-1c.html
-== bug-916535-background-repeat-linear.html bug-916535-background-repeat-linear.html
-== large-gradient-1.html large-gradient-1.html
-fuzzy-if(Android,4,1) == large-gradient-2.html large-gradient-2.html
-# Bug 1182082
-== large-gradient-3.html large-gradient-3.html
-== large-gradient-4.html large-gradient-4.html
-== large-gradient-5.html large-gradient-5.html
-== 1224761-1.html 1224761-1.html
diff --git a/layout/reftests/css-gradients/reftest.list b/layout/reftests/css-gradients/reftest.list
index 729bc6058..9b261a529 100644
--- a/layout/reftests/css-gradients/reftest.list
+++ b/layout/reftests/css-gradients/reftest.list
@@ -3,7 +3,7 @@ fuzzy-if(!contentSameGfxBackendAsCanvas,4,88500) fuzzy-if(azureSkiaGL||skiaConte
fuzzy-if(!contentSameGfxBackendAsCanvas,2,88500) fuzzy-if(azureSkiaGL,2,89997) fuzzy-if(azureQuartz,1,11469) fuzzy-if(skiaContent,1,16000) == linear-keywords-1a.html linear-keywords-1-ref.html
fuzzy-if(!contentSameGfxBackendAsCanvas,2,88500) fuzzy-if(azureSkiaGL,2,89997) fuzzy-if(azureQuartz,1,11985) fuzzy-if(skiaContent,1,16000) == linear-keywords-1b.html linear-keywords-1-ref.html
fuzzy-if(!contentSameGfxBackendAsCanvas,2,88500) fuzzy-if(azureQuartz,1,10230) fuzzy-if(skiaContent,1,18000) == linear-percent.html linear-percent-ref.html
-fuzzy-if(!contentSameGfxBackendAsCanvas,4,92400) fuzzy-if(azureSkiaGL||skiaContent,3,143400) fuzzy-if(azureQuartz,1,27827) fuzzy-if(Android,4,93000) == linear-mix.html linear-mix-ref.html
+fuzzy-if(!contentSameGfxBackendAsCanvas,4,92400) fuzzy-if(azureSkiaGL||skiaContent,3,143400) fuzzy-if(azureQuartz,1,27827) == linear-mix.html linear-mix-ref.html
== linear-diagonal-1a.html linear-diagonal-1-ref.html
== linear-diagonal-1b.html linear-diagonal-1-ref.html
== linear-diagonal-1c.html linear-diagonal-1-ref.html
@@ -51,9 +51,9 @@ fuzzy-if(!contentSameGfxBackendAsCanvas,3,88500) fuzzy-if(azureSkiaGL||skiaConte
fuzzy-if(!contentSameGfxBackendAsCanvas,3,88500) fuzzy-if(azureSkiaGL||skiaContent,3,89700) fuzzy-if(azureQuartz,1,22367) == linear-vertical-1e.html linear-vertical-1-ref.html
== linear-vertical-subpixel-1.html linear-vertical-subpixel-1-ref.html
== linear-viewport.html linear-viewport-ref.html
-fails-if(OSX==1010&&!skiaContent) fuzzy-if(Android,4,248) == linear-zero-length-1a.html linear-zero-length-1-ref.html
-fails-if(OSX==1010&&!skiaContent) fuzzy-if(Android,4,248) == linear-zero-length-1b.html linear-zero-length-1-ref.html
-fails-if(OSX==1010&&!skiaContent) fuzzy-if(Android,4,248) == linear-zero-length-1c.html linear-zero-length-1-ref.html
+fails-if(OSX==1010&&!skiaContent) == linear-zero-length-1a.html linear-zero-length-1-ref.html
+fails-if(OSX==1010&&!skiaContent) == linear-zero-length-1b.html linear-zero-length-1-ref.html
+fails-if(OSX==1010&&!skiaContent) == linear-zero-length-1c.html linear-zero-length-1-ref.html
== nostops.html about:blank
== onestop.html about:blank
fuzzy-if(!contentSameGfxBackendAsCanvas,1,5884) fuzzy-if(cocoaWidget,9,87824) fuzzy-if(azureSkiaGL,6,88024) random-if(d2d) fuzzy-if(skiaContent,4,6000) == radial-1a.html radial-1-ref.html
@@ -67,30 +67,30 @@ fuzzy(3,7860) fuzzy-if(cocoaWidget,5,89041) fuzzy-if(azureSkiaGL,4,90000) == rad
fuzzy(3,7860) fuzzy-if(cocoaWidget,5,89041) fuzzy-if(azureSkiaGL,4,90000) == radial-2f.html radial-2-ref.html
== radial-position-1a.html radial-position-1-ref.html
fuzzy-if(cocoaWidget,1,28) fuzzy-if(winWidget,1,18) fuzzy-if(skiaContent,1,50) == radial-position-1b.html radial-position-1-ref.html
-fuzzy-if(cocoaWidget,4,22317) fuzzy-if(Android,8,771) == radial-shape-closest-corner-1a.html radial-shape-closest-corner-1-ref.html
-fuzzy(1,238) fuzzy-if(cocoaWidget,4,22608) fuzzy-if((/^Windows\x20NT\x2010\.0/.test(http.oscpu)||/^Windows\x20NT\x206\./.test(http.oscpu))&&d2d,1,336) fuzzy-if(Android,8,787) fuzzy-if(skiaContent,2,300) == radial-shape-closest-corner-1b.html radial-shape-closest-corner-1-ref.html
-fuzzy-if(azureQuartz,2,41171) fuzzy-if(Android,8,771) == radial-shape-closest-corner-1c.html radial-shape-closest-corner-1-ref.html
-fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu)||/^Windows\x20NT\x206\.2/.test(http.oscpu),1,5) fuzzy-if(Android,17,3880) == radial-shape-closest-side-1a.html radial-shape-closest-side-1-ref.html
-fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu)||/^Windows\x20NT\x206\.2/.test(http.oscpu),1,5) fuzzy-if(Android,17,3880) == radial-shape-closest-side-1b.html radial-shape-closest-side-1-ref.html
-fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu)||/^Windows\x20NT\x206\.2/.test(http.oscpu),1,5) fuzzy-if(Android,17,3880) == radial-shape-closest-side-1c.html radial-shape-closest-side-1-ref.html
-fuzzy-if(Android,8,771) == radial-shape-farthest-corner-1a.html radial-shape-farthest-corner-1-ref.html
-fails-if(gtkWidget&&/x86_64-/.test(xulRuntime.XPCOMABI)) fuzzy(1,1569) fuzzy-if(cocoaWidget,2,41281) fuzzy-if(Android,8,1091) fuzzy-if(skiaContent,2,500) == radial-shape-farthest-corner-1b.html radial-shape-farthest-corner-1-ref.html
-fuzzy-if(Android,8,771) == radial-shape-farthest-corner-1c.html radial-shape-farthest-corner-1-ref.html
-fuzzy-if(Android,17,13320) == radial-shape-farthest-side-1a.html radial-shape-farthest-side-1-ref.html
-fuzzy-if(Android,17,13320) == radial-shape-farthest-side-1b.html radial-shape-farthest-side-1-ref.html
-fuzzy-if(Android,17,13320) == radial-shape-farthest-side-1c.html radial-shape-farthest-side-1-ref.html
+fuzzy-if(cocoaWidget,4,22317) == radial-shape-closest-corner-1a.html radial-shape-closest-corner-1-ref.html
+fuzzy(1,238) fuzzy-if(cocoaWidget,4,22608) fuzzy-if((/^Windows\x20NT\x2010\.0/.test(http.oscpu)||/^Windows\x20NT\x206\./.test(http.oscpu))&&d2d,1,336) fuzzy-if(skiaContent,2,300) == radial-shape-closest-corner-1b.html radial-shape-closest-corner-1-ref.html
+fuzzy-if(azureQuartz,2,41171) == radial-shape-closest-corner-1c.html radial-shape-closest-corner-1-ref.html
+fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu)||/^Windows\x20NT\x206\.2/.test(http.oscpu),1,5) == radial-shape-closest-side-1a.html radial-shape-closest-side-1-ref.html
+fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu)||/^Windows\x20NT\x206\.2/.test(http.oscpu),1,5) == radial-shape-closest-side-1b.html radial-shape-closest-side-1-ref.html
+fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu)||/^Windows\x20NT\x206\.2/.test(http.oscpu),1,5) == radial-shape-closest-side-1c.html radial-shape-closest-side-1-ref.html
+== radial-shape-farthest-corner-1a.html radial-shape-farthest-corner-1-ref.html
+fails-if(gtkWidget&&/x86_64-/.test(xulRuntime.XPCOMABI)) fuzzy(1,1569) fuzzy-if(cocoaWidget,2,41281) fuzzy-if(skiaContent,2,500) == radial-shape-farthest-corner-1b.html radial-shape-farthest-corner-1-ref.html
+== radial-shape-farthest-corner-1c.html radial-shape-farthest-corner-1-ref.html
+== radial-shape-farthest-side-1a.html radial-shape-farthest-side-1-ref.html
+== radial-shape-farthest-side-1b.html radial-shape-farthest-side-1-ref.html
+== radial-shape-farthest-side-1c.html radial-shape-farthest-side-1-ref.html
== radial-size-1a.html radial-size-1-ref.html
== radial-size-1b.html radial-size-1-ref.html
-fuzzy-if(Android,4,248) == radial-zero-length-1a.html radial-zero-length-1-ref.html
-fuzzy-if(Android,4,248) == radial-zero-length-1b.html radial-zero-length-1-ref.html
-fuzzy-if(Android,4,248) == radial-zero-length-1c.html radial-zero-length-1-ref.html
-fuzzy-if(Android,4,248) == radial-zero-length-1d.html radial-zero-length-1-ref.html
-fuzzy-if(Android,4,248) == radial-zero-length-1e.html radial-zero-length-1-ref.html
-fuzzy-if(Android,4,248) == radial-zero-length-1f.html radial-zero-length-1-ref.html
-fuzzy-if(Android,4,248) == radial-zero-length-1g.html radial-zero-length-1-ref.html
-fuzzy-if(Android,4,248) == radial-zero-length-1h.html radial-zero-length-1-ref.html
-fuzzy-if(Android,4,248) == radial-zero-length-1i.html radial-zero-length-1-ref.html
-fuzzy-if(Android,4,248) == radial-zero-length-1j.html radial-zero-length-1-ref.html
+== radial-zero-length-1a.html radial-zero-length-1-ref.html
+== radial-zero-length-1b.html radial-zero-length-1-ref.html
+== radial-zero-length-1c.html radial-zero-length-1-ref.html
+== radial-zero-length-1d.html radial-zero-length-1-ref.html
+== radial-zero-length-1e.html radial-zero-length-1-ref.html
+== radial-zero-length-1f.html radial-zero-length-1-ref.html
+== radial-zero-length-1g.html radial-zero-length-1-ref.html
+== radial-zero-length-1h.html radial-zero-length-1-ref.html
+== radial-zero-length-1i.html radial-zero-length-1-ref.html
+== radial-zero-length-1j.html radial-zero-length-1-ref.html
== repeated-final-stop-1.html repeated-final-stop-1-ref.html
== repeating-linear-1a.html repeating-linear-1-ref.html
== repeating-linear-1b.html repeating-linear-1-ref.html
@@ -130,9 +130,9 @@ fuzzy-if(!contentSameGfxBackendAsCanvas,4,20000) fuzzy-if(azureSkiaGL||skiaConte
fuzzy-if(!contentSameGfxBackendAsCanvas,4,20000) fuzzy-if(azureSkiaGL||skiaContent,8,20000) fuzzy-if(azureQuartz&&OSX==1006,2,7878) == aja-linear-5a.html aja-linear-5-ref.html
fuzzy-if(!contentSameGfxBackendAsCanvas,2,16500) fuzzy-if(azureSkiaGL||skiaContent,8,20000) fuzzy-if(azureQuartz,2,10163) == aja-linear-6a.html aja-linear-6-ref.html # bug 526708
fails == aja-linear-6b.html aja-linear-6-ref.html # bug 522607
-fuzzy-if(Android,6,10576) == height-dependence-1.html height-dependence-1-ref.html
-fuzzy-if(cocoaWidget,1,40000) fuzzy-if(Android,6,10576) == height-dependence-2.html height-dependence-2-ref.html
-fuzzy-if(Android,6,10576) == height-dependence-3.html height-dependence-3-ref.html
+== height-dependence-1.html height-dependence-1-ref.html
+fuzzy-if(cocoaWidget,1,40000) == height-dependence-2.html height-dependence-2-ref.html
+== height-dependence-3.html height-dependence-3-ref.html
== linear-onestopposition-1.html linear-onestopposition-1-ref.html
fuzzy-if(d2d,47,400) == linear-onestopposition-1.html linear-onestopposition-1-ref2.html # d2d interpolates the hard stop
@@ -145,7 +145,7 @@ fuzzy-if(d2d,47,400) == linear-onestopposition-1.html linear-onestopposition-1-r
== repeating-radial-onestopposition-1c.html orange-square.html
== bug-916535-background-repeat-linear.html bug-916535-background-repeat-linear-ref.html
fuzzy(1,800000) == large-gradient-1.html large-gradient-1-ref.html
-fuzzy-if(Android,4,1) == large-gradient-2.html large-gradient-2-ref.html # Bug 1182082
+== large-gradient-2.html large-gradient-2-ref.html # Bug 1182082
fuzzy(1,800000) == large-gradient-3.html large-gradient-3-ref.html
== large-gradient-4.html large-gradient-4-ref.html
fuzzy(2,800000) == large-gradient-5.html large-gradient-5-ref.html
diff --git a/layout/reftests/css-grid/reftest-stylo.list b/layout/reftests/css-grid/reftest-stylo.list
deleted file mode 100644
index 70fa86a74..000000000
--- a/layout/reftests/css-grid/reftest-stylo.list
+++ /dev/null
@@ -1,233 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-default-preferences pref(layout.css.grid.enabled,true)
-
-== grid-whitespace-handling-1a.xhtml grid-whitespace-handling-1a.xhtml
-== grid-whitespace-handling-1b.xhtml grid-whitespace-handling-1b.xhtml
-== grid-whitespace-handling-2.xhtml grid-whitespace-handling-2.xhtml
-== grid-placement-definite-001.html grid-placement-definite-001.html
-== grid-placement-definite-002.html grid-placement-definite-002.html
-== grid-placement-definite-003.html grid-placement-definite-003.html
-== grid-placement-negative-lines-001.html grid-placement-negative-lines-001.html
-== grid-placement-auto-row-sparse-001.html grid-placement-auto-row-sparse-001.html
-== grid-placement-auto-row-dense-001.html grid-placement-auto-row-dense-001.html
-== grid-placement-auto-col-sparse-001.html grid-placement-auto-col-sparse-001.html
-== grid-placement-auto-col-dense-001.html grid-placement-auto-col-dense-001.html
-== grid-placement-implicit-named-areas-001.html grid-placement-implicit-named-areas-001.html
-== grid-placement-named-lines-001.html grid-placement-named-lines-001.html
-== grid-placement-named-lines-002.html grid-placement-named-lines-002.html
-== grid-placement-named-lines-003.html grid-placement-named-lines-003.html
-== grid-track-sizing-001.html grid-track-sizing-001.html
-== grid-track-sizing-002.html grid-track-sizing-002.html
-== grid-abspos-items-001.html grid-abspos-items-001.html
-== grid-abspos-items-002.html grid-abspos-items-002.html
-== grid-abspos-items-003.html grid-abspos-items-003.html
-== grid-abspos-items-004.html grid-abspos-items-004.html
-== grid-abspos-items-005.html grid-abspos-items-005.html
-== grid-abspos-items-006.html grid-abspos-items-006.html
-== grid-abspos-items-007.html grid-abspos-items-007.html
-== grid-abspos-items-008.html grid-abspos-items-008.html
-== grid-abspos-items-009.html grid-abspos-items-009.html
-skip == grid-abspos-items-010.html grid-abspos-items-010.html
-== grid-abspos-items-011.html grid-abspos-items-011.html
-== grid-abspos-items-012.html grid-abspos-items-012.html
-== grid-abspos-items-013.html grid-abspos-items-013.html
-== grid-abspos-items-014.html grid-abspos-items-014.html
-skip == grid-abspos-items-015.html grid-abspos-items-015.html
-== grid-order-abspos-items-001.html grid-order-abspos-items-001.html
-== grid-order-placement-auto-001.html grid-order-placement-auto-001.html
-fuzzy-if(skiaContent,1,200) == grid-order-placement-definite-001.html grid-order-placement-definite-001.html
-skip-if(Android) == grid-placement-definite-implicit-001.html grid-placement-definite-implicit-001.html
-== grid-placement-definite-implicit-002.html grid-placement-definite-implicit-002.html
-skip-if(Android) fuzzy-if(winWidget,1,32) == grid-placement-auto-implicit-001.html grid-placement-auto-implicit-001.html
-== grid-placement-abspos-implicit-001.html grid-placement-abspos-implicit-001.html
-== rtl-grid-placement-definite-001.html rtl-grid-placement-definite-001.html
-== rtl-grid-placement-auto-row-sparse-001.html rtl-grid-placement-auto-row-sparse-001.html
-== vlr-grid-placement-auto-row-sparse-001.html vlr-grid-placement-auto-row-sparse-001.html
-== vrl-grid-placement-auto-row-sparse-001.html vrl-grid-placement-auto-row-sparse-001.html
-== grid-relpos-items-001.html grid-relpos-items-001.html
-== grid-item-sizing-percent-001.html grid-item-sizing-percent-001.html
-== grid-item-sizing-px-001.html grid-item-sizing-px-001.html
-== grid-item-dir-001.html grid-item-dir-001.html
-fuzzy-if(winWidget,70,130) fuzzy-if(cocoaWidget,85,180) == grid-col-max-sizing-max-content-001.html grid-col-max-sizing-max-content-001.html
-fuzzy-if(winWidget,70,130) fuzzy-if(cocoaWidget,85,180) == grid-col-max-sizing-max-content-002.html grid-col-max-sizing-max-content-002.html
-== grid-min-max-content-sizing-001.html grid-min-max-content-sizing-001.html
-== grid-min-max-content-sizing-002.html grid-min-max-content-sizing-002.html
-random == grid-auto-min-sizing-definite-001.html grid-auto-min-sizing-definite-001.html
-== grid-auto-min-sizing-intrinsic-001.html grid-auto-min-sizing-intrinsic-001.html
-== grid-auto-min-sizing-intrinsic-002.html grid-auto-min-sizing-intrinsic-002.html
-== grid-auto-min-sizing-intrinsic-003.html grid-auto-min-sizing-intrinsic-003.html
-== grid-auto-min-sizing-intrinsic-004.html grid-auto-min-sizing-intrinsic-004.html
-skip == grid-auto-min-sizing-percent-001.html grid-auto-min-sizing-percent-001.html
-== grid-track-intrinsic-sizing-001.html grid-track-intrinsic-sizing-001.html
-== grid-track-intrinsic-sizing-002.html grid-track-intrinsic-sizing-002.html
-== grid-track-intrinsic-sizing-003.html grid-track-intrinsic-sizing-003.html
-== grid-track-intrinsic-sizing-004.html grid-track-intrinsic-sizing-004.html
-== grid-track-percent-sizing-001.html grid-track-percent-sizing-001.html
-== grid-max-sizing-flex-001.html grid-max-sizing-flex-001.html
-== grid-max-sizing-flex-002.html grid-max-sizing-flex-002.html
-== grid-max-sizing-flex-003.html grid-max-sizing-flex-003.html
-== grid-max-sizing-flex-004.html grid-max-sizing-flex-004.html
-== grid-max-sizing-flex-005.html grid-max-sizing-flex-005.html
-== grid-max-sizing-flex-006.html grid-max-sizing-flex-006.html
-== grid-flex-min-sizing-001.html grid-flex-min-sizing-001.html
-== grid-flex-min-sizing-002.html grid-flex-min-sizing-002.html
-== grid-item-align-001.html grid-item-align-001.html
-skip == grid-item-align-002.html grid-item-align-002.html
-== grid-item-align-003.html grid-item-align-003.html
-== grid-item-justify-001.html grid-item-justify-001.html
-== grid-item-justify-002.html grid-item-justify-002.html
-== grid-item-stretch-001.html grid-item-stretch-001.html
-== grid-item-self-baseline-001.html grid-item-self-baseline-001.html
-skip-if(!gtkWidget) == grid-item-content-baseline-001.html grid-item-content-baseline-001.html
-# depends on exact Ahem baseline font metrics which seems to differ between platforms
-skip-if(!gtkWidget) == grid-item-content-baseline-002.html grid-item-content-baseline-002.html
-# ditto
-skip-if(!gtkWidget) == grid-item-mixed-baseline-001.html grid-item-mixed-baseline-001.html
-# ditto
-skip-if(!gtkWidget) == grid-item-mixed-baseline-002.html grid-item-mixed-baseline-002.html
-# ditto
-skip-if(!gtkWidget) == grid-item-mixed-baseline-003.html grid-item-mixed-baseline-003.html
-# ditto
-skip-if(!gtkWidget) == grid-item-mixed-baseline-004.html grid-item-mixed-baseline-004.html
-# ditto
-== grid-align-content-001.html grid-align-content-001.html
-== grid-justify-content-001.html grid-justify-content-001.html
-skip-if(Android&&isDebugBuild) == grid-justify-content-002.html grid-justify-content-002.html
-# Bug 1245884 - slow
-skip-if(Android&&isDebugBuild) == grid-justify-content-003.html grid-justify-content-003.html
-# Bug 1245884 - slow
-skip-if(Android&&isDebugBuild) == grid-column-gap-001.html grid-column-gap-001.html
-# Bug 1245884 - slow
-== grid-column-gap-002.html grid-column-gap-002.html
-== grid-column-gap-003.html grid-column-gap-003.html
-== grid-column-gap-004.html grid-column-gap-004.html
-== grid-row-gap-001.html grid-row-gap-001.html
-skip-if(Android&&isDebugBuild) == grid-row-gap-002.html grid-row-gap-002.html
-# Bug 1245884 - slow
-skip-if(Android&&isDebugBuild) == grid-row-gap-003.html grid-row-gap-003.html
-# Bug 1245884 - slow
-skip-if(Android&&isDebugBuild) == grid-row-gap-004.html grid-row-gap-004.html
-# Bug 1245884 - slow
-== grid-row-gap-005.html grid-row-gap-005.html
-== grid-container-overflow-001.html grid-container-overflow-001.html
-== grid-item-margin-left-auto-001.html grid-item-margin-left-auto-001.html
-== grid-item-margin-left-auto-002.html grid-item-margin-left-auto-002.html
-== grid-item-margin-left-auto-003.html grid-item-margin-left-auto-003.html
-skip == grid-item-margin-left-auto-004.html grid-item-margin-left-auto-004.html
-== grid-item-margin-left-right-auto-001.html grid-item-margin-left-right-auto-001.html
-skip == grid-item-margin-left-right-auto-002.html grid-item-margin-left-right-auto-002.html
-== grid-item-margin-left-right-auto-003.html grid-item-margin-left-right-auto-003.html
-== grid-item-margin-left-right-auto-004.html grid-item-margin-left-right-auto-004.html
-== grid-item-margin-right-auto-001.html grid-item-margin-right-auto-001.html
-== grid-item-margin-right-auto-002.html grid-item-margin-right-auto-002.html
-== grid-item-margin-right-auto-003.html grid-item-margin-right-auto-003.html
-== grid-item-margin-right-auto-004.html grid-item-margin-right-auto-004.html
-== grid-container-min-max-width-height-001.html grid-container-min-max-width-height-001.html
-== grid-clamping-001.html grid-clamping-001.html
-== grid-clamping-002.html grid-clamping-002.html
-== grid-repeat-auto-fill-fit-001.html grid-repeat-auto-fill-fit-001.html
-== grid-repeat-auto-fill-fit-002.html grid-repeat-auto-fill-fit-002.html
-== grid-repeat-auto-fill-fit-003.html grid-repeat-auto-fill-fit-003.html
-== grid-repeat-auto-fill-fit-004.html grid-repeat-auto-fill-fit-004.html
-== grid-repeat-auto-fill-fit-005.html grid-repeat-auto-fill-fit-005.html
-== grid-repeat-auto-fill-fit-006.html grid-repeat-auto-fill-fit-006.html
-== grid-repeat-auto-fill-fit-007.html grid-repeat-auto-fill-fit-007.html
-== grid-repeat-auto-fill-fit-008.html grid-repeat-auto-fill-fit-008.html
-== grid-repeat-auto-fill-fit-009.html grid-repeat-auto-fill-fit-009.html
-== grid-item-blockifying-001.html grid-item-blockifying-001.html
-== grid-fragmentation-001.html grid-fragmentation-001.html
-== grid-fragmentation-002.html grid-fragmentation-002.html
-== grid-fragmentation-003.html grid-fragmentation-003.html
-== grid-fragmentation-004.html grid-fragmentation-004.html
-skip == grid-fragmentation-005.html grid-fragmentation-005.html
-== grid-fragmentation-006.html grid-fragmentation-006.html
-== grid-fragmentation-007.html grid-fragmentation-007.html
-== grid-fragmentation-008.html grid-fragmentation-008.html
-== grid-fragmentation-009.html grid-fragmentation-009.html
-== grid-fragmentation-010.html grid-fragmentation-010.html
-== grid-fragmentation-011.html grid-fragmentation-011.html
-== grid-fragmentation-012.html grid-fragmentation-012.html
-== grid-fragmentation-013.html grid-fragmentation-013.html
-== grid-fragmentation-014.html grid-fragmentation-014.html
-asserts(0-10) == grid-fragmentation-015.html grid-fragmentation-015.html
-# bug 1144852 (due to vertical writing-mode)
-== grid-fragmentation-016.html grid-fragmentation-016.html
-== grid-fragmentation-017.html grid-fragmentation-017.html
-== grid-fragmentation-018.html grid-fragmentation-018.html
-== grid-fragmentation-019.html grid-fragmentation-019.html
-== grid-fragmentation-020.html grid-fragmentation-020.html
-== grid-fragmentation-021.html grid-fragmentation-021.html
-== grid-fragmentation-022.html grid-fragmentation-022.html
-== grid-fragmentation-023.html grid-fragmentation-023.html
-== grid-fragmentation-024.html grid-fragmentation-024.html
-== grid-fragmentation-025.html grid-fragmentation-025.html
-== grid-fragmentation-026.html grid-fragmentation-026.html
-== grid-fragmentation-027.html grid-fragmentation-027.html
-== grid-fragmentation-028.html grid-fragmentation-028.html
-== grid-fragmentation-029.html grid-fragmentation-029.html
-== grid-fragmentation-030.html grid-fragmentation-030.html
-== grid-fragmentation-031.html grid-fragmentation-031.html
-
-# Fragmentation tests that does dynamic content removal/insertions.
-# They should give the same result as the corresponding static test.
-== grid-fragmentation-dyn3-001.html grid-fragmentation-dyn3-001.html
-== grid-fragmentation-dyn4-001.html grid-fragmentation-dyn4-001.html
-== grid-fragmentation-dyn1-002.html grid-fragmentation-dyn1-002.html
-== grid-fragmentation-dyn3-002.html grid-fragmentation-dyn3-002.html
-skip == grid-fragmentation-dyn3-003.html grid-fragmentation-dyn3-003.html
-== grid-fragmentation-dyn4-004.html grid-fragmentation-dyn4-004.html
-== grid-fragmentation-dyn4-005.html grid-fragmentation-dyn4-005.html
-== grid-fragmentation-dyn5-005.html grid-fragmentation-dyn5-005.html
-== grid-fragmentation-dyn1-006.html grid-fragmentation-dyn1-006.html
-== grid-fragmentation-dyn3-007.html grid-fragmentation-dyn3-007.html
-== grid-fragmentation-dyn5-007.html grid-fragmentation-dyn5-007.html
-== grid-fragmentation-dyn5-008.html grid-fragmentation-dyn5-008.html
-== grid-fragmentation-dyn3-009.html grid-fragmentation-dyn3-009.html
-== grid-fragmentation-dyn3-009.html grid-fragmentation-dyn3-009.html
-== grid-fragmentation-dyn4-015.html grid-fragmentation-dyn4-015.html
-== grid-fragmentation-dyn1-015.html grid-fragmentation-dyn1-015.html
-== grid-fragmentation-dyn1-016.html grid-fragmentation-dyn1-016.html
-== grid-fragmentation-dyn5-016.html grid-fragmentation-dyn5-016.html
-== grid-fragmentation-dyn3-017.html grid-fragmentation-dyn3-017.html
-skip == grid-fragmentation-dyn2-018.html grid-fragmentation-dyn2-018.html
-== grid-fragmentation-dyn1-019.html grid-fragmentation-dyn1-019.html
-== grid-fragmentation-dyn2-019.html grid-fragmentation-dyn2-019.html
-== grid-fragmentation-dyn3-019.html grid-fragmentation-dyn3-019.html
-== grid-fragmentation-dyn4-019.html grid-fragmentation-dyn4-019.html
-== grid-fragmentation-dyn5-019.html grid-fragmentation-dyn5-019.html
-== grid-fragmentation-dyn1-020.html grid-fragmentation-dyn1-020.html
-== grid-fragmentation-dyn2-020.html grid-fragmentation-dyn2-020.html
-== grid-fragmentation-dyn1-021.html grid-fragmentation-dyn1-021.html
-# bug 1251799
-== grid-fragmentation-dyn2-021.html grid-fragmentation-dyn2-021.html
-== grid-fragmentation-dyn3-021.html grid-fragmentation-dyn3-021.html
-asserts(1-10) == grid-fragmentation-dyn4-021.html grid-fragmentation-dyn4-021.html
-# assertion related to bug 1251799 ?
-== grid-fragmentation-dyn5-021.html grid-fragmentation-dyn5-021.html
-== grid-fragmentation-dyn2-022.html grid-fragmentation-dyn2-022.html
-== grid-fragmentation-dyn1-023.html grid-fragmentation-dyn1-023.html
-== grid-fragmentation-dyn2-023.html grid-fragmentation-dyn2-023.html
-== grid-fragmentation-dyn3-023.html grid-fragmentation-dyn3-023.html
-== grid-fragmentation-dyn4-023.html grid-fragmentation-dyn4-023.html
-== grid-fragmentation-dyn5-023.html grid-fragmentation-dyn5-023.html
-== grid-fragmentation-dyn1-024.html grid-fragmentation-dyn1-024.html
-== grid-fragmentation-dyn2-025.html grid-fragmentation-dyn2-025.html
-== grid-fragmentation-dyn1-026.html grid-fragmentation-dyn1-026.html
-skip == grid-fragmentation-dyn2-026.html grid-fragmentation-dyn2-026.html
-== grid-fragmentation-dyn3-026.html grid-fragmentation-dyn3-026.html
-== grid-fragmentation-dyn4-026.html grid-fragmentation-dyn4-026.html
-== grid-fragmentation-dyn5-026.html grid-fragmentation-dyn5-026.html
-== grid-fragmentation-dyn1-027.html grid-fragmentation-dyn1-027.html
-== grid-fragmentation-dyn2-027.html grid-fragmentation-dyn2-027.html
-== grid-fragmentation-dyn3-027.html grid-fragmentation-dyn3-027.html
-== grid-fragmentation-dyn4-027.html grid-fragmentation-dyn4-027.html
-== grid-fragmentation-dyn5-027.html grid-fragmentation-dyn5-027.html
-skip == grid-fragmentation-dyn1-028.html grid-fragmentation-dyn1-028.html
-== grid-fragmentation-dyn2-028.html grid-fragmentation-dyn2-028.html
-== grid-fragmentation-dyn3-028.html grid-fragmentation-dyn3-028.html
-== grid-fragmentation-dyn4-028.html grid-fragmentation-dyn4-028.html
-== grid-fragmentation-dyn5-028.html grid-fragmentation-dyn5-028.html
-== grid-fragmentation-dyn1-029.html grid-fragmentation-dyn1-029.html
-== grid-fragmentation-dyn2-029.html grid-fragmentation-dyn2-029.html
-== grid-fragmentation-dyn2-030.html grid-fragmentation-dyn2-030.html
-== grid-fragmentation-dyn2-031.html grid-fragmentation-dyn2-031.html
diff --git a/layout/reftests/css-grid/reftest.list b/layout/reftests/css-grid/reftest.list
index 7c5e6be51..35e3140a8 100644
--- a/layout/reftests/css-grid/reftest.list
+++ b/layout/reftests/css-grid/reftest.list
@@ -248,10 +248,10 @@ asserts(0-10) == grid-fragmentation-015.html grid-fragmentation-015-ref.html # b
== grid-fragmentation-dyn5-019.html grid-fragmentation-019-ref.html
== grid-fragmentation-dyn1-020.html grid-fragmentation-020-ref.html
== grid-fragmentation-dyn2-020.html grid-fragmentation-020-ref.html
-!= grid-fragmentation-dyn1-021.html grid-fragmentation-021-ref.html # bug 1251799
+== grid-fragmentation-dyn1-021.html grid-fragmentation-021-ref.html
== grid-fragmentation-dyn2-021.html grid-fragmentation-021-ref.html
== grid-fragmentation-dyn3-021.html grid-fragmentation-021-ref.html
-asserts(1-10) == grid-fragmentation-dyn4-021.html grid-fragmentation-021-ref.html # assertion related to bug 1251799 ?
+== grid-fragmentation-dyn4-021.html grid-fragmentation-021-ref.html
== grid-fragmentation-dyn5-021.html grid-fragmentation-021-ref.html
== grid-fragmentation-dyn2-022.html grid-fragmentation-007-ref.html
== grid-fragmentation-dyn1-023.html grid-fragmentation-023-ref.html
diff --git a/layout/reftests/css-import/reftest-stylo.list b/layout/reftests/css-import/reftest-stylo.list
deleted file mode 100644
index 3e587c4b4..000000000
--- a/layout/reftests/css-import/reftest-stylo.list
+++ /dev/null
@@ -1,16 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-skip-if(B2G||Mulet) == 290018-1.html 290018-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 436261-1.html 436261-1.html
-== 436261-2.html 436261-2.html
-== 436261-3.html 436261-3.html
-== 444723-1.html 444723-1.html
-== 444723-2.html 444723-2.html
-== 445415-1a.xhtml 445415-1a.xhtml
-== 445415-1b.xhtml 445415-1b.xhtml
-skip-if(B2G||Mulet) == 445415-2a.xhtml 445415-2a.xhtml
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == 445415-2b.xhtml 445415-2b.xhtml
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
diff --git a/layout/reftests/css-invalid/button/reftest-stylo.list b/layout/reftests/css-invalid/button/reftest-stylo.list
deleted file mode 100644
index df501b3db..000000000
--- a/layout/reftests/css-invalid/button/reftest-stylo.list
+++ /dev/null
@@ -1,13 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-fuzzy-if(skiaContent,1,3) == button-valid.html button-valid.html
-fails fuzzy-if(skiaContent,1,5) == button-invalid.html button-invalid.html
-== button-disabled.html button-disabled.html
-fuzzy-if(skiaContent,1,5) == button-dyn-disabled.html button-dyn-disabled.html
-fails fuzzy-if(skiaContent,1,5) == button-dyn-not-disabled.html button-dyn-not-disabled.html
-fuzzy-if(skiaContent,1,5) == button-button.html button-button.html
-fails fuzzy-if(skiaContent,1,5) == button-reset.html button-reset.html
-fails fuzzy-if(skiaContent,1,5) == button-type-invalid.html button-type-invalid.html
-fails fuzzy-if(skiaContent,1,5) == button-type-barred.html button-type-barred.html
-fuzzy-if(skiaContent,1,3) == button-disabled-fieldset-1.html button-disabled-fieldset-1.html
-fuzzy-if(skiaContent,1,3) == button-disabled-fieldset-2.html button-disabled-fieldset-2.html
-fuzzy-if(skiaContent,1,3) == button-fieldset-legend.html button-fieldset-legend.html
diff --git a/layout/reftests/css-invalid/default-style/reftest-stylo.list b/layout/reftests/css-invalid/default-style/reftest-stylo.list
deleted file mode 100644
index eebfc3b5c..000000000
--- a/layout/reftests/css-invalid/default-style/reftest-stylo.list
+++ /dev/null
@@ -1,6 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== input.html input.html
-== button.html button.html
-== textarea.html textarea.html
-== select.html select.html
-== fieldset.html fieldset.html
diff --git a/layout/reftests/css-invalid/fieldset/reftest-stylo.list b/layout/reftests/css-invalid/fieldset/reftest-stylo.list
deleted file mode 100644
index 24abf4c4a..000000000
--- a/layout/reftests/css-invalid/fieldset/reftest-stylo.list
+++ /dev/null
@@ -1,30 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== fieldset-valid.html fieldset-valid.html
-== fieldset-invalid.html fieldset-invalid.html
-== fieldset-add-invalid-barred.html fieldset-add-invalid-barred.html
-== fieldset-add-invalid-element-dynamic.html fieldset-add-invalid-element-dynamic.html
-== fieldset-add-invalid-element.html fieldset-add-invalid-element.html
-== fieldset-add-invalid-with-valid-element.html fieldset-add-invalid-with-valid-element.html
-== fieldset-add-valid-element.html fieldset-add-valid-element.html
-== fieldset-add-valid-with-invalid-element.html fieldset-add-valid-with-invalid-element.html
-== fieldset-add-valid-with-no-element.html fieldset-add-valid-with-no-element.html
-== fieldset-dynamic-invalid-barred.html fieldset-dynamic-invalid-barred.html
-== fieldset-dynamic-invalid-not-barred.html fieldset-dynamic-invalid-not-barred.html
-== fieldset-dynamic-invalid.html fieldset-dynamic-invalid.html
-== fieldset-dynamic-valid.html fieldset-dynamic-valid.html
-== fieldset-invalid-and-barred-remove-barred.html fieldset-invalid-and-barred-remove-barred.html
-== fieldset-invalid-and-barred-remove-invalid.html fieldset-invalid-and-barred-remove-invalid.html
-== fieldset-invalid-and-barred.html fieldset-invalid-and-barred.html
-== fieldset-remove-invalid-element.html fieldset-remove-invalid-element.html
-== fieldset-static-invalid-barred.html fieldset-static-invalid-barred.html
-== fieldset-static-invalid.html fieldset-static-invalid.html
-== fieldset-static-valid.html fieldset-static-valid.html
-== fieldset-valid-and-barred-remove-barred.html fieldset-valid-and-barred-remove-barred.html
-== fieldset-valid-and-barred.html fieldset-valid-and-barred.html
-== fieldset-with-invalid-element-add-barred-dynamic.html fieldset-with-invalid-element-add-barred-dynamic.html
-== fieldset-with-valid-and-invalid.html fieldset-with-valid-and-invalid.html
-== fieldset-with-valid-element-add-barred-dynamic.html fieldset-with-valid-element-add-barred-dynamic.html
-== fieldset-nested-invalid.html fieldset-nested-invalid.html
-== fieldset-div-invalid.html fieldset-div-invalid.html
-== fieldset-nested-valid-invalid.html fieldset-nested-valid-invalid.html
-fails fuzzy-if(skiaContent,1,5) == fieldset-nested-barred.html fieldset-nested-barred.html
diff --git a/layout/reftests/css-invalid/form/reftest-stylo.list b/layout/reftests/css-invalid/form/reftest-stylo.list
deleted file mode 100644
index 5abbde77b..000000000
--- a/layout/reftests/css-invalid/form/reftest-stylo.list
+++ /dev/null
@@ -1,25 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== form-static-valid.html form-static-valid.html
-== form-dynamic-valid.html form-dynamic-valid.html
-== form-remove-invalid-element.html form-remove-invalid-element.html
-== form-static-invalid.html form-static-invalid.html
-== form-dynamic-invalid.html form-dynamic-invalid.html
-== form-add-control.html form-add-control.html
-== form-dynamic-invalid-not-barred.html form-dynamic-invalid-not-barred.html
-== form-remove-invalid-element.html form-remove-invalid-element.html
-== form-dynamic-invalid-barred.html form-dynamic-invalid-barred.html
-== form-static-invalid-barred.html form-static-invalid-barred.html
-== form-add-invalid-element.html form-add-invalid-element.html
-== form-add-valid-with-invalid-element.html form-add-valid-with-invalid-element.html
-== form-invalid-barred.html form-invalid-barred.html
-== form-add-valid-element.html form-add-valid-element.html
-== form-add-valid-with-no-element.html form-add-valid-with-no-element.html
-== form-add-invalid-with-valid-element.html form-add-invalid-with-valid-element.html
-== form-with-valid-and-invalid.html form-with-valid-and-invalid.html
-== form-add-invalid-element-dynamic.html form-add-invalid-element-dynamic.html
-== form-invalid-and-barred.html form-invalid-and-barred.html
-== form-invalid-and-barred-remove-barred.html form-invalid-and-barred-remove-barred.html
-== form-valid-and-barred.html form-valid-and-barred.html
-== form-valid-and-barred-remove-barred.html form-valid-and-barred-remove-barred.html
-== form-with-invalid-element-add-barred-dynamic.html form-with-invalid-element-add-barred-dynamic.html
-== form-with-valid-element-add-barred-dynamic.html form-with-valid-element-add-barred-dynamic.html
diff --git a/layout/reftests/css-invalid/input/reftest-stylo.list b/layout/reftests/css-invalid/input/reftest-stylo.list
deleted file mode 100644
index dc9dc5e8c..000000000
--- a/layout/reftests/css-invalid/input/reftest-stylo.list
+++ /dev/null
@@ -1,38 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== input-valid.html input-valid.html
-fuzzy-if(skiaContent,2,10) == input-customerror.html input-customerror.html
-skip-if(B2G||Mulet) == input-disabled.html input-disabled.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == input-dyn-disabled.html input-dyn-disabled.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== input-dyn-not-disabled.html input-dyn-not-disabled.html
-== input-readonly.html input-readonly.html
-== input-dyn-readonly.html input-dyn-readonly.html
-== input-dyn-not-readonly.html input-dyn-not-readonly.html
-skip == input-maxlength-valid.html input-maxlength-valid.html
-skip == input-maxlength-invalid.html input-maxlength-invalid.html
-== input-required-valid.html input-required-valid.html
-== input-required-invalid.html input-required-invalid.html
-== input-button.html input-button.html
-skip == input-reset.html input-reset.html
-== input-email-invalid.html input-email-invalid.html
-== input-email-valid.html input-email-valid.html
-== input-url-invalid.html input-url-invalid.html
-== input-url-valid.html input-url-valid.html
-== input-pattern-valid.html input-pattern-valid.html
-== input-pattern-invalid.html input-pattern-invalid.html
-== input-type-barred.html input-type-barred.html
-== input-type-invalid.html input-type-invalid.html
-== input-disabled-fieldset-1.html input-disabled-fieldset-1.html
-== input-disabled-fieldset-2.html input-disabled-fieldset-2.html
-skip == input-fieldset-legend.html input-fieldset-legend.html
-== input-radio-required.html input-radio-required.html
-fuzzy-if(skiaContent,2,10) == input-radio-customerror.html input-radio-customerror.html
-fuzzy-if(skiaContent,2,10) == input-radio-dyn-valid-1.html input-radio-dyn-valid-1.html
-fuzzy-if(skiaContent,2,10) == input-radio-dyn-valid-2.html input-radio-dyn-valid-2.html
-fuzzy-if(skiaContent,2,10) == input-radio-nogroup-required-valid.html input-radio-nogroup-required-valid.html
-fuzzy-if(skiaContent,2,10) == input-radio-nogroup-required-invalid.html input-radio-nogroup-required-invalid.html
-skip == input-radio-focus-click.html input-radio-focus-click.html
-== input-submit.html input-submit.html
-== input-image.html input-image.html
-# input type='hidden' shouldn't show
diff --git a/layout/reftests/css-invalid/output/reftest-stylo.list b/layout/reftests/css-invalid/output/reftest-stylo.list
deleted file mode 100644
index 3a855c81b..000000000
--- a/layout/reftests/css-invalid/output/reftest-stylo.list
+++ /dev/null
@@ -1,3 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== output-valid.html output-valid.html
-== output-invalid.html output-invalid.html
diff --git a/layout/reftests/css-invalid/reftest-stylo.list b/layout/reftests/css-invalid/reftest-stylo.list
deleted file mode 100644
index 2d75760b4..000000000
--- a/layout/reftests/css-invalid/reftest-stylo.list
+++ /dev/null
@@ -1,15 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# :invalid should not apply on fieldset (always barred from constraint validation)
-include fieldset/reftest-stylo.list
-
-# :invalid should apply on the following elements
-include button/reftest-stylo.list
-include input/reftest-stylo.list
-include select/reftest-stylo.list
-include textarea/reftest-stylo.list
-include output/reftest-stylo.list
-
-# default :invalid style
-include default-style/reftest-stylo.list
-
-include form/reftest-stylo.list
diff --git a/layout/reftests/css-invalid/select/reftest-stylo.list b/layout/reftests/css-invalid/select/reftest-stylo.list
deleted file mode 100644
index 9d68f50ec..000000000
--- a/layout/reftests/css-invalid/select/reftest-stylo.list
+++ /dev/null
@@ -1,16 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-needs-focus == select-valid.html select-valid.html
-fails fuzzy-if(skiaContent,1,3) needs-focus == select-invalid.html select-invalid.html
-fuzzy-if(skiaContent,2,6) needs-focus == select-disabled.html select-disabled.html
-skip-if(B2G||Mulet) fuzzy-if(skiaContent,2,6) needs-focus == select-dyn-disabled.html select-dyn-disabled.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails fuzzy-if(skiaContent,1,3) needs-focus == select-dyn-not-disabled.html select-dyn-not-disabled.html
-needs-focus == select-required-invalid.html select-required-invalid.html
-needs-focus == select-required-valid.html select-required-valid.html
-needs-focus == select-required-multiple-invalid.html select-required-multiple-invalid.html
-fuzzy-if(skiaContent,1,250) needs-focus == select-required-multiple-valid.html select-required-multiple-valid.html
-skip-if(B2G||Mulet) fails-if(Android) fuzzy-if(skiaContent,1,3) needs-focus == select-disabled-fieldset-1.html select-disabled-fieldset-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) fails-if(Android) fuzzy-if(skiaContent,2,3) needs-focus == select-disabled-fieldset-2.html select-disabled-fieldset-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fuzzy-if(skiaContent,2,5) needs-focus == select-fieldset-legend.html select-fieldset-legend.html
diff --git a/layout/reftests/css-invalid/select/reftest.list b/layout/reftests/css-invalid/select/reftest.list
index e76bb9042..f55e33a90 100644
--- a/layout/reftests/css-invalid/select/reftest.list
+++ b/layout/reftests/css-invalid/select/reftest.list
@@ -7,6 +7,6 @@ needs-focus == select-required-invalid.html select-required-ref.html
needs-focus == select-required-valid.html select-required-ref.html
needs-focus == select-required-multiple-invalid.html select-required-multiple-ref.html
fuzzy-if(skiaContent,1,250) needs-focus == select-required-multiple-valid.html select-required-multiple-ref.html
-fails-if(Android) fuzzy-if(skiaContent&&!Android,1,3) needs-focus == select-disabled-fieldset-1.html select-fieldset-ref.html
-fails-if(Android) fuzzy-if(skiaContent&&!Android,2,3) needs-focus == select-disabled-fieldset-2.html select-fieldset-ref.html
+fuzzy-if(skiaContent,1,3) needs-focus == select-disabled-fieldset-1.html select-fieldset-ref.html
+fuzzy-if(skiaContent,2,3) needs-focus == select-disabled-fieldset-2.html select-fieldset-ref.html
fuzzy-if(skiaContent,2,5) needs-focus == select-fieldset-legend.html select-fieldset-legend-ref.html
diff --git a/layout/reftests/css-invalid/textarea/reftest-stylo.list b/layout/reftests/css-invalid/textarea/reftest-stylo.list
deleted file mode 100644
index cd7a2facf..000000000
--- a/layout/reftests/css-invalid/textarea/reftest-stylo.list
+++ /dev/null
@@ -1,16 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== textarea-valid.html textarea-valid.html
-== textarea-customerror.html textarea-customerror.html
-== textarea-disabled.html textarea-disabled.html
-== textarea-dyn-disabled.html textarea-dyn-disabled.html
-== textarea-dyn-not-disabled.html textarea-dyn-not-disabled.html
-== textarea-readonly.html textarea-readonly.html
-== textarea-dyn-readonly.html textarea-dyn-readonly.html
-== textarea-dyn-not-readonly.html textarea-dyn-not-readonly.html
-skip == textarea-maxlength-valid.html textarea-maxlength-valid.html
-skip == textarea-maxlength-invalid.html textarea-maxlength-invalid.html
-== textarea-required-valid.html textarea-required-valid.html
-== textarea-required-invalid.html textarea-required-invalid.html
-== textarea-disabled-fieldset-1.html textarea-disabled-fieldset-1.html
-== textarea-disabled-fieldset-2.html textarea-disabled-fieldset-2.html
-== textarea-fieldset-legend.html textarea-fieldset-legend.html
diff --git a/layout/reftests/css-mediaqueries/reftest-stylo.list b/layout/reftests/css-mediaqueries/reftest-stylo.list
deleted file mode 100644
index e1bc51cd4..000000000
--- a/layout/reftests/css-mediaqueries/reftest-stylo.list
+++ /dev/null
@@ -1,50 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-fuzzy-if(Android,8,454) skip-if(B2G||Mulet) == mq_print_height.xhtml mq_print_height.xhtml
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop, bug 1178697
-skip-if(B2G||Mulet) == mq_print_deviceheight.xhtml mq_print_deviceheight.xhtml
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == mq_print_width.xhtml mq_print_width.xhtml
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == mq_print_minwidth.xhtml mq_print_minwidth.xhtml
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == mq_print_minheight.xhtml mq_print_minheight.xhtml
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == mq_print_aspectratio.xhtml mq_print_aspectratio.xhtml
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == mq_print_deviceaspectratio.xhtml mq_print_deviceaspectratio.xhtml
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == mq_print_devicewidth.xhtml mq_print_devicewidth.xhtml
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-fuzzy-if(Android,8,454) skip-if(B2G||Mulet) == mq_print_orientation.xhtml mq_print_orientation.xhtml
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-fuzzy-if(Android,8,454) skip-if(B2G||Mulet) == mq_print_maxheight.xhtml mq_print_maxheight.xhtml
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == mq_print_maxwidth.xhtml mq_print_maxwidth.xhtml
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-skip-if(B2G||Mulet) == mq_print_maxwidth_updown.xhtml mq_print_maxwidth_updown.xhtml
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == mq_print_maxheight_updown.xhtml mq_print_maxheight_updown.xhtml
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == mq_print_minheight_updown.xhtml mq_print_minheight_updown.xhtml
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == mq_print_minwidth_updown.xhtml mq_print_minwidth_updown.xhtml
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-skip == scoped-mq-update.html scoped-mq-update.html
-== system-metrics-1.html system-metrics-1.html
diff --git a/layout/reftests/css-mediaqueries/reftest.list b/layout/reftests/css-mediaqueries/reftest.list
index 4e4e28683..33c8108ea 100644
--- a/layout/reftests/css-mediaqueries/reftest.list
+++ b/layout/reftests/css-mediaqueries/reftest.list
@@ -1,4 +1,4 @@
-fuzzy-if(Android,8,454) == mq_print_height.xhtml mq_print-ref.xhtml # bug 1178697
+== mq_print_height.xhtml mq_print-ref.xhtml # bug 1178697
== mq_print_deviceheight.xhtml mq_print-ref.xhtml
== mq_print_width.xhtml mq_print-ref.xhtml
== mq_print_minwidth.xhtml mq_print-ref.xhtml
@@ -6,8 +6,8 @@ fuzzy-if(Android,8,454) == mq_print_height.xhtml mq_print-ref.xhtml # bug 117869
== mq_print_aspectratio.xhtml mq_print-ref.xhtml
== mq_print_deviceaspectratio.xhtml mq_print-ref.xhtml
== mq_print_devicewidth.xhtml mq_print-ref.xhtml
-fuzzy-if(Android,8,454) == mq_print_orientation.xhtml mq_print_orientation-ref.xhtml
-fuzzy-if(Android,8,454) == mq_print_maxheight.xhtml mq_print-ref.xhtml
+== mq_print_orientation.xhtml mq_print_orientation-ref.xhtml
+== mq_print_maxheight.xhtml mq_print-ref.xhtml
== mq_print_maxwidth.xhtml mq_print-ref.xhtml
== mq_print_maxwidth_updown.xhtml mq_print-ref.xhtml
diff --git a/layout/reftests/css-optional/reftest-stylo.list b/layout/reftests/css-optional/reftest-stylo.list
deleted file mode 100644
index 253f1b589..000000000
--- a/layout/reftests/css-optional/reftest-stylo.list
+++ /dev/null
@@ -1,11 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# Checking if these elements support :optional.
-== css-optional-textarea.html css-optional-textarea.html
-== css-optional-input.html css-optional-input.html
-== css-optional-select.html css-optional-select.html
-== css-optional-button.html css-optional-button.html
-
-# Checking dynamic behavior.
-== css-optional-dyn-1.html css-optional-dyn-1.html
-== css-optional-dyn-2.html css-optional-dyn-2.html
-
diff --git a/layout/reftests/css-parsing/reftest-stylo.list b/layout/reftests/css-parsing/reftest-stylo.list
deleted file mode 100644
index 4eaf3a490..000000000
--- a/layout/reftests/css-parsing/reftest-stylo.list
+++ /dev/null
@@ -1,10 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== at-rule-013.html at-rule-013.html
-== invalid-url-handling.xhtml invalid-url-handling.xhtml
-== pseudo-elements-1.html pseudo-elements-1.html
-== invalid-attr-1.html invalid-attr-1.html
-== at-rule-error-handling-import-1.html at-rule-error-handling-import-1.html
-== at-rule-error-handling-media-1.html at-rule-error-handling-media-1.html
-== invalid-font-face-descriptor-1.html invalid-font-face-descriptor-1.html
-== two-dash-identifiers.html two-dash-identifiers.html
-== supports-moz-bool-pref.html supports-moz-bool-pref.html
diff --git a/layout/reftests/css-placeholder/input/reftest-stylo.list b/layout/reftests/css-placeholder/input/reftest-stylo.list
deleted file mode 100644
index 8af78867b..000000000
--- a/layout/reftests/css-placeholder/input/reftest-stylo.list
+++ /dev/null
@@ -1,28 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# Tests using placeholder-focus-ref.html as a reference are disabled because
-# we can't change the caret colour nor disable it and we can't change the
-# text colour without changing the caret which means that the tested page has
-# a black caret with a grey text and the reference has a grey caret with grey
-# text. The only thing that is doable is to make the caret grey in the tested
-# page but that would make the test moot because a failure wouldn't be seen.
-# A real way to fix this would be to be able to style the caret or to implement
-# ::value (bug 648643), depending of the ::value behaviour (it could change the
-# caret colour and the text colour or just the text colour).
-
-== placeholder-simple.html placeholder-simple.html
-# needs-focus == placeholder-focus.html placeholder-focus.html
-needs-focus == placeholder-blur.html placeholder-blur.html
-== placeholder-value.html placeholder-value.html
-== placeholder-empty-string.html placeholder-empty-string.html
-== placeholder-add.html placeholder-add.html
-== placeholder-removal.html placeholder-removal.html
-== placeholder-value-set.html placeholder-value-set.html
-== placeholder-value-unset.html placeholder-value-unset.html
-== placeholder-value-reset.html placeholder-value-reset.html
-== placeholder-type-change-1.html placeholder-type-change-1.html
-== placeholder-type-change-2.html placeholder-type-change-2.html
-== css-display.html css-display.html
-# We can't check except by verifying that the output is different.
-# Same reasons as focus issues explained above.
-== css-opacity.html css-opacity.html
-== css-text-align.html css-text-align.html
diff --git a/layout/reftests/css-placeholder/reftest-stylo.list b/layout/reftests/css-placeholder/reftest-stylo.list
deleted file mode 100644
index 7d78a46b9..000000000
--- a/layout/reftests/css-placeholder/reftest-stylo.list
+++ /dev/null
@@ -1,8 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-include input/reftest-stylo.list
-include textarea/reftest-stylo.list
-
-fails fuzzy-if(skiaContent,1,4) == css-restrictions.html css-restrictions.html
-== css-simple-styling.html css-simple-styling.html
-== css-background.html css-background.html
-fails fuzzy-if(skiaContent,1,180) == ignore-pseudo-class.html ignore-pseudo-class.html
diff --git a/layout/reftests/css-placeholder/textarea/reftest-stylo.list b/layout/reftests/css-placeholder/textarea/reftest-stylo.list
deleted file mode 100644
index dd0812aec..000000000
--- a/layout/reftests/css-placeholder/textarea/reftest-stylo.list
+++ /dev/null
@@ -1,26 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# Tests using placeholder-focus-ref.html as a reference are disabled because
-# we can't change the caret colour nor disable it and we can't change the
-# text colour without changing the caret which means that the tested page has
-# a black caret with a grey text and the reference has a grey caret with grey
-# text. The only thing that is doable is to make the caret grey in the tested
-# page but that would make the test moot because a failure wouldn't be seen.
-# A real way to fix this would be to be able to style the caret or to implement
-# ::value (bug 648643), depending of the ::value behaviour (it could change the
-# caret colour and the text colour or just the text colour).
-
-== placeholder-simple.html placeholder-simple.html
-# needs-focus == placeholder-focus.html placeholder-focus.html
-needs-focus == placeholder-blur.html placeholder-blur.html
-== placeholder-value.html placeholder-value.html
-== placeholder-empty-string.html placeholder-empty-string.html
-== placeholder-add.html placeholder-add.html
-== placeholder-removal.html placeholder-removal.html
-== placeholder-value-set.html placeholder-value-set.html
-== placeholder-value-unset.html placeholder-value-unset.html
-== placeholder-value-reset.html placeholder-value-reset.html
-== css-resize.html css-resize.html
-== css-display.html css-display.html
-# We can't check except by verifying that the output is different.
-# Same reasons as focus issues explained above.
-== css-opacity.html css-opacity.html
diff --git a/layout/reftests/css-required/reftest-stylo.list b/layout/reftests/css-required/reftest-stylo.list
deleted file mode 100644
index 8574a5403..000000000
--- a/layout/reftests/css-required/reftest-stylo.list
+++ /dev/null
@@ -1,30 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# Checking if these types/elements support :required
-# == css-required-textarea.html css-required-textarea.html
-== css-required-radio.html css-required-radio.html
-== css-required-text.html css-required-text.html
-== css-required-checkbox.html css-required-checkbox.html
-== css-required-file.html css-required-file.html
-== css-required-password.html css-required-password.html
-== css-required-tel.html css-required-tel.html
-== css-required-search.html css-required-search.html
-== css-required-select.html css-required-select.html
-
-# Checking dynamic behavior with <input type='text'>
-== css-required-dyn-1.html css-required-dyn-1.html
-== css-required-dyn-2.html css-required-dyn-2.html
-== css-required-dyn-3.html css-required-dyn-3.html
-== css-required-dyn-4.html css-required-dyn-4.html
-== css-required-dyn-5.html css-required-dyn-5.html
-== css-required-dyn-6.html css-required-dyn-6.html
-
-# Following input types do not support :required
-== css-required-hidden.html css-required-hidden.html
-== css-required-button.html css-required-button.html
-== css-required-submit.html css-required-submit.html
-== css-required-image.html css-required-image.html
-== css-required-reset.html css-required-reset.html
-
-# Following elements can be optional but can't be required
-== css-required-button-element.html css-required-button-element.html
-
diff --git a/layout/reftests/css-ruby/reftest-stylo.list b/layout/reftests/css-ruby/reftest-stylo.list
deleted file mode 100644
index 1ed58bea4..000000000
--- a/layout/reftests/css-ruby/reftest-stylo.list
+++ /dev/null
@@ -1,59 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== bidi-1.html bidi-1.html
-== bidi-2.html bidi-2.html
-== box-generation-1.html box-generation-1.html
-== box-generation-2.html box-generation-2.html
-== box-generation-3.html box-generation-3.html
-== box-generation-4.html box-generation-4.html
-== box-generation-5.html box-generation-5.html
-== box-properties-1.html box-properties-1.html
-== box-properties-2.html box-properties-2.html
-== box-properties-3.html box-properties-3.html
-== box-properties-4.html box-properties-4.html
-== dynamic-insertion-1.html dynamic-insertion-1.html
-== dynamic-insertion-2.html dynamic-insertion-2.html
-== dynamic-insertion-3.html dynamic-insertion-3.html
-== dynamic-removal-1.html dynamic-removal-1.html
-== dynamic-removal-2.html dynamic-removal-2.html
-== dynamic-removal-3.html dynamic-removal-3.html
-== float-handling.html float-handling.html
-fails test-pref(dom.meta-viewport.enabled,true) test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == inflated-ruby-1.html inflated-ruby-1.html
-== intra-level-whitespace-1.html intra-level-whitespace-1.html
-== intra-level-whitespace-2.html intra-level-whitespace-2.html
-== intra-level-whitespace-3.html intra-level-whitespace-3.html
-== intrinsic-isize-1.html intrinsic-isize-1.html
-== intrinsic-isize-2.html intrinsic-isize-2.html
-== justification-1.html justification-1.html
-== justification-2.html justification-2.html
-fuzzy-if(winWidget,255,792) == lang-specific-style-1.html lang-specific-style-1.html
-# bug 1134947
-== line-breaking-1.html line-breaking-1.html
-== line-breaking-2.html line-breaking-2.html
-fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),3,2) == line-break-suppression-1.html line-break-suppression-1.html
-fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),3,2) == line-break-suppression-2.html line-break-suppression-2.html
-== line-break-suppression-3.html line-break-suppression-3.html
-== line-break-suppression-4.html line-break-suppression-4.html
-== line-break-suppression-5.html line-break-suppression-5.html
-== line-height-1.html line-height-1.html
-== line-height-2.html line-height-2.html
-== line-height-3.html line-height-3.html
-== line-height-4.html line-height-4.html
-test-pref(font.minimum-size.ja,16) == min-font-size-1.html min-font-size-1.html
-skip load nested-ruby-1.html
-== no-transform.html no-transform.html
-== relative-positioning-1.html relative-positioning-1.html
-== relative-positioning-2.html relative-positioning-2.html
-== ruby-align-1.html ruby-align-1.html
-== ruby-align-1a.html ruby-align-1a.html
-== ruby-align-2.html ruby-align-2.html
-== ruby-align-2a.html ruby-align-2a.html
-== ruby-position-horizontal.html ruby-position-horizontal.html
-== ruby-position-vertical-lr.html ruby-position-vertical-lr.html
-== ruby-position-vertical-rl.html ruby-position-vertical-rl.html
-== ruby-reflow-1-opaqueruby.html ruby-reflow-1-opaqueruby.html
-fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),13,1) == ruby-reflow-1-transparentruby.html ruby-reflow-1-transparentruby.html
-== ruby-span-1.html ruby-span-1.html
-== ruby-whitespace-1.html ruby-whitespace-1.html
-== ruby-whitespace-2.html ruby-whitespace-2.html
-== bug1181890.html bug1181890.html
-== bug1181890.html bug1181890.html
diff --git a/layout/reftests/css-selectors/reftest-stylo.list b/layout/reftests/css-selectors/reftest-stylo.list
deleted file mode 100644
index 155b7c2c0..000000000
--- a/layout/reftests/css-selectors/reftest-stylo.list
+++ /dev/null
@@ -1,9 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== state-dependent-in-any.html state-dependent-in-any.html
-== attr-case-insensitive-1.html attr-case-insensitive-1.html
-skip == sibling-combinators-on-anon-content-1.xhtml sibling-combinators-on-anon-content-1.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip == sibling-combinators-on-anon-content-2.xhtml sibling-combinators-on-anon-content-2.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-== nth-child-1.html nth-child-1.html
-== nth-child-2.html nth-child-2.html
diff --git a/layout/reftests/css-sizing/reftest-stylo.list b/layout/reftests/css-sizing/reftest-stylo.list
deleted file mode 100644
index 76a94893d..000000000
--- a/layout/reftests/css-sizing/reftest-stylo.list
+++ /dev/null
@@ -1,5 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== min-intrinsic-with-percents-across-img-cases.html min-intrinsic-with-percents-across-img-cases.html
-== min-intrinsic-with-percents-across-elements.html min-intrinsic-with-percents-across-elements.html
-skip == min-intrinsic-with-max-width-percents-across-form-controls.html min-intrinsic-with-max-width-percents-across-form-controls.html
-skip == min-intrinsic-with-width-percents-across-form-controls.html min-intrinsic-with-width-percents-across-form-controls.html
diff --git a/layout/reftests/css-submit-invalid/button-submit/reftest-stylo.list b/layout/reftests/css-submit-invalid/button-submit/reftest-stylo.list
deleted file mode 100644
index f7dbf6283..000000000
--- a/layout/reftests/css-submit-invalid/button-submit/reftest-stylo.list
+++ /dev/null
@@ -1,17 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== static-valid.html static-valid.html
-== dynamic-valid.html dynamic-valid.html
-== static-invalid.html static-invalid.html
-== dynamic-invalid.html dynamic-invalid.html
-== dynamic-invalid-barred.html dynamic-invalid-barred.html
-== dynamic-invalid-barred-2.html dynamic-invalid-barred-2.html
-== dynamic-invalid-not-barred.html dynamic-invalid-not-barred.html
-== static-invalid-barred.html static-invalid-barred.html
-== remove-invalid-element.html remove-invalid-element.html
-== add-invalid-element.html add-invalid-element.html
-== add-submit-control.html add-submit-control.html
-== remove-submit-control.html remove-submit-control.html
-== change-type-submit-control.html change-type-submit-control.html
-== change-type-not-submit-control.html change-type-not-submit-control.html
-== self-invalid.html self-invalid.html
-== remove-form.html remove-form.html
diff --git a/layout/reftests/css-submit-invalid/default-style/reftest-stylo.list b/layout/reftests/css-submit-invalid/default-style/reftest-stylo.list
deleted file mode 100644
index 49b10e400..000000000
--- a/layout/reftests/css-submit-invalid/default-style/reftest-stylo.list
+++ /dev/null
@@ -1,4 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== input-submit.html input-submit.html
-== input-image.html input-image.html
-== button-submit.html button-submit.html
diff --git a/layout/reftests/css-submit-invalid/input-image/reftest-stylo.list b/layout/reftests/css-submit-invalid/input-image/reftest-stylo.list
deleted file mode 100644
index 868f916c5..000000000
--- a/layout/reftests/css-submit-invalid/input-image/reftest-stylo.list
+++ /dev/null
@@ -1,18 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== static-valid.html static-valid.html
-== dynamic-valid.html dynamic-valid.html
-== static-invalid.html static-invalid.html
-skip-if(B2G||Mulet) == dynamic-invalid.html dynamic-invalid.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== dynamic-invalid-barred.html dynamic-invalid-barred.html
-== dynamic-invalid-barred-2.html dynamic-invalid-barred-2.html
-== dynamic-invalid-not-barred.html dynamic-invalid-not-barred.html
-== static-invalid-barred.html static-invalid-barred.html
-== remove-invalid-element.html remove-invalid-element.html
-== add-invalid-element.html add-invalid-element.html
-== add-submit-control.html add-submit-control.html
-== remove-submit-control.html remove-submit-control.html
-== change-type-submit-control.html change-type-submit-control.html
-== change-type-not-submit-control.html change-type-not-submit-control.html
-== self-invalid.html self-invalid.html
-== remove-form.html remove-form.html
diff --git a/layout/reftests/css-submit-invalid/input-submit/reftest-stylo.list b/layout/reftests/css-submit-invalid/input-submit/reftest-stylo.list
deleted file mode 100644
index 868f916c5..000000000
--- a/layout/reftests/css-submit-invalid/input-submit/reftest-stylo.list
+++ /dev/null
@@ -1,18 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== static-valid.html static-valid.html
-== dynamic-valid.html dynamic-valid.html
-== static-invalid.html static-invalid.html
-skip-if(B2G||Mulet) == dynamic-invalid.html dynamic-invalid.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== dynamic-invalid-barred.html dynamic-invalid-barred.html
-== dynamic-invalid-barred-2.html dynamic-invalid-barred-2.html
-== dynamic-invalid-not-barred.html dynamic-invalid-not-barred.html
-== static-invalid-barred.html static-invalid-barred.html
-== remove-invalid-element.html remove-invalid-element.html
-== add-invalid-element.html add-invalid-element.html
-== add-submit-control.html add-submit-control.html
-== remove-submit-control.html remove-submit-control.html
-== change-type-submit-control.html change-type-submit-control.html
-== change-type-not-submit-control.html change-type-not-submit-control.html
-== self-invalid.html self-invalid.html
-== remove-form.html remove-form.html
diff --git a/layout/reftests/css-submit-invalid/reftest-stylo.list b/layout/reftests/css-submit-invalid/reftest-stylo.list
deleted file mode 100644
index 3ffd1e932..000000000
--- a/layout/reftests/css-submit-invalid/reftest-stylo.list
+++ /dev/null
@@ -1,5 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-include button-submit/reftest-stylo.list
-include input-image/reftest-stylo.list
-include input-submit/reftest-stylo.list
-include default-style/reftest-stylo.list
diff --git a/layout/reftests/css-transitions/reftest-stylo.list b/layout/reftests/css-transitions/reftest-stylo.list
deleted file mode 100644
index fe4eff44b..000000000
--- a/layout/reftests/css-transitions/reftest-stylo.list
+++ /dev/null
@@ -1,5 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-skip == transitions-inline-already-wrapped-1.html transitions-inline-already-wrapped-1.html
-skip == transitions-inline-already-wrapped-2.html transitions-inline-already-wrapped-2.html
-== transitions-inline-rewrap-1.html transitions-inline-rewrap-1.html
-== transitions-inline-rewrap-2.html transitions-inline-rewrap-2.html
diff --git a/layout/reftests/css-ui-invalid/button/reftest-stylo.list b/layout/reftests/css-ui-invalid/button/reftest-stylo.list
deleted file mode 100644
index b4097b45d..000000000
--- a/layout/reftests/css-ui-invalid/button/reftest-stylo.list
+++ /dev/null
@@ -1,14 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== button-valid.html button-valid.html
-fails fuzzy-if(skiaContent,1,3) == button-invalid.html button-invalid.html
-fuzzy-if(skiaContent,2,5) == button-disabled.html button-disabled.html
-fuzzy-if(skiaContent,2,5) == button-dyn-disabled.html button-dyn-disabled.html
-fails fuzzy-if(skiaContent,1,3) == button-dyn-not-disabled.html button-dyn-not-disabled.html
-fuzzy-if(skiaContent,1,3) == button-button.html button-button.html
-fails fuzzy-if(skiaContent,1,3) == button-reset.html button-reset.html
-fails fuzzy-if(skiaContent,1,3) == button-type-invalid.html button-type-invalid.html
-fails fuzzy-if(skiaContent,1,3) == button-type-barred.html button-type-barred.html
-fuzzy-if(skiaContent,1,3) == button-disabled-fieldset-1.html button-disabled-fieldset-1.html
-fuzzy-if(skiaContent,1,3) == button-disabled-fieldset-2.html button-disabled-fieldset-2.html
-fuzzy-if(skiaContent,1,4) == button-fieldset-legend.html button-fieldset-legend.html
-fails fuzzy-if(skiaContent,1,3) == button-novalidate.html button-novalidate.html
diff --git a/layout/reftests/css-ui-invalid/default-style/reftest-stylo.list b/layout/reftests/css-ui-invalid/default-style/reftest-stylo.list
deleted file mode 100644
index b2a2c35d9..000000000
--- a/layout/reftests/css-ui-invalid/default-style/reftest-stylo.list
+++ /dev/null
@@ -1,13 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== input.html input.html
-== button.html button.html
-== textarea.html textarea.html
-== select.html select.html
-== fieldset.html fieldset.html
-== output.html output.html
-random-if(winWidget) needs-focus == input-focus.html input-focus.html
-# Intermittent failures, bug 660224
-needs-focus == button-focus.html button-focus.html
-needs-focus == textarea-focus.html textarea-focus.html
-random-if(winWidget) needs-focus == select-focus.html select-focus.html
-# Intermittent failures, bug 660224
diff --git a/layout/reftests/css-ui-invalid/input/reftest-stylo.list b/layout/reftests/css-ui-invalid/input/reftest-stylo.list
deleted file mode 100644
index 993d7c245..000000000
--- a/layout/reftests/css-ui-invalid/input/reftest-stylo.list
+++ /dev/null
@@ -1,48 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== input-valid.html input-valid.html
-== input-customerror.html input-customerror.html
-skip-if(B2G||Mulet) fuzzy-if(skiaContent,1,3) == input-disabled.html input-disabled.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) fuzzy-if(skiaContent,1,3) == input-dyn-disabled.html input-dyn-disabled.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fuzzy-if(skiaContent,1,3) == input-dyn-not-disabled.html input-dyn-not-disabled.html
-fuzzy-if(skiaContent,1,3) == input-readonly.html input-readonly.html
-fuzzy-if(skiaContent,1,3) == input-dyn-readonly.html input-dyn-readonly.html
-fails fuzzy-if(skiaContent,1,3) == input-dyn-not-readonly-not-changed.html input-dyn-not-readonly-not-changed.html
-fails fuzzy-if(skiaContent,1,3) == input-dyn-not-readonly-changed.html input-dyn-not-readonly-changed.html
-skip == input-maxlength-valid.html input-maxlength-valid.html
-skip == input-maxlength-invalid-changed.html input-maxlength-invalid-changed.html
-skip == input-maxlength-invalid-default.html input-maxlength-invalid-default.html
-== input-required-valid.html input-required-valid.html
-fuzzy-if(skiaContent,1,3) == input-required-invalid-default.html input-required-invalid-default.html
-fails fuzzy-if(skiaContent,1,3) == input-required-invalid-changed.html input-required-invalid-changed.html
-fuzzy-if(skiaContent,2,5) == input-button.html input-button.html
-skip fuzzy-if(skiaContent,2,5) == input-reset.html input-reset.html
-== input-email-invalid-default.html input-email-invalid-default.html
-== input-email-invalid-changed.html input-email-invalid-changed.html
-fuzzy-if(skiaContent,2,5) == input-email-valid.html input-email-valid.html
-== input-url-invalid-changed.html input-url-invalid-changed.html
-== input-url-invalid-default.html input-url-invalid-default.html
-== input-url-valid.html input-url-valid.html
-== input-pattern-valid.html input-pattern-valid.html
-== input-pattern-invalid-default.html input-pattern-invalid-default.html
-== input-pattern-invalid-changed.html input-pattern-invalid-changed.html
-fuzzy-if(skiaContent,2,5) == input-type-barred.html input-type-barred.html
-== input-type-invalid.html input-type-invalid.html
-== input-disabled-fieldset-1.html input-disabled-fieldset-1.html
-fuzzy-if(skiaContent,1,3) == input-disabled-fieldset-2.html input-disabled-fieldset-2.html
-skip fuzzy-if(skiaContent,1,3) == input-fieldset-legend.html input-fieldset-legend.html
-== input-checkbox-required-invalid-changed.html input-checkbox-required-invalid-changed.html
-== input-checkbox-required-invalid-default.html input-checkbox-required-invalid-default.html
-== input-radio-required-invalid-changed.html input-radio-required-invalid-changed.html
-== input-radio-required-invalid-default.html input-radio-required-invalid-default.html
-== input-file-required-invalid-changed.html input-file-required-invalid-changed.html
-== input-file-required-invalid-default.html input-file-required-invalid-default.html
-== input-radio-required.html input-radio-required.html
-== input-radio-customerror.html input-radio-customerror.html
-== input-radio-dyn-valid-1.html input-radio-dyn-valid-1.html
-== input-radio-dyn-valid-2.html input-radio-dyn-valid-2.html
-== input-radio-nogroup-required-valid.html input-radio-nogroup-required-valid.html
-== input-radio-nogroup-required-invalid.html input-radio-nogroup-required-invalid.html
-fails fuzzy-if(skiaContent,1,3) == input-novalidate.html input-novalidate.html
-# input type='hidden' shouldn't show
diff --git a/layout/reftests/css-ui-invalid/output/reftest-stylo.list b/layout/reftests/css-ui-invalid/output/reftest-stylo.list
deleted file mode 100644
index 06d928065..000000000
--- a/layout/reftests/css-ui-invalid/output/reftest-stylo.list
+++ /dev/null
@@ -1,4 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== output-valid.html output-valid.html
-== output-invalid.html output-invalid.html
-== output-novalidate.html output-novalidate.html
diff --git a/layout/reftests/css-ui-invalid/reftest-stylo.list b/layout/reftests/css-ui-invalid/reftest-stylo.list
deleted file mode 100644
index a0db8feb5..000000000
--- a/layout/reftests/css-ui-invalid/reftest-stylo.list
+++ /dev/null
@@ -1,10 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# :-moz-ui-invalid should apply on the following elements
-include button/reftest-stylo.list
-include input/reftest-stylo.list
-include select/reftest-stylo.list
-include textarea/reftest-stylo.list
-include output/reftest-stylo.list
-
-# default :-moz-ui-invalid style
-include default-style/reftest-stylo.list
diff --git a/layout/reftests/css-ui-invalid/select/reftest-stylo.list b/layout/reftests/css-ui-invalid/select/reftest-stylo.list
deleted file mode 100644
index 666fa6ad5..000000000
--- a/layout/reftests/css-ui-invalid/select/reftest-stylo.list
+++ /dev/null
@@ -1,22 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-needs-focus == select-valid.html select-valid.html
-fails fuzzy-if(skiaContent,1,3) needs-focus == select-invalid.html select-invalid.html
-fails fuzzy-if(skiaContent,2,5) needs-focus == select-invalid-reset.html select-invalid-reset.html
-needs-focus == select-disabled.html select-disabled.html
-skip-if(B2G||Mulet) needs-focus == select-dyn-disabled.html select-dyn-disabled.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails fuzzy-if(skiaContent,1,3) needs-focus == select-dyn-not-disabled.html select-dyn-not-disabled.html
-fuzzy-if(skiaContent,2,5) needs-focus == select-required-invalid-1.html select-required-invalid-1.html
-fuzzy-if(skiaContent,2,5) needs-focus == select-required-invalid-2.html select-required-invalid-2.html
-fuzzy-if(skiaContent,2,5) needs-focus == select-required-invalid-changed-1.html select-required-invalid-changed-1.html
-fuzzy-if(skiaContent,2,5) needs-focus == select-required-invalid-changed-2.html select-required-invalid-changed-2.html
-fuzzy-if(skiaContent,2,5) needs-focus == select-required-valid.html select-required-valid.html
-needs-focus == select-required-multiple-invalid.html select-required-multiple-invalid.html
-fails fuzzy-if(asyncPan&&!layersGPUAccelerated,84,77) fuzzy-if(skiaContent,1,1000) needs-focus == select-required-multiple-invalid-changed.html select-required-multiple-invalid-changed.html
-needs-focus == select-required-multiple-valid.html select-required-multiple-valid.html
-skip-if(B2G||Mulet) fails-if(Android) fuzzy-if(skiaContent,2,10) needs-focus == select-disabled-fieldset-1.html select-disabled-fieldset-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) fails-if(Android) fuzzy-if(skiaContent,2,10) needs-focus == select-disabled-fieldset-2.html select-disabled-fieldset-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fuzzy-if(skiaContent,2,10) needs-focus == select-fieldset-legend.html select-fieldset-legend.html
-fails fuzzy-if(skiaContent,1,5) needs-focus == select-novalidate.html select-novalidate.html
diff --git a/layout/reftests/css-ui-invalid/select/reftest.list b/layout/reftests/css-ui-invalid/select/reftest.list
index 1fd197793..09239e33e 100644
--- a/layout/reftests/css-ui-invalid/select/reftest.list
+++ b/layout/reftests/css-ui-invalid/select/reftest.list
@@ -12,7 +12,7 @@ fuzzy-if(skiaContent,2,5) needs-focus == select-required-valid.html select-requi
needs-focus == select-required-multiple-invalid.html select-required-multiple-ref.html
fuzzy-if(asyncPan&&!layersGPUAccelerated,84,77) fuzzy-if(skiaContent,1,1000) needs-focus == select-required-multiple-invalid-changed.html select-required-multiple-ref.html
needs-focus == select-required-multiple-valid.html select-required-multiple-ref.html
-fails-if(Android) fuzzy-if(skiaContent&&!Android,2,10) needs-focus == select-disabled-fieldset-1.html select-fieldset-ref.html
-fails-if(Android) fuzzy-if(skiaContent&&!Android,2,10) needs-focus == select-disabled-fieldset-2.html select-fieldset-ref.html
+fuzzy-if(skiaContent,2,10) needs-focus == select-disabled-fieldset-1.html select-fieldset-ref.html
+fuzzy-if(skiaContent,2,10) needs-focus == select-disabled-fieldset-2.html select-fieldset-ref.html
fuzzy-if(skiaContent,2,10) needs-focus == select-fieldset-legend.html select-fieldset-legend-ref.html
fuzzy-if(skiaContent,1,5) needs-focus == select-novalidate.html select-required-ref.html
diff --git a/layout/reftests/css-ui-invalid/textarea/reftest-stylo.list b/layout/reftests/css-ui-invalid/textarea/reftest-stylo.list
deleted file mode 100644
index 7ef5790a4..000000000
--- a/layout/reftests/css-ui-invalid/textarea/reftest-stylo.list
+++ /dev/null
@@ -1,19 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== textarea-valid.html textarea-valid.html
-== textarea-customerror.html textarea-customerror.html
-== textarea-disabled.html textarea-disabled.html
-== textarea-dyn-disabled.html textarea-dyn-disabled.html
-== textarea-dyn-not-disabled.html textarea-dyn-not-disabled.html
-== textarea-readonly.html textarea-readonly.html
-== textarea-dyn-readonly.html textarea-dyn-readonly.html
-== textarea-dyn-not-readonly-not-changed.html textarea-dyn-not-readonly-not-changed.html
-== textarea-dyn-not-readonly-changed.html textarea-dyn-not-readonly-changed.html
-skip == textarea-maxlength-valid.html textarea-maxlength-valid.html
-skip == textarea-maxlength-invalid.html textarea-maxlength-invalid.html
-skip == textarea-maxlength-default-value-invalid.html textarea-maxlength-default-value-invalid.html
-== textarea-required-valid.html textarea-required-valid.html
-== textarea-required-invalid.html textarea-required-invalid.html
-== textarea-required-invalid-changed.html textarea-required-invalid-changed.html
-== textarea-disabled-fieldset-1.html textarea-disabled-fieldset-1.html
-== textarea-disabled-fieldset-2.html textarea-disabled-fieldset-2.html
-== textarea-novalidate.html textarea-novalidate.html
diff --git a/layout/reftests/css-ui-valid/button/reftest-stylo.list b/layout/reftests/css-ui-valid/button/reftest-stylo.list
deleted file mode 100644
index 26f44fe35..000000000
--- a/layout/reftests/css-ui-valid/button/reftest-stylo.list
+++ /dev/null
@@ -1,14 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-fuzzy-if(skiaContent,2,2) == button-valid.html button-valid.html
-fails fuzzy-if(skiaContent,2,3) == button-invalid.html button-invalid.html
-== button-disabled.html button-disabled.html
-fuzzy-if(skiaContent,1,3) == button-dyn-disabled.html button-dyn-disabled.html
-fails fuzzy-if(skiaContent,2,3) == button-dyn-not-disabled.html button-dyn-not-disabled.html
-fuzzy-if(skiaContent,2,3) == button-button.html button-button.html
-fails fuzzy-if(skiaContent,2,3) == button-reset.html button-reset.html
-fails fuzzy-if(skiaContent,2,3) == button-type-invalid.html button-type-invalid.html
-fails fuzzy-if(skiaContent,2,3) == button-type-barred.html button-type-barred.html
-== button-disabled-fieldset-1.html button-disabled-fieldset-1.html
-fuzzy-if(skiaContent,1,3) == button-disabled-fieldset-2.html button-disabled-fieldset-2.html
-fuzzy-if(skiaContent,1,3) == button-fieldset-legend.html button-fieldset-legend.html
-fails fuzzy-if(skiaContent,2,2) == button-novalidate.html button-novalidate.html
diff --git a/layout/reftests/css-ui-valid/input/reftest-stylo.list b/layout/reftests/css-ui-valid/input/reftest-stylo.list
deleted file mode 100644
index acf1da14b..000000000
--- a/layout/reftests/css-ui-valid/input/reftest-stylo.list
+++ /dev/null
@@ -1,47 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== input-valid.html input-valid.html
-== input-customerror.html input-customerror.html
-fails-if(B2G||Mulet) == input-disabled.html input-disabled.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(B2G||Mulet) fuzzy-if(skiaContent,1,3) == input-dyn-disabled.html input-dyn-disabled.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fuzzy-if(skiaContent,1,3) == input-dyn-not-disabled.html input-dyn-not-disabled.html
-fails fuzzy-if(skiaContent,1,3) == input-dyn-not-disabled-changed.html input-dyn-not-disabled-changed.html
-fuzzy-if(skiaContent,1,3) == input-readonly.html input-readonly.html
-fuzzy-if(skiaContent,1,3) == input-dyn-readonly.html input-dyn-readonly.html
-fuzzy-if(skiaContent,1,3) == input-dyn-not-readonly.html input-dyn-not-readonly.html
-skip == input-dyn-not-readonly-changed.html input-dyn-not-readonly-changed.html
-skip == input-maxlength-valid.html input-maxlength-valid.html
-skip == input-maxlength-valid-changed.html input-maxlength-valid-changed.html
-skip == input-maxlength-invalid.html input-maxlength-invalid.html
-== input-required-valid.html input-required-valid.html
-== input-required-valid-changed.html input-required-valid-changed.html
-fuzzy-if(skiaContent,1,3) == input-required-invalid.html input-required-invalid.html
-== input-button.html input-button.html
-skip == input-reset.html input-reset.html
-== input-email-invalid.html input-email-invalid.html
-== input-email-valid.html input-email-valid.html
-== input-email-valid-changed.html input-email-valid-changed.html
-== input-url-invalid.html input-url-invalid.html
-== input-url-valid.html input-url-valid.html
-== input-url-valid-changed.html input-url-valid-changed.html
-== input-pattern-valid.html input-pattern-valid.html
-skip == input-pattern-valid-changed.html input-pattern-valid-changed.html
-== input-pattern-invalid.html input-pattern-invalid.html
-== input-type-barred.html input-type-barred.html
-== input-type-invalid.html input-type-invalid.html
-== input-disabled-fieldset-1.html input-disabled-fieldset-1.html
-fuzzy-if(skiaContent,1,3) == input-disabled-fieldset-2.html input-disabled-fieldset-2.html
-skip fuzzy-if(skiaContent,1,3) == input-fieldset-legend.html input-fieldset-legend.html
-== input-checkbox-valid-changed.html input-checkbox-valid-changed.html
-== input-checkbox-valid-default.html input-checkbox-valid-default.html
-skip == input-file-valid-changed.html input-file-valid-changed.html
-== input-file-valid-default.html input-file-valid-default.html
-== input-radio-required.html input-radio-required.html
-== input-radio-customerror.html input-radio-customerror.html
-== input-radio-dyn-valid-1.html input-radio-dyn-valid-1.html
-== input-radio-dyn-valid-2.html input-radio-dyn-valid-2.html
-== input-radio-nogroup-required-valid.html input-radio-nogroup-required-valid.html
-== input-radio-nogroup-required-invalid.html input-radio-nogroup-required-invalid.html
-fails fuzzy-if(skiaContent,1,3) == input-novalidate.html input-novalidate.html
-# input type='hidden' shouldn't show
diff --git a/layout/reftests/css-ui-valid/output/reftest-stylo.list b/layout/reftests/css-ui-valid/output/reftest-stylo.list
deleted file mode 100644
index 06d928065..000000000
--- a/layout/reftests/css-ui-valid/output/reftest-stylo.list
+++ /dev/null
@@ -1,4 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== output-valid.html output-valid.html
-== output-invalid.html output-invalid.html
-== output-novalidate.html output-novalidate.html
diff --git a/layout/reftests/css-ui-valid/reftest-stylo.list b/layout/reftests/css-ui-valid/reftest-stylo.list
deleted file mode 100644
index bc70990c3..000000000
--- a/layout/reftests/css-ui-valid/reftest-stylo.list
+++ /dev/null
@@ -1,7 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# :-moz-ui-valid should apply on the following elements
-include button/reftest-stylo.list
-include input/reftest-stylo.list
-include select/reftest-stylo.list
-include textarea/reftest-stylo.list
-include output/reftest-stylo.list
diff --git a/layout/reftests/css-ui-valid/select/reftest-stylo.list b/layout/reftests/css-ui-valid/select/reftest-stylo.list
deleted file mode 100644
index efd559ede..000000000
--- a/layout/reftests/css-ui-valid/select/reftest-stylo.list
+++ /dev/null
@@ -1,21 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-needs-focus == select-valid.html select-valid.html
-fails fuzzy-if(skiaContent,2,5) needs-focus == select-valid-reset.html select-valid-reset.html
-fails fuzzy-if(skiaContent,1,3) needs-focus == select-invalid.html select-invalid.html
-fuzzy-if(skiaContent,2,4) needs-focus == select-disabled.html select-disabled.html
-fuzzy-if(skiaContent,2,4) needs-focus == select-dyn-disabled.html select-dyn-disabled.html
-fails fuzzy-if(skiaContent,1,3) needs-focus == select-dyn-not-disabled.html select-dyn-not-disabled.html
-fuzzy-if(skiaContent,2,5) needs-focus == select-required-invalid.html select-required-invalid.html
-fuzzy-if(skiaContent,2,5) needs-focus == select-required-valid-1.html select-required-valid-1.html
-fuzzy-if(skiaContent,2,5) needs-focus == select-required-valid-2.html select-required-valid-2.html
-fuzzy-if(skiaContent,2,5) needs-focus == select-required-valid-changed-1.html select-required-valid-changed-1.html
-fuzzy-if(skiaContent,2,5) needs-focus == select-required-valid-changed-2.html select-required-valid-changed-2.html
-needs-focus == select-required-multiple-invalid.html select-required-multiple-invalid.html
-needs-focus == select-required-multiple-valid.html select-required-multiple-valid.html
-fails fuzzy-if(asyncPan&&layersGPUAccelerated,84,77) fuzzy-if(skiaContent,1,1000) needs-focus == select-required-multiple-valid-changed.html select-required-multiple-valid-changed.html
-fails-if(Android||B2G||Mulet) needs-focus == select-disabled-fieldset-1.html select-disabled-fieldset-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(Android||B2G||Mulet) fuzzy-if(skiaContent,2,10) needs-focus == select-disabled-fieldset-2.html select-disabled-fieldset-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fuzzy-if(skiaContent,2,10) needs-focus == select-fieldset-legend.html select-fieldset-legend.html
-fails fuzzy-if(skiaContent,2,5) needs-focus == select-novalidate.html select-novalidate.html
diff --git a/layout/reftests/css-ui-valid/select/reftest.list b/layout/reftests/css-ui-valid/select/reftest.list
index 082a6fc0c..16e0eda32 100644
--- a/layout/reftests/css-ui-valid/select/reftest.list
+++ b/layout/reftests/css-ui-valid/select/reftest.list
@@ -12,7 +12,7 @@ fuzzy-if(skiaContent,2,5) needs-focus == select-required-valid-changed-2.html se
needs-focus == select-required-multiple-invalid.html select-required-multiple-ref.html
needs-focus == select-required-multiple-valid.html select-required-multiple-ref.html
fuzzy(64,4) fuzzy-if(asyncPan&&layersGPUAccelerated,84,77) fuzzy-if(skiaContent,1,1000) needs-focus == select-required-multiple-valid-changed.html select-required-multiple-ref.html
-fails-if(Android) needs-focus == select-disabled-fieldset-1.html select-fieldset-ref.html
-fails-if(Android) fuzzy-if(skiaContent&&!Android,2,10) needs-focus == select-disabled-fieldset-2.html select-fieldset-ref.html
+needs-focus == select-disabled-fieldset-1.html select-fieldset-ref.html
+fuzzy-if(skiaContent,2,10) needs-focus == select-disabled-fieldset-2.html select-fieldset-ref.html
fuzzy-if(skiaContent,2,10) needs-focus == select-fieldset-legend.html select-fieldset-legend-ref.html
fuzzy-if(skiaContent,2,5) needs-focus == select-novalidate.html select-required-ref.html
diff --git a/layout/reftests/css-ui-valid/textarea/reftest-stylo.list b/layout/reftests/css-ui-valid/textarea/reftest-stylo.list
deleted file mode 100644
index 06417ad92..000000000
--- a/layout/reftests/css-ui-valid/textarea/reftest-stylo.list
+++ /dev/null
@@ -1,21 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== textarea-valid.html textarea-valid.html
-== textarea-customerror.html textarea-customerror.html
-== textarea-disabled.html textarea-disabled.html
-== textarea-dyn-disabled.html textarea-dyn-disabled.html
-== textarea-dyn-not-disabled.html textarea-dyn-not-disabled.html
-== textarea-dyn-not-disabled-changed.html textarea-dyn-not-disabled-changed.html
-== textarea-readonly.html textarea-readonly.html
-== textarea-dyn-readonly.html textarea-dyn-readonly.html
-== textarea-dyn-not-readonly.html textarea-dyn-not-readonly.html
-== textarea-dyn-not-readonly-changed.html textarea-dyn-not-readonly-changed.html
-skip == textarea-maxlength-valid.html textarea-maxlength-valid.html
-skip == textarea-maxlength-valid-changed.html textarea-maxlength-valid-changed.html
-skip == textarea-maxlength-invalid.html textarea-maxlength-invalid.html
-== textarea-required-valid.html textarea-required-valid.html
-== textarea-required-valid-changed.html textarea-required-valid-changed.html
-== textarea-required-invalid.html textarea-required-invalid.html
-== textarea-disabled-fieldset-1.html textarea-disabled-fieldset-1.html
-== textarea-disabled-fieldset-2.html textarea-disabled-fieldset-2.html
-== textarea-fieldset-legend.html textarea-fieldset-legend.html
-== textarea-novalidate.html textarea-novalidate.html
diff --git a/layout/reftests/css-valid/button/reftest-stylo.list b/layout/reftests/css-valid/button/reftest-stylo.list
deleted file mode 100644
index 44f68ec36..000000000
--- a/layout/reftests/css-valid/button/reftest-stylo.list
+++ /dev/null
@@ -1,13 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== button-valid.html button-valid.html
-fails fuzzy-if(skiaContent,1,3) == button-invalid.html button-invalid.html
-== button-disabled.html button-disabled.html
-== button-dyn-disabled.html button-dyn-disabled.html
-fails fuzzy-if(skiaContent,1,3) == button-dyn-not-disabled.html button-dyn-not-disabled.html
-fuzzy-if(skiaContent,1,3) == button-button.html button-button.html
-fails fuzzy-if(skiaContent,1,3) == button-reset.html button-reset.html
-fails fuzzy-if(skiaContent,1,3) == button-type-invalid.html button-type-invalid.html
-fails fuzzy-if(skiaContent,1,3) == button-type-barred.html button-type-barred.html
-== button-disabled-fieldset-1.html button-disabled-fieldset-1.html
-fuzzy-if(skiaContent,1,3) == button-disabled-fieldset-2.html button-disabled-fieldset-2.html
-== button-fieldset-legend.html button-fieldset-legend.html
diff --git a/layout/reftests/css-valid/fieldset/reftest-stylo.list b/layout/reftests/css-valid/fieldset/reftest-stylo.list
deleted file mode 100644
index ddb014190..000000000
--- a/layout/reftests/css-valid/fieldset/reftest-stylo.list
+++ /dev/null
@@ -1,3 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== fieldset-valid.html fieldset-valid.html
-== fieldset-invalid.html fieldset-invalid.html
diff --git a/layout/reftests/css-valid/input/reftest-stylo.list b/layout/reftests/css-valid/input/reftest-stylo.list
deleted file mode 100644
index 4124b358b..000000000
--- a/layout/reftests/css-valid/input/reftest-stylo.list
+++ /dev/null
@@ -1,37 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== input-valid.html input-valid.html
-== input-customerror.html input-customerror.html
-fails-if(B2G||Mulet) fuzzy-if(skiaContent,1,3) == input-disabled.html input-disabled.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(B2G||Mulet) fuzzy-if(skiaContent,1,3) == input-dyn-disabled.html input-dyn-disabled.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fuzzy-if(skiaContent,1,3) == input-dyn-not-disabled.html input-dyn-not-disabled.html
-fuzzy-if(skiaContent,1,3) == input-readonly.html input-readonly.html
-fuzzy-if(skiaContent,1,3) == input-dyn-readonly.html input-dyn-readonly.html
-fuzzy-if(skiaContent,1,3) == input-dyn-not-readonly.html input-dyn-not-readonly.html
-skip == input-maxlength-valid.html input-maxlength-valid.html
-skip == input-maxlength-invalid.html input-maxlength-invalid.html
-== input-required-valid.html input-required-valid.html
-fuzzy-if(skiaContent,1,3) == input-required-invalid.html input-required-invalid.html
-fuzzy-if(skiaContent,2,5) == input-button.html input-button.html
-skip fuzzy-if(skiaContent,2,5) == input-reset.html input-reset.html
-== input-email-invalid.html input-email-invalid.html
-fuzzy-if(skiaContent,2,5) == input-email-valid.html input-email-valid.html
-== input-url-invalid.html input-url-invalid.html
-== input-url-valid.html input-url-valid.html
-== input-pattern-valid.html input-pattern-valid.html
-== input-pattern-invalid.html input-pattern-invalid.html
-fuzzy-if(skiaContent,2,5) == input-type-barred.html input-type-barred.html
-== input-type-invalid.html input-type-invalid.html
-== input-disabled-fieldset-1.html input-disabled-fieldset-1.html
-fuzzy-if(skiaContent,1,3) == input-disabled-fieldset-2.html input-disabled-fieldset-2.html
-skip == input-fieldset-legend.html input-fieldset-legend.html
-== input-radio-required.html input-radio-required.html
-== input-radio-customerror.html input-radio-customerror.html
-== input-radio-dyn-valid-1.html input-radio-dyn-valid-1.html
-== input-radio-dyn-valid-2.html input-radio-dyn-valid-2.html
-== input-radio-nogroup-required-valid.html input-radio-nogroup-required-valid.html
-== input-radio-nogroup-required-invalid.html input-radio-nogroup-required-invalid.html
-== input-submit.html input-submit.html
-== input-image.html input-image.html
-# input type='hidden' shouldn't show
diff --git a/layout/reftests/css-valid/output/reftest-stylo.list b/layout/reftests/css-valid/output/reftest-stylo.list
deleted file mode 100644
index 3a855c81b..000000000
--- a/layout/reftests/css-valid/output/reftest-stylo.list
+++ /dev/null
@@ -1,3 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== output-valid.html output-valid.html
-== output-invalid.html output-invalid.html
diff --git a/layout/reftests/css-valid/reftest-stylo.list b/layout/reftests/css-valid/reftest-stylo.list
deleted file mode 100644
index 6e196de26..000000000
--- a/layout/reftests/css-valid/reftest-stylo.list
+++ /dev/null
@@ -1,10 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# :valid should not apply on fieldset (always barred from constraint validation)
-include fieldset/reftest-stylo.list
-
-# :valid should apply on the following elements
-include button/reftest-stylo.list
-include input/reftest-stylo.list
-include select/reftest-stylo.list
-include textarea/reftest-stylo.list
-include output/reftest-stylo.list
diff --git a/layout/reftests/css-valid/select/reftest-stylo.list b/layout/reftests/css-valid/select/reftest-stylo.list
deleted file mode 100644
index 9a0b62b72..000000000
--- a/layout/reftests/css-valid/select/reftest-stylo.list
+++ /dev/null
@@ -1,15 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-fuzzy-if(skiaContent,2,7) needs-focus == select-valid.html select-valid.html
-fails fuzzy-if(skiaContent,2,5) needs-focus == select-invalid.html select-invalid.html
-needs-focus == select-disabled.html select-disabled.html
-fuzzy-if(skiaContent,1,5) needs-focus == select-dyn-disabled.html select-dyn-disabled.html
-fails fuzzy-if(skiaContent,2,5) needs-focus == select-dyn-not-disabled.html select-dyn-not-disabled.html
-needs-focus == select-required-invalid.html select-required-invalid.html
-needs-focus == select-required-valid.html select-required-valid.html
-needs-focus == select-required-multiple-invalid.html select-required-multiple-invalid.html
-fuzzy-if(skiaContent,1,250) needs-focus == select-required-multiple-valid.html select-required-multiple-valid.html
-fails-if(Android||B2G||Mulet) needs-focus == select-disabled-fieldset-1.html select-disabled-fieldset-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(Android||B2G||Mulet) fuzzy-if(skiaContent,1,3) needs-focus == select-disabled-fieldset-2.html select-disabled-fieldset-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-needs-focus == select-fieldset-legend.html select-fieldset-legend.html
diff --git a/layout/reftests/css-valid/select/reftest.list b/layout/reftests/css-valid/select/reftest.list
index e88d25f53..a61355136 100644
--- a/layout/reftests/css-valid/select/reftest.list
+++ b/layout/reftests/css-valid/select/reftest.list
@@ -7,6 +7,6 @@ needs-focus == select-required-invalid.html select-required-ref.html
needs-focus == select-required-valid.html select-required-ref.html
needs-focus == select-required-multiple-invalid.html select-required-multiple-ref.html
fuzzy-if(skiaContent,1,250) needs-focus == select-required-multiple-valid.html select-required-multiple-ref.html
-fails-if(Android) needs-focus == select-disabled-fieldset-1.html select-fieldset-ref.html
-fails-if(Android) fuzzy-if(skiaContent&&!Android,1,3) needs-focus == select-disabled-fieldset-2.html select-fieldset-ref.html
+needs-focus == select-disabled-fieldset-1.html select-fieldset-ref.html
+fuzzy-if(skiaContent,1,3) needs-focus == select-disabled-fieldset-2.html select-fieldset-ref.html
needs-focus == select-fieldset-legend.html select-fieldset-legend-ref.html
diff --git a/layout/reftests/css-valid/textarea/reftest-stylo.list b/layout/reftests/css-valid/textarea/reftest-stylo.list
deleted file mode 100644
index cd7a2facf..000000000
--- a/layout/reftests/css-valid/textarea/reftest-stylo.list
+++ /dev/null
@@ -1,16 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== textarea-valid.html textarea-valid.html
-== textarea-customerror.html textarea-customerror.html
-== textarea-disabled.html textarea-disabled.html
-== textarea-dyn-disabled.html textarea-dyn-disabled.html
-== textarea-dyn-not-disabled.html textarea-dyn-not-disabled.html
-== textarea-readonly.html textarea-readonly.html
-== textarea-dyn-readonly.html textarea-dyn-readonly.html
-== textarea-dyn-not-readonly.html textarea-dyn-not-readonly.html
-skip == textarea-maxlength-valid.html textarea-maxlength-valid.html
-skip == textarea-maxlength-invalid.html textarea-maxlength-invalid.html
-== textarea-required-valid.html textarea-required-valid.html
-== textarea-required-invalid.html textarea-required-invalid.html
-== textarea-disabled-fieldset-1.html textarea-disabled-fieldset-1.html
-== textarea-disabled-fieldset-2.html textarea-disabled-fieldset-2.html
-== textarea-fieldset-legend.html textarea-fieldset-legend.html
diff --git a/layout/reftests/css-valuesandunits/reftest-stylo.list b/layout/reftests/css-valuesandunits/reftest-stylo.list
deleted file mode 100644
index 2d1be233d..000000000
--- a/layout/reftests/css-valuesandunits/reftest-stylo.list
+++ /dev/null
@@ -1,19 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== unit-rem-div-fontsize.html unit-rem-div-fontsize.html
-== unit-rem-div-width-inner.html unit-rem-div-width-inner.html
-== unit-rem-div-width-outer.html unit-rem-div-width-outer.html
-skip-if(B2G||Mulet) == unit-rem-iframe.html unit-rem-iframe.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== unit-rem-root-fontsize.html unit-rem-root-fontsize.html
-== unit-rem-root-fontsize.html unit-rem-root-fontsize.html
-== unit-rem-root-width.html unit-rem-root-width.html
-== unit-rem.svg unit-rem.svg
-skip == unit-vh-vw.html unit-vh-vw.html
-== unit-vh-vw-zoom.html unit-vh-vw-zoom.html
-== unit-vh-vw-overflow-auto.html unit-vh-vw-overflow-auto.html
-== unit-vh-vw-overflow-scroll.html unit-vh-vw-overflow-scroll.html
-skip == unit-vh-vw-overflow-scroll-x.html unit-vh-vw-overflow-scroll-x.html
-== unit-vh-vw-overflow-scroll-y.html unit-vh-vw-overflow-scroll-y.html
-skip == unit-vh-vw-overflow-auto.html unit-vh-vw-overflow-auto.html
-# Initial mulet triage: parity with B2G/B2G Desktop
diff --git a/layout/reftests/css-valuesandunits/reftest.list b/layout/reftests/css-valuesandunits/reftest.list
index 5e251b004..94c2e1f81 100644
--- a/layout/reftests/css-valuesandunits/reftest.list
+++ b/layout/reftests/css-valuesandunits/reftest.list
@@ -12,4 +12,4 @@
== unit-vh-vw-overflow-scroll.html unit-vh-vw-overflow-scroll-ref.html
== unit-vh-vw-overflow-scroll-x.html unit-vh-vw-overflow-scroll-x-ref.html
== unit-vh-vw-overflow-scroll-y.html unit-vh-vw-overflow-scroll-y-ref.html
-skip-if(Android) != unit-vh-vw-overflow-auto.html unit-vh-vw-overflow-scroll.html
+!= unit-vh-vw-overflow-auto.html unit-vh-vw-overflow-scroll.html
diff --git a/layout/reftests/css-variables/reftest-stylo.list b/layout/reftests/css-variables/reftest-stylo.list
deleted file mode 100644
index 859f44c5e..000000000
--- a/layout/reftests/css-variables/reftest-stylo.list
+++ /dev/null
@@ -1,5 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-default-preferences pref(layout.css.variables.enabled,true)
-
-skip == variables-ruletree-cache-01.html variables-ruletree-cache-01.html
-skip == variables-ruletree-cache-02.html variables-ruletree-cache-02.html
diff --git a/layout/reftests/css-visited/reftest-stylo.list b/layout/reftests/css-visited/reftest-stylo.list
deleted file mode 100644
index 40236791f..000000000
--- a/layout/reftests/css-visited/reftest-stylo.list
+++ /dev/null
@@ -1,5 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# Because coloring of visited links is asynchronous and does not block
-# or fire any events, the tests in this directory are not run through
-# the reftest harness. Instead, they are run through
-# layout/style/tests/test_visited_reftests.html .
diff --git a/layout/reftests/cssom/reftest-stylo.list b/layout/reftests/cssom/reftest-stylo.list
deleted file mode 100644
index 0677cddf6..000000000
--- a/layout/reftests/cssom/reftest-stylo.list
+++ /dev/null
@@ -1,5 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-fails skip-if(B2G||Mulet) fuzzy-if(skiaContent,2,5) == computed-style-cross-window.html computed-style-cross-window.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== inline-style-null.html inline-style-null.html
diff --git a/layout/reftests/datalist/reftest-stylo.list b/layout/reftests/datalist/reftest-stylo.list
deleted file mode 100644
index fab81b721..000000000
--- a/layout/reftests/datalist/reftest-stylo.list
+++ /dev/null
@@ -1,3 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== datalist-simple.html datalist-simple.html
-== datalist-errors.html datalist-errors.html
diff --git a/layout/reftests/details-summary/disabled-no-summary-ref.html b/layout/reftests/details-summary/disabled-no-summary-ref.html
deleted file mode 100644
index 6ecdbcdc0..000000000
--- a/layout/reftests/details-summary/disabled-no-summary-ref.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<!-- Any copyright is dedicated to the Public Domain.
- - http://creativecommons.org/publicdomain/zero/1.0/ -->
-
-<html>
- <body>
- <div>
- <p>This is the details.</p>
- </div>
- </body>
-</html>
diff --git a/layout/reftests/details-summary/disabled-single-summary-ref.html b/layout/reftests/details-summary/disabled-single-summary-ref.html
deleted file mode 100644
index f643af6dc..000000000
--- a/layout/reftests/details-summary/disabled-single-summary-ref.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<!-- Any copyright is dedicated to the Public Domain.
- - http://creativecommons.org/publicdomain/zero/1.0/ -->
-
-<html>
- <body>
- <div>
- <div>Summary</div>
- <p>This is the details.</p>
- </div>
- </body>
-</html>
diff --git a/layout/reftests/details-summary/reftest-stylo.list b/layout/reftests/details-summary/reftest-stylo.list
deleted file mode 100644
index e23b1206b..000000000
--- a/layout/reftests/details-summary/reftest-stylo.list
+++ /dev/null
@@ -1,87 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-default-preferences pref(dom.details_element.enabled,true)
-
-# Disable <details> and <summary>
-pref(dom.details_element.enabled,false) == single-summary.html single-summary.html
-pref(dom.details_element.enabled,false) == open-single-summary.html open-single-summary.html
-pref(dom.details_element.enabled,false) == no-summary.html no-summary.html
-
-# Basic <summary> handling
-== multiple-summary.html multiple-summary.html
-== open-multiple-summary.html open-multiple-summary.html
-== summary-not-first-child.html summary-not-first-child.html
-== open-summary-not-first-child.html open-summary-not-first-child.html
-== open-summary-block-style.html open-summary-block-style.html
-== no-summary.html no-summary.html
-== open-no-summary.html open-no-summary.html
-== summary-not-in-details.html summary-not-in-details.html
-== summary-not-direct-child.html summary-not-direct-child.html
-== float-in-summary.html float-in-summary.html
-
-# Add elements dynamically
-== dynamic-add-single-summary.html dynamic-add-single-summary.html
-== dynamic-add-summary-not-first-child.html dynamic-add-summary-not-first-child.html
-== dynamic-add-summary-and-paragraph.html dynamic-add-summary-and-paragraph.html
-== dynamic-add-paragraph-before-summary.html dynamic-add-paragraph-before-summary.html
-== dynamic-add-paragraph-before-summary-close.html dynamic-add-paragraph-before-summary-close.html
-== dynamic-add-paragraph-after-summary.html dynamic-add-paragraph-after-summary.html
-== dynamic-add-paragraph-after-summary-close.html dynamic-add-paragraph-after-summary-close.html
-== dynamic-add-details.html dynamic-add-details.html
-== dynamic-add-first-summary.html dynamic-add-first-summary.html
-== dynamic-add-second-summary.html dynamic-add-second-summary.html
-
-# Remove elements dynamically
-== dynamic-remove-single-summary.html dynamic-remove-single-summary.html
-== dynamic-remove-summary-not-first-child.html dynamic-remove-summary-not-first-child.html
-== dynamic-remove-first-summary.html dynamic-remove-first-summary.html
-== dynamic-remove-second-summary.html dynamic-remove-second-summary.html
-
-# Toggle details by open attribute
-== close-nested-details.html close-nested-details.html
-== open-nested-details.html open-nested-details.html
-
-# With 'overflow' property
-== overflow-hidden-open-details.html overflow-hidden-open-details.html
-== overflow-auto-open-details.html overflow-auto-open-details.html
-
-# With pagination property
-== details-page-break-after-1.html details-page-break-after-1.html
-== details-page-break-after-2.html details-page-break-after-2.html
-== details-page-break-before-1.html details-page-break-before-1.html
-== details-page-break-before-2.html details-page-break-before-2.html
-
-# Various properties on details or summary
-== details-display-inline.html details-display-inline.html
-== details-percentage-height-children.html details-percentage-height-children.html
-== details-absolute-children.html details-absolute-children.html
-== details-three-columns.html details-three-columns.html
-== details-writing-mode.html details-writing-mode.html
-== details-in-ol.html details-in-ol.html
-== summary-three-columns.html summary-three-columns.html
-
-# Dispatch mouse click to summary
-== mouse-click-single-summary.html mouse-click-single-summary.html
-== mouse-click-twice-single-summary.html mouse-click-twice-single-summary.html
-== mouse-click-open-single-summary.html mouse-click-open-single-summary.html
-== mouse-click-twice-open-single-summary.html mouse-click-twice-open-single-summary.html
-== mouse-click-open-second-summary.html mouse-click-open-second-summary.html
-== mouse-click-overflow-hidden-details.html mouse-click-overflow-hidden-details.html
-== mouse-click-twice-overflow-hidden-details.html mouse-click-twice-overflow-hidden-details.html
-skip == mouse-click-overflow-auto-details.html mouse-click-overflow-auto-details.html
-== mouse-click-twice-overflow-auto-details.html mouse-click-twice-overflow-auto-details.html
-== mouse-click-display-none-details.html mouse-click-display-none-details.html
-== mouse-click-change-details-to-display-none.html mouse-click-change-details-to-display-none.html
-== mouse-click-change-summary-to-display-none.html mouse-click-change-summary-to-display-none.html
-== mouse-click-move-summary-to-different-details.html mouse-click-move-summary-to-different-details.html
-
-# Dispatch mouse click to out-of-flow details or summary
-== mouse-click-fixed-summary.html mouse-click-fixed-summary.html
-== mouse-click-twice-fixed-summary.html mouse-click-twice-fixed-summary.html
-== mouse-click-float-details.html mouse-click-float-details.html
-== mouse-click-twice-float-details.html mouse-click-twice-float-details.html
-
-# Dispatch keyboard event to summary
-== key-enter-single-summary.html key-enter-single-summary.html
-== key-enter-open-second-summary.html key-enter-open-second-summary.html
-== key-enter-prevent-default.html key-enter-prevent-default.html
-== key-space-single-summary.html key-space-single-summary.html
diff --git a/layout/reftests/details-summary/reftest.list b/layout/reftests/details-summary/reftest.list
index 92b1404b5..a972cf498 100644
--- a/layout/reftests/details-summary/reftest.list
+++ b/layout/reftests/details-summary/reftest.list
@@ -1,10 +1,3 @@
-default-preferences pref(dom.details_element.enabled,true)
-
-# Disable <details> and <summary>
-pref(dom.details_element.enabled,false) == single-summary.html disabled-single-summary-ref.html
-pref(dom.details_element.enabled,false) == open-single-summary.html disabled-single-summary-ref.html
-pref(dom.details_element.enabled,false) == no-summary.html disabled-no-summary-ref.html
-
# Basic <summary> handling
== multiple-summary.html single-summary.html
== open-multiple-summary.html open-multiple-summary-ref.html
@@ -108,3 +101,7 @@ fuzzy(1,1) == mouse-click-twice-float-details.html float-details.html # Bug 1316
== details-before.html single-summary.html
== open-details-after.html open-single-summary.html
== open-details-before.html open-single-summary.html
+
+# Move summary element
+== move-float-summary-to-different-details.html move-float-summary-to-different-details-ref.html
+== move-position-absolute-summary-to-different-details.html move-position-absolute-summary-to-different-details-ref.html
diff --git a/layout/reftests/dom/reftest-stylo.list b/layout/reftests/dom/reftest-stylo.list
deleted file mode 100644
index 266ec1c2b..000000000
--- a/layout/reftests/dom/reftest-stylo.list
+++ /dev/null
@@ -1,76 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# various tests involving dynamic insertion using the DOM
-
-# append a single element
-skip == appendsingle.html appendsingle.html
-
-# append several elements
-skip == appendmultiple.html appendmultiple.html
-
-# insert a single element
-== insertsingle.html insertsingle.html
-
-# insert several elements
-== insertmultiple.html insertmultiple.html
-
-# insert multiple nodes to a parent and one of its children
-== inserttoparentandchild-1.html inserttoparentandchild-1.html
-== inserttoparentandchild-2.html inserttoparentandchild-2.html
-
-# insert a parent with child and then insert more children to the parent
-== insertparentandchild.html insertparentandchild.html
-
-# insert nodes to two different parents
-== inserttwoparents.html inserttwoparents.html
-
-# multiple content inserts and appends
-# multiple range inserts
-== insertmultiplemultiple-1.html insertmultiplemultiple-1.html
-# a range insert and an append
-== insertmultiplemultiple-2.html insertmultiplemultiple-2.html
-# multiple range inserts and an append
-== insertmultiplemultiple-2.html insertmultiplemultiple-2.html
-
-# testing bindings that have multiple insertion points
-# skip XBL test case on B2G
-skip-if(B2G||Mulet) == multipleinsertionpoints-ref2.xhtml multipleinsertionpoints-ref2.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-# append a single element
-skip skip-if(B2G||Mulet) == multipleinsertionpoints-appendsingle-1.xhtml multipleinsertionpoints-appendsingle-1.xhtml
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip skip-if(B2G||Mulet) == multipleinsertionpoints-appendsingle-2.xhtml multipleinsertionpoints-appendsingle-2.xhtml
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-# append several elements
-skip skip-if(B2G||Mulet) == multipleinsertionpoints-appendmultiple.xhtml multipleinsertionpoints-appendmultiple.xhtml
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-# insert a single element
-skip-if(B2G||Mulet) == multipleinsertionpoints-insertsingle-1.xhtml multipleinsertionpoints-insertsingle-1.xhtml
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == multipleinsertionpoints-insertsingle-2.xhtml multipleinsertionpoints-insertsingle-2.xhtml
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-# insert several elements
-skip-if(B2G||Mulet) == multipleinsertionpoints-insertmultiple.xhtml multipleinsertionpoints-insertmultiple.xhtml
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-# test appending some nodes whose frame construction should be done lazily
-# followed by appending a node that might not be done lazily
-skip skip-if((B2G&&browserIsRemote)||Mulet) == multipleappendwithxul.xhtml multipleappendwithxul.xhtml
-# Bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip == multipleappendwithinput.xhtml multipleappendwithinput.xhtml
-skip == multipleappendwitheditable.xhtml multipleappendwitheditable.xhtml
-
-skip-if(B2G||Mulet) == xbl-children-1.xhtml xbl-children-1.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == xbl-children-2.xhtml xbl-children-2.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == xbl-children-3.xhtml xbl-children-3.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == xbl-children-4.xhtml xbl-children-4.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
diff --git a/layout/reftests/first-letter/reftest-stylo.list b/layout/reftests/first-letter/reftest-stylo.list
deleted file mode 100644
index 81751d0d6..000000000
--- a/layout/reftests/first-letter/reftest-stylo.list
+++ /dev/null
@@ -1,82 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# basic functionality
-== basic-1.html basic-1.html
-== basic-2.html basic-2.html
-
-# parent style context correct
-== parent-style-1.html parent-style-1.html
-
-# others
-== nested-1a.html nested-1a.html
-== nested-1b.html nested-1b.html
-== nested-1c.html nested-1c.html
-== nested-1d.html nested-1d.html
-== nested-1e.html nested-1e.html
-== nested-1f.html nested-1f.html
-== nested-1g.html nested-1g.html
-== quote-1a.html quote-1a.html
-== quote-1b.html quote-1b.html
-# bug 509685
-== quote-1c.html quote-1c.html
-# bug 509685
-== quote-1c.html quote-1c.html
-== quote-1d.html quote-1d.html
-== quote-1d.html quote-1d.html
-== quote-1e.html quote-1e.html
-# bug 509685
-== quote-1e.html quote-1e.html
-== quote-1f.html quote-1f.html
-== dynamic-1.html dynamic-1.html
-# bug 8253
-random-if(d2d) == dynamic-2.html dynamic-2.html
-== dynamic-3a.html dynamic-3a.html
-== dynamic-3b.html dynamic-3b.html
-== 23605-1.html 23605-1.html
-== 23605-2.html 23605-2.html
-== 23605-3.html 23605-3.html
-== 23605-4.html 23605-4.html
-== 23605-5.html 23605-5.html
-== 23605-6.html 23605-6.html
-== 229764-1.html 229764-1.html
-== 229764-2.html 229764-2.html
-== 329069-1.html 329069-1.html
-fails-if(Android) == 329069-2.html 329069-2.html
-# Bug 999139
-== 329069-3.html 329069-3.html
-== 329069-4.html 329069-4.html
-HTTP(..) == 329069-5.html 329069-5.html
-== 342120-1.xhtml 342120-1.xhtml
-== 379799-1.html 379799-1.html
-== 399941-1.html 399941-1.html
-== 399941-2.html 399941-2.html
-== 399941-3.html 399941-3.html
-== 399941-4.html 399941-4.html
-== 399941-5.html 399941-5.html
-== 399941-6.html 399941-6.html
-== 399941-7.html 399941-7.html
-== 399941-8.html 399941-8.html
-== 399941-9.html 399941-9.html
-== 429968-1a.html 429968-1a.html
-== 429968-1b.html 429968-1b.html
-== 429968-2a.html 429968-2a.html
-== 429968-2b.html 429968-2b.html
-== 429968-2c.html 429968-2c.html
-== 441418-1.html 441418-1.html
-== 469227-1.html 469227-1.html
-== 484400-1.html 484400-1.html
-skip == 594303-1.html 594303-1.html
-skip fails-if(winWidget||cocoaWidget) == 617869-1.html 617869-1.html
-== 723509-1.html 723509-1.html
-== 922550-1.html 922550-1.html
-== 958249.html 958249.html
-== font-text-styles.html font-text-styles.html
-skip == font-text-styles-floater.html font-text-styles-floater.html
-# bug 992846
-# Initial mulet triage: parity with B2G/B2G Desktop
-== inline-height-empty.html inline-height-empty.html
-HTTP(..) == indic-clusters-1.html indic-clusters-1.html
-== overflow-float-nooverflow.html overflow-float-nooverflow.html
-== overflow-float-overflow.html overflow-float-overflow.html
-== overflow-inline-nooverflow.html overflow-inline-nooverflow.html
-== overflow-inline-overflow.html overflow-inline-overflow.html
-== overflow-inline-overflow.html overflow-inline-overflow.html
diff --git a/layout/reftests/first-letter/reftest.list b/layout/reftests/first-letter/reftest.list
index bc7924206..9c6a03a16 100644
--- a/layout/reftests/first-letter/reftest.list
+++ b/layout/reftests/first-letter/reftest.list
@@ -35,7 +35,7 @@ random-if(d2d) == dynamic-2.html dynamic-2-ref.html
!= 229764-1.html 229764-ref.html
== 229764-2.html 229764-ref.html
== 329069-1.html 329069-1-ref.html
-fails-if(Android) == 329069-2.html 329069-2-ref.html # Bug 999139
+== 329069-2.html 329069-2-ref.html # Bug 999139
== 329069-3.html 329069-3-ref.html
== 329069-4.html 329069-4-ref.html
HTTP(..) == 329069-5.html 329069-5-ref.html
diff --git a/layout/reftests/first-line/reftest-stylo.list b/layout/reftests/first-line/reftest-stylo.list
deleted file mode 100644
index 4c2ad992c..000000000
--- a/layout/reftests/first-line/reftest-stylo.list
+++ /dev/null
@@ -1,49 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# basic functionality
-== basic-1.html basic-1.html
-
-# handling of out-of-flows when ::first-line happens
-== out-of-flow-1a.html out-of-flow-1a.html
-== out-of-flow-1b.html out-of-flow-1b.html
-== out-of-flow-1c.html out-of-flow-1c.html
-== out-of-flow-1d.html out-of-flow-1d.html
-# bug 396645
-
-# parent style context correct
-== parent-style-1.html parent-style-1.html
-== parent-style-2.html parent-style-2.html
-== parent-style-3.html parent-style-3.html
-
-# stress-tests
-skip load stress-1.html
-# assertion test
-skip == stress-2.html stress-2.html
-# assertion + rendering test
-skip load stress-3.html
-# assertion test
-load stress-4.html
-# assertion/crash test.
-load stress-5.html
-# assertion/crash test
-load stress-6.html
-# assertion/crash test
-load stress-7.html
-# assertion/crash test
-== stress-8.html stress-8.html
-# assertion/crash test
-== stress-9.html stress-9.html
-# assertion/crash test
-load stress-10.html
-# crash test
-== stress-11.xhtml stress-11.xhtml
-
-skip == border-not-apply.html border-not-apply.html
-skip == 287088-1.html 287088-1.html
-skip == 287088-2.html 287088-2.html
-== 403177-1.html 403177-1.html
-== 469227-2.html 469227-2.html
-== 469227-3.html 469227-3.html
-
-== restyle-inside-first-line.html restyle-inside-first-line.html
-== font-styles.html font-styles.html
-fuzzy-if(OSX==1010,1,2) == font-styles-nooverflow.html font-styles-nooverflow.html
diff --git a/layout/reftests/flexbox/pagination/reftest-stylo.list b/layout/reftests/flexbox/pagination/reftest-stylo.list
deleted file mode 100644
index 47156fa3a..000000000
--- a/layout/reftests/flexbox/pagination/reftest-stylo.list
+++ /dev/null
@@ -1,31 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# Tests with an empty flex container being fragmented:
-== flexbox-empty-1a.html flexbox-empty-1a.html
-== flexbox-empty-1b.html flexbox-empty-1b.html
-== flexbox-empty-1c.html flexbox-empty-1c.html
-== flexbox-empty-1d.html flexbox-empty-1d.html
-
-# Tests with an empty flex container that overflows a short fixed-height block
-# being fragmented:
-== flexbox-empty-1e.html flexbox-empty-1e.html
-== flexbox-empty-1f.html flexbox-empty-1f.html
-== flexbox-empty-1g.html flexbox-empty-1g.html
-== flexbox-empty-1h.html flexbox-empty-1h.html
-
-# Tests with an empty flex container being fragmented, with margin, border,
-# and/or padding being taller than the available height:
-== flexbox-empty-2a.html flexbox-empty-2a.html
-== flexbox-empty-2b.html flexbox-empty-2b.html
-== flexbox-empty-2c.html flexbox-empty-2c.html
-== flexbox-empty-2d.html flexbox-empty-2d.html
-
-# Tests for how we fragment a flex container with one unbreakable child
-== flexbox-unbreakable-child-1a.html flexbox-unbreakable-child-1a.html
-== flexbox-unbreakable-child-1a-wrap.html flexbox-unbreakable-child-1a-wrap.html
-== flexbox-unbreakable-child-1b.html flexbox-unbreakable-child-1b.html
-== flexbox-unbreakable-child-1b-wrap.html flexbox-unbreakable-child-1b-wrap.html
-== flexbox-unbreakable-child-1c.html flexbox-unbreakable-child-1c.html
-== flexbox-unbreakable-child-1c-wrap.html flexbox-unbreakable-child-1c-wrap.html
-== flexbox-unbreakable-child-1d.html flexbox-unbreakable-child-1d.html
-== flexbox-unbreakable-child-1d-wrap.html flexbox-unbreakable-child-1d-wrap.html
-== flexbox-unbreakable-child-2.html flexbox-unbreakable-child-2.html
diff --git a/layout/reftests/flexbox/reftest-stylo.list b/layout/reftests/flexbox/reftest-stylo.list
deleted file mode 100644
index be3987fba..000000000
--- a/layout/reftests/flexbox/reftest-stylo.list
+++ /dev/null
@@ -1,121 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# NOTE: Most of our flexbox tests have moved to the w3c-css reftest directory.
-# The tests that remain in *this* directory are still here because either:
-# a) They (or one of their closely-related tests) use some moz-prefixed
-# feature, e.g. MozReftestInvalidate or -moz-max-content.
-# ...or...
-# b) They test a feature that has known bugs (e.g. bug 874713)
-#
-# Where possible & practical, we should try to address these so we can migrate
-# tests over to the w3c-css directory, so that they can become part of the
-# W3C's test suite.
-
-# SUBDIRECTORY: Reftests for paginated flex containers
-include pagination/reftest-stylo.list
-
-# Tests for cross-axis alignment (align-self / align-items properties)
-== flexbox-align-self-baseline-horiz-2.xhtml flexbox-align-self-baseline-horiz-2.xhtml
-# bug 793456, and possibly others
-# This one fails on windows R (but not Ru, strangely). On Windows R, the
-# single-line <label> flex item has a different background size in test vs. ref
-fuzzy-if(B2G,10,3) fuzzy-if(cocoaWidget,1,2) random-if(winWidget) == flexbox-align-self-baseline-horiz-3.xhtml flexbox-align-self-baseline-horiz-3.xhtml
-# XXXdholbert investigate
-== flexbox-align-self-baseline-horiz-4.xhtml flexbox-align-self-baseline-horiz-4.xhtml
-
-# Tests for box-sizing on flex containers and flex items.
-== flexbox-box-sizing-on-container-horiz-1.html flexbox-box-sizing-on-container-horiz-1.html
-== flexbox-box-sizing-on-container-vert-1.html flexbox-box-sizing-on-container-vert-1.html
-== flexbox-box-sizing-on-items-horiz-1a.html flexbox-box-sizing-on-items-horiz-1a.html
-== flexbox-box-sizing-on-items-horiz-1b.html flexbox-box-sizing-on-items-horiz-1b.html
-== flexbox-box-sizing-on-items-vert-1a.html flexbox-box-sizing-on-items-vert-1a.html
-== flexbox-box-sizing-on-items-vert-1b.html flexbox-box-sizing-on-items-vert-1b.html
-
-# Tests for dynamic modifications of content inside/around a flex container
-== flexbox-dyn-changeFrameWidth-1.xhtml flexbox-dyn-changeFrameWidth-1.xhtml
-== flexbox-dyn-changeFrameWidth-2.xhtml flexbox-dyn-changeFrameWidth-2.xhtml
-== flexbox-dyn-changeFrameWidth-3.xhtml flexbox-dyn-changeFrameWidth-3.xhtml
-== flexbox-dyn-changeFrameWidth-4.xhtml flexbox-dyn-changeFrameWidth-4.xhtml
-== flexbox-dyn-changeOrder-1a.html flexbox-dyn-changeOrder-1a.html
-== flexbox-dyn-changeOrder-1b.html flexbox-dyn-changeOrder-1b.html
-== flexbox-dyn-changePadding-1a.xhtml flexbox-dyn-changePadding-1a.xhtml
-== flexbox-dyn-changePadding-1b.xhtml flexbox-dyn-changePadding-1b.xhtml
-
-# Tests for dynamic insertions of content into a flex container
-# (with existing [div | span | text] inside the flexbox, and new content
-# inserted adjacent to that existing content.)
-== flexbox-dyn-insertAroundDiv-1.xhtml flexbox-dyn-insertAroundDiv-1.xhtml
-== flexbox-dyn-insertAroundDiv-2.xhtml flexbox-dyn-insertAroundDiv-2.xhtml
-== flexbox-dyn-insertAroundDiv-3.xhtml flexbox-dyn-insertAroundDiv-3.xhtml
-
-== flexbox-dyn-insertAroundSpan-1.xhtml flexbox-dyn-insertAroundSpan-1.xhtml
-== flexbox-dyn-insertAroundSpan-2.xhtml flexbox-dyn-insertAroundSpan-2.xhtml
-== flexbox-dyn-insertAroundSpan-3.xhtml flexbox-dyn-insertAroundSpan-3.xhtml
-
-== flexbox-dyn-insertAroundText-1.xhtml flexbox-dyn-insertAroundText-1.xhtml
-== flexbox-dyn-insertAroundText-2.xhtml flexbox-dyn-insertAroundText-2.xhtml
-== flexbox-dyn-insertAroundText-3.xhtml flexbox-dyn-insertAroundText-3.xhtml
-
-# Variant of one of the above tests, to regression-test an invalidation issue
-== flexbox-dyn-insertEmptySpan-1.xhtml flexbox-dyn-insertEmptySpan-1.xhtml
-
-# Tests for empty flexboxes (with no flex items)
-== flexbox-empty-1a.xhtml flexbox-empty-1a.xhtml
-== flexbox-empty-1b.xhtml flexbox-empty-1b.xhtml
-
-# Tests for handling of floated elements inside a flexbox
-== flexbox-float-1a.xhtml flexbox-float-1a.xhtml
-== flexbox-float-1b.xhtml flexbox-float-1b.xhtml
-== flexbox-float-1c.xhtml flexbox-float-1c.xhtml
-== flexbox-float-1d.xhtml flexbox-float-1d.xhtml
-== flexbox-float-2a.xhtml flexbox-float-2a.xhtml
-== flexbox-float-2b.xhtml flexbox-float-2b.xhtml
-
-# Tests for the order in which we paint flex items
-== flexbox-paint-ordering-3.html flexbox-paint-ordering-3.html
-# bug 874718
-
-# Tests for handling of absolutely/fixed/relatively-positioned flex items.
-== flexbox-position-absolute-1.xhtml flexbox-position-absolute-1.xhtml
-== flexbox-position-absolute-2.xhtml flexbox-position-absolute-2.xhtml
-== flexbox-position-absolute-3.xhtml flexbox-position-absolute-3.xhtml
-== flexbox-position-absolute-4.xhtml flexbox-position-absolute-4.xhtml
-== flexbox-position-fixed-3.xhtml flexbox-position-fixed-3.xhtml
-fuzzy-if(Android,16,400) == flexbox-position-fixed-1.xhtml flexbox-position-fixed-1.xhtml
-fuzzy-if(Android,16,400) == flexbox-position-fixed-2.xhtml flexbox-position-fixed-2.xhtml
-== flexbox-position-fixed-3.xhtml flexbox-position-fixed-3.xhtml
-== flexbox-position-fixed-4.xhtml flexbox-position-fixed-4.xhtml
-
-# Tests for inline content in a flexbox that gets wrapped in an anonymous block
-== flexbox-inlinecontent-horiz-1a.xhtml flexbox-inlinecontent-horiz-1a.xhtml
-# reference case rendering is incorrect; bug 858333
-skip == flexbox-inlinecontent-horiz-1b.xhtml flexbox-inlinecontent-horiz-1b.xhtml
-# reference case rendering is incorrect; bug 858333
-== flexbox-inlinecontent-horiz-2.xhtml flexbox-inlinecontent-horiz-2.xhtml
-== flexbox-inlinecontent-horiz-3a.xhtml flexbox-inlinecontent-horiz-3a.xhtml
-== flexbox-inlinecontent-horiz-3b.xhtml flexbox-inlinecontent-horiz-3b.xhtml
-== flexbox-inlinecontent-horiz-3c.xhtml flexbox-inlinecontent-horiz-3c.xhtml
-== flexbox-inlinecontent-horiz-4.xhtml flexbox-inlinecontent-horiz-4.xhtml
-== flexbox-inlinecontent-horiz-5.xhtml flexbox-inlinecontent-horiz-5.xhtml
-
-# Tests for intrinsic sizing of flexboxes
-== flexbox-intrinsic-sizing-horiz-1a.xhtml flexbox-intrinsic-sizing-horiz-1a.xhtml
-== flexbox-intrinsic-sizing-horiz-1b.xhtml flexbox-intrinsic-sizing-horiz-1b.xhtml
-== flexbox-intrinsic-sizing-horiz-2a.xhtml flexbox-intrinsic-sizing-horiz-2a.xhtml
-== flexbox-intrinsic-sizing-horiz-2b.xhtml flexbox-intrinsic-sizing-horiz-2b.xhtml
-
-# Tests for invalidation after dynamic modifications
-== flexbox-invalidation-1.html flexbox-invalidation-1.html
-
-# Tests for flexbox in an iframe that gets resized.
-fails skip-if(B2G||Mulet) fuzzy-if(skiaContent,1,5) == flexbox-resizeviewport-1.xhtml flexbox-resizeviewport-1.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-# Tests for flexbox styling on things that don't support it
-== flexbox-styling-on-svg-1.svg flexbox-styling-on-svg-1.svg
-
-# Tests with widgets as flex items
-fuzzy-if(gtkWidget,1,66) == flexbox-widget-flex-items-1.html flexbox-widget-flex-items-1.html
-fuzzy-if(gtkWidget,1,74) == flexbox-widget-flex-items-2.html flexbox-widget-flex-items-2.html
-skip-if(gtkWidget) == flexbox-widget-flex-items-3.html flexbox-widget-flex-items-3.html
-# bug 1260965
-fails fuzzy-if(gtkWidget,1,31) == flexbox-widget-flex-items-4.html flexbox-widget-flex-items-4.html
diff --git a/layout/reftests/flexbox/reftest.list b/layout/reftests/flexbox/reftest.list
index 79ffa7e75..be156100e 100644
--- a/layout/reftests/flexbox/reftest.list
+++ b/layout/reftests/flexbox/reftest.list
@@ -17,7 +17,7 @@ fails == flexbox-align-self-baseline-horiz-2.xhtml flexbox-align-self-baseline-
# This one fails on windows R (but not Ru, strangely) and GTK.
# On Windows R and GTK, the single-line <label> flex item has a different
# background size in test vs. ref
-# Disabled this test in v52 because it depends on bug 418833: fuzzy-if(cocoaWidget,1,2) random-if(winWidget||gtkWidget) skip-if(Android) == flexbox-align-self-baseline-horiz-3.xhtml flexbox-align-self-baseline-horiz-3-ref.xhtml # XXXdholbert investigate the random-if. The skip-if(Android) is because checkbox/radio appearance:none doesn't work as expected.
+# Disabled this test in v52 because it depends on bug 418833: fuzzy-if(cocoaWidget,1,2) random-if(winWidget||gtkWidget) == flexbox-align-self-baseline-horiz-3.xhtml flexbox-align-self-baseline-horiz-3-ref.xhtml # XXXdholbert investigate the random-if.
== flexbox-align-self-baseline-horiz-4.xhtml flexbox-align-self-baseline-horiz-4-ref.xhtml
# Tests for box-sizing on flex containers and flex items.
@@ -78,8 +78,8 @@ fails == flexbox-paint-ordering-3.html flexbox-paint-ordering-3-ref.html # bug
== flexbox-position-absolute-3.xhtml flexbox-position-absolute-3-ref.xhtml
== flexbox-position-absolute-4.xhtml flexbox-position-absolute-4-ref.xhtml
== flexbox-position-fixed-3.xhtml flexbox-position-fixed-3-ref.xhtml
-fuzzy-if(Android,16,400) == flexbox-position-fixed-1.xhtml flexbox-position-fixed-1-ref.xhtml
-fuzzy-if(Android,16,400) == flexbox-position-fixed-2.xhtml flexbox-position-fixed-2-ref.xhtml
+== flexbox-position-fixed-1.xhtml flexbox-position-fixed-1-ref.xhtml
+== flexbox-position-fixed-2.xhtml flexbox-position-fixed-2-ref.xhtml
== flexbox-position-fixed-3.xhtml flexbox-position-fixed-3-ref.xhtml
== flexbox-position-fixed-4.xhtml flexbox-position-fixed-4-ref.xhtml
diff --git a/layout/reftests/floats/reftest-stylo.list b/layout/reftests/floats/reftest-stylo.list
deleted file mode 100644
index d93517f22..000000000
--- a/layout/reftests/floats/reftest-stylo.list
+++ /dev/null
@@ -1,121 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== border-box-wrap-around-float.html border-box-wrap-around-float.html
-== other-float-outside-rule-3-left.html other-float-outside-rule-3-left.html
-skip == other-float-outside-rule-3-right.html other-float-outside-rule-3-right.html
-== other-float-outside-rule-3-left-2.html other-float-outside-rule-3-left-2.html
-# bug 616334
-== other-float-outside-rule-3-right-2.html other-float-outside-rule-3-right-2.html
-# bug 616334
-== other-float-outside-rule-7-left.html other-float-outside-rule-7-left.html
-# bug 616334
-== other-float-outside-rule-7-right.html other-float-outside-rule-7-right.html
-# bug 616334
-fails fuzzy-if(gtkWidget,1,10) == float-outside-block-push.html float-outside-block-push.html
-# bug 815612
-== relative-float-1.html relative-float-1.html
-== relative-float-2.html relative-float-2.html
-== zero-height-float-base.html zero-height-float-base.html
-== zero-height-float.html zero-height-float.html
-# bug 81710
-== 345369-1.html 345369-1.html
-== 345369-2.html 345369-2.html
-== 345369-3.html 345369-3.html
-== 345369-4.html 345369-4.html
-== 345369-5.html 345369-5.html
-== 429974-1.html 429974-1.html
-== 478834-1.html 478834-1.html
-== 546048-1.html 546048-1.html
-== 775350-1.html 775350-1.html
-== 1114329.html 1114329.html
-== 1236745-1.html 1236745-1.html
-== float-in-rtl-1a.html float-in-rtl-1a.html
-fails fuzzy-if(skiaContent,1,27000) == float-in-rtl-1b.html float-in-rtl-1b.html
-fails fuzzy-if(skiaContent,1,27000) == float-in-rtl-1c.html float-in-rtl-1c.html
-fails fuzzy-if(skiaContent,1,27000) == float-in-rtl-1d.html float-in-rtl-1d.html
-== float-in-rtl-2a.html float-in-rtl-2a.html
-fails fuzzy-if(skiaContent,1,12000) == float-in-rtl-2b.html float-in-rtl-2b.html
-fails fuzzy-if(skiaContent,1,12000) == float-in-rtl-2c.html float-in-rtl-2c.html
-fails fuzzy-if(skiaContent,1,12000) == float-in-rtl-2d.html float-in-rtl-2d.html
-== float-in-rtl-3a.html float-in-rtl-3a.html
-fails fuzzy-if(skiaContent,1,27000) == float-in-rtl-3b.html float-in-rtl-3b.html
-fails fuzzy-if(skiaContent,1,27000) == float-in-rtl-3c.html float-in-rtl-3c.html
-fails fuzzy-if(skiaContent,1,27000) == float-in-rtl-3d.html float-in-rtl-3d.html
-skip == float-in-rtl-4a.html float-in-rtl-4a.html
-fails fuzzy-if(skiaContent,1,12000) == float-in-rtl-4b.html float-in-rtl-4b.html
-fails fuzzy-if(skiaContent,1,12000) == float-in-rtl-4c.html float-in-rtl-4c.html
-fails fuzzy-if(skiaContent,1,12000) == float-in-rtl-4d.html float-in-rtl-4d.html
-
-== bfc-displace-1a.html bfc-displace-1a.html
-== bfc-displace-1b.html bfc-displace-1b.html
-== bfc-displace-2a.html bfc-displace-2a.html
-== bfc-displace-2b.html bfc-displace-2b.html
-== bfc-displace-3a.html bfc-displace-3a.html
-== bfc-displace-3b.html bfc-displace-3b.html
-== bfc-displace-4.html bfc-displace-4.html
-== bfc-shrink-1.html bfc-shrink-1.html
-
-# Testcases that involve vertical writing mode.
-#
-# XXX The default-preferences setting here can be removed after the
-# pref has been made true by default for all channels (bug 1138384).
-
-
-
-== float-in-rtl-vlr-1a.html float-in-rtl-vlr-1a.html
-== float-in-rtl-vlr-1b.html float-in-rtl-vlr-1b.html
-== float-in-rtl-vlr-1c.html float-in-rtl-vlr-1c.html
-== float-in-rtl-vlr-1d.html float-in-rtl-vlr-1d.html
-== float-in-rtl-vlr-2a.html float-in-rtl-vlr-2a.html
-== float-in-rtl-vlr-2b.html float-in-rtl-vlr-2b.html
-== float-in-rtl-vlr-2c.html float-in-rtl-vlr-2c.html
-== float-in-rtl-vlr-2d.html float-in-rtl-vlr-2d.html
-== float-in-rtl-vlr-3a.html float-in-rtl-vlr-3a.html
-== float-in-rtl-vlr-3b.html float-in-rtl-vlr-3b.html
-== float-in-rtl-vlr-3c.html float-in-rtl-vlr-3c.html
-== float-in-rtl-vlr-3d.html float-in-rtl-vlr-3d.html
-== float-in-rtl-vlr-4a.html float-in-rtl-vlr-4a.html
-== float-in-rtl-vlr-4b.html float-in-rtl-vlr-4b.html
-== float-in-rtl-vlr-4c.html float-in-rtl-vlr-4c.html
-== float-in-rtl-vlr-4d.html float-in-rtl-vlr-4d.html
-== float-in-rtl-vrl-1a.html float-in-rtl-vrl-1a.html
-== float-in-rtl-vrl-1b.html float-in-rtl-vrl-1b.html
-== float-in-rtl-vrl-1c.html float-in-rtl-vrl-1c.html
-== float-in-rtl-vrl-1d.html float-in-rtl-vrl-1d.html
-== float-in-rtl-vrl-2a.html float-in-rtl-vrl-2a.html
-== float-in-rtl-vrl-2b.html float-in-rtl-vrl-2b.html
-== float-in-rtl-vrl-2c.html float-in-rtl-vrl-2c.html
-== float-in-rtl-vrl-2d.html float-in-rtl-vrl-2d.html
-== float-in-rtl-vrl-3a.html float-in-rtl-vrl-3a.html
-== float-in-rtl-vrl-3b.html float-in-rtl-vrl-3b.html
-== float-in-rtl-vrl-3c.html float-in-rtl-vrl-3c.html
-== float-in-rtl-vrl-3d.html float-in-rtl-vrl-3d.html
-== float-in-rtl-vrl-4a.html float-in-rtl-vrl-4a.html
-== float-in-rtl-vrl-4b.html float-in-rtl-vrl-4b.html
-== float-in-rtl-vrl-4c.html float-in-rtl-vrl-4c.html
-== float-in-rtl-vrl-4d.html float-in-rtl-vrl-4d.html
-fuzzy-if(OSX==1010,28,7) fuzzy-if(Android,16,2) == orthogonal-floats-1a.html orthogonal-floats-1a.html
-fuzzy-if(OSX==1010,28,7) == orthogonal-floats-1b.html orthogonal-floats-1b.html
-fuzzy-if(OSX==1010,103,802) fuzzy-if(winWidget,116,700) HTTP(..) == orthogonal-floats-1c.html orthogonal-floats-1c.html
-fuzzy-if(OSX==1010,103,802) fuzzy-if(winWidget,116,700) HTTP(..) == orthogonal-floats-1d.html orthogonal-floats-1d.html
-
-pref(layout.css.float-logical-values.enabled,true) == logical-float-side-1.html logical-float-side-1.html
-pref(layout.css.float-logical-values.enabled,true) == logical-float-side-2.html logical-float-side-2.html
-pref(layout.css.float-logical-values.enabled,true) == logical-float-side-3.html logical-float-side-3.html
-pref(layout.css.float-logical-values.enabled,true) == logical-float-side-4.html logical-float-side-4.html
-
-== float-in-rtl-slr-1a.html float-in-rtl-slr-1a.html
-== float-in-rtl-slr-1b.html float-in-rtl-slr-1b.html
-== float-in-rtl-slr-1c.html float-in-rtl-slr-1c.html
-== float-in-rtl-slr-1d.html float-in-rtl-slr-1d.html
-== float-in-rtl-slr-2a.html float-in-rtl-slr-2a.html
-== float-in-rtl-slr-2b.html float-in-rtl-slr-2b.html
-== float-in-rtl-slr-2c.html float-in-rtl-slr-2c.html
-== float-in-rtl-slr-2d.html float-in-rtl-slr-2d.html
-== float-in-rtl-slr-3a.html float-in-rtl-slr-3a.html
-== float-in-rtl-slr-3b.html float-in-rtl-slr-3b.html
-== float-in-rtl-slr-3c.html float-in-rtl-slr-3c.html
-== float-in-rtl-slr-3d.html float-in-rtl-slr-3d.html
-== float-in-rtl-slr-4a.html float-in-rtl-slr-4a.html
-== float-in-rtl-slr-4b.html float-in-rtl-slr-4b.html
-== float-in-rtl-slr-4c.html float-in-rtl-slr-4c.html
-== float-in-rtl-slr-4d.html float-in-rtl-slr-4d.html
diff --git a/layout/reftests/floats/reftest.list b/layout/reftests/floats/reftest.list
index cb732c2ca..d10818be2 100644
--- a/layout/reftests/floats/reftest.list
+++ b/layout/reftests/floats/reftest.list
@@ -82,7 +82,7 @@ fuzzy-if(skiaContent,1,12000) == float-in-rtl-4d.html float-in-rtl-4-ref.html
== float-in-rtl-vrl-4b.html float-in-rtl-vrl-4-ref.html
== float-in-rtl-vrl-4c.html float-in-rtl-vrl-4-ref.html
== float-in-rtl-vrl-4d.html float-in-rtl-vrl-4-ref.html
-fuzzy-if(OSX==1010,28,7) fuzzy-if(Android,16,2) == orthogonal-floats-1a.html orthogonal-floats-1-ref.html
+fuzzy-if(OSX==1010,28,7) == orthogonal-floats-1a.html orthogonal-floats-1-ref.html
fuzzy-if(OSX==1010,28,7) == orthogonal-floats-1b.html orthogonal-floats-1-ref.html
fuzzy-if(OSX==1010,103,802) fuzzy-if(winWidget,135,700) HTTP(..) == orthogonal-floats-1c.html orthogonal-floats-1-ref.html
fuzzy-if(OSX==1010,103,802) fuzzy-if(winWidget,135,700) HTTP(..) == orthogonal-floats-1d.html orthogonal-floats-1-ref.html
diff --git a/layout/reftests/font-face/reftest-stylo.list b/layout/reftests/font-face/reftest-stylo.list
deleted file mode 100644
index 2f417856a..000000000
--- a/layout/reftests/font-face/reftest-stylo.list
+++ /dev/null
@@ -1,235 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# Tests using downloaded fonts use HTTP(..) because they use fonts in
-# ../fonts/. We can't use file:/// URLs because of cross-directory access
-# restrictions on file: URLs.
-
-HTTP(..) == download-1.html download-1.html
-HTTP(..) == download-2.html download-2.html
-HTTP(..) == download-2.html download-2.html
-random-if(winWidget) HTTP(..) == download-2-big.html download-2-big.html
-# bug 470713
-HTTP(..) == download-2-big-otf.html download-2-big-otf.html
-asserts-if(Android&&!asyncPan,1-8) HTTP(..) == download-3-notref.html download-3-notref.html
-# bug 1019192
-asserts-if(Android,0-8) HTTP(..) == download-3-ref.html download-3-ref.html
-# same bugs as above
-asserts-if(Android,0-8) HTTP(..) == fallback-to-system-1.html fallback-to-system-1.html
-# just delayed assertions from above tests
-HTTP(..) == name-override-simple-1.html name-override-simple-1.html
-HTTP(..) == name-override-simple-1.html name-override-simple-1.html
-HTTP(..) == name-override-1.html name-override-1.html
-HTTP(..) == multiple-descriptor-1.html multiple-descriptor-1.html
-HTTP(..) == multiple-descriptor-1.html multiple-descriptor-1.html
-skip HTTP(..) == src-list-1.html src-list-1.html
-HTTP(..) == src-list-2.html src-list-2.html
-random-if(winWidget) HTTP(..) == src-list-2-big-otf.html src-list-2-big-otf.html
-# bug 470713
-skip-if(B2G||Mulet) HTTP(..) == src-list-format-1.html src-list-format-1.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-HTTP(..) == src-list-format-2.html src-list-format-2.html
-HTTP(..) == src-list-format-3.html src-list-format-3.html
-HTTP(..) == src-list-format-4.html src-list-format-4.html
-HTTP(..) == src-list-format-5.html src-list-format-5.html
-HTTP(..) == src-list-format-6.html src-list-format-6.html
-# assumes AAT fonts are only supported on MacOS
-skip-if(B2G||Mulet) random-if(cocoaWidget) HTTP(..) == src-list-format-7.html src-list-format-7.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) random-if(!cocoaWidget) HTTP(..) == src-list-format-7.html src-list-format-7.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(Android||B2G) == src-list-local-full.html src-list-local-full.html
-# bug 773482
-fails-if(Android||B2G) == src-list-local-full-quotes.html src-list-local-full-quotes.html
-# bug 773482
-skip-if(B2G||Mulet) HTTP(..) == src-list-local-fallback.html src-list-local-fallback.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-# data url tests (these don't need the HTTP server)
-== src-list-data-1.html src-list-data-1.html
-== src-list-data-2.html src-list-data-2.html
-== src-list-data-3.html src-list-data-3.html
-== src-list-data-4.html src-list-data-4.html
-
-# load with data url vs. font data load
-skip-if(B2G||Mulet) HTTP(..) == src-list-actual-font-ref.html src-list-actual-font-ref.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-# localized full fontnames should *not* match, only English ones (need locale-invariant key)
-skip HTTP(..) == src-list-local-localized.html src-list-local-localized.html
-# 486787, 486497
-
-# postscript name lookup
-# fontconfig only supports postscript name lookup from 2.10.92, Android/B2G not supported
-skip-if(B2G||Mulet) fails-if(Android) random-if(gtkWidget) == src-list-local-ps.html src-list-local-ps.html
-# bug 773482
-# Mac-specific test of 100 weight faces
-random-if(!cocoaWidget) == helveticaneue-ultra.html helveticaneue-ultra.html
-
-HTTP(..) == order-1.html order-1.html
-HTTP(..) == order-2.html order-2.html
-HTTP(..) == order-3.html order-3.html
-HTTP(..) == multiple-in-family-1.html multiple-in-family-1.html
-HTTP(..) == multiple-in-family-1b.html multiple-in-family-1b.html
-HTTP(..) == multiple-in-family-1.html multiple-in-family-1.html
-HTTP(..) == prop-order-over-rule-order-1a.html prop-order-over-rule-order-1a.html
-HTTP(..) == prop-order-over-rule-order-1b.html prop-order-over-rule-order-1b.html
-HTTP(..) == prop-order-over-rule-order-1a.html prop-order-over-rule-order-1a.html
-skip-if(B2G||Mulet) HTTP(..) == cross-iframe-1.html cross-iframe-1.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-# unicode-range
-HTTP(..) == unicoderange-1.html unicoderange-1.html
-HTTP(..) == unicoderange-2.html unicoderange-2.html
-HTTP(..) == unicoderange-3.html unicoderange-3.html
-HTTP(..) == unicoderange-4.html unicoderange-4.html
-
-# Dynamic changes
-# we need to skip these because of the bug that's causing order-2.html to fail
-skip == enable-sheet-1.html enable-sheet-1.html
-skip == enable-sheet-2.html enable-sheet-2.html
-skip == enable-sheet-3.html enable-sheet-3.html
-skip == enable-sheet-4.html enable-sheet-4.html
-skip == enable-sheet-5.html enable-sheet-5.html
-skip == enable-sheet-6.html enable-sheet-6.html
-skip == enable-sheet-7.html enable-sheet-7.html
-skip == disable-sheet-1.html disable-sheet-1.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-# We're missing disable-sheet-{2,3,6,7} (analogs to
-# enable-sheet{2,3,6,7}) because I don't know how to detect test
-# completion for those cases.
-skip == disable-sheet-4.html disable-sheet-4.html
-skip == disable-sheet-5.html disable-sheet-5.html
-skip-if(B2G||Mulet) HTTP(..) == sheet-set-base-1.html sheet-set-base-1.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip == sheet-set-switch-1.html sheet-set-switch-1.html
-# bug 468217
-skip == insert-rule-1a.html insert-rule-1a.html
-skip == insert-rule-1b.html insert-rule-1b.html
-skip == delete-rule-1.html delete-rule-1.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip == media-query-add-1.html media-query-add-1.html
-skip == media-query-remove-1.html media-query-remove-1.html
-skip == media-query-add-1-ref.html media-query-add-1-ref.html
-
-HTTP(..) == ahem-metrics-1.html ahem-metrics-1.html
-HTTP(..) == ex-unit-1.html ex-unit-1.html
-HTTP(..) == ex-unit-1-dynamic.html ex-unit-1-dynamic.html
-
-== local-1.html local-1.html
-== local-styled-1.html local-styled-1.html
-
-skip-if(B2G||Mulet) HTTP(..) == synthetic-weight-style.html synthetic-weight-style.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) HTTP(..) == synthetic-variations.html synthetic-variations.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-# Leak test
-skip HTTP(..) load 486974-1.html
-
-# compare fonts with and without bad head checksum
-HTTP(..) == load-badchecksum.html load-badchecksum.html
-
-# @font-face names take precedence over names of platform fonts (bug 494360)
-skip-if(B2G||Mulet) HTTP(..) == name-collision.html name-collision.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) HTTP(..) == name-collision-bad-url.html name-collision-bad-url.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-HTTP(..) == name-collision-with-prefs-font.html name-collision-with-prefs-font.html
-# bug 668758
-HTTP(..) == load-badfullname.html load-badfullname.html
-
-# 507960-1-* : a collection of tests using DeLarge from openfontlibrary.org
-# check that the original DeLarge face (ttf) loads; if this fails,
-# none of the following tests are meaningful
-HTTP(..) == 507960-1-nofont.html 507960-1-nofont.html
-# check that the WOFF version loads, with and without a format hint
-HTTP(..) == 507960-1-woff.html 507960-1-woff.html
-HTTP(..) == 507960-1-woff-hint.html 507960-1-woff-hint.html
-# try damaged fonts that should still load (bad checksums)
-HTTP(..) == 507960-1-bad-checksums-ttf.html 507960-1-bad-checksums-ttf.html
-HTTP(..) == 507960-1-bad-checksums-woff.html 507960-1-bad-checksums-woff.html
-# try versions that should NOT load (bad offsets, signatures, hint)
-HTTP(..) == 507960-1-bad-sfnt-version-ttf.html 507960-1-bad-sfnt-version-ttf.html
-HTTP(..) == 507960-1-bad-sfnt-version-woff.html 507960-1-bad-sfnt-version-woff.html
-skip-if(B2G||Mulet) HTTP(..) == 507960-1-bad-woff-sig.html 507960-1-bad-woff-sig.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-HTTP(..) == 507960-1-bad-offset-woff.html 507960-1-bad-offset-woff.html
-HTTP(..) == 507960-1-woff-bad-hint.html 507960-1-woff-bad-hint.html
-
-# Tests for bug 523717
-HTTP(..) == underline-offset-change-1.html underline-offset-change-1.html
-skip == underline-offset-change-2.html underline-offset-change-2.html
-fails-if(cocoaWidget) fails-if(winWidget) HTTP(..) == underline-offset-change-1-ref.html underline-offset-change-1-ref.html
-# Bug 534132
-
-HTTP(..) == 534352-1-extra-cmap-sentinel.html 534352-1-extra-cmap-sentinel.html
-HTTP(..) == bug533251.html bug533251.html
-
-# Bug 875287
-HTTP(..) == font-familiy-whitespace-1.html font-familiy-whitespace-1.html
-HTTP(..) == font-familiy-whitespace-1.html font-familiy-whitespace-1.html
-
-skip-if(B2G||Mulet||Android) HTTP(..) == ivs-1.html ivs-1.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-# Android bug 1250229
-skip-if(B2G||Mulet||Android) HTTP(..) == cjkcisvs-1.html cjkcisvs-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-# Android bug 1250229
-
-skip-if(B2G||Mulet) HTTP(..) == missing-names.html missing-names.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-# Tests for bug 670900 - handling of 404 (not found) error in @font-face URL
-# (using Chunkfive font data returned from a .sjs file)
-HTTP(..) == font-error-404-1.html font-error-404-1.html
-# HTTP status 404, don't load
-skip-if(B2G||Mulet) HTTP(..) == font-error-404-2.html font-error-404-2.html
-# HTTP status 200, load
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-HTTP(..) == font-error-404-1.html font-error-404-1.html
-# sanity-check that the results differ
-
-# Font load redirection
-HTTP(..) == font-redirect.html font-redirect.html
-
-# Tests for potential regressions from bug 879963
-== dynamic-duplicate-rule-1a.html dynamic-duplicate-rule-1a.html
-== dynamic-duplicate-rule-1b.html dynamic-duplicate-rule-1b.html
-== dynamic-duplicate-rule-1c.html dynamic-duplicate-rule-1c.html
-
-# Test for COLR and CPAL support
-HTTP(..) == color-1a.html color-1a.html
-HTTP(..) == color-1a.html color-1a.html
-HTTP(..) == color-1b.html color-1b.html
-HTTP(..) == color-2a.html color-2a.html
-HTTP(..) == color-2a.html color-2a.html
-
-pref(gfx.downloadable_fonts.woff2.enabled,true) HTTP(..) == woff2-1.html woff2-1.html
-
-# sanity tests for reflow behavior with downloadable fonts
-HTTP(..) == reflow-sanity-1.html reflow-sanity-1.html
-HTTP(..) == reflow-sanity-1-data.html reflow-sanity-1-data.html
-HTTP(..) == reflow-sanity-1.html reflow-sanity-1.html
-HTTP(..) == reflow-sanity-delay-1a.html reflow-sanity-delay-1a.html
-HTTP(..) == reflow-sanity-delay-1b.html reflow-sanity-delay-1b.html
-HTTP(..) == reflow-sanity-delay-1c.html reflow-sanity-delay-1c.html
-HTTP(..) == reflow-sanity-delay-1-metrics.html reflow-sanity-delay-1-metrics.html
-
-# font-display
-pref(layout.css.font-display.enabled,true) HTTP(..) == font-display-1.html font-display-1.html
-# normal font load (~500ms)
-pref(layout.css.font-display.enabled,true) fuzzy-if(OSX==1010,3,5) HTTP(..) == font-display-2.html font-display-2.html
-# font load takes 4500ms
-
diff --git a/layout/reftests/font-face/reftest.list b/layout/reftests/font-face/reftest.list
index f7d9eb87c..53cf6008a 100644
--- a/layout/reftests/font-face/reftest.list
+++ b/layout/reftests/font-face/reftest.list
@@ -7,9 +7,9 @@ HTTP(..) == download-2.html download-2-ref.html
HTTP(..) != download-2.html about:blank
random-if(winWidget||gtkWidget) HTTP(..) == download-2-big.html download-2-big-otf.html # bug 470713
HTTP(..) != download-2-big-otf.html about:blank
-asserts-if(Android&&!asyncPan,1-8) HTTP(..) != download-3-notref.html download-3.html # bug 1019192
-asserts-if(Android,0-8) HTTP(..) == download-3-ref.html download-3.html # same bugs as above
-asserts-if(Android,0-8) HTTP(..) == fallback-to-system-1.html fallback-to-system-1-ref.html # just delayed assertions from above tests
+HTTP(..) != download-3-notref.html download-3.html # bug 1019192
+HTTP(..) == download-3-ref.html download-3.html # same bugs as above
+HTTP(..) == fallback-to-system-1.html fallback-to-system-1-ref.html # just delayed assertions from above tests
HTTP(..) == name-override-simple-1.html name-override-simple-1-ref.html
HTTP(..) != name-override-simple-1.html download-1-notref.html
fails HTTP(..) == name-override-1.html name-override-1-ref.html
@@ -27,8 +27,8 @@ HTTP(..) == src-list-format-6.html src-list-format-3-ref.html
# assumes AAT fonts are only supported on MacOS
random-if(cocoaWidget) HTTP(..) == src-list-format-7.html src-list-format-2-ref.html
random-if(!cocoaWidget) HTTP(..) == src-list-format-7.html src-list-format-3-ref.html
-fails-if(Android) == src-list-local-full.html src-list-local-full-ref.html
-fails-if(Android) == src-list-local-full-quotes.html src-list-local-full-ref.html
+== src-list-local-full.html src-list-local-full-ref.html
+== src-list-local-full-quotes.html src-list-local-full-ref.html
HTTP(..) == src-list-local-fallback.html src-list-local-fallback-ref.html
# data url tests (these don't need the HTTP server)
@@ -44,8 +44,8 @@ HTTP(..) == src-list-actual-font-ref.html src-list-data-1.html
skip HTTP(..) == src-list-local-localized.html src-list-local-localized-ref.html # 486787, 486497
# postscript name lookup
-# fontconfig only supports postscript name lookup from 2.10.92, Android not supported
-fails-if(Android) random-if(gtkWidget) == src-list-local-ps.html src-list-local-full-ref.html
+# fontconfig only supports postscript name lookup from 2.10.92
+random-if(gtkWidget) == src-list-local-ps.html src-list-local-full-ref.html
# Mac-specific test of 100 weight faces
random-if(!cocoaWidget) == helveticaneue-ultra.html helveticaneue-ultra-ref.html
@@ -142,8 +142,8 @@ HTTP(..) == bug533251.html bug533251-ref.html
HTTP(..) == font-familiy-whitespace-1.html font-familiy-whitespace-1-ref.html
HTTP(..) != font-familiy-whitespace-1.html font-familiy-whitespace-1-notref.html
-skip-if(Android) HTTP(..) == ivs-1.html ivs-1-ref.html # Android bug 1250229
-skip-if(Android) HTTP(..) == cjkcisvs-1.html cjkcisvs-1-ref.html # Android bug 1250229
+HTTP(..) == ivs-1.html ivs-1-ref.html
+HTTP(..) == cjkcisvs-1.html cjkcisvs-1-ref.html
HTTP(..) == missing-names.html missing-names-ref.html
diff --git a/layout/reftests/font-features/reftest-stylo.list b/layout/reftests/font-features/reftest-stylo.list
deleted file mode 100644
index e8357d035..000000000
--- a/layout/reftests/font-features/reftest-stylo.list
+++ /dev/null
@@ -1,137 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# Tests for opentype font feature control (bug 511339)
-#
-# These rely on the Linux Libertine font (loaded via @font-face)
-# to ensure that features are present.
-
-# check that Turkish language causes a change in rendering (no fi ligature)
-# (also works via Pango)
-skip-if(B2G||Mulet) HTTP(..) == font-features-turkish.html font-features-turkish.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-# check that disabling ligatures causes a change
-HTTP(..) == font-features-noliga.html font-features-noliga.html
-
-# check that enabling optional ligatures causes a change
-HTTP(..) == font-features-hlig.html font-features-hlig.html
-
-# compare Turkish rendering with reference using ZWNJ to break the ligature
-HTTP(..) == font-features-turkish.html font-features-turkish.html
-
-# compare Turkish rendering with explicitly disabled ligatures
-HTTP(..) == font-features-turkish.html font-features-turkish.html
-
-# The following should pass even if feature support isn't available,
-# because both testcase and reference will have the default rendering,
-# though they're not really meaningful unless the tests above passed already.
-
-# compare feature specified within @font-face to same feature in style rule
-HTTP(..) == font-features-hlig-2.html font-features-hlig-2.html
-HTTP(..) == font-features-hlig-4.html font-features-hlig-4.html
-HTTP(..) == font-features-hlig-5.html font-features-hlig-5.html
-HTTP(..) == font-features-ligatures-none.html font-features-ligatures-none.html
-
-# check that feature in style rule overrides @font-face
-skip-if(B2G||Mulet) HTTP(..) == font-features-hlig-3.html font-features-hlig-3.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-# compare font-language-override rendering to lang-tagged rendering
-skip-if(B2G||Mulet) HTTP(..) == font-features-turkish-override-1.html font-features-turkish-override-1.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-HTTP(..) == font-features-turkish-override-2.html font-features-turkish-override-2.html
-
-# check use of font-language-override to override explicit lang tag
-HTTP(..) == font-features-turkish-override-3.html font-features-turkish-override-3.html
-HTTP(..) == font-features-turkish-override-4.html font-features-turkish-override-4.html
-skip-if(B2G||Mulet) HTTP(..) == font-features-turkish-override-5.html font-features-turkish-override-5.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-# check that last value wins if a feature is repeated
-HTTP(..) == font-features-order-1.html font-features-order-1.html
-HTTP(..) == font-features-order-2.html font-features-order-2.html
-
-# check priority of feature settings vs. font-variant subproperty
-HTTP(..) == font-features-order-3.html font-features-order-3.html
-HTTP(..) == font-features-order-4.html font-features-order-4.html
-HTTP(..) == font-features-order-5.html font-features-order-5.html
-
-# check priority involving feature settings and font-variant-alternates
-HTTP(..) == alternates-order.html alternates-order.html
-
-# check that font-specific values line up with @font-face feature settings
-HTTP(..) == annotations.html annotations.html
-
-# font-variant subproperties
-# test for specific features being on and others off, based on prop values
-# (debug problems with font-variant-debug.html which displays all props)
-skip == font-variant-alternates.html font-variant-alternates.html
-# MULET: Bug 1144079: Re-enable Mulet mochitests and reftests taskcluster-specific disables
-skip == font-variant-caps.html font-variant-caps.html
-# MULET: Bug 1144079: Re-enable Mulet mochitests and reftests taskcluster-specific disables
-skip == font-variant-east-asian.html font-variant-east-asian.html
-# MULET: Bug 1144079: Re-enable Mulet mochitests and reftests taskcluster-specific disables
-skip == font-variant-ligatures.html font-variant-ligatures.html
-# MULET: Bug 1144079: Re-enable Mulet mochitests and reftests taskcluster-specific disables
-skip == font-variant-numeric.html font-variant-numeric.html
-# MULET: Bug 1144079: Re-enable Mulet mochitests and reftests taskcluster-specific disables
-skip == font-variant-position.html font-variant-position.html
-# MULET: Bug 1144079: Re-enable Mulet mochitests and reftests taskcluster-specific disables
-
-# font-kerning
-HTTP(..) == font-kerning-normal.html font-kerning-normal.html
-HTTP(..) == font-kerning-auto.html font-kerning-auto.html
-HTTP(..) == font-kerning-auto.html font-kerning-auto.html
-HTTP(..) == font-kerning-normal.html font-kerning-normal.html
-HTTP(..) == font-kerning-none.html font-kerning-none.html
-HTTP(..) == font-kerning-1.html font-kerning-1.html
-HTTP(..) == font-kerning-2.html font-kerning-2.html
-HTTP(..) == font-kerning-3.html font-kerning-3.html
-HTTP(..) == font-kerning-table-none.html font-kerning-table-none.html
-
-# sanity check for kerning - with no spaces, kerning should occur
-HTTP(..) == kerning-sanity-check-kern.html kerning-sanity-check-kern.html
-HTTP(..) == kerning-sanity-check-nokern.html kerning-sanity-check-nokern.html
-
-# OpenType features should work across inter-word spaces
-HTTP(..) == font-features-across-space-1.html font-features-across-space-1.html
-HTTP(..) == spacelookups.html spacelookups.html
-# tests whether word cache is in use by testing for ignored space kerns
-HTTP(..) == spacelookups-wordcache.html spacelookups-wordcache.html
-# requires Japanese font with feature support, WinXP lacks one
-random-if(!winWidget&&!cocoaWidget) fails-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) HTTP(..) == fwid-spaces.html fwid-spaces.html
-# Arial/Times New Roman on Win7+/OSX 10.6+ have kerning pairs that include spaces
-random-if(!winWidget&&!cocoaWidget) fails-if(winWidget||cocoaWidget) random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) HTTP(..) == kerning-spaces-arial-nokern.html kerning-spaces-arial-nokern.html
-random-if(!winWidget&&!cocoaWidget) fails-if(winWidget||cocoaWidget) random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) HTTP(..) == kerning-spaces-arial-kern.html kerning-spaces-arial-kern.html
-random-if(!winWidget&&!cocoaWidget) fails-if(winWidget||cocoaWidget) random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) HTTP(..) == kerning-spaces-tnr-nokern.html kerning-spaces-tnr-nokern.html
-random-if(!winWidget&&!cocoaWidget) fails-if(winWidget||cocoaWidget) random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) HTTP(..) == kerning-spaces-tnr-kern.html kerning-spaces-tnr-kern.html
-
-# font-variant-caps fallback
-# -- sanity check - none of these should look like the default rendering
-HTTP(..) == caps-fallback-smallcaps1.html caps-fallback-smallcaps1.html
-HTTP(..) == caps-fallback-smallcaps2.html caps-fallback-smallcaps2.html
-HTTP(..) == caps-fallback-petitecaps.html caps-fallback-petitecaps.html
-HTTP(..) == caps-fallback-allsmallcaps.html caps-fallback-allsmallcaps.html
-HTTP(..) == caps-fallback-allpetitecaps.html caps-fallback-allpetitecaps.html
-# -- normal or fallback rendering
-HTTP(..) == caps-fallback-smallcaps1.html caps-fallback-smallcaps1.html
-HTTP(..) == caps-fallback-smallcaps2.html caps-fallback-smallcaps2.html
-HTTP(..) == caps-fallback-petitecaps.html caps-fallback-petitecaps.html
-HTTP(..) == caps-fallback-allsmallcaps.html caps-fallback-allsmallcaps.html
-HTTP(..) == caps-fallback-allpetitecaps.html caps-fallback-allpetitecaps.html
-
-# font-variant-position fallback
-random-if(cocoaWidget||Android) HTTP(..) == subsuper-fallback.html subsuper-fallback.html
-# bug 1139269
-HTTP(..) == subsuper-fallback.html subsuper-fallback.html
-HTTP(..) == subsuper-fallback.html subsuper-fallback.html
-HTTP(..) == subsuper-fallback.html subsuper-fallback.html
-HTTP(..) == subsuper-fallback-omega.html subsuper-fallback-omega.html
-HTTP(..) == subsuper-nofallback.html subsuper-nofallback.html
-random-if(cocoaWidget) HTTP(..) == subsuper-nofallback.html subsuper-nofallback.html
-# bug 1139269
-HTTP(..) == subsuper-nofallback.html subsuper-nofallback.html
-HTTP(..) == subsuper-fallback-size.html subsuper-fallback-size.html
diff --git a/layout/reftests/font-features/reftest.list b/layout/reftests/font-features/reftest.list
index e91d864db..2ad193105 100644
--- a/layout/reftests/font-features/reftest.list
+++ b/layout/reftests/font-features/reftest.list
@@ -109,7 +109,7 @@ HTTP(..) == caps-fallback-allsmallcaps.html caps-fallback-smcpc2sc.html
HTTP(..) == caps-fallback-allpetitecaps.html caps-fallback-smcpc2sc.html
# font-variant-position fallback
-random-if(cocoaWidget||Android) HTTP(..) == subsuper-fallback.html subsuper-fallback-ref.html # bug 1139269
+random-if(cocoaWidget) HTTP(..) == subsuper-fallback.html subsuper-fallback-ref.html # bug 1139269
HTTP(..) != subsuper-fallback.html subsuper-fallback-notref1.html
HTTP(..) != subsuper-fallback.html subsuper-fallback-notref2.html
HTTP(..) != subsuper-fallback.html subsuper-fallback-notref3.html
diff --git a/layout/reftests/font-inflation/reftest-stylo.list b/layout/reftests/font-inflation/reftest-stylo.list
deleted file mode 100644
index 9f2b02a66..000000000
--- a/layout/reftests/font-inflation/reftest-stylo.list
+++ /dev/null
@@ -1,121 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# The following tests were written before
-# font.size.inflation.lineThreshold was implemented, and thus assumed
-# that there wasn't a threshold of text required for inflation. To run
-# them compatibly without having to rewrite all of them, we run them
-# with the lineThreshold preference explicitly set to zero. However,
-# newer tests should probably focus more on testing nonzero values of
-# that preference.
-
-# The font-inflation code uses the meta-viewport tag as one of its inputs
-# when determining if font-inflation needs to be applied, so enable it for
-# these tests.
-default-preferences pref(dom.meta-viewport.enabled,true)
-
-fails test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) test-pref(font.size.inflation.maxRatio,200) == maxRatio-1.html maxRatio-1.html
-skip == text-1.html text-1.html
-fails test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == text-2.html text-2.html
-fails test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == text-3.html text-3.html
-fails test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == text-4.html text-4.html
-fails test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == height-constraint-percent-1.html height-constraint-percent-1.html
-fails test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == height-constraint-percent-2.html height-constraint-percent-2.html
-fails test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == height-constraint-percent-3.html height-constraint-percent-3.html
-test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == height-constraint-percent-4.html height-constraint-percent-4.html
-fails test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == height-constraint-percent-5.html height-constraint-percent-5.html
-test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == height-constraint-percent-6.html height-constraint-percent-6.html
-test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == height-constraint-percent-7.html height-constraint-percent-7.html
-fails test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == height-constraint-percent-8.html height-constraint-percent-8.html
-fails test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == decoration-1.html decoration-1.html
-fails test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == bullet-1.html bullet-1.html
-test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == input-text-1-height.html input-text-1-height.html
-fails test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == input-text-1-noheight.html input-text-1-noheight.html
-test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == input-text-2-height.html input-text-2-height.html
-test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == input-text-2-noheight.html input-text-2-noheight.html
-test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == input-text-3-height.html input-text-3-height.html
-test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == input-text-3-noheight.html input-text-3-noheight.html
-test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == textarea-1.html textarea-1.html
-test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == textarea-2.html textarea-2.html
-test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == textarea-3.html textarea-3.html
-fails test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == css-transform-1.html css-transform-1.html
-fails test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == css-transform-2.html css-transform-2.html
-fails skip-if(B2G||Mulet) fuzzy-if(asyncPan&&!layersGPUAccelerated,102,1764) test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == container-with-clamping.html container-with-clamping.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) load video-1.html
-fails test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) HTTP(..) == intrinsic-min-1.html intrinsic-min-1.html
-fails skip-if(B2G||Mulet) test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) HTTP(..) == intrinsic-max-1.html intrinsic-max-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) HTTP(..) == intrinsic-fit-1a.html intrinsic-fit-1a.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails skip-if(B2G||Mulet) test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) HTTP(..) == intrinsic-fit-1b.html intrinsic-fit-1b.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) HTTP(..) == intrinsic-fit-1c.html intrinsic-fit-1c.html
-test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) HTTP(..) == intrinsic-fit-2a.html intrinsic-fit-2a.html
-fails skip-if(B2G||Mulet) test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) HTTP(..) == intrinsic-fit-2b.html intrinsic-fit-2b.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails skip-if(B2G||Mulet) test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) HTTP(..) == intrinsic-fit-2c.html intrinsic-fit-2c.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == select-listbox-1.html select-listbox-1.html
-fails test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == select-listbox-1.html select-listbox-1.html
-fails test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == select-combobox-1.html select-combobox-1.html
-fails test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == select-combobox-1.html select-combobox-1.html
-fails skip-if(B2G||Mulet) test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == select-listbox-2.html select-listbox-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == select-listbox-2.html select-listbox-2.html
-fails test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == select-combobox-2.html select-combobox-2.html
-fails test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == select-combobox-2.html select-combobox-2.html
-test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == select-combobox-3.html select-combobox-3.html
-fails asserts-if(gtkWidget,0-4) test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == input-checkbox.html input-checkbox.html
-fails asserts-if(gtkWidget,0-4) test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == input-radio.html input-radio.html
-test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == disable-fontinfl-on-mobile.html disable-fontinfl-on-mobile.html
-test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == disable-fontinfl-on-mobile-2.html disable-fontinfl-on-mobile-2.html
-test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == disable-fontinfl-on-mobile-3.html disable-fontinfl-on-mobile-3.html
-fails test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == disable-fontinfl-on-mobile-5.html disable-fontinfl-on-mobile-5.html
-test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == preformatted-text.html preformatted-text.html
-fails test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == fixed-height-body.html fixed-height-body.html
-fails test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == fixed-height-body-child.html fixed-height-body-child.html
-fails test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == consecutive-inline.html consecutive-inline.html
-
-# The tests below use nonzero values of the lineThreshold preference.
-skip == text-1.html text-1.html
-skip test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,100) HTTP(..) == list-1.html list-1.html
-test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,100) == threshold-1a.html threshold-1a.html
-fails test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,100) == threshold-1b.html threshold-1b.html
-fails test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,100) == threshold-1c.html threshold-1c.html
-fails test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,100) == threshold-2.html threshold-2.html
-fails test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,100) == threshold-3.html threshold-3.html
-fails test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,100) == threshold-scope-float-1.html threshold-scope-float-1.html
-fails test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,100) == threshold-scope-float-2.html threshold-scope-float-2.html
-fails test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,100) == threshold-scope-float-overflow-1.html threshold-scope-float-overflow-1.html
-fails test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,100) == threshold-scope-float-overflow-2.html threshold-scope-float-overflow-2.html
-fails test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,100) == threshold-scope-cell-1.html threshold-scope-cell-1.html
-fails test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,100) == threshold-scope-cell-2.html threshold-scope-cell-2.html
-fails test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,100) == threshold-scope-cell-3.html threshold-scope-cell-3.html
-
-fuzzy-if(gtkWidget,1,10) test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,100) == threshold-textarea-contents-under-1.html threshold-textarea-contents-under-1.html
-skip-if(B2G||Mulet) fuzzy-if(gtkWidget,1,10) test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,100) == threshold-textarea-contents-under-2.html threshold-textarea-contents-under-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip == threshold-textarea-contents-at-1.html threshold-textarea-contents-at-1.html
-skip == threshold-textarea-contents-at-2.html threshold-textarea-contents-at-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fuzzy-if(gtkWidget,1,10) test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,100) == threshold-input-text-contents-under-1.html threshold-input-text-contents-under-1.html
-fuzzy-if(gtkWidget,1,10) test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,100) == threshold-input-text-contents-under-2.html threshold-input-text-contents-under-2.html
-skip == threshold-input-text-contents-at-1.html threshold-input-text-contents-at-1.html
-skip == threshold-input-text-contents-at-2.html threshold-input-text-contents-at-2.html
-skip == threshold-select-listbox-contents-under-1.html threshold-select-listbox-contents-under-1.html
-skip == threshold-select-listbox-contents-under-2.html threshold-select-listbox-contents-under-2.html
-skip == threshold-select-listbox-contents-at-1.html threshold-select-listbox-contents-at-1.html
-skip == threshold-select-listbox-contents-at-2.html threshold-select-listbox-contents-at-2.html
-skip == threshold-select-combobox-contents-under-1.html threshold-select-combobox-contents-under-1.html
-skip == threshold-select-combobox-contents-under-2.html threshold-select-combobox-contents-under-2.html
-skip == threshold-select-combobox-contents-at-1.html threshold-select-combobox-contents-at-1.html
-skip == threshold-select-combobox-contents-at-2.html threshold-select-combobox-contents-at-2.html
-
-fails test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == relevant-width-1.html relevant-width-1.html
-fails test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == relevant-width-overflow-1.html relevant-width-overflow-1.html
-
-pref(font.size.inflation.emPerLine,15) pref(font.size.inflation.forceEnabled,true) pref(font.size.inflation.lineThreshold,0) == min-width-passes-1.html min-width-passes-1.html
-
-pref(font.size.inflation.emPerLine,15) pref(font.size.inflation.forceEnabled,true) == xul-reflow-1.html xul-reflow-1.html
-
-# reset the default preferences
-default-preferences
diff --git a/layout/reftests/font-inflation/reftest.list b/layout/reftests/font-inflation/reftest.list
index 0bce85253..c8b1978b1 100644
--- a/layout/reftests/font-inflation/reftest.list
+++ b/layout/reftests/font-inflation/reftest.list
@@ -95,7 +95,7 @@ test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceE
test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,100) == threshold-select-listbox-contents-under-2.html threshold-select-listbox-contents-under-2.html
test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,100) == threshold-select-listbox-contents-at-1.html threshold-select-listbox-contents-at-1-ref.html
test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,100) == threshold-select-listbox-contents-at-2.html threshold-select-listbox-contents-at-2-ref.html
-fuzzy-if(gtkWidget,1,8) fuzzy-if(Android,4,2) test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,100) == threshold-select-combobox-contents-under-1.html threshold-select-combobox-contents-under-1.html
+fuzzy-if(gtkWidget,1,8) test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,100) == threshold-select-combobox-contents-under-1.html threshold-select-combobox-contents-under-1.html
fuzzy-if(gtkWidget,1,8) test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,100) == threshold-select-combobox-contents-under-2.html threshold-select-combobox-contents-under-2.html
fuzzy-if(gtkWidget,1,8) test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,100) == threshold-select-combobox-contents-at-1.html threshold-select-combobox-contents-at-1-ref.html
fuzzy-if(gtkWidget,1,8) test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,100) == threshold-select-combobox-contents-at-2.html threshold-select-combobox-contents-at-2-ref.html
diff --git a/layout/reftests/font-loading-api/reftest-stylo.list b/layout/reftests/font-loading-api/reftest-stylo.list
deleted file mode 100644
index 42b504c24..000000000
--- a/layout/reftests/font-loading-api/reftest-stylo.list
+++ /dev/null
@@ -1,12 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-default-preferences pref(layout.css.font-loading-api.enabled,true)
-
-HTTP(..) == dynamic-insert-1.html dynamic-insert-1.html
-fails HTTP(..) == dynamic-remove-1.html dynamic-remove-1.html
-HTTP(..) == ex-unit-1.html ex-unit-1.html
-skip == multiple-sets-1.html multiple-sets-1.html
-HTTP(..) == name-collision.html name-collision.html
-HTTP(..) == order-1.html order-1.html
-skip HTTP(..) == src-list-1.html src-list-1.html
-HTTP(..) == src-list-2.html src-list-2.html
-HTTP(..) == src-list-data-1.html src-list-data-1.html
diff --git a/layout/reftests/font-matching/reftest-stylo.list b/layout/reftests/font-matching/reftest-stylo.list
deleted file mode 100644
index 5902a983f..000000000
--- a/layout/reftests/font-matching/reftest-stylo.list
+++ /dev/null
@@ -1,143 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== CSS21-t1502-no-inherited-font-family.xhtml CSS21-t1502-no-inherited-font-family.xhtml
-
-# basic tests for bug 538730
-== synthetic-bold-1.html synthetic-bold-1.html
-== synthetic-bold-2.html synthetic-bold-2.html
-
-# synthetic bold/italic tests
-== defaultfont-bold.html defaultfont-bold.html
-== defaultfont-italic.html defaultfont-italic.html
-== defaultfont-oblique.html defaultfont-oblique.html
-== defaultfont-bolditalic.html defaultfont-bolditalic.html
-== defaultfont-bolditalic.html defaultfont-bolditalic.html
-
-== defaultjapanese-bold.html defaultjapanese-bold.html
-== defaultjapanese-italic.html defaultjapanese-italic.html
-== defaultjapanese-oblique.html defaultjapanese-oblique.html
-== defaultjapanese-bolditalic.html defaultjapanese-bolditalic.html
-== defaultjapanese-bolditalic.html defaultjapanese-bolditalic.html
-
-random-if(cocoaWidget) == impact-bold.html impact-bold.html
-# bug 539418
-== impact-italic.html impact-italic.html
-== impact-oblique.html impact-oblique.html
-== impact-bolditalic.html impact-bolditalic.html
-== impact-bolditalic.html impact-bolditalic.html
-
-== arialunicode-bold.html arialunicode-bold.html
-== arialunicode-italic.html arialunicode-italic.html
-== arialunicode-oblique.html arialunicode-oblique.html
-== arialunicode-bolditalic.html arialunicode-bolditalic.html
-== arialunicode-bolditalic.html arialunicode-bolditalic.html
-
-== lucidaconsole-bold.html lucidaconsole-bold.html
-== lucidaconsole-italic.html lucidaconsole-italic.html
-== lucidaconsole-oblique.html lucidaconsole-oblique.html
-== lucidaconsole-bolditalic.html lucidaconsole-bolditalic.html
-== lucidaconsole-bolditalic.html lucidaconsole-bolditalic.html
-
-# checking that we don't match fullnames, psnames (see bug 538103)
-== arial-variations-1.html arial-variations-1.html
-== arial-variations-2.html arial-variations-2.html
-== arial-variations-3.html arial-variations-3.html
-== arial-variations-4.html arial-variations-4.html
-== arial-variations-5.html arial-variations-5.html
-== arial-variations-6.html arial-variations-6.html
-
-# localized font family names should always match just as English names do
-== localized-family-names-001.html localized-family-names-001.html
-skip-if(Mulet) == localized-family-names-002.html localized-family-names-002.html
-# MULET: Bug 1144079: Re-enable Mulet mochitests and reftests taskcluster-specific disables
-fails-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu)&&!d2d) == localized-family-names-003.html localized-family-names-003.html
-# Bug 1258248
-== localized-family-names-004.html localized-family-names-004.html
-
-# family names with escaped spaces shouldn't match the names without the spaces
-== familyname-escapedidents.html familyname-escapedidents.html
-
-# weight mapping tests
-skip-if(B2G||Mulet) HTTP(..) == normalmedium.html normalmedium.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) HTTP(..) == normalmedium.html normalmedium.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-# Linux fails due to bug 604815
-skip fuzzy-if(OSX==1010&&browserIsRemote,1,23) HTTP(..) == weightmapping-12.html weightmapping-12.html
-skip HTTP(..) == weightmapping-25.html weightmapping-25.html
-skip HTTP(..) == weightmapping-45.html weightmapping-45.html
-skip HTTP(..) == weightmapping-458.html weightmapping-458.html
-skip HTTP(..) == weightmapping-478.html weightmapping-478.html
-skip HTTP(..) == weightmapping-7.html weightmapping-7.html
-skip fuzzy-if(OSX==1010,1,30) HTTP(..) == weightmapping-12579.html weightmapping-12579.html
-
-skip skip-if(B2G||Mulet) HTTP(..) == stretchmapping-all.html stretchmapping-all.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip skip-if(B2G||Mulet) HTTP(..) == stretchmapping-reverse.html stretchmapping-reverse.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip fuzzy-if(OSX==1010&&browserIsRemote,1,17) fuzzy-if(Android,4,8) HTTP(..) == stretchmapping-35.html stretchmapping-35.html
-skip fuzzy-if(OSX==1010,3,5) HTTP(..) == stretchmapping-137.html stretchmapping-137.html
-
-# test for font-stretch using @font-face
-skip-if(B2G||Mulet) skip-if(Android) HTTP(..) == font-stretch-1.html font-stretch-1.html
-# bugs 773482, 927602
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) skip-if(Android) HTTP(..) == font-shorthand-stretch-1.html font-shorthand-stretch-1.html
-# bugs 773482, 927602
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-# bug 724231 - applying synthetic styles to a single @font-face font
-# should apply artificial obliquing, not switch to a true styled face
-== synthetic-style-1.html synthetic-style-1.html
-== synthetic-style-2.html synthetic-style-2.html
-
-# Bug 765906 - synthetic bold should be used if necessary together with system fallback.
-# **NOTE** we skip these on Linux because of bug 769659.
-# test 1 uses Cherokee; expected to pass on OS X and Win7
-random-if(!(cocoaWidget||/^Windows\x20NT\x206\.1/.test(http.oscpu))) skip-if(gtkWidget) == bold-system-fallback-1.html bold-system-fallback-1.html
-# test 2 uses Chess symbols; expected to pass on Android
-random-if(!Android) skip-if(gtkWidget) == bold-system-fallback-2.html bold-system-fallback-2.html
-
-# Bug 769475 - applying 'italic' to Arabic text in Arial should NOT change family or metrics.
-# Expected to pass on MacOSX and Windows; other platforms unknown, depending on font availability.
-random-if(!(cocoaWidget||winWidget)) == arial-arabic.html arial-arabic.html
-
-== syntheticbold-rotated.html syntheticbold-rotated.html
-
-HTTP(..) == font-synthesis-1.html font-synthesis-1.html
-skip-if(Mulet) HTTP(..) == font-synthesis-2.html font-synthesis-2.html
-# MULET: Bug 1144079: Re-enable Mulet mochitests and reftests taskcluster-specific disables
-
-# Bug 1060791 - support for format 10 cmap in Apple Symbols;
-# relevant fonts not present on other platforms.
-skip skip-if(!cocoaWidget) HTTP(..) == apple-symbols-1.html apple-symbols-1.html
-
-# distinguish between italic and oblique
-== simple-oblique.html simple-oblique.html
-== italic-oblique-1.html italic-oblique-1.html
-== italic-oblique-2.html italic-oblique-2.html
-== italic-oblique-3.html italic-oblique-3.html
-== italic-oblique-4.html italic-oblique-4.html
-== italic-oblique-5.html italic-oblique-5.html
-== italic-oblique-6.html italic-oblique-6.html
-== italic-oblique-7.html italic-oblique-7.html
-== italic-oblique-8.html italic-oblique-8.html
-== italic-oblique-9.html italic-oblique-9.html
-== italic-oblique-kinnari.html italic-oblique-kinnari.html
-
-# system font generic per-language tests, only works under OSX currently
-# Bug 1212731 - initial implementation caused startup regression and
-# regression with full-width digits display in UI elements. Disable
-# tests until these problems are corrected.
-# random-if(!OSX) == system-generic-fallback-1.html system-generic-fallback-1.html
-# random-if(!OSX||OSX<1008) == system-generic-fallback-2.html system-generic-fallback-2.html
-# random-if(!OSX||OSX<1008) == system-generic-fallback-3.html system-generic-fallback-3.html
-# random-if(!OSX||OSX<1008) == system-generic-fallback-4.html system-generic-fallback-4.html
-# random-if(!OSX) == system-generic-fallback-ko.html system-generic-fallback-ko.html
-# random-if(!OSX) == system-generic-fallback-zh-tw.html system-generic-fallback-zh-tw.html
-# random-if(!OSX) == system-generic-fallback-zh-cn.html system-generic-fallback-zh-cn.html
-# random-if(!OSX) == system-generic-fallback-zh-tw.html system-generic-fallback-zh-tw.html
-
diff --git a/layout/reftests/font-matching/reftest.list b/layout/reftests/font-matching/reftest.list
index ec2c98f21..f9c396289 100644
--- a/layout/reftests/font-matching/reftest.list
+++ b/layout/reftests/font-matching/reftest.list
@@ -67,7 +67,7 @@ fuzzy-if(OSX==1010,1,30) HTTP(..) == weightmapping-12579.html weightmapping-1257
HTTP(..) == stretchmapping-all.html stretchmapping-all-ref.html
HTTP(..) == stretchmapping-reverse.html stretchmapping-reverse-ref.html
-fuzzy-if(OSX==1010&&browserIsRemote,1,17) fuzzy-if(Android,4,8) HTTP(..) == stretchmapping-35.html stretchmapping-35-ref.html
+fuzzy-if(OSX==1010&&browserIsRemote,1,17) HTTP(..) == stretchmapping-35.html stretchmapping-35-ref.html
fuzzy-if(OSX==1010,3,5) HTTP(..) == stretchmapping-137.html stretchmapping-137-ref.html
# test for font-stretch using @font-face
@@ -83,8 +83,7 @@ HTTP(..) == font-shorthand-stretch-1.html font-stretch-1-ref.html
# **NOTE** we skip these on Linux because of bug 769659.
# test 1 uses Cherokee; expected to pass on OS X and Win7
random-if(!(cocoaWidget||/^Windows\x20NT\x206\.1/.test(http.oscpu))) skip-if(gtkWidget) != bold-system-fallback-1.html bold-system-fallback-1-notref.html
-# test 2 uses Chess symbols; expected to pass on Android
-random-if(!Android) skip-if(gtkWidget) != bold-system-fallback-2.html bold-system-fallback-2-notref.html
+skip-if(gtkWidget) != bold-system-fallback-2.html bold-system-fallback-2-notref.html
# Bug 769475 - applying 'italic' to Arabic text in Arial should NOT change family or metrics.
# Expected to pass on MacOSX and Windows; other platforms unknown, depending on font availability.
diff --git a/layout/reftests/fonts/mark-generate.py b/layout/reftests/fonts/mark-generate.py
index 8d537fa81..1af6612ec 100755
--- a/layout/reftests/fonts/mark-generate.py
+++ b/layout/reftests/fonts/mark-generate.py
@@ -1,5 +1,4 @@
#!/usr/bin/python
-# vim: set shiftwidth=4 tabstop=8 autoindent expandtab:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/layout/reftests/fonts/math/generate.py b/layout/reftests/fonts/math/generate.py
index b42cd3e22..76cfcc597 100644
--- a/layout/reftests/fonts/math/generate.py
+++ b/layout/reftests/fonts/math/generate.py
@@ -1,5 +1,4 @@
#!/usr/bin/python
-# vim: set shiftwidth=4 tabstop=8 autoindent expandtab:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/layout/reftests/forms/button/reftest-stylo.list b/layout/reftests/forms/button/reftest-stylo.list
deleted file mode 100644
index c76d15c91..000000000
--- a/layout/reftests/forms/button/reftest-stylo.list
+++ /dev/null
@@ -1,61 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== first-letter-1.html first-letter-1.html
-== first-letter-1.html first-letter-1.html
-
-== focus-area-percent-units-1.html focus-area-percent-units-1.html
-== focus-area-percent-units-2.html focus-area-percent-units-2.html
-
-== max-height.html max-height.html
-== min-height.html min-height.html
-== overflow-areas-1.html overflow-areas-1.html
-
-# The buttons in these tests have some fancy shading applied to their corners
-# on B2G, despite their "-moz-appearance: none; background: gray", so they
-# don't quite match the reference case's normal <div>. That's why they're fuzzy.
-fuzzy-if(B2G||Mulet||Android,125,20) == percent-height-child-1.html percent-height-child-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-pref(browser.display.focus_ring_width,1) fuzzy-if(B2G||Mulet||Android,125,80) == percent-height-child-2.html percent-height-child-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fuzzy-if(B2G||Mulet||Android,125,20) == percent-width-child-1.html percent-width-child-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-pref(browser.display.focus_ring_width,1) fuzzy-if(B2G||Mulet||Android,125,80) == percent-width-child-2.html percent-width-child-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-== vertical-centering.html vertical-centering.html
-
-== line-height-button-0.5.html line-height-button-0.5.html
-== line-height-button-1.5.html line-height-button-1.5.html
-== line-height-input-0.5.html line-height-input-0.5.html
-== line-height-input-1.5.html line-height-input-1.5.html
-
-# Looks like Android and B2G change the text color, but to something slightly
-# different from ColorGray
-fails-if(Android||B2G||Mulet) == disabled-1.html disabled-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== disabled-2.html disabled-2.html
-
-== disabled-3.html disabled-3.html
-== disabled-4.html disabled-4.html
-== disabled-5.html disabled-5.html
-== disabled-6.html disabled-6.html
-
-fails-if(B2G||Mulet) == width-auto-size-em-ltr.html width-auto-size-em-ltr.html
-# Bug 1145672
-# Bug 1150486
-fails-if(B2G||Mulet) == width-auto-size-ltr.html width-auto-size-ltr.html
-# Bug 1145672
-# Bug 1150486
-== width-exact-fit-ltr.html width-exact-fit-ltr.html
-== width-erode-part-focuspadding-ltr.html width-erode-part-focuspadding-ltr.html
-== width-erode-all-focuspadding-ltr.html width-erode-all-focuspadding-ltr.html
-== width-erode-overflow-focuspadding-ltr.html width-erode-overflow-focuspadding-ltr.html
-fails-if(B2G||Mulet) == width-auto-size-em-rtl.html width-auto-size-em-rtl.html
-# Bug 1145672
-# Bug 1150486
-fails-if(B2G||Mulet) == width-auto-size-rtl.html width-auto-size-rtl.html
-# Bug 1145672
-# Bug 1150486
-== width-exact-fit-rtl.html width-exact-fit-rtl.html
-== width-erode-part-focuspadding-rtl.html width-erode-part-focuspadding-rtl.html
-== width-erode-all-focuspadding-rtl.html width-erode-all-focuspadding-rtl.html
-== width-erode-overflow-focuspadding-rtl.html width-erode-overflow-focuspadding-rtl.html
diff --git a/layout/reftests/forms/button/reftest.list b/layout/reftests/forms/button/reftest.list
index cefec2e85..db314516d 100644
--- a/layout/reftests/forms/button/reftest.list
+++ b/layout/reftests/forms/button/reftest.list
@@ -8,13 +8,10 @@
== min-height.html min-height-ref.html
== overflow-areas-1.html overflow-areas-1-ref.html
-# The buttons in these tests have some fancy shading applied to their corners
-# on Android, despite their "-moz-appearance: none; background: gray", so they
-# don't quite match the reference case's normal <div>. That's why they're fuzzy.
-fuzzy-if(Android,125,20) == percent-height-child-1.html percent-height-child-1-ref.html
-pref(browser.display.focus_ring_width,1) fuzzy-if(Android,125,80) == percent-height-child-2.html percent-height-child-2-ref.html
-fuzzy-if(Android,125,20) == percent-width-child-1.html percent-width-child-1-ref.html
-pref(browser.display.focus_ring_width,1) fuzzy-if(Android,125,80) == percent-width-child-2.html percent-width-child-2-ref.html
+== percent-height-child-1.html percent-height-child-1-ref.html
+pref(browser.display.focus_ring_width,1) == percent-height-child-2.html percent-height-child-2-ref.html
+== percent-width-child-1.html percent-width-child-1-ref.html
+pref(browser.display.focus_ring_width,1) == percent-width-child-2.html percent-width-child-2-ref.html
== vertical-centering.html vertical-centering-ref.html
@@ -23,9 +20,7 @@ pref(browser.display.focus_ring_width,1) fuzzy-if(Android,125,80) == percent-wid
!= line-height-input-0.5.html line-height-input-1.0.html
!= line-height-input-1.5.html line-height-input-1.0.html
-# Looks like Android changes the text color, but to something slightly
-# different from ColorGray
-fails-if(Android) == disabled-1.html disabled-1-ref.html
+== disabled-1.html disabled-1-ref.html
== disabled-2.html disabled-2-ref.html
!= disabled-3.html disabled-3-notref.html
diff --git a/layout/reftests/forms/fieldset/reftest-stylo.list b/layout/reftests/forms/fieldset/reftest-stylo.list
deleted file mode 100644
index d1dd22756..000000000
--- a/layout/reftests/forms/fieldset/reftest-stylo.list
+++ /dev/null
@@ -1,19 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-fuzzy-if(skiaContent,2,13) == dynamic-legend-scroll-1.html dynamic-legend-scroll-1.html
-== fieldset-hidden-1.html fieldset-hidden-1.html
-== fieldset-intrinsic-width-1.html fieldset-intrinsic-width-1.html
-== fieldset-percentage-padding-1.html fieldset-percentage-padding-1.html
-== fieldset-scroll-1.html fieldset-scroll-1.html
-== fieldset-scrolled-1.html fieldset-scrolled-1.html
-random-if(B2G||Mulet) == fieldset-overflow-auto-1.html fieldset-overflow-auto-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fuzzy-if(winWidget&&!layersGPUAccelerated,121,221) == positioned-container-1.html positioned-container-1.html
-== relpos-legend-1.html relpos-legend-1.html
-== relpos-legend-2.html relpos-legend-2.html
-skip-if((B2G&&browserIsRemote)||Mulet) == sticky-legend-1.html sticky-legend-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails fuzzy-if(skiaContent,1,40768) == abs-pos-child-sizing.html abs-pos-child-sizing.html
-== overflow-hidden.html overflow-hidden.html
-== legend-rtl.html legend-rtl.html
-== fieldset-grid-001.html fieldset-grid-001.html
-== fieldset-flexbox-001.html fieldset-flexbox-001.html
diff --git a/layout/reftests/forms/input/checkbox/reftest-stylo.list b/layout/reftests/forms/input/checkbox/reftest-stylo.list
deleted file mode 100644
index 11fe7d778..000000000
--- a/layout/reftests/forms/input/checkbox/reftest-stylo.list
+++ /dev/null
@@ -1,18 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== label-dynamic.html label-dynamic.html
-skip-if(B2G||Mulet) fails-if(Android) == radio-stretched.html radio-stretched.html
-# test for bug 464589
-# Initial mulet triage: parity with B2G/B2G Desktop
-== checked.html checked.html
-== checked-native.html checked-native.html
-== checked.html checked.html
-== checked-notref.html checked-notref.html
-== checked-native.html checked-native.html
-== checked-native-notref.html checked-native-notref.html
-== indeterminate-checked.html indeterminate-checked.html
-== indeterminate-unchecked.html indeterminate-unchecked.html
-== indeterminate-native-checked.html indeterminate-native-checked.html
-== indeterminate-native-unchecked.html indeterminate-native-unchecked.html
-== indeterminate-selector.html indeterminate-selector.html
-skip-if(!gtkWidget||Mulet) == gtk-theme-width-height.html gtk-theme-width-height.html
-# bug 1141511: Disable some gtkWidget-dependant reftests on Mulet
diff --git a/layout/reftests/forms/input/checkbox/reftest.list b/layout/reftests/forms/input/checkbox/reftest.list
index cc485e969..442d3d1cd 100644
--- a/layout/reftests/forms/input/checkbox/reftest.list
+++ b/layout/reftests/forms/input/checkbox/reftest.list
@@ -1,5 +1,5 @@
== label-dynamic.html label-dynamic-ref.html
-fails-if(Android) == radio-stretched.html radio-stretched-ref.html # test for bug 464589
+== radio-stretched.html radio-stretched-ref.html # test for bug 464589
!= checked.html checked-notref.html
!= checked-native.html checked-native-notref.html
!= checked.html about:blank
diff --git a/layout/reftests/forms/input/color/reftest-stylo.list b/layout/reftests/forms/input/color/reftest-stylo.list
deleted file mode 100644
index a1e01b480..000000000
--- a/layout/reftests/forms/input/color/reftest-stylo.list
+++ /dev/null
@@ -1,20 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# Simple test. Should fail on platforms where input type color isn't activated
-# yet. Missing platforms are B2G (bug 875751), Android (bug 875750).
-fails-if(B2G||Mulet||Android) == input-color-1.html input-color-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-default-preferences pref(dom.forms.color,true)
-
-# Despite the "default-preferences" line above, B2G and Android are still
-# excluded from some style in forms.css, which makes the following tests fail.
-fails-if(B2G||Mulet||Android) == margin-padding-1.html margin-padding-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== block-invalidate-1.html block-invalidate-1.html
-== block-invalidate-2.html block-invalidate-2.html
-fuzzy-if(gtkWidget,8,33) fuzzy-if(skiaContent,8,35) fails-if(B2G||Mulet||Android) == transformations-1.html transformations-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(B2G||Mulet||Android) == custom-style-1.html custom-style-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(B2G||Mulet||Android) == custom-style-2.html custom-style-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
diff --git a/layout/reftests/forms/input/color/reftest.list b/layout/reftests/forms/input/color/reftest.list
index 148cb4bad..314eebd04 100644
--- a/layout/reftests/forms/input/color/reftest.list
+++ b/layout/reftests/forms/input/color/reftest.list
@@ -1,14 +1,12 @@
# Simple test. Should fail on platforms where input type color isn't activated
-# yet. The missing platform is Android (bug 875750).
-fails-if(Android) == input-color-1.html input-color-1-ref.html
+# yet.
+== input-color-1.html input-color-1-ref.html
default-preferences pref(dom.forms.color,true)
-# Despite the "default-preferences" line above, Android is still
-# excluded from some style in forms.css, which makes the following tests fail.
-fails-if(Android) == margin-padding-1.html margin-padding-1-ref.html
+== margin-padding-1.html margin-padding-1-ref.html
== block-invalidate-1.html block-invalidate-1-ref.html
== block-invalidate-2.html block-invalidate-2-ref.html
-fuzzy-if(gtkWidget,8,33) fuzzy-if(skiaContent,8,35) fails-if(Android) == transformations-1.html transformations-1-ref.html
-fails-if(Android) == custom-style-1.html custom-style-1-ref.html
-fails-if(Android) == custom-style-2.html custom-style-2-ref.html
+fuzzy-if(gtkWidget,8,33) fuzzy-if(skiaContent,8,35) == transformations-1.html transformations-1-ref.html
+== custom-style-1.html custom-style-1-ref.html
+== custom-style-2.html custom-style-2-ref.html
diff --git a/layout/reftests/forms/input/datetime/reftest.list b/layout/reftests/forms/input/datetime/reftest.list
index a62d56c7c..25f676898 100644
--- a/layout/reftests/forms/input/datetime/reftest.list
+++ b/layout/reftests/forms/input/datetime/reftest.list
@@ -1,24 +1,21 @@
default-preferences pref(dom.forms.datetime,true)
-# not valid on Android/B2G where type=time looks like type=text
-skip-if(Android||B2G||Mulet) != time-simple-unthemed.html time-simple-unthemed-ref.html
-skip-if(Android||B2G||Mulet) != time-large-font.html time-basic.html
-skip-if(Android||B2G||Mulet) != time-width-height.html time-basic.html
-skip-if(Android||B2G||Mulet) != time-border.html time-basic.html
-# only valid on Android/B2G where type=number looks the same as type=text
-skip-if(!Android&&!B2G&&!Mulet) == time-simple-unthemed.html time-simple-unthemed-ref.html
+!= time-simple-unthemed.html time-simple-unthemed-ref.html
+!= time-large-font.html time-basic.html
+!= time-width-height.html time-basic.html
+!= time-border.html time-basic.html
# type change
-skip-if(Android||B2G||Mulet) == to-time-from-other-type-unthemed.html time-simple-unthemed.html
-skip-if(Android||B2G||Mulet) == from-time-to-other-type-unthemed.html from-time-to-other-type-unthemed-ref.html
+== to-time-from-other-type-unthemed.html time-simple-unthemed.html
+== from-time-to-other-type-unthemed.html from-time-to-other-type-unthemed-ref.html
# content should not overflow on small width/height
-skip-if(Android) == time-small-width.html time-small-width-ref.html
-skip-if(Android) == time-small-height.html time-small-height-ref.html
-skip-if(Android) == time-small-width-height.html time-small-width-height-ref.html
+== time-small-width.html time-small-width-ref.html
+== time-small-height.html time-small-height-ref.html
+== time-small-width-height.html time-small-width-height-ref.html
# content (text) should be left aligned
-skip-if(Android) == time-content-left-aligned.html time-content-left-aligned-ref.html
+== time-content-left-aligned.html time-content-left-aligned-ref.html
# reset button should be right aligned
-skip-if(Android) fails-if(styloVsGecko) == time-reset-button-right-aligned.html time-reset-button-right-aligned-ref.html # bug 1372062
+fails-if(styloVsGecko) == time-reset-button-right-aligned.html time-reset-button-right-aligned-ref.html # bug 1372062
diff --git a/layout/reftests/forms/input/email/reftest-stylo.list b/layout/reftests/forms/input/email/reftest-stylo.list
deleted file mode 100644
index 021c5f861..000000000
--- a/layout/reftests/forms/input/email/reftest-stylo.list
+++ /dev/null
@@ -1,4 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== 1.html 1.html
-== 2.html 2.html
-== 3.html 3.html
diff --git a/layout/reftests/forms/input/file/reftest-stylo.list b/layout/reftests/forms/input/file/reftest-stylo.list
deleted file mode 100644
index 44d8ce504..000000000
--- a/layout/reftests/forms/input/file/reftest-stylo.list
+++ /dev/null
@@ -1,20 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# B2G failures: bug 855352.
-fails-if(B2G||Mulet||Android) fuzzy-if(OSX==1006,8,152) skip-if((B2G&&browserIsRemote)||Mulet) == simple.html simple.html
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(B2G||Mulet||Android) fuzzy-if(OSX==1006,8,76) skip-if((B2G&&browserIsRemote)||Mulet) == rtl.html rtl.html
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(B2G||Mulet||Android) fuzzy-if(OSX==1006,8,152) skip-if((B2G&&browserIsRemote)||Mulet) == size.html size.html
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(B2G||Mulet||Android) fuzzy-if(OSX==1006,8,76) skip-if((B2G&&browserIsRemote)||Mulet) == background.html background.html
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(B2G||Mulet||Android) skip-if((B2G&&browserIsRemote)||Mulet) == style.html style.html
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-== width-clip.html width-clip.html
-fails-if(B2G||Mulet||Android) == color-inherit.html color-inherit.html
-# Initial mulet triage: parity with B2G/B2G Desktop
diff --git a/layout/reftests/forms/input/file/reftest.list b/layout/reftests/forms/input/file/reftest.list
index ecb509226..7596f1c82 100644
--- a/layout/reftests/forms/input/file/reftest.list
+++ b/layout/reftests/forms/input/file/reftest.list
@@ -1,7 +1,7 @@
-fails-if(Android) fuzzy-if(OSX==1006,8,152) == simple.html simple-ref.xul
-fails-if(Android) fuzzy-if(OSX==1006,8,76) == rtl.html rtl-ref.xul
-fails-if(Android) fuzzy-if(OSX==1006,8,152) == size.html simple-ref.xul
-fails-if(Android) fuzzy-if(OSX==1006,8,76) == background.html background-ref.xul
-fails-if(Android) == style.html style-ref.xul
+fuzzy-if(OSX==1006,8,152) == simple.html simple-ref.xul
+fuzzy-if(OSX==1006,8,76) == rtl.html rtl-ref.xul
+fuzzy-if(OSX==1006,8,152) == size.html simple-ref.xul
+fuzzy-if(OSX==1006,8,76) == background.html background-ref.xul
+== style.html style-ref.xul
!= width-clip.html width-clip-ref.html
-fails-if(Android) == color-inherit.html color-inherit-ref.html
+== color-inherit.html color-inherit-ref.html
diff --git a/layout/reftests/forms/input/hidden/reftest-stylo.list b/layout/reftests/forms/input/hidden/reftest-stylo.list
deleted file mode 100644
index db274e45f..000000000
--- a/layout/reftests/forms/input/hidden/reftest-stylo.list
+++ /dev/null
@@ -1,2 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== border.html border.html
diff --git a/layout/reftests/forms/input/number/number-style-inheritance-ref.html b/layout/reftests/forms/input/number/number-style-inheritance-ref.html
new file mode 100644
index 000000000..00c8dba43
--- /dev/null
+++ b/layout/reftests/forms/input/number/number-style-inheritance-ref.html
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<html>
+ <body>
+ <input type="text" style="width: 100px; text-decoration: underline;" value="1234">
+ </body>
+</html>
diff --git a/layout/reftests/forms/input/number/number-style-inheritance.html b/layout/reftests/forms/input/number/number-style-inheritance.html
new file mode 100644
index 000000000..b21ff1f1c
--- /dev/null
+++ b/layout/reftests/forms/input/number/number-style-inheritance.html
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<html>
+ <body>
+ <input type="number" style="width: 100px; -moz-appearance: textfield; text-decoration: underline;" value="1234">
+ </body>
+</html>
diff --git a/layout/reftests/forms/input/number/reftest-stylo.list b/layout/reftests/forms/input/number/reftest-stylo.list
deleted file mode 100644
index 8a10476d7..000000000
--- a/layout/reftests/forms/input/number/reftest-stylo.list
+++ /dev/null
@@ -1,65 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-default-preferences pref(dom.forms.number,true)
-
-# sanity checks:
-# not valid on Android/B2G where type=number looks like type=text
-skip skip-if(Android||B2G||Mulet) == not-other-type-unthemed-1.html not-other-type-unthemed-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip skip-if(Android||B2G||Mulet) == not-other-type-unthemed-1.html not-other-type-unthemed-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-# only valid on Android/B2G where type=number looks the same as type=text
-skip-if(!Android&&!B2G&&!Mulet) == number-same-as-text-unthemed.html number-same-as-text-unthemed.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-# should look the same as type=text, except for the spin box
-skip == number-similar-to-text-unthemed.html number-similar-to-text-unthemed.html
-skip == number-similar-to-text-unthemed-rtl.html number-similar-to-text-unthemed-rtl.html
-skip == number-similar-to-text-unthemed-vertical-lr.html number-similar-to-text-unthemed-vertical-lr.html
-skip == number-similar-to-text-unthemed-vertical-rl.html number-similar-to-text-unthemed-vertical-rl.html
-
-# dynamic type changes:
-fuzzy-if(/^Windows\x20NT\x205\.1/.test(http.oscpu),64,4) fuzzy-if(cocoaWidget,63,4) fuzzy-if(skiaContent,2,5) == to-number-from-other-type-unthemed-1.html to-number-from-other-type-unthemed-1.html
-# skip fuzzy-if(skiaContent,2,5) == from-number-to-other-type-unthemed-1.html from-number-to-other-type-unthemed-1.html
-
-# dynamic value changes:
-# skip fuzzy-if(skiaContent,2,13) == show-value.html show-value.html
-
-# disabled
-skip == number-disabled.html number-disabled.html
-
-# auto width:
-skip == number-auto-width-1.html number-auto-width-1.html
-
-# min-height/max-height tests:
-skip skip-if(B2G||Mulet||Android) == number-min-height-1.html number-min-height-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip skip-if(B2G||Mulet||Android) == number-min-height-2.html number-min-height-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip skip-if(B2G||Mulet||Android) == number-max-height-1.html number-max-height-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip skip-if(B2G||Mulet||Android) == number-max-height-2.html number-max-height-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-# number of significant fractional digits:
-skip == number-significant-fractional-digits.html number-significant-fractional-digits.html
-
-# focus
-# autofocus is disabled on B2G
-# https://bugzilla.mozilla.org/show_bug.cgi?id=965763
-# skip skip-if(B2G||Mulet) fuzzy-if(skiaContent,2,5) needs-focus == focus-handling.html focus-handling.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-# select
-skip == number-selected.html number-selected.html
-
-# pseudo-elements not usable from content:
-skip == number-pseudo-elements.html number-pseudo-elements.html
-
-skip == number-placeholder.html number-placeholder.html
-
-# check that if the anonymous text control is reframed, we reframe the whole
-# number control (the fuzzy is for the top-right and bottom-left of the border
-# bevel which gets slightly different antialiasing after invalidation):
-skip == number-reframe-anon-text-field.html number-reframe-anon-text-field.html
-
-skip == pseudo-classes.html pseudo-classes.html
diff --git a/layout/reftests/forms/input/number/reftest.list b/layout/reftests/forms/input/number/reftest.list
index ecf05ce15..610c847e7 100644
--- a/layout/reftests/forms/input/number/reftest.list
+++ b/layout/reftests/forms/input/number/reftest.list
@@ -1,11 +1,9 @@
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
-skip-if(Android) != not-other-type-unthemed-1.html not-other-type-unthemed-1b-notref.html
-# only valid on Android where type=number looks the same as type=text
-skip-if(!Android) == number-same-as-text-unthemed.html number-same-as-text-unthemed-ref.html
+!= not-other-type-unthemed-1.html not-other-type-unthemed-1a-notref.html
+!= not-other-type-unthemed-1.html not-other-type-unthemed-1b-notref.html
+!= number-same-as-text-unthemed.html number-same-as-text-unthemed-ref.html
# should look the same as type=text, except for the spin box
== number-similar-to-text-unthemed.html number-similar-to-text-unthemed-ref.html
@@ -27,10 +25,10 @@ fuzzy-if(skiaContent,2,13) == show-value.html show-value-ref.html
== number-auto-width-1.html number-auto-width-1-ref.html
# min-height/max-height tests:
-skip-if(Android) == number-min-height-1.html number-min-height-1-ref.html
-skip-if(Android) == number-min-height-2.html number-min-height-2-ref.html
-skip-if(Android) == number-max-height-1.html number-max-height-1-ref.html
-skip-if(Android) == number-max-height-2.html number-max-height-2-ref.html
+== number-min-height-1.html number-min-height-1-ref.html
+== number-min-height-2.html number-min-height-2-ref.html
+== number-max-height-1.html number-max-height-1-ref.html
+== number-max-height-2.html number-max-height-2-ref.html
# number of significant fractional digits:
== number-significant-fractional-digits.html number-significant-fractional-digits-ref.html
@@ -52,3 +50,6 @@ fuzzy-if(skiaContent,2,5) needs-focus == focus-handling.html focus-handling-ref.
fuzzy(128,4) == number-reframe-anon-text-field.html number-reframe-anon-text-field-ref.html
== pseudo-classes.html about:blank
+
+# Style inheritance:
+== number-style-inheritance.html number-style-inheritance-ref.html
diff --git a/layout/reftests/forms/input/percentage/reftest-stylo.list b/layout/reftests/forms/input/percentage/reftest-stylo.list
deleted file mode 100644
index 6f9069ce2..000000000
--- a/layout/reftests/forms/input/percentage/reftest-stylo.list
+++ /dev/null
@@ -1,2 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== padding.html padding.html
diff --git a/layout/reftests/forms/input/radio/reftest-stylo.list b/layout/reftests/forms/input/radio/reftest-stylo.list
deleted file mode 100644
index 7f7adc33b..000000000
--- a/layout/reftests/forms/input/radio/reftest-stylo.list
+++ /dev/null
@@ -1,10 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== label-dynamic.html label-dynamic.html
-== checked.html checked.html
-== checked-native.html checked-native.html
-== checked.html checked.html
-== checked-notref.html checked-notref.html
-== checked-native.html checked-native.html
-== checked-native-notref.html checked-native-notref.html
-skip-if(!gtkWidget||Mulet) == gtk-theme-width-height.html gtk-theme-width-height.html
-# bug 1141511: Disable some gtkWidget-dependant reftests on Mulet
diff --git a/layout/reftests/forms/input/range/reftest-stylo.list b/layout/reftests/forms/input/range/reftest-stylo.list
deleted file mode 100644
index 776a29fb2..000000000
--- a/layout/reftests/forms/input/range/reftest-stylo.list
+++ /dev/null
@@ -1,54 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-
-# sanity checks:
-skip == not-other-type-unthemed-1.html not-other-type-unthemed-1.html
-skip == not-other-type-unthemed-1.html not-other-type-unthemed-1.html
-skip == not-other-type-unthemed-1.html not-other-type-unthemed-1.html
-
-# dynamic type changes:
-fuzzy-if(skiaContent,1,40) == to-range-from-other-type-unthemed-1.html to-range-from-other-type-unthemed-1.html
-== from-range-to-other-type-unthemed-1.html from-range-to-other-type-unthemed-1.html
-
-# for different values:
-== different-fraction-of-range-unthemed-1.html different-fraction-of-range-unthemed-1.html
-== same-fraction-of-range-unthemed-1.html same-fraction-of-range-unthemed-1.html
-
-# dynamic value changes:
-fails fuzzy-if(skiaContent,1,40) == value-prop-unthemed.html value-prop-unthemed.html
-== value-prop.html value-prop.html
-fails fuzzy-if(skiaContent,1,40) == valueAsNumber-prop-unthemed.html valueAsNumber-prop-unthemed.html
-== valueAsNumber-prop.html valueAsNumber-prop.html
-fails fuzzy-if(B2G,2,1) fuzzy-if(skiaContent,1,40) == stepDown-unthemed.html stepDown-unthemed.html
-fuzzy-if(B2G,2,1) == stepDown.html stepDown.html
-fails fuzzy-if(skiaContent,1,40) == stepUp-unthemed.html stepUp-unthemed.html
-== stepUp.html stepUp.html
-fuzzy-if(B2G,2,1) == max-prop.html max-prop.html
-skip == reset-value.html reset-value.html
-
-# 'direction' property:
-== direction-unthemed-1.html direction-unthemed-1.html
-
-# ::-moz-range-progress pseudo-element:
-fails-if(B2G||Mulet||Android) == moz-range-progress-1.html moz-range-progress-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== moz-range-progress-2.html moz-range-progress-2.html
-== moz-range-progress-3.html moz-range-progress-3.html
-
-# Tests for block and inline orientation in combination with writing-mode
-# XXX Remove default-preferences setting here after bug 1138384 makes
-# it the default for all channels
-
-== range-orient-horizontal.html range-orient-horizontal.html
-== range-orient-horizontal.html range-orient-horizontal.html
-== range-orient-block.html range-orient-block.html
-== range-orient-inline.html range-orient-inline.html
-== range-vlr.html range-vlr.html
-== range-vlr-orient-block.html range-vlr-orient-block.html
-== range-vlr-orient-inline.html range-vlr-orient-inline.html
-== range-vlr-orient-horizontal.html range-vlr-orient-horizontal.html
-== range-vlr-orient-vertical.html range-vlr-orient-vertical.html
-== range-vrl.html range-vrl.html
-== range-vrl-orient-block.html range-vrl-orient-block.html
-== range-vrl-orient-inline.html range-vrl-orient-inline.html
-== range-vrl-orient-horizontal.html range-vrl-orient-horizontal.html
-== range-vrl-orient-vertical.html range-vrl-orient-vertical.html
diff --git a/layout/reftests/forms/input/range/reftest.list b/layout/reftests/forms/input/range/reftest.list
index 8c2c231a3..6838099c6 100644
--- a/layout/reftests/forms/input/range/reftest.list
+++ b/layout/reftests/forms/input/range/reftest.list
@@ -28,7 +28,7 @@ fuzzy-if(skiaContent,1,40) == stepUp-unthemed.html 75pct-unthemed-common-ref.htm
== direction-unthemed-1.html direction-unthemed-1-ref.html
# ::-moz-range-progress pseudo-element:
-fails-if(Android) == moz-range-progress-1.html moz-range-progress-1-ref.html
+== moz-range-progress-1.html moz-range-progress-1-ref.html
== moz-range-progress-2.html moz-range-progress-2-ref.html
== moz-range-progress-3.html moz-range-progress-3-ref.html
diff --git a/layout/reftests/forms/input/reftest-stylo.list b/layout/reftests/forms/input/reftest-stylo.list
deleted file mode 100644
index c3ab90d2c..000000000
--- a/layout/reftests/forms/input/reftest-stylo.list
+++ /dev/null
@@ -1,14 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-include checkbox/reftest-stylo.list
-include email/reftest-stylo.list
-include tel/reftest-stylo.list
-include search/reftest-stylo.list
-include url/reftest-stylo.list
-include number/reftest-stylo.list
-include file/reftest-stylo.list
-include radio/reftest-stylo.list
-include range/reftest-stylo.list
-include text/reftest-stylo.list
-include percentage/reftest-stylo.list
-include hidden/reftest-stylo.list
-include color/reftest-stylo.list
diff --git a/layout/reftests/forms/input/search/reftest-stylo.list b/layout/reftests/forms/input/search/reftest-stylo.list
deleted file mode 100644
index 021c5f861..000000000
--- a/layout/reftests/forms/input/search/reftest-stylo.list
+++ /dev/null
@@ -1,4 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== 1.html 1.html
-== 2.html 2.html
-== 3.html 3.html
diff --git a/layout/reftests/forms/input/tel/reftest-stylo.list b/layout/reftests/forms/input/tel/reftest-stylo.list
deleted file mode 100644
index 021c5f861..000000000
--- a/layout/reftests/forms/input/tel/reftest-stylo.list
+++ /dev/null
@@ -1,4 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== 1.html 1.html
-== 2.html 2.html
-== 3.html 3.html
diff --git a/layout/reftests/forms/input/text/reftest-stylo.list b/layout/reftests/forms/input/text/reftest-stylo.list
deleted file mode 100644
index 86f890acd..000000000
--- a/layout/reftests/forms/input/text/reftest-stylo.list
+++ /dev/null
@@ -1,16 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== bounds-1.html bounds-1.html
-fuzzy-if(asyncPan&&!layersGPUAccelerated,121,84) == size-1.html size-1.html
-skip-if(B2G||Mulet) == size-2.html size-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-HTTP(..) == baseline-1.html baseline-1.html
-skip-if((B2G&&browserIsRemote)||Mulet) HTTP(..) == centering-1.xul centering-1.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == dynamic-height-1.xul dynamic-height-1.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-fuzzy-if(skiaContent,1,500) needs-focus == select.html select.html
-== intrinsic-size.html intrinsic-size.html
-== line-height-0.5.html line-height-0.5.html
-== line-height-1.5.html line-height-1.5.html
diff --git a/layout/reftests/forms/input/url/reftest-stylo.list b/layout/reftests/forms/input/url/reftest-stylo.list
deleted file mode 100644
index 021c5f861..000000000
--- a/layout/reftests/forms/input/url/reftest-stylo.list
+++ /dev/null
@@ -1,4 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== 1.html 1.html
-== 2.html 2.html
-== 3.html 3.html
diff --git a/layout/reftests/forms/legend/reftest-stylo.list b/layout/reftests/forms/legend/reftest-stylo.list
deleted file mode 100644
index e622ffda4..000000000
--- a/layout/reftests/forms/legend/reftest-stylo.list
+++ /dev/null
@@ -1,5 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-skip-if(B2G||Mulet) == legend.html legend.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip == shadow-dom.html shadow-dom.html
-== 1273433.html 1273433.html
diff --git a/layout/reftests/forms/legend/reftest.list b/layout/reftests/forms/legend/reftest.list
index 879835a59..03e25eb20 100644
--- a/layout/reftests/forms/legend/reftest.list
+++ b/layout/reftests/forms/legend/reftest.list
@@ -1,3 +1,3 @@
== legend.html legend-ref.html
-fuzzy-if(skiaContent,1,7) pref(dom.webcomponents.enabled,true) == shadow-dom.html shadow-dom-ref.html
+#bug 1418002 fuzzy-if(skiaContent,1,7) pref(dom.webcomponents.enabled,true) == shadow-dom.html shadow-dom-ref.html
== 1273433.html 1273433-ref.html
diff --git a/layout/reftests/forms/legend/shadow-dom.html b/layout/reftests/forms/legend/shadow-dom.html
index ad7babcf7..0f0a53665 100644
--- a/layout/reftests/forms/legend/shadow-dom.html
+++ b/layout/reftests/forms/legend/shadow-dom.html
@@ -48,17 +48,19 @@ div.after::after {content: " Y";}
return e;
}
- document.body.offsetHeight;
+ function run() {
+ document.body.offsetHeight;
- shadow("host1").innerHTML = '<content></content> c';
- shadow("host2").innerHTML = 'a <content></content> c';
- shadow("host3").innerHTML = 'a <content></content>';
- shadow("host4").innerHTML = '<content></content>';
- shadow("host5").innerHTML = 'a <content></content>';
- shadow("host6").innerHTML = '<z style="color:blue; display:contents"><content></content></z> c';
- shadow("host7").innerHTML = 'a <content select=".c"></content> <content select=".b"></content> B';
- shadow("host8").innerHTML = 'A <content select=".c"></content> <content select=".b"></content> B';
- shadow("host9").innerHTML = 'A <content select=".c"></content> <content select=".b"></content> B <content select=".b"></content>';
+ shadow("host1").innerHTML = '<content></content> c';
+ shadow("host2").innerHTML = 'a <content></content> c';
+ shadow("host3").innerHTML = 'a <content></content>';
+ shadow("host4").innerHTML = '<content></content>';
+ shadow("host5").innerHTML = 'a <content></content>';
+ shadow("host6").innerHTML = '<z style="color:blue; display:contents"><content></content></z> c';
+ shadow("host7").innerHTML = 'a <content select=".c"></content> <content select=".b"></content> B';
+ shadow("host8").innerHTML = 'A <content select=".c"></content> <content select=".b"></content> B';
+ shadow("host9").innerHTML = 'A <content select=".c"></content> <content select=".b"></content> B <content select=".b"></content>';
+ }
function tweak() {
document.body.offsetHeight;
@@ -105,7 +107,12 @@ div.after::after {content: " Y";}
},0);
}
- window.addEventListener("MozReftestInvalidate", tweak, false);
+ if (document.body.createShadowRoot) {
+ run();
+ window.addEventListener("MozReftestInvalidate", tweak, false);
+ } else {
+ document.documentElement.removeAttribute("class");
+ }
</script>
</body>
</html>
diff --git a/layout/reftests/forms/meter/default-style/reftest-stylo.list b/layout/reftests/forms/meter/default-style/reftest-stylo.list
deleted file mode 100644
index 55cd0b3e3..000000000
--- a/layout/reftests/forms/meter/default-style/reftest-stylo.list
+++ /dev/null
@@ -1,3 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== default-style.html default-style.html
-== default-style-dyn.html default-style-dyn.html
diff --git a/layout/reftests/forms/meter/reftest-stylo.list b/layout/reftests/forms/meter/reftest-stylo.list
deleted file mode 100644
index ef10df30d..000000000
--- a/layout/reftests/forms/meter/reftest-stylo.list
+++ /dev/null
@@ -1,49 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-fuzzy-if(Android,128,16) == values.html values.html
-== values-rtl.html values-rtl.html
-== margin-padding.html margin-padding.html
-== margin-padding-rtl.html margin-padding-rtl.html
-skip-if(B2G||Mulet) == bar-pseudo-element.html bar-pseudo-element.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== bar-pseudo-element-rtl.html bar-pseudo-element-rtl.html
-
-# vertical tests
-== values-vertical.html values-vertical.html
-== values-vertical-rtl.html values-vertical-rtl.html
-== margin-padding-vertical.html margin-padding-vertical.html
-== margin-padding-vertical-rtl.html margin-padding-vertical-rtl.html
-skip-if(B2G||Mulet) == bar-pseudo-element-vertical.html bar-pseudo-element-vertical.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== bar-pseudo-element-vertical-rtl.html bar-pseudo-element-vertical-rtl.html
-
-# The following test is disabled but kept in the repository because the
-# transformations will not behave exactly the same for <meter> and two divs.
-# However, it would be possible to manually check those.
-# == transformations.html transformations.html
-
-# default style
-include default-style/reftest-stylo.list
-
-# Tests for bugs:
-== block-invalidate.html block-invalidate.html
-== in-cells.html in-cells.html
-== max-height.html max-height.html
-
-# Tests for block and inline orientation in combination with writing-mode
-# XXX Remove default-preferences setting here after bug 1138384 makes
-# it the default for all channels
-
-== meter-orient-vertical.html meter-orient-vertical.html
-== meter-orient-horizontal.html meter-orient-horizontal.html
-== meter-orient-block.html meter-orient-block.html
-== meter-orient-inline.html meter-orient-inline.html
-== meter-vlr.html meter-vlr.html
-== meter-vlr-orient-block.html meter-vlr-orient-block.html
-== meter-vlr-orient-inline.html meter-vlr-orient-inline.html
-== meter-vlr-orient-horizontal.html meter-vlr-orient-horizontal.html
-skip == meter-vlr-orient-vertical.html meter-vlr-orient-vertical.html
-== meter-vrl.html meter-vrl.html
-== meter-vrl-orient-block.html meter-vrl-orient-block.html
-== meter-vrl-orient-inline.html meter-vrl-orient-inline.html
-== meter-vrl-orient-horizontal.html meter-vrl-orient-horizontal.html
-== meter-vrl-orient-vertical.html meter-vrl-orient-vertical.html
diff --git a/layout/reftests/forms/meter/reftest.list b/layout/reftests/forms/meter/reftest.list
index 0a92a6004..ec0b5fcb0 100644
--- a/layout/reftests/forms/meter/reftest.list
+++ b/layout/reftests/forms/meter/reftest.list
@@ -1,4 +1,4 @@
-fuzzy-if(Android,128,16) == values.html values-ref.html
+== values.html values-ref.html
== values-rtl.html values-rtl-ref.html
== margin-padding.html margin-padding-ref.html
== margin-padding-rtl.html margin-padding-rtl-ref.html
diff --git a/layout/reftests/forms/output/reftest-stylo.list b/layout/reftests/forms/output/reftest-stylo.list
deleted file mode 100644
index b55dac96f..000000000
--- a/layout/reftests/forms/output/reftest-stylo.list
+++ /dev/null
@@ -1,8 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== output-1.html output-1.html
-== output-2.html output-2.html
-== output-3.html output-3.html
-== output-4.html output-4.html
-== output-5.html output-5.html
-== output-6.html output-6.html
-== output-7.html output-7.html
diff --git a/layout/reftests/forms/placeholder/reftest-stylo.list b/layout/reftests/forms/placeholder/reftest-stylo.list
deleted file mode 100644
index e6766e944..000000000
--- a/layout/reftests/forms/placeholder/reftest-stylo.list
+++ /dev/null
@@ -1,39 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# Tests using placeholder-focus-ref.html as a reference are disabled because
-# we can't change the caret colour nor disable it and we can't change the
-# text colour without changing the caret which means that the tested page has
-# a black caret with a grey text and the reference has a grey caret with grey
-# text. The only thing that is doable is to make the caret grey in the tested
-# page but that would make the test moot because a failure wouldn't be seen.
-# A real way to fix this would be to be able to style the caret or to implement
-# ::value (bug 648643), depending of the ::value behaviour (it could change the
-# caret colour and the text colour or just the text colour).
-
-== placeholder-1-text.html placeholder-1-text.html
-== placeholder-1-password.html placeholder-1-password.html
-== placeholder-1-textarea.html placeholder-1-textarea.html
-== placeholder-2.html placeholder-2.html
-== placeholder-2-textarea.html placeholder-2-textarea.html
-== placeholder-3.html placeholder-3.html
-== placeholder-4.html placeholder-4.html
-== placeholder-5.html placeholder-5.html
-fuzzy-if(winWidget,160,10) fuzzy-if(Android,1,1) fuzzy-if(asyncPan&&!layersGPUAccelerated,146,317) fuzzy-if(OSX==1010&&browserIsRemote,1,8) == placeholder-6.html placeholder-6.html
-skip-if(B2G||Mulet||(Android&&asyncPan)) == placeholder-6-textarea.html placeholder-6-textarea.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-# needs-focus == placeholder-7.html placeholder-7.html
-# needs-focus == placeholder-8.html placeholder-8.html
-# needs-focus == placeholder-9.html placeholder-9.html
-needs-focus == placeholder-10.html placeholder-10.html
-== placeholder-11.html placeholder-11.html
-== placeholder-12.html placeholder-12.html
-== placeholder-13.html placeholder-13.html
-== placeholder-14.html placeholder-14.html
-== placeholder-18.html placeholder-18.html
-random-if(winWidget) skip-if((B2G&&browserIsRemote)||Mulet) == placeholder-19.xul placeholder-19.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-# needs-focus == placeholder-20.html placeholder-20.html
-needs-focus == placeholder-21.html placeholder-21.html
-needs-focus == placeholder-22.html placeholder-22.html
-== placeholder-rtl.html placeholder-rtl.html
-pref(dom.placeholder.show_on_focus,false) needs-focus == placeholder-focus-pref.html placeholder-focus-pref.html
diff --git a/layout/reftests/forms/placeholder/reftest.list b/layout/reftests/forms/placeholder/reftest.list
index 525b4ab74..3ba996083 100644
--- a/layout/reftests/forms/placeholder/reftest.list
+++ b/layout/reftests/forms/placeholder/reftest.list
@@ -16,8 +16,8 @@
== placeholder-3.html placeholder-overridden-ref.html
== placeholder-4.html placeholder-overridden-ref.html
== placeholder-5.html placeholder-visible-ref.html
-fuzzy-if(winWidget,160,10) fuzzy-if(Android,1,1) fuzzy-if(asyncPan&&!layersGPUAccelerated,146,317) fuzzy-if(OSX==1010&&browserIsRemote,1,8) == placeholder-6.html placeholder-overflow-ref.html
-skip-if(Android&&asyncPan) == placeholder-6-textarea.html placeholder-overflow-textarea-ref.html
+fuzzy-if(winWidget,160,10) fuzzy-if(asyncPan&&!layersGPUAccelerated,146,317) fuzzy-if(OSX==1010&&browserIsRemote,1,8) == placeholder-6.html placeholder-overflow-ref.html
+== placeholder-6-textarea.html placeholder-overflow-textarea-ref.html
# needs-focus == placeholder-7.html placeholder-focus-ref.html
# needs-focus == placeholder-8.html placeholder-focus-ref.html
# needs-focus == placeholder-9.html placeholder-focus-ref.html
diff --git a/layout/reftests/forms/progress/reftest-stylo.list b/layout/reftests/forms/progress/reftest-stylo.list
deleted file mode 100644
index 5019c4486..000000000
--- a/layout/reftests/forms/progress/reftest-stylo.list
+++ /dev/null
@@ -1,49 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== values.html values.html
-== values-rtl.html values-rtl.html
-== margin-padding.html margin-padding.html
-== margin-padding-rtl.html margin-padding-rtl.html
-skip-if(B2G||Mulet) == bar-pseudo-element.html bar-pseudo-element.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== bar-pseudo-element-rtl.html bar-pseudo-element-rtl.html
-== indeterminate-style-width.html indeterminate-style-width.html
-
-# vertical tests
-== values-vertical.html values-vertical.html
-== values-vertical-rtl.html values-vertical-rtl.html
-== margin-padding-vertical.html margin-padding-vertical.html
-== margin-padding-vertical-rtl.html margin-padding-vertical-rtl.html
-skip-if(B2G||Mulet) == bar-pseudo-element-vertical.html bar-pseudo-element-vertical.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== bar-pseudo-element-vertical-rtl.html bar-pseudo-element-vertical-rtl.html
-== indeterminate-style-height.html indeterminate-style-height.html
-
-# The following test is disabled but kept in the repository because the
-# transformations will not behave exactly the same for <progress> and two divs.
-# However, it would be possible to manually check those.
-# == transformations.html transformations.html
-
-# Tests for bugs:
-== block-invalidate.html block-invalidate.html
-== in-cells.html in-cells.html
-== max-height.html max-height.html
-
-# Tests for block and inline orientation in combination with writing-mode
-# XXX Remove default-preferences setting here after bug 1138384 makes
-# it the default for all channels
-
-== progress-orient-horizontal.html progress-orient-horizontal.html
-skip == progress-orient-vertical.html progress-orient-vertical.html
-# only OS X currently has direction-dependent rendering here
-== progress-orient-block.html progress-orient-block.html
-== progress-orient-inline.html progress-orient-inline.html
-== progress-vlr.html progress-vlr.html
-== progress-vlr-orient-block.html progress-vlr-orient-block.html
-== progress-vlr-orient-inline.html progress-vlr-orient-inline.html
-== progress-vlr-orient-horizontal.html progress-vlr-orient-horizontal.html
-== progress-vlr-orient-vertical.html progress-vlr-orient-vertical.html
-== progress-vrl.html progress-vrl.html
-== progress-vrl-orient-block.html progress-vrl-orient-block.html
-== progress-vrl-orient-inline.html progress-vrl-orient-inline.html
-== progress-vrl-orient-horizontal.html progress-vrl-orient-horizontal.html
-== progress-vrl-orient-vertical.html progress-vrl-orient-vertical.html
diff --git a/layout/reftests/forms/reftest-stylo.list b/layout/reftests/forms/reftest-stylo.list
deleted file mode 100644
index cfea24b9a..000000000
--- a/layout/reftests/forms/reftest-stylo.list
+++ /dev/null
@@ -1,36 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-skip-if(B2G||Mulet) fuzzy-if(skiaContent,1,10) HTTP(..) == text-control-baseline-1.html text-control-baseline-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-# button element
-include button/reftest-stylo.list
-
-# legend element
-include legend/reftest-stylo.list
-
-# fieldset element
-include fieldset/reftest-stylo.list
-
-# placeholder
-include placeholder/reftest-stylo.list
-
-# input
-include input/reftest-stylo.list
-
-# meter element
-include meter/reftest-stylo.list
-
-# output element
-include output/reftest-stylo.list
-
-# progress element
-include progress/reftest-stylo.list
-
-# select element
-include select/reftest-stylo.list
-
-# textarea element
-include textarea/reftest-stylo.list
-
-# textbox element
-include textbox/reftest-stylo.list
diff --git a/layout/reftests/forms/reftest.list b/layout/reftests/forms/reftest.list
index c7532077b..c587abe80 100644
--- a/layout/reftests/forms/reftest.list
+++ b/layout/reftests/forms/reftest.list
@@ -1,9 +1,9 @@
fuzzy-if(skiaContent,1,10) HTTP(..) == text-control-baseline-1.html text-control-baseline-1-ref.html
-fuzzy-if(cocoaWidget,16,64) fuzzy-if(Android,52,64) fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu),104,224) fuzzy-if(/^Windows\x20NT\x206\.2/.test(http.oscpu),57,400) == display-block-baselines-1.html display-block-baselines-1-ref.html # anti-aliasing issues
+fuzzy-if(cocoaWidget,16,64) fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu),104,224) fuzzy-if(/^Windows\x20NT\x206\.2/.test(http.oscpu),57,400) == display-block-baselines-1.html display-block-baselines-1-ref.html # anti-aliasing issues
== display-block-baselines-2.html display-block-baselines-2-ref.html
== display-block-baselines-3.html display-block-baselines-3-ref.html
== display-block-baselines-4.html display-block-baselines-4-ref.html
-fuzzy-if(Android,4,8) == display-block-baselines-5.html display-block-baselines-5-ref.html
+== display-block-baselines-5.html display-block-baselines-5-ref.html
# button element
include button/reftest.list
diff --git a/layout/reftests/forms/select/reftest-stylo.list b/layout/reftests/forms/select/reftest-stylo.list
deleted file mode 100644
index 998f27237..000000000
--- a/layout/reftests/forms/select/reftest-stylo.list
+++ /dev/null
@@ -1,15 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-fuzzy-if(Android,2,2) skip-if(B2G||Mulet) == out-of-bounds-selectedindex.html out-of-bounds-selectedindex.html
-# test for bug 471741
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == multiple.html multiple.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== boguskids.html boguskids.html
-== dynamic-boguskids.html dynamic-boguskids.html
-== option-children.html option-children.html
-fuzzy(1,4) == padding-button-placement.html padding-button-placement.html
-HTTP(../..) == vertical-centering.html vertical-centering.html
-== 997709-2.html 997709-2.html
-needs-focus == focusring-1.html focusring-1.html
-needs-focus == focusring-2.html focusring-2.html
-needs-focus == focusring-3.html focusring-3.html
diff --git a/layout/reftests/forms/select/reftest.list b/layout/reftests/forms/select/reftest.list
index 1261dad9f..f3e0bc866 100644
--- a/layout/reftests/forms/select/reftest.list
+++ b/layout/reftests/forms/select/reftest.list
@@ -1,4 +1,4 @@
-fuzzy-if(Android,4,11) == out-of-bounds-selectedindex.html out-of-bounds-selectedindex-ref.html # test for bug 471741
+== out-of-bounds-selectedindex.html out-of-bounds-selectedindex-ref.html # test for bug 471741
== multiple.html multiple-ref.html
== boguskids.html boguskids-ref.html
== dynamic-boguskids.html boguskids-ref.html
diff --git a/layout/reftests/forms/textarea/reftest-stylo.list b/layout/reftests/forms/textarea/reftest-stylo.list
deleted file mode 100644
index 0a050f16b..000000000
--- a/layout/reftests/forms/textarea/reftest-stylo.list
+++ /dev/null
@@ -1,23 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-skip-if(B2G||Mulet||Android) == resize.html resize.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-# an offset seems to apply to the native resizer on windows so skip this test for now
-fails skip-if(B2G||Mulet||Android) skip-if(winWidget) fuzzy-if(cocoaWidget,1,33) fuzzy-if(skiaContent&&!winWidget,5,10) == resize-background.html resize-background.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet||Android) == ltr.html ltr.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet||Android) == ltr-scrollbar.html ltr-scrollbar.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip == in-ltr-doc-scrollbar.html in-ltr-doc-scrollbar.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet||Android) == ltr.html ltr.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet||Android) fails-if(xulRuntime.widgetToolkit=="gtk2") == rtl.html rtl.html
-# bug 834724
-# Initial mulet triage: parity with B2G/B2G Desktop
-== rtl.html rtl.html
-== rtl.html rtl.html
-== rtl.html rtl.html
-fuzzy-if(skiaContent,1,3) == setvalue-framereconstruction-1.html setvalue-framereconstruction-1.html
-fuzzy-if(asyncPan&&!layersGPUAccelerated,102,4168) == padding-scrollbar-placement.html padding-scrollbar-placement.html
-== various-cols.html various-cols.html
diff --git a/layout/reftests/forms/textarea/reftest.list b/layout/reftests/forms/textarea/reftest.list
index aee3654cb..15e285c0c 100644
--- a/layout/reftests/forms/textarea/reftest.list
+++ b/layout/reftests/forms/textarea/reftest.list
@@ -1,11 +1,11 @@
-skip-if(Android) == resize.html resize-ref.html
+== resize.html resize-ref.html
# an offset seems to apply to the native resizer on windows so skip this test for now
-skip-if(Android) skip-if(winWidget) fuzzy-if(cocoaWidget,1,33) fuzzy-if(skiaContent&&!winWidget&&!Android,5,10) == resize-background.html resize-background-ref.html
-skip-if(Android) != ltr.html rtl.html
-skip-if(Android) != ltr-scrollbar.html rtl-scrollbar.html
-skip-if(Android) != in-ltr-doc-scrollbar.html in-rtl-doc-scrollbar.html
-skip-if(Android) != ltr.html no-resize.html
-skip-if(Android) fails-if(xulRuntime.widgetToolkit=="gtk2") != rtl.html no-resize.html # bug 834724
+skip-if(winWidget) fuzzy-if(cocoaWidget,1,33) fuzzy-if(skiaContent&&!winWidget,5,10) == resize-background.html resize-background-ref.html
+!= ltr.html rtl.html
+!= ltr-scrollbar.html rtl-scrollbar.html
+!= in-ltr-doc-scrollbar.html in-rtl-doc-scrollbar.html
+!= ltr.html no-resize.html
+fails-if(xulRuntime.widgetToolkit=="gtk2") != rtl.html no-resize.html # bug 834724
== rtl.html rtl-dynamic-attr.html
== rtl.html rtl-dynamic-style.html
== rtl.html in-dynamic-rtl-doc.html
diff --git a/layout/reftests/forms/textbox/reftest-stylo.list b/layout/reftests/forms/textbox/reftest-stylo.list
deleted file mode 100644
index f14a2c20a..000000000
--- a/layout/reftests/forms/textbox/reftest-stylo.list
+++ /dev/null
@@ -1,28 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# access-key tests are no use on OS X because access keys are not indicated visually
-# no real XUL theme on Android so we just skip
-skip-if(cocoaWidget||((B2G&&browserIsRemote)||Mulet)||Android) == accesskey-1.xul accesskey-1.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(cocoaWidget||((B2G&&browserIsRemote)||Mulet)||Android) == accesskey-2.xul accesskey-2.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-# accesskey-3 fails because of defects in XUL bidi support
-skip == accesskey-3.xul accesskey-3.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(cocoaWidget||((B2G&&browserIsRemote)||Mulet)||Android) == accesskey-3.xul accesskey-3.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(cocoaWidget||((B2G&&browserIsRemote)||Mulet)||Android) == accesskey-4.xul accesskey-4.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(cocoaWidget||((B2G&&browserIsRemote)||Mulet)||Android) == accesskey-4.xul accesskey-4.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet||Android) == align-baseline-1.xul align-baseline-1.xul
-# test for bug 494901
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet||Android) == setsize.xul setsize.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
diff --git a/layout/reftests/forms/textbox/reftest.list b/layout/reftests/forms/textbox/reftest.list
index eb0b8fc9d..8e955e597 100644
--- a/layout/reftests/forms/textbox/reftest.list
+++ b/layout/reftests/forms/textbox/reftest.list
@@ -1,11 +1,10 @@
# access-key tests are no use on OS X because access keys are not indicated visually
-# no real XUL theme on Android so we just skip
-skip-if(cocoaWidget||Android) != accesskey-1.xul accesskey-1-notref.xul
-skip-if(cocoaWidget||Android) == accesskey-2.xul accesskey-2-ref.xul
+skip-if(cocoaWidget) != accesskey-1.xul accesskey-1-notref.xul
+skip-if(cocoaWidget) == accesskey-2.xul accesskey-2-ref.xul
# accesskey-3 fails because of defects in XUL bidi support
-fails-if(!cocoaWidget) skip-if(cocoaWidget||Android) == accesskey-3.xul accesskey-3-ref.xul
-skip-if(cocoaWidget||Android) != accesskey-3.xul accesskey-3-notref.xul
-skip-if(cocoaWidget||Android) == accesskey-4.xul accesskey-4-ref.xul
-skip-if(cocoaWidget||Android) != accesskey-4.xul accesskey-4-notref.xul
-skip-if(Android) == align-baseline-1.xul align-baseline-1-ref.xul # test for bug 494901
-skip-if(Android) == setsize.xul setsize-ref.xul
+fails-if(!cocoaWidget) skip-if(cocoaWidget) == accesskey-3.xul accesskey-3-ref.xul
+skip-if(cocoaWidget) != accesskey-3.xul accesskey-3-notref.xul
+skip-if(cocoaWidget) == accesskey-4.xul accesskey-4-ref.xul
+skip-if(cocoaWidget) != accesskey-4.xul accesskey-4-notref.xul
+== align-baseline-1.xul align-baseline-1-ref.xul # test for bug 494901
+== setsize.xul setsize-ref.xul
diff --git a/layout/reftests/generated-content/reftest-stylo.list b/layout/reftests/generated-content/reftest-stylo.list
deleted file mode 100644
index 1b63ebecf..000000000
--- a/layout/reftests/generated-content/reftest-stylo.list
+++ /dev/null
@@ -1,20 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# All tests in this file have fuzz on OS X 10.10 due to bug 1220052.
-
-skip-if(B2G||Mulet) fuzzy-if(OSX==1010,1,10) == display-types-01.html display-types-01.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-fuzzy-if(OSX==1010,1,10) == dynamic-attr-01.html dynamic-attr-01.html
-fuzzy-if(OSX==1010,1,10) == dynamic-button-01a.html dynamic-button-01a.html
-fuzzy-if(OSX==1010,1,10) == dynamic-button-01b.html dynamic-button-01b.html
-fuzzy-if(OSX==1010,1,10) == dynamic-fieldset-01a.html dynamic-fieldset-01a.html
-fuzzy-if(OSX==1010,1,10) == dynamic-fieldset-01b.html dynamic-fieldset-01b.html
-fuzzy-if(OSX==1010,1,10) == dynamic-restyle-01.html dynamic-restyle-01.html
-fuzzy-if(OSX==1010,1,10) == dynamic-table-cell-01a.html dynamic-table-cell-01a.html
-fuzzy-if(OSX==1010,1,10) == dynamic-table-cell-01b.html dynamic-table-cell-01b.html
-fuzzy-if(OSX==1010,1,10) == floated-01.html floated-01.html
-fuzzy-if(OSX==1010,1,10) == images-01.html images-01.html
-fuzzy-if(OSX==1010,1,10) == positioned-01.html positioned-01.html
-fuzzy-if(OSX==1010,1,10) == quotes-001.xml quotes-001.xml
-fuzzy-if(OSX==1010,1,10) == table-ignoring-whitespace-01.html table-ignoring-whitespace-01.html
-fuzzy-if(OSX==1010,1,10) == table-parts-01.html table-parts-01.html
diff --git a/layout/reftests/ib-split/reftest-stylo.list b/layout/reftests/ib-split/reftest-stylo.list
deleted file mode 100644
index 2c5b4b204..000000000
--- a/layout/reftests/ib-split/reftest-stylo.list
+++ /dev/null
@@ -1,86 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== remove-split-inline-1.html remove-split-inline-1.html
-== remove-from-split-inline-1.html remove-from-split-inline-1.html
-== remove-from-split-inline-1-ref.html remove-from-split-inline-1-ref.html
-== remove-from-split-inline-2.html remove-from-split-inline-2.html
-== remove-from-split-inline-3.html remove-from-split-inline-3.html
-== remove-from-split-inline-3-ref.html remove-from-split-inline-3-ref.html
-== remove-from-split-inline-4.html remove-from-split-inline-4.html
-== remove-from-split-inline-4-ref.html remove-from-split-inline-4-ref.html
-== remove-from-split-inline-5.html remove-from-split-inline-5.html
-== remove-from-split-inline-5-ref.html remove-from-split-inline-5-ref.html
-== remove-from-split-inline-6.html remove-from-split-inline-6.html
-== remove-from-split-inline-6-ref.html remove-from-split-inline-6-ref.html
-== insert-into-split-inline-1a.html insert-into-split-inline-1a.html
-== insert-into-split-inline-1b.html insert-into-split-inline-1b.html
-== insert-into-split-inline-1c.html insert-into-split-inline-1c.html
-== insert-into-split-inline-1d.html insert-into-split-inline-1d.html
-== insert-into-split-inline-1e.html insert-into-split-inline-1e.html
-== insert-into-split-inline-1f.html insert-into-split-inline-1f.html
-== insert-into-split-inline-1g.html insert-into-split-inline-1g.html
-== insert-into-split-inline-1h.html insert-into-split-inline-1h.html
-== insert-into-split-inline-1i.html insert-into-split-inline-1i.html
-== insert-into-split-inline-1j.html insert-into-split-inline-1j.html
-== insert-into-split-inline-1k.html insert-into-split-inline-1k.html
-== insert-into-split-inline-1l.html insert-into-split-inline-1l.html
-== insert-into-split-inline-1-ref.html insert-into-split-inline-1-ref.html
-== insert-into-split-inline-2a.html insert-into-split-inline-2a.html
-== insert-into-split-inline-2b.html insert-into-split-inline-2b.html
-== insert-into-split-inline-2c.html insert-into-split-inline-2c.html
-== insert-into-split-inline-2d.html insert-into-split-inline-2d.html
-== insert-into-split-inline-2e.html insert-into-split-inline-2e.html
-== insert-into-split-inline-2f.html insert-into-split-inline-2f.html
-== insert-into-split-inline-2g.html insert-into-split-inline-2g.html
-== insert-into-split-inline-2h.html insert-into-split-inline-2h.html
-== insert-into-split-inline-2i.html insert-into-split-inline-2i.html
-== insert-into-split-inline-2-ref.html insert-into-split-inline-2-ref.html
-== insert-into-split-inline-3.html insert-into-split-inline-3.html
-== insert-into-split-inline-3-ref.html insert-into-split-inline-3-ref.html
-== insert-into-split-inline-4.html insert-into-split-inline-4.html
-== insert-into-split-inline-4-ref.html insert-into-split-inline-4-ref.html
-== insert-into-split-inline-5.html insert-into-split-inline-5.html
-== insert-into-split-inline-5-ref.html insert-into-split-inline-5-ref.html
-== insert-into-split-inline-6.html insert-into-split-inline-6.html
-== insert-into-split-inline-6-ref.html insert-into-split-inline-6-ref.html
-== insert-into-split-inline-7.html insert-into-split-inline-7.html
-== insert-into-split-inline-7-ref.html insert-into-split-inline-7-ref.html
-== insert-into-split-inline-8a.html insert-into-split-inline-8a.html
-== insert-into-split-inline-8b.html insert-into-split-inline-8b.html
-== insert-into-split-inline-8c.html insert-into-split-inline-8c.html
-== insert-into-split-inline-8-ref.html insert-into-split-inline-8-ref.html
-== insert-into-split-inline-9.html insert-into-split-inline-9.html
-== insert-into-split-inline-9-ref.html insert-into-split-inline-9-ref.html
-== insert-into-split-inline-10.html insert-into-split-inline-10.html
-== insert-into-split-inline-10-ref.html insert-into-split-inline-10-ref.html
-== insert-into-split-inline-11.html insert-into-split-inline-11.html
-== insert-into-split-inline-11-ref.html insert-into-split-inline-11-ref.html
-== insert-into-split-inline-12.html insert-into-split-inline-12.html
-== insert-into-split-inline-12-ref.html insert-into-split-inline-12-ref.html
-== insert-into-split-inline-13.html insert-into-split-inline-13.html
-== insert-into-split-inline-13-ref.html insert-into-split-inline-13-ref.html
-== insert-into-split-inline-14.html insert-into-split-inline-14.html
-== insert-into-split-inline-14-ref.html insert-into-split-inline-14-ref.html
-== insert-into-split-inline-15.html insert-into-split-inline-15.html
-== insert-into-split-inline-15-ref.html insert-into-split-inline-15-ref.html
-== insert-into-split-inline-16a.html insert-into-split-inline-16a.html
-== insert-into-split-inline-16b.html insert-into-split-inline-16b.html
-== insert-into-split-inline-16-ref.html insert-into-split-inline-16-ref.html
-== float-inside-inline-between-blocks-1.html float-inside-inline-between-blocks-1.html
-== table-pseudo-in-part3-1.html table-pseudo-in-part3-1.html
-== emptyspan-1.html emptyspan-1.html
-skip == emptyspan-2.html emptyspan-2.html
-== emptyspan-3.html emptyspan-3.html
-== emptyspan-4.html emptyspan-4.html
-== split-inner-inline-1.html split-inner-inline-1.html
-== split-inner-inline-2.html split-inner-inline-2.html
-== whitespace-present-1a.html whitespace-present-1a.html
-== whitespace-present-1b.html whitespace-present-1b.html
-== percent-height-1.html percent-height-1.html
-== ignored-margins-1a.html ignored-margins-1a.html
-== ignored-margins-1b.html ignored-margins-1b.html
-== ignored-margins-2a.html ignored-margins-2a.html
-== ignored-margins-2b.html ignored-margins-2b.html
-== trailing-inline-with-continuations-1.html trailing-inline-with-continuations-1.html
-skip == append-to-empty-trailing-inline-1.html append-to-empty-trailing-inline-1.html
-skip == append-to-nested-split-inline-1.html append-to-nested-split-inline-1.html
-skip == append-to-nested-split-inline-1-ref.html append-to-nested-split-inline-1-ref.html
diff --git a/layout/reftests/image-element/reftest-stylo.list b/layout/reftests/image-element/reftest-stylo.list
deleted file mode 100644
index 518d86024..000000000
--- a/layout/reftests/image-element/reftest-stylo.list
+++ /dev/null
@@ -1,67 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-random == bug-364968.html bug-364968.html
-== bug-463204.html bug-463204.html
-== canvas-outside-document.html canvas-outside-document.html
-== mozsetimageelement-01.html mozsetimageelement-01.html
-skip-if(B2G||Mulet) == mozsetimageelement-02.html mozsetimageelement-02.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == image-outside-document-invalidate.html image-outside-document-invalidate.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == canvas-outside-document-invalidate-01.html canvas-outside-document-invalidate-01.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip == canvas-outside-document-invalidate-02.html canvas-outside-document-invalidate-02.html
-# See bug 666800
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-#fails with Skia due to Skia bug http://code.google.com/p/skia/issues/detail?id=568
-== element-paint-simple.html element-paint-simple.html
-== element-paint-repeated.html element-paint-repeated.html
-== element-paint-recursion.html element-paint-recursion.html
-skip-if(B2G||Mulet) HTTP(..) == element-paint-continuation.html element-paint-continuation.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== element-paint-transform-01.html element-paint-transform-01.html
-random-if(d2d) == element-paint-transform-02.html element-paint-transform-02.html
-# bug 587133
-fuzzy-if(d2d&&/^Windows\x20NT\x206\.1/.test(http.oscpu),16,90) == element-paint-background-size-01.html element-paint-background-size-01.html
-== element-paint-background-size-02.html element-paint-background-size-02.html
-== element-paint-transform-repeated.html element-paint-transform-repeated.html
-fuzzy-if(d2d,255,24) == element-paint-transform-03.html element-paint-transform-03.html
-fails fuzzy-if(asyncPan,2,140) fuzzy-if(skiaContent,2,106) == element-paint-native-widget.html element-paint-native-widget.html
-# in -ref the scrollframe is active and layerized differently with APZ
-skip fails-if(usesRepeatResampling) == element-paint-subimage-sampling-restriction.html element-paint-subimage-sampling-restriction.html
-== element-paint-clippath.html element-paint-clippath.html
-== element-paint-sharpness-01a.html element-paint-sharpness-01a.html
-fuzzy-if(skiaContent,1,326) == element-paint-sharpness-01b.html element-paint-sharpness-01b.html
-== element-paint-sharpness-01c.html element-paint-sharpness-01c.html
-== element-paint-sharpness-02a.html element-paint-sharpness-02a.html
-fuzzy-if(B2G,11,4) == element-paint-sharpness-02b.html element-paint-sharpness-02b.html
-== element-paint-paintserversize-rounding-01.html element-paint-paintserversize-rounding-01.html
-fuzzy-if(!isDebugBuild&&gtkWidget&&/^Linux\x20i686/.test(http.oscpu),79,1191) == element-paint-paintserversize-rounding-02.html element-paint-paintserversize-rounding-02.html
-# Linux32 from GCC update
-== element-paint-multiple-backgrounds-01a.html element-paint-multiple-backgrounds-01a.html
-skip-if(B2G||Mulet) == element-paint-multiple-backgrounds-01b.html element-paint-multiple-backgrounds-01b.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == element-paint-multiple-backgrounds-01c.html element-paint-multiple-backgrounds-01c.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== gradient-html-01.html gradient-html-01.html
-== gradient-html-02.html gradient-html-02.html
-random-if(!cocoaWidget) == gradient-html-03.html gradient-html-03.html
-== gradient-html-04.html gradient-html-04.html
-== gradient-html-05.html gradient-html-05.html
-fuzzy(1,9674) random-if(!cocoaWidget) == gradient-html-06a.html gradient-html-06a.html
-fuzzy(1,9674) random-if(!cocoaWidget) == gradient-html-06b.html gradient-html-06b.html
-== gradient-html-06c.html gradient-html-06c.html
-== gradient-html-06d.html gradient-html-06d.html
-random-if(!cocoaWidget) fuzzy-if(cocoaWidget,2,42305) == gradient-html-07a.html gradient-html-07a.html
-== gradient-html-07c.html gradient-html-07c.html
-HTTP == invalidate-1.html invalidate-1.html
-== pattern-html-01.html pattern-html-01.html
-== pattern-html-02.html pattern-html-02.html
-# skip XBL test case on B2G
-skip-if(B2G||Mulet) == referenced-from-binding-01.html referenced-from-binding-01.html
-# Initial mulet triage: parity with B2G/B2G Desktop
diff --git a/layout/reftests/image-rect/reftest-stylo.list b/layout/reftests/image-rect/reftest-stylo.list
deleted file mode 100644
index 3cf5817af..000000000
--- a/layout/reftests/image-rect/reftest-stylo.list
+++ /dev/null
@@ -1,23 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-skip-if(B2G||Mulet) == background-common-usage-floating-point.html background-common-usage-floating-point.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== background-common-usage-percent.html background-common-usage-percent.html
-== background-common-usage-pixel.html background-common-usage-pixel.html
-== background-draw-nothing-empty-rect.html background-draw-nothing-empty-rect.html
-== background-draw-nothing-invalid-syntax.html background-draw-nothing-invalid-syntax.html
-asserts(0-6) == background-draw-nothing-malformed-images.html background-draw-nothing-malformed-images.html
-# Bug 576419
-== background-monster-rect.html background-monster-rect.html
-skip == background-over-size-rect.html background-over-size-rect.html
-== background-test-parser.html background-test-parser.html
-fuzzy-if(Android||B2G,113,124) == background-with-other-properties.html background-with-other-properties.html
-fuzzy-if(Android||B2G||Mulet,16,22) == background-zoom-1.html background-zoom-1.html
-# Bug 1128229
-# Bug 1153574
-fuzzy-if(Mulet,2,11) == background-zoom-2.html background-zoom-2.html
-# Bug 1153574
-== background-zoom-3.html background-zoom-3.html
-== background-zoom-4.html background-zoom-4.html
-== dom-api-computed-style.html dom-api-computed-style.html
-== dom-api.html dom-api.html
diff --git a/layout/reftests/image-rect/reftest.list b/layout/reftests/image-rect/reftest.list
index 077deec1e..61573c8f5 100644
--- a/layout/reftests/image-rect/reftest.list
+++ b/layout/reftests/image-rect/reftest.list
@@ -7,8 +7,8 @@ asserts(0-6) == background-draw-nothing-malformed-images.html background-draw-no
== background-monster-rect.html background-monster-rect-ref.html
== background-over-size-rect.html background-over-size-rect-ref.html
== background-test-parser.html background-test-parser-ref.html
-fuzzy-if(Android,113,124) == background-with-other-properties.html background-with-other-properties-ref.html
-fuzzy-if(Android,16,22) == background-zoom-1.html background-zoom-1-ref.html # Bug 1128229
+== background-with-other-properties.html background-with-other-properties-ref.html
+== background-zoom-1.html background-zoom-1-ref.html # Bug 1128229
== background-zoom-2.html background-zoom-2-ref.html
== background-zoom-3.html background-zoom-3-ref.html
== background-zoom-4.html background-zoom-4-ref.html
diff --git a/layout/reftests/image-region/reftest-stylo.list b/layout/reftests/image-region/reftest-stylo.list
deleted file mode 100644
index 417d66082..000000000
--- a/layout/reftests/image-region/reftest-stylo.list
+++ /dev/null
@@ -1,3 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-skip-if((B2G&&browserIsRemote)||Mulet) == image-region.xul image-region.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
diff --git a/layout/reftests/image/reftest-stylo.list b/layout/reftests/image/reftest-stylo.list
deleted file mode 100644
index 23d4783a3..000000000
--- a/layout/reftests/image/reftest-stylo.list
+++ /dev/null
@@ -1,137 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-fuzzy-if(Android,8,30) == background-image-zoom-1.html background-image-zoom-1.html
-fails-if(usesRepeatResampling) == background-image-zoom-2.html background-image-zoom-2.html
-== image-seam-1a.html image-seam-1a.html
-== image-seam-1b.html image-seam-1b.html
-fuzzy-if(Android,255,154) == image-seam-2.html image-seam-2.html
-# Bug 1128229
-skip-if((B2G&&browserIsRemote)||Mulet) == image-zoom-1.html image-zoom-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == image-zoom-2.html image-zoom-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== invalid-url-image-1.html invalid-url-image-1.html
-random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) == sync-image-switch-1a.html sync-image-switch-1a.html
-# bug 855050 for WinXP
-random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) == sync-image-switch-1b.html sync-image-switch-1b.html
-# bug 855050 for WinXP
-random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) == sync-image-switch-1c.html sync-image-switch-1c.html
-# bug 855050 for WinXP
-random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) == sync-image-switch-1d.html sync-image-switch-1d.html
-# bug 855050 for WinXP
-
-# Tests for "object-fit" & "object-position"
-skip == image-object-fit-dyn-1.html image-object-fit-dyn-1.html
-skip == image-object-fit-with-background-1.html image-object-fit-with-background-1.html
-skip == image-object-fit-with-background-2.html image-object-fit-with-background-2.html
-skip == image-object-position-dyn-1.html image-object-position-dyn-1.html
-skip == image-object-position-with-background-1.html image-object-position-with-background-1.html
-skip == image-object-position-with-background-2.html image-object-position-with-background-2.html
-# Bug 1128229
-
-# Tests for image-orientation used with 'from-image' (note that all
-# image-orientation tests are fuzzy because the JPEG images do not perfectly
-# reproduce blocks of solid color, even at maximum quality):
-== image-orientation-from-image.html?none image-orientation-from-image.html?none
-== image-orientation-from-image.html?0 image-orientation-from-image.html?0
-== image-orientation-from-image.html?90 image-orientation-from-image.html?90
-== image-orientation-from-image.html?180 image-orientation-from-image.html?180
-== image-orientation-from-image.html?270 image-orientation-from-image.html?270
-== image-orientation-from-image.html?0&flip image-orientation-from-image.html?0&flip
-== image-orientation-from-image.html?90&flip image-orientation-from-image.html?90&flip
-== image-orientation-from-image.html?180&flip image-orientation-from-image.html?180&flip
-== image-orientation-from-image.html?270&flip image-orientation-from-image.html?270&flip
-
-# Tests for image-orientation used with an explicit orientation:
-fuzzy(1,1) == image-orientation-explicit.html?0 image-orientation-explicit.html?0
-== image-orientation-explicit.html?90 image-orientation-explicit.html?90
-== image-orientation-explicit.html?180 image-orientation-explicit.html?180
-== image-orientation-explicit.html?270 image-orientation-explicit.html?270
-== image-orientation-explicit.html?0&flip image-orientation-explicit.html?0&flip
-== image-orientation-explicit.html?90&flip image-orientation-explicit.html?90&flip
-== image-orientation-explicit.html?180&flip image-orientation-explicit.html?180&flip
-== image-orientation-explicit.html?270&flip image-orientation-explicit.html?270&flip
-
-# Tests for image-orientation used with non-axis-aligned angles:
-fuzzy(1,1) == image-orientation-explicit.html?-45 image-orientation-explicit.html?-45
-fuzzy(1,1) == image-orientation-explicit.html?-15 image-orientation-explicit.html?-15
-fuzzy(1,1) == image-orientation-explicit.html?15 image-orientation-explicit.html?15
-== image-orientation-explicit.html?45 image-orientation-explicit.html?45
-== image-orientation-explicit.html?75 image-orientation-explicit.html?75
-== image-orientation-explicit.html?105 image-orientation-explicit.html?105
-== image-orientation-explicit.html?135 image-orientation-explicit.html?135
-== image-orientation-explicit.html?165 image-orientation-explicit.html?165
-== image-orientation-explicit.html?195 image-orientation-explicit.html?195
-== image-orientation-explicit.html?225 image-orientation-explicit.html?225
-== image-orientation-explicit.html?255 image-orientation-explicit.html?255
-== image-orientation-explicit.html?285 image-orientation-explicit.html?285
-fuzzy(1,1) == image-orientation-explicit.html?315 image-orientation-explicit.html?315
-fuzzy(1,1) == image-orientation-explicit.html?345 image-orientation-explicit.html?345
-
-# Tests for image-orientation used on generated content:
-== image-orientation-generated-content.html?from-image image-orientation-generated-content.html?from-image
-== image-orientation-generated-content.html?0 image-orientation-generated-content.html?0
-== image-orientation-generated-content.html?90 image-orientation-generated-content.html?90
-== image-orientation-generated-content.html?180 image-orientation-generated-content.html?180
-== image-orientation-generated-content.html?270 image-orientation-generated-content.html?270
-== image-orientation-generated-content.html?0&flip image-orientation-generated-content.html?0&flip
-== image-orientation-generated-content.html?90&flip image-orientation-generated-content.html?90&flip
-== image-orientation-generated-content.html?180&flip image-orientation-generated-content.html?180&flip
-== image-orientation-generated-content.html?270&flip image-orientation-generated-content.html?270&flip
-
-# Tests that image-orientation does not apply to decorative images:
-== image-orientation-background.html?from-image image-orientation-background.html?from-image
-== image-orientation-background.html?90&flip image-orientation-background.html?90&flip
-== image-orientation-border-image.html?from-image image-orientation-border-image.html?from-image
-== image-orientation-border-image.html?90&flip image-orientation-border-image.html?90&flip
-== image-orientation-list-style-image.html?from-image image-orientation-list-style-image.html?from-image
-== image-orientation-list-style-image.html?90&flip image-orientation-list-style-image.html?90&flip
-
-# Sanity checks for the image-orientation tests. Ensures that the various
-# combinations of rotations and flips actually look different from each other.
-== image-orientation-ref.html?0 image-orientation-ref.html?0
-== image-orientation-ref.html?0 image-orientation-ref.html?0
-== image-orientation-ref.html?0 image-orientation-ref.html?0
-== image-orientation-ref.html?90 image-orientation-ref.html?90
-== image-orientation-ref.html?90 image-orientation-ref.html?90
-== image-orientation-ref.html?180 image-orientation-ref.html?180
-== image-orientation-ref.html?0 image-orientation-ref.html?0
-== image-orientation-ref.html?90 image-orientation-ref.html?90
-== image-orientation-ref.html?180 image-orientation-ref.html?180
-== image-orientation-ref.html?270 image-orientation-ref.html?270
-== image-orientation-generated-content-ref.html?0 image-orientation-generated-content-ref.html?0
-== image-orientation-generated-content-ref.html?0 image-orientation-generated-content-ref.html?0
-== image-orientation-generated-content-ref.html?0 image-orientation-generated-content-ref.html?0
-== image-orientation-generated-content-ref.html?90 image-orientation-generated-content-ref.html?90
-== image-orientation-generated-content-ref.html?90 image-orientation-generated-content-ref.html?90
-== image-orientation-generated-content-ref.html?180 image-orientation-generated-content-ref.html?180
-== image-orientation-generated-content-ref.html?0 image-orientation-generated-content-ref.html?0
-== image-orientation-generated-content-ref.html?90 image-orientation-generated-content-ref.html?90
-== image-orientation-generated-content-ref.html?180 image-orientation-generated-content-ref.html?180
-== image-orientation-generated-content-ref.html?270 image-orientation-generated-content-ref.html?270
-== image-orientation-dynamic.html image-orientation-dynamic.html
-
-# <img srcset> tests
-skip == image-srcset-basic-selection-0.1x.html image-srcset-basic-selection-0.1x.html
-skip == image-srcset-basic-selection-2x.html image-srcset-basic-selection-2x.html
-skip == image-srcset-basic-selection-0.5x.html image-srcset-basic-selection-0.5x.html
-skip == image-srcset-basic-selection-0.6x.html image-srcset-basic-selection-0.6x.html
-skip == image-srcset-basic-selection-1.5x.html image-srcset-basic-selection-1.5x.html
-skip == image-srcset-basic-selection-1x.html image-srcset-basic-selection-1x.html
-skip == image-srcset-basic-selection-width-0.5x.html image-srcset-basic-selection-width-0.5x.html
-skip == image-srcset-basic-selection-width-10x.html image-srcset-basic-selection-width-10x.html
-skip == image-srcset-basic-selection-width-2x.html image-srcset-basic-selection-width-2x.html
-skip == image-srcset-basic-selection-width-1x.html image-srcset-basic-selection-width-1x.html
-== image-srcset-default-2x.html image-srcset-default-2x.html
-== image-srcset-default-1x.html image-srcset-default-1x.html
-== image-srcset-default-src-2x.html image-srcset-default-src-2x.html
-== image-srcset-default-src-1x.html image-srcset-default-src-1x.html
-== image-srcset-orientation-2x.html image-srcset-orientation-2x.html
-== image-srcset-orientation-1x.html image-srcset-orientation-1x.html
-== image-srcset-svg-3x.html image-srcset-svg-3x.html
-== image-srcset-svg-2x.html image-srcset-svg-2x.html
-== image-srcset-svg-1x.html image-srcset-svg-1x.html
-== image-srcset-svg-default-2x.html image-srcset-svg-default-2x.html
-== image-srcset-svg-default-1x.html image-srcset-svg-default-1x.html
-
-== image-resize-percent-height.html image-resize-percent-height.html
-== image-resize-percent-width.html image-resize-percent-width.html
diff --git a/layout/reftests/image/reftest.list b/layout/reftests/image/reftest.list
index 0eddb61fc..ad3179464 100644
--- a/layout/reftests/image/reftest.list
+++ b/layout/reftests/image/reftest.list
@@ -1,8 +1,8 @@
-fuzzy-if(Android,8,30) == background-image-zoom-1.html background-image-zoom-1-ref.html
+== background-image-zoom-1.html background-image-zoom-1-ref.html
fails-if(usesRepeatResampling) == background-image-zoom-2.html about:blank
== image-seam-1a.html image-seam-1-ref.html
== image-seam-1b.html image-seam-1-ref.html
-fuzzy-if(Android,255,154) == image-seam-2.html image-seam-2-ref.html # Bug 1128229
+== image-seam-2.html image-seam-2-ref.html # Bug 1128229
== image-zoom-1.html image-zoom-1-ref.html
== image-zoom-2.html image-zoom-1-ref.html
== invalid-url-image-1.html invalid-url-image-1-ref.html
diff --git a/layout/reftests/indic-shaping/reftest-stylo.list b/layout/reftests/indic-shaping/reftest-stylo.list
deleted file mode 100644
index 762b68513..000000000
--- a/layout/reftests/indic-shaping/reftest-stylo.list
+++ /dev/null
@@ -1,32 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-skip-if(B2G||Mulet) HTTP(..) == devanagari-1a.html devanagari-1a.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-HTTP(..) == devanagari-1b.html devanagari-1b.html
-HTTP(..) == devanagari-2.html devanagari-2.html
-HTTP(..) == devanagari-3a.html devanagari-3a.html
-HTTP(..) == devanagari-3b.html devanagari-3b.html
-HTTP(..) == devanagari-4.html devanagari-4.html
-
-HTTP(..) == gujarati-1a.html gujarati-1a.html
-HTTP(..) == gujarati-1b.html gujarati-1b.html
-HTTP(..) == gujarati-2.html gujarati-2.html
-HTTP(..) == gujarati-3a.html gujarati-3a.html
-skip-if(B2G||Mulet) HTTP(..) == gujarati-3b.html gujarati-3b.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-HTTP(..) == gujarati-4.html gujarati-4.html
-
-skip-if(B2G||Mulet) HTTP(..) == bengali-1a.html bengali-1a.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-HTTP(..) == bengali-1b.html bengali-1b.html
-HTTP(..) == bengali-2a.html bengali-2a.html
-HTTP(..) == bengali-2b.html bengali-2b.html
-skip-if(B2G||Mulet) HTTP(..) == bengali-3a.html bengali-3a.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-HTTP(..) == bengali-3b.html bengali-3b.html
-HTTP(..) == bengali-3c.html bengali-3c.html
-HTTP(..) == bengali-3c.html bengali-3c.html
-
-== 686225-1-bangla-aat.html 686225-1-bangla-aat.html
-skip == 686225-2-kannada-aat.html 686225-2-kannada-aat.html
-
-HTTP(..) == balinese-1.html balinese-1.html
diff --git a/layout/reftests/inline-borderpadding/reftest-stylo.list b/layout/reftests/inline-borderpadding/reftest-stylo.list
deleted file mode 100644
index 650b0437b..000000000
--- a/layout/reftests/inline-borderpadding/reftest-stylo.list
+++ /dev/null
@@ -1,9 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-skip == ltr-basic.html ltr-basic.html
-skip == rtl-basic.html rtl-basic.html
-skip == rtl-span-only.html rtl-span-only.html
-skip == ltr-span-only.html ltr-span-only.html
-skip == ltr-ib.html ltr-ib.html
-skip == rtl-ib.html rtl-ib.html
-skip == rtl-span-only-ib.html rtl-span-only-ib.html
-skip == ltr-span-only-ib.html ltr-span-only-ib.html
diff --git a/layout/reftests/inline/reftest-stylo.list b/layout/reftests/inline/reftest-stylo.list
deleted file mode 100644
index ac47cff55..000000000
--- a/layout/reftests/inline/reftest-stylo.list
+++ /dev/null
@@ -1,8 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== zero-inline-block-margin-left.html zero-inline-block-margin-left.html
-== zero-inline-block-margin-right.html zero-inline-block-margin-right.html
-== zero-inline-block-margin-ref.html zero-inline-block-margin-ref.html
-== inline-block-width.html inline-block-width.html
-== inline-block-padding.html inline-block-padding.html
-== inline-block-margin.html inline-block-margin.html
-== inline-block-width.html inline-block-width.html
diff --git a/layout/reftests/invalidation/reftest-stylo.list b/layout/reftests/invalidation/reftest-stylo.list
deleted file mode 100644
index 8ead7ca3d..000000000
--- a/layout/reftests/invalidation/reftest-stylo.list
+++ /dev/null
@@ -1,85 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== table-repaint-a.html table-repaint-a.html
-== table-repaint-b.html table-repaint-b.html
-== table-repaint-c.html table-repaint-c.html
-== table-repaint-d.html table-repaint-d.html
-skip-if((B2G&&browserIsRemote)||Mulet) == 540247-1.xul 540247-1.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == 543681-1.html 543681-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 1243409-1.html 1243409-1.html
-== test-image-layers.html test-image-layers.html
-random-if(B2G||Mulet) == test-image-layers-multiple-displayitem.html test-image-layers-multiple-displayitem.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-pref(layout.animated-image-layers.enabled,true) skip-if(Android||gtkWidget) == test-animated-image-layers.html test-animated-image-layers.html
-fails pref(layout.animated-image-layers.enabled,true) skip-if(Android||gtkWidget) == test-animated-image-layers-background.html test-animated-image-layers-background.html
-== box-shadow-border-radius.html box-shadow-border-radius.html
-== filter-userspace-offset.svg?offsetContainer=rect filter-userspace-offset.svg?offsetContainer=rect
-== filter-userspace-offset.svg?offsetContainer=use filter-userspace-offset.svg?offsetContainer=use
-== filter-userspace-offset.svg?offsetContainer=innerSVG filter-userspace-offset.svg?offsetContainer=innerSVG
-== filter-userspace-offset.svg?offsetContainer=foreignObject filter-userspace-offset.svg?offsetContainer=foreignObject
-== filter-userspace-offset.svg?offsetContainer=rect&filter=flood-boundingBox filter-userspace-offset.svg?offsetContainer=rect&filter=flood-boundingBox
-== filter-userspace-offset.svg?offsetContainer=use&filter=flood-boundingBox filter-userspace-offset.svg?offsetContainer=use&filter=flood-boundingBox
-== filter-userspace-offset.svg?offsetContainer=innerSVG&filter=flood-boundingBox filter-userspace-offset.svg?offsetContainer=innerSVG&filter=flood-boundingBox
-== filter-userspace-offset.svg?offsetContainer=foreignObject&filter=flood-boundingBox filter-userspace-offset.svg?offsetContainer=foreignObject&filter=flood-boundingBox
-== filter-userspace-offset.svg?offsetContainer=rect&filter=matrix-boundingBox filter-userspace-offset.svg?offsetContainer=rect&filter=matrix-boundingBox
-== filter-userspace-offset.svg?offsetContainer=use&filter=matrix-boundingBox filter-userspace-offset.svg?offsetContainer=use&filter=matrix-boundingBox
-== filter-userspace-offset.svg?offsetContainer=innerSVG&filter=matrix-boundingBox filter-userspace-offset.svg?offsetContainer=innerSVG&filter=matrix-boundingBox
-== filter-userspace-offset.svg?offsetContainer=foreignObject&filter=matrix-boundingBox filter-userspace-offset.svg?offsetContainer=foreignObject&filter=matrix-boundingBox
-== filter-userspace-offset.svg?offsetContainer=rect&filter=flood-userSpace-at100 filter-userspace-offset.svg?offsetContainer=rect&filter=flood-userSpace-at100
-== filter-userspace-offset.svg?offsetContainer=use&filter=flood-userSpace-at100 filter-userspace-offset.svg?offsetContainer=use&filter=flood-userSpace-at100
-== filter-userspace-offset.svg?offsetContainer=innerSVG&filter=flood-userSpace-atZero filter-userspace-offset.svg?offsetContainer=innerSVG&filter=flood-userSpace-atZero
-== filter-userspace-offset.svg?offsetContainer=foreignObject&filter=flood-userSpace-at100 filter-userspace-offset.svg?offsetContainer=foreignObject&filter=flood-userSpace-at100
-== filter-userspace-offset.svg?offsetContainer=rect&filter=matrix-userSpace-at100 filter-userspace-offset.svg?offsetContainer=rect&filter=matrix-userSpace-at100
-== filter-userspace-offset.svg?offsetContainer=use&filter=matrix-userSpace-at100 filter-userspace-offset.svg?offsetContainer=use&filter=matrix-userSpace-at100
-== filter-userspace-offset.svg?offsetContainer=innerSVG&filter=matrix-userSpace-atZero filter-userspace-offset.svg?offsetContainer=innerSVG&filter=matrix-userSpace-atZero
-== filter-userspace-offset.svg?offsetContainer=foreignObject&filter=matrix-userSpace-at100 filter-userspace-offset.svg?offsetContainer=foreignObject&filter=matrix-userSpace-at100
-== filter-userspace-offset.svg?offsetContainer=rect&mask=boundingBox filter-userspace-offset.svg?offsetContainer=rect&mask=boundingBox
-== filter-userspace-offset.svg?offsetContainer=use&mask=boundingBox filter-userspace-offset.svg?offsetContainer=use&mask=boundingBox
-== filter-userspace-offset.svg?offsetContainer=innerSVG&mask=boundingBox filter-userspace-offset.svg?offsetContainer=innerSVG&mask=boundingBox
-== filter-userspace-offset.svg?offsetContainer=foreignObject&mask=boundingBox filter-userspace-offset.svg?offsetContainer=foreignObject&mask=boundingBox
-== filter-userspace-offset.svg?offsetContainer=rect&mask=userSpace-at100 filter-userspace-offset.svg?offsetContainer=rect&mask=userSpace-at100
-== filter-userspace-offset.svg?offsetContainer=use&mask=userSpace-at100 filter-userspace-offset.svg?offsetContainer=use&mask=userSpace-at100
-== filter-userspace-offset.svg?offsetContainer=innerSVG&mask=userSpace-atZero filter-userspace-offset.svg?offsetContainer=innerSVG&mask=userSpace-atZero
-== filter-userspace-offset.svg?offsetContainer=foreignObject&mask=userSpace-at100 filter-userspace-offset.svg?offsetContainer=foreignObject&mask=userSpace-at100
-== filter-userspace-offset.svg?offsetContainer=rect&filter=matrix-fillPaint-boundingBox filter-userspace-offset.svg?offsetContainer=rect&filter=matrix-fillPaint-boundingBox
-== filter-userspace-offset.svg?offsetContainer=rect&filter=matrix-fillPaint-userSpace-at100 filter-userspace-offset.svg?offsetContainer=rect&filter=matrix-fillPaint-userSpace-at100
-== scroll-inactive-layers.html scroll-inactive-layers.html
-== scroll-inactive-layers-2.html scroll-inactive-layers-2.html
-== inactive-layertree-visible-region-1.html inactive-layertree-visible-region-1.html
-== inactive-layertree-visible-region-2.html inactive-layertree-visible-region-2.html
-== transform-floating-point-invalidation.html transform-floating-point-invalidation.html
-== transform-floating-point-invalidation.html?reverse transform-floating-point-invalidation.html?reverse
-== nudge-to-integer-invalidation.html nudge-to-integer-invalidation.html
-== nudge-to-integer-invalidation.html?reverse nudge-to-integer-invalidation.html?reverse
-== clipped-animated-transform-1.html clipped-animated-transform-1.html
-== paintedlayer-recycling-1.html paintedlayer-recycling-1.html
-== paintedlayer-recycling-2.html paintedlayer-recycling-2.html
-pref(layers.single-tile.enabled,false) == paintedlayer-recycling-3.html paintedlayer-recycling-3.html
-== paintedlayer-recycling-4.html paintedlayer-recycling-4.html
-== paintedlayer-recycling-5.html paintedlayer-recycling-5.html
-== paintedlayer-recycling-6.html paintedlayer-recycling-6.html
-== paintedlayer-recycling-7.html paintedlayer-recycling-7.html
-== masklayer-1.html masklayer-1.html
-== masklayer-2.html masklayer-2.html
-random == layer-splitting-1.html layer-splitting-1.html
-random == layer-splitting-2.html layer-splitting-2.html
-random == layer-splitting-3.html layer-splitting-3.html
-fails == layer-splitting-4.html layer-splitting-4.html
-== layer-splitting-5.html layer-splitting-5.html
-== layer-splitting-6.html layer-splitting-6.html
-== layer-splitting-7.html layer-splitting-7.html
-fuzzy-if(gtkWidget,2,4) fuzzy-if(asyncPan,2,3955) fuzzy-if(OSX,179,30) fuzzy-if(skiaContent,16,3230) == image-scrolling-zoom-1.html image-scrolling-zoom-1.html
-== image-scrolling-zoom-1-ref.html image-scrolling-zoom-1-ref.html
-pref(layers.single-tile.enabled,false) == fast-scrolling.html fast-scrolling.html
-== background-position-1.html background-position-1.html
-== background-position-2a.html background-position-2a.html
-== background-position-2b.html background-position-2b.html
-== background-position-2c.html background-position-2c.html
-== background-position-2d.html background-position-2d.html
-== background-position-2e.html background-position-2e.html
-== background-position-2f.html background-position-2f.html
-== zero-opacity-animation.html zero-opacity-animation.html
-== zero-opacity-text.html zero-opacity-text.html
-== negative-w-component.html negative-w-component.html
diff --git a/layout/reftests/invalidation/reftest.list b/layout/reftests/invalidation/reftest.list
index 314693359..0c6e979d5 100644
--- a/layout/reftests/invalidation/reftest.list
+++ b/layout/reftests/invalidation/reftest.list
@@ -7,8 +7,8 @@
== 1243409-1.html 1243409-1-ref.html
== test-image-layers.html test-image-layers-ref.html
== test-image-layers-multiple-displayitem.html test-image-layers-ref.html
-pref(layout.animated-image-layers.enabled,true) skip-if(Android||gtkWidget) == test-animated-image-layers.html test-animated-image-layers-ref.html
-pref(layout.animated-image-layers.enabled,true) skip-if(Android||gtkWidget) == test-animated-image-layers-background.html test-animated-image-layers-ref.html
+pref(layout.animated-image-layers.enabled,true) skip-if(gtkWidget) == test-animated-image-layers.html test-animated-image-layers-ref.html
+pref(layout.animated-image-layers.enabled,true) skip-if(gtkWidget) == test-animated-image-layers-background.html test-animated-image-layers-ref.html
== box-shadow-border-radius.html box-shadow-border-radius-ref.html
== filter-userspace-offset.svg?offsetContainer=rect filter-userspace-offset.svg
== filter-userspace-offset.svg?offsetContainer=use filter-userspace-offset.svg
diff --git a/layout/reftests/layers/reftest-stylo.list b/layout/reftests/layers/reftest-stylo.list
deleted file mode 100644
index 984f829c1..000000000
--- a/layout/reftests/layers/reftest-stylo.list
+++ /dev/null
@@ -1,33 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== move-to-background-1.html move-to-background-1.html
-fuzzy-if(cocoaWidget,2,6) random-if(Android) == component-alpha-exit-1.html component-alpha-exit-1.html
-# bug 760275
-== pull-background-1.html pull-background-1.html
-== pull-background-2.html pull-background-2.html
-== pull-background-3.html pull-background-3.html
-== pull-background-4.html pull-background-4.html
-== pull-background-5.html pull-background-5.html
-== pull-background-6.html pull-background-6.html
-# The animated-position tests are disabled for intermittent failures / passes, bug 1150941
-skip == pull-background-animated-position-1.html pull-background-animated-position-1.html
-# Fails with event regions
-skip == pull-background-animated-position-2.html pull-background-animated-position-2.html
-skip == pull-background-animated-position-3.html pull-background-animated-position-3.html
-# Fails because PaintedLayer item assignment doesn't recognize overflow:hidden clips
-skip == pull-background-animated-position-4.html pull-background-animated-position-4.html
-# Fails because PaintedLayer item assignment and background pulling don't recognize overflow:hidden clips
-skip == pull-background-animated-position-5.html pull-background-animated-position-5.html
-# Fails because ownLayer bounds don't anticipate changes of animated contents, but doesn't fail with event regions
-skip-if(!asyncPan) == pull-background-displayport-1.html pull-background-displayport-1.html
-skip-if(!asyncPan) == pull-background-displayport-2.html pull-background-displayport-2.html
-skip-if(!asyncPan) == pull-background-displayport-3.html pull-background-displayport-3.html
-# fails with non-overlay scrollbars and event regions due to bug 1148515
-skip-if(!asyncPan) == pull-background-displayport-4.html pull-background-displayport-4.html
-# fails with non-overlay scrollbars and event regions due to bug 1148515
-skip-if(!asyncPan) == pull-background-displayport-5.html pull-background-displayport-5.html
-skip-if(!asyncPan) == pull-background-displayport-6.html pull-background-displayport-6.html
-# fails with non-overlay scrollbars and event regions due to bug 1148515
-fuzzy(2,30150) == opacity-blending.html opacity-blending.html
-== mask-layer-transform.html mask-layer-transform.html
-fails fuzzy-if(gtkWidget,1,17) == forced-bg-color-outside-visible-region.html forced-bg-color-outside-visible-region.html
-== layerize-over-fixed-bg-1.html layerize-over-fixed-bg-1.html
diff --git a/layout/reftests/layers/reftest.list b/layout/reftests/layers/reftest.list
index d2cabf37e..7a4dc06d6 100644
--- a/layout/reftests/layers/reftest.list
+++ b/layout/reftests/layers/reftest.list
@@ -1,5 +1,5 @@
== move-to-background-1.html move-to-background-1-ref.html
-fuzzy-if(cocoaWidget,2,6) random-if(Android) == component-alpha-exit-1.html component-alpha-exit-1-ref.html # bug 760275
+fuzzy-if(cocoaWidget,2,6) == component-alpha-exit-1.html component-alpha-exit-1-ref.html # bug 760275
!= pull-background-1.html about:blank
!= pull-background-2.html about:blank
!= pull-background-3.html about:blank
diff --git a/layout/reftests/line-breaking/reftest-stylo.list b/layout/reftests/line-breaking/reftest-stylo.list
deleted file mode 100644
index 7b2576a40..000000000
--- a/layout/reftests/line-breaking/reftest-stylo.list
+++ /dev/null
@@ -1,41 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== between-whitespaces.html between-whitespaces.html
-== chemical-1.html chemical-1.html
-== currency-1.html currency-1.html
-== currency-2.html currency-2.html
-== datetime-1.html datetime-1.html
-== emoji-1.html emoji-1.html
-== emoji-2.html emoji-2.html
-== hyphens-1.html hyphens-1.html
-== hyphens-2.html hyphens-2.html
-# The following three tests may fail if rendering with Core Text (see bug 389074)
-# due to subpixel glyph positioning differences between the reference cases with <br>
-# and the automatically-wrapped lines in the test file
-random-if(cocoaWidget) == ja-1.html ja-1.html
-random-if(cocoaWidget) == ja-2.html ja-2.html
-random-if(cocoaWidget) == ja-3.html ja-3.html
-== khmer-1.html khmer-1.html
-== leaders-1.html leaders-1.html
-== markup-src-1.html markup-src-1.html
-== non-breakable-1.html non-breakable-1.html
-== non-breakable-2.html non-breakable-2.html
-== numerics-1.html numerics-1.html
-skip == parentheses-1.html parentheses-1.html
-== punctuation-open-1.html punctuation-open-1.html
-== punctuation-open-2.html punctuation-open-2.html
-== punctuation-open-3.html punctuation-open-3.html
-== punctuation-open-4.html punctuation-open-4.html
-== quotationmarks-1.html quotationmarks-1.html
-# The following is currently disabled on Linux because of a rendering issue with missing-glyph
-# representations on the test boxes. See bug #450088 for discussion.
-skip-if(B2G||Mulet) skip-if(gtkWidget) == quotationmarks-cjk-1.html quotationmarks-cjk-1.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== smileys-1.html smileys-1.html
-== smileys-2.html smileys-2.html
-== url-1.html url-1.html
-== url-2.html url-2.html
-== url-3.html url-3.html
-== winpath-1.html winpath-1.html
-skip-if(Mulet) == zwnbsp-1.html zwnbsp-1.html
-# MULET: Bug 1144079: Re-enable Mulet mochitests and reftests taskcluster-specific disables
diff --git a/layout/reftests/list-item/reftest-stylo.list b/layout/reftests/list-item/reftest-stylo.list
deleted file mode 100644
index 50fc2907a..000000000
--- a/layout/reftests/list-item/reftest-stylo.list
+++ /dev/null
@@ -1,13 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-fuzzy-if(OSX>=1008,55,4) == numbering-1.html numbering-1.html
-== numbering-2.html numbering-2.html
-== ol-reversed-1a.html ol-reversed-1a.html
-asserts(1) == ol-reversed-1b.html ol-reversed-1b.html
-# bug 478135
-== ol-reversed-1c.html ol-reversed-1c.html
-== ol-reversed-2.html ol-reversed-2.html
-== ol-reversed-3.html ol-reversed-3.html
-== bullet-space-1.html bullet-space-1.html
-== bullet-space-2.html bullet-space-2.html
-== bullet-intrinsic-isize-1.html bullet-intrinsic-isize-1.html
-== bullet-intrinsic-isize-2.html bullet-intrinsic-isize-2.html
diff --git a/layout/reftests/margin-collapsing/reftest-stylo.list b/layout/reftests/margin-collapsing/reftest-stylo.list
deleted file mode 100644
index 652f1c578..000000000
--- a/layout/reftests/margin-collapsing/reftest-stylo.list
+++ /dev/null
@@ -1,943 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# Test Suite for CSS 2.1, 8.3.1 Collapsing margins - See Bug 477462
-# Based on CSS 2.1: http://www.w3.org/TR/2011/REC-CSS2-20110607/
-# and its Errata, Last revised: $Date: 2013-09-09 17:40:16 $
-# The structure of this manifest is intended to resemble the structure of
-# the prose that defines collapsing margins. As a result, there are several
-# sections where inline-block-, block-, and other- series are combined.
-# E.g. the first section is about horizontal margins and includes both
-# inline- and block series.
-# "Horizontal margins never collapse."
-# Horizontal margins of inline boxes do not collapse.
-# The norefs for these tests depict margins that incorrectly collapsed.
-== inline-horizontal-1.html inline-horizontal-1.html
-== inline-horizontal-1.html inline-horizontal-1.html
-== inline-horizontal-2.html inline-horizontal-2.html
-== inline-horizontal-2.html inline-horizontal-2.html
-skip-if(B2G||Mulet) == inline-horizontal-1-dyn.html inline-horizontal-1-dyn.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== inline-horizontal-1-dyn.html inline-horizontal-1-dyn.html
-skip-if(B2G||Mulet) == inline-horizontal-2-dyn.html inline-horizontal-2-dyn.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== inline-horizontal-2-dyn.html inline-horizontal-2-dyn.html
-# Horizontal margins of block boxes do not collapse.
-# These block boxes are actually floats - in CSS 2.1 there is no other
-# method to create horizontally adjacent block boxes.
-== block-horizontal-1.html block-horizontal-1.html
-== block-horizontal-1.html block-horizontal-1.html
-== block-horizontal-2.html block-horizontal-2.html
-== block-horizontal-2.html block-horizontal-2.html
-== block-horizontal-3.html block-horizontal-3.html
-== block-horizontal-3.html block-horizontal-3.html
-== block-horizontal-4.html block-horizontal-4.html
-== block-horizontal-4.html block-horizontal-4.html
-skip-if(B2G||Mulet) == block-horizontal-1-dyn.html block-horizontal-1-dyn.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== block-horizontal-1-dyn.html block-horizontal-1-dyn.html
-skip-if(B2G||Mulet) == block-horizontal-2-dyn.html block-horizontal-2-dyn.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== block-horizontal-2-dyn.html block-horizontal-2-dyn.html
-skip-if(B2G||Mulet) == block-horizontal-3-dyn.html block-horizontal-3-dyn.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== block-horizontal-3-dyn.html block-horizontal-3-dyn.html
-skip-if(B2G||Mulet) == block-horizontal-4-dyn.html block-horizontal-4-dyn.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== block-horizontal-4-dyn.html block-horizontal-4-dyn.html
-# Horizontal margins of inline-block boxes do not collapse.
-== inline-block-horizontal-1.html inline-block-horizontal-1.html
-== inline-block-horizontal-1.html inline-block-horizontal-1.html
-== inline-block-horizontal-2.html inline-block-horizontal-2.html
-== inline-block-horizontal-2.html inline-block-horizontal-2.html
-skip-if(B2G||Mulet) == inline-block-horizontal-1-dyn.html inline-block-horizontal-1-dyn.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== inline-block-horizontal-1-dyn.html inline-block-horizontal-1-dyn.html
-skip-if(B2G||Mulet) == inline-block-horizontal-2-dyn.html inline-block-horizontal-2-dyn.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== inline-block-horizontal-2-dyn.html inline-block-horizontal-2-dyn.html
-# Horizontal margins of inline-tables do not collapse.
-skip == inline-table-horizontal-1.html inline-table-horizontal-1.html
-skip == inline-table-horizontal-1.html inline-table-horizontal-1.html
-skip-if(B2G||Mulet) == inline-table-horizontal-1-dyn.html inline-table-horizontal-1-dyn.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== inline-table-horizontal-1-dyn.html inline-table-horizontal-1-dyn.html
-# "In CSS, the adjoining margins of two or more boxes
-# (which might or might not be siblings) can combine to form a single margin.
-# Margins that combine this way are said to collapse,
-# and the resulting combined margin is called a collapsed margin."
-# "Two margins are adjoining if and only if:" [...]
-# "both belong to vertically-adjacent box edges,
-# i.e. form one of the following pairs:" [...]
-# "bottom margin of box and top margin of its next in-flow following sibling"
-# "When two or more margins collapse,
-# the resulting margin width is the maximum of the collapsing margins' widths."
-# The margins of two in-flow siblings should collapse.
-# These tests feature margins of different or equal sizes on each box.
-# The norefs depict incorrect results where the margins did not collapse.
-== block-sibling-1a.html block-sibling-1a.html
-== block-sibling-1a.html block-sibling-1a.html
-== block-sibling-1a.html block-sibling-1a.html
-== block-sibling-1b.html block-sibling-1b.html
-== block-sibling-1b.html block-sibling-1b.html
-== block-sibling-1b.html block-sibling-1b.html
-== block-sibling-1c.html block-sibling-1c.html
-== block-sibling-1c.html block-sibling-1c.html
-== block-sibling-1c.html block-sibling-1c.html
-== block-sibling-2.html block-sibling-2.html
-== block-sibling-2.html block-sibling-2.html
-== block-sibling-2.html block-sibling-2.html
-== block-sibling-3.html block-sibling-3.html
-== block-sibling-3.html block-sibling-3.html
-== block-sibling-3.html block-sibling-3.html
-== block-sibling-1a-dyn.html block-sibling-1a-dyn.html
-== block-sibling-1a-dyn.html block-sibling-1a-dyn.html
-== block-sibling-1a-dyn.html block-sibling-1a-dyn.html
-== block-sibling-1b-dyn.html block-sibling-1b-dyn.html
-== block-sibling-1b-dyn.html block-sibling-1b-dyn.html
-== block-sibling-1b-dyn.html block-sibling-1b-dyn.html
-== block-sibling-1c-dyn.html block-sibling-1c-dyn.html
-== block-sibling-1c-dyn.html block-sibling-1c-dyn.html
-== block-sibling-1c-dyn.html block-sibling-1c-dyn.html
-skip-if(B2G||Mulet) == block-sibling-2-dyn.html block-sibling-2-dyn.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== block-sibling-2-dyn.html block-sibling-2-dyn.html
-== block-sibling-2-dyn.html block-sibling-2-dyn.html
-== block-sibling-3-dyn.html block-sibling-3-dyn.html
-== block-sibling-3-dyn.html block-sibling-3-dyn.html
-== block-sibling-3-dyn.html block-sibling-3-dyn.html
-# "In the case of negative margins, the maximum of the absolute values of the
-# negative adjoining margins is deducted from the maximum of the positive
-# adjoining margins. If there are no positive margins, the maximum of the
-# absolute values of the adjoining margins is deducted from zero."
-# These tests feature sibling block boxes where one or two margins are negative.
-# The norefs depict possible incorrect addition or subtraction of margins.
-== block-negative-1a.html block-negative-1a.html
-== block-negative-1a.html block-negative-1a.html
-== block-negative-1a.html block-negative-1a.html
-== block-negative-1b.html block-negative-1b.html
-== block-negative-1b.html block-negative-1b.html
-== block-negative-1b.html block-negative-1b.html
-== block-negative-2a.html block-negative-2a.html
-== block-negative-2a.html block-negative-2a.html
-== block-negative-2a.html block-negative-2a.html
-== block-negative-2b.html block-negative-2b.html
-== block-negative-2b.html block-negative-2b.html
-== block-negative-2b.html block-negative-2b.html
-== block-negative-3a.html block-negative-3a.html
-== block-negative-3a.html block-negative-3a.html
-== block-negative-3a.html block-negative-3a.html
-== block-negative-3a.html block-negative-3a.html
-== block-negative-3b.html block-negative-3b.html
-== block-negative-3b.html block-negative-3b.html
-== block-negative-3b.html block-negative-3b.html
-== block-negative-3b.html block-negative-3b.html
-== block-negative-4a.html block-negative-4a.html
-== block-negative-4a.html block-negative-4a.html
-== block-negative-4a.html block-negative-4a.html
-== block-negative-4a.html block-negative-4a.html
-== block-negative-4b.html block-negative-4b.html
-== block-negative-4b.html block-negative-4b.html
-== block-negative-4b.html block-negative-4b.html
-== block-negative-4b.html block-negative-4b.html
-== block-negative-5.html block-negative-5.html
-== block-negative-5.html block-negative-5.html
-== block-negative-5.html block-negative-5.html
-== block-negative-5.html block-negative-5.html
-== block-negative-1a-dyn1.html block-negative-1a-dyn1.html
-== block-negative-1a-dyn1.html block-negative-1a-dyn1.html
-== block-negative-1a-dyn1.html block-negative-1a-dyn1.html
-== block-negative-1a-dyn2.html block-negative-1a-dyn2.html
-== block-negative-1a-dyn2.html block-negative-1a-dyn2.html
-== block-negative-1a-dyn2.html block-negative-1a-dyn2.html
-== block-negative-1b-dyn1.html block-negative-1b-dyn1.html
-== block-negative-1b-dyn1.html block-negative-1b-dyn1.html
-== block-negative-1b-dyn1.html block-negative-1b-dyn1.html
-== block-negative-1b-dyn2.html block-negative-1b-dyn2.html
-== block-negative-1b-dyn2.html block-negative-1b-dyn2.html
-== block-negative-1b-dyn2.html block-negative-1b-dyn2.html
-== block-negative-2a-dyn1.html block-negative-2a-dyn1.html
-== block-negative-2a-dyn1.html block-negative-2a-dyn1.html
-== block-negative-2a-dyn1.html block-negative-2a-dyn1.html
-== block-negative-2a-dyn2.html block-negative-2a-dyn2.html
-== block-negative-2a-dyn2.html block-negative-2a-dyn2.html
-== block-negative-2a-dyn2.html block-negative-2a-dyn2.html
-== block-negative-2b-dyn1.html block-negative-2b-dyn1.html
-== block-negative-2b-dyn1.html block-negative-2b-dyn1.html
-== block-negative-2b-dyn1.html block-negative-2b-dyn1.html
-== block-negative-2b-dyn2.html block-negative-2b-dyn2.html
-== block-negative-2b-dyn2.html block-negative-2b-dyn2.html
-== block-negative-2b-dyn2.html block-negative-2b-dyn2.html
-== block-negative-3a-dyn1.html block-negative-3a-dyn1.html
-== block-negative-3a-dyn1.html block-negative-3a-dyn1.html
-== block-negative-3a-dyn1.html block-negative-3a-dyn1.html
-== block-negative-3a-dyn1.html block-negative-3a-dyn1.html
-== block-negative-3a-dyn2.html block-negative-3a-dyn2.html
-== block-negative-3a-dyn2.html block-negative-3a-dyn2.html
-== block-negative-3a-dyn2.html block-negative-3a-dyn2.html
-== block-negative-3a-dyn2.html block-negative-3a-dyn2.html
-== block-negative-3b-dyn1.html block-negative-3b-dyn1.html
-== block-negative-3b-dyn1.html block-negative-3b-dyn1.html
-== block-negative-3b-dyn1.html block-negative-3b-dyn1.html
-== block-negative-3b-dyn1.html block-negative-3b-dyn1.html
-== block-negative-3b-dyn2.html block-negative-3b-dyn2.html
-== block-negative-3b-dyn2.html block-negative-3b-dyn2.html
-== block-negative-3b-dyn2.html block-negative-3b-dyn2.html
-== block-negative-3b-dyn2.html block-negative-3b-dyn2.html
-== block-negative-4a-dyn1.html block-negative-4a-dyn1.html
-== block-negative-4a-dyn1.html block-negative-4a-dyn1.html
-== block-negative-4a-dyn1.html block-negative-4a-dyn1.html
-== block-negative-4a-dyn1.html block-negative-4a-dyn1.html
-== block-negative-4a-dyn2.html block-negative-4a-dyn2.html
-== block-negative-4a-dyn2.html block-negative-4a-dyn2.html
-== block-negative-4a-dyn2.html block-negative-4a-dyn2.html
-== block-negative-4a-dyn2.html block-negative-4a-dyn2.html
-== block-negative-4b-dyn1.html block-negative-4b-dyn1.html
-== block-negative-4b-dyn1.html block-negative-4b-dyn1.html
-== block-negative-4b-dyn1.html block-negative-4b-dyn1.html
-== block-negative-4b-dyn1.html block-negative-4b-dyn1.html
-== block-negative-4b-dyn2.html block-negative-4b-dyn2.html
-== block-negative-4b-dyn2.html block-negative-4b-dyn2.html
-== block-negative-4b-dyn2.html block-negative-4b-dyn2.html
-== block-negative-4b-dyn2.html block-negative-4b-dyn2.html
-== block-negative-5-dyn1.html block-negative-5-dyn1.html
-== block-negative-5-dyn1.html block-negative-5-dyn1.html
-== block-negative-5-dyn1.html block-negative-5-dyn1.html
-== block-negative-5-dyn1.html block-negative-5-dyn1.html
-== block-negative-5-dyn2.html block-negative-5-dyn2.html
-== block-negative-5-dyn2.html block-negative-5-dyn2.html
-== block-negative-5-dyn2.html block-negative-5-dyn2.html
-== block-negative-5-dyn2.html block-negative-5-dyn2.html
-# "Two margins are adjoining if and only if:" [...]
-# "both belong to vertically-adjacent box edges,
-# i.e. form one of the following pairs:" [...]
-# "top margin of a box and top margin of its first in-flow child"
-# "bottom margin of a last in-flow child and bottom margin of its parent
-# if the parent has 'auto' computed height"
-# "A collapsed margin is considered adjoining to another margin if
-# any of its component margins is adjoining to that margin."
-# "Note. Adjoining margins can be generated by elements that are
-# not related as siblings or ancestors."
-# These tests check whether margins are correctly collapsed even when the
-# boxes participating are not related as siblings or ancestors.
-# The tests feature different sizes of margins on different boxes.
-== block-non-sibling-1a.html block-non-sibling-1a.html
-== block-non-sibling-1a.html block-non-sibling-1a.html
-== block-non-sibling-1b.html block-non-sibling-1b.html
-== block-non-sibling-1b.html block-non-sibling-1b.html
-== block-non-sibling-1c.html block-non-sibling-1c.html
-== block-non-sibling-1c.html block-non-sibling-1c.html
-skip == block-non-sibling-1d.html block-non-sibling-1d.html
-skip == block-non-sibling-1d.html block-non-sibling-1d.html
-== block-non-sibling-1e.html block-non-sibling-1e.html
-== block-non-sibling-1e.html block-non-sibling-1e.html
-== block-non-sibling-1f.html block-non-sibling-1f.html
-== block-non-sibling-1f.html block-non-sibling-1f.html
-== block-non-sibling-2a.html block-non-sibling-2a.html
-== block-non-sibling-2a.html block-non-sibling-2a.html
-== block-non-sibling-2b.html block-non-sibling-2b.html
-== block-non-sibling-2b.html block-non-sibling-2b.html
-== block-non-sibling-2c.html block-non-sibling-2c.html
-== block-non-sibling-2c.html block-non-sibling-2c.html
-== block-non-sibling-2d.html block-non-sibling-2d.html
-== block-non-sibling-2d.html block-non-sibling-2d.html
-== block-non-sibling-2e.html block-non-sibling-2e.html
-== block-non-sibling-2e.html block-non-sibling-2e.html
-== block-non-sibling-2f.html block-non-sibling-2f.html
-== block-non-sibling-2f.html block-non-sibling-2f.html
-== block-non-sibling-3a.html block-non-sibling-3a.html
-== block-non-sibling-3a.html block-non-sibling-3a.html
-== block-non-sibling-3b.html block-non-sibling-3b.html
-== block-non-sibling-3b.html block-non-sibling-3b.html
-skip == block-non-sibling-3c.html block-non-sibling-3c.html
-skip == block-non-sibling-3c.html block-non-sibling-3c.html
-== block-non-sibling-3d.html block-non-sibling-3d.html
-== block-non-sibling-3d.html block-non-sibling-3d.html
-== block-non-sibling-4.html block-non-sibling-4.html
-== block-non-sibling-4.html block-non-sibling-4.html
-== block-non-sibling-1a-dyn.html block-non-sibling-1a-dyn.html
-== block-non-sibling-1b-dyn.html block-non-sibling-1b-dyn.html
-== block-non-sibling-1c-dyn.html block-non-sibling-1c-dyn.html
-== block-non-sibling-1d-dyn.html block-non-sibling-1d-dyn.html
-== block-non-sibling-1e-dyn.html block-non-sibling-1e-dyn.html
-== block-non-sibling-1f-dyn.html block-non-sibling-1f-dyn.html
-== block-non-sibling-2a-dyn.html block-non-sibling-2a-dyn.html
-== block-non-sibling-2b-dyn.html block-non-sibling-2b-dyn.html
-== block-non-sibling-2c-dyn.html block-non-sibling-2c-dyn.html
-== block-non-sibling-2d-dyn.html block-non-sibling-2d-dyn.html
-== block-non-sibling-2e-dyn.html block-non-sibling-2e-dyn.html
-== block-non-sibling-2f-dyn.html block-non-sibling-2f-dyn.html
-== block-non-sibling-3a-dyn.html block-non-sibling-3a-dyn.html
-== block-non-sibling-3b-dyn.html block-non-sibling-3b-dyn.html
-== block-non-sibling-3c-dyn.html block-non-sibling-3c-dyn.html
-== block-non-sibling-3d-dyn.html block-non-sibling-3d-dyn.html
-== block-non-sibling-4-dyn.html block-non-sibling-4-dyn.html
-# The first-child series tests cases where the top margin of a box collapses
-# with the top margin of its parent element.
-# This series is more extensive than the non-sibling series, because
-# various combinations of positive and negative margins are tested.
-== block-first-child-1a.html block-first-child-1a.html
-== block-first-child-1b.html block-first-child-1b.html
-== block-first-child-1c.html block-first-child-1c.html
-== block-first-child-2.html block-first-child-2.html
-== block-first-child-3.html block-first-child-3.html
-== block-first-child-4.html block-first-child-4.html
-== block-first-child-5.html block-first-child-5.html
-== block-first-child-6.html block-first-child-6.html
-== block-first-child-7.html block-first-child-7.html
-== block-first-child-8a.html block-first-child-8a.html
-== block-first-child-8b.html block-first-child-8b.html
-== block-first-child-8c.html block-first-child-8c.html
-== block-first-child-1a-dyn.html block-first-child-1a-dyn.html
-== block-first-child-1b-dyn.html block-first-child-1b-dyn.html
-# == block-first-child-1c-dyn.html block-first-child-1c-dyn.html
-== block-first-child-2-dyn.html block-first-child-2-dyn.html
-== block-first-child-3-dyn.html block-first-child-3-dyn.html
-== block-first-child-4-dyn.html block-first-child-4-dyn.html
-== block-first-child-5-dyn.html block-first-child-5-dyn.html
-== block-first-child-6-dyn.html block-first-child-6-dyn.html
-== block-first-child-7-dyn.html block-first-child-7-dyn.html
-== block-first-child-8a-dyn.html block-first-child-8a-dyn.html
-== block-first-child-8b-dyn.html block-first-child-8b-dyn.html
-== block-first-child-8c-dyn.html block-first-child-8c-dyn.html
-# "The bottom margin of an in-flow block box with a 'height' of 'auto'
-# collapses with its last in-flow block-level child's bottom margin"
-# Note: The block-auto-height-last-child series automatically covers
-# all cases where 'min-height' is '0' and 'max-height' is 'none' as
-# these are the default values of those properties.
-== block-auto-height-last-child-1a.html block-auto-height-last-child-1a.html
-== block-auto-height-last-child-1b.html block-auto-height-last-child-1b.html
-== block-auto-height-last-child-1c.html block-auto-height-last-child-1c.html
-skip == block-auto-height-last-child-2.html block-auto-height-last-child-2.html
-== block-auto-height-last-child-3.html block-auto-height-last-child-3.html
-== block-auto-height-last-child-4.html block-auto-height-last-child-4.html
-== block-auto-height-last-child-5.html block-auto-height-last-child-5.html
-== block-auto-height-last-child-6.html block-auto-height-last-child-6.html
-== block-auto-height-last-child-7.html block-auto-height-last-child-7.html
-== block-auto-height-last-child-8a.html block-auto-height-last-child-8a.html
-== block-auto-height-last-child-8b.html block-auto-height-last-child-8b.html
-== block-auto-height-last-child-8c.html block-auto-height-last-child-8c.html
-== block-auto-height-last-child-1a-dyn.html block-auto-height-last-child-1a-dyn.html
-== block-auto-height-last-child-1b-dyn.html block-auto-height-last-child-1b-dyn.html
-== block-auto-height-last-child-1c-dyn.html block-auto-height-last-child-1c-dyn.html
-== block-auto-height-last-child-2-dyn.html block-auto-height-last-child-2-dyn.html
-== block-auto-height-last-child-3-dyn.html block-auto-height-last-child-3-dyn.html
-== block-auto-height-last-child-4-dyn.html block-auto-height-last-child-4-dyn.html
-== block-auto-height-last-child-5-dyn.html block-auto-height-last-child-5-dyn.html
-== block-auto-height-last-child-6-dyn.html block-auto-height-last-child-6-dyn.html
-== block-auto-height-last-child-7-dyn.html block-auto-height-last-child-7-dyn.html
-== block-auto-height-last-child-8a-dyn.html block-auto-height-last-child-8a-dyn.html
-== block-auto-height-last-child-8b-dyn.html block-auto-height-last-child-8b-dyn.html
-== block-auto-height-last-child-8c-dyn.html block-auto-height-last-child-8c-dyn.html
-# The last-child series is an older variant of the
-# block-auto-height-last-child tests.
-== block-last-child-1a.html block-last-child-1a.html
-== block-last-child-1b.html block-last-child-1b.html
-== block-last-child-1c.html block-last-child-1c.html
-== block-last-child-2a.html block-last-child-2a.html
-== block-last-child-2b.html block-last-child-2b.html
-== block-last-child-2c.html block-last-child-2c.html
-== block-last-child-2d.html block-last-child-2d.html
-== block-last-child-3a.html block-last-child-3a.html
-== block-last-child-3b.html block-last-child-3b.html
-== block-last-child-3c.html block-last-child-3c.html
-== block-last-child-3d.html block-last-child-3d.html
-== block-last-child-4a.html block-last-child-4a.html
-== block-last-child-4b.html block-last-child-4b.html
-== block-last-child-4c.html block-last-child-4c.html
-== block-last-child-4d.html block-last-child-4d.html
-# There's also the older block-zero-min-height series which explicitly
-# adds min-height: 0; to boxes with height: auto;
-# This should have no effect on margin-collapsing.
-== block-zero-min-height-1a.html block-zero-min-height-1a.html
-== block-zero-min-height-1b.html block-zero-min-height-1b.html
-== block-zero-min-height-1c.html block-zero-min-height-1c.html
-== block-zero-min-height-1d.html block-zero-min-height-1d.html
-== block-zero-min-height-1e.html block-zero-min-height-1e.html
-== block-zero-min-height-1f.html block-zero-min-height-1f.html
-== block-zero-min-height-1a.html block-zero-min-height-1a.html
-== block-zero-min-height-1b.html block-zero-min-height-1b.html
-== block-zero-min-height-1c.html block-zero-min-height-1c.html
-== block-zero-min-height-1d.html block-zero-min-height-1d.html
-== block-zero-min-height-1e.html block-zero-min-height-1e.html
-== block-zero-min-height-1f.html block-zero-min-height-1f.html
-== block-zero-min-height-2a.html block-zero-min-height-2a.html
-== block-zero-min-height-2b.html block-zero-min-height-2b.html
-== block-zero-min-height-2c.html block-zero-min-height-2c.html
-== block-zero-min-height-2d.html block-zero-min-height-2d.html
-== block-zero-min-height-2e.html block-zero-min-height-2e.html
-== block-zero-min-height-2f.html block-zero-min-height-2f.html
-== block-zero-min-height-2a.html block-zero-min-height-2a.html
-== block-zero-min-height-2b.html block-zero-min-height-2b.html
-== block-zero-min-height-2c.html block-zero-min-height-2c.html
-== block-zero-min-height-2d.html block-zero-min-height-2d.html
-== block-zero-min-height-2e.html block-zero-min-height-2e.html
-== block-zero-min-height-2f.html block-zero-min-height-2f.html
-== block-zero-min-height-3a.html block-zero-min-height-3a.html
-== block-zero-min-height-3b.html block-zero-min-height-3b.html
-== block-zero-min-height-3c.html block-zero-min-height-3c.html
-== block-zero-min-height-3d.html block-zero-min-height-3d.html
-# If a parent box's height is 'auto' and its 'min-height' is non-zero,
-# then its bottom margin collapses with its last-child's bottom margin.
-# This is true even if the two margins do not actually touch each other,
-# as they are still considered 'adjoining'.
-== block-min-height-last-child-1a.html block-min-height-last-child-1a.html
-# Bug 616339
-== block-min-height-last-child-1b.html block-min-height-last-child-1b.html
-== block-min-height-last-child-1c.html block-min-height-last-child-1c.html
-== block-min-height-last-child-2a.html block-min-height-last-child-2a.html
-# Bug 616339
-== block-min-height-last-child-2b.html block-min-height-last-child-2b.html
-# Bug 616339
-== block-min-height-last-child-3a.html block-min-height-last-child-3a.html
-# Bug 616339
-== block-min-height-last-child-3b.html block-min-height-last-child-3b.html
-== block-min-height-last-child-3c.html block-min-height-last-child-3c.html
-== block-min-height-last-child-4a.html block-min-height-last-child-4a.html
-== block-min-height-last-child-4b.html block-min-height-last-child-4b.html
-== block-min-height-last-child-4c.html block-min-height-last-child-4c.html
-== block-min-height-last-child-5a.html block-min-height-last-child-5a.html
-== block-min-height-last-child-5b.html block-min-height-last-child-5b.html
-== block-min-height-last-child-6a.html block-min-height-last-child-6a.html
-== block-min-height-last-child-6b.html block-min-height-last-child-6b.html
-== block-min-height-last-child-6c.html block-min-height-last-child-6c.html
-== block-min-height-last-child-7a.html block-min-height-last-child-7a.html
-== block-min-height-last-child-7b.html block-min-height-last-child-7b.html
-== block-min-height-last-child-7c.html block-min-height-last-child-7c.html
-== block-min-height-last-child-8a.html block-min-height-last-child-8a.html
-== block-min-height-last-child-8b.html block-min-height-last-child-8b.html
-== block-min-height-last-child-9a.html block-min-height-last-child-9a.html
-== block-min-height-last-child-9b.html block-min-height-last-child-9b.html
-== block-min-height-last-child-9c.html block-min-height-last-child-9c.html
-== block-min-height-last-child-1a-dyn.html block-min-height-last-child-1a-dyn.html
-# Bug 616339
-== block-min-height-last-child-1b-dyn.html block-min-height-last-child-1b-dyn.html
-== block-min-height-last-child-1c-dyn.html block-min-height-last-child-1c-dyn.html
-== block-min-height-last-child-2a-dyn.html block-min-height-last-child-2a-dyn.html
-# Bug 616339
-== block-min-height-last-child-2b-dyn.html block-min-height-last-child-2b-dyn.html
-# Bug 616339
-== block-min-height-last-child-3a-dyn.html block-min-height-last-child-3a-dyn.html
-# Bug 616339
-== block-min-height-last-child-3b-dyn.html block-min-height-last-child-3b-dyn.html
-== block-min-height-last-child-3c-dyn.html block-min-height-last-child-3c-dyn.html
-== block-min-height-last-child-4a-dyn.html block-min-height-last-child-4a-dyn.html
-== block-min-height-last-child-4b-dyn.html block-min-height-last-child-4b-dyn.html
-== block-min-height-last-child-4c-dyn.html block-min-height-last-child-4c-dyn.html
-== block-min-height-last-child-5a-dyn.html block-min-height-last-child-5a-dyn.html
-== block-min-height-last-child-5b-dyn.html block-min-height-last-child-5b-dyn.html
-== block-min-height-last-child-6a-dyn.html block-min-height-last-child-6a-dyn.html
-== block-min-height-last-child-6b-dyn.html block-min-height-last-child-6b-dyn.html
-== block-min-height-last-child-6c-dyn.html block-min-height-last-child-6c-dyn.html
-== block-min-height-last-child-7a-dyn.html block-min-height-last-child-7a-dyn.html
-== block-min-height-last-child-7b-dyn.html block-min-height-last-child-7b-dyn.html
-== block-min-height-last-child-7c-dyn.html block-min-height-last-child-7c-dyn.html
-== block-min-height-last-child-8a-dyn.html block-min-height-last-child-8a-dyn.html
-== block-min-height-last-child-8b-dyn.html block-min-height-last-child-8b-dyn.html
-== block-min-height-last-child-9a-dyn.html block-min-height-last-child-9a-dyn.html
-== block-min-height-last-child-9b-dyn.html block-min-height-last-child-9b-dyn.html
-== block-min-height-last-child-9c-dyn.html block-min-height-last-child-9c-dyn.html
-# If a parent box's height is 'auto' and its 'max-height' is not 'none'
-# then its bottom margin collapses with its last-child's bottom margin.
-# According to CSS 2.1 §10.7 (Minimum and maximum heights) this is true,
-# even if the descendant's height is bigger than the defined max-height.
-== block-max-height-last-child-1a.html block-max-height-last-child-1a.html
-== block-max-height-last-child-1b.html block-max-height-last-child-1b.html
-== block-max-height-last-child-1c.html block-max-height-last-child-1c.html
-== block-max-height-last-child-2a.html block-max-height-last-child-2a.html
-== block-max-height-last-child-2b.html block-max-height-last-child-2b.html
-== block-max-height-last-child-3a.html block-max-height-last-child-3a.html
-== block-max-height-last-child-3b.html block-max-height-last-child-3b.html
-== block-max-height-last-child-3c.html block-max-height-last-child-3c.html
-== block-max-height-last-child-4a.html block-max-height-last-child-4a.html
-== block-max-height-last-child-4b.html block-max-height-last-child-4b.html
-== block-max-height-last-child-4c.html block-max-height-last-child-4c.html
-== block-max-height-last-child-5a.html block-max-height-last-child-5a.html
-== block-max-height-last-child-5b.html block-max-height-last-child-5b.html
-== block-max-height-last-child-6a.html block-max-height-last-child-6a.html
-== block-max-height-last-child-6b.html block-max-height-last-child-6b.html
-== block-max-height-last-child-6c.html block-max-height-last-child-6c.html
-== block-max-height-last-child-7a.html block-max-height-last-child-7a.html
-# Bug 616339
-== block-max-height-last-child-7b.html block-max-height-last-child-7b.html
-== block-max-height-last-child-7c.html block-max-height-last-child-7c.html
-== block-max-height-last-child-8a.html block-max-height-last-child-8a.html
-# Bug 616339
-== block-max-height-last-child-8b.html block-max-height-last-child-8b.html
-# Bug 616339
-== block-max-height-last-child-9a.html block-max-height-last-child-9a.html
-# Bug 616339
-== block-max-height-last-child-9b.html block-max-height-last-child-9b.html
-== block-max-height-last-child-9c.html block-max-height-last-child-9c.html
-== block-max-height-last-child-1a-dyn.html block-max-height-last-child-1a-dyn.html
-== block-max-height-last-child-1b-dyn.html block-max-height-last-child-1b-dyn.html
-== block-max-height-last-child-1c-dyn.html block-max-height-last-child-1c-dyn.html
-== block-max-height-last-child-2a-dyn.html block-max-height-last-child-2a-dyn.html
-== block-max-height-last-child-2b-dyn.html block-max-height-last-child-2b-dyn.html
-== block-max-height-last-child-3a-dyn.html block-max-height-last-child-3a-dyn.html
-== block-max-height-last-child-3b-dyn.html block-max-height-last-child-3b-dyn.html
-== block-max-height-last-child-3c-dyn.html block-max-height-last-child-3c-dyn.html
-== block-max-height-last-child-4a-dyn.html block-max-height-last-child-4a-dyn.html
-== block-max-height-last-child-4b-dyn.html block-max-height-last-child-4b-dyn.html
-== block-max-height-last-child-4c-dyn.html block-max-height-last-child-4c-dyn.html
-== block-max-height-last-child-5a-dyn.html block-max-height-last-child-5a-dyn.html
-== block-max-height-last-child-5b-dyn.html block-max-height-last-child-5b-dyn.html
-== block-max-height-last-child-6a-dyn.html block-max-height-last-child-6a-dyn.html
-== block-max-height-last-child-6b-dyn.html block-max-height-last-child-6b-dyn.html
-== block-max-height-last-child-6c-dyn.html block-max-height-last-child-6c-dyn.html
-== block-max-height-last-child-7a-dyn.html block-max-height-last-child-7a-dyn.html
-# Bug 616339
-== block-max-height-last-child-7b-dyn.html block-max-height-last-child-7b-dyn.html
-== block-max-height-last-child-7c-dyn.html block-max-height-last-child-7c-dyn.html
-== block-max-height-last-child-8a-dyn.html block-max-height-last-child-8a-dyn.html
-# Bug 616339
-== block-max-height-last-child-8b-dyn.html block-max-height-last-child-8b-dyn.html
-# Bug 616339
-== block-max-height-last-child-9a-dyn.html block-max-height-last-child-9a-dyn.html
-# Bug 616339
-== block-max-height-last-child-9b-dyn.html block-max-height-last-child-9b-dyn.html
-== block-max-height-last-child-9c-dyn.html block-max-height-last-child-9c-dyn.html
-# If a parent box's height is not 'auto' then its bottom margin
-# never collapses with its last-child's bottom margin,
-# as these margins are not considered 'adjoining'.
-# According to CSS 2.1 §10.7 (Minimum and maximum heights) this is true,
-# even if the value of min- or max-height is used instead.
-== block-fix-height-last-child-1a.html block-fix-height-last-child-1a.html
-== block-fix-height-last-child-1b.html block-fix-height-last-child-1b.html
-== block-fix-height-last-child-2a.html block-fix-height-last-child-2a.html
-== block-fix-height-last-child-2b.html block-fix-height-last-child-2b.html
-skip == block-fix-height-last-child-3a.html block-fix-height-last-child-3a.html
-== block-fix-height-last-child-3b.html block-fix-height-last-child-3b.html
-== block-fix-height-last-child-4a.html block-fix-height-last-child-4a.html
-== block-fix-height-last-child-4b.html block-fix-height-last-child-4b.html
-== block-fix-height-last-child-4c.html block-fix-height-last-child-4c.html
-== block-fix-height-last-child-4d.html block-fix-height-last-child-4d.html
-== block-fix-height-last-child-4e.html block-fix-height-last-child-4e.html
-== block-fix-height-last-child-4f.html block-fix-height-last-child-4f.html
-== block-fix-height-last-child-4g.html block-fix-height-last-child-4g.html
-== block-fix-height-last-child-4h.html block-fix-height-last-child-4h.html
-== block-fix-height-last-child-1a-dyn.html block-fix-height-last-child-1a-dyn.html
-== block-fix-height-last-child-1b-dyn.html block-fix-height-last-child-1b-dyn.html
-== block-fix-height-last-child-2a-dyn.html block-fix-height-last-child-2a-dyn.html
-== block-fix-height-last-child-2b-dyn.html block-fix-height-last-child-2b-dyn.html
-== block-fix-height-last-child-3a-dyn.html block-fix-height-last-child-3a-dyn.html
-== block-fix-height-last-child-3b-dyn.html block-fix-height-last-child-3b-dyn.html
-== block-fix-height-last-child-4a-dyn.html block-fix-height-last-child-4a-dyn.html
-== block-fix-height-last-child-4b-dyn.html block-fix-height-last-child-4b-dyn.html
-== block-fix-height-last-child-4c-dyn.html block-fix-height-last-child-4c-dyn.html
-== block-fix-height-last-child-4d-dyn.html block-fix-height-last-child-4d-dyn.html
-== block-fix-height-last-child-4e-dyn.html block-fix-height-last-child-4e-dyn.html
-== block-fix-height-last-child-4f-dyn.html block-fix-height-last-child-4f-dyn.html
-== block-fix-height-last-child-4g-dyn.html block-fix-height-last-child-4g-dyn.html
-== block-fix-height-last-child-4h-dyn.html block-fix-height-last-child-4h-dyn.html
-# "Two margins are adjoining if and only if:" [...]
-# "both belong to vertically-adjacent box edges,
-# i.e. form one of the following pairs:" [...]
-# "top and bottom margins of a box that does not establish a new block
-# formatting context and that has zero computed 'min-height', zero or
-# 'auto' computed 'height', and no in-flow children"
-# Note that "if the top and bottom margins of a box are adjoining, then it is
-# possible for margins to collapse through it."
-# I.e. a parent's top and bottom margin are still considered adjoining if
-# they collapse through their in-flow children's margins.
-== block-no-content-1a.html block-no-content-1a.html
-== block-no-content-1b.html block-no-content-1b.html
-== block-no-content-1c.html block-no-content-1c.html
-== block-no-content-1d.html block-no-content-1d.html
-== block-no-content-2a.html block-no-content-2a.html
-== block-no-content-2b.html block-no-content-2b.html
-== block-no-content-2c.html block-no-content-2c.html
-== block-no-content-2d.html block-no-content-2d.html
-== block-no-content-2e.html block-no-content-2e.html
-== block-no-content-3a.html block-no-content-3a.html
-== block-no-content-3b.html block-no-content-3b.html
-== block-no-content-3c.html block-no-content-3c.html
-== block-no-content-4a.html block-no-content-4a.html
-== block-no-content-4b.html block-no-content-4b.html
-== block-no-content-4c.html block-no-content-4c.html
-== block-no-content-5a.html block-no-content-5a.html
-== block-no-content-5b.html block-no-content-5b.html
-== block-no-content-6.html block-no-content-6.html
-== block-no-content-7.html block-no-content-7.html
-# "If the top margin of a box with non-zero computed 'min-height' and 'auto'
-# computed 'height' collapses with the bottom margin of its last in-flow
-# child, then the child's bottom margin does not collapse with the parent's
-# bottom margin."
-== block-no-content-8.html block-no-content-8.html
-== block-no-content-1a-dyn.html block-no-content-1a-dyn.html
-skip == block-no-content-1b-dyn.html block-no-content-1b-dyn.html
-== block-no-content-1c-dyn.html block-no-content-1c-dyn.html
-== block-no-content-1d-dyn.html block-no-content-1d-dyn.html
-== block-no-content-2a-dyn.html block-no-content-2a-dyn.html
-== block-no-content-2b-dyn.html block-no-content-2b-dyn.html
-== block-no-content-2c-dyn.html block-no-content-2c-dyn.html
-== block-no-content-2d-dyn.html block-no-content-2d-dyn.html
-== block-no-content-2e-dyn.html block-no-content-2e-dyn.html
-== block-no-content-3a-dyn.html block-no-content-3a-dyn.html
-== block-no-content-3b-dyn.html block-no-content-3b-dyn.html
-== block-no-content-3c-dyn.html block-no-content-3c-dyn.html
-== block-no-content-4a-dyn.html block-no-content-4a-dyn.html
-== block-no-content-4b-dyn.html block-no-content-4b-dyn.html
-== block-no-content-4c-dyn.html block-no-content-4c-dyn.html
-== block-no-content-5a-dyn.html block-no-content-5a-dyn.html
-== block-no-content-5b-dyn.html block-no-content-5b-dyn.html
-skip == block-no-content-6-dyn.html block-no-content-6-dyn.html
-== block-no-content-7-dyn.html block-no-content-7-dyn.html
-== block-no-content-8-dyn.html block-no-content-8-dyn.html
-# These tests are similar to the no-content ones, except that some boxes
-# have height: 0; declared on them.
-skip == block-zero-height-1a.html block-zero-height-1a.html
-== block-zero-height-1b.html block-zero-height-1b.html
-== block-zero-height-2a.html block-zero-height-2a.html
-== block-zero-height-2b.html block-zero-height-2b.html
-== block-zero-height-2c.html block-zero-height-2c.html
-== block-zero-height-3a.html block-zero-height-3a.html
-== block-zero-height-3b.html block-zero-height-3b.html
-== block-zero-height-3c.html block-zero-height-3c.html
-# "Margins of elements that establish new block formatting contexts ([...])
-# do not collapse with their in-flow children."
-# The margins of a block formatting context can collapse with margins of
-# in-flow sibling boxes, but not with margins of their in-flow children.
-# Elements that establish a block formatting context are:
-# * "elements with 'overflow' other than 'visible'"
-== block-overflow-1.html block-overflow-1.html
-== block-overflow-1.html block-overflow-1.html
-== block-overflow-2.html block-overflow-2.html
-== block-overflow-2.html block-overflow-2.html
-skip-if(B2G||Mulet) == block-overflow-3.html block-overflow-3.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == block-overflow-3.html block-overflow-3.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == block-overflow-4.html block-overflow-4.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == block-overflow-4.html block-overflow-4.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== block-overflow-5a.html block-overflow-5a.html
-== block-overflow-5a.html block-overflow-5a.html
-== block-overflow-5b.html block-overflow-5b.html
-== block-overflow-5b.html block-overflow-5b.html
-== block-overflow-5c.html block-overflow-5c.html
-== block-overflow-5c.html block-overflow-5c.html
-== block-overflow-5d.html block-overflow-5d.html
-== block-overflow-5d.html block-overflow-5d.html
-== block-overflow-1-dyn.html block-overflow-1-dyn.html
-== block-overflow-2-dyn.html block-overflow-2-dyn.html
-skip-if(B2G||Mulet) == block-overflow-3-dyn.html block-overflow-3-dyn.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == block-overflow-4-dyn.html block-overflow-4-dyn.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== block-overflow-5a-dyn.html block-overflow-5a-dyn.html
-== block-overflow-5b-dyn.html block-overflow-5b-dyn.html
-== block-overflow-5c-dyn.html block-overflow-5c-dyn.html
-== block-overflow-5d-dyn.html block-overflow-5d-dyn.html
-# * 'fieldset' elements, per HTML5 (Candidate Recommendation 6 August 2013):
-# §10.3.13 (The fieldset and legend elements): "The fieldset element is
-# expected to establish a new block formatting context."
-== fieldset-sibling-1a.html fieldset-sibling-1a.html
-== fieldset-sibling-1b.html fieldset-sibling-1b.html
-== fieldset-sibling-1c.html fieldset-sibling-1c.html
-== fieldset-sibling-2a.html fieldset-sibling-2a.html
-== fieldset-sibling-2b.html fieldset-sibling-2b.html
-== fieldset-sibling-2c.html fieldset-sibling-2c.html
-== fieldset-sibling-2a.html fieldset-sibling-2a.html
-== fieldset-sibling-2b.html fieldset-sibling-2b.html
-== fieldset-sibling-2c.html fieldset-sibling-2c.html
-== fieldset-sibling-1a-dyn.html fieldset-sibling-1a-dyn.html
-== fieldset-sibling-1b-dyn.html fieldset-sibling-1b-dyn.html
-== fieldset-sibling-1c-dyn.html fieldset-sibling-1c-dyn.html
-== fieldset-sibling-2a-dyn.html fieldset-sibling-2a-dyn.html
-== fieldset-sibling-2b-dyn.html fieldset-sibling-2b-dyn.html
-== fieldset-sibling-2c-dyn.html fieldset-sibling-2c-dyn.html
-== fieldset-child-1.html fieldset-child-1.html
-== fieldset-child-1-dyn.html fieldset-child-1-dyn.html
-# * Tables, per CSS 2.1 §17.4 (Tables in the visual formatting model):
-# "The table wrapper box establishes a block formatting context."
-# "The table wrapper box is a 'block' box if the table is block-level [...]"
-== table-sibling-1a.html table-sibling-1a.html
-== table-sibling-1a.html table-sibling-1a.html
-== table-sibling-1b.html table-sibling-1b.html
-== table-sibling-1b.html table-sibling-1b.html
-== table-sibling-1c.html table-sibling-1c.html
-== table-sibling-1c.html table-sibling-1c.html
-== table-sibling-2a.html table-sibling-2a.html
-== table-sibling-2a.html table-sibling-2a.html
-== table-sibling-2b.html table-sibling-2b.html
-== table-sibling-2b.html table-sibling-2b.html
-== table-sibling-2c.html table-sibling-2c.html
-== table-sibling-2c.html table-sibling-2c.html
-skip-if(B2G||Mulet) == table-sibling-1a-dyn.html table-sibling-1a-dyn.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== table-sibling-1a-dyn.html table-sibling-1a-dyn.html
-skip-if(B2G||Mulet) == table-sibling-1b-dyn.html table-sibling-1b-dyn.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== table-sibling-1b-dyn.html table-sibling-1b-dyn.html
-skip-if(B2G||Mulet) == table-sibling-1c-dyn.html table-sibling-1c-dyn.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== table-sibling-1c-dyn.html table-sibling-1c-dyn.html
-skip-if(B2G||Mulet) == table-sibling-2a-dyn.html table-sibling-2a-dyn.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== table-sibling-2a-dyn.html table-sibling-2a-dyn.html
-skip-if(B2G||Mulet) == table-sibling-2b-dyn.html table-sibling-2b-dyn.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== table-sibling-2b-dyn.html table-sibling-2b-dyn.html
-skip-if(B2G||Mulet) == table-sibling-2c-dyn.html table-sibling-2c-dyn.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== table-sibling-2c-dyn.html table-sibling-2c-dyn.html
-skip-if(B2G||Mulet) == table-sibling-3-dyn.html table-sibling-3-dyn.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== table-sibling-3-dyn.html table-sibling-3-dyn.html
-# * table-caption boxes, per CSS 2.1 §9.4.1 (Block formatting contexts):
-# "[...] block containers (such as [...] table-captions) [...]
-# establish new block formatting contexts for their contents."
-# The margins of a table-caption do not collapse with the margins
-# of the table wrapper box. They can collapse with the margins of other
-# table-captions, though, if they share the same caption-side.
-== table-caption-1a.html table-caption-1a.html
-== table-caption-1b.html table-caption-1b.html
-== table-caption-1c.html table-caption-1c.html
-== table-caption-2a.html table-caption-2a.html
-== table-caption-2b.html table-caption-2b.html
-== table-caption-2c.html table-caption-2c.html
-== table-caption-1a-dyn.html table-caption-1a-dyn.html
-== table-caption-1b-dyn.html table-caption-1b-dyn.html
-== table-caption-1c-dyn.html table-caption-1c-dyn.html
-== table-caption-2a-dyn.html table-caption-2a-dyn.html
-== table-caption-2b-dyn.html table-caption-2b-dyn.html
-== table-caption-2c-dyn.html table-caption-2c-dyn.html
-# Note: CSS 2.1 suggests that the 'caption-side' values 'top-outside' and
-# 'bottom-outside' will be used in a future CSS Module to restore the
-# CSS 2 definition of 'top' and 'bottom' (which is different from CSS 2.1's).
-# Since Bug #659828 was fixed, 'top-outside' and 'bottom-outside' act as an
-# alias for the CSS 2.1 values 'top' and 'bottom' respectively.
-== table-caption-top-1.html table-caption-top-1.html
-== table-caption-top-2.html table-caption-top-2.html
-== table-caption-top-outside-1.html table-caption-top-outside-1.html
-== table-caption-top-outside-2.html table-caption-top-outside-2.html
-skip == table-caption-bottom-1.html table-caption-bottom-1.html
-== table-caption-bottom-2.html table-caption-bottom-2.html
-== table-caption-bottom-outside-1.html table-caption-bottom-outside-1.html
-== table-caption-bottom-outside-2.html table-caption-bottom-outside-2.html
-== table-caption-top-1-dyn.html table-caption-top-1-dyn.html
-== table-caption-top-2-dyn.html table-caption-top-2-dyn.html
-== table-caption-top-outside-1-dyn.html table-caption-top-outside-1-dyn.html
-== table-caption-top-outside-2-dyn.html table-caption-top-outside-2-dyn.html
-== table-caption-bottom-1-dyn.html table-caption-bottom-1-dyn.html
-== table-caption-bottom-2-dyn.html table-caption-bottom-2-dyn.html
-== table-caption-bottom-outside-1-dyn.html table-caption-bottom-outside-1-dyn.html
-== table-caption-bottom-outside-2-dyn.html table-caption-bottom-outside-2-dyn.html
-== caption-sibling-1a.html caption-sibling-1a.html
-# Bug 144517
-== caption-sibling-1a.html caption-sibling-1a.html
-== caption-sibling-1b.html caption-sibling-1b.html
-# Bug 144517
-== caption-sibling-1b.html caption-sibling-1b.html
-== caption-sibling-1c.html caption-sibling-1c.html
-# Bug 144517
-== caption-sibling-1c.html caption-sibling-1c.html
-== caption-sibling-1a-dyn.html caption-sibling-1a-dyn.html
-# Bug 144517
-== caption-sibling-1a-dyn.html caption-sibling-1a-dyn.html
-skip == caption-sibling-1b-dyn.html caption-sibling-1b-dyn.html
-# Bug 144517
-skip == caption-sibling-1b-dyn.html caption-sibling-1b-dyn.html
-== caption-sibling-1c-dyn.html caption-sibling-1c-dyn.html
-# Bug 144517
-== caption-sibling-1c-dyn.html caption-sibling-1c-dyn.html
-== caption-sibling-2-dyn.html caption-sibling-2-dyn.html
-# Bug 144517
-== caption-sibling-2-dyn.html caption-sibling-2-dyn.html
-== caption-child-1.html caption-child-1.html
-== caption-child-1-dyn.html caption-child-1-dyn.html
-# * Multi-column elements, per CSS Multi-column Layout Module
-# (Candidate Recommendation 12 April 2011):
-# "A multi-column element establishes a new block formatting context [...]"
-== column-sibling-1a.html column-sibling-1a.html
-== column-sibling-1b.html column-sibling-1b.html
-== column-sibling-1c.html column-sibling-1c.html
-== column-sibling-1a-dyn.html column-sibling-1a-dyn.html
-== column-sibling-1b-dyn.html column-sibling-1b-dyn.html
-== column-sibling-1c-dyn.html column-sibling-1c-dyn.html
-== column-sibling-2a.html column-sibling-2a.html
-== column-sibling-2b.html column-sibling-2b.html
-== column-sibling-2c.html column-sibling-2c.html
-== column-sibling-2a-dyn.html column-sibling-2a-dyn.html
-== column-sibling-2b-dyn.html column-sibling-2b-dyn.html
-== column-sibling-2c-dyn.html column-sibling-2c-dyn.html
-== column-child-1.html column-child-1.html
-== column-child-1-dyn.html column-child-1-dyn.html
-# * inline-block boxes
-# "Margins of inline-block boxes do not collapse
-# (not even with their in-flow children)."
-== inline-block-sibling-1a.html inline-block-sibling-1a.html
-== inline-block-sibling-1b.html inline-block-sibling-1b.html
-== inline-block-sibling-1c.html inline-block-sibling-1c.html
-== inline-block-sibling-2.html inline-block-sibling-2.html
-== inline-block-sibling-2.html inline-block-sibling-2.html
-== inline-block-sibling-1a-dyn.html inline-block-sibling-1a-dyn.html
-== inline-block-sibling-1b-dyn.html inline-block-sibling-1b-dyn.html
-== inline-block-sibling-1c-dyn.html inline-block-sibling-1c-dyn.html
-== inline-block-sibling-2-dyn.html inline-block-sibling-2-dyn.html
-== inline-block-child-1.html inline-block-child-1.html
-== inline-block-child-2.html inline-block-child-2.html
-== inline-block-child-2.html inline-block-child-2.html
-== inline-block-child-3.html inline-block-child-3.html
-== inline-block-child-1-dyn.html inline-block-child-1-dyn.html
-== inline-block-child-2-dyn.html inline-block-child-2-dyn.html
-== inline-block-child-3-dyn.html inline-block-child-3-dyn.html
-# * absolutely positioned elements
-# "Margins of absolutely positioned boxes do not collapse
-# (not even with their in-flow children)."
-== block-abs-pos-1.html block-abs-pos-1.html
-== block-abs-pos-2.html block-abs-pos-2.html
-== block-abs-pos-2.html block-abs-pos-2.html
-== block-abs-pos-1-dyn.html block-abs-pos-1-dyn.html
-== block-abs-pos-2-dyn.html block-abs-pos-2-dyn.html
-# * Floats
-# "Margins between a floated box and any other box do not collapse
-# (not even between a float and its in-flow children)."
-skip == block-float-1a.html block-float-1a.html
-skip == block-float-1a.html block-float-1a.html
-skip == block-float-1a.html block-float-1a.html
-== block-float-1b.html block-float-1b.html
-== block-float-1b.html block-float-1b.html
-== block-float-1b.html block-float-1b.html
-== block-float-2a.html block-float-2a.html
-== block-float-2a.html block-float-2a.html
-== block-float-2b.html block-float-2b.html
-== block-float-2b.html block-float-2b.html
-== block-float-3a.html block-float-3a.html
-== block-float-3b.html block-float-3b.html
-== block-float-1a-dyn.html block-float-1a-dyn.html
-== block-float-1b-dyn.html block-float-1b-dyn.html
-== block-float-2a-dyn.html block-float-2a-dyn.html
-== block-float-2b-dyn.html block-float-2b-dyn.html
-== block-float-3a-dyn.html block-float-3a-dyn.html
-== block-float-3b-dyn.html block-float-3b-dyn.html
-# Tests for various cases where clearance is applied and collapsing is
-# prevented or only allows for certain margins.
-== block-clear-1a.html block-clear-1a.html
-== block-clear-1b.html block-clear-1b.html
-== block-clear-2.html block-clear-2.html
-== block-clear-2.html block-clear-2.html
-== block-clear-3a.html block-clear-3a.html
-== block-clear-3b.html block-clear-3b.html
-== block-clear-3c.html block-clear-3c.html
-== block-clear-3d.html block-clear-3d.html
-== block-clear-3e.html block-clear-3e.html
-== block-clear-3f.html block-clear-3f.html
-skip == block-clear-4a.html block-clear-4a.html
-== block-clear-4b.html block-clear-4b.html
-== block-clear-4c.html block-clear-4c.html
-== block-clear-4d.html block-clear-4d.html
-== block-clear-4e.html block-clear-4e.html
-== block-clear-4f.html block-clear-4f.html
-== block-clear-5a.html block-clear-5a.html
-== block-clear-5b.html block-clear-5b.html
-== block-clear-5c.html block-clear-5c.html
-== block-clear-5d.html block-clear-5d.html
-== block-clear-5e.html block-clear-5e.html
-== block-clear-5f.html block-clear-5f.html
-== block-clear-5g.html block-clear-5g.html
-== block-clear-5h.html block-clear-5h.html
-== block-clear-6a-left.html block-clear-6a-left.html
-# Bug 493380
-== block-clear-6b-left.html block-clear-6b-left.html
-== block-clear-6c-left.html block-clear-6c-left.html
-== block-clear-6d-left.html block-clear-6d-left.html
-# Bug 493380
-== block-clear-6d-left.html block-clear-6d-left.html
-# Bug 493380
-skip == block-clear-6e-left.html block-clear-6e-left.html
-skip == block-clear-6e-left.html block-clear-6e-left.html
-== block-clear-6f-left.html block-clear-6f-left.html
-== block-clear-6f-left.html block-clear-6f-left.html
-== block-clear-7a-left.html block-clear-7a-left.html
-# Bug 493380
-== block-clear-7b-left.html block-clear-7b-left.html
-# Bug 493380
-== block-clear-7c-left.html block-clear-7c-left.html
-# Bug 493380
-== block-clear-7d-left.html block-clear-7d-left.html
-== block-clear-7e-left.html block-clear-7e-left.html
-# Bug 493380
-== block-clear-7e-left.html block-clear-7e-left.html
-# Bug 493380
-== block-clear-7f-left.html block-clear-7f-left.html
-# Bug 493380
-== block-clear-7f-left.html block-clear-7f-left.html
-# Bug 493380
-== block-clear-7g-left.html block-clear-7g-left.html
-# Bug 493380
-== block-clear-7g-left.html block-clear-7g-left.html
-# Bug 493380
-== block-clear-7h-left.html block-clear-7h-left.html
-== block-clear-7h-left.html block-clear-7h-left.html
-# "Margins of the root element's box do not collapse."
-# Testing the root margins of a generic XML document.
-== block-xml-root-1.xml block-xml-root-1.xml
-# In XML and XHTML, the html element is not necessarily the root element of
-# a document. In that case, the margins of the html element collapse
-# like the margins of any other block boxes.
-skip == block-xhtml-root-1a.xhtml block-xhtml-root-1a.xhtml
-skip == block-xhtml-root-1b.xhtml block-xhtml-root-1b.xhtml
-skip == block-xhtml-root-2.xhtml block-xhtml-root-2.xhtml
-skip == block-xhtml-root-3.xhtml block-xhtml-root-3.xhtml
-# When the html element is the root element of the document, its margins
-# do not collapse.
-== block-xhtml-html-1a.xhtml block-xhtml-html-1a.xhtml
-== block-xhtml-html-1b.xhtml block-xhtml-html-1b.xhtml
-== block-xhtml-html-2.xhtml block-xhtml-html-2.xhtml
-== block-xhtml-html-3.xhtml block-xhtml-html-3.xhtml
-== block-xhtml-html-1a-dyn.xhtml block-xhtml-html-1a-dyn.xhtml
-== block-xhtml-html-1b-dyn.xhtml block-xhtml-html-1b-dyn.xhtml
-== block-xhtml-html-2-dyn.xhtml block-xhtml-html-2-dyn.xhtml
-== block-xhtml-html-3-dyn.xhtml block-xhtml-html-3-dyn.xhtml
-# In HTML documents only the html element can be the root element.
-# Its margins do not collapse.
-== block-html-html-1a.html block-html-html-1a.html
-== block-html-html-1b.html block-html-html-1b.html
-== block-html-html-2.html block-html-html-2.html
-== block-html-html-3.html block-html-html-3.html
-== block-html-html-1a-dyn.html block-html-html-1a-dyn.html
-== block-html-html-1b-dyn.html block-html-html-1b-dyn.html
-== block-html-html-2-dyn.html block-html-html-2-dyn.html
-== block-html-html-3-dyn.html block-html-html-3-dyn.html
-# These are older tests that check whether margins on the root element collapse.
-== block-root-1a.html block-root-1a.html
-== block-root-1a.html block-root-1a.html
-== block-root-1a.html block-root-1a.html
-== block-root-1a.html block-root-1a.html
-== block-root-1b.html block-root-1b.html
-== block-root-1b.html block-root-1b.html
-== block-html-body-1.html block-html-body-1.html
-== block-html-body-1.html block-html-body-1.html
-== block-html-body-1.html block-html-body-1.html
-# Some basic tests for margins given in percent and em.
-== block-percent-1.html block-percent-1.html
-== block-percent-1-dyn.html block-percent-1-dyn.html
-== block-percent-2.html block-percent-2.html
-== block-percent-2-dyn.html block-percent-2-dyn.html
-== block-em-length-1.html block-em-length-1.html
-== block-em-length-1-dyn.html block-em-length-1-dyn.html
-# Other tests.
-== dynamic-add-text-1.html dynamic-add-text-1.html
-# Bug 467321
-== scrollable-vertical-margin.html scrollable-vertical-margin.html
-== scrollable-horizontal-margin.html scrollable-horizontal-margin.html
diff --git a/layout/reftests/mathml/columnlines-1-ref.html b/layout/reftests/mathml/columnlines-1-ref.html
index e5ea01a7d..8556fb1be 100644
--- a/layout/reftests/mathml/columnlines-1-ref.html
+++ b/layout/reftests/mathml/columnlines-1-ref.html
@@ -1,5 +1,4 @@
<!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- -->
-<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: -->
<!DOCTYPE html>
<html>
<head>
diff --git a/layout/reftests/mathml/columnlines-1a.html b/layout/reftests/mathml/columnlines-1a.html
index 3f391c296..541d74cd7 100644
--- a/layout/reftests/mathml/columnlines-1a.html
+++ b/layout/reftests/mathml/columnlines-1a.html
@@ -1,5 +1,4 @@
<!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- -->
-<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: -->
<!DOCTYPE html>
<html>
<head>
diff --git a/layout/reftests/mathml/columnlines-1b.html b/layout/reftests/mathml/columnlines-1b.html
index 9ee1a3e35..3a441a1b8 100644
--- a/layout/reftests/mathml/columnlines-1b.html
+++ b/layout/reftests/mathml/columnlines-1b.html
@@ -1,5 +1,4 @@
<!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- -->
-<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: -->
<!DOCTYPE html>
<html>
<head>
diff --git a/layout/reftests/mathml/columnlines-1c.html b/layout/reftests/mathml/columnlines-1c.html
index d1bd0d7ce..51e33ce84 100644
--- a/layout/reftests/mathml/columnlines-1c.html
+++ b/layout/reftests/mathml/columnlines-1c.html
@@ -1,5 +1,4 @@
<!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- -->
-<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: -->
<!DOCTYPE html>
<html>
<head>
diff --git a/layout/reftests/mathml/columnlines-2-ref.html b/layout/reftests/mathml/columnlines-2-ref.html
index 84c96c5fe..6fcd823ce 100644
--- a/layout/reftests/mathml/columnlines-2-ref.html
+++ b/layout/reftests/mathml/columnlines-2-ref.html
@@ -1,5 +1,4 @@
<!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- -->
-<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: -->
<!DOCTYPE html>
<html>
<head>
diff --git a/layout/reftests/mathml/columnlines-2a.html b/layout/reftests/mathml/columnlines-2a.html
index ea3ed5abe..54eb8e928 100644
--- a/layout/reftests/mathml/columnlines-2a.html
+++ b/layout/reftests/mathml/columnlines-2a.html
@@ -1,5 +1,4 @@
<!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- -->
-<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: -->
<!DOCTYPE html>
<html>
<head>
diff --git a/layout/reftests/mathml/columnlines-2b.html b/layout/reftests/mathml/columnlines-2b.html
index 36182d60a..5c2447b40 100644
--- a/layout/reftests/mathml/columnlines-2b.html
+++ b/layout/reftests/mathml/columnlines-2b.html
@@ -1,5 +1,4 @@
<!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- -->
-<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: -->
<!DOCTYPE html>
<html>
<head>
diff --git a/layout/reftests/mathml/columnlines-3-1-ref.html b/layout/reftests/mathml/columnlines-3-1-ref.html
index ce49f5dad..3f162127e 100644
--- a/layout/reftests/mathml/columnlines-3-1-ref.html
+++ b/layout/reftests/mathml/columnlines-3-1-ref.html
@@ -1,5 +1,4 @@
<!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- -->
-<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: -->
<!DOCTYPE html>
<html>
<head>
diff --git a/layout/reftests/mathml/columnlines-3-1.html b/layout/reftests/mathml/columnlines-3-1.html
index 80c46858e..e7c6fd759 100644
--- a/layout/reftests/mathml/columnlines-3-1.html
+++ b/layout/reftests/mathml/columnlines-3-1.html
@@ -1,5 +1,4 @@
<!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- -->
-<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: -->
<!DOCTYPE html>
<html>
<head>
diff --git a/layout/reftests/mathml/columnlines-3-2-ref.html b/layout/reftests/mathml/columnlines-3-2-ref.html
index 6549ad526..6727d8fcd 100644
--- a/layout/reftests/mathml/columnlines-3-2-ref.html
+++ b/layout/reftests/mathml/columnlines-3-2-ref.html
@@ -1,5 +1,4 @@
<!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- -->
-<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: -->
<!DOCTYPE html>
<html>
<head>
diff --git a/layout/reftests/mathml/columnlines-3-2.html b/layout/reftests/mathml/columnlines-3-2.html
index 789013d9f..24ef9268c 100644
--- a/layout/reftests/mathml/columnlines-3-2.html
+++ b/layout/reftests/mathml/columnlines-3-2.html
@@ -1,5 +1,4 @@
<!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- -->
-<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: -->
<!DOCTYPE html>
<html>
<head>
diff --git a/layout/reftests/mathml/menclose-1-ref.html b/layout/reftests/mathml/menclose-1-ref.html
index 2302a2b8d..a6b2d7257 100644
--- a/layout/reftests/mathml/menclose-1-ref.html
+++ b/layout/reftests/mathml/menclose-1-ref.html
@@ -1,5 +1,4 @@
<!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- -->
-<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: -->
<!DOCTYPE html>
<html>
<head>
diff --git a/layout/reftests/mathml/menclose-1a.html b/layout/reftests/mathml/menclose-1a.html
index 649ea0ea2..cc7ae54a6 100644
--- a/layout/reftests/mathml/menclose-1a.html
+++ b/layout/reftests/mathml/menclose-1a.html
@@ -1,5 +1,4 @@
<!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- -->
-<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: -->
<!DOCTYPE html>
<html>
<head>
diff --git a/layout/reftests/mathml/menclose-1b.html b/layout/reftests/mathml/menclose-1b.html
index d46e43d42..03e7aea5d 100644
--- a/layout/reftests/mathml/menclose-1b.html
+++ b/layout/reftests/mathml/menclose-1b.html
@@ -1,5 +1,4 @@
<!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- -->
-<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: -->
<!DOCTYPE html>
<html>
<head>
diff --git a/layout/reftests/mathml/menclose-1c.html b/layout/reftests/mathml/menclose-1c.html
index cca82fb38..0a1a93c7d 100644
--- a/layout/reftests/mathml/menclose-1c.html
+++ b/layout/reftests/mathml/menclose-1c.html
@@ -1,5 +1,4 @@
<!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- -->
-<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: -->
<!DOCTYPE html>
<html>
<head>
diff --git a/layout/reftests/mathml/menclose-1d.html b/layout/reftests/mathml/menclose-1d.html
index 6c98cdb96..0dbd557fe 100644
--- a/layout/reftests/mathml/menclose-1d.html
+++ b/layout/reftests/mathml/menclose-1d.html
@@ -1,5 +1,4 @@
<!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- -->
-<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: -->
<!DOCTYPE html>
<html>
<head>
diff --git a/layout/reftests/mathml/menclose-1e.html b/layout/reftests/mathml/menclose-1e.html
index 6c1d4bc2d..c3b4231d7 100644
--- a/layout/reftests/mathml/menclose-1e.html
+++ b/layout/reftests/mathml/menclose-1e.html
@@ -1,5 +1,4 @@
<!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- -->
-<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: -->
<!DOCTYPE html>
<html>
<head>
diff --git a/layout/reftests/mathml/menclose-1f.html b/layout/reftests/mathml/menclose-1f.html
index f4409e20b..c12dedb54 100644
--- a/layout/reftests/mathml/menclose-1f.html
+++ b/layout/reftests/mathml/menclose-1f.html
@@ -1,5 +1,4 @@
<!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- -->
-<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: -->
<!DOCTYPE html>
<html>
<head>
diff --git a/layout/reftests/mathml/menclose-1g.html b/layout/reftests/mathml/menclose-1g.html
index 97a88eba2..48dceadf0 100644
--- a/layout/reftests/mathml/menclose-1g.html
+++ b/layout/reftests/mathml/menclose-1g.html
@@ -1,5 +1,4 @@
<!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- -->
-<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: -->
<!DOCTYPE html>
<html>
<head>
diff --git a/layout/reftests/mathml/menclose-1h.html b/layout/reftests/mathml/menclose-1h.html
index fa17c0789..79f7d6c02 100644
--- a/layout/reftests/mathml/menclose-1h.html
+++ b/layout/reftests/mathml/menclose-1h.html
@@ -1,5 +1,4 @@
<!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- -->
-<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: -->
<!DOCTYPE html>
<html>
<head>
diff --git a/layout/reftests/mathml/menclose-1i.html b/layout/reftests/mathml/menclose-1i.html
index 062ef17f5..2e5fc559e 100644
--- a/layout/reftests/mathml/menclose-1i.html
+++ b/layout/reftests/mathml/menclose-1i.html
@@ -1,5 +1,4 @@
<!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- -->
-<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: -->
<!DOCTYPE html>
<html>
<head>
diff --git a/layout/reftests/mathml/menclose-1j.html b/layout/reftests/mathml/menclose-1j.html
index 175f65aa3..a992b0014 100644
--- a/layout/reftests/mathml/menclose-1j.html
+++ b/layout/reftests/mathml/menclose-1j.html
@@ -1,5 +1,4 @@
<!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- -->
-<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: -->
<!DOCTYPE html>
<html>
<head>
diff --git a/layout/reftests/mathml/menclose-1k.html b/layout/reftests/mathml/menclose-1k.html
index 03f9d15fc..4704d64fd 100644
--- a/layout/reftests/mathml/menclose-1k.html
+++ b/layout/reftests/mathml/menclose-1k.html
@@ -1,5 +1,4 @@
<!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- -->
-<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: -->
<!DOCTYPE html>
<html>
<head>
diff --git a/layout/reftests/mathml/menclose-1l.html b/layout/reftests/mathml/menclose-1l.html
index dce96364d..a11c337f2 100644
--- a/layout/reftests/mathml/menclose-1l.html
+++ b/layout/reftests/mathml/menclose-1l.html
@@ -1,5 +1,4 @@
<!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- -->
-<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: -->
<!DOCTYPE html>
<html>
<head>
diff --git a/layout/reftests/mathml/menclose-1m.html b/layout/reftests/mathml/menclose-1m.html
index 4acdaf914..e505289ce 100644
--- a/layout/reftests/mathml/menclose-1m.html
+++ b/layout/reftests/mathml/menclose-1m.html
@@ -1,5 +1,4 @@
<!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- -->
-<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: -->
<!DOCTYPE html>
<html>
<head>
diff --git a/layout/reftests/mathml/menclose-1n.html b/layout/reftests/mathml/menclose-1n.html
index 3557fc348..c9c252c1a 100644
--- a/layout/reftests/mathml/menclose-1n.html
+++ b/layout/reftests/mathml/menclose-1n.html
@@ -1,5 +1,4 @@
<!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- -->
-<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: -->
<!DOCTYPE html>
<html>
<head>
diff --git a/layout/reftests/mathml/menclose-1o.html b/layout/reftests/mathml/menclose-1o.html
index 231aeaa09..f7fcfd6bd 100644
--- a/layout/reftests/mathml/menclose-1o.html
+++ b/layout/reftests/mathml/menclose-1o.html
@@ -1,5 +1,4 @@
<!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- -->
-<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: -->
<!DOCTYPE html>
<html>
<head>
diff --git a/layout/reftests/mathml/menclose-1p.html b/layout/reftests/mathml/menclose-1p.html
index 5bff5e02f..ac92a52e0 100644
--- a/layout/reftests/mathml/menclose-1p.html
+++ b/layout/reftests/mathml/menclose-1p.html
@@ -1,5 +1,4 @@
<!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- -->
-<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: -->
<!DOCTYPE html>
<html>
<head>
diff --git a/layout/reftests/mathml/mo-lspace-rspace-ref.html b/layout/reftests/mathml/mo-lspace-rspace-ref.html
index e8a409610..5c97ddf1c 100644
--- a/layout/reftests/mathml/mo-lspace-rspace-ref.html
+++ b/layout/reftests/mathml/mo-lspace-rspace-ref.html
@@ -1,5 +1,4 @@
<!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- -->
-<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: -->
<!DOCTYPE html>
<html>
<head>
diff --git a/layout/reftests/mathml/mo-lspace-rspace.html b/layout/reftests/mathml/mo-lspace-rspace.html
index 68fd59b37..f5833a5f1 100644
--- a/layout/reftests/mathml/mo-lspace-rspace.html
+++ b/layout/reftests/mathml/mo-lspace-rspace.html
@@ -1,5 +1,4 @@
<!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- -->
-<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: -->
<!DOCTYPE html>
<html>
<head>
diff --git a/layout/reftests/mathml/reftest-stylo.list b/layout/reftests/mathml/reftest-stylo.list
deleted file mode 100644
index 7e38f1ba1..000000000
--- a/layout/reftests/mathml/reftest-stylo.list
+++ /dev/null
@@ -1,415 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== dir-1.html dir-1.html
-== dir-2.html dir-2.html
-== dir-3.html dir-3.html
-== dir-4.html dir-4.html
-== dir-5.html dir-5.html
-== dir-6.html dir-6.html
-== dir-6a.html dir-6a.html
-== dir-7.html dir-7.html
-== dir-8.html dir-8.html
-== dir-9.html dir-9.html
-# Bug 787215
-== dir-10.html dir-10.html
-random-if((B2G&&browserIsRemote)||Mulet) == dir-11.html dir-11.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== css-spacing-1.html css-spacing-1.html
-== displaystyle-1.html displaystyle-1.html
-== displaystyle-2.html displaystyle-2.html
-== displaystyle-3.html displaystyle-3.html
-random-if((B2G&&browserIsRemote)||Mulet) == displaystyle-4.html displaystyle-4.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) random-if(smallScreen&&Android) fuzzy(255,200) == mirror-op-1.html mirror-op-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== mirror-op-2.html mirror-op-2.html
-== mirror-op-3.html mirror-op-3.html
-== mirror-op-4.html mirror-op-4.html
-== dynamic-mi.xhtml dynamic-mi.xhtml
-== mphantom-1.html mphantom-1.html
-== mphantom-2.html mphantom-2.html
-== mfenced-1.xhtml mfenced-1.xhtml
-== mfenced-2a.xhtml mfenced-2a.xhtml
-== mfenced-2b.xhtml mfenced-2b.xhtml
-== mfenced-3a.xhtml mfenced-3a.xhtml
-== mfenced-3b.xhtml mfenced-3b.xhtml
-== mfenced-3c.xhtml mfenced-3c.xhtml
-== mfenced-3d.xhtml mfenced-3d.xhtml
-== mfenced-4a.xhtml mfenced-4a.xhtml
-== mfenced-4b.xhtml mfenced-4b.xhtml
-== mfenced-5a.xhtml mfenced-5a.xhtml
-== mfenced-5b.xhtml mfenced-5b.xhtml
-== mfenced-5c.xhtml mfenced-5c.xhtml
-== mfenced-5d.xhtml mfenced-5d.xhtml
-== mfenced-6.html mfenced-6.html
-== mfenced-7.html mfenced-7.html
-== mfenced-8.html mfenced-8.html
-== mfenced-9.html mfenced-9.html
-fails-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) == mfenced-10.html mfenced-10.html
-# Windows versions without Cambria Math, see bug 670592
-== mfenced-11.html mfenced-11.html
-skip-if(Mulet) == mfenced-12.html mfenced-12.html
-# MULET: Bug 1144079: Re-enable Mulet mochitests and reftests taskcluster-specific disables
-== mi-mathvariant-1.xhtml mi-mathvariant-1.xhtml
-== mi-mathvariant-2.xhtml mi-mathvariant-2.xhtml
-== mi-mathvariant-3.html mi-mathvariant-3.html
-== non-spacing-accent-1.xhtml non-spacing-accent-1.xhtml
-== overbar-width-1.xhtml overbar-width-1.xhtml
-skip-if(B2G||Mulet) == quotes-1.xhtml quotes-1.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-== stretchy-underbar-1.xhtml stretchy-underbar-1.xhtml
-== stretchy-munderover-1a.html stretchy-munderover-1a.html
-== stretchy-munderover-1b.html stretchy-munderover-1b.html
-== stretchy-munderover-1c.html stretchy-munderover-1c.html
-== stretchy-munderover-1d.html stretchy-munderover-1d.html
-== stretchy-munderover-1e.html stretchy-munderover-1e.html
-== stretchy-munderover-2a.html stretchy-munderover-2a.html
-== stretchy-munderover-2b.html stretchy-munderover-2b.html
-== stretchy-munderover-2c.html stretchy-munderover-2c.html
-== stretchy-munderover-2d.html stretchy-munderover-2d.html
-== stretchy-munderover-2e.html stretchy-munderover-2e.html
-== stretchy-munderover-2f.html stretchy-munderover-2f.html
-== stretchy-munderover-2g.html stretchy-munderover-2g.html
-== stretchy-munderover-3a.html stretchy-munderover-3a.html
-== stretchy-munderover-3b.html stretchy-munderover-3b.html
-== stretchy-munderover-3c.html stretchy-munderover-3c.html
-== stretchy-munderover-3d.html stretchy-munderover-3d.html
-== stretchy-msup-1a.html stretchy-msup-1a.html
-== stretchy-msup-1b.html stretchy-msup-1b.html
-== stretchy-msup-1c.html stretchy-msup-1c.html
-== stretchy-msup-1d.html stretchy-msup-1d.html
-== stretchy-mfenced-1a.html stretchy-mfenced-1a.html
-== stretchy-mfenced-1b.html stretchy-mfenced-1b.html
-== stretchy-mfenced-2a.html stretchy-mfenced-2a.html
-== stretchy-mfenced-2b.html stretchy-mfenced-2b.html
-== stretchy-mfenced-3a.html stretchy-mfenced-3a.html
-== stretchy-mfenced-3b.html stretchy-mfenced-3b.html
-== stretchy-mfenced-4a.html stretchy-mfenced-4a.html
-== stretchy-mfenced-4b.html stretchy-mfenced-4b.html
-== stretchy-mover-1a.html stretchy-mover-1a.html
-== stretchy-mover-1b.html stretchy-mover-1b.html
-== stretchy-mover-2a.html stretchy-mover-2a.html
-== stretchy-mover-2b.html stretchy-mover-2b.html
-== stretchy-mover-3.html stretchy-mover-3.html
-== stretchy-largeop-1.html stretchy-largeop-1.html
-== stretchy-largeop-2.html stretchy-largeop-2.html
-== stretchy-largeop-3.html stretchy-largeop-3.html
-== table-width-1.xhtml table-width-1.xhtml
-== table-width-2.html table-width-2.html
-== table-width-3.html table-width-3.html
-== table-width-4.html table-width-4.html
-== underbar-width-1.xhtml underbar-width-1.xhtml
-skip == mathml-type-supported.xhtml mathml-type-supported.xhtml
-== mtable-align-negative-rownumber.html mtable-align-negative-rownumber.html
-== embellished-op-1-1.html embellished-op-1-1.html
-== embellished-op-1-2.html embellished-op-1-2.html
-== embellished-op-1-3.html embellished-op-1-3.html
-== embellished-op-1-4.html embellished-op-1-4.html
-== embellished-op-1-5.html embellished-op-1-5.html
-== embellished-op-2-1.html embellished-op-2-1.html
-== embellished-op-2-2.html embellished-op-2-2.html
-== embellished-op-2-3.html embellished-op-2-3.html
-== embellished-op-2-4.html embellished-op-2-4.html
-== embellished-op-3-1.html embellished-op-3-1.html
-== embellished-op-3-2.html embellished-op-3-2.html
-== embellished-op-3-3.html embellished-op-3-3.html
-== embellished-op-3-4.html embellished-op-3-4.html
-== embellished-op-3-5.html embellished-op-3-5.html
-== embellished-op-4-1.html embellished-op-4-1.html
-== embellished-op-4-2.html embellished-op-4-2.html
-== embellished-op-4-3.html embellished-op-4-3.html
-== embellished-op-5-1.html embellished-op-5-1.html
-== embellished-op-5-2.html embellished-op-5-2.html
-random-if(winWidget&&!/^Windows\x20NT\x205\.1/.test(http.oscpu)) == semantics-1.xhtml semantics-1.xhtml
-# Windows versions with Cambria Math
-== semantics-2.html semantics-2.html
-== semantics-3.html semantics-3.html
-skip == semantics-4.html semantics-4.html
-== mathcolor-1.xml mathcolor-1.xml
-== mathcolor-2.xml mathcolor-2.xml
-== mathcolor-3.xml mathcolor-3.xml
-== mathcolor-4.xml mathcolor-4.xml
-== mathbackground-1.xml mathbackground-1.xml
-== mathbackground-2.xml mathbackground-2.xml
-== mathbackground-3.xml mathbackground-3.xml
-== mathbackground-4.xml mathbackground-4.xml
-== mstyle-1.xhtml mstyle-1.xhtml
-== mstyle-2.xhtml mstyle-2.xhtml
-== mstyle-3.xhtml mstyle-3.xhtml
-== mstyle-4.xhtml mstyle-4.xhtml
-== mstyle-5.xhtml mstyle-5.xhtml
-# Bug 787215
-== scale-stretchy-1.xhtml scale-stretchy-1.xhtml
-== scale-stretchy-2.xhtml scale-stretchy-2.xhtml
-fails-if(skiaContent&&OSX>=1010) == scale-stretchy-3.xhtml scale-stretchy-3.xhtml
-== scale-stretchy-4.xhtml scale-stretchy-4.xhtml
-== scale-stretchy-5.xhtml scale-stretchy-5.xhtml
-== stretchy-1.html stretchy-1.html
-== mspace-1.html mspace-1.html
-== mpadded-1.html mpadded-1.html
-== mpadded-2.html mpadded-2.html
-== mpadded-3.html mpadded-3.html
-== mpadded-4.html mpadded-4.html
-== mpadded-5.html mpadded-5.html
-== mpadded-1-2.html mpadded-1-2.html
-== mpadded-6.html mpadded-6.html
-fails-if(Mulet) == mpadded-7.html mpadded-7.html
-# MULET: Bug 1144079: Re-enable Mulet mochitests and reftests taskcluster-specific disables
-== mpadded-8.html mpadded-8.html
-== mpadded-9.html mpadded-9.html
-== math-display.html math-display.html
-== scriptlevel-1.html scriptlevel-1.html
-== scriptlevel-movablelimits-1.html scriptlevel-movablelimits-1.html
-== munderover-align-accent-false.html munderover-align-accent-false.html
-== munderover-align-accent-true.html munderover-align-accent-true.html
-== munder-mover-align-accent-true.html munder-mover-align-accent-true.html
-== munder-mover-align-accent-false.html munder-mover-align-accent-false.html
-== mfrac-linethickness-1.xhtml mfrac-linethickness-1.xhtml
-== mfrac-linethickness-2.xhtml mfrac-linethickness-2.xhtml
-== mfrac-linethickness-3.xhtml mfrac-linethickness-3.xhtml
-skip == mathml-negativespace.html mathml-negativespace.html
-== negative-mspace-1.html negative-mspace-1.html
-skip == link-1.xhtml link-1.xhtml
-== munderover-empty-scripts.html munderover-empty-scripts.html
-== positive-namedspace.html positive-namedspace.html
-== mtable-align-whitespace.html mtable-align-whitespace.html
-== mtable-width.html mtable-width.html
-== mtable-rowlines-single-mtable-dynamic.html mtable-rowlines-single-mtable-dynamic.html
-== mtable-rowlines-multi-mtable-dynamic.html mtable-rowlines-multi-mtable-dynamic.html
-== mtable-rowalign-single-mtr.html mtable-rowalign-single-mtr.html
-== mtable-rowalign-single-mtr-dynamic.html mtable-rowalign-single-mtr-dynamic.html
-== mtable-rowalign-single-mtable.html mtable-rowalign-single-mtable.html
-== mtable-rowalign-single-mtable-dynamic.html mtable-rowalign-single-mtable-dynamic.html
-== mtable-rowalign-multi-mtable.html mtable-rowalign-multi-mtable.html
-== mtable-rowalign-multi-mtable-dynamic.html mtable-rowalign-multi-mtable-dynamic.html
-== mtable-columnlines-single-mtable-dynamic.html mtable-columnlines-single-mtable-dynamic.html
-== mtable-columnlines-multi-mtable-dynamic.html mtable-columnlines-multi-mtable-dynamic.html
-== mtable-columnalign-single-mtr.html mtable-columnalign-single-mtr.html
-== mtable-columnalign-single-mtr-dynamic.html mtable-columnalign-single-mtr-dynamic.html
-== mtable-columnalign-single-mtable.html mtable-columnalign-single-mtable.html
-== mtable-columnalign-single-mtable-dynamic.html mtable-columnalign-single-mtable-dynamic.html
-== mtable-columnalign-multi-mtr.html mtable-columnalign-multi-mtr.html
-== mtable-columnalign-multi-mtr-dynamic.html mtable-columnalign-multi-mtr-dynamic.html
-== mtable-columnalign-multi-mtable.html mtable-columnalign-multi-mtable.html
-== mtable-columnalign-multi-mtable-dynamic.html mtable-columnalign-multi-mtable-dynamic.html
-== maction-selection.html maction-selection.html
-== maction-dynamic-embellished-op.html maction-dynamic-embellished-op.html
-skip-if(B2G||Mulet) == maction-dynamic-1.html maction-dynamic-1.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== maction-dynamic-2.html maction-dynamic-2.html
-== mo-lspace-rspace.html mo-lspace-rspace.html
-== mo-lspace-rspace-2.html mo-lspace-rspace-2.html
-== mo-lspace-rspace-3.html mo-lspace-rspace-3.html
-== mo-lspace-rspace-4.html mo-lspace-rspace-4.html
-== mo-invisibleoperators.html mo-invisibleoperators.html
-== mo-invisibleoperators-2.html mo-invisibleoperators-2.html
-== mo-glyph-size.html mo-glyph-size.html
-skip-if(B2G||Mulet) == maction-dynamic-3.html maction-dynamic-3.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== whitespace-trim-1.html whitespace-trim-1.html
-== whitespace-trim-2.html whitespace-trim-2.html
-== whitespace-trim-3.html whitespace-trim-3.html
-== whitespace-trim-4.html whitespace-trim-4.html
-# Bug 787215
-== whitespace-trim-5.html whitespace-trim-5.html
-random-if(winWidget&&!d2d) == opentype-stretchy.html opentype-stretchy.html
-== opentype-fraction-dynamic-linethickness.html opentype-fraction-dynamic-linethickness.html
-== operator-1.xhtml operator-1.xhtml
-== scriptshift-1.xhtml scriptshift-1.xhtml
-== number-size-1.xhtml number-size-1.xhtml
-random-if((B2G&&browserIsRemote)||Mulet) fails-if(winWidget&&/^Windows\x20NT\x205\.1/.test(http.oscpu)) fuzzy-if(skiaContent,1,80) == multiscripts-1.html multiscripts-1.html
-# B2G - slight height variation from font metrics
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip == mathml-mmultiscript-base.html mathml-mmultiscript-base.html
-== mathml-mmultiscript-mprescript.html mathml-mmultiscript-mprescript.html
-== menclose-1a.html menclose-1a.html
-== menclose-1b.html menclose-1b.html
-== menclose-1c.html menclose-1c.html
-== menclose-1d.html menclose-1d.html
-== menclose-1e.html menclose-1e.html
-== menclose-1f.html menclose-1f.html
-== menclose-1g.html menclose-1g.html
-== menclose-1h.html menclose-1h.html
-== menclose-1i.html menclose-1i.html
-== menclose-1j.html menclose-1j.html
-skip == menclose-1k.html menclose-1k.html
-== menclose-1l.html menclose-1l.html
-== menclose-1m.html menclose-1m.html
-== menclose-1n.html menclose-1n.html
-== menclose-1o.html menclose-1o.html
-== menclose-1p.html menclose-1p.html
-== menclose-1q.html menclose-1q.html
-fails-if(B2G) == menclose-2-actuarial.html menclose-2-actuarial.html
-# B2G slight thickness variation
-== menclose-2-bottom.html menclose-2-bottom.html
-fails-if(B2G) == menclose-2-box.html menclose-2-box.html
-# B2G slight thickness variation
-== menclose-2-circle.html menclose-2-circle.html
-== menclose-2-downdiagonalstrike.html menclose-2-downdiagonalstrike.html
-== menclose-2-horizontalstrike.html menclose-2-horizontalstrike.html
-fails-if(B2G) == menclose-2-left.html menclose-2-left.html
-# B2G slight thickness variation
-fuzzy-if(skiaContent,80,5) == menclose-2-longdiv.html menclose-2-longdiv.html
-== menclose-2-right.html menclose-2-right.html
-fails-if(B2G) == menclose-2-roundedbox.html menclose-2-roundedbox.html
-# B2G slight thickness variation
-fails-if(B2G) == menclose-2-top.html menclose-2-top.html
-# B2G slight thickness variation
-fails-if(B2G) == menclose-2-updiagonalarrow.html menclose-2-updiagonalarrow.html
-# B2G slight thickness variation
-== menclose-2-updiagonalstrike.html menclose-2-updiagonalstrike.html
-== menclose-2-verticalstrike.html menclose-2-verticalstrike.html
-fails-if(B2G) == menclose-2-roundedbox.html menclose-2-roundedbox.html
-# B2G slight thickness variation
-== menclose-2-phasorangle.html menclose-2-phasorangle.html
-== menclose-3-box.html menclose-3-box.html
-== menclose-3-madruwb.html menclose-3-madruwb.html
-fails-if(B2G||Android||OSX==1006) == menclose-3-radical.html menclose-3-radical.html
-# Bug 973917
-== menclose-3-default.html menclose-3-default.html
-== menclose-3-invalid.html menclose-3-invalid.html
-== menclose-3-multiple.html menclose-3-multiple.html
-== menclose-3-unknown.html menclose-3-unknown.html
-== menclose-4.html menclose-4.html
-== menclose-5-actuarial.html menclose-5-actuarial.html
-== menclose-5-bottom.html menclose-5-bottom.html
-== menclose-5-box.html menclose-5-box.html
-fails fuzzy-if(OSX,1,100) fuzzy-if(skiaContent,1,2) == menclose-5-circle.html menclose-5-circle.html
-fuzzy-if(d2d,7,1) == menclose-5-downdiagonalstrike.html menclose-5-downdiagonalstrike.html
-== menclose-5-horizontalstrike.html menclose-5-horizontalstrike.html
-== menclose-5-left.html menclose-5-left.html
-== menclose-5-longdiv.html menclose-5-longdiv.html
-== menclose-5-madruwb.html menclose-5-madruwb.html
-== menclose-5-radical.html menclose-5-radical.html
-== menclose-5-right.html menclose-5-right.html
-fails fuzzy-if(skiaContent,5,5) == menclose-5-roundedbox.html menclose-5-roundedbox.html
-== menclose-5-top.html menclose-5-top.html
-skip fuzzy-if(skiaContent,1,1) == menclose-5-updiagonalarrow.html menclose-5-updiagonalarrow.html
-fuzzy-if(d2d,7,1) == menclose-5-updiagonalstrike.html menclose-5-updiagonalstrike.html
-== menclose-5-verticalstrike.html menclose-5-verticalstrike.html
-== menclose-5-phasorangle.html menclose-5-phasorangle.html
-== menclose-6-actuarial.html menclose-6-actuarial.html
-== menclose-6-bottom.html menclose-6-bottom.html
-== menclose-6-box.html menclose-6-box.html
-fails fuzzy-if(skiaContent,1,2) == menclose-6-circle.html menclose-6-circle.html
-fuzzy-if(d2d,7,1) == menclose-6-downdiagonalstrike.html menclose-6-downdiagonalstrike.html
-== menclose-6-horizontalstrike.html menclose-6-horizontalstrike.html
-== menclose-6-left.html menclose-6-left.html
-== menclose-6-longdiv.html menclose-6-longdiv.html
-== menclose-6-madruwb.html menclose-6-madruwb.html
-== menclose-6-radical.html menclose-6-radical.html
-== menclose-6-right.html menclose-6-right.html
-fails fuzzy-if(skiaContent,2,3) == menclose-6-roundedbox.html menclose-6-roundedbox.html
-== menclose-6-top.html menclose-6-top.html
-skip == menclose-6-updiagonalarrow.html menclose-6-updiagonalarrow.html
-fuzzy-if(d2d,7,1) == menclose-6-updiagonalstrike.html menclose-6-updiagonalstrike.html
-== menclose-6-verticalstrike.html menclose-6-verticalstrike.html
-== menclose-6-phasorangle.html menclose-6-phasorangle.html
-== mmultiscript-align.html mmultiscript-align.html
-fails-if(winWidget&&!/^Windows\x20NT\x205\.1/.test(http.oscpu)) == subscript-italic-correction.html subscript-italic-correction.html
-# Windows versions with Cambria Math, bug 961482
-fails-if(B2G||Android||/^Windows\x20NT\x205\.1/.test(http.oscpu)||OSX==1006) == mathvariant-1a.html mathvariant-1a.html
-# Bug 1010679
-fails-if(B2G||Android||/^Windows\x20NT\x205\.1/.test(http.oscpu)||OSX==1006) == mathvariant-1b.html mathvariant-1b.html
-# Bug 1010679
-fails-if(B2G||Android||/^Windows\x20NT\x205\.1/.test(http.oscpu)||OSX==1006) == mathvariant-1c.html mathvariant-1c.html
-# Bug 1010679
-== mathvariant-1d.html mathvariant-1d.html
-fails-if(B2G||Mulet||Android||/^Windows\x20NT\x205\.1/.test(http.oscpu)||OSX) == mathvariant-2.html mathvariant-2.html
-# Bugs 1010678, 1010679
-== mathvariant-3.html mathvariant-3.html
-== mathvariant-4.html mathvariant-4.html
-== mathvariant-5.html mathvariant-5.html
-== dtls-1.html dtls-1.html
-== dtls-2.html dtls-2.html
-== dtls-3.html dtls-3.html
-== ssty-1.html ssty-1.html
-== ssty-2.html ssty-2.html
-== ssty-3.html ssty-3.html
-== ssty-4.html ssty-4.html
-== mathscript-1.html mathscript-1.html
-== mathscript-2.html mathscript-2.html
-== mo-accent-dynamic.html mo-accent-dynamic.html
-== mo-movablelimits-dynamic.html mo-movablelimits-dynamic.html
-== munderover-accent-dynamic.html munderover-accent-dynamic.html
-== munderover-accentunder-dynamic.html munderover-accentunder-dynamic.html
-== columnlines-1a.html columnlines-1a.html
-== columnlines-1b.html columnlines-1b.html
-== columnlines-1c.html columnlines-1c.html
-== columnlines-2a.html columnlines-2a.html
-== columnlines-2b.html columnlines-2b.html
-== columnlines-3-1.html columnlines-3-1.html
-== columnlines-3-2.html columnlines-3-2.html
-== rowlines-1a.html rowlines-1a.html
-== rowlines-1b.html rowlines-1b.html
-== rowlines-1c.html rowlines-1c.html
-== rowlines-2a.html rowlines-2a.html
-== rowlines-2b.html rowlines-2b.html
-== rowlines-3-1.html rowlines-3-1.html
-== rowlines-3-2.html rowlines-3-2.html
-== tablespacing-1.html tablespacing-1.html
-== tablespacing-2.html tablespacing-2.html
-== tablespacing-3.html tablespacing-3.html
-== tablespacing-4.html tablespacing-4.html
-== tablespacing-5.html tablespacing-5.html
-== tablespacing-5a.html tablespacing-5a.html
-== tablespacing-6.html tablespacing-6.html
-== tablespacing-7.html tablespacing-7.html
-== tablespacing-8a.html tablespacing-8a.html
-== tablespacing-8b.html tablespacing-8b.html
-== op-dict-1.html op-dict-1.html
-== op-dict-2.html op-dict-2.html
-== op-dict-3.html op-dict-3.html
-== op-dict-4.html op-dict-4.html
-== op-dict-5.html op-dict-5.html
-== op-dict-6.html op-dict-6.html
-== op-dict-7.html op-dict-7.html
-== op-dict-8.html op-dict-8.html
-== op-dict-9.html op-dict-9.html
-== op-dict-10.html op-dict-10.html
-== op-dict-11.html op-dict-11.html
-== op-dict-12.html op-dict-12.html
-== op-dict-13.html op-dict-13.html
-== mfrac-A-1.html mfrac-A-1.html
-== mfrac-A-2.html mfrac-A-2.html
-== mfrac-A-3.html mfrac-A-3.html
-== mfrac-A-4.html mfrac-A-4.html
-== mfrac-A-5.html mfrac-A-5.html
-== mfrac-A-6.html mfrac-A-6.html
-== mfrac-A-7.html mfrac-A-7.html
-== mfrac-A-8.html mfrac-A-8.html
-== mfrac-B-1.html mfrac-B-1.html
-== mfrac-B-2.html mfrac-B-2.html
-== mfrac-B-3.html mfrac-B-3.html
-== mfrac-B-4.html mfrac-B-4.html
-== mfrac-B-5.html mfrac-B-5.html
-== mfrac-B-6.html mfrac-B-6.html
-== mfrac-B-7.html mfrac-B-7.html
-fuzzy-if(OSX,1,100) fuzzy-if(skiaContent,1,14) == mfrac-C-1.html mfrac-C-1.html
-== mfrac-C-2.html mfrac-C-2.html
-== mfrac-C-3.html mfrac-C-3.html
-== mfrac-C-4.html mfrac-C-4.html
-fuzzy-if(OSX,1,100) fuzzy-if(skiaContent,1,14) == mfrac-D-1.html mfrac-D-1.html
-== mfrac-D-2.html mfrac-D-2.html
-== mfrac-D-3.html mfrac-D-3.html
-== mfrac-D-4.html mfrac-D-4.html
-== mfrac-E-1.html mfrac-E-1.html
-skip == shadow-dom-1.html shadow-dom-1.html
-pref(font.size.inflation.emPerLine,25) == font-inflation-1.html font-inflation-1.html
-test-pref(font.minimum-size.x-math,40) == default-font.html default-font.html
-== radicalbar-1.html radicalbar-1.html
-== radicalbar-1a.html radicalbar-1a.html
-== radicalbar-1b.html radicalbar-1b.html
-== radicalbar-1c.html radicalbar-1c.html
-== radicalbar-1d.html radicalbar-1d.html
-== radicalbar-2.html radicalbar-2.html
-== radicalbar-2a.html radicalbar-2a.html
-== radicalbar-2b.html radicalbar-2b.html
-== radicalbar-2c.html radicalbar-2c.html
-== radicalbar-2d.html radicalbar-2d.html
-== radicalbar-3.html radicalbar-3.html
-== radicalbar-3a.html radicalbar-3a.html
-== radicalbar-3b.html radicalbar-3b.html
-== radicalbar-3c.html radicalbar-3c.html
-== radicalbar-3d.html radicalbar-3d.html
diff --git a/layout/reftests/mathml/reftest.list b/layout/reftests/mathml/reftest.list
index f45cc20f6..6b6445ed6 100644
--- a/layout/reftests/mathml/reftest.list
+++ b/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) == mirror-op-1.html mirror-op-1-ref.html
+fuzzy(255,200) == 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
@@ -242,7 +242,7 @@ random-if(gtkWidget) == menclose-2-roundedbox.html menclose-2-roundedbox-ref.htm
== menclose-2-phasorangle.html menclose-2-phasorangle-ref.html
== menclose-3-box.html menclose-3-box-ref.html
== menclose-3-madruwb.html menclose-3-madruwb-ref.html
-fails-if(Android||OSX==1006) == menclose-3-radical.html menclose-3-radical-ref.html # Bug 973917
+fails-if(OSX==1006) == menclose-3-radical.html menclose-3-radical-ref.html # Bug 973917
== menclose-3-default.html menclose-3-default-ref.html
== menclose-3-invalid.html menclose-3-invalid-ref.html
== menclose-3-multiple.html menclose-3-multiple-ref.html
@@ -283,12 +283,12 @@ fuzzy-if(d2d,7,1) == menclose-6-updiagonalstrike.html menclose-6-ref.html
== menclose-6-verticalstrike.html menclose-6-ref.html
== menclose-6-phasorangle.html menclose-6-ref.html
== mmultiscript-align.html mmultiscript-align-ref.html
-fails-if(winWidget&&!/^Windows\x20NT\x205\.1/.test(http.oscpu)) == subscript-italic-correction.html subscript-italic-correction-ref.html # Windows versions with Cambria Math, bug 961482
-fails-if(Android||/^Windows\x20NT\x205\.1/.test(http.oscpu)||OSX==1006) == mathvariant-1a.html mathvariant-1a-ref.html # Bug 1010679
-fails-if(Android||/^Windows\x20NT\x205\.1/.test(http.oscpu)||OSX==1006) == mathvariant-1b.html mathvariant-1b-ref.html # Bug 1010679
-fails-if(Android||/^Windows\x20NT\x205\.1/.test(http.oscpu)||OSX==1006) == mathvariant-1c.html mathvariant-1c-ref.html # Bug 1010679
+fails-if(winWidget) == subscript-italic-correction.html subscript-italic-correction-ref.html # Windows versions with Cambria Math, bug 961482
+fails-if(OSX==1006) == mathvariant-1a.html mathvariant-1a-ref.html # Bug 1010679
+fails-if(OSX==1006) == mathvariant-1b.html mathvariant-1b-ref.html # Bug 1010679
+fails-if(OSX==1006) == mathvariant-1c.html mathvariant-1c-ref.html # Bug 1010679
== mathvariant-1d.html mathvariant-1d-ref.html
-fails-if(Android||/^Windows\x20NT\x205\.1/.test(http.oscpu)||OSX) == mathvariant-2.html mathvariant-2-ref.html # Bugs 1010678, 1010679
+fails-if(OSX) == mathvariant-2.html mathvariant-2-ref.html # Bug 1010679
== mathvariant-3.html mathvariant-3-ref.html
== mathvariant-4.html mathvariant-4-ref.html
== mathvariant-5.html mathvariant-5-ref.html
diff --git a/layout/reftests/mathml/rowlines-1-ref.html b/layout/reftests/mathml/rowlines-1-ref.html
index e5ea01a7d..8556fb1be 100644
--- a/layout/reftests/mathml/rowlines-1-ref.html
+++ b/layout/reftests/mathml/rowlines-1-ref.html
@@ -1,5 +1,4 @@
<!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- -->
-<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: -->
<!DOCTYPE html>
<html>
<head>
diff --git a/layout/reftests/mathml/rowlines-1a.html b/layout/reftests/mathml/rowlines-1a.html
index 51073e3d5..023dc151d 100644
--- a/layout/reftests/mathml/rowlines-1a.html
+++ b/layout/reftests/mathml/rowlines-1a.html
@@ -1,5 +1,4 @@
<!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- -->
-<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: -->
<!DOCTYPE html>
<html>
<head>
diff --git a/layout/reftests/mathml/rowlines-1b.html b/layout/reftests/mathml/rowlines-1b.html
index 860edda59..b41b6dac7 100644
--- a/layout/reftests/mathml/rowlines-1b.html
+++ b/layout/reftests/mathml/rowlines-1b.html
@@ -1,5 +1,4 @@
<!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- -->
-<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: -->
<!DOCTYPE html>
<html>
<head>
diff --git a/layout/reftests/mathml/rowlines-1c.html b/layout/reftests/mathml/rowlines-1c.html
index dd51f155f..53bacf25c 100644
--- a/layout/reftests/mathml/rowlines-1c.html
+++ b/layout/reftests/mathml/rowlines-1c.html
@@ -1,5 +1,4 @@
<!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- -->
-<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: -->
<!DOCTYPE html>
<html>
<head>
diff --git a/layout/reftests/mathml/rowlines-2-ref.html b/layout/reftests/mathml/rowlines-2-ref.html
index f66962bad..d2dd4e444 100644
--- a/layout/reftests/mathml/rowlines-2-ref.html
+++ b/layout/reftests/mathml/rowlines-2-ref.html
@@ -1,5 +1,4 @@
<!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- -->
-<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: -->
<!DOCTYPE html>
<html>
<head>
diff --git a/layout/reftests/mathml/rowlines-2a.html b/layout/reftests/mathml/rowlines-2a.html
index 2dfa6cb04..058d39aa1 100644
--- a/layout/reftests/mathml/rowlines-2a.html
+++ b/layout/reftests/mathml/rowlines-2a.html
@@ -1,5 +1,4 @@
<!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- -->
-<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: -->
<!DOCTYPE html>
<html>
<head>
diff --git a/layout/reftests/mathml/rowlines-2b.html b/layout/reftests/mathml/rowlines-2b.html
index 3489239d1..de973b547 100644
--- a/layout/reftests/mathml/rowlines-2b.html
+++ b/layout/reftests/mathml/rowlines-2b.html
@@ -1,5 +1,4 @@
<!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- -->
-<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: -->
<!DOCTYPE html>
<html>
<head>
diff --git a/layout/reftests/mathml/rowlines-3-1-ref.html b/layout/reftests/mathml/rowlines-3-1-ref.html
index 9f292f7ce..4f6f70af3 100644
--- a/layout/reftests/mathml/rowlines-3-1-ref.html
+++ b/layout/reftests/mathml/rowlines-3-1-ref.html
@@ -1,5 +1,4 @@
<!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- -->
-<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: -->
<!DOCTYPE html>
<html>
<head>
diff --git a/layout/reftests/mathml/rowlines-3-1.html b/layout/reftests/mathml/rowlines-3-1.html
index e40b2b7fa..c9af50dc1 100644
--- a/layout/reftests/mathml/rowlines-3-1.html
+++ b/layout/reftests/mathml/rowlines-3-1.html
@@ -1,5 +1,4 @@
<!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- -->
-<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: -->
<!DOCTYPE html>
<html>
<head>
diff --git a/layout/reftests/mathml/rowlines-3-2-ref.html b/layout/reftests/mathml/rowlines-3-2-ref.html
index 01fe8ad0d..94dff55d5 100644
--- a/layout/reftests/mathml/rowlines-3-2-ref.html
+++ b/layout/reftests/mathml/rowlines-3-2-ref.html
@@ -1,5 +1,4 @@
<!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- -->
-<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: -->
<!DOCTYPE html>
<html>
<head>
diff --git a/layout/reftests/mathml/rowlines-3-2.html b/layout/reftests/mathml/rowlines-3-2.html
index 685970faf..e2e9267ae 100644
--- a/layout/reftests/mathml/rowlines-3-2.html
+++ b/layout/reftests/mathml/rowlines-3-2.html
@@ -1,5 +1,4 @@
<!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- -->
-<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: -->
<!DOCTYPE html>
<html>
<head>
diff --git a/layout/reftests/mathml/shadow-dom-1.html b/layout/reftests/mathml/shadow-dom-1.html
index 547253a3c..bbf27069f 100644
--- a/layout/reftests/mathml/shadow-dom-1.html
+++ b/layout/reftests/mathml/shadow-dom-1.html
@@ -7,9 +7,11 @@
<script>
function insertShadowMathML() {
var x = document.getElementById("x");
- x.createShadowRoot();
- x.shadowRoot.innerHTML =
- '<math><msup><mi>X</mi><mi>X</mi></msup></math>';
+ if (x.createShadowRoot) {
+ x.createShadowRoot();
+ x.shadowRoot.innerHTML =
+ '<math><msup><mi>X</mi><mi>X</mi></msup></math>';
+ }
document.documentElement.removeAttribute("class");
}
window.addEventListener("MozReftestInvalidate", insertShadowMathML, false);
diff --git a/layout/reftests/mathml/tablespacing-8-ref.html b/layout/reftests/mathml/tablespacing-8-ref.html
index a39c15b3d..4c4b1c28f 100644
--- a/layout/reftests/mathml/tablespacing-8-ref.html
+++ b/layout/reftests/mathml/tablespacing-8-ref.html
@@ -1,5 +1,4 @@
<!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- -->
-<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: -->
<!DOCTYPE html>
<html>
<body>
diff --git a/layout/reftests/mathml/tablespacing-8a.html b/layout/reftests/mathml/tablespacing-8a.html
index 3e2b42c9e..bbdbb4de0 100644
--- a/layout/reftests/mathml/tablespacing-8a.html
+++ b/layout/reftests/mathml/tablespacing-8a.html
@@ -1,5 +1,4 @@
<!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- -->
-<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: -->
<!DOCTYPE html>
<html>
<body>
diff --git a/layout/reftests/mathml/tablespacing-8b.html b/layout/reftests/mathml/tablespacing-8b.html
index db29f12b5..8228866b8 100644
--- a/layout/reftests/mathml/tablespacing-8b.html
+++ b/layout/reftests/mathml/tablespacing-8b.html
@@ -1,5 +1,4 @@
<!-- -*- mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- -->
-<!-- vim: set tabstop=2 expandtab shiftwidth=2 textwidth=80: -->
<!DOCTYPE html>
<html>
<body>
diff --git a/layout/reftests/moz.build b/layout/reftests/moz.build
index 3ab3d4246..6a59cb097 100644
--- a/layout/reftests/moz.build
+++ b/layout/reftests/moz.build
@@ -1,5 +1,4 @@
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/layout/reftests/mp4-video/reftest-stylo.list b/layout/reftests/mp4-video/reftest-stylo.list
deleted file mode 100644
index c1483ac47..000000000
--- a/layout/reftests/mp4-video/reftest-stylo.list
+++ /dev/null
@@ -1,2 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-skip-if(B2G||Mulet||winWidget) == canvas-1.xhtml canvas-1.xhtml
diff --git a/layout/reftests/native-theme/reftest-stylo.list b/layout/reftests/native-theme/reftest-stylo.list
deleted file mode 100644
index f5cf1b75a..000000000
--- a/layout/reftests/native-theme/reftest-stylo.list
+++ /dev/null
@@ -1,88 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-skip == button-html-not-blank.html button-html-not-blank.html
-skip == button-not-blank.html button-not-blank.html
-skip == checkbox-not-blank.html checkbox-not-blank.html
-skip == combobox-not-blank.html combobox-not-blank.html
-skip == fieldset-not-blank.html fieldset-not-blank.html
-skip == file-not-blank.html file-not-blank.html
-skip == listbox-not-blank.html listbox-not-blank.html
-skip == radio-not-blank.html radio-not-blank.html
-skip == text-control-not-blank.html text-control-not-blank.html
-skip == textarea-not-blank.html textarea-not-blank.html
-
-# The following tests will fail if the platform does not have native
-# theme support (which all platforms should have).
-fails-if(!nativeThemePref) == text-input-native.html text-input-native.html
-fails fuzzy-if(skiaContent,2,88) == text-input-nonnative-when-styled.html text-input-nonnative-when-styled.html
-fails-if(!nativeThemePref) == textarea-native.html textarea-native.html
-fails fuzzy-if(skiaContent,2,53) == textarea-nonnative-when-styled.html textarea-nonnative-when-styled.html
-fails-if(!nativeThemePref) == button-native.html button-native.html
-== button-nonnative-when-styled.html button-nonnative-when-styled.html
-skip fails-if(!nativeThemePref&&!Android) == combobox-native.html combobox-native.html
-== combobox-nonnative-when-styled.html combobox-nonnative-when-styled.html
-fails-if(!nativeThemePref) needs-focus == listbox-native.html listbox-native.html
-needs-focus == listbox-nonnative-when-styled.html listbox-nonnative-when-styled.html
-fails-if(!nativeThemePref) == radio-native.html radio-native.html
-== radio-still-native-when-styled.html radio-still-native-when-styled.html
-fails-if(!nativeThemePref) == checkbox-native.html checkbox-native.html
-== checkbox-still-native-when-styled.html checkbox-still-native-when-styled.html
-== native-theme-disabled-cascade-levels.html native-theme-disabled-cascade-levels.html
-
-== 427122-1.html 427122-1.html
-
-# 403458 is a Windows-only bug
-skip-if(!winWidget) == 403458-winmenu-ltr.xul 403458-winmenu-ltr.xul
-
-== 470711-1.xul 470711-1.xul
-
-== 482955-1.xul 482955-1.xul
-
-== 492155-1.html 492155-1.html
-== 492155-2.html 492155-2.html
-== 492155-3.html 492155-3.html
-fails-if(Android&&!asyncPan) == 492155-4.html 492155-4.html
-
-== box-shadow-input.html box-shadow-input.html
-== box-shadow-button.html box-shadow-button.html
-== box-shadow-listbox.html box-shadow-listbox.html
-== box-shadow-combobox.html box-shadow-combobox.html
-
-# RTL mirroring tests
-== checkbox-not-mirrored-when-rtl.html checkbox-not-mirrored-when-rtl.html
-skip-if(!cocoaWidget) == menulist-mirrored-when-rtl.xul menulist-mirrored-when-rtl.xul
-skip-if(!cocoaWidget) == searchfield-mirrored-when-rtl.xul searchfield-mirrored-when-rtl.xul
-skip-if(!cocoaWidget) == select-mirrored-when-rtl.html select-mirrored-when-rtl.html
-
-== resizer-bottomend.xul resizer-bottomend.xul
-random-if(d2d) == resizer-bottomend.xul resizer-bottomend.xul
-# bug 581086
-== resizer-bottomend.xul resizer-bottomend.xul
-skip-if(gtkWidget) == resizer-bottomend-rtl.xul resizer-bottomend-rtl.xul
-skip-if(gtkWidget) random-if(d2d) == resizer-bottomend-rtl.xul resizer-bottomend-rtl.xul
-# bug 581086
-
-== resizer-bottomstart.xul resizer-bottomstart.xul
-random-if(d2d) == resizer-bottomstart.xul resizer-bottomstart.xul
-random-if(d2d) == resizer-bottomstart.xul resizer-bottomstart.xul
-== resizer-bottomstart.xul resizer-bottomstart.xul
-skip-if(gtkWidget) == resizer-bottomstart-rtl.xul resizer-bottomstart-rtl.xul
-skip-if(gtkWidget) random-if(d2d) == resizer-bottomstart-rtl.xul resizer-bottomstart-rtl.xul
-
-# Windows-only, depends on native scrollbar metrics
-skip-if(!winWidget) == scroll-thumb-minimum-size-notheme.html scroll-thumb-minimum-size-notheme.html
-# skip-if(!winWidget) == scroll-thumb-minimum-size-theme.html scroll-thumb-minimum-size-theme.html
-# Bug 512206
-
-== border-radius.html border-radius.html
-
-== checkbox-dynamic-1.html checkbox-dynamic-1.html
-
-# These tests have been written to test the overflow of the window widget
-# (bug 568825) but we can't test it on Windows and Cocoa because they have
-# animated progress bars.
-# Nothing shows up on Android, presumably because that appearance type is
-# not implemented.
-skip-if(cocoaWidget) skip-if(winWidget) == progress-overflow.html progress-overflow.html
-fails-if(Android) skip-if(cocoaWidget) skip-if(winWidget) == progress-overflow-small.html progress-overflow-small.html
-
-== 676387-1.xul 676387-1.xul
diff --git a/layout/reftests/native-theme/reftest.list b/layout/reftests/native-theme/reftest.list
index c2df3caaa..c2a000ffa 100644
--- a/layout/reftests/native-theme/reftest.list
+++ b/layout/reftests/native-theme/reftest.list
@@ -17,7 +17,7 @@ fails-if(!nativeThemePref) != textarea-native.html textarea-nonnative.html
fuzzy-if(skiaContent,2,53) == textarea-nonnative-when-styled.html textarea-nonnative-when-styled-ref.html
fails-if(!nativeThemePref) != button-native.html button-nonnative.html
== button-nonnative-when-styled.html button-nonnative-when-styled-ref.html
-fails-if(!nativeThemePref&&!Android) != combobox-native.html combobox-nonnative.html
+fails-if(!nativeThemePref) != combobox-native.html combobox-nonnative.html
== combobox-nonnative-when-styled.html combobox-nonnative-when-styled-ref.html
fails-if(!nativeThemePref) needs-focus != listbox-native.html listbox-nonnative.html
needs-focus == listbox-nonnative-when-styled.html listbox-nonnative-when-styled-ref.html
@@ -39,7 +39,7 @@ skip-if(!winWidget) != 403458-winmenu-ltr.xul 403458-winmenu-rtl.xul
== 492155-1.html about:blank
== 492155-2.html about:blank
== 492155-3.html about:blank
-fails-if(Android&&!asyncPan) != 492155-4.html about:blank
+!= 492155-4.html about:blank
!= box-shadow-input.html box-shadow-input-ref.html
!= box-shadow-button.html box-shadow-button-ref.html
@@ -76,9 +76,7 @@ skip-if(!winWidget) == scroll-thumb-minimum-size-notheme.html scroll-thumb-minim
# These tests have been written to test the overflow of the window widget
# (bug 568825) but we can't test it on Windows and Cocoa because they have
# animated progress bars.
-# Nothing shows up on Android, presumably because that appearance type is
-# not implemented.
skip-if(cocoaWidget) skip-if(winWidget) == progress-overflow.html progress-overflow-ref.html
-fails-if(Android) skip-if(cocoaWidget) skip-if(winWidget) != progress-overflow-small.html progress-nobar.html
+skip-if(cocoaWidget) skip-if(winWidget) != progress-overflow-small.html progress-nobar.html
== 676387-1.xul 676387-1-ref.xul
diff --git a/layout/reftests/object/reftest-stylo.list b/layout/reftests/object/reftest-stylo.list
deleted file mode 100644
index 629e954f4..000000000
--- a/layout/reftests/object/reftest-stylo.list
+++ /dev/null
@@ -1,60 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== no-attrs.html no-attrs.html
-random HTTP == 404-data.html 404-data.html
-random HTTP == 404-data-with-type.html 404-data-with-type.html
-random == page-as-data.html page-as-data.html
-random == page-as-data-with-type.html page-as-data-with-type.html
-random == connection-refused.html connection-refused.html
-== image.html image.html
-== image-with-type.html image-with-type.html
-random == image-no-useful-extension-typesniff.html image-no-useful-extension-typesniff.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails == image-no-useful-extension-with-type.html image-no-useful-extension-with-type.html
-#
-# This test must be run on an HTTP server because it relies on the HTTP
-# Content-Type overriding the type specified by the attribute on the object,
-# but when run from a local file the type attribute will override the
-# content-sniffed assumed type (text/html based entirely on the extension).
-#
-random HTTP == type-overridden-by-server.html type-overridden-by-server.html
-#
-# XXX missing tests 012-015 from http://biesi.damowmow.com/object/ here; need
-# a controllable HTTP server (or preferably one run on the test machine)
-# to add them
-#
-== malformed-should-fallback.html malformed-should-fallback.html
-== malformed-with-type.html malformed-with-type.html
-#
-# XXX missing tests 018-021 from http://biesi.damowmow.com/object/ here; need
-# a controllable HTTP server (or preferably one run on the test machine)
-# to add them
-#
-== unknown-type.html unknown-type.html
-== malformed-xml.html malformed-xml.html
-== malformed-xml-with-type.html malformed-xml-with-type.html
-#
-# XXX missing tests 025-28 from http://biesi.damowmow.com/object/ here; would
-# need to require Flash on the test machine to run them
-#
-# XXX need to support <img src="foo.svg"> for these to pass
-random == svg.html svg.html
-== svg-with-type.html svg-with-type.html
-#
-# XXX missing test 031 from http://biesi.damowmow.com/object/ here; need to
-# first support the standby attribute on objects, then need to figure out
-# how to reproduce the setup needed for that test such that reftest will
-# handle it correctly, since a still-loading image probably delays the
-# snapshot reftest takes
-#
-# XXX missing test 032 from http://biesi.damowmow.com/object/ here; would
-# need to require Java on test machine to run it
-#
-# XXX missing test 033 from http://biesi.damowmow.com/object/ here; not sure
-# how nullplugin testing should work
-#
-#
-# XXX missing test 034 from http://biesi.damowmow.com/object/ here; would
-# need to require Flash on the test machine to run them
-#
-== malformed-uri.html malformed-uri.html
diff --git a/layout/reftests/object/reftest.list b/layout/reftests/object/reftest.list
index 1437c897c..0b22c0ffa 100644
--- a/layout/reftests/object/reftest.list
+++ b/layout/reftests/object/reftest.list
@@ -6,7 +6,7 @@ HTTP == 404-data-with-type.html 404-data-with-type-ref.html
== connection-refused.html connection-refused-ref.html
== image.html image-ref.html
== image-with-type.html image-with-type-ref.html
-fails-if(Android) == image-no-useful-extension-typesniff.html image-no-useful-extension-typesniff-ref.html
+== image-no-useful-extension-typesniff.html image-no-useful-extension-typesniff-ref.html
== image-no-useful-extension-with-type.html image-no-useful-extension-with-type-ref.html
#
# This test must be run on an HTTP server because it relies on the HTTP
diff --git a/layout/reftests/ogg-video/reftest-stylo.list b/layout/reftests/ogg-video/reftest-stylo.list
deleted file mode 100644
index e59d9d534..000000000
--- a/layout/reftests/ogg-video/reftest-stylo.list
+++ /dev/null
@@ -1,65 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# NOTE: bug 1084564 covers "fails"/"skip" annotations for b2g/android below:
-== 444-1.html 444-1.html
-fails-if(Android||B2G||Mulet) HTTP(..) == aspect-ratio-1a.xhtml aspect-ratio-1a.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(Android||B2G||Mulet) HTTP(..) == aspect-ratio-1b.xhtml aspect-ratio-1b.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(Android||B2G||Mulet) skip-if(gtkWidget) HTTP(..) == aspect-ratio-2a.xhtml aspect-ratio-2a.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(Android||B2G||Mulet) skip-if(gtkWidget) HTTP(..) == aspect-ratio-2b.xhtml aspect-ratio-2b.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-HTTP(..) == aspect-ratio-3a.xhtml aspect-ratio-3a.xhtml
-HTTP(..) == aspect-ratio-3b.xhtml aspect-ratio-3b.xhtml
-fails-if(Android||B2G||Mulet) random-if(layersGPUAccelerated) == encoded-aspect-ratio-1.html encoded-aspect-ratio-1.html
-# bug 623460 for WinXP
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(Android||B2G||Mulet) HTTP(..) == basic-1.xhtml basic-1.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(Android||B2G||Mulet) HTTP(..) == canvas-1a.xhtml canvas-1a.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(Android||B2G||Mulet) HTTP(..) == canvas-1b.xhtml canvas-1b.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-== clipping-1a.html clipping-1a.html
-== empty-1a.html empty-1a.html
-== empty-1b.html empty-1b.html
-#these is skipped because we hang on the htmlparser tests when this is ran
-random skip-if(Android||B2G||Mulet) HTTP(..) == object-aspect-ratio-1a.xhtml object-aspect-ratio-1a.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-random skip-if(Android||B2G||Mulet) HTTP(..) == object-aspect-ratio-1b.xhtml object-aspect-ratio-1b.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(Android||B2G||Mulet) HTTP(..) == offset-1.xhtml offset-1.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-random skip-if(Android||B2G||Mulet) HTTP(..) == object-aspect-ratio-2a.xhtml object-aspect-ratio-2a.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip random skip-if(Android||B2G||Mulet) HTTP(..) == object-aspect-ratio-2b.xhtml object-aspect-ratio-2b.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(Android||B2G||Mulet) fuzzy-if(winWidget,1,56000) fuzzy-if(cocoaWidget,1,56000) HTTP(..) == zoomed-1.xhtml zoomed-1.xhtml
-# bug 778995 for fuzzy
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(Android||B2G||Mulet) == poster-1.html poster-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(Android||B2G||Mulet) == poster-2.html poster-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(Android||B2G||Mulet) == poster-3.html poster-3.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(Android||B2G||Mulet) == poster-4.html poster-4.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(Android||B2G||Mulet) == poster-5.html poster-5.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(Android||B2G||Mulet) == poster-6.html poster-6.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(Android||B2G||Mulet) == poster-7.html poster-7.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(Android||B2G||Mulet) == poster-8.html poster-8.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-random skip-if(Android||B2G||Mulet) == poster-10.html poster-10.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-random skip-if(Android||B2G||Mulet) == poster-11.html poster-11.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-random skip-if(Android||B2G||Mulet) == poster-12.html poster-12.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(Android||B2G||Mulet) == poster-13.html poster-13.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(Android||B2G||Mulet) == poster-15.html poster-15.html
-# Initial mulet triage: parity with B2G/B2G Desktop
diff --git a/layout/reftests/ogg-video/reftest.list b/layout/reftests/ogg-video/reftest.list
index cbe110f6c..ec77523f2 100644
--- a/layout/reftests/ogg-video/reftest.list
+++ b/layout/reftests/ogg-video/reftest.list
@@ -1,35 +1,34 @@
-# NOTE: bug 1084564 covers "fails"/"skip" annotations for android below:
fuzzy(255,5000) == 444-1.html 444-1-ref.html
-fails-if(Android) HTTP(..) == aspect-ratio-1a.xhtml aspect-ratio-1-ref.html
-fails-if(Android) HTTP(..) == aspect-ratio-1b.xhtml aspect-ratio-1-ref.html
-fails-if(Android) skip-if(gtkWidget) HTTP(..) == aspect-ratio-2a.xhtml aspect-ratio-2-ref.html
-fails-if(Android) skip-if(gtkWidget) HTTP(..) == aspect-ratio-2b.xhtml aspect-ratio-2-ref.html
+HTTP(..) == aspect-ratio-1a.xhtml aspect-ratio-1-ref.html
+HTTP(..) == aspect-ratio-1b.xhtml aspect-ratio-1-ref.html
+skip-if(gtkWidget) HTTP(..) == aspect-ratio-2a.xhtml aspect-ratio-2-ref.html
+skip-if(gtkWidget) HTTP(..) == aspect-ratio-2b.xhtml aspect-ratio-2-ref.html
HTTP(..) == aspect-ratio-3a.xhtml aspect-ratio-3-ref.xhtml
HTTP(..) == aspect-ratio-3b.xhtml aspect-ratio-3-ref.xhtml
-fails-if(Android) random-if(layersGPUAccelerated) == encoded-aspect-ratio-1.html encoded-aspect-ratio-1-ref.html # bug 623460 for WinXP
-fails-if(Android) HTTP(..) == basic-1.xhtml basic-1-ref.html
-skip-if(Android) HTTP(..) == canvas-1a.xhtml basic-1-ref.html
-fails-if(Android) HTTP(..) == canvas-1b.xhtml basic-1-ref.html
+random-if(layersGPUAccelerated) == encoded-aspect-ratio-1.html encoded-aspect-ratio-1-ref.html # bug 623460 for WinXP
+HTTP(..) == basic-1.xhtml basic-1-ref.html
+HTTP(..) == canvas-1a.xhtml basic-1-ref.html
+HTTP(..) == canvas-1b.xhtml basic-1-ref.html
== clipping-1a.html clipping-1-ref.html
== empty-1a.html empty-1-ref.html
== empty-1b.html empty-1-ref.html
#these is skipped because we hang on the htmlparser tests when this is ran
-random skip-if(Android) HTTP(..) == object-aspect-ratio-1a.xhtml aspect-ratio-1-ref.html
-random skip-if(Android) HTTP(..) == object-aspect-ratio-1b.xhtml aspect-ratio-1-ref.html
-skip-if(Android) HTTP(..) == offset-1.xhtml offset-1-ref.html
-random skip-if(Android) HTTP(..) == object-aspect-ratio-2a.xhtml aspect-ratio-2-ref.html
-random skip-if(Android) HTTP(..) == object-aspect-ratio-2b.xhtml aspect-ratio-2-ref.html
-skip-if(Android) fuzzy-if(winWidget,1,56000) fuzzy-if(cocoaWidget,1,56000) HTTP(..) == zoomed-1.xhtml zoomed-1-ref.html # bug 778995 for fuzzy
-skip-if(Android) == poster-1.html poster-ref-blue250x200.html
-skip-if(Android) == poster-2.html poster-ref-black140x100.html
-skip-if(Android) == poster-3.html poster-ref-black140x100.html
-skip-if(Android) == poster-4.html poster-ref-black140x100.html
-skip-if(Android) == poster-5.html poster-ref-black140x100.html
-skip-if(Android) == poster-6.html poster-ref-black140x100.html
-skip-if(Android) == poster-7.html poster-ref-red140x100.html
-skip-if(Android) == poster-8.html poster-ref-black140x100.html
-random skip-if(Android) == poster-10.html poster-ref-blue125x100.html
-random skip-if(Android) == poster-11.html poster-ref-blue140x100.html
-random skip-if(Android) == poster-12.html poster-ref-blue140x100.html
-skip-if(Android) == poster-13.html poster-ref-blue400x300.html
-skip-if(Android) == poster-15.html poster-ref-green70x30.html
+random HTTP(..) == object-aspect-ratio-1a.xhtml aspect-ratio-1-ref.html
+random HTTP(..) == object-aspect-ratio-1b.xhtml aspect-ratio-1-ref.html
+HTTP(..) == offset-1.xhtml offset-1-ref.html
+random HTTP(..) == object-aspect-ratio-2a.xhtml aspect-ratio-2-ref.html
+random HTTP(..) == object-aspect-ratio-2b.xhtml aspect-ratio-2-ref.html
+fuzzy-if(winWidget,1,56000) fuzzy-if(cocoaWidget,1,56000) HTTP(..) == zoomed-1.xhtml zoomed-1-ref.html # bug 778995 for fuzzy
+== poster-1.html poster-ref-blue250x200.html
+== poster-2.html poster-ref-black140x100.html
+== poster-3.html poster-ref-black140x100.html
+== poster-4.html poster-ref-black140x100.html
+== poster-5.html poster-ref-black140x100.html
+== poster-6.html poster-ref-black140x100.html
+== poster-7.html poster-ref-red140x100.html
+== poster-8.html poster-ref-black140x100.html
+random == poster-10.html poster-ref-blue125x100.html
+random == poster-11.html poster-ref-blue140x100.html
+random == poster-12.html poster-ref-blue140x100.html
+== poster-13.html poster-ref-blue400x300.html
+== poster-15.html poster-ref-green70x30.html
diff --git a/layout/reftests/outline/reftest-stylo.list b/layout/reftests/outline/reftest-stylo.list
deleted file mode 100644
index 0cc5c462e..000000000
--- a/layout/reftests/outline/reftest-stylo.list
+++ /dev/null
@@ -1,15 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== outline-and-box-shadow.html outline-and-box-shadow.html
-== outline-and-3d-transform-1a.html outline-and-3d-transform-1a.html
-== outline-and-3d-transform-1b.html outline-and-3d-transform-1b.html
-fuzzy-if(Mulet||gtkWidget,136,120) fuzzy-if(Android,255,356) fuzzy-if(d2d,16,96) fuzzy-if(cocoaWidget,255,120) fuzzy-if(B2G,128,60) fuzzy-if(winWidget,255,216) == outline-and-3d-transform-2.html outline-and-3d-transform-2.html
-== outline-overflow-block-abspos.html outline-overflow-block-abspos.html
-== outline-overflow-block-float.html outline-overflow-block-float.html
-== outline-overflow-inlineblock-abspos.html outline-overflow-inlineblock-abspos.html
-== outline-overflow-inlineblock-float.html outline-overflow-inlineblock-float.html
-pref(layout.css.outline-style-auto.enabled,true) skip-if((!gtkWidget&&!winWidget&&!cocoaWidget)||Mulet) == outline-auto-001.html outline-auto-001.html
-# only works on platforms that supports NS_THEME_FOCUS_OUTLINE
-# bug 1141511: Disable some gtkWidget-dependant reftests on Mulet
-pref(layout.css.outline-style-auto.enabled,false) == outline-auto-001.html outline-auto-001.html
-== outline-initial-1a.html outline-initial-1a.html
-== outline-initial-1b.html outline-initial-1b.html
diff --git a/layout/reftests/outline/reftest.list b/layout/reftests/outline/reftest.list
index b3fd2634f..a729d892e 100644
--- a/layout/reftests/outline/reftest.list
+++ b/layout/reftests/outline/reftest.list
@@ -1,7 +1,7 @@
== outline-and-box-shadow.html outline-and-box-shadow-ref.html
== outline-and-3d-transform-1a.html outline-and-3d-transform-1-ref.html
== outline-and-3d-transform-1b.html outline-and-3d-transform-1-ref.html
-fuzzy-if(gtkWidget,136,120) fuzzy-if(Android,255,356) fuzzy-if(d2d,16,96) fuzzy-if(cocoaWidget,255,120) fuzzy-if(winWidget,255,216) == outline-and-3d-transform-2.html outline-and-3d-transform-2-ref.html
+fuzzy-if(gtkWidget,136,120) fuzzy-if(d2d,16,96) fuzzy-if(cocoaWidget,255,120) fuzzy-if(winWidget,255,216) == outline-and-3d-transform-2.html outline-and-3d-transform-2-ref.html
== outline-overflow-block-abspos.html outline-overflow-block-ref.html
== outline-overflow-block-float.html outline-overflow-block-ref.html
== outline-overflow-inlineblock-abspos.html outline-overflow-inlineblock-ref.html
diff --git a/layout/reftests/pagination/reftest-stylo.list b/layout/reftests/pagination/reftest-stylo.list
deleted file mode 100644
index 3548c1d06..000000000
--- a/layout/reftests/pagination/reftest-stylo.list
+++ /dev/null
@@ -1,109 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# For more pagination tests, see layout/reftests/w3c-css/submitted/css21/pagination/
-# and layout/reftests/w3c-css/submitted/multicol3/
-# Pagination tests
-# asserts(3) == abspos-breaking-000.xhtml abspos-breaking-000.xhtml
-# bug 1067755, 1135556
-== abspos-breaking-001.xhtml abspos-breaking-001.xhtml
-== abspos-breaking-002.xhtml abspos-breaking-002.xhtml
-== abspos-breaking-003.html abspos-breaking-003.html
-== abspos-breaking-004.html abspos-breaking-004.html
-== abspos-breaking-005.html abspos-breaking-005.html
-== abspos-breaking-006.html abspos-breaking-006.html
-pref(layout.css.box-decoration-break.enabled,true) == abspos-breaking-007.html abspos-breaking-007.html
-skip-if(B2G||Mulet) pref(layout.css.box-decoration-break.enabled,true) == abspos-breaking-008.html abspos-breaking-008.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) pref(layout.css.box-decoration-break.enabled,true) == abspos-breaking-009.html abspos-breaking-009.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) pref(layout.css.box-decoration-break.enabled,true) == abspos-breaking-010.html abspos-breaking-010.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== abspos-breaking-011.html abspos-breaking-011.html
-== abspos-overflow-01.xhtml abspos-overflow-01.xhtml
-== abspos-overflow-01-cols.xhtml abspos-overflow-01-cols.xhtml
-skip == border-breaking-000-cols.xhtml border-breaking-000-cols.xhtml
-== border-breaking-001-cols.xhtml border-breaking-001-cols.xhtml
-== border-breaking-002-cols.xhtml border-breaking-002-cols.xhtml
-== border-breaking-003-cols.xhtml border-breaking-003-cols.xhtml
-== border-breaking-004-cols.xhtml border-breaking-004-cols.xhtml
-== content-inserted-000.xhtml content-inserted-000.xhtml
-== content-inserted-001.xhtml content-inserted-001.xhtml
-== content-inserted-002.xhtml content-inserted-002.xhtml
-== content-inserted-003.xhtml content-inserted-003.xhtml
-== content-inserted-004.xhtml content-inserted-004.xhtml
-== content-inserted-005.xhtml content-inserted-005.xhtml
-== content-inserted-006.xhtml content-inserted-006.xhtml
-== content-inserted-007.xhtml content-inserted-007.xhtml
-skip == content-inserted-008.xhtml content-inserted-008.xhtml
-== content-inserted-009.xhtml content-inserted-009.xhtml
-== dynamic-abspos-overflow-01-cols.xhtml dynamic-abspos-overflow-01-cols.xhtml
-== float-clear-000.html float-clear-000.html
-== float-clear-000.html float-clear-000.html
-== float-clear-001.html float-clear-001.html
-skip == float-clear-002.html float-clear-002.html
-skip == float-clear-002.html float-clear-002.html
-== float-clear-003.html float-clear-003.html
-== float-clear-000-print.html float-clear-000-print.html
-== float-clear-001-print.html float-clear-001-print.html
-== float-clear-002-print.html float-clear-002-print.html
-== float-clear-003-print.html float-clear-003-print.html
-== float-continuations-000.html float-continuations-000.html
-fails fuzzy-if(skiaContent,1,21) == resize-reflow-000.html resize-reflow-000.html
-fuzzy-if(skiaContent,1,23) == resize-reflow-001.html resize-reflow-001.html
-== table-page-break-before-auto-1.html table-page-break-before-auto-1.html
-#== table-page-break-before-auto-2.html table-page-break-before-auto-2-ref.html bug bug
-== table-page-break-before-always-1.html table-page-break-before-always-1.html
-== table-page-break-before-left-1.html table-page-break-before-left-1.html
-== table-page-break-before-right-1.html table-page-break-before-right-1.html
-== table-page-break-after-always-1.html table-page-break-after-always-1.html
-== table-page-break-after-left-1.html table-page-break-after-left-1.html
-== table-page-break-after-right-1.html table-page-break-after-right-1.html
-skip-if(B2G||Mulet) == rowgroup-page-break-after-always-1.html rowgroup-page-break-after-always-1.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == row-page-break-after-always-1.html row-page-break-after-always-1.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == row-page-break-after-always-2.html row-page-break-after-always-2.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == rowgroup-thead-page-break-after-always-1.html rowgroup-thead-page-break-after-always-1.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == rowgroup-tfoot-page-break-after-always-1.html rowgroup-tfoot-page-break-after-always-1.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == table-tfoot-thead-1.html table-tfoot-thead-1.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== table-caption-splitrowgroup-1.html table-caption-splitrowgroup-1.html
-== table-caption-splitaftercaption-1.html table-caption-splitaftercaption-1.html
-skip-if(B2G||Mulet) == table-caption-splitaftercaption-2.html table-caption-splitaftercaption-2.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == table-caption-splitaftercaption-3.html table-caption-splitaftercaption-3.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == table-caption-splitaftercaption-4.html table-caption-splitaftercaption-4.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == table-caption-splitaftercaption-5.html table-caption-splitaftercaption-5.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == table-caption-splitaftercaption-6.html table-caption-splitaftercaption-6.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == table-caption-splitaftercaption-7.html table-caption-splitaftercaption-7.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-# == table-caption-splitaftercaption-8.html table-caption-splitaftercaption-8.html
-# bug 672654
-# == table-caption-splitaftercaption-9.html table-caption-splitaftercaption-9.html
-# bug 672654
-# == table-caption-splitaftercaption-10.html table-caption-splitaftercaption-10.html
-# bug 672654
-# == table-caption-splitaftercaption-11.html table-caption-splitaftercaption-11.html
-# bug 672654
-== column-balancing-break-inside-avoid-2.html column-balancing-break-inside-avoid-2.html
-fails-if(B2G||Mulet) == combobox-page-break-inside.html combobox-page-break-inside.html
-# reftest-print doesn't work on B2G
-# Initial mulet triage: parity with B2G/B2G Desktop
diff --git a/layout/reftests/percent-overflow-sizing/reftest-stylo.list b/layout/reftests/percent-overflow-sizing/reftest-stylo.list
deleted file mode 100644
index 0d1e6a586..000000000
--- a/layout/reftests/percent-overflow-sizing/reftest-stylo.list
+++ /dev/null
@@ -1,76 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== simpleHeight100.html simpleHeight100.html
-== simpleAbsHeight.html simpleAbsHeight.html
-skip-if(B2G||Mulet) random-if(transparentScrollbars) == hScrollSimpleHeight.html hScrollSimpleHeight.html
-# bug 650591
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) random-if(transparentScrollbars) == hScrollSimpleHeightQuirks-1.html hScrollSimpleHeightQuirks-1.html
-# bug 650591
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) random-if(transparentScrollbars) == hScrollSimpleHeightQuirks-2.html hScrollSimpleHeightQuirks-2.html
-# bug 650591
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) random-if(transparentScrollbars) == hScrollSimpleHeightQuirks-3.html hScrollSimpleHeightQuirks-3.html
-# bug 650591
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) random-if(transparentScrollbars) == hScrollAbsHeight.html hScrollAbsHeight.html
-# bug 650591
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) random-if(transparentScrollbars) == hScrollAbsHeightQuirks.html hScrollAbsHeightQuirks.html
-# bug 650591
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== simpleHeight100D.html simpleHeight100D.html
-== simpleAbsHeightD.html simpleAbsHeightD.html
-skip-if(B2G||Mulet) random-if(transparentScrollbars) == hScrollSimpleHeightD.html hScrollSimpleHeightD.html
-# bug 650591
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) random-if(transparentScrollbars) == hScrollSimpleHeightQuirks-1D.html hScrollSimpleHeightQuirks-1D.html
-# bug 650591
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) random-if(transparentScrollbars) == hScrollSimpleHeightQuirks-2D.html hScrollSimpleHeightQuirks-2D.html
-# bug 650591
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-random-if(transparentScrollbars) fuzzy-if(B2G,1,11) == hScrollSimpleHeightQuirks-3D.html hScrollSimpleHeightQuirks-3D.html
-# bug 650591, 1136304
-skip-if(B2G||Mulet) random-if(transparentScrollbars) == hScrollAbsHeightD.html hScrollAbsHeightD.html
-# bug 650591
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) random-if(transparentScrollbars) == hScrollAbsHeightQuirksD.html hScrollAbsHeightQuirksD.html
-# bug 650591
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== simpleMinHeight100D.html simpleMinHeight100D.html
-== simpleAbsMinHeightD.html simpleAbsMinHeightD.html
-skip-if(B2G||Mulet) random-if(transparentScrollbars) == hScrollSimpleMinHeightD.html hScrollSimpleMinHeightD.html
-# bug 650591
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) random-if(transparentScrollbars) == hScrollSimpleMinHeightQuirks-1D.html hScrollSimpleMinHeightQuirks-1D.html
-# bug 650591
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip skip-if(B2G||Mulet) random-if(transparentScrollbars) == hScrollSimpleMinHeightQuirks-3D.html hScrollSimpleMinHeightQuirks-3D.html
-# bug 650591
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) random-if(transparentScrollbars) == hScrollAbsMinHeightD.html hScrollAbsMinHeightD.html
-# bug 650591
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) random-if(transparentScrollbars) == hScrollAbsMinHeightQuirksD.html hScrollAbsMinHeightQuirksD.html
-# bug 650591
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== dynamicHeight100.html dynamicHeight100.html
-== nestedHeight.html nestedHeight.html
-== nestedHeightQuirks.html nestedHeightQuirks.html
diff --git a/layout/reftests/pixel-rounding/reftest-stylo.list b/layout/reftests/pixel-rounding/reftest-stylo.list
deleted file mode 100644
index 8d1f6e78b..000000000
--- a/layout/reftests/pixel-rounding/reftest-stylo.list
+++ /dev/null
@@ -1,186 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== check-image.html check-image.html
-== check-image-blue.html check-image-blue.html
-
-
-== background-color-base.html background-color-base.html
-== background-color-height-4.html background-color-height-4.html
-== background-color-height-5.html background-color-height-5.html
-== background-color-height-6.html background-color-height-6.html
-== background-color-base.html background-color-base.html
-== background-color-top-4.html background-color-top-4.html
-== background-color-top-5.html background-color-top-5.html
-== background-color-top-6.html background-color-top-6.html
-== background-color-base.html background-color-base.html
-== background-color-width-4.html background-color-width-4.html
-== background-color-width-5.html background-color-width-5.html
-== background-color-width-6.html background-color-width-6.html
-== background-color-base.html background-color-base.html
-== background-color-left-4.html background-color-left-4.html
-== background-color-left-5.html background-color-left-5.html
-== background-color-left-6.html background-color-left-6.html
-== background-color-top-height-4.html background-color-top-height-4.html
-== background-color-top-height-5.html background-color-top-height-5.html
-== background-color-top-height-6.html background-color-top-height-6.html
-skip == background-color-left-width-4.html background-color-left-width-4.html
-== background-color-left-width-5.html background-color-left-width-5.html
-== background-color-left-width-6.html background-color-left-width-6.html
-== background-color-height-top-4.html background-color-height-top-4.html
-== background-color-height-top-5.html background-color-height-top-5.html
-skip == background-color-height-top-6.html background-color-height-top-6.html
-== background-color-width-left-4.html background-color-width-left-4.html
-== background-color-width-left-5.html background-color-width-left-5.html
-== background-color-width-left-6.html background-color-width-left-6.html
-
-
-== border-base-ref.html border-base-ref.html
-== border-height-4.html border-height-4.html
-== border-height-5.html border-height-5.html
-== border-height-6.html border-height-6.html
-== border-base-ref.html border-base-ref.html
-== border-width-4.html border-width-4.html
-== border-width-5.html border-width-5.html
-== border-width-6.html border-width-6.html
-== border-base-ref.html border-base-ref.html
-== border-left-4.html border-left-4.html
-== border-left-5.html border-left-5.html
-== border-left-6.html border-left-6.html
-== border-base-ref.html border-base-ref.html
-== border-top-4.html border-top-4.html
-== border-top-5.html border-top-5.html
-== border-top-6.html border-top-6.html
-
-== background-image-base.html background-image-base.html
-== background-image-height-4.html background-image-height-4.html
-== background-image-height-5.html background-image-height-5.html
-== background-image-height-6.html background-image-height-6.html
-== background-image-base.html background-image-base.html
-== background-image-top-4.html background-image-top-4.html
-== background-image-top-5.html background-image-top-5.html
-== background-image-top-6.html background-image-top-6.html
-== background-image-base.html background-image-base.html
-== background-image-width-4.html background-image-width-4.html
-== background-image-width-5.html background-image-width-5.html
-== background-image-width-6.html background-image-width-6.html
-== background-image-base.html background-image-base.html
-== background-image-left-4.html background-image-left-4.html
-== background-image-left-5.html background-image-left-5.html
-== background-image-left-6.html background-image-left-6.html
-== background-image-top-height-4.html background-image-top-height-4.html
-== background-image-top-height-5.html background-image-top-height-5.html
-== background-image-top-height-6.html background-image-top-height-6.html
-== background-image-left-width-4.html background-image-left-width-4.html
-== background-image-left-width-5.html background-image-left-width-5.html
-== background-image-left-width-6.html background-image-left-width-6.html
-== background-image-height-top-4.html background-image-height-top-4.html
-== background-image-height-top-5.html background-image-height-top-5.html
-== background-image-height-top-6.html background-image-height-top-6.html
-== background-image-width-left-4.html background-image-width-left-4.html
-== background-image-width-left-5.html background-image-width-left-5.html
-== background-image-width-left-6.html background-image-width-left-6.html
-
-
-# These all fail due bug 371180, plus a bunch of other bugs that ought to be filed.
-== collapsed-border-height-4.html collapsed-border-height-4.html
-== collapsed-border-height-5.html collapsed-border-height-5.html
-== collapsed-border-height-6.html collapsed-border-height-6.html
-== collapsed-border-width-4.html collapsed-border-width-4.html
-== collapsed-border-width-5.html collapsed-border-width-5.html
-== collapsed-border-width-6.html collapsed-border-width-6.html
-== collapsed-border-left-4.html collapsed-border-left-4.html
-== collapsed-border-left-5.html collapsed-border-left-5.html
-== collapsed-border-left-6.html collapsed-border-left-6.html
-== collapsed-border-top-4.html collapsed-border-top-4.html
-== collapsed-border-top-5.html collapsed-border-top-5.html
-== collapsed-border-top-6.html collapsed-border-top-6.html
-
-
-== image-base-ref.html image-base-ref.html
-== image-height-4.html image-height-4.html
-== image-height-5.html image-height-5.html
-== image-height-6.html image-height-6.html
-== image-base-ref.html image-base-ref.html
-== image-top-4.html image-top-4.html
-== image-top-5.html image-top-5.html
-== image-top-6.html image-top-6.html
-== image-base-ref.html image-base-ref.html
-== image-width-4.html image-width-4.html
-== image-width-5.html image-width-5.html
-== image-width-6.html image-width-6.html
-== image-base-ref.html image-base-ref.html
-== image-left-4.html image-left-4.html
-== image-left-5.html image-left-5.html
-== image-left-6.html image-left-6.html
-== image-top-height-4.html image-top-height-4.html
-== image-top-height-5.html image-top-height-5.html
-== image-top-height-6.html image-top-height-6.html
-== image-left-width-4.html image-left-width-4.html
-== image-left-width-5.html image-left-width-5.html
-== image-left-width-6.html image-left-width-6.html
-== image-height-top-4.html image-height-top-4.html
-== image-height-top-5.html image-height-top-5.html
-== image-height-top-6.html image-height-top-6.html
-== image-width-left-4.html image-width-left-4.html
-== image-width-left-5.html image-width-left-5.html
-== image-width-left-6.html image-width-left-6.html
-
-
-skip pref(image.downscale-during-decode.enabled,true) == image-high-quality-scaling-1.html image-high-quality-scaling-1.html
-
-
-== offscreen-0-ref.html offscreen-0-ref.html
-== offscreen-background-color-pos-4.html offscreen-background-color-pos-4.html
-== offscreen-background-color-pos-5.html offscreen-background-color-pos-5.html
-== offscreen-background-color-pos-6.html offscreen-background-color-pos-6.html
-== offscreen-background-color-size-4.html offscreen-background-color-size-4.html
-== offscreen-background-color-size-5.html offscreen-background-color-size-5.html
-== offscreen-background-color-size-6.html offscreen-background-color-size-6.html
-== offscreen-image-pos-4.html offscreen-image-pos-4.html
-== offscreen-image-pos-5.html offscreen-image-pos-5.html
-== offscreen-image-pos-6.html offscreen-image-pos-6.html
-== offscreen-image-size-4.html offscreen-image-size-4.html
-== offscreen-image-size-5.html offscreen-image-size-5.html
-== offscreen-image-size-6.html offscreen-image-size-6.html
-
-
-== rounded-background-color-base-ref.html rounded-background-color-base-ref.html
-fuzzy-if(skiaContent,1,14) == rounded-background-color-height-4.html rounded-background-color-height-4.html
-skip == rounded-background-color-height-5.html rounded-background-color-height-5.html
-== rounded-background-color-height-6.html rounded-background-color-height-6.html
-== rounded-background-color-base-ref.html rounded-background-color-base-ref.html
-fuzzy-if(skiaContent,1,14) == rounded-background-color-top-4.html rounded-background-color-top-4.html
-== rounded-background-color-top-5.html rounded-background-color-top-5.html
-== rounded-background-color-top-6.html rounded-background-color-top-6.html
-== rounded-background-color-base-ref.html rounded-background-color-base-ref.html
-fuzzy-if(skiaContent,1,14) == rounded-background-color-width-4.html rounded-background-color-width-4.html
-== rounded-background-color-width-5.html rounded-background-color-width-5.html
-== rounded-background-color-width-6.html rounded-background-color-width-6.html
-== rounded-background-color-base-ref.html rounded-background-color-base-ref.html
-fuzzy-if(skiaContent,1,225) == rounded-background-color-left-4.html rounded-background-color-left-4.html
-fuzzy-if(skiaContent,1,160) == rounded-background-color-left-5.html rounded-background-color-left-5.html
-fuzzy-if(skiaContent,1,145) == rounded-background-color-left-6.html rounded-background-color-left-6.html
-fuzzy-if(skiaContent,1,145) == rounded-background-color-top-height-4.html rounded-background-color-top-height-4.html
-fuzzy-if(skiaContent,1,113) == rounded-background-color-top-height-5.html rounded-background-color-top-height-5.html
-fuzzy-if(skiaContent,1,145) == rounded-background-color-top-height-6.html rounded-background-color-top-height-6.html
-skip fuzzy-if(skiaContent,1,225) == rounded-background-color-left-width-4.html rounded-background-color-left-width-4.html
-fuzzy-if(skiaContent,1,113) == rounded-background-color-left-width-5.html rounded-background-color-left-width-5.html
-fuzzy-if(skiaContent,1,113) == rounded-background-color-left-width-6.html rounded-background-color-left-width-6.html
-fuzzy-if(skiaContent,1,145) == rounded-background-color-height-top-4.html rounded-background-color-height-top-4.html
-fuzzy-if(skiaContent,1,97) == rounded-background-color-height-top-5.html rounded-background-color-height-top-5.html
-skip fuzzy-if(skiaContent,1,113) == rounded-background-color-height-top-6.html rounded-background-color-height-top-6.html
-fuzzy-if(skiaContent,1,225) == rounded-background-color-width-left-4.html rounded-background-color-width-left-4.html
-fuzzy-if(skiaContent,1,145) == rounded-background-color-width-left-5.html rounded-background-color-width-left-5.html
-fuzzy-if(skiaContent,1,145) == rounded-background-color-width-left-6.html rounded-background-color-width-left-6.html
-
-skip skip-if(B2G||Mulet) == background-image-tiling.html background-image-tiling.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-== border-image-width-0.html border-image-width-0.html
-== border-image-width-4.html border-image-width-4.html
-== border-image-width-9.html border-image-width-9.html
-
-== iframe-1.html iframe-1.html
-
-== viewport-units-rounding-1.html viewport-units-rounding-1.html
-== viewport-units-rounding-2.html viewport-units-rounding-2.html
diff --git a/layout/reftests/position-dynamic-changes/horizontal/reftest-stylo.list b/layout/reftests/position-dynamic-changes/horizontal/reftest-stylo.list
deleted file mode 100644
index 2f9419814..000000000
--- a/layout/reftests/position-dynamic-changes/horizontal/reftest-stylo.list
+++ /dev/null
@@ -1,19 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# This directory includes 7 different permutations of the same tests.
-# reftest_plain-stylo.list is the manifest file for tests without any border, margin
-# or padding applied to either the abs-pos element or the parent.
-# reftest_{prop}_{element}.list files are the manifest files for tests with the
-# CSS property {prop} applied to {element}. These files use the query string
-# on the test file and the reference file to ask the code in ../handleprop.js add
-# the corresponding CSS style.
-
-# Any changes to the contents of the following files needs to be reflected on
-# all of them.
-
-include reftest_plain-stylo.list
-include reftest_border_abspos-stylo.list
-include reftest_border_parent-stylo.list
-include reftest_margin_abspos-stylo.list
-include reftest_margin_parent-stylo.list
-include reftest_padding_abspos-stylo.list
-include reftest_padding_parent-stylo.list
diff --git a/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest-stylo.list b/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest-stylo.list
deleted file mode 100644
index 2f9419814..000000000
--- a/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest-stylo.list
+++ /dev/null
@@ -1,19 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# This directory includes 7 different permutations of the same tests.
-# reftest_plain-stylo.list is the manifest file for tests without any border, margin
-# or padding applied to either the abs-pos element or the parent.
-# reftest_{prop}_{element}.list files are the manifest files for tests with the
-# CSS property {prop} applied to {element}. These files use the query string
-# on the test file and the reference file to ask the code in ../handleprop.js add
-# the corresponding CSS style.
-
-# Any changes to the contents of the following files needs to be reflected on
-# all of them.
-
-include reftest_plain-stylo.list
-include reftest_border_abspos-stylo.list
-include reftest_border_parent-stylo.list
-include reftest_margin_abspos-stylo.list
-include reftest_margin_parent-stylo.list
-include reftest_padding_abspos-stylo.list
-include reftest_padding_parent-stylo.list
diff --git a/layout/reftests/position-dynamic-changes/mixed/reftest-stylo.list b/layout/reftests/position-dynamic-changes/mixed/reftest-stylo.list
deleted file mode 100644
index 2f9419814..000000000
--- a/layout/reftests/position-dynamic-changes/mixed/reftest-stylo.list
+++ /dev/null
@@ -1,19 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# This directory includes 7 different permutations of the same tests.
-# reftest_plain-stylo.list is the manifest file for tests without any border, margin
-# or padding applied to either the abs-pos element or the parent.
-# reftest_{prop}_{element}.list files are the manifest files for tests with the
-# CSS property {prop} applied to {element}. These files use the query string
-# on the test file and the reference file to ask the code in ../handleprop.js add
-# the corresponding CSS style.
-
-# Any changes to the contents of the following files needs to be reflected on
-# all of them.
-
-include reftest_plain-stylo.list
-include reftest_border_abspos-stylo.list
-include reftest_border_parent-stylo.list
-include reftest_margin_abspos-stylo.list
-include reftest_margin_parent-stylo.list
-include reftest_padding_abspos-stylo.list
-include reftest_padding_parent-stylo.list
diff --git a/layout/reftests/position-dynamic-changes/reftest-stylo.list b/layout/reftests/position-dynamic-changes/reftest-stylo.list
deleted file mode 100644
index 4c7de798e..000000000
--- a/layout/reftests/position-dynamic-changes/reftest-stylo.list
+++ /dev/null
@@ -1,12 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-include horizontal/reftest-stylo.list
-include vertical/reftest-stylo.list
-include mixed/reftest-stylo.list
-include mixed-abspos-root/reftest-stylo.list
-include relative/reftest-stylo.list
-
-== multiple-changes.html multiple-changes.html
-== shrink-wrap.html shrink-wrap.html
-== max-width.html max-width.html
-fuzzy-if(cocoaWidget&&layersGPUAccelerated,1,2) == min-width.html min-width.html
-# Bug 761770
diff --git a/layout/reftests/position-dynamic-changes/relative/reftest-stylo.list b/layout/reftests/position-dynamic-changes/relative/reftest-stylo.list
deleted file mode 100644
index a0a93c4fc..000000000
--- a/layout/reftests/position-dynamic-changes/relative/reftest-stylo.list
+++ /dev/null
@@ -1,8 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-fuzzy-if(cocoaWidget,1,2) fuzzy-if(d2d,47,26) fuzzy-if(asyncPan&&!layersGPUAccelerated,121,614) == move-right-bottom.html move-right-bottom.html
-fuzzy-if(cocoaWidget,1,2) fuzzy-if(asyncPan&&!layersGPUAccelerated,121,614) == move-top-left.html move-top-left.html
-# Bug 688545
-fuzzy-if(cocoaWidget,1,3) fuzzy-if(asyncPan&&!layersGPUAccelerated,121,497) == move-right-bottom-table.html move-right-bottom-table.html
-fuzzy-if(cocoaWidget,1,3) fuzzy-if(asyncPan&&!layersGPUAccelerated,121,497) == move-top-left-table.html move-top-left-table.html
-# Bug 688545
-== percent.html percent.html
diff --git a/layout/reftests/position-dynamic-changes/vertical/reftest-stylo.list b/layout/reftests/position-dynamic-changes/vertical/reftest-stylo.list
deleted file mode 100644
index 2f9419814..000000000
--- a/layout/reftests/position-dynamic-changes/vertical/reftest-stylo.list
+++ /dev/null
@@ -1,19 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# This directory includes 7 different permutations of the same tests.
-# reftest_plain-stylo.list is the manifest file for tests without any border, margin
-# or padding applied to either the abs-pos element or the parent.
-# reftest_{prop}_{element}.list files are the manifest files for tests with the
-# CSS property {prop} applied to {element}. These files use the query string
-# on the test file and the reference file to ask the code in ../handleprop.js add
-# the corresponding CSS style.
-
-# Any changes to the contents of the following files needs to be reflected on
-# all of them.
-
-include reftest_plain-stylo.list
-include reftest_border_abspos-stylo.list
-include reftest_border_parent-stylo.list
-include reftest_margin_abspos-stylo.list
-include reftest_margin_parent-stylo.list
-include reftest_padding_abspos-stylo.list
-include reftest_padding_parent-stylo.list
diff --git a/layout/reftests/position-relative/reftest-stylo.list b/layout/reftests/position-relative/reftest-stylo.list
deleted file mode 100644
index e0824d6ac..000000000
--- a/layout/reftests/position-relative/reftest-stylo.list
+++ /dev/null
@@ -1,10 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== table-collapse-1.html table-collapse-1.html
-== table-collapse-2.html table-collapse-2.html
-== table-collapse-3.html table-collapse-3.html
-== table-collapse-4.html table-collapse-4.html
-== table-separate-1.html table-separate-1.html
-== table-separate-2.html table-separate-2.html
-== table-separate-3.html table-separate-3.html
-== table-separate-4.html table-separate-4.html
-== 1115999-1.html 1115999-1.html
diff --git a/layout/reftests/position-sticky/reftest-stylo.list b/layout/reftests/position-sticky/reftest-stylo.list
deleted file mode 100644
index 490b11f63..000000000
--- a/layout/reftests/position-sticky/reftest-stylo.list
+++ /dev/null
@@ -1,55 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== top-1.html top-1.html
-fuzzy-if(Android,6,1568) == top-2.html top-2.html
-fuzzy-if(Android,6,2729) == top-3.html top-3.html
-== top-4.html top-4.html
-== top-5.html top-5.html
-fuzzy-if(Android,2,1568) == top-6.html top-6.html
-== bottom-1.html bottom-1.html
-== bottom-2a.html bottom-2a.html
-== bottom-2b.html bottom-2b.html
-== bottom-2c.html bottom-2c.html
-== bottom-3.html bottom-3.html
-== bottom-4.html bottom-4.html
-fuzzy-if(Android,2,4) == left-1.html left-1.html
-fuzzy-if(Android,2,4) == left-2.html left-2.html
-== left-3.html left-3.html
-== right-1.html right-1.html
-fuzzy-if(Android,2,4) == right-2.html right-2.html
-fuzzy-if(Android,2,4) == right-3.html right-3.html
-== margin-1.html margin-1.html
-== padding-1.html padding-1.html
-== padding-2.html padding-2.html
-random-if(B2G||Mulet) == padding-3.html padding-3.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== overcontain-1.html overcontain-1.html
-== initial-1.html initial-1.html
-== initial-scroll-1.html initial-scroll-1.html
-== scrollframe-reflow-1.html scrollframe-reflow-1.html
-== scrollframe-reflow-2.html scrollframe-reflow-2.html
-== scrollframe-auto-1.html scrollframe-auto-1.html
-== stacking-context-1.html stacking-context-1.html
-== top-bottom-1.html top-bottom-1.html
-== top-bottom-2.html top-bottom-2.html
-== top-bottom-3.html top-bottom-3.html
-== left-right-1.html left-right-1.html
-== left-right-2.html left-right-2.html
-== left-right-3.html left-right-3.html
-fuzzy-if(Android,4,810) == containing-block-1.html containing-block-1.html
-== overconstrained-1.html overconstrained-1.html
-== overconstrained-2.html overconstrained-2.html
-== overconstrained-3.html overconstrained-3.html
-== inline-1.html inline-1.html
-== inline-2.html inline-2.html
-fuzzy-if(OSX==1006||OSX==1007,64,100) fuzzy-if(OSX>=1008,99,210) == inline-3.html inline-3.html
-skip-if(!asyncPan) == inline-4.html inline-4.html
-== column-contain-1a.html column-contain-1a.html
-== column-contain-1b.html column-contain-1b.html
-== column-contain-2.html column-contain-2.html
-== block-in-inline-1.html block-in-inline-1.html
-fuzzy-if(skiaContent,1,22) fuzzy-if(winWidget&&!layersGPUAccelerated,116,1320) fuzzy-if(Android,8,1533) skip-if((B2G&&browserIsRemote)||Mulet) == block-in-inline-2.html block-in-inline-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fuzzy-if(winWidget&&!layersGPUAccelerated,116,1320) fuzzy-if(Android,8,630) fuzzy-if(OSX>=1008,1,11) skip-if((B2G&&browserIsRemote)||Mulet) fuzzy-if(skiaContent,1,124) == block-in-inline-3.html block-in-inline-3.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== block-in-inline-continuations.html block-in-inline-continuations.html
-fuzzy-if(winWidget&&!layersGPUAccelerated,121,111) == inner-table-1.html inner-table-1.html
diff --git a/layout/reftests/position-sticky/reftest.list b/layout/reftests/position-sticky/reftest.list
index 01e7b1638..620454bf7 100644
--- a/layout/reftests/position-sticky/reftest.list
+++ b/layout/reftests/position-sticky/reftest.list
@@ -1,21 +1,21 @@
== top-1.html top-1-ref.html
-fuzzy-if(Android,6,1568) == top-2.html top-2-ref.html
-fuzzy-if(Android,6,2729) == top-3.html top-3-ref.html
+== top-2.html top-2-ref.html
+== top-3.html top-3-ref.html
== top-4.html top-4-ref.html
== top-5.html top-5-ref.html
-fuzzy-if(Android,2,1568) == top-6.html top-6-ref.html
+== top-6.html top-6-ref.html
== bottom-1.html bottom-1-ref.html
== bottom-2a.html bottom-2-ref.html
== bottom-2b.html bottom-2-ref.html
== bottom-2c.html bottom-2-ref.html
== bottom-3.html bottom-3-ref.html
== bottom-4.html bottom-4-ref.html
-fuzzy-if(Android,2,4) == left-1.html left-1-ref.html
-fuzzy-if(Android,2,4) == left-2.html left-2-ref.html
+== left-1.html left-1-ref.html
+== left-2.html left-2-ref.html
== left-3.html left-3-ref.html
== right-1.html right-1-ref.html
-fuzzy-if(Android,2,4) == right-2.html right-2-ref.html
-fuzzy-if(Android,2,4) == right-3.html right-3-ref.html
+== right-2.html right-2-ref.html
+== right-3.html right-3-ref.html
== margin-1.html margin-1-ref.html
== padding-1.html padding-1-ref.html
== padding-2.html padding-2-ref.html
@@ -26,14 +26,14 @@ fuzzy-if(Android,2,4) == right-3.html right-3-ref.html
== scrollframe-reflow-1.html scrollframe-reflow-1-ref.html
== scrollframe-reflow-2.html scrollframe-reflow-2-ref.html
== scrollframe-auto-1.html scrollframe-auto-1-ref.html
-fuzzy-if(Android,2,3) == stacking-context-1.html stacking-context-1-ref.html
+== stacking-context-1.html stacking-context-1-ref.html
== top-bottom-1.html top-bottom-1-ref.html
== top-bottom-2.html top-bottom-2-ref.html
== top-bottom-3.html top-bottom-3-ref.html
== left-right-1.html left-right-1-ref.html
== left-right-2.html left-right-2-ref.html
== left-right-3.html left-right-3-ref.html
-fuzzy-if(Android,4,810) == containing-block-1.html containing-block-1-ref.html
+== containing-block-1.html containing-block-1-ref.html
== overconstrained-1.html overconstrained-1-ref.html
== overconstrained-2.html overconstrained-2-ref.html
== overconstrained-3.html overconstrained-3-ref.html
@@ -45,6 +45,6 @@ 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
== block-in-inline-1.html block-in-inline-1-ref.html
-fuzzy-if(skiaContent,1,22) fuzzy-if(winWidget&&!layersGPUAccelerated,116,1320) fuzzy-if(Android,8,1533) == block-in-inline-2.html block-in-inline-2-ref.html
-fuzzy-if(Android,8,630) fuzzy-if(OSX>=1008,1,11) fuzzy-if(skiaContent,1,220) fuzzy-if(winWidget&&!layersGPUAccelerated,116,1320) == block-in-inline-3.html block-in-inline-3-ref.html
+fuzzy-if(skiaContent,1,22) fuzzy-if(winWidget&&!layersGPUAccelerated,116,1320) == block-in-inline-2.html block-in-inline-2-ref.html
+fuzzy-if(OSX>=1008,1,11) fuzzy-if(skiaContent,1,220) fuzzy-if(winWidget&&!layersGPUAccelerated,116,1320) == block-in-inline-3.html block-in-inline-3-ref.html
== block-in-inline-continuations.html block-in-inline-continuations-ref.html
diff --git a/layout/reftests/printing/reftest-stylo.list b/layout/reftests/printing/reftest-stylo.list
deleted file mode 100644
index 2324cd008..000000000
--- a/layout/reftests/printing/reftest-stylo.list
+++ /dev/null
@@ -1,52 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# Sanity check
-skip == blank.html blank.html
-
-# Bugs
-== 272830-1.html 272830-1.html
-== 318022-1.html 318022-1.html
-== 403669-1.html 403669-1.html
-random-if((B2G&&browserIsRemote)||Mulet) == 381497-n.html 381497-n.html
-# reftest-print doesn't work on B2G (scrollbar difference only)
-# Initial mulet triage: parity with B2G/B2G Desktop
-== test-async-print.html test-async-print.html
-fails-if(B2G||Mulet) == 129941-1a.html 129941-1a.html
-# reftest-print doesn't work on B2G
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 129941-1b.html 129941-1b.html
-== 609227-1.html 609227-1.html
-fails-if(B2G||Mulet) == 609227-2a.html 609227-2a.html
-# reftest-print doesn't work on B2G
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(B2G||Mulet) == 609227-2b.html 609227-2b.html
-# reftest-print doesn't work on B2G
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 577450-1.html 577450-1.html
-== 626395-1a.html 626395-1a.html
-== 626395-1b.html 626395-1b.html
-== 626395-2a.html 626395-2a.html
-== 626395-2b.html 626395-2b.html
-== 626395-2c.html 626395-2c.html
-== 626395-2d.html 626395-2d.html
-== 652178-1.html 652178-1.html
-fails-if(B2G||Mulet) == 115199-1.html 115199-1.html
-# reftest-print doesn't work on B2G
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 115199-2a.html 115199-2a.html
-== 115199-2b.html 115199-2b.html
-== 652178-1.html 652178-1.html
-skip-if(B2G||Mulet) fuzzy-if(cocoaWidget,1,5000) == 745025-1.html 745025-1.html
-# reftest-print doesn't work on B2G
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 820496-1.html 820496-1.html
-
-# NOTE: These tests don't yet rigorously test what they're
-# trying to test (shrink-to-fit behavior), due to bug 967311.
-random-if((B2G&&browserIsRemote)||Mulet) == 960822.html 960822.html
-# reftest-print doesn't work on B2G (scrollbar difference only)
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 966419-1.html 966419-1.html
-== 966419-2.html 966419-2.html
-# skip-if(B2G||Mulet) asserts(3) HTTP(..) fails 1108104.html 1108104-ref.html
-# bug 1067755, 1135556
-# Initial mulet triage: parity with B2G/B2G Desktop
diff --git a/layout/reftests/reftest-sanity/reftest-stylo.list b/layout/reftests/reftest-sanity/reftest-stylo.list
deleted file mode 100644
index 0d759dd84..000000000
--- a/layout/reftests/reftest-sanity/reftest-stylo.list
+++ /dev/null
@@ -1,210 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== data:text/html,<body> data:text/html,<body>
-skip == data:text/plain, data:text/plain,
-skip == data:text/plain,HELLO data:text/plain,HELLO
-
-# these tests make sure async reftests work:
-skip-if(B2G||Mulet) == test-async.xul test-async.xul
-# bug 785074
-# Initial mulet triage: parity with B2G
-skip-if(B2G||Mulet) == test-async.html test-async.html
-# bug 785074
-# Initial mulet triage: parity with B2G
-
-# test that zoom works (and really zooms, not just scales)
-== test-zoom.html test-zoom.html
-
-# make sure we don't fall over if the root is missing
-skip == no-root.html no-root.html
-
-# Makes sure that the file: protocol handler and HTTP server both
-# choose HTML vs. XHTML processing based on the file extensions.
-== html-vs-xhtml-by-extension.html html-vs-xhtml-by-extension.html
-HTTP == html-vs-xhtml-by-extension.html html-vs-xhtml-by-extension.html
-
-# make sure red and green colors are not the default and are different from
-# each other
-== green.html green.html
-== green.html green.html
-== red.html red.html
-
-# Make sure about:blank works, even via HTTP.
-skip == blank.html blank.html
-skip == about:blank about:blank
-skip HTTP == blank.html blank.html
-skip HTTP == about:blank about:blank
-# same for data:
-== default.html default.html
-== data:text/html,<div>Text</div> data:text/html,<div>Text</div>
-HTTP == default.html default.html
-HTTP == data:text/html,<div>Text</div> data:text/html,<div>Text</div>
-skip == blank.html blank.html
-skip HTTP == blank.html blank.html
-
-skip-if(B2G||Mulet) HTTP(..) == filter-1.xhtml filter-1.xhtml
-# Initial mulet triage: parity with B2G
-skip-if(B2G||Mulet) HTTP(..) == filter-2.xhtml filter-2.xhtml
-# bug 773482
-# Initial mulet triage: parity with B2G
-
-# test that the MozReftestInvalidate event fires
-== invalidation.html invalidation.html
-== zoom-invalidation.html zoom-invalidation.html
-
-# test parsing of asserts() expressions
-skip asserts(0) load about:blank
-skip asserts(0-5) load about:blank
-skip asserts-if(true,0) load about:blank
-skip asserts-if(false,7) load about:blank
-skip asserts-if(true,0-4) load about:blank
-skip asserts-if(false,6-8) load about:blank
-
-# test that <div> is display:block
-== div.html div.html
-
-# test script keyword
-include scripttests-stylo.list
-
-# test url-prefix
-include urlprefixtests-stylo.list
-
-# test default-preferences
-include default-preferences-tests-stylo.list
-
-# test that all corners are visible
-== corners-1.html corners-1.html
-== corners-2.html corners-2.html
-== corners-3.html corners-3.html
-== corners-4.html corners-4.html
-
-# Test that the harness gives the correct page dimensions.
-== page-width-3.9in.html page-width-3.9in.html
-skip-if(B2G||Mulet) == page-width-4.1in.html page-width-4.1in.html
-# bug 774396
-# Initial mulet triage: parity with B2G
-skip-if(B2G||Mulet) == page-width-auto.html page-width-auto.html
-# bug 774396
-# Initial mulet triage: parity with B2G
-skip-if(B2G||Mulet) == page-height-2in.html page-height-2in.html
-# bug 774396
-# Initial mulet triage: parity with B2G
-== page-height-2in.html page-height-2in.html
-== page-height-2.1in.html page-height-2.1in.html
-
-# Check that tests that need focus are skipped when it's not available
-needs-focus load needs-focus.html
-
-# Bug 632636
-skip == data:text/plain,HELLO data:text/plain,HELLO
-skip needs-focus == data:text/plain, data:text/plain,
-
-# Sanity check of viewport+displayport overrides
-pref(dom.meta-viewport.enabled,true) skip-if(!browserIsRemote) == test-displayport-2.html test-displayport-2.html
-# bug 593168
-skip-if(!browserIsRemote) fails-if(OSX&&layersGPUAccelerated) fuzzy-if(layersOMTC,1,1390) random-if(Android) random-if(B2G||Mulet) random-if(transparentScrollbars) == 647192-1.html 647192-1.html
-# Initial mulet triage: parity with B2G
-skip-if(!browserIsRemote||((B2G&&browserIsRemote)||Mulet)) == 656041-1.html 656041-1.html
-# Initial mulet triage: parity with B2G
-pref(dom.meta-viewport.enabled,true) skip-if(!browserIsRemote||layersOMTC) == test-displayport-bg.html test-displayport-bg.html
-# bug 694706
-
-# IPC Position-fixed frames/layers test
-# Fixed layers are temporarily disabled (bug 656167).
-#pref(dom.meta-viewport.enabled,true) skip-if(!browserIsRemote) == test-pos-fixed.html test-pos-fixed.html
-#pref(dom.meta-viewport.enabled,true) skip-if(!browserIsRemote) == test-bg-attachment-fixed.html test-bg-attachment-fixed.html
-pref(dom.meta-viewport.enabled,true) skip-if(!browserIsRemote) == test-pos-fixed-transform.html test-pos-fixed-transform.html
-
-# reftest syntax: require-or
-skip require-or(unrecognizedCondition,skip) script scripttest-fail.html
-skip require-or(true&&unrecognizedCondition,skip) script scripttest-fail.html
-skip require-or(unrecognizedCondition&&true,skip) script scripttest-fail.html
-skip require-or(unrecognizedCondition,fails) script scripttest-fail.html
-require-or(true,fails) script scripttest-pass.html
-require-or(true&&true,fails) script scripttest-pass.html
-
-# tests for pref(...) syntax in manifest, including "fails" examples with incorrect prefs
-# a boolean pref
-pref(gfx.downloadable_fonts.enabled,true) HTTP(..) == font-download.html font-download.html
-pref(gfx.downloadable_fonts.enabled,false) HTTP(..) == font-download.html font-download.html
-fails pref(gfx.downloadable_fonts.enabled,0) HTTP(..) == font-download.html font-download.html
-fails pref(gfx.downloadable_fonts.enabled,"foo") HTTP(..) == font-download.html font-download.html
-# a non-existent pref
-fails pref(not.a.real.pref.name,1) == font-download.html font-download.html
-# an integer pref
-pref(font.size.variable.x-western,16) == font-size-16.html font-size-16.html
-pref(font.size.variable.x-western,16) == font-size-24.html font-size-24.html
-pref(font.size.variable.x-western,24) == font-size-24.html font-size-24.html
-pref(font.size.variable.x-western,24) == font-size-16.html font-size-16.html
-fails pref(font.size.variable.x-western,false) == font-size-16.html font-size-16.html
-fails pref(font.size.variable.x-western,"foo") == font-size-16.html font-size-16.html
-# a string pref
-pref(font.default.x-western,"serif") == font-serif.html font-serif.html
-pref(font.default.x-western,"serif") == font-sans-serif.html font-sans-serif.html
-pref(font.default.x-western,"sans-serif") == font-sans-serif.html font-sans-serif.html
-pref(font.default.x-western,"sans-serif") == font-serif.html font-serif.html
-fails pref(font.default.x-western,true) == font-serif.html font-serif.html
-fails pref(font.default.x-western,0) == font-serif.html font-serif.html
-# tests for ref-pref, and test-pref
-ref-pref(font.size.variable.x-western,16) == font-size-16.html font-size-16.html
-ref-pref(font.size.variable.x-western,16) == font-size-24.html font-size-24.html
-ref-pref(font.size.variable.x-western,24) == font-size-24.html font-size-24.html
-ref-pref(font.size.variable.x-western,24) == font-size-16.html font-size-16.html
-fails ref-pref(font.size.variable.x-western,false) == font-size-16.html font-size-16.html
-fails ref-pref(font.size.variable.x-western,"foo") == font-size-16.html font-size-16.html
-skip test-pref(font.size.variable.x-western,16) == font-default.html font-default.html
-skip test-pref(font.size.variable.x-western,16) == font-default.html font-default.html
-skip test-pref(font.size.variable.x-western,24) == font-default.html font-default.html
-skip test-pref(font.size.variable.x-western,24) == font-default.html font-default.html
-skip test-pref(font.size.variable.x-western,false) == font-default.html font-default.html
-skip test-pref(font.size.variable.x-western,"foo") == font-default.html font-default.html
-skip ref-pref(font.size.variable.x-western,16) test-pref(font.size.variable.x-western,24) == font-default.html font-default.html
-skip ref-pref(font.size.variable.x-western,24) test-pref(font.size.variable.x-western,16) == font-default.html font-default.html
-skip ref-pref(font.size.variable.x-western,24) test-pref(font.size.variable.x-western,24) == font-default.html font-default.html
-# reftest syntax: fuzzy(maxPixelDifference,maxNumberDifferingPixels)
-fuzzy(1,250000) == fuzzy.html fuzzy.html
-fuzzy(1,250000) == too-fuzzy.html too-fuzzy.html
-fuzzy-if(true,1,250000) == fuzzy.html fuzzy.html
-fuzzy-if(false,2,1) == fuzzy-ref.html fuzzy-ref.html
-# When using 565 fuzzy.html and fuzzy-ref.html will compare as equal
-fuzzy-if(false,2,1) random-if(Android) == fuzzy.html fuzzy.html
-
-# Test that reftest-no-paint fails correctly
-== reftest-no-paint.html reftest-no-paint.html
-
-skip-if(!asyncPan||!browserIsRemote) == async-scroll-1a.html async-scroll-1a.html
-
-# Disable low-res painting for this test as it will cause more to
-# be drawn than we want.
-default-preferences pref(layers.low-precision-buffer,false)
-skip-if(!asyncPan||!browserIsRemote) == async-scroll-1b.html async-scroll-1b.html
-default-preferences
-
-skip-if(!asyncZoom) == async-zoom-1.html async-zoom-1.html
-skip-if(!asyncZoom) == async-zoom-2.html async-zoom-2.html
-
-# reftest-opaque-layer
-== reftest-opaque-layer-pass.html reftest-opaque-layer-pass.html
-== reftest-opaque-layer-pass.html reftest-opaque-layer-pass.html
-skip == about:blank about:blank
-fails == reftest-opaque-layer-fail.html reftest-opaque-layer-fail.html
-
-# If reftest-opaque-layer fails (no matter whether it fails in the test or in the reference),
-# it shouldn't matter whether the test matches the reference.
-fails == reftest-opaque-layer-fail.html reftest-opaque-layer-fail.html
-fails == reftest-opaque-layer-fail.html reftest-opaque-layer-fail.html
-skip == about:blank about:blank
-fails == reftest-opaque-layer-fail.html reftest-opaque-layer-fail.html
-skip == about:blank about:blank
-
-# reftest-opaque-layer and reftest-wait
-fails == reftest-opaque-layer-wait-pass.html reftest-opaque-layer-wait-pass.html
-fails == reftest-opaque-layer-wait-pass.html reftest-opaque-layer-wait-pass.html
-== reftest-opaque-layer-wait-fail.html reftest-opaque-layer-wait-fail.html
-== reftest-opaque-layer-wait-fail.html reftest-opaque-layer-wait-fail.html
-
-# reftest-assigned-layer
-== reftest-assigned-layer-pass.html reftest-assigned-layer-pass.html
-fails == reftest-assigned-layer-fail-1.html reftest-assigned-layer-fail-1.html
-fails == reftest-assigned-layer-fail-2.html reftest-assigned-layer-fail-2.html
-fails == reftest-assigned-layer-fail-3.html reftest-assigned-layer-fail-3.html
-fails == reftest-assigned-layer-fail-4.html reftest-assigned-layer-fail-4.html
diff --git a/layout/reftests/reftest-sanity/reftest.list b/layout/reftests/reftest-sanity/reftest.list
index a11abc467..eb4f185ee 100644
--- a/layout/reftests/reftest-sanity/reftest.list
+++ b/layout/reftests/reftest-sanity/reftest.list
@@ -44,7 +44,7 @@ HTTP(..) == filter-2.xhtml filter-2-ref.xhtml
== zoom-invalidation.html zoom-invalidation-ref.html # bug 773482
# test that xulRuntime.OS works
-fails-if(xulRuntime.OS!="Linux"&&!Android) == data:text/html,<body>Linux data:text/html,<script>document.write(navigator.platform.substr(0,5))</script>
+fails-if(xulRuntime.OS!="Linux") == data:text/html,<body>Linux data:text/html,<script>document.write(navigator.platform.substr(0,5))</script>
fails-if(xulRuntime.OS!="WINNT") == data:text/html,<body>Win data:text/html,<script>document.write(navigator.platform.substr(0,3))</script>
fails-if(xulRuntime.OS!="Darwin") == data:text/html,<body>Mac data:text/html,<script>document.write(navigator.platform.substr(0,3))</script>
@@ -91,7 +91,7 @@ needs-focus == data:text/plain, about:blank
# Sanity check of viewport+displayport overrides
pref(dom.meta-viewport.enabled,true) skip-if(!browserIsRemote) != test-displayport-2.html test-displayport-ref.html # bug 593168
-skip-if(!browserIsRemote) fails-if(OSX&&layersGPUAccelerated) fuzzy-if(layersOMTC,1,1390) random-if(Android) random-if(transparentScrollbars) == 647192-1.html 647192-1-ref.html
+skip-if(!browserIsRemote) fails-if(OSX&&layersGPUAccelerated) fuzzy-if(layersOMTC,1,1390) random-if(transparentScrollbars) == 647192-1.html 647192-1-ref.html
skip-if(!browserIsRemote) == 656041-1.html 656041-1-ref.html
pref(dom.meta-viewport.enabled,true) skip-if(!browserIsRemote||layersOMTC) == test-displayport-bg.html test-displayport-ref.html # bug 694706
@@ -153,7 +153,7 @@ fuzzy(1,250000) != too-fuzzy.html fuzzy-ref.html
fuzzy-if(true,1,250000) == fuzzy.html fuzzy-ref.html
fuzzy-if(false,2,1) == fuzzy-ref.html fuzzy-ref.html
# When using 565 fuzzy.html and fuzzy-ref.html will compare as equal
-fails fuzzy-if(false,2,1) random-if(Android) == fuzzy.html fuzzy-ref.html
+fails fuzzy-if(false,2,1) == fuzzy.html fuzzy-ref.html
# Test that reftest-no-paint fails correctly
fails == reftest-no-paint.html reftest-no-paint-ref.html
@@ -166,8 +166,6 @@ default-preferences pref(layers.low-precision-buffer,false)
skip-if(!asyncPan||!browserIsRemote) != async-scroll-1b.html async-scroll-1-ref.html
default-preferences
-skip-if(!Android) pref(apz.allow_zooming,true) != async-zoom-1.html async-zoom-1-ref.html
-fuzzy(112,800) skip-if(!Android) pref(apz.allow_zooming,true) == async-zoom-2.html async-zoom-2-ref.html
# reftest-opaque-layer
== reftest-opaque-layer-pass.html reftest-opaque-layer-pass.html
diff --git a/layout/reftests/reftest-stylo.list b/layout/reftests/reftest-stylo.list
deleted file mode 100644
index 54afc3dac..000000000
--- a/layout/reftests/reftest-stylo.list
+++ /dev/null
@@ -1,422 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# If you mark a test as failing or random, you MUST file a bug report in
-# bugzilla and note the bug number as a comment on the line with the
-# failing test.
-#
-# Please keep the tests in alphabetical order unless there is a reason
-# for something to not be in order.
-
-# verify the tests work
-include reftest-sanity/reftest-stylo.list
-
-# images (if ImageLib is busted, could result in weird failures in other tests)
-include ../../image/test/reftest/reftest-stylo.list
-
-# CSSWG tests
-include w3c-css/submitted/reftest-stylo.list
-include w3c-css/received/reftest-stylo.list
-
-# relative and absolute positioning
-include abs-pos/reftest-stylo.list
-include position-relative/reftest-stylo.list
-
-include async-scrolling/reftest-stylo.list
-
-# backgrounds/
-include backgrounds/reftest-stylo.list
-
-# bidi/
-include bidi/reftest-stylo.list
-
-# border with dashed/dotted
-include border-dotted/reftest-stylo.list
-
-# border-image
-include border-image/reftest-stylo.list
-
-# border-radius/
-include border-radius/reftest-stylo.list
-
-# -moz-box tests
-include box/reftest-stylo.list
-
-# box-ordinal/
-include box-ordinal/reftest-stylo.list
-
-# box-properties/
-include box-properties/reftest-stylo.list
-
-# box-shadow/
-include box-shadow/reftest-stylo.list
-
-# bugs/
-include bugs/reftest-stylo.list
-
-# canvas
-include canvas/reftest-stylo.list
-include ../../dom/canvas/test/reftest/reftest-stylo.list
-
-# css animations
-# disabled due to timeouts
-# include css-animations/reftest-stylo.list
-
-# blending/
-include css-blending/reftest-stylo.list
-
-# Tests for the css-break spec
-include css-break/reftest-stylo.list
-
-# css calc() tests
-include css-calc/reftest-stylo.list
-
-# css character encoding tests
-include css-charset/reftest-stylo.list
-
-# css default pseudo class tests
-include css-default/reftest-stylo.list
-
-# css-display spec tests
-include css-display/reftest-stylo.list
-
-# css :disable tests
-include css-disabled/reftest-stylo.list
-
-# css :enable tests
-include css-enabled/reftest-stylo.list
-
-# css @import tests
-include css-import/reftest-stylo.list
-
-# css gradients
-include css-gradients/reftest-stylo.list
-
-# css media queries (tests for print mode)
-include css-mediaqueries/reftest-stylo.list
-
-# css parsing
-include css-parsing/reftest-stylo.list
-
-# css placeholder
-include css-placeholder/reftest-stylo.list
-
-# css ruby
-include css-ruby/reftest-stylo.list
-
-# css required
-include css-required/reftest-stylo.list
-
-# css optional
-include css-optional/reftest-stylo.list
-
-# css valid
-include css-valid/reftest-stylo.list
-
-# css invalid
-include css-invalid/reftest-stylo.list
-
-# css-submit-invalid
-include css-submit-invalid/reftest-stylo.list
-
-# css text-overflow
-include text-overflow/reftest-stylo.list
-
-# css selectors
-include css-selectors/reftest-stylo.list
-
-# css sizing
-include css-sizing/reftest-stylo.list
-
-# css transitions
-include css-transitions/reftest-stylo.list
-
-# css :-moz-ui-invalid
-include css-ui-invalid/reftest-stylo.list
-
-# css :-moz-ui-valid
-include css-ui-valid/reftest-stylo.list
-
-# css values and units
-include css-valuesandunits/reftest-stylo.list
-
-# css variables
-include css-variables/reftest-stylo.list
-
-# Reftests in css-visited are run using
-# layout/style/test/test_visited_reftests instead of using the reftest
-# harness.
-
-include cssom/reftest-stylo.list
-
-# columns/
-include columns/reftest-stylo.list
-
-# content/
-include ../../dom/tests/reftest/reftest-stylo.list
-
-# counters/
-include counters/reftest-stylo.list
-
-# counter-style/
-include counter-style/reftest-stylo.list
-
-# datalist
-include datalist/reftest-stylo.list
-
-# details and summary
-include details-summary/reftest-stylo.list
-
-# dom/
-include dom/reftest-stylo.list
-
-# generated-content/
-include generated-content/reftest-stylo.list
-
-# first-letter/
-include first-letter/reftest-stylo.list
-
-# first-line/
-include first-line/reftest-stylo.list
-
-# flexbox (display: flex, display: inline-flex)
-include flexbox/reftest-stylo.list
-
-# CSS Grid (display: grid, display: inline-grid)
-include css-grid/reftest-stylo.list
-
-# floats/
-include floats/reftest-stylo.list
-
-# font-face
-# Lots of Stylo intermittents
-# include font-face/reftest-stylo.list
-
-# font features (opentype)
-include font-features/reftest-stylo.list
-
-# mobile font size inflation
-skip-if((B2G&&browserIsRemote)||Mulet) include font-inflation/reftest-stylo.list
-# Bug 972697
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-# CSS Font Loading API
-include font-loading-api/reftest-stylo.list
-
-# font matching
-include font-matching/reftest-stylo.list
-
-# forms
-include forms/reftest-stylo.list
-
-# gfx
-include ../../gfx/tests/reftest/reftest-stylo.list
-
-# block-inside-inline splits
-include ib-split/reftest-stylo.list
-
-# image/
-include image/reftest-stylo.list
-
-# image-element/
-include image-element/reftest-stylo.list
-
-# image-rect/
-include image-rect/reftest-stylo.list
-
-# image-region/
-include image-region/reftest-stylo.list
-
-# indic shaping with harfbuzz
-include indic-shaping/reftest-stylo.list
-
-# inline layout
-include inline/reftest-stylo.list
-
-# inline borders and padding
-include inline-borderpadding/reftest-stylo.list
-
-# layers/
-include layers/reftest-stylo.list
-
-# line-breaking/
-include line-breaking/reftest-stylo.list
-
-# list-item/
-include list-item/reftest-stylo.list
-
-# mathml/
-include mathml/reftest-stylo.list
-
-# margin-collapsing
-include margin-collapsing/reftest-stylo.list
-
-# native-theme/
-# skipping for B2G since something around radio-nonnative.html makes the whole suite hang
-skip-if(B2G||Android||Mulet) include native-theme/reftest-stylo.list
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-# netwerk/
-include ../../netwerk/test/reftest/reftest-stylo.list
-
-include outline/reftest-stylo.list
-
-# object/
-# include object/reftest-stylo.list
-
-# ogg-video/
-skip-if(!B2G&&browserIsRemote) include ogg-video/reftest-stylo.list
-
-# webm-video/
-# skip-if(!B2G&&browserIsRemote) include webm-video/reftest-stylo.list
-
-# mp4-video/
-skip-if(!B2G&&browserIsRemote) include mp4-video/reftest-stylo.list
-
-# parser/
-include ../../parser/htmlparser/tests/reftest/reftest-stylo.list
-
-# percent-overflow-sizing/
-include percent-overflow-sizing/reftest-stylo.list
-
-# pixel-rounding/
-include pixel-rounding/reftest-stylo.list
-
-# plugin/
-# include ../../dom/plugins/test/reftest/reftest-stylo.list
-
-# position-dynamic-changes/
-include position-dynamic-changes/reftest-stylo.list
-
-# printing
-include printing/reftest-stylo.list
-include pagination/reftest-stylo.list
-
-# <style scoped>
-include scoped-style/reftest-stylo.list
-
-# scrolling
-include scrolling/reftest-stylo.list
-
-# selection
-include selection/reftest-stylo.list
-
-# sticky positioning
-include position-sticky/reftest-stylo.list
-
-# svg/
-include svg/reftest-stylo.list
-
-# tab-size/
-include tab-size/reftest-stylo.list
-
-# table-anonymous-boxes/
-include table-anonymous-boxes/reftest-stylo.list
-
-# table-background/
-include table-background/reftest-stylo.list
-
-# table-bordercollapse/
-include table-bordercollapse/reftest-stylo.list
-
-# table-dom/
-include table-dom/reftest-stylo.list
-
-# table-html/
-include table-html/reftest-stylo.list
-
-include table-overflow/reftest-stylo.list
-
-# table-width/
-include table-width/reftest-stylo.list
-
-include ../tables/reftests/reftest-stylo.list
-
-# text/
-include text/reftest-stylo.list
-
-# text-stroke
-include text-stroke/reftest-stylo.list
-
-# text-decoration/
-include text-decoration/reftest-stylo.list
-
-# text-indent/
-include text-indent/reftest-stylo.list
-
-# text-shadow/
-include text-shadow/reftest-stylo.list
-
-# text-svgglyphs/
-include text-svgglyphs/reftest-stylo.list
-
-# text-transform/
-include text-transform/reftest-stylo.list
-
-# theme (osx)
-include ../../toolkit/themes/osx/reftests/reftest-stylo.list
-
-include ../../toolkit/content/tests/reftests/reftest-stylo.list
-
-# -moz-transform/
-include transform/reftest-stylo.list
-
-# 3d transforms
-include transform-3d/reftest-stylo.list
-
-# unicode/ (verify that we don't do expend effort doing unicode-aware case checks)
-include unicode/reftest-stylo.list
-
-include view-source/reftest-stylo.list
-
-# web-animations
-include web-animations/reftest-stylo.list
-
-# webcomponents/
-include webcomponents/reftest-stylo.list
-
-# widget/
-include ../../widget/reftests/reftest-stylo.list
-
-# xml-stylesheet/
-include ../../dom/tests/reftest/xml-stylesheet/reftest-stylo.list
-
-# xul-document-load/ (no XUL theme on Android)
-skip-if(Android) include xul-document-load/reftest-stylo.list
-
-# xul/ (no XUL theme on Android)
-skip-if(Android) include xul/reftest-stylo.list
-
-# xul (no XUL theme on Android)
-skip-if(Android) include ../xul/reftest/reftest-stylo.list
-
-# xul grid (no XUL theme on Android)
-skip-if(Android) include ../xul/grid/reftests/reftest-stylo.list
-
-# -webkit-box & associated properties (mapped to modern flexbox)
-include webkit-box/reftest-stylo.list
-
-# -webkit-gradient expressions
-include webkit-gradient/reftest-stylo.list
-
-# writing-mode
-include writing-mode/reftest-stylo.list
-
-# z-index/
-include z-index/reftest-stylo.list
-
-# reftest(s) to verify content bugfixes
-include ../../dom/html/reftests/reftest-stylo.list
-
-# editor/
-include ../../editor/reftests/reftest-stylo.list
-
-# box-sizing
-include box-sizing/reftest-stylo.list
-
-# invalidation
-include invalidation/reftest-stylo.list
-
-# encodings
-include ../../dom/encoding/test/reftest/reftest-stylo.list
-
-# APZ/async positioning tests
-include ../../gfx/layers/apz/test/reftest/reftest-stylo.list
diff --git a/layout/reftests/reftest.list b/layout/reftests/reftest.list
index b06eba58e..90320cba3 100644
--- a/layout/reftests/reftest.list
+++ b/layout/reftests/reftest.list
@@ -248,8 +248,7 @@ include mathml/reftest.list
include margin-collapsing/reftest.list
# native-theme/
-# (no XUL theme on Android)
-skip-if(Android) include native-theme/reftest.list
+include native-theme/reftest.list
# netwerk/
include ../../netwerk/test/reftest/reftest.list
@@ -376,17 +375,17 @@ include ../../widget/reftests/reftest.list
# xml-stylesheet/
include ../../dom/tests/reftest/xml-stylesheet/reftest.list
-# xul-document-load/ (no XUL theme on Android)
-skip-if(Android) include xul-document-load/reftest.list
+# xul-document-load/
+include xul-document-load/reftest.list
-# xul/ (no XUL theme on Android)
-skip-if(Android) include xul/reftest.list
+# xul/
+include xul/reftest.list
-# xul (no XUL theme on Android)
-skip-if(Android) include ../xul/reftest/reftest.list
+# xul
+include ../xul/reftest/reftest.list
-# xul grid (no XUL theme on Android)
-skip-if(Android) include ../xul/grid/reftests/reftest.list
+# xul grid
+include ../xul/grid/reftests/reftest.list
# -webkit-box & associated properties (mapped to modern flexbox)
include webkit-box/reftest.list
diff --git a/layout/reftests/scoped-style/reftest-stylo.list b/layout/reftests/scoped-style/reftest-stylo.list
deleted file mode 100644
index 52e136b94..000000000
--- a/layout/reftests/scoped-style/reftest-stylo.list
+++ /dev/null
@@ -1,58 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== scoped-style-001.html scoped-style-001.html
-== scoped-style-002.html scoped-style-002.html
-== scoped-style-003.html scoped-style-003.html
-== scoped-style-004.html scoped-style-004.html
-== scoped-style-005.html scoped-style-005.html
-== scoped-style-006.html scoped-style-006.html
-== scoped-style-007.html scoped-style-007.html
-== scoped-style-008.html scoped-style-008.html
-== scoped-style-009.html scoped-style-009.html
-== scoped-style-010.html scoped-style-010.html
-== scoped-style-011.html scoped-style-011.html
-== scoped-style-012.html scoped-style-012.html
-== scoped-style-013.html scoped-style-013.html
-== scoped-style-014.html scoped-style-014.html
-== scoped-style-015.html scoped-style-015.html
-== scoped-style-016.html scoped-style-016.html
-== scoped-style-017.html scoped-style-017.html
-== scoped-style-018.html scoped-style-018.html
-== scoped-style-019.svg scoped-style-019.svg
-== scoped-style-020.html scoped-style-020.html
-== scoped-style-021.html scoped-style-021.html
-== scoped-style-022.html scoped-style-022.html
-== scoped-style-023.html scoped-style-023.html
-== scoped-style-024.html scoped-style-024.html
-skip == scoped-style-important-001.html scoped-style-important-001.html
-== scoped-style-important-002.html scoped-style-important-002.html
-== scoped-style-important-003.html scoped-style-important-003.html
-== scoped-style-important-004.html scoped-style-important-004.html
-== scoped-style-important-005.html scoped-style-important-005.html
-== scoped-style-important-006.html scoped-style-important-006.html
-== scoped-style-important-007.html scoped-style-important-007.html
-== scoped-style-dynamic-001.html scoped-style-dynamic-001.html
-== scoped-style-dynamic-002.html scoped-style-dynamic-002.html
-== scoped-style-dynamic-003.html scoped-style-dynamic-003.html
-== scoped-style-dynamic-004.html scoped-style-dynamic-004.html
-== scoped-style-dynamic-005.html scoped-style-dynamic-005.html
-== scoped-style-dynamic-006.html scoped-style-dynamic-006.html
-== scoped-style-dynamic-007.html scoped-style-dynamic-007.html
-== scoped-style-dynamic-008.html scoped-style-dynamic-008.html
-== scoped-style-dynamic-009.html scoped-style-dynamic-009.html
-== scoped-style-dynamic-010.html scoped-style-dynamic-010.html
-== scoped-style-dynamic-011.html scoped-style-dynamic-011.html
-== scoped-style-dynamic-012.svg scoped-style-dynamic-012.svg
-== scoped-style-dynamic-013.svg scoped-style-dynamic-013.svg
-== scoped-style-dynamic-014.svg scoped-style-dynamic-014.svg
-== scoped-style-dynamic-015.svg scoped-style-dynamic-015.svg
-== scoped-style-import.html scoped-style-import.html
-== scoped-style-media.html scoped-style-media.html
-== scoped-style-namespace.html scoped-style-namespace.html
-== scoped-style-charset.html scoped-style-charset.html
-== scoped-style-document.html scoped-style-document.html
-HTTP(..) == scoped-style-font-face.html scoped-style-font-face.html
-== scoped-style-keyframes.html scoped-style-keyframes.html
-== scoped-style-supports.html scoped-style-supports.html
-pref(layout.css.scope-pseudo.enabled,true) == scoped-style-pseudo-001.html scoped-style-pseudo-001.html
-pref(layout.css.scope-pseudo.enabled,true) == scoped-style-pseudo-002.html scoped-style-pseudo-002.html
-pref(layout.css.scope-pseudo.enabled,true) == scoped-style-pseudo-003.html scoped-style-pseudo-003.html
diff --git a/layout/reftests/scrolling/reftest-stylo.list b/layout/reftests/scrolling/reftest-stylo.list
deleted file mode 100644
index 496795585..000000000
--- a/layout/reftests/scrolling/reftest-stylo.list
+++ /dev/null
@@ -1,69 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-skip HTTP == deferred-anchor.xhtml#d deferred-anchor.xhtml#d
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip == deferred-anchor2.xhtml deferred-anchor2.xhtml
-# bug 1182632
-HTTP == fixed-1.html fixed-1.html
-random HTTP == fixed-table-1.html fixed-table-1.html
-HTTP == fixed-opacity-1.html fixed-opacity-1.html
-skip-if(B2G||Mulet) HTTP == fixed-opacity-2.html fixed-opacity-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-random HTTP == fixed-text-1.html fixed-text-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-HTTP == fixed-text-2.html fixed-text-2.html
-random-if(Android) skip-if((B2G&&browserIsRemote)||Mulet) fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),1,12) == iframe-border-radius.html iframe-border-radius.html
-# bug 760269
-# Initial mulet triage: parity with B2G/B2G Desktop
-random-if(Android) HTTP == image-1.html image-1.html
-skip == opacity-mixed-scrolling-1.html opacity-mixed-scrolling-1.html
-# bug 760269
-skip == opacity-mixed-scrolling-2.html opacity-mixed-scrolling-2.html
-# see bug 625357
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(Android) pref(layout.css.scroll-behavior.enabled,true) pref(layout.css.scroll-behavior.property-enabled,true) == scroll-behavior-1.html scroll-behavior-1.html
-# see bug 1041833
-skip-if(Android) pref(layout.css.scroll-behavior.enabled,true) pref(layout.css.scroll-behavior.property-enabled,true) == scroll-behavior-2.html scroll-behavior-2.html
-# see bug 1041833
-skip-if(Mulet) skip-if(Android) pref(layout.css.scroll-behavior.enabled,true) pref(layout.css.scroll-behavior.property-enabled,true) == scroll-behavior-3.html scroll-behavior-3.html
-# see bug 1041833
-# MULET: Bug 1144079: Re-enable Mulet mochitests and reftests taskcluster-specific disables
-skip-if(Mulet) skip-if(Android) pref(layout.css.scroll-behavior.enabled,true) pref(layout.css.scroll-behavior.property-enabled,true) == scroll-behavior-4.html scroll-behavior-4.html
-# see bug 1041833
-# MULET: Bug 1144079: Re-enable Mulet mochitests and reftests taskcluster-specific disables
-skip-if(Mulet) skip-if(Android) pref(layout.css.scroll-behavior.enabled,true) pref(layout.css.scroll-behavior.property-enabled,true) == scroll-behavior-5.html scroll-behavior-5.html
-# see bug 1041833
-# MULET: Bug 1144079: Re-enable Mulet mochitests and reftests taskcluster-specific disables
-skip-if(Android) pref(layout.css.scroll-behavior.enabled,true) pref(layout.css.scroll-behavior.property-enabled,true) == scroll-behavior-6.html scroll-behavior-6.html
-# see bug 1041833
-skip-if(Android) pref(layout.css.scroll-behavior.enabled,true) pref(layout.css.scroll-behavior.property-enabled,true) == scroll-behavior-7.html scroll-behavior-7.html
-# see bug 1041833
-skip-if(Android) pref(layout.css.scroll-behavior.enabled,true) pref(layout.css.scroll-behavior.property-enabled,true) == scroll-behavior-8.html scroll-behavior-8.html
-# see bug 1041833
-skip == scroll-behavior-9.html scroll-behavior-9.html
-# see bug 1041833
-skip-if(Android) pref(layout.css.scroll-behavior.enabled,true) pref(layout.css.scroll-behavior.property-enabled,true) == scroll-behavior-10.html scroll-behavior-10.html
-# see bug 1041833
-skip-if((B2G&&browserIsRemote)||Mulet) HTTP == simple-1.html simple-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip skip-if(B2G||Mulet) HTTP == subpixel-1.html#d subpixel-1.html#d
-# Initial mulet triage: parity with B2G/B2G Desktop
-random HTTP == text-1.html text-1.html
-fuzzy-if(Android,4,120) HTTP == text-2.html?up text-2.html?up
-skip-if(B2G||Mulet) fuzzy-if(d2d,1,4) HTTP == transformed-1.html transformed-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-HTTP == transformed-1.html?up transformed-1.html?up
-fuzzy-if(Android,5,20000) == uncovering-1.html uncovering-1.html
-fuzzy-if(Android,5,20000) == uncovering-2.html uncovering-2.html
-skip-if(B2G||Mulet) fuzzy-if(asyncPan&&!layersGPUAccelerated,121,3721) == less-than-scrollbar-height.html less-than-scrollbar-height.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == huge-horizontal-overflow.html huge-horizontal-overflow.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == huge-vertical-overflow.html huge-vertical-overflow.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fuzzy-if(asyncPan&&!layersGPUAccelerated,102,6818) == iframe-scrolling-attr-1.html iframe-scrolling-attr-1.html
-skip-if((B2G&&browserIsRemote)||Mulet) fuzzy-if(asyncPan&&!layersGPUAccelerated,102,6818) == iframe-scrolling-attr-2.html iframe-scrolling-attr-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== frame-scrolling-attr-1.html frame-scrolling-attr-1.html
-fuzzy-if(asyncPan&&!layersGPUAccelerated,102,2420) == frame-scrolling-attr-2.html frame-scrolling-attr-2.html
-== move-item.html move-item.html
-# bug 1125750
diff --git a/layout/reftests/scrolling/reftest.list b/layout/reftests/scrolling/reftest.list
index 43997ced7..81fcb09ec 100644
--- a/layout/reftests/scrolling/reftest.list
+++ b/layout/reftests/scrolling/reftest.list
@@ -4,30 +4,30 @@ HTTP == fixed-1.html fixed-1.html?ref
fuzzy-if(skiaContent,1,32200) HTTP == fixed-table-1.html fixed-table-1.html?ref
HTTP == fixed-opacity-1.html fixed-opacity-1.html?ref
HTTP == fixed-opacity-2.html fixed-opacity-2.html?ref
-random-if(gtkWidget) fuzzy-if(Android,3,60) HTTP == fixed-text-1.html fixed-text-1.html?ref
+random-if(gtkWidget) HTTP == fixed-text-1.html fixed-text-1.html?ref
HTTP == fixed-text-2.html fixed-text-2.html?ref
-random-if(Android) fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),1,12) == iframe-border-radius.html iframe-border-radius-ref.html # bug 760269
-random-if(Android) HTTP == image-1.html image-1.html?ref
-random-if(Android) HTTP == opacity-mixed-scrolling-1.html opacity-mixed-scrolling-1.html?ref # bug 760269
+fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),1,12) == iframe-border-radius.html iframe-border-radius-ref.html # bug 760269
+HTTP == image-1.html image-1.html?ref
+HTTP == opacity-mixed-scrolling-1.html opacity-mixed-scrolling-1.html?ref # bug 760269
random-if(cocoaWidget) HTTP == opacity-mixed-scrolling-2.html opacity-mixed-scrolling-2.html?ref # see bug 625357
-skip-if(Android) pref(layout.css.scroll-behavior.enabled,true) pref(layout.css.scroll-behavior.property-enabled,true) == scroll-behavior-1.html scroll-behavior-1.html?ref # see bug 1041833
-skip-if(Android) pref(layout.css.scroll-behavior.enabled,true) pref(layout.css.scroll-behavior.property-enabled,true) == scroll-behavior-2.html scroll-behavior-2.html?ref # see bug 1041833
-skip-if(Android) pref(layout.css.scroll-behavior.enabled,true) pref(layout.css.scroll-behavior.property-enabled,true) == scroll-behavior-3.html scroll-behavior-3.html?ref # see bug 1041833
-skip-if(Android) pref(layout.css.scroll-behavior.enabled,true) pref(layout.css.scroll-behavior.property-enabled,true) == scroll-behavior-4.html scroll-behavior-4.html?ref # see bug 1041833
-skip-if(Android) pref(layout.css.scroll-behavior.enabled,true) pref(layout.css.scroll-behavior.property-enabled,true) == scroll-behavior-5.html scroll-behavior-5.html?ref # see bug 1041833
-skip-if(Android) pref(layout.css.scroll-behavior.enabled,true) pref(layout.css.scroll-behavior.property-enabled,true) == scroll-behavior-6.html scroll-behavior-6.html?ref # see bug 1041833
-skip-if(Android) pref(layout.css.scroll-behavior.enabled,true) pref(layout.css.scroll-behavior.property-enabled,true) == scroll-behavior-7.html scroll-behavior-7.html?ref # see bug 1041833
-skip-if(Android) pref(layout.css.scroll-behavior.enabled,true) pref(layout.css.scroll-behavior.property-enabled,true) == scroll-behavior-8.html scroll-behavior-8.html?ref # see bug 1041833
-skip-if(Android) pref(layout.css.scroll-behavior.enabled,true) pref(layout.css.scroll-behavior.property-enabled,true) == scroll-behavior-9.html scroll-behavior-9.html?ref # see bug 1041833
-skip-if(Android) pref(layout.css.scroll-behavior.enabled,true) pref(layout.css.scroll-behavior.property-enabled,true) == scroll-behavior-10.html scroll-behavior-10.html?ref # see bug 1041833
+pref(layout.css.scroll-behavior.enabled,true) pref(layout.css.scroll-behavior.property-enabled,true) == scroll-behavior-1.html scroll-behavior-1.html?ref # see bug 1041833
+pref(layout.css.scroll-behavior.enabled,true) pref(layout.css.scroll-behavior.property-enabled,true) == scroll-behavior-2.html scroll-behavior-2.html?ref # see bug 1041833
+pref(layout.css.scroll-behavior.enabled,true) pref(layout.css.scroll-behavior.property-enabled,true) == scroll-behavior-3.html scroll-behavior-3.html?ref # see bug 1041833
+pref(layout.css.scroll-behavior.enabled,true) pref(layout.css.scroll-behavior.property-enabled,true) == scroll-behavior-4.html scroll-behavior-4.html?ref # see bug 1041833
+pref(layout.css.scroll-behavior.enabled,true) pref(layout.css.scroll-behavior.property-enabled,true) == scroll-behavior-5.html scroll-behavior-5.html?ref # see bug 1041833
+pref(layout.css.scroll-behavior.enabled,true) pref(layout.css.scroll-behavior.property-enabled,true) == scroll-behavior-6.html scroll-behavior-6.html?ref # see bug 1041833
+pref(layout.css.scroll-behavior.enabled,true) pref(layout.css.scroll-behavior.property-enabled,true) == scroll-behavior-7.html scroll-behavior-7.html?ref # see bug 1041833
+pref(layout.css.scroll-behavior.enabled,true) pref(layout.css.scroll-behavior.property-enabled,true) == scroll-behavior-8.html scroll-behavior-8.html?ref # see bug 1041833
+pref(layout.css.scroll-behavior.enabled,true) pref(layout.css.scroll-behavior.property-enabled,true) == scroll-behavior-9.html scroll-behavior-9.html?ref # see bug 1041833
+pref(layout.css.scroll-behavior.enabled,true) pref(layout.css.scroll-behavior.property-enabled,true) == scroll-behavior-10.html scroll-behavior-10.html?ref # see bug 1041833
HTTP == simple-1.html simple-1.html?ref
HTTP == subpixel-1.html#d subpixel-1-ref.html#d
-fuzzy-if(Android,4,120) HTTP == text-1.html text-1.html?ref
-fuzzy-if(Android,4,120) HTTP == text-2.html?up text-2.html?ref
+HTTP == text-1.html text-1.html?ref
+HTTP == text-2.html?up text-2.html?ref
fuzzy-if(d2d,1,4) HTTP == transformed-1.html transformed-1.html?ref
HTTP == transformed-1.html?up transformed-1.html?ref
-fuzzy-if(Android,5,20000) == uncovering-1.html uncovering-1-ref.html
-fuzzy-if(Android,5,20000) == uncovering-2.html uncovering-2-ref.html
+== uncovering-1.html uncovering-1-ref.html
+== uncovering-2.html uncovering-2-ref.html
fuzzy-if(asyncPan&&!layersGPUAccelerated,140,4520) == less-than-scrollbar-height.html less-than-scrollbar-height-ref.html
== huge-horizontal-overflow.html huge-horizontal-overflow-ref.html
== huge-vertical-overflow.html huge-vertical-overflow-ref.html
diff --git a/layout/reftests/selection/reftest-stylo.list b/layout/reftests/selection/reftest-stylo.list
deleted file mode 100644
index c85f4468f..000000000
--- a/layout/reftests/selection/reftest-stylo.list
+++ /dev/null
@@ -1,43 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-fails fuzzy-if(skiaContent,1,30) == dynamic-text-1a.html dynamic-text-1a.html
-fails fuzzy-if(skiaContent,1,40) == dynamic-text-1b.html dynamic-text-1b.html
-== extend-1-sanity.html extend-1-sanity.html
-fails fuzzy-if(skiaContent,1,1000) == extend-1a.html extend-1a.html
-fails fuzzy-if(skiaContent,1,10) == extend-1b.html extend-1b.html
-fails fuzzy-if(skiaContent,1,1000) == extend-1c.html extend-1c.html
-fails fuzzy-if(skiaContent,1,1000) == extend-1d.html extend-1d.html
-skip fuzzy-if(skiaContent,1,1000) == extend-1e.html extend-1e.html
-fails fuzzy-if(skiaContent,1,1000) == extend-1f.html extend-1f.html
-fails fuzzy-if(skiaContent,1,1000) == extend-1g.html extend-1g.html
-fails fuzzy-if(skiaContent,1,1000) == extend-1h.html extend-1h.html
-fails fuzzy-if(skiaContent,1,10) == extend-1i.html extend-1i.html
-== extend-2a.html extend-2a.html
-== extend-2b.html extend-2b.html
-== extend-3-sanity.html extend-3-sanity.html
-fuzzy-if(skiaContent,1,700) == extend-3a.html extend-3a.html
-fuzzy-if(skiaContent,1,700) == extend-3b.html extend-3b.html
-fuzzy-if(skiaContent,1,700) == extend-3c.html extend-3c.html
-fuzzy-if(skiaContent,1,700) == extend-3d.html extend-3d.html
-fuzzy-if(skiaContent,1,700) == extend-3e.html extend-3e.html
-fuzzy-if(skiaContent,1,700) == extend-3f.html extend-3f.html
-fuzzy-if(skiaContent,1,700) == extend-3g.html extend-3g.html
-fuzzy-if(skiaContent,1,700) == extend-3h.html extend-3h.html
-fuzzy-if(skiaContent,1,700) == extend-3i.html extend-3i.html
-== extend-4a.html extend-4a.html
-== extend-4b.html extend-4b.html
-# these 3 random-if(Android) are a difference of Native & Xul, see bug 739714
-skip random-if(Android||B2G||Mulet) needs-focus == pseudo-element-of-native-anonymous.html pseudo-element-of-native-anonymous.html
-# bug 676641
-# Initial mulet triage: parity with B2G/B2G Desktop
-# These tests uses Highlight and HighlightText color keywords, they are not same as text selection color on Mac.
-random-if(Android||B2G||Mulet) fails-if(cocoaWidget) needs-focus == non-themed-widget.html non-themed-widget.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-random-if(Android||B2G||Mulet) fails-if(cocoaWidget) needs-focus == themed-widget.html themed-widget.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== addrange-1.html addrange-1.html
-fuzzy-if(skiaContent,1,1200) == addrange-2.html addrange-2.html
-skip == splitText-normalize.html splitText-normalize.html
-skip == modify-range.html modify-range.html
-skip == dom-mutations.html dom-mutations.html
-fuzzy-if(OSX==1010,9,1) fuzzy-if(OSX&&skiaContent,6,1) fuzzy-if(skiaContent&&!OSX,1,2138) == trailing-space-1.html trailing-space-1.html
diff --git a/layout/reftests/selection/reftest.list b/layout/reftests/selection/reftest.list
index 4b20b4790..024a9ea86 100644
--- a/layout/reftests/selection/reftest.list
+++ b/layout/reftests/selection/reftest.list
@@ -24,11 +24,10 @@ fuzzy-if(skiaContent,1,700) == extend-3h.html extend-3-ref.html
fuzzy-if(skiaContent,1,700) == extend-3i.html extend-3-ref.html
== extend-4a.html extend-4-ref.html
== extend-4b.html extend-4-ref.html
-# these 3 random-if(Android) are a difference of Native & Xul, see bug 739714
-random-if(Android) needs-focus != pseudo-element-of-native-anonymous.html pseudo-element-of-native-anonymous-ref.html # bug 676641
+needs-focus != pseudo-element-of-native-anonymous.html pseudo-element-of-native-anonymous-ref.html # bug 676641
# These tests uses Highlight and HighlightText color keywords, they are not same as text selection color on Mac.
-random-if(Android) fails-if(cocoaWidget) needs-focus == non-themed-widget.html non-themed-widget-ref.html
-random-if(Android) fails-if(cocoaWidget) needs-focus == themed-widget.html themed-widget-ref.html
+fails-if(cocoaWidget) needs-focus == non-themed-widget.html non-themed-widget-ref.html
+fails-if(cocoaWidget) needs-focus == themed-widget.html themed-widget-ref.html
== addrange-1.html addrange-ref.html
fuzzy-if(skiaContent,1,1200) == addrange-2.html addrange-ref.html
== splitText-normalize.html splitText-normalize-ref.html
diff --git a/layout/reftests/svg/as-image/reftest-stylo.list b/layout/reftests/svg/as-image/reftest-stylo.list
deleted file mode 100644
index da8acdfff..000000000
--- a/layout/reftests/svg/as-image/reftest-stylo.list
+++ /dev/null
@@ -1,275 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# Tests related to SVG being used as an image
-
-# zoom/
-include zoom/reftest-stylo.list
-
-# Background-image tests
-skip-if(Mulet) == background-display-none-1.html background-display-none-1.html
-# MULET: Bug 1144079: Re-enable Mulet mochitests and reftests taskcluster-specific disables
-skip-if(B2G||Mulet) == background-simple-1.html background-simple-1.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== background-simple-2.html background-simple-2.html
-
-# Sightly trickier background-image test
-== background-viewBox-1.html background-viewBox-1.html
-
-# background tests with the background area getting resized
-== background-resize-1.html background-resize-1.html
-== background-resize-2.html background-resize-2.html
-== background-resize-3.html background-resize-3.html
-== background-resize-4.html background-resize-4.html
-
-# Test for stretching background images by different amounts in each dimension
-== background-stretch-1.html background-stretch-1.html
-
-# Tests for scaling background images
-== background-scale-no-viewbox-1.html background-scale-no-viewbox-1.html
-== background-scale-with-viewbox-1.html background-scale-with-viewbox-1.html
-
-# Tests with -moz-image-rect()
-random == background-image-rect-1svg.html background-image-rect-1svg.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== background-image-rect-1png.html background-image-rect-1png.html
-== background-image-rect-2.html background-image-rect-2.html
-
-# Test for border-image
-== border-image-simple-1.html border-image-simple-1.html
-== border-image-simple-2.html border-image-simple-2.html
-
-# Test for canvas "drawImage" method
-== canvas-drawImage-simple-1a.html canvas-drawImage-simple-1a.html
-== canvas-drawImage-simple-1b.html canvas-drawImage-simple-1b.html
-
-skip-if(B2G||Mulet) == canvas-drawImage-scale-1a.html canvas-drawImage-scale-1a.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == canvas-drawImage-scale-1b.html canvas-drawImage-scale-1b.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == canvas-drawImage-scale-1c.html canvas-drawImage-scale-1c.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-fuzzy(1,2) fuzzy-if(skiaContent,1,529) == canvas-drawImage-scale-2a.html canvas-drawImage-scale-2a.html
-fuzzy(1,2) fuzzy-if(skiaContent,1,529) == canvas-drawImage-scale-2b.html canvas-drawImage-scale-2b.html
-
-fuzzy-if(winWidget&&!d2d,1,10000) fuzzy-if(azureSkia,1,10000) fuzzy-if(Android||B2G,1,10000) == canvas-drawImage-alpha-1.html canvas-drawImage-alpha-1.html
-#Same as scale-2a but with globalAlpha:
-fuzzy-if(azureSkia,1,40000) == canvas-drawImage-alpha-2.html canvas-drawImage-alpha-2.html
-
-skip-if(B2G||Mulet) == canvas-drawImage-slice-1a.html canvas-drawImage-slice-1a.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== canvas-drawImage-slice-1b.html canvas-drawImage-slice-1b.html
-
-== canvas-drawImage-origin-clean-1.html canvas-drawImage-origin-clean-1.html
-== canvas-drawImage-transform-restored.html canvas-drawImage-transform-restored.html
-
-# Simple <img> tests
-== img-simple-1.html img-simple-1.html
-== img-simple-2.html img-simple-2.html
-fuzzy-if(skiaContent,255,350) == img-simple-3.html img-simple-3.html
-== img-simple-4.html img-simple-4.html
-fails fuzzy-if(skiaContent,255,90) == img-simple-5.html img-simple-5.html
-skip-if(B2G||Mulet) == img-simple-6.html img-simple-6.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails fuzzy-if(skiaContent,255,27) == img-simple-7.html img-simple-7.html
-
-# Test with mix of <html:img> and <svg:image> referring to the same images,
-# with a variety of preserveAspectRatio values in play.
-random == img-and-image-1.html img-and-image-1.html
-# bug 645267
-
-# More complex <img> tests
-== img-blobURI-1.html img-blobURI-1.html
-skip random == img-blobURI-2.html img-blobURI-2.html
-fuzzy-if(d2d,16,10) == img-content-outside-viewBox-1.html img-content-outside-viewBox-1.html
-# d2d is bug 1074161
-skip-if(Mulet) == img-display-none-1.html img-display-none-1.html
-# MULET: Bug 1144079: Re-enable Mulet mochitests and reftests taskcluster-specific disables
-== img-dyn-1.html img-dyn-1.html
-== img-foreignObject-1.html img-foreignObject-1.html
-
-# The following tests check that content embedded via <iframe> and <embed>
-# doesn't load (or execute scripts) in SVG-as-an-image.
-# The "!=" lines are to test that the SVG content, when viewed directly (not as
-# an image), does actually render its external content (making it look
-# different from the reference case). We don't do that check for
-# img-foreignObject-iframe-1a.html, though, because its SVG image tries to
-# alert(), and that'd trigger a reftest timeout if we loaded that file directly.
-== img-foreignObject-embed-1.html img-foreignObject-embed-1.html
-== img-foreignObject-embed-1-helper.svg img-foreignObject-embed-1-helper.svg
-== img-foreignObject-iframe-1a.html img-foreignObject-iframe-1a.html
-== img-foreignObject-iframe-1b.html img-foreignObject-iframe-1b.html
-== img-foreignObject-iframe-1b-helper.svg img-foreignObject-iframe-1b-helper.svg
-
-== img-widthAndHeight-meet-1.html img-widthAndHeight-meet-1.html
-skip == img-widthAndHeight-meet-2.html img-widthAndHeight-meet-2.html
-== img-widthAndHeight-slice-1.html img-widthAndHeight-slice-1.html
-== img-widthAndHeight-slice-2.html img-widthAndHeight-slice-2.html
-
-== img-height-meet-1.html img-height-meet-1.html
-== img-height-meet-2.html img-height-meet-2.html
-== img-height-slice-1.html img-height-slice-1.html
-== img-height-slice-2.html img-height-slice-2.html
-
-== img-width-meet-1.html img-width-meet-1.html
-== img-width-meet-2.html img-width-meet-2.html
-== img-width-slice-1.html img-width-slice-1.html
-== img-width-slice-2.html img-width-slice-2.html
-
-# Alternate version of "width & height both non-%-valued" tests, but now
-# with no explicit viewBox, to trigger "synthesize-viewBox" behavior
-== img-novb-widthAndHeight-meet-1-em.html img-novb-widthAndHeight-meet-1-em.html
-== img-novb-widthAndHeight-meet-1-px.html img-novb-widthAndHeight-meet-1-px.html
-== img-novb-widthAndHeight-slice-1-em.html img-novb-widthAndHeight-slice-1-em.html
-== img-novb-widthAndHeight-slice-1-px.html img-novb-widthAndHeight-slice-1-px.html
-
-# Alternate versions of "only one dimension is non-%-valued" tests, but now
-# with no explicit viewBox, to trigger "synthesize-viewBox" behavior
-== img-novb-height-meet-1.html img-novb-height-meet-1.html
-== img-novb-height-slice-1.html img-novb-height-slice-1.html
-fuzzy-if(skiaContent,255,10) == img-novb-width-meet-1.html img-novb-width-meet-1.html
-fuzzy-if(skiaContent,255,10) == img-novb-width-slice-1.html img-novb-width-slice-1.html
-
-# with with a fragmentIdentifier viewBox
-skip-if(B2G||Mulet) == img-fragment-1a.html img-fragment-1a.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == img-fragment-1b.html img-fragment-1b.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == img-fragment-1c.html img-fragment-1c.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == img-fragment-2a.html img-fragment-2a.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == img-fragment-2b.html img-fragment-2b.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == img-fragment-2c.html img-fragment-2c.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-fuzzy-if(B2G,68,4) == list-simple-1.html list-simple-1.html
-
-== svg-image-simple-1.svg svg-image-simple-1.svg
-== svg-image-simple-2.svg svg-image-simple-2.svg
-== svg-image-simple-3.svg svg-image-simple-3.svg
-
-# tests for <svg> files that include themselves as an <image>
-== svg-image-recursive-1a.svg svg-image-recursive-1a.svg
-== svg-image-recursive-1b.svg svg-image-recursive-1b.svg
-== svg-image-recursive-2a.svg svg-image-recursive-2a.svg
-== svg-image-recursive-2b.html svg-image-recursive-2b.html
-
-# test that scripting feature is not supported in images or referenced documents
-skip skip-if(B2G||Mulet) == svg-image-script-1.svg svg-image-script-1.svg
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip == svg-image-script-2.svg svg-image-script-2.svg
-
-# tests for external resources vs. data URIs in SVG as an image
-== svg-image-datauri-1.html svg-image-datauri-1.html
-HTTP == svg-image-datauri-1.html svg-image-datauri-1.html
-== svg-image-external-1.html svg-image-external-1.html
-HTTP == svg-image-external-1.html svg-image-external-1.html
-== svg-stylesheet-datauri-1.html svg-stylesheet-datauri-1.html
-HTTP == svg-stylesheet-datauri-1.html svg-stylesheet-datauri-1.html
-== svg-stylesheet-external-1.html svg-stylesheet-external-1.html
-HTTP == svg-stylesheet-external-1.html svg-stylesheet-external-1.html
-
-# test that :visited status is ignored in image documents
-# We load the images directly first, to be sure history is populated.
-# It's also good to verify that the helper images don't match lime100x100.svg
-# in non-image contexts, but for that to work, we have to reliably count on
-# :visited styles loading (asynchronously), so we test that in
-# layout/style/test/test_visited_reftests.html instead of the reftest harness.
-== svg-image-visited-1-helper.svg svg-image-visited-1-helper.svg
-== svg-image-visited-1.html svg-image-visited-1.html
-== svg-image-visited-2-helper.svg svg-image-visited-2-helper.svg
-skip == svg-image-visited-2.html svg-image-visited-2.html
-
-# Test for painting problems with SVGs used in border images.
-# XXXseth: The underlying problems also apply to media fragments,
-# but the test case would be much simpler. This should be switched
-# over to use media fragments once bug 790640 lands.
-skip-if(B2G||Mulet) fuzzy(2,1) == svg-border-image-repaint-1.html svg-border-image-repaint-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-# Tests for image-orientation with a viewbox and an intrinsic size:
-== image-orientation-viewbox-and-size.html?0 image-orientation-viewbox-and-size.html?0
-== image-orientation-viewbox-and-size.html?90 image-orientation-viewbox-and-size.html?90
-== image-orientation-viewbox-and-size.html?180 image-orientation-viewbox-and-size.html?180
-== image-orientation-viewbox-and-size.html?270 image-orientation-viewbox-and-size.html?270
-== image-orientation-viewbox-and-size.html?0&flip image-orientation-viewbox-and-size.html?0&flip
-== image-orientation-viewbox-and-size.html?90&flip image-orientation-viewbox-and-size.html?90&flip
-== image-orientation-viewbox-and-size.html?180&flip image-orientation-viewbox-and-size.html?180&flip
-== image-orientation-viewbox-and-size.html?270&flip image-orientation-viewbox-and-size.html?270&flip
-
-# Tests for image-orientation with a viewbox and no intrinsic size:
-== image-orientation-viewbox-no-size.html?0 image-orientation-viewbox-no-size.html?0
-== image-orientation-viewbox-no-size.html?90 image-orientation-viewbox-no-size.html?90
-== image-orientation-viewbox-no-size.html?180 image-orientation-viewbox-no-size.html?180
-== image-orientation-viewbox-no-size.html?270 image-orientation-viewbox-no-size.html?270
-== image-orientation-viewbox-no-size.html?0&flip image-orientation-viewbox-no-size.html?0&flip
-== image-orientation-viewbox-no-size.html?90&flip image-orientation-viewbox-no-size.html?90&flip
-== image-orientation-viewbox-no-size.html?180&flip image-orientation-viewbox-no-size.html?180&flip
-== image-orientation-viewbox-no-size.html?270&flip image-orientation-viewbox-no-size.html?270&flip
-
-# Tests for image-orientation with no viewbox and an intrinsic size:
-== image-orientation-no-viewbox-and-size.html?0 image-orientation-no-viewbox-and-size.html?0
-== image-orientation-no-viewbox-and-size.html?90 image-orientation-no-viewbox-and-size.html?90
-== image-orientation-no-viewbox-and-size.html?180 image-orientation-no-viewbox-and-size.html?180
-== image-orientation-no-viewbox-and-size.html?270 image-orientation-no-viewbox-and-size.html?270
-skip == image-orientation-no-viewbox-and-size.html?0&flip image-orientation-no-viewbox-and-size.html?0&flip
-== image-orientation-no-viewbox-and-size.html?90&flip image-orientation-no-viewbox-and-size.html?90&flip
-== image-orientation-no-viewbox-and-size.html?180&flip image-orientation-no-viewbox-and-size.html?180&flip
-skip == image-orientation-no-viewbox-and-size.html?270&flip image-orientation-no-viewbox-and-size.html?270&flip
-
-# Tests for image-orientation with no viewbox and no intrinsic size:
-== image-orientation-no-viewbox-no-size.html?0 image-orientation-no-viewbox-no-size.html?0
-== image-orientation-no-viewbox-no-size.html?90 image-orientation-no-viewbox-no-size.html?90
-== image-orientation-no-viewbox-no-size.html?180 image-orientation-no-viewbox-no-size.html?180
-== image-orientation-no-viewbox-no-size.html?270 image-orientation-no-viewbox-no-size.html?270
-== image-orientation-no-viewbox-no-size.html?0&flip image-orientation-no-viewbox-no-size.html?0&flip
-== image-orientation-no-viewbox-no-size.html?90&flip image-orientation-no-viewbox-no-size.html?90&flip
-== image-orientation-no-viewbox-no-size.html?180&flip image-orientation-no-viewbox-no-size.html?180&flip
-== image-orientation-no-viewbox-no-size.html?270&flip image-orientation-no-viewbox-no-size.html?270&flip
-
-# Test that 'image-orientation: from-image' has no effect, since SVGs don't have EXIF data.
-== image-orientation-viewbox-and-size.html?from-image image-orientation-viewbox-and-size.html?from-image
-== image-orientation-viewbox-no-size.html?from-image image-orientation-viewbox-no-size.html?from-image
-
-# Sanity checks for the image-orientation tests. Ensures that the various
-# combinations of rotations and flips actually look different from each other.
-== image-orientation-ref.html?0 image-orientation-ref.html?0
-== image-orientation-ref.html?0 image-orientation-ref.html?0
-== image-orientation-ref.html?0 image-orientation-ref.html?0
-== image-orientation-ref.html?90 image-orientation-ref.html?90
-== image-orientation-ref.html?90 image-orientation-ref.html?90
-== image-orientation-ref.html?180 image-orientation-ref.html?180
-== image-orientation-ref.html?0 image-orientation-ref.html?0
-== image-orientation-ref.html?90 image-orientation-ref.html?90
-== image-orientation-ref.html?180 image-orientation-ref.html?180
-== image-orientation-ref.html?270 image-orientation-ref.html?270
-
-# Tests that nonuniform scales work with SVG-as-image.
-== nonuniform-scale-2d.html?0.5&1.0 nonuniform-scale-2d.html?0.5&1.0
-== nonuniform-scale-2d.html?1.0&0.5 nonuniform-scale-2d.html?1.0&0.5
-== nonuniform-scale-3d.html?0.5&1.0&0.5 nonuniform-scale-3d.html?0.5&1.0&0.5
-== nonuniform-scale-3d.html?1.0&0.5&0.5 nonuniform-scale-3d.html?1.0&0.5&0.5
-
-# Sanity checks that nonuniform scales don't devolve to uniform scales.
-== nonuniform-scale-2d.html?0.3&1.0 nonuniform-scale-2d.html?0.3&1.0
-== nonuniform-scale-2d.html?0.3&1.0 nonuniform-scale-2d.html?0.3&1.0
-== nonuniform-scale-2d.html?1.0&0.3 nonuniform-scale-2d.html?1.0&0.3
-== nonuniform-scale-2d.html?1.0&0.3 nonuniform-scale-2d.html?1.0&0.3
-== nonuniform-scale-3d.html?0.3&1.0&0.3 nonuniform-scale-3d.html?0.3&1.0&0.3
-== nonuniform-scale-3d.html?0.3&1.0&0.3 nonuniform-scale-3d.html?0.3&1.0&0.3
-== nonuniform-scale-3d.html?1.0&0.3&0.3 nonuniform-scale-3d.html?1.0&0.3&0.3
-== nonuniform-scale-3d.html?1.0&0.3&0.3 nonuniform-scale-3d.html?1.0&0.3&0.3
-
-# Test for preserveAspectRatio with no-longer-supported "defer" keyword
-== defer-unsupported-1.svg defer-unsupported-1.svg
diff --git a/layout/reftests/svg/as-image/reftest.list b/layout/reftests/svg/as-image/reftest.list
index 75c149646..ff8eef230 100644
--- a/layout/reftests/svg/as-image/reftest.list
+++ b/layout/reftests/svg/as-image/reftest.list
@@ -44,7 +44,7 @@ include zoom/reftest.list
fuzzy(1,2) fuzzy-if(skiaContent,1,529) == canvas-drawImage-scale-2a.html canvas-drawImage-scale-2-ref.html
fuzzy(1,2) fuzzy-if(skiaContent,1,529) == canvas-drawImage-scale-2b.html canvas-drawImage-scale-2-ref.html
-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
+fuzzy-if(winWidget&&!d2d,1,10000) fuzzy-if(azureSkia,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(azureSkia,1,40000) == canvas-drawImage-alpha-2.html canvas-drawImage-alpha-2-ref.html
diff --git a/layout/reftests/svg/as-image/zoom/reftest-stylo.list b/layout/reftests/svg/as-image/zoom/reftest-stylo.list
deleted file mode 100644
index fe8a9bd67..000000000
--- a/layout/reftests/svg/as-image/zoom/reftest-stylo.list
+++ /dev/null
@@ -1,12 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# Tests related to SVG being used as an image, with zooming
-
-# Simple <img> tests
-fuzzy-if(skiaContent,1,408) == img-zoomIn-1.html img-zoomIn-1.html
-fuzzy-if(skiaContent,1,74) == img-zoomOut-1.html img-zoomOut-1.html
-
-# Ensure that scaled SVG images aren't fuzzy when tiled.
-== img-fuzzy-zoomOut-1.html img-fuzzy-zoomOut-1.html
-== img-fuzzy-zoomIn-1.html img-fuzzy-zoomIn-1.html
-== img-fuzzy-transform-zoomOut-1.html img-fuzzy-transform-zoomOut-1.html
-== img-fuzzy-transform-zoomIn-1.html img-fuzzy-transform-zoomIn-1.html
diff --git a/layout/reftests/svg/filters/css-filter-chains/reftest-stylo.list b/layout/reftests/svg/filters/css-filter-chains/reftest-stylo.list
deleted file mode 100644
index f1b5acf76..000000000
--- a/layout/reftests/svg/filters/css-filter-chains/reftest-stylo.list
+++ /dev/null
@@ -1,11 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# These tests verify that CSS filter chains behave properly.
-# e.g. filter: blur(3px) grayscale(0.5) invert(0.2);
-
-default-preferences pref(layout.css.filters.enabled,true)
-
-# Some platforms render this complex filter chain a little differently, and that's ok.
-fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu)&&layersGPUAccelerated,35,13057) == long-chain.html long-chain.html
-# Win10: Bug 1258241
-== moz-element.html moz-element.html
-== same-filter.html same-filter.html
diff --git a/layout/reftests/svg/filters/css-filters/reftest-stylo.list b/layout/reftests/svg/filters/css-filters/reftest-stylo.list
deleted file mode 100644
index 68ad536fc..000000000
--- a/layout/reftests/svg/filters/css-filters/reftest-stylo.list
+++ /dev/null
@@ -1,69 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# These tests verify that CSS filters behave properly.
-# e.g. filter: blur(3px)
-
-default-preferences pref(layout.css.filters.enabled,true)
-
-== blur.html blur.html
-== blur.svg blur.svg
-== blur-calc.html blur-calc.html
-== blur-calc-negative.html blur-calc-negative.html
-skip-if(d2d) == blur-cap-large-radius-on-software.html blur-cap-large-radius-on-software.html
-== blur-em-radius.html blur-em-radius.html
-== blur-invalid-radius.html blur-invalid-radius.html
-== blur-rem-radius.html blur-rem-radius.html
-== blur-zero-radius.html blur-zero-radius.html
-== blur-zoomed-page.html blur-zoomed-page.html
-== brightness.html brightness.html
-== brightness-darken.html brightness-darken.html
-== brightness-extreme.html brightness-extreme.html
-== brightness-one.html brightness-one.html
-== brightness-percent.html brightness-percent.html
-== brightness-zero.html brightness-zero.html
-== containing-block-1.html containing-block-1.html
-== contrast.html contrast.html
-== contrast-extreme.html contrast-extreme.html
-== contrast-one.html contrast-one.html
-== contrast-percent.html contrast-percent.html
-== contrast-reduce.html contrast-reduce.html
-== contrast-zero.html contrast-zero.html
-== drop-shadow.html drop-shadow.html
-== drop-shadow-default-color.html drop-shadow-default-color.html
-== drop-shadow-negative-offset.html drop-shadow-negative-offset.html
-fuzzy-if(d2d,1,10000) == grayscale.html grayscale.html
-fuzzy-if(d2d,1,10000) == grayscale-one.html grayscale-one.html
-fuzzy-if(d2d,1,10000) == grayscale-over-one.html grayscale-over-one.html
-fuzzy-if(d2d,1,10000) == grayscale-percent.html grayscale-percent.html
-== grayscale-zero.html grayscale-zero.html
-== hue-rotate.html hue-rotate.html
-== hue-rotate-360.html hue-rotate-360.html
-skip == hue-rotate-grad.html hue-rotate-grad.html
-fuzzy-if(d2d,2,7500) == hue-rotate-multichannel.html hue-rotate-multichannel.html
-== hue-rotate-negative.html hue-rotate-negative.html
-== hue-rotate-over-360.html hue-rotate-over-360.html
-== hue-rotate-rad.html hue-rotate-rad.html
-== hue-rotate-turn.html hue-rotate-turn.html
-== hue-rotate-zero.html hue-rotate-zero.html
-fuzzy-if(d2d,1,10000) == invert.html invert.html
-== invert-half.html invert-half.html
-== invert-one.html invert-one.html
-== invert-over-one.html invert-over-one.html
-fuzzy-if(d2d,1,10000) == invert-percent.html invert-percent.html
-== invert-zero.html invert-zero.html
-fuzzy-if(d2d,1,10000) == opacity.html opacity.html
-== opacity-one.html opacity-one.html
-== opacity-over-one.html opacity-over-one.html
-fails fuzzy-if(skiaContent,1,10000) == opacity-over-one-translucent-source.html opacity-over-one-translucent-source.html
-fuzzy-if(d2d,1,10000) == opacity-percent.html opacity-percent.html
-== opacity-zero.html opacity-zero.html
-== saturate.html saturate.html
-fuzzy-if(d2d,1,10000) == saturate-desaturate.html saturate-desaturate.html
-== saturate-extreme.html saturate-extreme.html
-== saturate-one.html saturate-one.html
-== saturate-percent.html saturate-percent.html
-fuzzy-if(d2d,1,10000) == saturate-zero.html saturate-zero.html
-fuzzy-if(d2d,1,10000) == sepia.html sepia.html
-fuzzy-if(d2d,1,10000) == sepia-one.html sepia-one.html
-fuzzy-if(d2d,1,10000) == sepia-over-one.html sepia-over-one.html
-fuzzy-if(d2d,1,10000) == sepia-percent.html sepia-percent.html
-== sepia-zero.html sepia-zero.html
diff --git a/layout/reftests/svg/filters/css-svg-filter-chains/reftest-stylo.list b/layout/reftests/svg/filters/css-svg-filter-chains/reftest-stylo.list
deleted file mode 100644
index c6fcd6cdc..000000000
--- a/layout/reftests/svg/filters/css-svg-filter-chains/reftest-stylo.list
+++ /dev/null
@@ -1,11 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# These tests verify that filter chains of combined CSS and SVG filters behave
-# properly.
-# e.g. filter: url(#f1) blur(3px) url(#2) grayscale(0.5);
-
-default-preferences pref(layout.css.filters.enabled,true)
-
-== clip-input-css-filter.html clip-input-css-filter.html
-== css-filter-first.html css-filter-first.html
-== css-filter-last.html css-filter-last.html
-== css-filter-middle.html css-filter-middle.html
diff --git a/layout/reftests/svg/filters/reftest-stylo.list b/layout/reftests/svg/filters/reftest-stylo.list
deleted file mode 100644
index 93586902e..000000000
--- a/layout/reftests/svg/filters/reftest-stylo.list
+++ /dev/null
@@ -1,128 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# In general, the fe*-1 tests test basic functionality clipped to a filter primitive
-# subregion. The fe*-2 tests test with no clipping (which stresses
-# the automatic optimal surface-size computation a bit more).
-
-# CSS filter tests
-include css-filters/reftest-stylo.list
-
-# CSS filter chain tests
-include css-filter-chains/reftest-stylo.list
-
-# Combined CSS and SVG filter chain tests
-include css-svg-filter-chains/reftest-stylo.list
-
-# SVG filter chain tests
-include svg-filter-chains/reftest-stylo.list
-
-== dynamic-filtered-foreignObject-01.svg dynamic-filtered-foreignObject-01.svg
-== dynamic-filter-invalidation-01.svg dynamic-filter-invalidation-01.svg
-== dynamic-filter-invalidation-02.svg dynamic-filter-invalidation-02.svg
-
-fuzzy(1,42500) == feBlend-1.svg feBlend-1.svg
-== feBlend-2.svg feBlend-2.svg
-
-skip fuzzy-if(d2d||skiaContent,1,6400) == feColorMatrix-1.svg feColorMatrix-1.svg
-fuzzy-if(d2d,1,10000) == feColorMatrix-2.svg feColorMatrix-2.svg
-
-== feComponentTransfer-1.svg feComponentTransfer-1.svg
-== feComponentTransfer-2.svg feComponentTransfer-2.svg
-
-fuzzy-if(d2d||skiaContent,1,9600) == feComposite-1.svg feComposite-1.svg
-fuzzy-if(d2d||skiaContent,1,10000) == feComposite-2.svg feComposite-2.svg
-
-== feConvolveMatrix-1.svg feConvolveMatrix-1.svg
-== feConvolveMatrix-2.svg feConvolveMatrix-2.svg
-
-== feDisplacementMap-1.svg feDisplacementMap-1.svg
-skip == feDisplacementMap-2.svg feDisplacementMap-2.svg
-
-fuzzy-if(d2d,1,6400) fuzzy-if(skiaContent,1,1600) == feFlood-1.svg feFlood-1.svg
-skip-if(d2d) fuzzy-if(skiaContent,1,6400) == feFlood-2.svg feFlood-2.svg
-
-fuzzy(1,6400) fuzzy-if(skiaContent,1,6404) == feGaussianBlur-1.svg feGaussianBlur-1.svg
-== feGaussianBlur-2.svg feGaussianBlur-2.svg
-# == feGaussianBlur-3.svg feGaussianBlur-3.svg
-== feGaussianBlur-4.svg feGaussianBlur-4.svg
-== feGaussianBlur-5.svg feGaussianBlur-5.svg
-== feGaussianBlur-6.svg feGaussianBlur-6.svg
-skip-if(d2d) == feGaussianBlur-cap-large-directional-radius-on-software.html feGaussianBlur-cap-large-directional-radius-on-software.html
-
-== feImage-1.svg feImage-1.svg
-# (Make sure our image renders at all)
-== feImage-1.svg feImage-1.svg
-== feImage-scale-to-primitive-subregion.html feImage-scale-to-primitive-subregion.html
-
-== feMerge-1.svg feMerge-1.svg
-== feMerge-2.svg feMerge-2.svg
-
-== feMorphology-1.svg feMorphology-1.svg
-== feMorphology-2.svg feMorphology-2.svg
-
-== feOffset-1.svg feOffset-1.svg
-== feOffset-2.svg feOffset-2.svg
-
-== feTile-1.svg feTile-1.svg
-== feTile-2.svg feTile-2.svg
-
-# no tests for feTurbulence
-
-== filter-clipped-rect-01.svg filter-clipped-rect-01.svg
-== filter-inner-svg-01.svg filter-inner-svg-01.svg
-== filter-inner-svg-02.svg filter-inner-svg-02.svg
-== filter-inner-svg-03.svg filter-inner-svg-03.svg
-== filter-marked-line-01.svg filter-marked-line-01.svg
-# bug 477704
-== filter-kernelUnitLength-01.svg filter-kernelUnitLength-01.svg
-== filter-marked-line-02.svg filter-marked-line-02.svg
-== filter-marked-line-03.svg filter-marked-line-03.svg
-== filter-marked-line-04.svg filter-marked-line-04.svg
-== filter-marked-line-05.svg filter-marked-line-05.svg
-== filter-marked-line-06.svg filter-marked-line-06.svg
-== filter-marked-line-07.svg filter-marked-line-07.svg
-== filter-marked-line-08.svg filter-marked-line-08.svg
-== filter-marked-line-09.svg filter-marked-line-09.svg
-== filter-nested-filtering-01.svg filter-nested-filtering-01.svg
-== filter-nested-filtering-02.svg filter-nested-filtering-02.svg
-== filter-patterned-rect-01.svg filter-patterned-rect-01.svg
-== filter-patterned-rect-02.svg filter-patterned-rect-02.svg
-
-== feColorMatrix-saturate-01.svg feColorMatrix-saturate-01.svg
-
-== feComponentTransfer-03.svg feComponentTransfer-03.svg
-== feComponentTransfer-04.svg feComponentTransfer-04.svg
-== feComposite-arguments-01.svg feComposite-arguments-01.svg
-fuzzy(1,26732) == feComposite-paint-01.svg feComposite-paint-01.svg
-fuzzy(1,10000) == feConvolveMatrix-bias-01.svg feConvolveMatrix-bias-01.svg
-== feConvolveMatrix-order-01.svg feConvolveMatrix-order-01.svg
-
-fuzzy-if(skiaContent,1,400) == feDisplacementMap-alpha-01.svg feDisplacementMap-alpha-01.svg
-fuzzy(2,500) == feDisplacementMap-colour-01.svg feDisplacementMap-colour-01.svg
-== feDisplacementMap-scale-01.svg feDisplacementMap-scale-01.svg
-
-== feDropShadow-01.svg feDropShadow-01.svg
-
-== feGaussianBlur-alpha-01.svg feGaussianBlur-alpha-01.svg
-
-== feMorphology-radius-negative-01.svg feMorphology-radius-negative-01.svg
-== feMorphology-radius-negative-02.svg feMorphology-radius-negative-02.svg
-== feMorphology-radius-zero-01.svg feMorphology-radius-zero-01.svg
-== feMorphology-radius-zero-02.svg feMorphology-radius-zero-02.svg
-
-== feTile-large-01.svg feTile-large-01.svg
-== feTile-large-02.svg feTile-large-02.svg
-== feTile-outside-01.svg feTile-outside-01.svg
-
-fuzzy(1,217) == feDiffuseLighting-1.svg feDiffuseLighting-1.svg
-
-fuzzy(2,2659) skip-if(d2d) == feSpecularLighting-1.svg feSpecularLighting-1.svg
-
-== filter-lighting-region.svg filter-lighting-region.svg
-
-== fePointLight-zoomed-page.svg fePointLight-zoomed-page.svg
-
-== feTurbulence-offset.svg feTurbulence-offset.svg
-
-== outside-sourcegraphic-1.svg outside-sourcegraphic-1.svg
-== outside-sourcegraphic-2.svg outside-sourcegraphic-2.svg
-== outside-sourcegraphic-3.svg outside-sourcegraphic-3.svg
diff --git a/layout/reftests/svg/filters/svg-filter-chains/reftest-stylo.list b/layout/reftests/svg/filters/svg-filter-chains/reftest-stylo.list
deleted file mode 100644
index dcab28c80..000000000
--- a/layout/reftests/svg/filters/svg-filter-chains/reftest-stylo.list
+++ /dev/null
@@ -1,19 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# These tests verify that SVG filter chains behave properly.
-# e.g. filter: url(#f1) url(#f2) url(#f3)
-
-default-preferences pref(layout.css.filters.enabled,true)
-
-== clip-input.svg clip-input.svg
-== clip-original-SourceGraphic.svg clip-original-SourceGraphic.svg
-== clip-output.svg clip-output.svg
-== default-subregion.svg default-subregion.svg
-== different-FillPaint-filter-regions.svg different-FillPaint-filter-regions.svg
-== different-StrokePaint-filter-regions.svg different-StrokePaint-filter-regions.svg
-== dont-clip-previous-primitives.svg dont-clip-previous-primitives.svg
-== intersecting-filter-regions.svg intersecting-filter-regions.svg
-== long-chain.svg long-chain.svg
-== multiple-primitives-per-filter.svg multiple-primitives-per-filter.svg
-== second-filter-uses-SourceAlpha.svg second-filter-uses-SourceAlpha.svg
-== second-filter-uses-SourceGraphic.svg second-filter-uses-SourceGraphic.svg
-== simple-chain.svg simple-chain.svg
diff --git a/layout/reftests/svg/image/reftest-stylo.list b/layout/reftests/svg/image/reftest-stylo.list
deleted file mode 100644
index 3b7af994a..000000000
--- a/layout/reftests/svg/image/reftest-stylo.list
+++ /dev/null
@@ -1,44 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# Tests of the SVG <image> element
-
-== image-fill-01.svg image-fill-01.svg
-== image-filter-01.svg image-filter-01.svg
-== image-load-01.svg image-load-01.svg
-skip fuzzy-if(Android&&!browserIsRemote,4,32) == image-opacity-01.svg image-opacity-01.svg
-# Bug 779514 for Android
-fuzzy-if(Android,4,34) == image-opacity-02.svg image-opacity-02.svg
-# Bug 776039 for Android
-== image-rotate-01.svg image-rotate-01.svg
-== image-rotate-02a.svg image-rotate-02a.svg
-== image-rotate-02b.svg image-rotate-02b.svg
-== image-scaling-01.svg image-scaling-01.svg
-== image-scaling-02.svg image-scaling-02.svg
-== image-svg-inline-01.html image-svg-inline-01.html
-== image-svg-inline-zoom-in-01a.html image-svg-inline-zoom-in-01a.html
-== image-svg-inline-zoom-in-01b.html image-svg-inline-zoom-in-01b.html
-== image-svg-inline-zoom-in-01c.html image-svg-inline-zoom-in-01c.html
-== image-svg-inline-zoom-in-01d.html image-svg-inline-zoom-in-01d.html
-== image-svg-inline-zoom-out-01a.html image-svg-inline-zoom-out-01a.html
-== image-svg-inline-zoom-out-01b.html image-svg-inline-zoom-out-01b.html
-== image-svg-inline-zoom-out-01c.html image-svg-inline-zoom-out-01c.html
-== image-svg-inline-zoom-out-01d.html image-svg-inline-zoom-out-01d.html
-== image-svg-inline-sprite-zoom-in-01a.html image-svg-inline-sprite-zoom-in-01a.html
-== image-svg-inline-sprite-zoom-in-01b.html image-svg-inline-sprite-zoom-in-01b.html
-== image-svg-inline-sprite-zoom-out-01a.html image-svg-inline-sprite-zoom-out-01a.html
-== image-svg-inline-sprite-zoom-out-01b.html image-svg-inline-sprite-zoom-out-01b.html
-== image-translate-01.svg image-translate-01.svg
-== image-x-01.svg image-x-01.svg
-== image-xy-01.svg image-xy-01.svg
-== image-y-01.svg image-y-01.svg
-== image-zoom-02.svg image-zoom-02.svg
-== imported-image-01.svg imported-image-01.svg
-== imported-image-02.svg imported-image-02.svg
-
-# Tests for <image> with preserveAspectRatio
-== image-preserveAspectRatio-01-raster.svg image-preserveAspectRatio-01-raster.svg
-== image-preserveAspectRatio-01-svg.svg image-preserveAspectRatio-01-svg.svg
-== image-preserveAspectRatio-02-raster.svg image-preserveAspectRatio-02-raster.svg
-== image-preserveAspectRatio-02-svg.svg image-preserveAspectRatio-02-svg.svg
-== image-preserveAspectRatio-03.svg image-preserveAspectRatio-03.svg
-== image-preserveAspectRatio-04.svg image-preserveAspectRatio-04.svg
-== image-preserveAspectRatio-05.svg image-preserveAspectRatio-05.svg
diff --git a/layout/reftests/svg/image/reftest.list b/layout/reftests/svg/image/reftest.list
index c49a2e5b1..8c5b5c3ee 100644
--- a/layout/reftests/svg/image/reftest.list
+++ b/layout/reftests/svg/image/reftest.list
@@ -3,8 +3,8 @@
== image-fill-01.svg ../pass.svg
== image-filter-01.svg image-filter-01-ref.svg
== image-load-01.svg ../pass.svg
-fuzzy-if(Android&&!browserIsRemote,4,32) == image-opacity-01.svg image-opacity-01-ref.svg # Bug 779514 for Android
-fuzzy-if(Android,4,34) == image-opacity-02.svg image-opacity-02-ref.svg # Bug 776039 for Android
+== image-opacity-01.svg image-opacity-01-ref.svg
+== image-opacity-02.svg image-opacity-02-ref.svg
== image-rotate-01.svg image-rotate-01-ref.svg
== image-rotate-02a.svg image-rotate-02-ref.svg
== image-rotate-02b.svg image-rotate-02-ref.svg
diff --git a/layout/reftests/svg/load-only/reftest-stylo.list b/layout/reftests/svg/load-only/reftest-stylo.list
deleted file mode 100644
index e444f0901..000000000
--- a/layout/reftests/svg/load-only/reftest-stylo.list
+++ /dev/null
@@ -1,4 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-
-skip load filter-primitives-01.svg
-
diff --git a/layout/reftests/svg/mask-img-ref.html b/layout/reftests/svg/mask-img-ref.html
index a9505112c..5504fbd01 100644
--- a/layout/reftests/svg/mask-img-ref.html
+++ b/layout/reftests/svg/mask-img-ref.html
@@ -2,7 +2,6 @@
<html>
<body style="margin:0">
<img src='data:image/svg+xml,
-<!-- vim: set expandtab ts=2 sw=2 tw=80: -->
<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%"
xmlns:xlink="http://www.w3.org/1999/xlink"
viewBox="0 0 700 130">
diff --git a/layout/reftests/svg/mask-img.html b/layout/reftests/svg/mask-img.html
index e080a1b08..31fe9b8c3 100644
--- a/layout/reftests/svg/mask-img.html
+++ b/layout/reftests/svg/mask-img.html
@@ -3,7 +3,6 @@
<body style="margin:0">
<div style="height:50px"></div>
<img border=0 src='data:image/svg+xml,
-<!-- vim: set expandtab ts=2 sw=2 tw=80: -->
<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%"
xmlns:xlink="http://www.w3.org/1999/xlink"
viewBox="0 0 700 80">
diff --git a/layout/reftests/svg/moz-only/reftest-stylo.list b/layout/reftests/svg/moz-only/reftest-stylo.list
deleted file mode 100644
index 19633a793..000000000
--- a/layout/reftests/svg/moz-only/reftest-stylo.list
+++ /dev/null
@@ -1,40 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-
-# XBL tests
-skip-if((B2G&&browserIsRemote)||Mulet) == xbl-basic-01.svg xbl-basic-01.svg
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == xbl-basic-02.svg xbl-basic-02.svg
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == xbl-basic-03.svg xbl-basic-03.svg
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == xbl-grad-ref--grad-in-binding-01.svg xbl-grad-ref--grad-in-binding-01.svg
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == xbl-grad-ref--grad-in-binding-02.svg xbl-grad-ref--grad-in-binding-02.svg
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == xbl-grad-ref--grad-in-bound-01.svg xbl-grad-ref--grad-in-bound-01.svg
-# Initial mulet triage: parity with B2G/B2G Desktop
-== xbl-grad-ref--grad-in-bound-02.svg xbl-grad-ref--grad-in-bound-02.svg
-== xbl-grad-ref--grad-in-resources-01.svg xbl-grad-ref--grad-in-resources-01.svg
-== xbl-grad-ref--grad-in-resources-02.svg xbl-grad-ref--grad-in-resources-02.svg
-skip-if((B2G&&browserIsRemote)||Mulet) == xbl-grad-ref--grad-in-binding-03.svg xbl-grad-ref--grad-in-binding-03.svg
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == xbl-grad-ref--grad-in-bound-03.svg xbl-grad-ref--grad-in-bound-03.svg
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == xbl-grad-ref--grad-in-binding-04.svg xbl-grad-ref--grad-in-binding-04.svg
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == xbl-grad-ref--grad-in-bound-04.svg xbl-grad-ref--grad-in-bound-04.svg
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-# Tests for zooming with the full page zoom UI
-skip-if(B2G||Mulet) random-if(d2d) == feImage-zoom-01a.svg feImage-zoom-01a.svg
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) random-if(d2d) == feImage-zoom-01b.svg feImage-zoom-01b.svg
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == foreignObject-zoom-01.svg foreignObject-zoom-01.svg
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == zoom-invalidation-01.svg zoom-invalidation-01.svg
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == replaced-element-zoom-01.html replaced-element-zoom-01.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fuzzy-if(winWidget,12,7) == zoomed-svg-with-viewBox-01.svg zoomed-svg-with-viewBox-01.svg
diff --git a/layout/reftests/svg/reftest-stylo.list b/layout/reftests/svg/reftest-stylo.list
deleted file mode 100644
index 27a7ac44f..000000000
--- a/layout/reftests/svg/reftest-stylo.list
+++ /dev/null
@@ -1,499 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# svg-as-an-image tests
-include as-image/reftest-stylo.list
-
-# <image> tests
-include image/reftest-stylo.list
-
-# sizing tests
-include sizing/reftest-stylo.list
-
-# filter tests
-include filters/reftest-stylo.list
-
-# smil / animation tests
-include smil/reftest-stylo.list
-
-# text tests
-include text/reftest-stylo.list
-
-# load only tests
-include load-only/reftest-stylo.list
-
-# Mozilla only tests (i.e. those containing XUL/XBL/etc.)
-include moz-only/reftest-stylo.list
-
-# svg-integration tests (using svg effects in e.g. HTML)
-include svg-integration/reftest-stylo.list
-
-== baseline-middle-01.svg baseline-middle-01.svg
-== border-radius-01.html border-radius-01.html
-== cssComment-in-attribute-01.svg cssComment-in-attribute-01.svg
-== clip-01.svg clip-01.svg
-== clip-02a.svg clip-02a.svg
-== clip-02b.svg clip-02b.svg
-== clipPath-advanced-01.svg clipPath-advanced-01.svg
-fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu)||/^Windows\x20NT\x206\.[12]/.test(http.oscpu),1,5) fuzzy-if(azureQuartz,1,6) fuzzy-if(OSX,1,6) fuzzy-if(skiaContent,1,300) == clipPath-and-shape-rendering-01.svg clipPath-and-shape-rendering-01.svg
-# bug 614840
-== clipPath-and-transform-01.svg clipPath-and-transform-01.svg
-== clipPath-basic-01.svg clipPath-basic-01.svg
-== clipPath-basic-02.svg clipPath-basic-02.svg
-== clipPath-basic-03.svg clipPath-basic-03.svg
-== clipPath-basic-04.svg clipPath-basic-04.svg
-== clipPath-basic-05.svg clipPath-basic-05.svg
-== clipPath-basic-06.svg clipPath-basic-06.svg
-== clipPath-basic-07.svg clipPath-basic-07.svg
-== clipPath-winding-01.svg clipPath-winding-01.svg
-== clip-surface-clone-01.svg clip-surface-clone-01.svg
-== conditions-01.svg conditions-01.svg
-== conditions-02.svg conditions-02.svg
-== conditions-03.svg conditions-03.svg
-== conditions-04.svg conditions-04.svg
-random-if(Mulet) == conditions-05.svg conditions-05.svg
-# bug 1178062
-skip == conditions-06.svg conditions-06.svg
-== conditions-07.svg conditions-07.svg
-fuzzy-if(skiaContent,1,320) == conditions-08.svg conditions-08.svg
-== conditions-09.svg conditions-09.svg
-== currentColor-01.svg currentColor-01.svg
-== currentColor-02.svg currentColor-02.svg
-== currentColor-03.svg currentColor-03.svg
-random == data-uri-with-filter-01.xhtml data-uri-with-filter-01.xhtml
-random == data-uri-with-gradient-01.xhtml data-uri-with-gradient-01.xhtml
-random == data-uri-with-pattern-01.xhtml data-uri-with-pattern-01.xhtml
-== dynamic-attr-removal-1.svg dynamic-attr-removal-1.svg
-== dynamic-attr-removal-2.svg dynamic-attr-removal-2.svg
-== dynamic-attr-change-1.svg dynamic-attr-change-1.svg
-== dynamic-attr-change-2.svg dynamic-attr-change-2.svg
-== dynamic-class-01.svg dynamic-class-01.svg
-fuzzy-if(Android,4,87) == dynamic-clipPath-01.svg dynamic-clipPath-01.svg
-== dynamic-clipPath-02.svg dynamic-clipPath-02.svg
-== dynamic-clipPath-clip-rule-01.svg dynamic-clipPath-clip-rule-01.svg
-== dynamic-conditions-01.svg dynamic-conditions-01.svg
-random-if(Mulet) == dynamic-conditions-02.svg dynamic-conditions-02.svg
-# bug 1178062
-== dynamic-conditions-03.svg dynamic-conditions-03.svg
-random-if(Mulet) == dynamic-conditions-04.svg dynamic-conditions-04.svg
-# bug 1178062
-== dynamic-conditions-05.svg dynamic-conditions-05.svg
-random-if(Mulet) == dynamic-conditions-06.svg dynamic-conditions-06.svg
-# bug 1178062
-== dynamic-conditions-07.svg dynamic-conditions-07.svg
-== dynamic-conditions-08.svg dynamic-conditions-08.svg
-random-if(Mulet) == dynamic-conditions-09.svg dynamic-conditions-09.svg
-# bug 1178062
-random-if(Mulet) == dynamic-conditions-10.svg dynamic-conditions-10.svg
-# bug 1178062
-== dynamic-conditions-11.svg dynamic-conditions-11.svg
-== dynamic-conditions-12.svg dynamic-conditions-12.svg
-random-if(Mulet) == dynamic-conditions-13.svg dynamic-conditions-13.svg
-# bug 1178062
-== dynamic-feFlood-01.svg dynamic-feFlood-01.svg
-asserts(0-1) == dynamic-feImage-01.svg dynamic-feImage-01.svg
-# intermittent assertions (bug 886080)
-== dynamic-fill-01.svg dynamic-fill-01.svg
-== dynamic-fill-rule-01.svg dynamic-fill-rule-01.svg
-fuzzy-if(d2d||skiaContent,1,10000) == dynamic-filter-contents-01a.svg dynamic-filter-contents-01a.svg
-fuzzy-if(d2d||skiaContent,1,10000) == dynamic-filter-contents-01b.svg dynamic-filter-contents-01b.svg
-== dynamic-gradient-contents-01.svg dynamic-gradient-contents-01.svg
-== dynamic-gradient-contents-02.svg dynamic-gradient-contents-02.svg
-== dynamic-inner-svg-01.svg dynamic-inner-svg-01.svg
-== dynamic-link-style-01.svg dynamic-link-style-01.svg
-== dynamic-marker-01.svg dynamic-marker-01.svg
-== dynamic-marker-02.svg dynamic-marker-02.svg
-== dynamic-marker-03.svg dynamic-marker-03.svg
-== dynamic-mask-01.svg dynamic-mask-01.svg
-== dynamic-mask-contents-01.svg dynamic-mask-contents-01.svg
-== dynamic-mask-pre-effects-bbox.html dynamic-mask-pre-effects-bbox.html
-== dynamic-opacity-property-01.svg dynamic-opacity-property-01.svg
-== dynamic-pattern-01.svg dynamic-pattern-01.svg
-== dynamic-pattern-02.svg dynamic-pattern-02.svg
-== dynamic-pattern-contents-01.svg dynamic-pattern-contents-01.svg
-== dynamic-pattern-contents-02.svg dynamic-pattern-contents-02.svg
-== dynamic-rect-01.svg dynamic-rect-01.svg
-fuzzy-if(d2d&&layersGPUAccelerated,3,1200) == dynamic-rect-02.svg dynamic-rect-02.svg
-# bug 776038 for Win7, Win8
-== dynamic-rect-03.svg dynamic-rect-03.svg
-== dynamic-rect-04.xhtml dynamic-rect-04.xhtml
-== dynamic-rect-05.svg dynamic-rect-05.svg
-== dynamic-reflow-01.svg dynamic-reflow-01.svg
-== dynamic-small-object-scaled-up-01.svg dynamic-small-object-scaled-up-01.svg
-== dynamic-small-object-scaled-up-02.svg dynamic-small-object-scaled-up-02.svg
-== dynamic-stroke-01.svg dynamic-stroke-01.svg
-== dynamic-stroke-opacity-01.svg dynamic-stroke-opacity-01.svg
-== dynamic-stroke-width-01.svg dynamic-stroke-width-01.svg
-== dynamic-switch-01.svg dynamic-switch-01.svg
-== dynamic-text-01.svg dynamic-text-01.svg
-fuzzy-if(d2d&&layersGPUAccelerated,3,12739) == dynamic-text-02.svg dynamic-text-02.svg
-# bug 776038 for Win7, Win8
-fuzzy-if(d2d&&layersGPUAccelerated,2,10539) == dynamic-text-03.svg dynamic-text-03.svg
-# bug 776038 for Win7
-random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu),47,89) == dynamic-text-04.svg dynamic-text-04.svg
-# bug 421587 for WinXP, bug 776038 for Win7
-== dynamic-text-05.svg dynamic-text-05.svg
-== dynamic-text-06.svg dynamic-text-06.svg
-== dynamic-text-07.svg dynamic-text-07.svg
-== dynamic-text-08.svg dynamic-text-08.svg
-== dynamic-text-attr-01.svg dynamic-text-attr-01.svg
-== dynamic-textPath-01.svg dynamic-textPath-01.svg
-== dynamic-textPath-02.svg dynamic-textPath-02.svg
-== dynamic-textPath-03.svg dynamic-textPath-03.svg
-== dynamic-use-01.svg dynamic-use-01.svg
-== dynamic-use-02.svg dynamic-use-02.svg
-== dynamic-use-03.svg dynamic-use-03.svg
-== dynamic-use-04.svg dynamic-use-04.svg
-== dynamic-use-05.svg dynamic-use-05.svg
-== dynamic-use-06.svg dynamic-use-06.svg
-== dynamic-use-07.svg dynamic-use-07.svg
-random == dynamic-use-nested-01a.svg dynamic-use-nested-01a.svg
-random == dynamic-use-nested-01b.svg dynamic-use-nested-01b.svg
-== dynamic-use-remove-width.svg dynamic-use-remove-width.svg
-== dynamic-viewBox-change-01.svg dynamic-viewBox-change-01.svg
-== dynamic-viewBox-change-02.svg dynamic-viewBox-change-02.svg
-== dynamic-viewBox-change-03.svg dynamic-viewBox-change-03.svg
-random == fragmentIdentifier-01.xhtml fragmentIdentifier-01.xhtml
-== linked-filter-01.svg linked-filter-01.svg
-== linked-pattern-01.svg linked-pattern-01.svg
-== use-01.svg use-01.svg
-== use-01-extref.svg use-01-extref.svg
-== use-02-extref.svg use-02-extref.svg
-== use-extref-dataURI-01.svg use-extref-dataURI-01.svg
-== use-children.svg use-children.svg
-== fallback-color-01a.svg fallback-color-01a.svg
-== fallback-color-01b.svg fallback-color-01b.svg
-== fallback-color-02a.svg fallback-color-02a.svg
-== fallback-color-02b.svg fallback-color-02b.svg
-== fallback-color-03.svg fallback-color-03.svg
-fuzzy-if(skiaContent,1,2) == fallback-color-04.svg fallback-color-04.svg
-== filter-basic-01.svg filter-basic-01.svg
-== filter-basic-02.svg filter-basic-02.svg
-== filter-basic-03.svg filter-basic-03.svg
-== filter-bounds-01.svg filter-bounds-01.svg
-== filter-bounds-02.svg filter-bounds-02.svg
-# This pref is normally on by default, but we turn it off in reftest runs to
-# disable an unnecessary security-check. This reftest is actually testing that
-# the security check works, though, so it needs the pref to be turned on:
-fails-if(Android||B2G) pref(security.fileuri.strict_origin_policy,true) == filter-extref-differentOrigin-01.svg filter-extref-differentOrigin-01.svg
-# Bug 695385
-== filter-foreignObject-01.svg filter-foreignObject-01.svg
-== filter-in-mask-01.svg filter-in-mask-01.svg
-== filter-invalidation-01.svg filter-invalidation-01.svg
-== filter-result-01.svg filter-result-01.svg
-== filter-scaled-01.svg filter-scaled-01.svg
-fuzzy-if(skiaContent,1,500) == filter-scaled-02.html filter-scaled-02.html
-== filter-translated-01.svg filter-translated-01.svg
-fuzzy-if(skiaContent,1,2500) == filters-and-group-opacity-01.svg filters-and-group-opacity-01.svg
-== foreignObject-01.svg foreignObject-01.svg
-== foreignObject-02.svg foreignObject-02.svg
-== foreignObject-ancestor-style-change-01.svg foreignObject-ancestor-style-change-01.svg
-== foreignObject-change-transform-01.svg foreignObject-change-transform-01.svg
-== foreignObject-display-01.svg foreignObject-display-01.svg
-== foreignObject-form-theme.svg foreignObject-form-theme.svg
-== foreignObject-img-form-theme.html foreignObject-img-form-theme.html
-== foreignObject-move-repaint-01.svg foreignObject-move-repaint-01.svg
-== foreignObject-overflow-01.svg foreignObject-overflow-01.svg
-== foreignObject-start-hidden-01.svg foreignObject-start-hidden-01.svg
-# followup from Bug 596765
-== foreignObject-start-hidden-02.svg foreignObject-start-hidden-02.svg
-== foreignObject-style-change-01.svg foreignObject-style-change-01.svg
-== foreignObject-dynamic-abspos-01.html foreignObject-dynamic-abspos-01.html
-fuzzy-if(Android,18,600) == foreignObject-fixedpos-01.html foreignObject-fixedpos-01.html
-== foreignObject-fixedpos-02.html foreignObject-fixedpos-02.html
-== foreignObject-dynamic-fixedpos-01.html foreignObject-dynamic-fixedpos-01.html
-== foreignObject-vertical-01.svg foreignObject-vertical-01.svg
-== g-transform-01.svg g-transform-01.svg
-== getElementById-a-element-01.svg getElementById-a-element-01.svg
-fuzzy-if(Android||B2G,9,980) skip-if(Mulet) fuzzy-if(skiaContent,3,32000) == gradient-live-01a.svg gradient-live-01a.svg
-# Initial mulet triage: parity with B2G/B2G Desktop
-# MULET: Bug 1144079: Re-enable Mulet mochitests and reftests taskcluster-specific disables
-fuzzy-if(Android||B2G,9,980) skip-if(Mulet) fuzzy-if(skiaContent,3,32000) == gradient-live-01b.svg gradient-live-01b.svg
-# Initial mulet triage: parity with B2G/B2G Desktop
-# MULET: Bug 1144079: Re-enable Mulet mochitests and reftests taskcluster-specific disables
-fuzzy-if(Android||B2G,9,980) skip-if(Mulet) fuzzy-if(skiaContent,3,32000) == gradient-live-01c.svg gradient-live-01c.svg
-# Initial mulet triage: parity with B2G/B2G Desktop
-# MULET: Bug 1144079: Re-enable Mulet mochitests and reftests taskcluster-specific disables
-fuzzy-if(Android||B2G,9,980) skip-if(Mulet) fuzzy-if(skiaContent,3,32000) == gradient-live-01d.svg gradient-live-01d.svg
-# Initial mulet triage: parity with B2G/B2G Desktop
-# MULET: Bug 1144079: Re-enable Mulet mochitests and reftests taskcluster-specific disables
-== gradient-transform-01.svg gradient-transform-01.svg
-fuzzy-if(skiaContent,1,550) == import-svg-01.html import-svg-01.html
-== invalid-text-01.svg invalid-text-01.svg
-== lang-attribute-01.svg lang-attribute-01.svg
-== lang-attribute-02.svg lang-attribute-02.svg
-== lang-attribute-03.svg lang-attribute-03.svg
-== linearGradient-basic-01.svg linearGradient-basic-01.svg
-== linearGradient-basic-02.svg linearGradient-basic-02.svg
-# off-by-one fuzziness expected. OS X is broken with bad aliasing though (bug 1023640).
-fuzzy-if(cocoaWidget,15,19679) fuzzy-if(winWidget,1,8800) fuzzy-if(!cocoaWidget&&!winWidget,1,4000) fuzzy-if(skiaContent,1,5000) == linearGradient-basic-03.svg linearGradient-basic-03.svg
-fuzzy-if(skiaContent,1,20000) == markers-and-group-opacity-01.svg markers-and-group-opacity-01.svg
-== marker-attribute-01.svg marker-attribute-01.svg
-== marker-effects-01.svg marker-effects-01.svg
-fuzzy-if(skiaContent,1,100) == marker-viewBox-01.svg marker-viewBox-01.svg
-fuzzy-if(skiaContent,1,100) == marker-orientation-01.svg marker-orientation-01.svg
-fuzzy-if(skiaContent,1,5) pref(svg.marker-improvements.enabled,true) == marker-orientation-02.svg marker-orientation-02.svg
-== marker-orientation-03.svg marker-orientation-03.svg
-== marker-orientation-04.svg marker-orientation-04.svg
-== mask-basic-01.svg mask-basic-01.svg
-== mask-basic-02.svg mask-basic-02.svg
-== mask-basic-03.svg mask-basic-03.svg
-== mask-basic-04.svg mask-basic-04.svg
-== mask-extref-dataURI-01.svg mask-extref-dataURI-01.svg
-== mask-containing-masked-content-01.svg mask-containing-masked-content-01.svg
-== mask-transformed-01.svg mask-transformed-01.svg
-== mask-transformed-02.svg mask-transformed-02.svg
-== mask-transformed-child-01.svg mask-transformed-child-01.svg
-# fuzzy because of the differences between clipPath and mask clipping
-== mask-and-clipPath.html mask-and-clipPath.html
-== mask-and-clipPath-2.svg mask-and-clipPath-2.svg
-fuzzy-if(d2d||skiaContent,1,6400) == mask-type-01.svg mask-type-01.svg
-fuzzy-if(d2d||skiaContent,1,6400) == mask-type-02.svg mask-type-02.svg
-fuzzy-if(d2d||skiaContent,1,6400) == mask-type-03.svg mask-type-03.svg
-fuzzy-if(d2d||skiaContent,1,6400) == mask-type-04.svg mask-type-04.svg
-== nested-viewBox-01.svg nested-viewBox-01.svg
-fuzzy-if(skiaContent,3,448000) == nesting-invalid-01.svg nesting-invalid-01.svg
-fuzzy-if(d2d&&/^Windows\x20NT\x20(6\.1|10\.0)/.test(http.oscpu),63,168) fuzzy-if(cocoaWidget,1,122) fuzzy-if(skiaContent,2,1000) == non-scaling-stroke-01.svg non-scaling-stroke-01.svg
-# bug 1074161 for Win7 and OSX 10.8
-fuzzy-if(gtkWidget,1,99) fuzzy-if(!contentSameGfxBackendAsCanvas,9,99) fuzzy-if(Android||B2G,9,586) == non-scaling-stroke-02.svg non-scaling-stroke-02.svg
-== non-scaling-stroke-03.svg non-scaling-stroke-03.svg
-== objectBoundingBox-and-clipPath.svg objectBoundingBox-and-clipPath.svg
-# Bug 588684
-random-if(gtkWidget) == objectBoundingBox-and-fePointLight-01.svg objectBoundingBox-and-fePointLight-01.svg
-random-if(gtkWidget) == objectBoundingBox-and-fePointLight-02.svg objectBoundingBox-and-fePointLight-02.svg
-== objectBoundingBox-and-mask.svg objectBoundingBox-and-mask.svg
-== objectBoundingBox-and-mask-02.svg objectBoundingBox-and-mask-02.svg
-== objectBoundingBox-and-pattern-01a.svg objectBoundingBox-and-pattern-01a.svg
-== objectBoundingBox-and-pattern-01b.svg objectBoundingBox-and-pattern-01b.svg
-== objectBoundingBox-and-pattern-01c.svg objectBoundingBox-and-pattern-01c.svg
-== objectBoundingBox-and-pattern-02.svg objectBoundingBox-and-pattern-02.svg
-== objectBoundingBox-and-pattern-03.svg objectBoundingBox-and-pattern-03.svg
-== opacity-and-gradient-01.svg opacity-and-gradient-01.svg
-skip-if(d2d) fuzzy-if(cocoaWidget,1,99974) fuzzy-if(skiaContent,1,200000) == opacity-and-gradient-02.svg opacity-and-gradient-02.svg
-== opacity-and-pattern-01.svg opacity-and-pattern-01.svg
-fuzzy-if(skiaContent,1,10000) == opacity-and-transform-01.svg opacity-and-transform-01.svg
-fuzzy-if(Android,8,200) random-if((B2G&&browserIsRemote)||Mulet) == outer-svg-border-and-padding-01.svg outer-svg-border-and-padding-01.svg
-# Initial mulet triage: parity with B2G/B2G Desktop
-== overflow-on-outer-svg-01.svg overflow-on-outer-svg-01.svg
-== overflow-on-outer-svg-02a.xhtml overflow-on-outer-svg-02a.xhtml
-== overflow-on-outer-svg-02b.xhtml overflow-on-outer-svg-02b.xhtml
-== overflow-on-outer-svg-02c.xhtml overflow-on-outer-svg-02c.xhtml
-== overflow-on-outer-svg-02d.xhtml overflow-on-outer-svg-02d.xhtml
-== overflow-on-outer-svg-03a.xhtml overflow-on-outer-svg-03a.xhtml
-== overflow-on-outer-svg-03b.xhtml overflow-on-outer-svg-03b.xhtml
-pref(svg.paint-order.enabled,true) == paint-order-01.svg paint-order-01.svg
-pref(svg.paint-order.enabled,true) == paint-order-02.svg paint-order-02.svg
-pref(svg.paint-order.enabled,true) == paint-order-03.svg paint-order-03.svg
-#fuzzy(23,60) fails-if(d2d) == path-01.svg path-01.svg
-== path-02.svg path-02.svg
-== path-03.svg path-03.svg
-== path-04.svg path-04.svg
-== path-05.svg path-05.svg
-fuzzy-if(skiaContent,1,400) == path-06.svg path-06.svg
-== path-07.svg path-07.svg
-== path-08.svg path-08.svg
-== pathLength-01.svg pathLength-01.svg
-== pathLength-02.svg pathLength-02.svg
-== pattern-basic-01.svg pattern-basic-01.svg
-== pattern-invalid-01.svg pattern-invalid-01.svg
-fuzzy-if(skiaContent,1,5) == pattern-live-01a.svg pattern-live-01a.svg
-fuzzy-if(skiaContent,1,5) == pattern-live-01b.svg pattern-live-01b.svg
-fuzzy-if(skiaContent,1,5) == pattern-live-01c.svg pattern-live-01c.svg
-fuzzy-if(skiaContent,1,5) == pattern-scale-01a.svg pattern-scale-01a.svg
-== pattern-scale-01b.svg pattern-scale-01b.svg
-fuzzy-if(skiaContent,3,5) == pattern-scale-01c.svg pattern-scale-01c.svg
-== pattern-transform-presence-01.svg pattern-transform-presence-01.svg
-== pattern-transformed-01.svg pattern-transformed-01.svg
-== polygon-01.svg polygon-01.svg
-== polygon-marker-01.svg polygon-marker-01.svg
-== polygon-points-negative-01.svg polygon-points-negative-01.svg
-== polyline-points-invalid-01.svg polyline-points-invalid-01.svg
-== pseudo-classes-01.svg pseudo-classes-01.svg
-# This test depends on :visited styles (which are asynchronous), so we run
-# it in layout/style/test/test_visited_reftests.html instead of using the
-# reftest harness.
-# == pseudo-classes-02.svg pseudo-classes-02.svg
-== radialGradient-basic-01.svg radialGradient-basic-01.svg
-== radialGradient-basic-02.svg radialGradient-basic-02.svg
-fuzzy-if(cocoaWidget,4,15982) fuzzy-if(winWidget,4,92) fuzzy-if(skiaContent,4,60) == radialGradient-basic-03.svg radialGradient-basic-03.svg
-== radialGradient-basic-04.svg radialGradient-basic-04.svg
-fuzzy-if(skiaContent,1,3600) == rect-01.svg rect-01.svg
-== rect-02.svg rect-02.svg
-== rect-03.svg rect-03.svg
-== rect-04.svg rect-04.svg
-== rect-with-rx-and-ry-01.svg rect-with-rx-and-ry-01.svg
-== rect-with-rx-or-ry-01.svg rect-with-rx-or-ry-01.svg
-== rootElement-null-01.svg rootElement-null-01.svg
-== script-empty-01.svg script-empty-01.svg
-== selector-01.svg selector-01.svg
-== stroke-linecap-circle-ellipse-01.svg stroke-linecap-circle-ellipse-01.svg
-== stroke-linecap-circle-ellipse-dashed-01.svg stroke-linecap-circle-ellipse-dashed-01.svg
-== stroke-width-percentage-01.svg stroke-width-percentage-01.svg
-== stroke-width-percentage-02a.svg stroke-width-percentage-02a.svg
-== stroke-width-percentage-02b.svg stroke-width-percentage-02b.svg
-== stroke-width-percentage-03.xhtml stroke-width-percentage-03.xhtml
-== style-property-on-script-element-01.svg style-property-on-script-element-01.svg
-== style-without-type-attribute.svg style-without-type-attribute.svg
-== svg-in-foreignObject-01.xhtml svg-in-foreignObject-01.xhtml
-fails fuzzy-if(skiaContent,1,2600) == svg-in-foreignObject-02.xhtml svg-in-foreignObject-02.xhtml
-# reuse -01-ref.xhtml
-== switch-01.svg switch-01.svg
-== suspend-01.svg suspend-01.svg
-== suspend-02.svg suspend-02.svg
-== suspend-03.svg suspend-03.svg
-== suspend-04.svg suspend-04.svg
-== suspend-05.svg suspend-05.svg
-== suspend-06.svg suspend-06.svg
-== suspend-07.svg suspend-07.svg
-== suspend-08.svg suspend-08.svg
-== svg-transform-01.svg svg-transform-01.svg
-== svg-transform-02.svg svg-transform-02.svg
-== symbol-01.svg symbol-01.svg
-== text-font-size-01.svg text-font-size-01.svg
-random-if(gtkWidget) == text-font-weight-01.svg text-font-weight-01.svg
-# bug 386713
-== text-gradient-01.svg text-gradient-01.svg
-random-if(winWidget) == text-gradient-02.svg text-gradient-02.svg
-# see bug 590101
-fuzzy-if(skiaContent,1,5500) == text-gradient-03.svg text-gradient-03.svg
-HTTP(..) == text-gradient-04.svg text-gradient-04.svg
-== text-in-link-01.svg text-in-link-01.svg
-== text-in-link-02.svg text-in-link-02.svg
-== text-in-link-03.svg text-in-link-03.svg
-# Tests for bug 546813: sanity-check using HTML text, then test SVG behavior.
-skip-if(B2G||Mulet) == text-language-00.xhtml text-language-00.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) random-if(gtkWidget) == text-language-01.xhtml text-language-01.xhtml
-# Fails on Linux tryserver due to lack of CJK fonts.
-# Initial mulet triage: parity with B2G/B2G Desktop
-fuzzy-if(OSX==1007,6,2) fuzzy-if(OSX==1008,46,26) == text-layout-01.svg text-layout-01.svg
-== text-layout-02.svg text-layout-02.svg
-== text-layout-03.svg text-layout-03.svg
-== text-layout-04.svg text-layout-04.svg
-== text-layout-05.svg text-layout-05.svg
-fuzzy-if(cocoaWidget&&layersGPUAccelerated,1,3) == text-layout-06.svg text-layout-06.svg
-== text-layout-07.svg text-layout-07.svg
-== text-layout-08.svg text-layout-08.svg
-== text-scale-01.svg text-scale-01.svg
-fuzzy-if(skiaContent,2,1000) HTTP(..) == text-scale-02.svg text-scale-02.svg
-HTTP(..) == text-scale-03.svg text-scale-03.svg
-== text-stroke-scaling-01.svg text-stroke-scaling-01.svg
-== stroke-dasharray-01.svg stroke-dasharray-01.svg
-fuzzy-if(skiaContent,1,340) == stroke-dasharray-02.svg stroke-dasharray-02.svg
-fuzzy-if(skiaContent,1,340) == stroke-dasharray-03.svg stroke-dasharray-03.svg
-== stroke-dasharray-and-pathLength-01.svg stroke-dasharray-and-pathLength-01.svg
-== stroke-dasharray-and-text-01.svg stroke-dasharray-and-text-01.svg
-== stroke-dashoffset-01.svg stroke-dashoffset-01.svg
-== stroke-dashoffset-and-pathLength-01.svg stroke-dashoffset-and-pathLength-01.svg
-== stroke-linecap-round-w-zero-length-segs-01.svg stroke-linecap-round-w-zero-length-segs-01.svg
-== stroke-linecap-round-w-zero-length-segs-02.svg stroke-linecap-round-w-zero-length-segs-02.svg
-== stroke-linecap-square-w-zero-length-segs-01.svg stroke-linecap-square-w-zero-length-segs-01.svg
-== stroke-linecap-square-w-zero-length-segs-02.svg stroke-linecap-square-w-zero-length-segs-02.svg
-== textPath-01.svg textPath-01.svg
-== textPath-02.svg textPath-02.svg
-fuzzy-if(skiaContent,1,610) == textPath-03.svg textPath-03.svg
-== textPath-04.svg textPath-04.svg
-== textPath-05.html textPath-05.html
-== text-style-01a.svg text-style-01a.svg
-== text-style-01b.svg text-style-01b.svg
-== text-style-01c.svg text-style-01c.svg
-== text-style-01d.svg text-style-01d.svg
-== text-style-01e.svg text-style-01e.svg
-== text-white-space-01.svg text-white-space-01.svg
-== thin-stroke-01.svg thin-stroke-01.svg
-== zero-stroke-01.svg zero-stroke-01.svg
-== tspan-dxdy-01.svg tspan-dxdy-01.svg
-== tspan-dxdy-02.svg tspan-dxdy-02.svg
-== tspan-dxdy-03.svg tspan-dxdy-03.svg
-== tspan-dxdy-04.svg tspan-dxdy-04.svg
-== tspan-dxdy-05.svg tspan-dxdy-05.svg
-== tspan-dxdy-06.svg tspan-dxdy-06.svg
-== tspan-dxdy-textPath-01.svg tspan-dxdy-textPath-01.svg
-random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) == tspan-rotate-01.svg tspan-rotate-01.svg
-# Bug 629718 for random failure on WinXP
-# bug 773482
-random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) fuzzy-if(skiaContent,1,550) == tspan-rotate-02.svg tspan-rotate-02.svg
-# Bug 629718 for random failure on WinXP
-# bug 773482
-random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) fuzzy-if(skiaContent,1,550) == tspan-rotate-02.svg tspan-rotate-02.svg
-# Bug 629718 for random failure on WinXP
-# bug 773482
-random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) fuzzy-if(skiaContent,1,550) == tspan-rotate-03.svg tspan-rotate-03.svg
-# Bug 629718 for random failure on WinXP
-# bug 773482
-random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) fuzzy-if(skiaContent,1,550) == tspan-rotate-04.svg tspan-rotate-04.svg
-# Bug 629718 for random failure on WinXP
-# bug 773482
-random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) fuzzy-if(skiaContent,1,550) == tspan-rotate-04.svg tspan-rotate-04.svg
-# Bug 629718 for random failure on WinXP
-# bug 773482
-random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) fuzzy-if(skiaContent,1,550) == tspan-rotate-05.svg tspan-rotate-05.svg
-# Bug 629718 for random failure on WinXP
-random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) fuzzy-if(skiaContent,1,550) == tspan-rotate-06.svg tspan-rotate-06.svg
-# Bug 629718 for random failure on WinXP
-# bug 773482
-== tspan-rotate-07.svg tspan-rotate-07.svg
-== tspan-rotate-textPath-01.svg tspan-rotate-textPath-01.svg
-fuzzy-if(skiaContent,1,100) == tspan-xy-01.svg tspan-xy-01.svg
-# bug 773482
-== tspan-xy-02.svg tspan-xy-02.svg
-# bug 773482
-fuzzy-if(skiaContent,1,300) == tspan-xy-03.svg tspan-xy-03.svg
-# bug 773482
-fuzzy-if(skiaContent,1,300) == tspan-xy-04.svg tspan-xy-04.svg
-# bug 773482
-fuzzy-if(skiaContent,1,300) == tspan-xy-05.svg tspan-xy-05.svg
-# bug 773482
-fuzzy-if(skiaContent,1,300) == tspan-xy-06.svg tspan-xy-06.svg
-# bug 773482
-fuzzy-if(skiaContent,1,100) == tspan-xy-anchor-middle-01.svg tspan-xy-anchor-middle-01.svg
-# bug 773482
-fuzzy-if(skiaContent,1,100) == tspan-xy-anchor-end-01.svg tspan-xy-anchor-end-01.svg
-# bug 773482
-== userSpaceOnUse-and-pattern-01.svg userSpaceOnUse-and-pattern-01.svg
-== viewBox-and-pattern-01.svg viewBox-and-pattern-01.svg
-== viewBox-and-pattern-02.svg viewBox-and-pattern-02.svg
-== viewBox-and-pattern-03.svg viewBox-and-pattern-03.svg
-== viewBox-and-pattern-04.svg viewBox-and-pattern-04.svg
-== viewBox-invalid-01.svg viewBox-invalid-01.svg
-== viewBox-invalid-02.svg viewBox-invalid-02.svg
-== viewBox-valid-01.svg viewBox-valid-01.svg
-== viewBox-valid-02.xhtml viewBox-valid-02.xhtml
-== viewport-percent-graphic-user-01.svg viewport-percent-graphic-user-01.svg
-== winding-01.svg winding-01.svg
-
-== svg-effects-area-unzoomed.xhtml svg-effects-area-unzoomed.xhtml
-== svg-effects-area-zoomed-in.xhtml svg-effects-area-zoomed-in.xhtml
-== svg-effects-area-zoomed-out.xhtml svg-effects-area-zoomed-out.xhtml
-== href-attr-change-restyles.svg href-attr-change-restyles.svg
-== mask-img.html mask-img.html
-
-skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-color-burn.svg blend-color-burn.svg
-skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-color-dodge.svg blend-color-dodge.svg
-# pref(layout.css.mix-blend-mode.enabled,true) == blend-color.svg blend-color.svg
-skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-darken.svg blend-darken.svg
-skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-difference.svg blend-difference.svg
-skip-if(Android) fuzzy-if(skiaContent,1,1600) pref(layout.css.mix-blend-mode.enabled,true) == blend-exclusion.svg blend-exclusion.svg
-# pref(layout.css.mix-blend-mode.enabled,true) == blend-hard-light.svg blend-hard-light.svg
-# pref(layout.css.mix-blend-mode.enabled,true) == blend-hue.svg blend-hue.svg
-skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-layer-blend.svg blend-layer-blend.svg
-skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-layer-filter.svg blend-layer-filter.svg
-skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-layer-mask.svg blend-layer-mask.svg
-skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-layer-opacity.svg blend-layer-opacity.svg
-skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-lighten.svg blend-lighten.svg
-# pref(layout.css.mix-blend-mode.enabled,true) == blend-luminosity.svg blend-luminosity.svg
-#skip-if(B2G||Mulet||Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-multiply-alpha.svg blend-multiply-alpha.svg
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-multiply.svg blend-multiply.svg
-pref(layout.css.mix-blend-mode.enabled,true) == blend-normal.svg blend-normal.svg
-#skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-overlay.svg blend-overlay.svg
-#skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-saturation.svg blend-saturation.svg
-#skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-screen.svg blend-screen.svg
-#skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-soft-light.svg blend-soft-light.svg
-skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-difference-stacking.html blend-difference-stacking.html
-
-# test case for Fragment URLs
-# https://drafts.csswg.org/css-values/#local-urls
-== use-localRef-marker-01.svg use-localRef-marker-01.svg
-== use-localRef-clipPath-01.svg use-localRef-clipPath-01.svg
-== use-localRef-filter-01.svg use-localRef-filter-01.svg
-skip == use-localRef-fill-01.svg use-localRef-fill-01.svg
-== use-localRef-stroke-01.svg use-localRef-stroke-01.svg
diff --git a/layout/reftests/svg/reftest.list b/layout/reftests/svg/reftest.list
index 21e1c68a1..304753eb7 100644
--- a/layout/reftests/svg/reftest.list
+++ b/layout/reftests/svg/reftest.list
@@ -63,7 +63,7 @@ fuzzy-if(skiaContent,1,320) == conditions-08.svg conditions-08-ref.svg
== dynamic-attr-change-1.svg pass.svg
== dynamic-attr-change-2.svg pass.svg
== dynamic-class-01.svg pass.svg
-fuzzy-if(Android,4,87) == dynamic-clipPath-01.svg pass.svg
+== dynamic-clipPath-01.svg pass.svg
== dynamic-clipPath-02.svg pass.svg
== dynamic-clipPath-clip-rule-01.svg pass.svg
== dynamic-conditions-01.svg pass.svg
@@ -160,7 +160,7 @@ fuzzy-if(skiaContent,1,2) == fallback-color-04.svg pass.svg
# This pref is normally on by default, but we turn it off in reftest runs to
# disable an unnecessary security-check. This reftest is actually testing that
# the security check works, though, so it needs the pref to be turned on:
-fails-if(Android) pref(security.fileuri.strict_origin_policy,true) == filter-extref-differentOrigin-01.svg pass.svg # Bug 695385
+pref(security.fileuri.strict_origin_policy,true) == filter-extref-differentOrigin-01.svg pass.svg # Bug 695385
== filter-foreignObject-01.svg pass.svg
== filter-in-mask-01.svg pass.svg
== filter-invalidation-01.svg pass.svg
@@ -182,16 +182,16 @@ fuzzy-if(skiaContent,1,800000) == filters-and-group-opacity-01.svg filters-and-g
== foreignObject-start-hidden-02.svg pass.svg
== foreignObject-style-change-01.svg pass.svg
== foreignObject-dynamic-abspos-01.html foreignObject-dynamic-abspos-01-ref.html
-fuzzy-if(Android,18,600) == foreignObject-fixedpos-01.html foreignObject-dynamic-abspos-01-ref.html
+== foreignObject-fixedpos-01.html foreignObject-dynamic-abspos-01-ref.html
== foreignObject-fixedpos-02.html foreignObject-fixedpos-ref.html
== foreignObject-dynamic-fixedpos-01.html foreignObject-dynamic-abspos-01-ref.html
== foreignObject-vertical-01.svg foreignObject-vertical-01-ref.svg
== g-transform-01.svg pass.svg
== getElementById-a-element-01.svg pass.svg
-fuzzy-if(Android,9,980) fuzzy-if(skiaContent,3,32000) == gradient-live-01a.svg gradient-live-01-ref.svg
-fuzzy-if(Android,9,980) fuzzy-if(skiaContent,3,32000) == gradient-live-01b.svg gradient-live-01-ref.svg
-fuzzy-if(Android,9,980) fuzzy-if(skiaContent,3,32000) == gradient-live-01c.svg gradient-live-01-ref.svg
-fuzzy-if(Android,9,980) fuzzy-if(skiaContent,3,32000) == gradient-live-01d.svg gradient-live-01-ref.svg
+fuzzy-if(skiaContent,3,32000) == gradient-live-01a.svg gradient-live-01-ref.svg
+fuzzy-if(skiaContent,3,32000) == gradient-live-01b.svg gradient-live-01-ref.svg
+fuzzy-if(skiaContent,3,32000) == gradient-live-01c.svg gradient-live-01-ref.svg
+fuzzy-if(skiaContent,3,32000) == gradient-live-01d.svg gradient-live-01-ref.svg
== gradient-transform-01.svg pass.svg
fuzzy-if(skiaContent,1,550) == import-svg-01.html pass.svg
== invalid-text-01.svg pass.svg
@@ -229,7 +229,7 @@ fuzzy-if(d2d||skiaContent,1,6400) == mask-type-04.svg mask-type-01-ref.svg
== nested-viewBox-01.svg pass.svg
fuzzy-if(skiaContent,3,448000) == nesting-invalid-01.svg nesting-invalid-01-ref.svg
fuzzy-if(d2d&&/^Windows\x20NT\x20(6\.1|10\.0)/.test(http.oscpu),63,168) fuzzy-if(cocoaWidget,1,122) fuzzy-if(skiaContent,2,1000) == non-scaling-stroke-01.svg non-scaling-stroke-01-ref.svg # bug 1074161 for Win7 and OSX 10.8
-fuzzy-if(gtkWidget,1,99) fuzzy-if(!contentSameGfxBackendAsCanvas,9,99) fuzzy-if(Android,9,586) == non-scaling-stroke-02.svg non-scaling-stroke-02-ref.svg
+fuzzy-if(gtkWidget,1,99) fuzzy-if(!contentSameGfxBackendAsCanvas,9,99) == non-scaling-stroke-02.svg non-scaling-stroke-02-ref.svg
== non-scaling-stroke-03.svg non-scaling-stroke-03-ref.svg
== objectBoundingBox-and-clipPath.svg pass.svg
# Bug 588684
@@ -246,7 +246,7 @@ random-if(gtkWidget) == objectBoundingBox-and-fePointLight-02.svg objectBounding
skip-if(d2d) fuzzy-if(cocoaWidget,1,99974) fuzzy-if(skiaContent,1,200000) == opacity-and-gradient-02.svg opacity-and-gradient-02-ref.svg
== opacity-and-pattern-01.svg pass.svg
fuzzy-if(skiaContent,1,10000) == opacity-and-transform-01.svg opacity-and-transform-01-ref.svg
-fuzzy-if(Android,8,200) == outer-svg-border-and-padding-01.svg outer-svg-border-and-padding-01-ref.svg
+== outer-svg-border-and-padding-01.svg outer-svg-border-and-padding-01-ref.svg
== outline.html outline-ref.html
== overflow-on-outer-svg-01.svg overflow-on-outer-svg-01-ref.svg
== overflow-on-outer-svg-02a.xhtml overflow-on-outer-svg-02-ref.xhtml
@@ -417,28 +417,28 @@ fuzzy-if(skiaContent,1,100) == tspan-xy-anchor-end-01.svg tspan-xy-anchor-end-re
== href-attr-change-restyles.svg href-attr-change-restyles-ref.svg
fuzzy(128,141) == mask-img.html mask-img-ref.html
-skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-color-burn.svg blend-color-burn-ref.svg
-skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-color-dodge.svg blend-color-dodge-ref.svg
+pref(layout.css.mix-blend-mode.enabled,true) == blend-color-burn.svg blend-color-burn-ref.svg
+pref(layout.css.mix-blend-mode.enabled,true) == blend-color-dodge.svg blend-color-dodge-ref.svg
# pref(layout.css.mix-blend-mode.enabled,true) == blend-color.svg blend-color-ref.svg
-skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-darken.svg blend-darken-ref.svg
-skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-difference.svg blend-difference-ref.svg
-skip-if(Android) fuzzy-if(skiaContent,1,1600) pref(layout.css.mix-blend-mode.enabled,true) == blend-exclusion.svg blend-exclusion-ref.svg
+pref(layout.css.mix-blend-mode.enabled,true) == blend-darken.svg blend-darken-ref.svg
+pref(layout.css.mix-blend-mode.enabled,true) == blend-difference.svg blend-difference-ref.svg
+fuzzy-if(skiaContent,1,1600) pref(layout.css.mix-blend-mode.enabled,true) == blend-exclusion.svg blend-exclusion-ref.svg
# pref(layout.css.mix-blend-mode.enabled,true) == blend-hard-light.svg blend-hard-light-ref.svg
# pref(layout.css.mix-blend-mode.enabled,true) == blend-hue.svg blend-hue-ref.svg
-skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-layer-blend.svg blend-layer-blend-ref.svg
-skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-layer-filter.svg blend-layer-filter-ref.svg
-skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-layer-mask.svg blend-layer-mask-ref.svg
-skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-layer-opacity.svg blend-layer-opacity-ref.svg
-skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-lighten.svg blend-lighten-ref.svg
+pref(layout.css.mix-blend-mode.enabled,true) == blend-layer-blend.svg blend-layer-blend-ref.svg
+pref(layout.css.mix-blend-mode.enabled,true) == blend-layer-filter.svg blend-layer-filter-ref.svg
+pref(layout.css.mix-blend-mode.enabled,true) == blend-layer-mask.svg blend-layer-mask-ref.svg
+pref(layout.css.mix-blend-mode.enabled,true) == blend-layer-opacity.svg blend-layer-opacity-ref.svg
+pref(layout.css.mix-blend-mode.enabled,true) == blend-lighten.svg blend-lighten-ref.svg
# pref(layout.css.mix-blend-mode.enabled,true) == blend-luminosity.svg blend-luminosity-ref.svg
-#skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-multiply-alpha.svg blend-multiply-alpha-ref.svg
-skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-multiply.svg blend-multiply-ref.svg
+# pref(layout.css.mix-blend-mode.enabled,true) == blend-multiply-alpha.svg blend-multiply-alpha-ref.svg
+pref(layout.css.mix-blend-mode.enabled,true) == blend-multiply.svg blend-multiply-ref.svg
pref(layout.css.mix-blend-mode.enabled,true) == blend-normal.svg blend-normal-ref.svg
-#skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-overlay.svg blend-overlay-ref.svg
-#skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-saturation.svg blend-saturation-ref.svg
-#skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-screen.svg blend-screen-ref.svg
-#skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-soft-light.svg blend-soft-light-ref.svg
-skip-if(Android) pref(layout.css.mix-blend-mode.enabled,true) == blend-difference-stacking.html blend-difference-stacking-ref.html
+# pref(layout.css.mix-blend-mode.enabled,true) == blend-overlay.svg blend-overlay-ref.svg
+# pref(layout.css.mix-blend-mode.enabled,true) == blend-saturation.svg blend-saturation-ref.svg
+# pref(layout.css.mix-blend-mode.enabled,true) == blend-screen.svg blend-screen-ref.svg
+# pref(layout.css.mix-blend-mode.enabled,true) == blend-soft-light.svg blend-soft-light-ref.svg
+pref(layout.css.mix-blend-mode.enabled,true) == blend-difference-stacking.html blend-difference-stacking-ref.html
# test case for Fragment URLs
# https://drafts.csswg.org/css-values/#local-urls
diff --git a/layout/reftests/svg/sizing/reftest-stylo.list b/layout/reftests/svg/sizing/reftest-stylo.list
deleted file mode 100644
index e10728a80..000000000
--- a/layout/reftests/svg/sizing/reftest-stylo.list
+++ /dev/null
@@ -1,322 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-
-# This directory contains tests that test the sizing of the SVG viewport into
-# which SVG is rendered. It includes tests for standalone SVG, SVG embedded by
-# reference using the HTML <object> element, and SVG rendered inline within
-# XHTML.
-#
-# SVG's <svg> element is a "replaced element". The main specification texts
-# covering how the <svg> element is sized are:
-#
-# http://www.w3.org/TR/SVGMobile12/coords.html#InitialViewport
-# http://www.w3.org/TR/SVGMobile12/coords.html#IntrinsicSizing
-# http://www.w3.org/TR/CSS21/visudet.html
-
-skip-if(B2G||Mulet||Android) == scrollbars-01.svg scrollbars-01.svg
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet||Android) == scrollbars-02.svg scrollbars-02.svg
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-# Standalone tests
-#
-# To get reasonable test coverage of the implementation of the replaced element
-# algorythm we test all permutations of the CSS 'width' and 'height' properties
-# having the values zero, auto, a px value or a percentage value, and of the
-# intrinsic width and height (the 'width' and 'height' attributes) having the
-# values zero, a px value or a percentage value. This gives us 4*4*3*3 == ==
-# tests. On top of that, there are 12 cases from the 144 permutations for which
-# the 'viewBox' attribute should have an affect (see below).
-#
-# In the file names for the standalone tests that follow, the first two fields
-# denote the type of value specified for the CSS 'width' and 'height'
-# properties, and the third and four fields denote the type of value used for
-# the intrinsic width and height (i.e. the 'width' and 'height' attributes).
-#
-# Note that the standalone SVG testcases can't test defaulting to 300x150 px
-# because SVG always has an intrinsic width and height. To get the size of an
-# SVG to default to 300x150 px the SVG will need to have a containing block
-# that depends on the SVG's size (e.g. a floating containing block). Again, see
-# below for those tests.
-
-== standalone--0-0--0-0.svg standalone--0-0--0-0.svg
-== standalone--0-0--0-pct.svg standalone--0-0--0-pct.svg
-== standalone--0-0--0-px.svg standalone--0-0--0-px.svg
-== standalone--0-0--pct-0.svg standalone--0-0--pct-0.svg
-== standalone--0-0--pct-pct.svg standalone--0-0--pct-pct.svg
-== standalone--0-0--pct-px.svg standalone--0-0--pct-px.svg
-== standalone--0-0--px-0.svg standalone--0-0--px-0.svg
-== standalone--0-0--px-pct.svg standalone--0-0--px-pct.svg
-== standalone--0-0--px-px.svg standalone--0-0--px-px.svg
-
-== standalone--0-auto--0-0.svg standalone--0-auto--0-0.svg
-== standalone--0-auto--0-pct.svg standalone--0-auto--0-pct.svg
-== standalone--0-auto--0-px.svg standalone--0-auto--0-px.svg
-== standalone--0-auto--pct-0.svg standalone--0-auto--pct-0.svg
-== standalone--0-auto--pct-pct.svg standalone--0-auto--pct-pct.svg
-== standalone--0-auto--pct-px.svg standalone--0-auto--pct-px.svg
-== standalone--0-auto--px-0.svg standalone--0-auto--px-0.svg
-== standalone--0-auto--px-pct.svg standalone--0-auto--px-pct.svg
-== standalone--0-auto--px-px.svg standalone--0-auto--px-px.svg
-
-== standalone--0-pct--0-0.svg standalone--0-pct--0-0.svg
-== standalone--0-pct--0-pct.svg standalone--0-pct--0-pct.svg
-== standalone--0-pct--0-px.svg standalone--0-pct--0-px.svg
-== standalone--0-pct--pct-0.svg standalone--0-pct--pct-0.svg
-== standalone--0-pct--pct-pct.svg standalone--0-pct--pct-pct.svg
-== standalone--0-pct--pct-px.svg standalone--0-pct--pct-px.svg
-== standalone--0-pct--px-0.svg standalone--0-pct--px-0.svg
-== standalone--0-pct--px-pct.svg standalone--0-pct--px-pct.svg
-== standalone--0-pct--px-px.svg standalone--0-pct--px-px.svg
-
-== standalone--0-px--0-0.svg standalone--0-px--0-0.svg
-== standalone--0-px--0-pct.svg standalone--0-px--0-pct.svg
-== standalone--0-px--0-px.svg standalone--0-px--0-px.svg
-== standalone--0-px--pct-0.svg standalone--0-px--pct-0.svg
-== standalone--0-px--pct-pct.svg standalone--0-px--pct-pct.svg
-== standalone--0-px--pct-px.svg standalone--0-px--pct-px.svg
-== standalone--0-px--px-0.svg standalone--0-px--px-0.svg
-== standalone--0-px--px-pct.svg standalone--0-px--px-pct.svg
-== standalone--0-px--px-px.svg standalone--0-px--px-px.svg
-
-== standalone--auto-0--0-0.svg standalone--auto-0--0-0.svg
-== standalone--auto-0--0-pct.svg standalone--auto-0--0-pct.svg
-== standalone--auto-0--0-px.svg standalone--auto-0--0-px.svg
-== standalone--auto-0--pct-0.svg standalone--auto-0--pct-0.svg
-== standalone--auto-0--pct-pct.svg standalone--auto-0--pct-pct.svg
-== standalone--auto-0--pct-px.svg standalone--auto-0--pct-px.svg
-== standalone--auto-0--px-0.svg standalone--auto-0--px-0.svg
-== standalone--auto-0--px-pct.svg standalone--auto-0--px-pct.svg
-== standalone--auto-0--px-px.svg standalone--auto-0--px-px.svg
-
-== standalone--auto-auto--0-0.svg standalone--auto-auto--0-0.svg
-skip == standalone--auto-auto--0-pct.svg standalone--auto-auto--0-pct.svg
-== standalone--auto-auto--0-px.svg standalone--auto-auto--0-px.svg
-== standalone--auto-auto--pct-0.svg standalone--auto-auto--pct-0.svg
-fuzzy-if(d2d,1,400) == standalone--auto-auto--pct-pct.svg standalone--auto-auto--pct-pct.svg
-== standalone--auto-auto--pct-px.svg standalone--auto-auto--pct-px.svg
-== standalone--auto-auto--px-0.svg standalone--auto-auto--px-0.svg
-== standalone--auto-auto--px-pct.svg standalone--auto-auto--px-pct.svg
-== standalone--auto-auto--px-px.svg standalone--auto-auto--px-px.svg
-
-== standalone--auto-pct--0-0.svg standalone--auto-pct--0-0.svg
-== standalone--auto-pct--0-pct.svg standalone--auto-pct--0-pct.svg
-== standalone--auto-pct--0-px.svg standalone--auto-pct--0-px.svg
-fuzzy-if(d2d,1,400) == standalone--auto-pct--pct-0.svg standalone--auto-pct--pct-0.svg
-fuzzy-if(d2d,1,400) == standalone--auto-pct--pct-pct.svg standalone--auto-pct--pct-pct.svg
-fuzzy-if(d2d,1,400) == standalone--auto-pct--pct-px.svg standalone--auto-pct--pct-px.svg
-== standalone--auto-pct--px-0.svg standalone--auto-pct--px-0.svg
-== standalone--auto-pct--px-pct.svg standalone--auto-pct--px-pct.svg
-fuzzy-if(d2d,1,1000) == standalone--auto-pct--px-px.svg standalone--auto-pct--px-px.svg
-# intrinsic ratio!
-
-== standalone--auto-px--0-0.svg standalone--auto-px--0-0.svg
-== standalone--auto-px--0-pct.svg standalone--auto-px--0-pct.svg
-== standalone--auto-px--0-px.svg standalone--auto-px--0-px.svg
-== standalone--auto-px--pct-0.svg standalone--auto-px--pct-0.svg
-== standalone--auto-px--pct-pct.svg standalone--auto-px--pct-pct.svg
-== standalone--auto-px--pct-px.svg standalone--auto-px--pct-px.svg
-== standalone--auto-px--px-0.svg standalone--auto-px--px-0.svg
-== standalone--auto-px--px-pct.svg standalone--auto-px--px-pct.svg
-== standalone--auto-px--px-px.svg standalone--auto-px--px-px.svg
-# intrinsic ratio!
-
-== standalone--pct-0--0-0.svg standalone--pct-0--0-0.svg
-== standalone--pct-0--0-pct.svg standalone--pct-0--0-pct.svg
-== standalone--pct-0--0-px.svg standalone--pct-0--0-px.svg
-== standalone--pct-0--pct-0.svg standalone--pct-0--pct-0.svg
-== standalone--pct-0--pct-pct.svg standalone--pct-0--pct-pct.svg
-== standalone--pct-0--pct-px.svg standalone--pct-0--pct-px.svg
-== standalone--pct-0--px-0.svg standalone--pct-0--px-0.svg
-== standalone--pct-0--px-pct.svg standalone--pct-0--px-pct.svg
-== standalone--pct-0--px-px.svg standalone--pct-0--px-px.svg
-
-== standalone--pct-auto--0-0.svg standalone--pct-auto--0-0.svg
-fuzzy-if(d2d,1,400) == standalone--pct-auto--0-pct.svg standalone--pct-auto--0-pct.svg
-== standalone--pct-auto--0-px.svg standalone--pct-auto--0-px.svg
-== standalone--pct-auto--pct-0.svg standalone--pct-auto--pct-0.svg
-fuzzy-if(d2d,1,400) == standalone--pct-auto--pct-pct.svg standalone--pct-auto--pct-pct.svg
-== standalone--pct-auto--pct-px.svg standalone--pct-auto--pct-px.svg
-== standalone--pct-auto--px-0.svg standalone--pct-auto--px-0.svg
-fuzzy-if(d2d,1,400) == standalone--pct-auto--px-pct.svg standalone--pct-auto--px-pct.svg
-== standalone--pct-auto--px-px.svg standalone--pct-auto--px-px.svg
-# intrinsic ratio!
-
-fuzzy-if(d2d,1,400) == standalone--pct-pct--0-0.svg standalone--pct-pct--0-0.svg
-fuzzy-if(d2d,1,400) == standalone--pct-pct--0-pct.svg standalone--pct-pct--0-pct.svg
-fuzzy-if(d2d,1,400) == standalone--pct-pct--0-px.svg standalone--pct-pct--0-px.svg
-fuzzy-if(d2d,1,400) == standalone--pct-pct--pct-0.svg standalone--pct-pct--pct-0.svg
-fuzzy-if(d2d,1,400) == standalone--pct-pct--pct-pct.svg standalone--pct-pct--pct-pct.svg
-fuzzy-if(d2d,1,400) == standalone--pct-pct--pct-px.svg standalone--pct-pct--pct-px.svg
-fuzzy-if(d2d,1,400) == standalone--pct-pct--px-0.svg standalone--pct-pct--px-0.svg
-fuzzy-if(d2d,1,400) == standalone--pct-pct--px-pct.svg standalone--pct-pct--px-pct.svg
-fuzzy-if(d2d,1,400) == standalone--pct-pct--px-px.svg standalone--pct-pct--px-px.svg
-
-== standalone--pct-px--0-0.svg standalone--pct-px--0-0.svg
-== standalone--pct-px--0-pct.svg standalone--pct-px--0-pct.svg
-== standalone--pct-px--0-px.svg standalone--pct-px--0-px.svg
-== standalone--pct-px--pct-0.svg standalone--pct-px--pct-0.svg
-== standalone--pct-px--pct-pct.svg standalone--pct-px--pct-pct.svg
-== standalone--pct-px--pct-px.svg standalone--pct-px--pct-px.svg
-== standalone--pct-px--px-0.svg standalone--pct-px--px-0.svg
-== standalone--pct-px--px-pct.svg standalone--pct-px--px-pct.svg
-== standalone--pct-px--px-px.svg standalone--pct-px--px-px.svg
-
-== standalone--px-0--0-0.svg standalone--px-0--0-0.svg
-== standalone--px-0--0-pct.svg standalone--px-0--0-pct.svg
-== standalone--px-0--0-px.svg standalone--px-0--0-px.svg
-== standalone--px-0--pct-0.svg standalone--px-0--pct-0.svg
-== standalone--px-0--pct-pct.svg standalone--px-0--pct-pct.svg
-== standalone--px-0--pct-px.svg standalone--px-0--pct-px.svg
-== standalone--px-0--px-0.svg standalone--px-0--px-0.svg
-== standalone--px-0--px-pct.svg standalone--px-0--px-pct.svg
-== standalone--px-0--px-px.svg standalone--px-0--px-px.svg
-
-== standalone--px-auto--0-0.svg standalone--px-auto--0-0.svg
-== standalone--px-auto--0-pct.svg standalone--px-auto--0-pct.svg
-== standalone--px-auto--0-px.svg standalone--px-auto--0-px.svg
-== standalone--px-auto--pct-0.svg standalone--px-auto--pct-0.svg
-== standalone--px-auto--pct-pct.svg standalone--px-auto--pct-pct.svg
-== standalone--px-auto--pct-px.svg standalone--px-auto--pct-px.svg
-== standalone--px-auto--px-0.svg standalone--px-auto--px-0.svg
-== standalone--px-auto--px-pct.svg standalone--px-auto--px-pct.svg
-== standalone--px-auto--px-px.svg standalone--px-auto--px-px.svg
-# intrinsic ratio!
-
-== standalone--px-pct--0-0.svg standalone--px-pct--0-0.svg
-== standalone--px-pct--0-pct.svg standalone--px-pct--0-pct.svg
-== standalone--px-pct--0-px.svg standalone--px-pct--0-px.svg
-== standalone--px-pct--pct-0.svg standalone--px-pct--pct-0.svg
-== standalone--px-pct--pct-pct.svg standalone--px-pct--pct-pct.svg
-== standalone--px-pct--pct-px.svg standalone--px-pct--pct-px.svg
-== standalone--px-pct--px-0.svg standalone--px-pct--px-0.svg
-== standalone--px-pct--px-pct.svg standalone--px-pct--px-pct.svg
-== standalone--px-pct--px-px.svg standalone--px-pct--px-px.svg
-
-== standalone--px-px--0-0.svg standalone--px-px--0-0.svg
-== standalone--px-px--0-pct.svg standalone--px-px--0-pct.svg
-== standalone--px-px--0-px.svg standalone--px-px--0-px.svg
-== standalone--px-px--pct-0.svg standalone--px-px--pct-0.svg
-== standalone--px-px--pct-pct.svg standalone--px-px--pct-pct.svg
-== standalone--px-px--pct-px.svg standalone--px-px--pct-px.svg
-== standalone--px-px--px-0.svg standalone--px-px--px-0.svg
-== standalone--px-px--px-pct.svg standalone--px-px--px-pct.svg
-== standalone--px-px--px-px.svg standalone--px-px--px-px.svg
-
-
-# As mentioned above, the 'viewBox' attribute may play a part in the sizing of
-# the SVG viewport in 12 of the 144 standalone tests above. The 'viewBox'
-# attribute only affects the replaced element sizing algorithm (by providing an
-# intrinsic ratio) when the SVG 'width' and 'height' attributes don't provide
-# an intrinsic ratio but the algorithm says the intrinsic ratio should be used
-# if avaliable. In other words, this is when one of the CSS properties 'width'
-# or 'height' has the value 'auto' and the other has a non-zero value, while
-# one or both of the SVG 'width' and 'height' attributes has a percentage
-# value. For the standalone tests above that means the value of the 'viewBox'
-# attribute matters in the 12 cases that follow.
-#
-# XXX We could also check that 'viewBox' does NOT have an affect in the other
-# cases.
-#
-# XXX What about cases like standalone--auto-pct--0-px--viewBox.svg? Is the
-# intrinsic ratio zero and not used, or should we use the viewBox ratio?
-
-== standalone--auto-pct--pct-pct--viewBox.svg standalone--auto-pct--pct-pct--viewBox.svg
-== standalone--auto-pct--pct-px--viewBox.svg standalone--auto-pct--pct-px--viewBox.svg
-== standalone--auto-pct--px-pct--viewBox.svg standalone--auto-pct--px-pct--viewBox.svg
-== standalone--auto-px--pct-pct--viewBox.svg standalone--auto-px--pct-pct--viewBox.svg
-== standalone--auto-px--pct-px--viewBox.svg standalone--auto-px--pct-px--viewBox.svg
-== standalone--auto-px--px-pct--viewBox.svg standalone--auto-px--px-pct--viewBox.svg
-== standalone--pct-auto--pct-pct--viewBox.svg standalone--pct-auto--pct-pct--viewBox.svg
-== standalone--pct-auto--pct-px--viewBox.svg standalone--pct-auto--pct-px--viewBox.svg
-== standalone--pct-auto--px-pct--viewBox.svg standalone--pct-auto--px-pct--viewBox.svg
-== standalone--px-auto--pct-pct--viewBox.svg standalone--px-auto--pct-pct--viewBox.svg
-== standalone--px-auto--pct-px--viewBox.svg standalone--px-auto--pct-px--viewBox.svg
-== standalone--px-auto--px-pct--viewBox.svg standalone--px-auto--px-pct--viewBox.svg
-
-
-# Sanity tests. These tests check that our choice of percentage width (49%)
-# doesn't coincidently result in the same width as our choice of px width
-# (70px) or the fall back width (300 px), and that our choice of percentage
-# height (49%) doesn't coincidently result in the same height as our choice of
-# px height (70px) or the fall back height (150 px). This ensures that we won't
-# miss false positives for the tests:
-#
-# standalone--pct-xxx--px-xxx.svg
-# standalone--xxx-pct--xxx-px.svg
-# standalone--px-xxx--pct-xxx.svg
-# standalone--xxx-px--xxx-pct.svg
-#
-# if the user agent ignores the CSS property and uses the attribute instead.
-# This will happen if the content area width is 612 px or the content height is
-# 306 px. Hopefully it's unlikely testers will encounter this.
-
-== standalone-sanity-width-pct.svg standalone-sanity-width-pct.svg
-== standalone-sanity-width-pct.svg standalone-sanity-width-pct.svg
-== standalone-sanity-height-pct.svg standalone-sanity-height-pct.svg
-== standalone-sanity-height-pct.svg standalone-sanity-height-pct.svg
-
-
-# Embedded inline tests
-#
-# The standalone tests provide a reasonable workout for replaced element
-# algorithm sizing, but we also want to test that SVG embedded inline is
-# positioned correctly when the properties 'display', 'float' and 'position'
-# are set to different values.
-#
-# We could certainly expand on these tests, but they provide reasonable base
-# coverage.
-
-HTTP(../..) == inline--display-block--01.xhtml inline--display-block--01.xhtml
-fuzzy-if(OSX,1,10) HTTP(../..) == inline--display-inline--01.xhtml inline--display-inline--01.xhtml
-HTTP(../..) == inline--display-inline-block--01.xhtml inline--display-inline-block--01.xhtml
-== inline--float-left--01.xhtml inline--float-left--01.xhtml
-skip == inline--float-right--01.xhtml inline--float-right--01.xhtml
-== inline--position-absolute--01.xhtml inline--position-absolute--01.xhtml
-== inline--position-absolute--02.xhtml inline--position-absolute--02.xhtml
-HTTP(../..) == inline--position-relative--01.xhtml inline--position-relative--01.xhtml
-
-
-# Embedded by reference tests
-#
-# One issue when it comes to documents embedded by reference is whether
-# non-'auto' values for the CSS 'width' and 'height' properties on the
-# _embedded_ document's root element should be used as intrinsic values by
-# replaced elements like HTML <object>. For the sake of simplicity we will
-# ignore this case for now, but it's certainly worth revisiting at some point
-# in the future.
-#
-# Since we have given the replaced element algorithm a reasonable workout in
-# the standalone tests, for the embedded by reference tests we will simply
-# check that the embedded SVG's intrinsic dimensions are used. The following
-# tests do not have any width or height on the <object> element so they should
-# be sized purely by the embedded SVG's intrinsic size.
-
-skip == object--auto-auto--0-0.html object--auto-auto--0-0.html
-# XXX add border
-skip == object--auto-auto--0-pct.html object--auto-auto--0-pct.html
-skip == object--auto-auto--0-px.html object--auto-auto--0-px.html
-skip == object--auto-auto--pct-0.html object--auto-auto--pct-0.html
-# The following four commented out tests fail post bug 428023:
-#== object--auto-auto--pct-pct.html object--auto-auto--pct-pct.html
-#== object--auto-auto--pct-px.html object--auto-auto--pct-px.html
-skip == object--auto-auto--px-0.html object--auto-auto--px-0.html
-#== object--auto-auto--px-pct.html object--auto-auto--px-pct.html
-skip == object--auto-auto--px-px.html object--auto-auto--px-px.html
-#== object--pct-pct--0-0.html object--pct-pct--0-0.html
-
-
-# Assorted tests to check that dynamic changes work correctly
-#
-# Here we have an assortment of different tests to check that updates occur
-# correctly when changes are made that should result in a change in the size
-# or position of the SVG.
-
-skip == dynamic--inline-css-height.xhtml dynamic--inline-css-height.xhtml
-skip == dynamic--inline-css-width.xhtml dynamic--inline-css-width.xhtml
-skip == dynamic--inline-resize-window-height.xhtml dynamic--inline-resize-window-height.xhtml
-# XXX breaks the reftest run as the window height somehow is not restored
-skip == dynamic--inline-resize-window-width.xhtml dynamic--inline-resize-window-width.xhtml
-# Fails way too much
-skip == dynamic--object-svg-unloaded.xhtml dynamic--object-svg-unloaded.xhtml
-# == ==
-
diff --git a/layout/reftests/svg/smil/container/reftest-stylo.list b/layout/reftests/svg/smil/container/reftest-stylo.list
deleted file mode 100644
index 4d52070f3..000000000
--- a/layout/reftests/svg/smil/container/reftest-stylo.list
+++ /dev/null
@@ -1,25 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# Tests related to SVG Animation (using SMIL), focusing on animation-sorting
-# to see which animation takes precedence (out of multiple animations on the
-# same attribute)
-
-random == enveloped-tree-1.xhtml enveloped-tree-1.xhtml
-# bug 470868
-fails fuzzy-if(cocoaWidget&&layersGPUAccelerated,1,3) fuzzy-if(skiaContent,1,810) == promoted-tree-1.xhtml promoted-tree-1.xhtml
-random == moved-tree-1.xhtml moved-tree-1.xhtml
-# bug 470868
-skip random-if(cocoaWidget||d2d) == deferred-anim-1.xhtml deferred-anim-1.xhtml
-# bug 470868, bug 585484
-skip random-if(cocoaWidget&&layersGPUAccelerated) == deferred-tree-1.xhtml deferred-tree-1.xhtml
-# bug 470868
-fails random-if(cocoaWidget&&layersGPUAccelerated) fuzzy-if(skiaContent,1,530) == deferred-tree-2a.xhtml deferred-tree-2a.xhtml
-# bug 470868
-fails random-if(cocoaWidget&&layersGPUAccelerated) fuzzy-if(skiaContent,1,530) == deferred-tree-2b.xhtml deferred-tree-2b.xhtml
-# bug 470868
-fails fuzzy-if(cocoaWidget&&layersGPUAccelerated,1,16) fuzzy-if(skiaContent,1,410) == deferred-tree-3a.xhtml deferred-tree-3a.xhtml
-fails fuzzy-if(cocoaWidget&&layersGPUAccelerated,1,16) fuzzy-if(skiaContent,1,110) == deferred-tree-3b.xhtml deferred-tree-3b.xhtml
-fails fuzzy-if(cocoaWidget&&layersGPUAccelerated,1,16) fuzzy-if(skiaContent,1,110) == deferred-tree-3c.xhtml deferred-tree-3c.xhtml
-fails fuzzy-if(cocoaWidget&&layersGPUAccelerated,1,16) fuzzy-if(skiaContent,1,110) == deferred-tree-3d.xhtml deferred-tree-3d.xhtml
-# this will occasionally fail until we correctly clear animation effects from
-# no-longer-targeted elements
-random == invalid-elem-1.xhtml invalid-elem-1.xhtml
diff --git a/layout/reftests/svg/smil/event/reftest-stylo.list b/layout/reftests/svg/smil/event/reftest-stylo.list
deleted file mode 100644
index b70cafd53..000000000
--- a/layout/reftests/svg/smil/event/reftest-stylo.list
+++ /dev/null
@@ -1,33 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# Tests related to SVG Animation (using SMIL) that use event timing.
-
-== event-begin-1.svg event-begin-1.svg
-== event-begin-offset-1.svg event-begin-offset-1.svg
-== event-begin-offset-2.svg event-begin-offset-2.svg
-== event-begin-timeevent-1.svg event-begin-timeevent-1.svg
-== event-begin-timeevent-2.svg event-begin-timeevent-2.svg
-random-if(Android) == event-begin-timeevent-3.svg event-begin-timeevent-3.svg
-== event-begin-load-1.svg event-begin-load-1.svg
-== event-bubble-1.svg event-bubble-1.svg
-== event-custom-1.svg event-custom-1.svg
-== event-end-1.svg event-end-1.svg
-== event-end-2.svg event-end-2.svg
-== event-end-open-1.svg event-end-open-1.svg
-== event-end-trimmed-1.svg event-end-trimmed-1.svg
-== event-preventDefault-1.svg event-preventDefault-1.svg
-== event-seek-1.svg event-seek-1.svg
-== event-target-default-1.svg event-target-default-1.svg
-== event-target-default-2.svg event-target-default-2.svg
-== event-target-id-change-1.svg event-target-id-change-1.svg
-== event-target-id-change-2.svg event-target-id-change-2.svg
-== event-target-id-change-3.svg event-target-id-change-3.svg
-== event-target-xlink-change-1.svg event-target-xlink-change-1.svg
-== event-target-xlink-change-2.svg event-target-xlink-change-2.svg
-== event-target-xlink-change-3.svg event-target-xlink-change-3.svg
-== event-target-xlink-change-4.svg event-target-xlink-change-4.svg
-== event-target-surgery-1.svg event-target-surgery-1.svg
-skip == event-target-surgery-2.svg event-target-surgery-2.svg
-== event-target-surgery-3.svg event-target-surgery-3.svg
-skip == event-target-non-svg-1.xhtml event-target-non-svg-1.xhtml
-== accesskey-entity-1.svg accesskey-entity-1.svg
-== accesskey-entity-2.svg accesskey-entity-2.svg
diff --git a/layout/reftests/svg/smil/event/reftest.list b/layout/reftests/svg/smil/event/reftest.list
index 02b845b07..fc2b057e5 100644
--- a/layout/reftests/svg/smil/event/reftest.list
+++ b/layout/reftests/svg/smil/event/reftest.list
@@ -5,7 +5,7 @@
== event-begin-offset-2.svg green-box-ref.svg
== event-begin-timeevent-1.svg green-box-ref.svg
== event-begin-timeevent-2.svg green-box-ref.svg
-random-if(Android) == event-begin-timeevent-3.svg green-box-ref.svg
+== event-begin-timeevent-3.svg green-box-ref.svg
== event-begin-load-1.svg green-box-ref.svg
== event-bubble-1.svg green-box-ref.svg
== event-custom-1.svg green-box-ref.svg
diff --git a/layout/reftests/svg/smil/motion/reftest-stylo.list b/layout/reftests/svg/smil/motion/reftest-stylo.list
deleted file mode 100644
index fb9c53e55..000000000
--- a/layout/reftests/svg/smil/motion/reftest-stylo.list
+++ /dev/null
@@ -1,23 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# Tests related to SVG Animation (using SMIL), focusing on the animateMotion
-# element.
-
-== animateMotion-by-1.svg animateMotion-by-1.svg
-== animateMotion-by-2.svg animateMotion-by-2.svg
-fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu)||/^Windows\x20NT\x206\.2/.test(http.oscpu),1,800) == animateMotion-flattening-1.svg animateMotion-flattening-1.svg
-# bug 951541
-== animateMotion-from-to-1.svg animateMotion-from-to-1.svg
-== animateMotion-indefinite-to-1.svg animateMotion-indefinite-to-1.svg
-== animateMotion-indefinite-to-2.svg animateMotion-indefinite-to-2.svg
-== animateMotion-rotate-1a.svg animateMotion-rotate-1a.svg
-== animateMotion-rotate-1b.svg animateMotion-rotate-1b.svg
-fuzzy-if(skiaContent,1,40) == animateMotion-rotate-2.svg animateMotion-rotate-2.svg
-== animateMotion-to-overridden-1.svg animateMotion-to-overridden-1.svg
-== animateMotion-values-linear-1.svg animateMotion-values-linear-1.svg
-== animateMotion-values-paced-1a.svg animateMotion-values-paced-1a.svg
-fuzzy-if(skiaContent,1,30) == animateMotion-values-paced-1b.svg animateMotion-values-paced-1b.svg
-
-# Tests involving <mpath> sub-element
-== animateMotion-mpath-pathLength-1.svg animateMotion-mpath-pathLength-1.svg
-== animateMotion-mpath-targetChange-1.svg animateMotion-mpath-targetChange-1.svg
-== animateMotion-mpath-target-transform-1.svg animateMotion-mpath-target-transform-1.svg
diff --git a/layout/reftests/svg/smil/pause/reftest-stylo.list b/layout/reftests/svg/smil/pause/reftest-stylo.list
deleted file mode 100644
index 767331316..000000000
--- a/layout/reftests/svg/smil/pause/reftest-stylo.list
+++ /dev/null
@@ -1,3 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# Tests for pause behaviour
-== init-pause-1.svg init-pause-1.svg
diff --git a/layout/reftests/svg/smil/reftest-stylo.list b/layout/reftests/svg/smil/reftest-stylo.list
deleted file mode 100644
index 41ebed9c9..000000000
--- a/layout/reftests/svg/smil/reftest-stylo.list
+++ /dev/null
@@ -1,286 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# Tests related to SVG Animation (using SMIL)
-# XXXdholbert Partial list of features that still need reftests:
-# - calcMode=discrete, paced, spline
-# - Stacking of additive=[sum|replace] animations
-# - Stacking of additive animations, w/ "hybrid case of to-animation"
-# - Repeating animations, w/ & w/out accumulate=sum
-# - Interpolation between different units (e.g. font-size attr, 3em to 50px)
-# - Correct behavior for em/ex font-size animations, when context changes
-# (with change happening 1. when completed/frozen and 2. when animating)
-# - CSS properties
-# - DOM interfaces:
-# * Section 6.2 of http://www.w3.org/TR/smil-animation/
-# * Animation-related bits of http://www.w3.org/TR/SVG/struct.html#DOMInterfaces
-# - Some more "anim-retarget" tests, with attributeType being changed/cleared.
-# (after we've got support for SVG/SMIL animation of CSS properties)
-
-# animateMotion tests
-include motion/reftest-stylo.list
-
-# animation sort-order tests
-include sort/reftest-stylo.list
-
-# set tests
-include set/reftest-stylo.list
-
-# style tests
-include style/reftest-stylo.list
-
-# animateTransform tests
-include transform/reftest-stylo.list
-
-# time-dependent tests
-# XXXdholbert Disabling this class of tests for now, because most of them
-# can & should be converted so they don't depend on specific timeout values.
-# (to prevent sporadic failures due to nondeterminism)
-# include timed/reftest-stylo.list
-
-# time container tests
-include container/reftest-stylo.list
-
-# repeat tests
-include repeat/reftest-stylo.list
-
-# restart tests
-include restart/reftest-stylo.list
-
-# pause tests
-include pause/reftest-stylo.list
-
-# syncbase tests
-include syncbase/reftest-stylo.list
-
-# seek tests
-include seek/reftest-stylo.list
-
-# event tests
-include event/reftest-stylo.list
-
-# General tests
-== anim-discrete-values-1.svg anim-discrete-values-1.svg
-== anim-discrete-values-2.svg anim-discrete-values-2.svg
-== anim-discrete-values-3.svg anim-discrete-values-3.svg
-== anim-discrete-replace-sum-1.svg anim-discrete-replace-sum-1.svg
-== anim-discrete-sum-none-1.svg anim-discrete-sum-none-1.svg
-== anim-discrete-sum-sum-1.svg anim-discrete-sum-sum-1.svg
-
-== anim-discrete-to-1.svg anim-discrete-to-1.svg
-== anim-discrete-to-2.svg anim-discrete-to-2.svg
-== anim-discrete-to-3.svg anim-discrete-to-3.svg
-== anim-discrete-to-4.svg anim-discrete-to-4.svg
-
-== anim-indefinite-to-1.svg anim-indefinite-to-1.svg
-== anim-indefinite-to-2.svg anim-indefinite-to-2.svg
-== anim-indefinite-to-3.svg anim-indefinite-to-3.svg
-== anim-indefinite-to-4.svg anim-indefinite-to-4.svg
-
-== anim-fillcolor-1.svg anim-fillcolor-1.svg
-# bug 436296
-== anim-fillopacity-1none.svg anim-fillopacity-1none.svg
-== anim-fillopacity-1css.svg anim-fillopacity-1css.svg
-== anim-fillopacity-1xml.svg anim-fillopacity-1xml.svg
-
-fuzzy-if(skiaContent,1,3600) == anim-opacity-01.svg anim-opacity-01.svg
-
-== anim-height-done-1a.svg anim-height-done-1a.svg
-== anim-height-done-1b.svg anim-height-done-1b.svg
-== anim-height-done-2.svg anim-height-done-2.svg
-== anim-height-interp-1.svg anim-height-interp-1.svg
-== anim-height-interp-2.svg anim-height-interp-2.svg
-== anim-height-interp-3.svg anim-height-interp-3.svg
-== anim-height-interp-4.svg anim-height-interp-4.svg
-== anim-height-interp-5.svg anim-height-interp-5.svg
-== anim-height-interp-6.svg anim-height-interp-6.svg
-
-# check conditional processing
-== anim-conditions-01.svg anim-conditions-01.svg
-== anim-conditions-02.svg anim-conditions-02.svg
-
-# animate some <length> attributes:
-== anim-filter-primitive-size-01.svg anim-filter-primitive-size-01.svg
-== anim-filter-size-01.svg anim-filter-size-01.svg
-== anim-length-reset-01.svg anim-length-reset-01.svg
-== anim-nonpixel-length-reset-01.svg anim-nonpixel-length-reset-01.svg
-== anim-use-length-01.svg anim-use-length-01.svg
-== anim-use-length-02.svg anim-use-length-02.svg
-
-# animate some <number> attributes:
-== anim-feComponentTransfer-01.svg anim-feComponentTransfer-01.svg
-== anim-feDistantLight-01.svg anim-feDistantLight-01.svg
-== anim-feOffset-01.svg anim-feOffset-01.svg
-== anim-feSpotLight-01.svg anim-feSpotLight-01.svg
-== anim-offset-01.svg anim-offset-01.svg
-== anim-pathLength-01.svg anim-pathLength-01.svg
-
-# animate some <number-optional-number> attributes:
-fuzzy-if(skiaContent,1,600) == anim-feGaussianBlur-01.svg anim-feGaussianBlur-01.svg
-
-# animate some <integer> attributes:
-== anim-feTurbulence-numOctaves-01.svg anim-feTurbulence-numOctaves-01.svg
-
-# animate some <integer-optional-integer> attributes:
-== anim-feConvolveMatrix-order-01.svg anim-feConvolveMatrix-order-01.svg
-
-# animate some <angle> attributes:
-== anim-marker-orient-01.svg anim-marker-orient-01.svg
-== anim-marker-orient-02.svg anim-marker-orient-02.svg
-
-#animate points list:
-== anim-polygon-points-01.svg anim-polygon-points-01.svg
-== anim-polyline-points-01.svg anim-polyline-points-01.svg
-
-# animate path data:
-== anim-path-d-01.svg anim-path-d-01.svg
-
-# animate some enumeration attributes:
-== anim-feComposite-operator-01.svg anim-feComposite-operator-01.svg
-== anim-filter-filterUnits-01.svg anim-filter-filterUnits-01.svg
-
-# animate some boolean attributes:
-== anim-feConvolveMatrix-preserveAlpha-01.svg anim-feConvolveMatrix-preserveAlpha-01.svg
-
-# animate some viewBox attributes
-fuzzy-if(Android,4,1) == anim-svg-viewBox-01.svg anim-svg-viewBox-01.svg
-== anim-svg-viewBox-02.svg anim-svg-viewBox-02.svg
-== anim-svg-viewBox-03.svg anim-svg-viewBox-03.svg
-skip == anim-view-01.svg#view anim-view-01.svg#view
-
-# animate some preserveAspectRatio attributes
-== anim-feImage-preserveAspectRatio-01.svg anim-feImage-preserveAspectRatio-01.svg
-== anim-svg-preserveAspectRatio-01.svg anim-svg-preserveAspectRatio-01.svg
-
-# animate some string attributes:
-== anim-filter-href-01.svg anim-filter-href-01.svg
-== anim-gradient-href-01.svg anim-gradient-href-01.svg
-== anim-image-href-01.svg anim-image-href-01.svg
-== anim-pattern-href-01.svg anim-pattern-href-01.svg
-== anim-use-href-01.svg anim-use-href-01.svg
-
-# animate the class attribute
-== anim-class-01.svg anim-class-01.svg
-== anim-class-02.svg anim-class-02.svg
-== anim-class-03.svg anim-class-03.svg
-== anim-class-04.svg anim-class-04.svg
-
-# animate with some paint server values
-== anim-paintserver-1.svg anim-paintserver-1.svg
-
-# animate attributes on text content children
-== anim-text-attr-01.svg anim-text-attr-01.svg
-
-# animate where the base value is non-interpolatable but will be replaced anyway
-== anim-fill-overpaintserver-1.svg anim-fill-overpaintserver-1.svg
-== anim-fill-overpaintserver-2.svg anim-fill-overpaintserver-2.svg
-
-# animate where we fallback from 'additive' animation to non-additive
-skip == anim-additive-fallback-1.svg anim-additive-fallback-1.svg
-
-== anim-remove-1.svg anim-remove-1.svg
-== anim-remove-2.svg anim-remove-2.svg
-== anim-remove-3.svg anim-remove-3.svg
-== anim-remove-4.svg anim-remove-4.svg
-== anim-remove-5.svg anim-remove-5.svg
-skip == anim-remove-6.svg anim-remove-6.svg
-== anim-remove-7.svg anim-remove-7.svg
-== anim-remove-8css.svg anim-remove-8css.svg
-== anim-remove-8xml.svg anim-remove-8xml.svg
-== anim-remove-9.svg anim-remove-9.svg
-== anim-retarget-1.svg anim-retarget-1.svg
-== anim-retarget-2.svg anim-retarget-2.svg
-== anim-retarget-3.svg anim-retarget-3.svg
-== anim-retarget-4.svg anim-retarget-4.svg
-== anim-retarget-5.svg anim-retarget-5.svg
-== anim-retarget-6.svg anim-retarget-6.svg
-== anim-retarget-7.svg anim-retarget-7.svg
-== anim-retarget-8.svg anim-retarget-8.svg
-
-== anim-strokecolor-1.svg anim-strokecolor-1.svg
-# bug 436296
-== anim-strokewidth-1xml.svg anim-strokewidth-1xml.svg
-
-== anim-targethref-1.svg anim-targethref-1.svg
-== anim-targethref-2.svg anim-targethref-2.svg
-== anim-targethref-3.svg anim-targethref-3.svg
-== anim-targethref-4.svg anim-targethref-4.svg
-== anim-targethref-5.svg anim-targethref-5.svg
-== anim-targethref-6.svg anim-targethref-6.svg
-== anim-targethref-7.svg anim-targethref-7.svg
-== anim-targethref-8.svg anim-targethref-8.svg
-== anim-targethref-9.svg anim-targethref-9.svg
-
-skip-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) == anim-text-rotate-01.svg anim-text-rotate-01.svg
-# Bug 645104 for skip failure on WinXP
-== anim-feFuncR-tableValues-01.svg anim-feFuncR-tableValues-01.svg
-
-skip == anim-text-x-y-dx-dy-01.svg anim-text-x-y-dx-dy-01.svg
-# bug 579588
-
-== anim-width-done-1a.svg anim-width-done-1a.svg
-== anim-width-done-1b.svg anim-width-done-1b.svg
-
-== anim-x-done-1a.svg anim-x-done-1a.svg
-== anim-x-done-1b.svg anim-x-done-1b.svg
-== anim-x-interp-1.svg anim-x-interp-1.svg
-== anim-x-interp-2.svg anim-x-interp-2.svg
-== anim-x-interp-3.svg anim-x-interp-3.svg
-== anim-x-interp-4.svg anim-x-interp-4.svg
-== anim-x-interp-5.svg anim-x-interp-5.svg
-== anim-x-interp-6.svg anim-x-interp-6.svg
-
-== anim-y-done-1a.svg anim-y-done-1a.svg
-== anim-y-done-1b.svg anim-y-done-1b.svg
-== anim-y-interp-1.svg anim-y-interp-1.svg
-== anim-y-interp-2.svg anim-y-interp-2.svg
-== anim-y-interp-3.svg anim-y-interp-3.svg
-== anim-y-interp-4.svg anim-y-interp-4.svg
-== anim-y-interp-5.svg anim-y-interp-5.svg
-== anim-y-interp-6.svg anim-y-interp-6.svg
-
-# Test we don't rely on HasAttr to see if an attribute has been set
-== anim-rect-rxry-1.svg anim-rect-rxry-1.svg
-== anim-pattern-attr-presence-01.svg anim-pattern-attr-presence-01.svg
-== anim-pattern-attr-presence-02.svg anim-pattern-attr-presence-02.svg
-# ^ bug 621651
-fuzzy-if(cocoaWidget&&layersGPUAccelerated,1,2) == anim-gradient-attr-presence-01.svg anim-gradient-attr-presence-01.svg
-
-== api-sanity-1.svg api-sanity-1.svg
-
-skip == freeze-applied-late-1.svg freeze-applied-late-1.svg
-skip == freeze-applied-late-2.svg freeze-applied-late-2.svg
-skip == freeze-applied-late-3.svg freeze-applied-late-3.svg
-skip == freeze-applied-late-4.svg freeze-applied-late-4.svg
-== frozen-to-anim-1.svg frozen-to-anim-1.svg
-
-== inactivate-with-active-unchanged-1.svg inactivate-with-active-unchanged-1.svg
-== inactivate-with-active-unchanged-2.svg inactivate-with-active-unchanged-2.svg
-
-skip == mapped-attr-long-url-1.svg mapped-attr-long-url-1.svg
-skip == mapped-attr-long-url-2.svg mapped-attr-long-url-2.svg
-
-# interaction between xml mapped attributes and their css equivalents
-skip == mapped-attr-vs-css-prop-1.svg mapped-attr-vs-css-prop-1.svg
-
-== min-1.svg min-1.svg
-
-== smil-transitions-interaction-1a.svg smil-transitions-interaction-1a.svg
-== smil-transitions-interaction-1b.svg smil-transitions-interaction-1b.svg
-== smil-transitions-interaction-2a.svg smil-transitions-interaction-2a.svg
-== smil-transitions-interaction-2b.svg smil-transitions-interaction-2b.svg
-== smil-transitions-interaction-3a.svg smil-transitions-interaction-3a.svg
-== smil-transitions-interaction-3b.svg smil-transitions-interaction-3b.svg
-== smil-transitions-interaction-4a.svg smil-transitions-interaction-4a.svg
-== smil-transitions-interaction-4b.svg smil-transitions-interaction-4b.svg
-
-# Test filtering of excessive times
-== filtered-instance-time-1.svg filtered-instance-time-1.svg
-
-# Test animation using defs element
-== anim-defs-gradient-property.svg anim-defs-gradient-property.svg
-== anim-defs-gradient-attribute.svg anim-defs-gradient-attribute.svg
-== anim-defs-fill.svg anim-defs-fill.svg
-== anim-defs-width.svg anim-defs-width.svg
-
-# Test animation that changes 'display' attribute
-== anim-display.svg anim-display.svg
-== anim-display-in-g-element.svg anim-display-in-g-element.svg
diff --git a/layout/reftests/svg/smil/reftest.list b/layout/reftests/svg/smil/reftest.list
index 801e55915..209bbd7af 100644
--- a/layout/reftests/svg/smil/reftest.list
+++ b/layout/reftests/svg/smil/reftest.list
@@ -139,7 +139,7 @@ fuzzy-if(skiaContent,1,600) == anim-feGaussianBlur-01.svg lime.svg
== anim-feConvolveMatrix-preserveAlpha-01.svg lime.svg
# animate some viewBox attributes
-fuzzy-if(Android,4,1) == anim-svg-viewBox-01.svg lime.svg
+== anim-svg-viewBox-01.svg lime.svg
== anim-svg-viewBox-02.svg lime.svg
== anim-svg-viewBox-03.svg lime.svg
== anim-view-01.svg#view lime.svg
diff --git a/layout/reftests/svg/smil/repeat/reftest-stylo.list b/layout/reftests/svg/smil/repeat/reftest-stylo.list
deleted file mode 100644
index c11c03e69..000000000
--- a/layout/reftests/svg/smil/repeat/reftest-stylo.list
+++ /dev/null
@@ -1,4 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# Tests for repeat behaviour
-== indefinite-repeat-1.svg indefinite-repeat-1.svg
-== init-repeat-1.svg init-repeat-1.svg
diff --git a/layout/reftests/svg/smil/restart/reftest-stylo.list b/layout/reftests/svg/smil/restart/reftest-stylo.list
deleted file mode 100644
index b32d8d8ff..000000000
--- a/layout/reftests/svg/smil/restart/reftest-stylo.list
+++ /dev/null
@@ -1,9 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# Tests for restart behaviour
-== reset-1.svg reset-1.svg
-== reset-2.svg reset-2.svg
-== reset-3.svg reset-3.svg
-== reset-4.svg reset-4.svg
-# reset-5.svg is no longer valid and has been removed
-== reset-6.svg reset-6.svg
-== reset-7.svg reset-7.svg
diff --git a/layout/reftests/svg/smil/seek/reftest-stylo.list b/layout/reftests/svg/smil/seek/reftest-stylo.list
deleted file mode 100644
index 6ac92da28..000000000
--- a/layout/reftests/svg/smil/seek/reftest-stylo.list
+++ /dev/null
@@ -1,18 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# Tests for seeking behaviour
-== anim-x-seek-1a.svg anim-x-seek-1a.svg
-== anim-x-seek-1b.svg anim-x-seek-1b.svg
-== anim-x-seek-1c.svg anim-x-seek-1c.svg
-== anim-x-seek-1d.svg anim-x-seek-1d.svg
-== anim-x-seek-1e.svg anim-x-seek-1e.svg
-== anim-x-seek-dynamic-1a.svg anim-x-seek-dynamic-1a.svg
-== anim-x-seek-dynamic-1b.svg anim-x-seek-dynamic-1b.svg
-== anim-x-seek-dynamic-1c.svg anim-x-seek-dynamic-1c.svg
-== anim-x-seek-dynamic-1d.svg anim-x-seek-dynamic-1d.svg
-== anim-x-seek-dynamic-1e.svg anim-x-seek-dynamic-1e.svg
-== anim-x-seek-dynamic-1f.svg anim-x-seek-dynamic-1f.svg
-== anim-x-seek-dynamic-1g.svg anim-x-seek-dynamic-1g.svg
-== anim-x-seek-dynamic-1h.svg anim-x-seek-dynamic-1h.svg
-== anim-x-seek-dynamic-1i.svg anim-x-seek-dynamic-1i.svg
-== anim-x-seek-negative-1a.svg anim-x-seek-negative-1a.svg
-== anim-x-seek-cross-container-1a.xhtml anim-x-seek-cross-container-1a.xhtml
diff --git a/layout/reftests/svg/smil/set/reftest-stylo.list b/layout/reftests/svg/smil/set/reftest-stylo.list
deleted file mode 100644
index 20d38fc0c..000000000
--- a/layout/reftests/svg/smil/set/reftest-stylo.list
+++ /dev/null
@@ -1,3 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== set-css-fontsize-freeze-1.svg set-css-fontsize-freeze-1.svg
-== set-css-fontsize-remove-1.svg set-css-fontsize-remove-1.svg
diff --git a/layout/reftests/svg/smil/smil-grid.js b/layout/reftests/svg/smil/smil-grid.js
index a67d3929f..f31281994 100644
--- a/layout/reftests/svg/smil/smil-grid.js
+++ b/layout/reftests/svg/smil/smil-grid.js
@@ -1,5 +1,4 @@
/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* vim: set ts=2 sw=2 sts=2 et: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/reftests/svg/smil/sort/reftest-stylo.list b/layout/reftests/svg/smil/sort/reftest-stylo.list
deleted file mode 100644
index c1333cac3..000000000
--- a/layout/reftests/svg/smil/sort/reftest-stylo.list
+++ /dev/null
@@ -1,14 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# Tests related to SVG Animation (using SMIL), focusing on animation-sorting
-# to see which animation takes precedence (out of multiple animations on the
-# same attribute)
-
-== sort-startAfter-1.svg sort-startAfter-1.svg
-== sort-startAfter-2.svg sort-startAfter-2.svg
-== sort-startAfter-3.svg sort-startAfter-3.svg
-== sort-startSame-1a.svg sort-startSame-1a.svg
-== sort-startSame-1b.svg sort-startSame-1b.svg
-== sort-startSame-2a.svg sort-startSame-2a.svg
-== sort-startSame-2b.svg sort-startSame-2b.svg
-random == sort-additive-1.svg sort-additive-1.svg
-# bug 547801
diff --git a/layout/reftests/svg/smil/style/reftest-stylo.list b/layout/reftests/svg/smil/style/reftest-stylo.list
deleted file mode 100644
index 8edffb202..000000000
--- a/layout/reftests/svg/smil/style/reftest-stylo.list
+++ /dev/null
@@ -1,159 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# Tests related to SVG Animation (using SMIL) of CSS properties
-
-# XXXdholbert TODO: Test color animation with "color-interpolation: linearRGB"
-# (when it's implemented)
-
-# 'color' property, from/to/by with named colors & hex values
-== anim-css-color-1-by-ident-hex.svg anim-css-color-1-by-ident-hex.svg
-== anim-css-color-1-from-by-hex-hex.svg anim-css-color-1-from-by-hex-hex.svg
-fuzzy-if(skiaContent,1,550) == anim-css-color-1-from-by-ident-hex.svg anim-css-color-1-from-by-ident-hex.svg
-fuzzy-if(skiaContent,1,550) == anim-css-color-1-from-to-hex-hex.svg anim-css-color-1-from-to-hex-hex.svg
-fuzzy-if(skiaContent,1,550) == anim-css-color-1-from-to-ident-ident.svg anim-css-color-1-from-to-ident-ident.svg
-fuzzy-if(skiaContent,1,550) == anim-css-color-1-to-ident-hex.svg anim-css-color-1-to-ident-hex.svg
-fuzzy-if(skiaContent,1,550) == anim-css-color-1-to-ident-ident.svg anim-css-color-1-to-ident-ident.svg
-
-# 'color' property, paced calcMode
-== anim-css-color-2-paced-rgb.svg anim-css-color-2-paced-rgb.svg
-
-# 'color' property, animating *by* a named color
-fuzzy-if(skiaContent,1,580) == anim-css-color-3-by-ident-ident.svg anim-css-color-3-by-ident-ident.svg
-fuzzy-if(skiaContent,1,580) == anim-css-color-3-from-by-ident-ident.svg anim-css-color-3-from-by-ident-ident.svg
-fuzzy-if(skiaContent,1,580) == anim-css-color-3-from-by-rgb-ident.svg anim-css-color-3-from-by-rgb-ident.svg
-
-# 'fill' property, from/to/by with named colors & hex values
-fuzzy-if(skiaContent,1,550) == anim-css-fill-1-by-ident-hex.svg anim-css-fill-1-by-ident-hex.svg
-fuzzy-if(skiaContent,1,550) == anim-css-fill-1-from-by-hex-hex.svg anim-css-fill-1-from-by-hex-hex.svg
-fuzzy-if(skiaContent,1,550) == anim-css-fill-1-from-by-ident-hex.svg anim-css-fill-1-from-by-ident-hex.svg
-fuzzy-if(skiaContent,1,550) == anim-css-fill-1-from-to-hex-hex.svg anim-css-fill-1-from-to-hex-hex.svg
-fuzzy-if(skiaContent,1,550) == anim-css-fill-1-from-to-ident-ident.svg anim-css-fill-1-from-to-ident-ident.svg
-fuzzy-if(skiaContent,1,550) == anim-css-fill-1-to-ident-hex.svg anim-css-fill-1-to-ident-hex.svg
-fuzzy-if(skiaContent,1,550) == anim-css-fill-1-to-ident-ident.svg anim-css-fill-1-to-ident-ident.svg
-
-# 'fill' property, from/to/by, with 'currentColor' keyword
-fuzzy-if(skiaContent,1,550) == anim-css-fill-1-by-ident-curcol.svg anim-css-fill-1-by-ident-curcol.svg
-fuzzy-if(skiaContent,1,550) == anim-css-fill-1-from-by-curcol-hex.svg anim-css-fill-1-from-by-curcol-hex.svg
-fuzzy-if(skiaContent,1,550) == anim-css-fill-1-from-by-hex-curcol.svg anim-css-fill-1-from-by-hex-curcol.svg
-fuzzy-if(skiaContent,1,550) == anim-css-fill-1-from-to-curcol-hex.svg anim-css-fill-1-from-to-curcol-hex.svg
-fuzzy-if(skiaContent,1,550) == anim-css-fill-1-from-to-hex-curcol.svg anim-css-fill-1-from-to-hex-curcol.svg
-fuzzy-if(skiaContent,1,550) == anim-css-fill-1-to-ident-curcol.svg anim-css-fill-1-to-ident-curcol.svg
-
-# 'fill' property, paced calcMode
-== anim-css-fill-2-paced-rgb.svg anim-css-fill-2-paced-rgb.svg
-
-# 'fill' property, animating *by* a named color
-fuzzy-if(skiaContent,1,580) == anim-css-fill-3-by-ident-ident.svg anim-css-fill-3-by-ident-ident.svg
-fuzzy-if(skiaContent,1,580) == anim-css-fill-3-from-by-ident-ident.svg anim-css-fill-3-from-by-ident-ident.svg
-fuzzy-if(skiaContent,1,580) == anim-css-fill-3-from-by-rgb-ident.svg anim-css-fill-3-from-by-rgb-ident.svg
-
-# check handling of overflowing color values
-# NOTE: The second test fails because we compute "from + by" as the animation
-# end-point, and we clamp that final color value (due to bug 515919) and use
-# the clamped value for interpolation. That's earlier than the SVG spec wants
-# us to clamp -- we're only supposed to clamp *final presentation values*.
-# (Reference: SVG 1.1 Appendix F.4)
-== anim-css-fill-overflow-1-by.svg anim-css-fill-overflow-1-by.svg
-== anim-css-fill-overflow-1-from-by.svg anim-css-fill-overflow-1-from-by.svg
-
-# 'fill-opacity' property
-fuzzy-if(skiaContent,1,885) == anim-css-fillopacity-1-by.svg anim-css-fillopacity-1-by.svg
-fuzzy-if(skiaContent,1,210) == anim-css-fillopacity-1-from-by.svg anim-css-fillopacity-1-from-by.svg
-== anim-css-fillopacity-1-from-to.svg anim-css-fillopacity-1-from-to.svg
-fuzzy-if(skiaContent,1,550) == anim-css-fillopacity-1-to.svg anim-css-fillopacity-1-to.svg
-== anim-css-fillopacity-2-paced.svg anim-css-fillopacity-2-paced.svg
-== anim-css-fillopacity-3-clamp-big.svg anim-css-fillopacity-3-clamp-big.svg
-# bug 501188
-fuzzy-if(skiaContent,1,365) == anim-css-fillopacity-3-clamp-small.svg anim-css-fillopacity-3-clamp-small.svg
-
-# 'font' shorthand property
-== anim-css-font-1.svg anim-css-font-1.svg
-
-# 'font-size' property, from/by/to with pixel values only
-== anim-css-fontsize-1-from-by-px-px.svg anim-css-fontsize-1-from-by-px-px.svg
-== anim-css-fontsize-1-from-to-px-px.svg anim-css-fontsize-1-from-to-px-px.svg
-
-# 'font-size' property (accepts unitless values)
-== anim-css-fontsize-1-from-to-no-no.svg anim-css-fontsize-1-from-to-no-no.svg
-== anim-css-fontsize-1-from-to-no-px.svg anim-css-fontsize-1-from-to-no-px.svg
-== anim-css-fontsize-1-from-to-px-no.svg anim-css-fontsize-1-from-to-px-no.svg
-
-# 'font-size' mapped attribute (accepts unitless values)
-skip == anim-mapped-fontsize-1-from-to-no-no.svg anim-mapped-fontsize-1-from-to-no-no.svg
-skip == anim-mapped-fontsize-1-from-to-no-px.svg anim-mapped-fontsize-1-from-to-no-px.svg
-skip == anim-mapped-fontsize-1-from-to-px-no.svg anim-mapped-fontsize-1-from-to-px-no.svg
-
-# 'font-size' property, from/by/to with percent values
-== anim-css-fontsize-1-from-by-pct-pct.svg anim-css-fontsize-1-from-by-pct-pct.svg
-== anim-css-fontsize-1-from-by-pct-px.svg anim-css-fontsize-1-from-by-pct-px.svg
-== anim-css-fontsize-1-from-by-px-pct.svg anim-css-fontsize-1-from-by-px-pct.svg
-== anim-css-fontsize-1-from-to-pct-pct.svg anim-css-fontsize-1-from-to-pct-pct.svg
-== anim-css-fontsize-1-from-to-pct-px.svg anim-css-fontsize-1-from-to-pct-px.svg
-== anim-css-fontsize-1-from-to-px-pct.svg anim-css-fontsize-1-from-to-px-pct.svg
-
-# 'font-size' property, with negative addition
-== anim-css-fontsize-2-from-by-px-px.svg anim-css-fontsize-2-from-by-px-px.svg
-== anim-css-fontsize-2-from-by-px-em.svg anim-css-fontsize-2-from-by-px-em.svg
-== anim-css-fontsize-2-from-by-em-em.svg anim-css-fontsize-2-from-by-em-em.svg
-
-# 'stroke-dasharray' property, from/to with pixel values only
-== anim-css-strokedasharray-1.svg anim-css-strokedasharray-1.svg
-
-# 'stroke-width' property, from/by/to with pixel values only
-== anim-css-strokewidth-1-by-px-px.svg anim-css-strokewidth-1-by-px-px.svg
-== anim-css-strokewidth-1-from-by-px-px.svg anim-css-strokewidth-1-from-by-px-px.svg
-== anim-css-strokewidth-1-from-to-px-px.svg anim-css-strokewidth-1-from-to-px-px.svg
-== anim-css-strokewidth-1-to-px-px.svg anim-css-strokewidth-1-to-px-px.svg
-
-# 'stroke-width' property, from/by/to with unitless values only
-== anim-css-strokewidth-1-by-no-no.svg anim-css-strokewidth-1-by-no-no.svg
-== anim-css-strokewidth-1-from-by-no-no.svg anim-css-strokewidth-1-from-by-no-no.svg
-== anim-css-strokewidth-1-from-to-no-no.svg anim-css-strokewidth-1-from-to-no-no.svg
-== anim-css-strokewidth-1-to-no-no.svg anim-css-strokewidth-1-to-no-no.svg
-
-# 'stroke-width' property, from/by/to with percent values
-# XXXdholbert the mixed pct + px tests fail right now, because we need calc()
-# in order to interpolate between pct and non-pct values, and we don't yet
-# support calc() for stroke-width & other SVG-specific properties (Bug 594933).
-== anim-css-strokewidth-1-by-pct-pct.svg anim-css-strokewidth-1-by-pct-pct.svg
-== anim-css-strokewidth-1-by-pct-px.svg anim-css-strokewidth-1-by-pct-px.svg
-== anim-css-strokewidth-1-by-px-pct.svg anim-css-strokewidth-1-by-px-pct.svg
-== anim-css-strokewidth-1-from-by-pct-pct.svg anim-css-strokewidth-1-from-by-pct-pct.svg
-== anim-css-strokewidth-1-from-by-pct-px.svg anim-css-strokewidth-1-from-by-pct-px.svg
-== anim-css-strokewidth-1-from-by-px-pct.svg anim-css-strokewidth-1-from-by-px-pct.svg
-== anim-css-strokewidth-1-from-to-pct-pct.svg anim-css-strokewidth-1-from-to-pct-pct.svg
-== anim-css-strokewidth-1-from-to-pct-px.svg anim-css-strokewidth-1-from-to-pct-px.svg
-== anim-css-strokewidth-1-from-to-px-pct.svg anim-css-strokewidth-1-from-to-px-pct.svg
-== anim-css-strokewidth-1-to-pct-pct.svg anim-css-strokewidth-1-to-pct-pct.svg
-== anim-css-strokewidth-1-to-pct-px.svg anim-css-strokewidth-1-to-pct-px.svg
-== anim-css-strokewidth-1-to-px-pct.svg anim-css-strokewidth-1-to-px-pct.svg
-
-# 'stroke-width' property, from/by/to with em values
-== anim-css-strokewidth-1-by-px-em.svg anim-css-strokewidth-1-by-px-em.svg
-== anim-css-strokewidth-1-by-em-em.svg anim-css-strokewidth-1-by-em-em.svg
-== anim-css-strokewidth-1-by-em-px.svg anim-css-strokewidth-1-by-em-px.svg
-== anim-css-strokewidth-1-from-by-px-em.svg anim-css-strokewidth-1-from-by-px-em.svg
-== anim-css-strokewidth-1-from-by-em-em.svg anim-css-strokewidth-1-from-by-em-em.svg
-== anim-css-strokewidth-1-from-by-em-px.svg anim-css-strokewidth-1-from-by-em-px.svg
-== anim-css-strokewidth-1-from-to-px-em.svg anim-css-strokewidth-1-from-to-px-em.svg
-== anim-css-strokewidth-1-from-to-em-em.svg anim-css-strokewidth-1-from-to-em-em.svg
-== anim-css-strokewidth-1-from-to-em-px.svg anim-css-strokewidth-1-from-to-em-px.svg
-== anim-css-strokewidth-1-to-px-em.svg anim-css-strokewidth-1-to-px-em.svg
-== anim-css-strokewidth-1-to-em-em.svg anim-css-strokewidth-1-to-em-em.svg
-== anim-css-strokewidth-1-to-em-px.svg anim-css-strokewidth-1-to-em-px.svg
-
-# 'stroke-width' property, values-array & paced calc-mode support
-== anim-css-strokewidth-2-values-em-em.svg anim-css-strokewidth-2-values-em-em.svg
-== anim-css-strokewidth-2-values-em-px.svg anim-css-strokewidth-2-values-em-px.svg
-== anim-css-strokewidth-2-values-px-em.svg anim-css-strokewidth-2-values-px-em.svg
-fuzzy-if(skiaContent,1,360) == anim-css-strokewidth-2-values-px-px.svg anim-css-strokewidth-2-values-px-px.svg
-== anim-css-strokewidth-3-paced.svg anim-css-strokewidth-3-paced.svg
-
-# 'stroke-width' property, negative addition
-== anim-css-strokewidth-4-from-by-px-px.svg anim-css-strokewidth-4-from-by-px-px.svg
-== anim-css-strokewidth-4-from-by-px-em.svg anim-css-strokewidth-4-from-by-px-em.svg
-== anim-css-strokewidth-4-from-by-em-em.svg anim-css-strokewidth-4-from-by-em-em.svg
-fuzzy-if(skiaContent,1,170) == anim-css-strokewidth-4-from-by-no-no.svg anim-css-strokewidth-4-from-by-no-no.svg
-
-# check correct handling of "!important" values
-== important-set-1.svg important-set-1.svg
-== important-set-2.svg important-set-2.svg
diff --git a/layout/reftests/svg/smil/syncbase/reftest-stylo.list b/layout/reftests/svg/smil/syncbase/reftest-stylo.list
deleted file mode 100644
index ed7f204af..000000000
--- a/layout/reftests/svg/smil/syncbase/reftest-stylo.list
+++ /dev/null
@@ -1,100 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# Tests related to SVG Animation (using SMIL) that use syncbase timing.
-
-# New intervals
-== new-interval-simple-1.svg new-interval-simple-1.svg
-== new-interval-simple-2.svg new-interval-simple-2.svg
-== new-interval-negative-offset-1.svg new-interval-negative-offset-1.svg
-== new-interval-negative-offset-2.svg new-interval-negative-offset-2.svg
-== new-interval-negative-offset-3.svg new-interval-negative-offset-3.svg
-== new-interval-negative-offset-4.svg new-interval-negative-offset-4.svg
-== new-interval-negative-syncbase-1.svg new-interval-negative-syncbase-1.svg
-== new-interval-restart-1.svg new-interval-restart-1.svg
-== new-interval-restart-2.svg new-interval-restart-2.svg
-== new-interval-restart-3.svg new-interval-restart-3.svg
-== new-interval-early-end-1.svg new-interval-early-end-1.svg
-== new-interval-early-end-2.svg new-interval-early-end-2.svg
-== new-interval-early-end-3.svg new-interval-early-end-3.svg
-== new-interval-early-end-4.svg new-interval-early-end-4.svg
-== new-interval-early-end-5.svg new-interval-early-end-5.svg
-== new-interval-early-end-6.svg new-interval-early-end-6.svg
-== new-interval-early-end-7.svg new-interval-early-end-7.svg
-== new-interval-doubly-dependent-1.svg new-interval-doubly-dependent-1.svg
-== new-interval-doubly-dependent-2.svg new-interval-doubly-dependent-2.svg
-== new-interval-doubly-dependent-3.svg new-interval-doubly-dependent-3.svg
-== new-interval-triply-dependent-1.svg new-interval-triply-dependent-1.svg
-skip == new-interval-triply-dependent-2.svg new-interval-triply-dependent-2.svg
-== new-interval-end-negative-1.svg new-interval-end-negative-1.svg
-== new-interval-end-negative-2.svg new-interval-end-negative-2.svg
-== new-interval-end-dep-1.svg new-interval-end-dep-1.svg
-== new-interval-chain-1.svg new-interval-chain-1.svg
-== new-interval-chain-2.svg new-interval-chain-2.svg
-== new-interval-sample-order-1.svg new-interval-sample-order-1.svg
-== new-interval-freeze-begin-1.svg new-interval-freeze-begin-1.svg
-
-# Changing intervals
-== changed-interval-simple-1.svg changed-interval-simple-1.svg
-== changed-interval-simple-2.svg changed-interval-simple-2.svg
-== changed-interval-simple-3.svg changed-interval-simple-3.svg
-== changed-interval-simple-4.svg changed-interval-simple-4.svg
-== changed-interval-simple-5.svg changed-interval-simple-5.svg
-== changed-interval-resolved-1.svg changed-interval-resolved-1.svg
-== changed-interval-resolved-2.svg changed-interval-resolved-2.svg
-== changed-interval-sort-1.svg changed-interval-sort-1.svg
-== changed-interval-change-spec-1.svg changed-interval-change-spec-1.svg
-== changed-interval-change-spec-2.svg changed-interval-change-spec-2.svg
-== changed-interval-change-spec-3.svg changed-interval-change-spec-3.svg
-== changed-interval-change-spec-4.svg changed-interval-change-spec-4.svg
-
-# Deleted intervals
-== deleted-interval-simple-1.svg deleted-interval-simple-1.svg
-== deleted-interval-simple-2.svg deleted-interval-simple-2.svg
-== deleted-interval-simple-3.svg deleted-interval-simple-3.svg
-== deleted-interval-simple-4.svg deleted-interval-simple-4.svg
-== deleted-interval-simple-5.svg deleted-interval-simple-5.svg
-
-# Trimmed intervals
-== trimmed-interval-1.svg trimmed-interval-1.svg
-
-# Cyclic dependencies
-== cycle-ok-1.svg cycle-ok-1.svg
-== cycle-ok-2.svg cycle-ok-2.svg
-== cycle-ok-3.svg cycle-ok-3.svg
-== cycle-ok-4.svg cycle-ok-4.svg
-== cycle-ok-5.svg cycle-ok-5.svg
-== cycle-self-ref-1.svg cycle-self-ref-1.svg
-== cycle-self-ref-2.svg cycle-self-ref-2.svg
-== cycle-self-ref-3.svg cycle-self-ref-3.svg
-== cycle-self-ref-4.svg cycle-self-ref-4.svg
-== cycle-self-ref-5.svg cycle-self-ref-5.svg
-== cycle-invalid-1.svg cycle-invalid-1.svg
-== cycle-invalid-2.svg cycle-invalid-2.svg
-== cycle-invalid-3.svg cycle-invalid-3.svg
-== cycle-invalid-4.svg cycle-invalid-4.svg
-== cycle-change-1.svg cycle-change-1.svg
-== cycle-change-2.svg cycle-change-2.svg
-skip == cycle-delete-1.svg cycle-delete-1.svg
-== cycle-recursion-1.svg cycle-recursion-1.svg
-== cycle-recursion-2.svg cycle-recursion-2.svg
-
-# Animation sandwich priority
-== sandwich-priority-1.svg sandwich-priority-1.svg
-== sandwich-priority-2.svg sandwich-priority-2.svg
-== sandwich-priority-3.svg sandwich-priority-3.svg
-== sandwich-priority-4.svg sandwich-priority-4.svg
-== sandwich-priority-5.svg sandwich-priority-5.svg
-== sandwich-priority-6.svg sandwich-priority-6.svg
-== sandwich-priority-7.svg sandwich-priority-7.svg
-== sandwich-priority-8.svg sandwich-priority-8.svg
-== sandwich-priority-9.svg sandwich-priority-9.svg
-== sandwich-priority-10.svg sandwich-priority-10.svg
-== sandwich-priority-11.svg sandwich-priority-11.svg
-== sandwich-priority-12.svg sandwich-priority-12.svg
-
-# Cross-time container dependencies
-skip == cross-container-1.xhtml cross-container-1.xhtml
-== cross-container-2.xhtml cross-container-2.xhtml
-skip == cross-container-3.xhtml cross-container-3.xhtml
-
-# Filtering
-== filtered-interval-1.svg filtered-interval-1.svg
diff --git a/layout/reftests/svg/smil/timed/reftest-stylo.list b/layout/reftests/svg/smil/timed/reftest-stylo.list
deleted file mode 100644
index ed399e826..000000000
--- a/layout/reftests/svg/smil/timed/reftest-stylo.list
+++ /dev/null
@@ -1,19 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# Tests related to SVG Animation that use timeouts to interrupt, modify,
-# and examine animations.
-#
-# NOTE: Most of these tests require a few seconds to run.
-# (That's longer than most other reftests)
-
-== paced-1.svg paced-1.svg
-== pause-1.svg pause-1.svg
-fails == removeChild-1.svg removeChild-1.svg
-# rect needs to reset
-fails == removeChild-2.svg removeChild-2.svg
-# rect needs to reset
-skip == appendChild-1a.svg appendChild-1a.svg
-# first rect needs to reset
-skip == appendChild-1b.svg appendChild-1b.svg
-skip == appendChild-2a.svg appendChild-2a.svg
-# first rect needs to reset
-skip == appendChild-2b.svg appendChild-2b.svg
diff --git a/layout/reftests/svg/smil/transform/reftest-stylo.list b/layout/reftests/svg/smil/transform/reftest-stylo.list
deleted file mode 100644
index bac1a7061..000000000
--- a/layout/reftests/svg/smil/transform/reftest-stylo.list
+++ /dev/null
@@ -1,23 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# Tests related to SVG Animation (using SMIL), focusing on the animateTransform
-# element.
-
-fuzzy(111,1802) fuzzy-if(skiaContent,130,1000) == additive-1.svg additive-1.svg
-# bug 981344, bug 1239766
-== animate-width-1.svg animate-width-1.svg
-fuzzy-if(cocoaWidget,1,32) fuzzy-if(winWidget,15,4) == paced-1.svg paced-1.svg
-# bug 981640
-fuzzy-if(skiaContent,1,220) == rotate-angle-1.svg rotate-angle-1.svg
-== rotate-angle-2.svg rotate-angle-2.svg
-fuzzy-if(skiaContent,1,130) == rotate-angle-3.svg rotate-angle-3.svg
-fuzzy-if(skiaContent,1,110) == rotate-angle-4.svg rotate-angle-4.svg
-fuzzy-if(skiaContent,1,130) == rotate-angle-5.svg rotate-angle-5.svg
-fuzzy(12,27) fuzzy-if(skiaContent,1,180) == scale-1.svg scale-1.svg
-# bug 981004
-== set-transform-1.svg set-transform-1.svg
-fuzzy-if(winWidget,1,3) == skew-1.svg skew-1.svg
-# bug 983671
-== translate-clipPath-1.svg translate-clipPath-1.svg
-fails-if(OSX==1006&&!skiaContent) == translate-gradient-1.svg translate-gradient-1.svg
-== translate-pattern-1.svg translate-pattern-1.svg
-== use-1.svg use-1.svg
diff --git a/layout/reftests/svg/smil/transform/reftest.list b/layout/reftests/svg/smil/transform/reftest.list
index 184e708fa..6ef895259 100644
--- a/layout/reftests/svg/smil/transform/reftest.list
+++ b/layout/reftests/svg/smil/transform/reftest.list
@@ -9,9 +9,9 @@ fuzzy-if(skiaContent,1,220) == rotate-angle-1.svg rotate-angle-ref.svg
fuzzy-if(skiaContent,1,130) == rotate-angle-3.svg rotate-angle-ref.svg
fuzzy-if(skiaContent,1,110) == rotate-angle-4.svg rotate-angle-ref.svg
fuzzy-if(skiaContent,1,130) == rotate-angle-5.svg rotate-angle-ref.svg
-fuzzy(12,27) fuzzy-if(skiaContent,1,180) fuzzy-if(Android,16,3) == scale-1.svg scale-1-ref.svg # bug 981004
+fuzzy(12,27) fuzzy-if(skiaContent,1,180) == scale-1.svg scale-1-ref.svg # bug 981004
== set-transform-1.svg lime.svg
-fuzzy-if(winWidget||gtkWidget||OSX,1,27) fuzzy-if(Android&&skiaContent,1,20) == skew-1.svg skew-1-ref.svg # bug 983671, Bug 1260629
+fuzzy-if(winWidget||gtkWidget||OSX,1,27) == skew-1.svg skew-1-ref.svg # bug 983671, Bug 1260629
== translate-clipPath-1.svg lime.svg
fails-if(OSX==1006&&!skiaContent) == translate-gradient-1.svg lime.svg
== translate-pattern-1.svg lime.svg
diff --git a/layout/reftests/svg/svg-integration/clip-path/reftest-stylo.list b/layout/reftests/svg/svg-integration/clip-path/reftest-stylo.list
deleted file mode 100644
index 273ece54e..000000000
--- a/layout/reftests/svg/svg-integration/clip-path/reftest-stylo.list
+++ /dev/null
@@ -1,50 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# These tests verify that CSS clip-path behaves properly.
-# e.g. clip-path: polygon(nonzero, 3px 3px, 20% 20%)
-
-default-preferences pref(layout.css.clip-path-shapes.enabled,true)
-
-# Following tests adapted from W3C csswg-test repo
-== clip-path-polygon-001.html clip-path-polygon-001.html
-== clip-path-polygon-002.html clip-path-polygon-002.html
-== clip-path-polygon-003.html clip-path-polygon-003.html
-== clip-path-polygon-004.html clip-path-polygon-004.html
-skip == clip-path-polygon-005.html clip-path-polygon-005.html
-== clip-path-polygon-006.html clip-path-polygon-006.html
-== clip-path-polygon-007.html clip-path-polygon-007.html
-== clip-path-polygon-008.html clip-path-polygon-008.html
-== clip-path-polygon-009.html clip-path-polygon-009.html
-== clip-path-polygon-010.html clip-path-polygon-010.html
-== clip-path-polygon-011.html clip-path-polygon-011.html
-== clip-path-polygon-012.html clip-path-polygon-012.html
-== clip-path-polygon-013.html clip-path-polygon-013.html
-
-== clip-path-circle-001.html clip-path-circle-001.html
-== clip-path-circle-002.html clip-path-circle-002.html
-== clip-path-circle-003.html clip-path-circle-003.html
-== clip-path-circle-004.html clip-path-circle-004.html
-== clip-path-circle-005.html clip-path-circle-005.html
-== clip-path-circle-006.html clip-path-circle-006.html
-== clip-path-circle-007.html clip-path-circle-007.html
-== clip-path-circle-008.html clip-path-circle-008.html
-== clip-path-circle-009.html clip-path-circle-009.html
-== clip-path-circle-010.html clip-path-circle-010.html
-== clip-path-circle-011.html clip-path-circle-011.html
-== clip-path-circle-012.html clip-path-circle-012.html
-== clip-path-circle-013.html clip-path-circle-013.html
-== clip-path-circle-014.html clip-path-circle-014.html
-== clip-path-circle-015.html clip-path-circle-015.html
-== clip-path-circle-016.html clip-path-circle-016.html
-== clip-path-circle-017.html clip-path-circle-017.html
-== clip-path-circle-018.html clip-path-circle-018.html
-== clip-path-circle-019.html clip-path-circle-019.html
-== clip-path-circle-020.html clip-path-circle-020.html
-
-== clip-path-ellipse-001.html clip-path-ellipse-001.html
-== clip-path-ellipse-002.html clip-path-ellipse-002.html
-== clip-path-ellipse-003.html clip-path-ellipse-003.html
-== clip-path-ellipse-004.html clip-path-ellipse-004.html
-== clip-path-ellipse-005.html clip-path-ellipse-005.html
-== clip-path-ellipse-006.html clip-path-ellipse-006.html
-== clip-path-ellipse-007.html clip-path-ellipse-007.html
-== clip-path-ellipse-008.html clip-path-ellipse-008.html
diff --git a/layout/reftests/svg/svg-integration/reftest-stylo.list b/layout/reftests/svg/svg-integration/reftest-stylo.list
deleted file mode 100644
index a157f501b..000000000
--- a/layout/reftests/svg/svg-integration/reftest-stylo.list
+++ /dev/null
@@ -1,49 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# clip-path tests
-include clip-path/reftest-stylo.list
-
-== clipPath-html-01.xhtml clipPath-html-01.xhtml
-== clipPath-html-01-extref.xhtml clipPath-html-01-extref.xhtml
-== clipPath-html-02.xhtml clipPath-html-02.xhtml
-== clipPath-html-02-extref.xhtml clipPath-html-02-extref.xhtml
-== clipPath-html-03.xhtml clipPath-html-03.xhtml
-== clipPath-html-03-extref.xhtml clipPath-html-03-extref.xhtml
-== clipPath-html-04.xhtml clipPath-html-04.xhtml
-== clipPath-html-04-extref.xhtml clipPath-html-04-extref.xhtml
-fails fuzzy-if(true,140,70) == clipPath-html-05.xhtml clipPath-html-05.xhtml
-# Bug 776089
-fails fuzzy-if(true,140,70) == clipPath-html-05-extref.xhtml clipPath-html-05-extref.xhtml
-# Bug 776089
-fuzzy-if(Android,255,30) == clipPath-html-06.xhtml clipPath-html-06.xhtml
-fuzzy-if(Android,255,30) == clipPath-html-06-extref.xhtml clipPath-html-06-extref.xhtml
-== clipPath-html-07.xhtml clipPath-html-07.xhtml
-== clipPath-html-08.xhtml clipPath-html-08.xhtml
-# reuse 07-ref.svg
-== clipPath-html-zoomed-01.xhtml clipPath-html-zoomed-01.xhtml
-== clipPath-transformed-html-01.xhtml clipPath-transformed-html-01.xhtml
-== clipPath-transformed-html-02.xhtml clipPath-transformed-html-02.xhtml
-== conditions-outer-svg-01.xhtml conditions-outer-svg-01.xhtml
-== conditions-outer-svg-02.xhtml conditions-outer-svg-02.xhtml
-== dynamic-conditions-outer-svg-01.xhtml dynamic-conditions-outer-svg-01.xhtml
-== dynamic-conditions-outer-svg-02.xhtml dynamic-conditions-outer-svg-02.xhtml
-== dynamic-conditions-outer-svg-03.xhtml dynamic-conditions-outer-svg-03.xhtml
-== dynamic-conditions-outer-svg-04.xhtml dynamic-conditions-outer-svg-04.xhtml
-== filter-html-01.xhtml filter-html-01.xhtml
-random-if(B2G||Mulet||Android) == filter-html-01-extref.xhtml filter-html-01-extref.xhtml
-# Bug 1063987
-# Initial mulet triage: parity with B2G/B2G Desktop
-# Android: bug 1198380
-== filter-html-zoomed-01.xhtml filter-html-zoomed-01.xhtml
-== mask-html-01.xhtml mask-html-01.xhtml
-== mask-html-01-extref-01.xhtml mask-html-01-extref-01.xhtml
-random == mask-html-01-extref-02.xhtml mask-html-01-extref-02.xhtml
-# random due to bug 877661
-fuzzy-if(B2G&&browserIsRemote,1,2300) == mask-html-zoomed-01.xhtml mask-html-zoomed-01.xhtml
-# Skil XBL test case on B2G
-skip-if(B2G||Mulet) == mask-html-xbl-bound-01.html mask-html-xbl-bound-01.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== mask-transformed-html-01.xhtml mask-transformed-html-01.xhtml
-== mask-transformed-html-02.xhtml mask-transformed-html-02.xhtml
-== patterned-svg-under-transformed-html-01.xhtml patterned-svg-under-transformed-html-01.xhtml
-== patterned-svg-under-transformed-html-02.xhtml patterned-svg-under-transformed-html-02.xhtml
-
diff --git a/layout/reftests/svg/svg-integration/reftest.list b/layout/reftests/svg/svg-integration/reftest.list
index 6d7b76b75..da491b607 100644
--- a/layout/reftests/svg/svg-integration/reftest.list
+++ b/layout/reftests/svg/svg-integration/reftest.list
@@ -9,10 +9,10 @@ include clip-path/reftest.list
== clipPath-html-03-extref.xhtml clipPath-html-03-ref.svg
== clipPath-html-04.xhtml clipPath-html-04-ref.xhtml
== clipPath-html-04-extref.xhtml clipPath-html-04-ref.xhtml
-fuzzy-if(true,140,70) == clipPath-html-05.xhtml clipPath-html-05-ref.xhtml # Bug 776089
-fuzzy-if(true,140,70) == clipPath-html-05-extref.xhtml clipPath-html-05-ref.xhtml # Bug 776089
-fuzzy-if(Android,255,30) == clipPath-html-06.xhtml clipPath-html-06-ref.xhtml
-fuzzy-if(Android,255,30) == clipPath-html-06-extref.xhtml clipPath-html-06-ref.xhtml
+fuzzy(140,70) == clipPath-html-05.xhtml clipPath-html-05-ref.xhtml # Bug 776089
+fuzzy(140,70) == clipPath-html-05-extref.xhtml clipPath-html-05-ref.xhtml # Bug 776089
+== clipPath-html-06.xhtml clipPath-html-06-ref.xhtml
+== clipPath-html-06-extref.xhtml clipPath-html-06-ref.xhtml
== clipPath-html-07.xhtml clipPath-html-07-ref.svg
== clipPath-html-08.xhtml clipPath-html-07-ref.svg # reuse 07-ref.svg
== clipPath-html-zoomed-01.xhtml clipPath-html-01-ref.svg
@@ -25,7 +25,7 @@ fuzzy-if(Android,255,30) == clipPath-html-06-extref.xhtml clipPath-html-06-ref.x
== dynamic-conditions-outer-svg-03.xhtml ../pass.svg
== dynamic-conditions-outer-svg-04.xhtml ../pass.svg
== filter-html-01.xhtml filter-html-01-ref.svg
-random-if(Android) == filter-html-01-extref.xhtml filter-html-01-ref.svg # Android: bug 1198380
+== filter-html-01-extref.xhtml filter-html-01-ref.svg
== filter-html-zoomed-01.xhtml filter-html-01-ref.svg
== mask-html-01.xhtml mask-html-01-ref.svg
== mask-html-01-extref-01.xhtml mask-html-01-ref.svg
diff --git a/layout/reftests/svg/text/reftest-stylo.list b/layout/reftests/svg/text/reftest-stylo.list
deleted file mode 100644
index 68f6a9819..000000000
--- a/layout/reftests/svg/text/reftest-stylo.list
+++ /dev/null
@@ -1,204 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== simple.svg simple.svg
-== simple-2.svg simple-2.svg
-== simple-underline.svg simple-underline.svg
-skip == simple-underline-scaled.svg simple-underline-scaled.svg
-== simple-anchor-end-bidi.svg simple-anchor-end-bidi.svg
-== simple-anchor-end-rtl.svg simple-anchor-end-rtl.svg
-== simple-anchor-end.svg simple-anchor-end.svg
-== simple-anchor-middle-bidi.svg simple-anchor-middle-bidi.svg
-== simple-anchor-middle-rtl.svg simple-anchor-middle-rtl.svg
-fuzzy-if(skiaContent,111,81) == simple-anchor-middle.svg simple-anchor-middle.svg
-== simple-bidi.svg simple-bidi.svg
-== simple-bidi-2.svg simple-bidi-2.svg
-
-== simple-dx.svg simple-dx.svg
-== simple-dx-2.svg simple-dx-2.svg
-== simple-dx-anchor-end-bidi.svg simple-dx-anchor-end-bidi.svg
-== simple-dx-anchor-end-rtl.svg simple-dx-anchor-end-rtl.svg
-== simple-dx-anchor-end.svg simple-dx-anchor-end.svg
-== simple-dx-anchor-middle-bidi.svg simple-dx-anchor-middle-bidi.svg
-== simple-dx-anchor-middle-rtl.svg simple-dx-anchor-middle-rtl.svg
-== simple-dx-anchor-middle.svg simple-dx-anchor-middle.svg
-== simple-dx-bidi.svg simple-dx-bidi.svg
-== simple-dx-bidi-2.svg simple-dx-bidi-2.svg
-== simple-dx-rtl.svg simple-dx-rtl.svg
-== simple-dx-rtl-2.svg simple-dx-rtl-2.svg
-
-== simple-fill-color-dynamic.svg simple-fill-color-dynamic.svg
-== simple-fill-color.svg simple-fill-color.svg
-HTTP(../..) == simple-fill-gradient.svg simple-fill-gradient.svg
-== simple-fill-none.svg simple-fill-none.svg
-== simple-pointer-events.svg simple-pointer-events.svg
-
-== simple-multiple-dx.svg simple-multiple-dx.svg
-== simple-multiple-dx-2.svg simple-multiple-dx-2.svg
-== simple-multiple-dx-anchor-end-bidi.svg simple-multiple-dx-anchor-end-bidi.svg
-HTTP(../..) == simple-multiple-dx-anchor-middle-bidi.svg simple-multiple-dx-anchor-middle-bidi.svg
-== simple-multiple-dx-anchor-end-rtl.svg simple-multiple-dx-anchor-end-rtl.svg
-== simple-multiple-dx-anchor-end.svg simple-multiple-dx-anchor-end.svg
-fuzzy-if(skiaContent,1,2) HTTP(../..) == simple-multiple-dx-anchor-middle-rtl.svg simple-multiple-dx-anchor-middle-rtl.svg
-HTTP(../..) == simple-multiple-dx-anchor-middle.svg simple-multiple-dx-anchor-middle.svg
-== simple-multiple-dx-bidi.svg simple-multiple-dx-bidi.svg
-== simple-multiple-dx-bidi-2.svg simple-multiple-dx-bidi-2.svg
-== simple-multiple-dx-rtl.svg simple-multiple-dx-rtl.svg
-== simple-multiple-dx-rtl-2.svg simple-multiple-dx-rtl-2.svg
-
-== simple-rtl.svg simple-rtl.svg
-== simple-rtl-2.svg simple-rtl-2.svg
-HTTP(../..) == simple-transform-rotate.svg simple-transform-rotate.svg
-
-== multiple-x.svg multiple-x.svg
-== multiple-x-bidi.svg multiple-x-bidi.svg
-== multiple-x-rtl.svg multiple-x-rtl.svg
-== multiple-x-anchor-end-bidi.svg multiple-x-anchor-end-bidi.svg
-== multiple-x-anchor-end-rtl.svg multiple-x-anchor-end-rtl.svg
-== multiple-x-anchor-end.svg multiple-x-anchor-end.svg
-== multiple-x-dx-bidi.svg multiple-x-dx-bidi.svg
-== multiple-x-dx-rtl.svg multiple-x-dx-rtl.svg
-== multiple-x-dx.svg multiple-x-dx.svg
-== multiple-x-holes-bidi.svg multiple-x-holes-bidi.svg
-== multiple-x-holes-dx-bidi.svg multiple-x-holes-dx-bidi.svg
-== multiple-x-holes.svg multiple-x-holes.svg
-== multiple-x-holes-dx.svg multiple-x-holes-dx.svg
-== multiple-x-holes-multiple-dx-bidi.svg multiple-x-holes-multiple-dx-bidi.svg
-== multiple-x-holes-multiple-dx-rtl.svg multiple-x-holes-multiple-dx-rtl.svg
-== multiple-x-holes-multiple-dx.svg multiple-x-holes-multiple-dx.svg
-== multiple-x-holes-rtl.svg multiple-x-holes-rtl.svg
-== multiple-x-multiple-dx-bidi.svg multiple-x-multiple-dx-bidi.svg
-== multiple-x-multiple-dx-rtl.svg multiple-x-multiple-dx-rtl.svg
-== multiple-x-multiple-dx.svg multiple-x-multiple-dx.svg
-== multiple-x-multiple-dx-anchor-end-bidi.svg multiple-x-multiple-dx-anchor-end-bidi.svg
-== multiple-x-multiple-dx-anchor-end-rtl.svg multiple-x-multiple-dx-anchor-end-rtl.svg
-== multiple-x-multiple-dx-anchor-end.svg multiple-x-multiple-dx-anchor-end.svg
-
-== multiple-x-percentages.svg multiple-x-percentages.svg
-== multiple-x-percentages-2.html multiple-x-percentages-2.html
-== multiple-x-percentages-3.html multiple-x-percentages-3.html
-
-== multiple-x-white-space.svg multiple-x-white-space.svg
-
-== multiple-chunks-bidi.svg multiple-chunks-bidi.svg
-== multiple-chunks-different-anchor-bidi.svg multiple-chunks-different-anchor-bidi.svg
-== multiple-chunks-different-anchor-rtl.svg multiple-chunks-different-anchor-rtl.svg
-== multiple-chunks-different-anchor.svg multiple-chunks-different-anchor.svg
-== multiple-chunks-directions-and-anchor.svg multiple-chunks-directions-and-anchor.svg
-== multiple-chunks-directions-and-anchor-dx.svg multiple-chunks-directions-and-anchor-dx.svg
-== multiple-chunks-directions-and-anchor-multiple-dx.svg multiple-chunks-directions-and-anchor-multiple-dx.svg
-== multiple-chunks-dx-bidi.svg multiple-chunks-dx-bidi.svg
-== multiple-chunks-dx-different-anchor-bidi.svg multiple-chunks-dx-different-anchor-bidi.svg
-== multiple-chunks-dx-different-anchor-rtl.svg multiple-chunks-dx-different-anchor-rtl.svg
-== multiple-chunks-dx-different-anchor.svg multiple-chunks-dx-different-anchor.svg
-== multiple-chunks-dx-rtl.svg multiple-chunks-dx-rtl.svg
-== multiple-chunks-dx.svg multiple-chunks-dx.svg
-== multiple-chunks-fill-color.svg multiple-chunks-fill-color.svg
-== multiple-chunks-multiple-dx-bidi.svg multiple-chunks-multiple-dx-bidi.svg
-== multiple-chunks-multiple-dx-different-anchor-bidi.svg multiple-chunks-multiple-dx-different-anchor-bidi.svg
-== multiple-chunks-multiple-dx-different-anchor-rtl.svg multiple-chunks-multiple-dx-different-anchor-rtl.svg
-== multiple-chunks-multiple-dx-different-anchor.svg multiple-chunks-multiple-dx-different-anchor.svg
-== multiple-chunks-multiple-dx-rtl.svg multiple-chunks-multiple-dx-rtl.svg
-== multiple-chunks-multiple-dx.svg multiple-chunks-multiple-dx.svg
-== multiple-chunks-rtl.svg multiple-chunks-rtl.svg
-== multiple-chunks.svg multiple-chunks.svg
-
-== display-none-1.svg display-none-1.svg
-== display-none-2.svg display-none-2.svg
-== display-none-3.svg display-none-3.svg
-== display-none-4.svg display-none-4.svg
-
-== simple-multiline.svg simple-multiline.svg
-== simple-multiline-number.svg simple-multiline-number.svg
-== simple-multiline-pc.svg simple-multiline-pc.svg
-== simple-multiline-anchor-end.svg simple-multiline-anchor-end.svg
-
-fuzzy-if(skiaContent,1,15) == textpath.svg textpath.svg
-== textpath-a.svg textpath-a.svg
-== textpath-anchor-middle.svg textpath-anchor-middle.svg
-== textpath-anchor-end.svg textpath-anchor-end.svg
-== textpath-invalid-parent.svg textpath-invalid-parent.svg
-== textpath-multiline.svg textpath-multiline.svg
-== textpath-multiline-2.svg textpath-multiline-2.svg
-== textpath-after.svg textpath-after.svg
-== textpath-after-anchor-end.svg textpath-after-anchor-end.svg
-
-== textLength.svg textLength.svg
-fuzzy-if(skiaContent,1,200) == textLength-2.svg textLength-2.svg
-fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu)||/^Windows\x20NT\x206\.[12]/.test(http.oscpu),4,17) fuzzy-if(skiaContent,1,100) == textLength-3.svg textLength-3.svg
-== textLength-4.svg textLength-4.svg
-== textLength-5.svg textLength-5.svg
-== textLength-6.svg textLength-6.svg
-
-# text-shadow
-== text-shadow.svg text-shadow.svg
-
-# vertical text
-== vertical-01.svg vertical-01.svg
-
-# tests for ignoring various properties
-== ignore-border.svg ignore-border.svg
-== ignore-display.svg ignore-display.svg
-== ignore-float.svg ignore-float.svg
-== ignore-float-first-letter.svg ignore-float-first-letter.svg
-== ignore-position.svg ignore-position.svg
-== ignore-margin.svg ignore-margin.svg
-== ignore-padding.svg ignore-padding.svg
-== ignore-vertical-align.svg ignore-vertical-align.svg
-== ignore-overflow-scroll.svg ignore-overflow-scroll.svg
-== ignore-text-align.svg ignore-text-align.svg
-== ignore-text-align-2.svg ignore-text-align-2.svg
-
-# pseudo-elements
-== pseudo-first-line.svg pseudo-first-line.svg
-== pseudo-first-line-2.svg pseudo-first-line-2.svg
-== pseudo-first-letter.svg pseudo-first-letter.svg
-== pseudo-first-letter-2.svg pseudo-first-letter-2.svg
-== ignore-before-after.svg ignore-before-after.svg
-
-# invalid child nodes
-== ignore-invalid-child.svg ignore-invalid-child.svg
-== ignore-invalid-child-2.svg ignore-invalid-child-2.svg
-
-# text inside a link
-# == link-surrounding.svg link-surrounding.svg
-
-# dynamic document changes
-== dynamic-font-size.svg dynamic-font-size.svg
-== dynamic-font-size-2.svg dynamic-font-size-2.svg
-== dynamic-font-size-3.svg dynamic-font-size-3.svg
-== dynamic-font-size-4.svg dynamic-font-size-4.svg
-== dynamic-dominant-baseline.svg dynamic-dominant-baseline.svg
-== dynamic-multiple-x.svg dynamic-multiple-x.svg
-fuzzy-if(!d2d,14,2) fuzzy-if(azureQuartz,1,6) fuzzy-if(skiaContent,1,200) == dynamic-non-scaling-stroke.svg dynamic-non-scaling-stroke-ref.svg #Bug #Bug
-== dynamic-text-shadow.svg dynamic-text-shadow.svg
-
-# text and masks
-skip fuzzy-if(skiaContent&&winWidget,39,224) HTTP(../..) == mask-applied.svg mask-applied.svg
-fuzzy-if(skiaContent&&winWidget,77,56) HTTP(../..) == mask-content.svg mask-content.svg
-fuzzy-if(skiaContent&&winWidget,39,112) HTTP(../..) == mask-content-2.svg mask-content-2.svg
-
-# text and clipPaths
-skip HTTP(../..) == clipPath-applied.svg clipPath-applied.svg
-fuzzy-if(skiaContent&&winWidget,77,56) HTTP(../..) == clipPath-content.svg clipPath-content.svg
-fuzzy-if(skiaContent&&winWidget,39,112) HTTP(../..) == clipPath-content-2.svg clipPath-content-2.svg
-
-# text and patterns
-fuzzy-if(cocoaWidget,1,6) == pattern-content.svg pattern-content.svg
-
-# text and filters
-skip fuzzy-if(skiaContent&&winWidget,109,336) HTTP(../..) == filter-applied.svg filter-applied.svg
-
-# vertical text
-fuzzy-if(skiaContent,1,80) == textpath-vertical-dx.svg textpath-vertical-dx.svg
-
-# selection
-needs-focus == deselectAll.svg deselectAll.svg
-fuzzy-if(skiaContent,1,250) needs-focus == selectSubString.svg selectSubString.svg
-fuzzy-if(skiaContent,1,600) needs-focus == selectSubString-2.svg selectSubString-2.svg
-fuzzy-if(skiaContent,1,250) needs-focus == selectSubString-3.svg selectSubString-3.svg
-needs-focus == simple-selection.svg simple-selection.svg
-fuzzy-if(skiaContent,1,100) needs-focus == simple-bidi-selection.svg simple-bidi-selection.svg
-fuzzy-if(skiaContent,1,50) needs-focus == simple-fill-color-selection.svg simple-fill-color-selection.svg
-fuzzy-if(skiaContent,1,150) needs-focus == simple-underline-selection.svg simple-underline-selection.svg
-fuzzy-if(skiaContent,1,300) needs-focus == multiple-text-selection.svg multiple-text-selection.svg
-needs-focus == multiple-chunks-selection.svg multiple-chunks-selection.svg
-fuzzy-if(skiaContent,1,200) needs-focus == textpath-selection.svg textpath-selection.svg
diff --git a/layout/reftests/tab-size/reftest-stylo.list b/layout/reftests/tab-size/reftest-stylo.list
deleted file mode 100644
index 1fc9ed7a1..000000000
--- a/layout/reftests/tab-size/reftest-stylo.list
+++ /dev/null
@@ -1,12 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== tab-size-8.html tab-size-8.html
-== tab-size-8.html tab-size-8.html
-== tab-size-4.html tab-size-4.html
-== tab-size-4-span.html tab-size-4-span.html
-== tab-size-4-spanoffset.html tab-size-4-spanoffset.html
-== tab-size-4-multiple.html tab-size-4-multiple.html
-== tab-size-1.html tab-size-1.html
-== tab-size-0.html tab-size-0.html
-== tab-size-negative.html tab-size-negative.html
-== tab-size-change-1a.html tab-size-change-1a.html
-== tab-size-change-1b.html tab-size-change-1b.html
diff --git a/layout/reftests/table-anonymous-boxes/reftest-stylo.list b/layout/reftests/table-anonymous-boxes/reftest-stylo.list
deleted file mode 100644
index 6ab2f6087..000000000
--- a/layout/reftests/table-anonymous-boxes/reftest-stylo.list
+++ /dev/null
@@ -1,119 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== 121142-1a.html 121142-1a.html
-== 121142-1b.html 121142-1b.html
-== 121142-2.html 121142-2.html
-== 156888-1.html 156888-1.html
-fuzzy-if(skiaContent,1,2) == 156888-2.html 156888-2.html
-== 162063-1.xhtml 162063-1.xhtml
-== 203923-1.html 203923-1.html
-== 203923-2.html 203923-2.html
-== 208305-1.html 208305-1.html
-== 208305-2.html 208305-2.html
-== 208305-3.html 208305-3.html
-== 208305-4.html 208305-4.html
-== 277995-1.html 277995-1.html
-fuzzy-if(skiaContent,1,6) == 293576-1.html 293576-1.html
-== 302113-1.html 302113-1.html
-fails fuzzy-if(skiaContent,1,6) == 315146-1.xhtml 315146-1.xhtml
-== 325543-1a.html 325543-1a.html
-== 325543-1b.html 325543-1b.html
-fuzzy-if(skiaContent,1,6) == 338735-1.html 338735-1.html
-fails fuzzy-if(skiaContent,1,6) == 339388-1a.html 339388-1a.html
-fails fuzzy-if(skiaContent,1,6) == 339388-1b.html 339388-1b.html
-== 363326-1.html 363326-1.html
-== 368932-1.html 368932-1.html
-== 371054-1.html 371054-1.html
-== 372641-1a.xhtml 372641-1a.xhtml
-== 372641-1b.xhtml 372641-1b.xhtml
-== 372641-1c.xhtml 372641-1c.xhtml
-== 372649-1.html 372649-1.html
-== 373379-1.html 373379-1.html
-random-if(d2d) == 394402-1a.html 394402-1a.html
-# bug 586833
-== 394402-1b.html 394402-1b.html
-# bug 586833
-== 398095-1.html 398095-1.html
-== 407115-1.html 407115-1.html
-== 443616-1a.xhtml 443616-1a.xhtml
-== 443616-1b.html 443616-1b.html
-== 448111-1.html 448111-1.html
-== 490174-1.html 490174-1.html
-== 695538-1.html 695538-1.html
-== infer-first-row.html infer-first-row.html
-== infer-first-row-and-table.html infer-first-row-and-table.html
-== infer-second-row.html infer-second-row.html
-== infer-second-row-and-table.html infer-second-row-and-table.html
-== infer-table-around-headers-footers-1.html infer-table-around-headers-footers-1.html
-== infer-table-around-headers-footers-2.html infer-table-around-headers-footers-2.html
-== infer-table-around-headers-footers-3.html infer-table-around-headers-footers-3.html
-== infer-rows-inside-rowgroups.html infer-rows-inside-rowgroups.html
-== infer-table-row-cell.html infer-table-row-cell.html
-# Or should it be? Spec is unclear.
-== infer-table.html infer-table.html
-== 3-tables-ref.html 3-tables-ref.html
-== 3-tables-ref.html 3-tables-ref.html
-== blocks-divide-tables-1.html blocks-divide-tables-1.html
-== blocks-divide-tables-2.html blocks-divide-tables-2.html
-== infer-cells-1.html infer-cells-1.html
-== infer-cells-2.html infer-cells-2.html
-== infer-cells-3.html infer-cells-3.html
-== infer-cells-4.html infer-cells-4.html
-== cols-test-1.html cols-test-1.html
-== cols-test-2.html cols-test-2.html
-== cols-test-3.html cols-test-3.html
-== dynamic-abs-pos-tbody.html dynamic-abs-pos-tbody.html
-== dynamic-removal-1.html dynamic-removal-1.html
-== dynamic-removal-2.html dynamic-removal-2.html
-== dynamic-removal-3.html dynamic-removal-3.html
-== dynamic-removal-4.html dynamic-removal-4.html
-== dynamic-removal-5.html dynamic-removal-5.html
-== dynamic-removal-6.html dynamic-removal-6.html
-== dynamic-removal-7.html dynamic-removal-7.html
-== dynamic-removal-8.html dynamic-removal-8.html
-== dynamic-removal-9.html dynamic-removal-9.html
-== dynamic-removal-10.html dynamic-removal-10.html
-skip == dynamic-removal-11.html dynamic-removal-11.html
-== dynamic-removal-12.html dynamic-removal-12.html
-== dynamic-removal-13.html dynamic-removal-13.html
-== dynamic-removal-14.html dynamic-removal-14.html
-== dynamic-removal-15.html dynamic-removal-15.html
-== dynamic-removal-16.html dynamic-removal-16.html
-== dynamic-removal-17.html dynamic-removal-17.html
-== dynamic-insert-cell-1.html dynamic-insert-cell-1.html
-== dynamic-switch-block-to-cell-1.html dynamic-switch-block-to-cell-1.html
-== dynamic-switch-block-to-cell-2.html dynamic-switch-block-to-cell-2.html
-== dynamic-switch-block-to-cell-3.html dynamic-switch-block-to-cell-3.html
-== dynamic-switch-block-to-cell-4.html dynamic-switch-block-to-cell-4.html
-== dynamic-switch-block-to-cell-5.html dynamic-switch-block-to-cell-5.html
-== dynamic-switch-inline-to-cell-1.html dynamic-switch-inline-to-cell-1.html
-== dynamic-switch-inline-to-cell-2.html dynamic-switch-inline-to-cell-2.html
-== dynamic-switch-inline-to-cell-3.html dynamic-switch-inline-to-cell-3.html
-== dynamic-switch-inline-to-cell-4.html dynamic-switch-inline-to-cell-4.html
-== dynamic-switch-inline-to-cell-5.html dynamic-switch-inline-to-cell-5.html
-== white-space-1.html white-space-1.html
-== white-space-2.html white-space-2.html
-== white-space-3.html white-space-3.html
-== white-space-4.html white-space-4.html
-== white-space-5.html white-space-5.html
-== white-space-6.html white-space-6.html
-== white-space-7.html white-space-7.html
-== white-space-8.html white-space-8.html
-== white-space-9.html white-space-9.html
-== white-space-10.html white-space-10.html
-== white-space-11.html white-space-11.html
-== white-space-12.html white-space-12.html
-== white-space-13.html white-space-13.html
-== white-space-14.html white-space-14.html
-== white-space-15.html white-space-15.html
-== white-space-16.html white-space-16.html
-== white-space-17.html white-space-17.html
-== white-space-18.html white-space-18.html
-== white-space-19.html white-space-19.html
-== white-space-20.html white-space-20.html
-== white-space-21.html white-space-21.html
-== white-space-22.html white-space-22.html
-== white-space-23.html white-space-23.html
-== white-space-24.html white-space-24.html
-== white-space-25.html white-space-25.html
-== white-space-26.html white-space-26.html
-== white-space-pre-1.html white-space-pre-1.html
diff --git a/layout/reftests/table-background/reftest-stylo.list b/layout/reftests/table-background/reftest-stylo.list
deleted file mode 100644
index 91271f6a5..000000000
--- a/layout/reftests/table-background/reftest-stylo.list
+++ /dev/null
@@ -1,100 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# these could be moved to crashtests
-== backgr_border-table-cell.html backgr_border-table-cell.html
-== backgr_border-table-column-group.html backgr_border-table-column-group.html
-# This seems to be caused by bug 527825
-asserts-if(gtkWidget,0-12) == backgr_border-table-column.html backgr_border-table-column.html
-asserts-if(gtkWidget,0-6) == backgr_border-table-quirks.html backgr_border-table-quirks.html
-== backgr_border-table-row-group.html backgr_border-table-row-group.html
-== backgr_border-table-row.html backgr_border-table-row.html
-== backgr_border-table.html backgr_border-table.html
-== backgr_fixed-bg.html backgr_fixed-bg.html
-skip == backgr_index.html backgr_index.html
-== backgr_layers-hide.html backgr_layers-hide.html
-== backgr_layers-opacity.html backgr_layers-opacity.html
-random == backgr_layers-show.html backgr_layers-show.html
-== backgr_position-table-cell.html backgr_position-table-cell.html
-== backgr_position-table-column-group.html backgr_position-table-column-group.html
-== backgr_position-table-column.html backgr_position-table-column.html
-== backgr_position-table-row-group.html backgr_position-table-row-group.html
-== backgr_position-table-row.html backgr_position-table-row.html
-== backgr_position-table.html backgr_position-table.html
-== backgr_simple-table-cell.html backgr_simple-table-cell.html
-== backgr_simple-table-column-group.html backgr_simple-table-column-group.html
-== backgr_simple-table-column.html backgr_simple-table-column.html
-== backgr_simple-table-row-group.html backgr_simple-table-row-group.html
-== backgr_simple-table-row.html backgr_simple-table-row.html
-== backgr_simple-table.html backgr_simple-table.html
-
-# would also be good to test table-header-group and table-footer-group
-# (and rows and row groups in the presence of their reordering)
-# Also need to test different values of background-origin and background-clip.
-skip-if(B2G||Mulet) == border-separate-table-cell.html border-separate-table-cell.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == border-separate-table-column-group.html border-separate-table-column-group.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == border-separate-table-column.html border-separate-table-column.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == border-separate-table-row-group.html border-separate-table-row-group.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== border-separate-table-row.html border-separate-table-row.html
-skip-if(B2G||Mulet) == border-separate-table.html border-separate-table.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == border-collapse-table-cell.html border-collapse-table-cell.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == border-collapse-table-column-group.html border-collapse-table-column-group.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == border-collapse-table-column.html border-collapse-table-column.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == border-collapse-table-row-group.html border-collapse-table-row-group.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== border-collapse-table-row.html border-collapse-table-row.html
-== border-collapse-table.html border-collapse-table.html
-skip-if(B2G||Mulet) fuzzy-if(d2d,1,1083) fuzzy-if(skiaContent,1,2200) == border-collapse-opacity-table-cell.html border-collapse-opacity-table-cell.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== border-collapse-opacity-table-column-group.html border-collapse-opacity-table-column-group.html
-# bug 424274
-== border-collapse-opacity-table-column.html border-collapse-opacity-table-column.html
-# bug 424274
-fails skip-if(B2G||Mulet) fuzzy-if(d2d,1,16359) fuzzy-if(skiaContent,1,17000) == border-collapse-opacity-table-row-group.html border-collapse-opacity-table-row-group.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails skip-if(B2G||Mulet) fuzzy-if(d2d,1,5453) fuzzy-if(skiaContent,1,5500) == border-collapse-opacity-table-row.html border-collapse-opacity-table-row.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails skip-if(B2G||Mulet) fuzzy-if(d2d,1,29973) fuzzy-if(skiaContent,1,60000) == border-collapse-opacity-table.html border-collapse-opacity-table.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) fuzzy-if(d2d,1,2478) fuzzy-if(skiaContent,1,2500) == border-separate-opacity-table-cell.html border-separate-opacity-table-cell.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== border-separate-opacity-table-column-group.html border-separate-opacity-table-column-group.html
-# bug 424274
-== border-separate-opacity-table-column.html border-separate-opacity-table-column.html
-# bug 424274
-fails fuzzy-if(d2d,1,37170) fuzzy-if(skiaContent,1,38000) == border-separate-opacity-table-row-group.html border-separate-opacity-table-row-group.html
-fails skip-if(B2G||Mulet) fuzzy-if(d2d,1,12390) fuzzy-if(skiaContent,1,13000) == border-separate-opacity-table-row.html border-separate-opacity-table-row.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails skip-if(B2G||Mulet) fuzzy-if(skiaContent,1,95000) == border-separate-opacity-table.html border-separate-opacity-table.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== scrollable-rowgroup-collapse-background.html scrollable-rowgroup-collapse-background.html
-== scrollable-rowgroup-collapse-border.html scrollable-rowgroup-collapse-border.html
-== scrollable-rowgroup-separate-background.html scrollable-rowgroup-separate-background.html
-== scrollable-rowgroup-separate-border.html scrollable-rowgroup-separate-border.html
-# scrolling rowgroups were removed in bug 28800
-== empty-cells-default-1.html empty-cells-default-1.html
-== empty-cells-default-2.html empty-cells-default-2.html
-fuzzy-if(OSX,1,113) fuzzy-if(winWidget,1,12) fuzzy-if(Android,1,39) fuzzy-if(winWidget&&!layersGPUAccelerated,82,116) fuzzy-if(skiaContent,77,5400) == table-row-opacity-dynamic-1.html table-row-opacity-dynamic-1.html
-random == table-row-opacity-dynamic-2.html table-row-opacity-dynamic-2.html
diff --git a/layout/reftests/table-background/reftest.list b/layout/reftests/table-background/reftest.list
index a89115ef4..37f0ba057 100644
--- a/layout/reftests/table-background/reftest.list
+++ b/layout/reftests/table-background/reftest.list
@@ -58,7 +58,7 @@ fuzzy-if(d2d||skiaContent,1,95000) == border-separate-opacity-table.html border-
== scrollable-rowgroup-separate-border.html scrollable-rowgroup-separate-notref.html # scrolling rowgroups were removed in bug 28800
== empty-cells-default-1.html empty-cells-default-1-ref.html
== empty-cells-default-2.html empty-cells-default-2-ref.html
-fuzzy-if(OSX,1,113) fuzzy-if(winWidget,1,12) fuzzy-if(Android,1,39) fuzzy-if(winWidget&&!layersGPUAccelerated,82,116) fuzzy-if(skiaContent,84,5500) == table-row-opacity-dynamic-1.html table-row-opacity-dynamic-1-ref.html
+fuzzy-if(OSX,1,113) fuzzy-if(winWidget,1,12) fuzzy-if(winWidget&&!layersGPUAccelerated,82,116) fuzzy-if(skiaContent,84,5500) == table-row-opacity-dynamic-1.html table-row-opacity-dynamic-1-ref.html
== table-row-opacity-dynamic-2.html table-row-opacity-dynamic-2-ref.html
== table-col-overlapping.html table-col-overlapping-ref.html
diff --git a/layout/reftests/table-bordercollapse/bug1379306-ref.html b/layout/reftests/table-bordercollapse/bug1379306-ref.html
new file mode 100644
index 000000000..76c8ef813
--- /dev/null
+++ b/layout/reftests/table-bordercollapse/bug1379306-ref.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<title>Table Cell Testcase, bug 1379306</title>
+<style>
+ table.collapse {
+ border-collapse: collapse;
+ }
+ td {
+ border: 20px solid #aaa;
+ width: 120px;
+ height: 150px;
+ }
+ .first {
+ background-color: #000;
+ position: absolute;
+ top: 20px;
+ left: 20px;
+ height: 10px;
+ width: 20px
+ }
+</style>
+<h1>Table Cell Testcase, bug 1379306</h1>
+
+<div style="position: relative;">
+ <table class="collapse">
+ <tr>
+ <td>
+ <div class="first"></div>
+ </td>
+ </tr>
+ </table>
+</div> \ No newline at end of file
diff --git a/layout/reftests/table-bordercollapse/bug1379306.html b/layout/reftests/table-bordercollapse/bug1379306.html
new file mode 100644
index 000000000..2d7f4bce4
--- /dev/null
+++ b/layout/reftests/table-bordercollapse/bug1379306.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<title>Table Cell Testcase, bug 1379306</title>
+<style>
+ table.collapse {
+ border-collapse: collapse;
+ }
+ td {
+ border: 20px solid #aaa;
+ width: 120px;
+ height: 150px;
+ position: relative;
+ }
+ div {
+ background-color: #000;
+ position: absolute;
+ top: 0;
+ left: 0;
+ height: 10px;
+ width: 20px
+ }
+</style>
+<h1>Table Cell Testcase, bug 1379306</h1>
+
+<table class="collapse">
+ <tr>
+ <td>
+ <div></div>
+ </td>
+ </tr>
+</table> \ No newline at end of file
diff --git a/layout/reftests/table-bordercollapse/reftest-stylo.list b/layout/reftests/table-bordercollapse/reftest-stylo.list
deleted file mode 100644
index 2821d7e2e..000000000
--- a/layout/reftests/table-bordercollapse/reftest-stylo.list
+++ /dev/null
@@ -1,107 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== bc_dyn_cell1.html bc_dyn_cell1.html
-== bc_dyn_cell2.html bc_dyn_cell2.html
-== bc_dyn_cell3.html bc_dyn_cell3.html
-== bc_dyn_cell4.html bc_dyn_cell4.html
-== bc_dyn_cell5.html bc_dyn_cell5.html
-== bc_dyn_row1.html bc_dyn_row1.html
-== bc_dyn_row2.html bc_dyn_row2.html
-== bc_dyn_row3.html bc_dyn_row3.html
-== bc_dyn_rg1.html bc_dyn_rg1.html
-== bc_dyn_rg2.html bc_dyn_rg2.html
-== bc_dyn_rg3.html bc_dyn_rg3.html
-== bc_dyn_col1.html bc_dyn_col1.html
-== bc_dyn_col2.html bc_dyn_col2.html
-== bc_dyn_col3.html bc_dyn_col3.html
-== bc_dyn_cg1.html bc_dyn_cg1.html
-== bc_dyn_cg2.html bc_dyn_cg2.html
-== bc_dyn_cg3.html bc_dyn_cg3.html
-== bc_dyn_table1.html bc_dyn_table1.html
-== bc_dyn_table2.html bc_dyn_table2.html
-== bc_dyn_table3.html bc_dyn_table3.html
-== bc_borderoffset1.html bc_borderoffset1.html
-== bc_borderoffset2.html bc_borderoffset2.html
-== frame_above_rules_all.html frame_above_rules_all.html
-== frame_above_rules_cols.html frame_above_rules_cols.html
-== frame_above_rules_groups.html frame_above_rules_groups.html
-== frame_above_rules_none.html frame_above_rules_none.html
-== frame_above_rules_rows.html frame_above_rules_rows.html
-== frame_below_rules_all.html frame_below_rules_all.html
-== frame_below_rules_cols.html frame_below_rules_cols.html
-== frame_below_rules_groups.html frame_below_rules_groups.html
-== frame_below_rules_none.html frame_below_rules_none.html
-== frame_below_rules_rows.html frame_below_rules_rows.html
-== frame_border_rules_all.html frame_border_rules_all.html
-== frame_border_rules_cols.html frame_border_rules_cols.html
-== frame_border_rules_groups.html frame_border_rules_groups.html
-== frame_border_rules_none.html frame_border_rules_none.html
-== frame_border_rules_rows.html frame_border_rules_rows.html
-== frame_box_rules_all.html frame_box_rules_all.html
-== frame_box_rules_cols.html frame_box_rules_cols.html
-== frame_box_rules_groups.html frame_box_rules_groups.html
-== frame_box_rules_none.html frame_box_rules_none.html
-== frame_box_rules_none-collapse.html frame_box_rules_none-collapse.html
-== frame_box_rules_rows.html frame_box_rules_rows.html
-== frame_hsides_rules_all.html frame_hsides_rules_all.html
-== frame_hsides_rules_cols.html frame_hsides_rules_cols.html
-== frame_hsides_rules_groups.html frame_hsides_rules_groups.html
-== frame_hsides_rules_none.html frame_hsides_rules_none.html
-skip == frame_hsides_rules_rows.html frame_hsides_rules_rows.html
-== frame_lhs_rules_all.html frame_lhs_rules_all.html
-== frame_lhs_rules_cols.html frame_lhs_rules_cols.html
-== frame_lhs_rules_groups.html frame_lhs_rules_groups.html
-== frame_lhs_rules_none.html frame_lhs_rules_none.html
-== frame_lhs_rules_rows.html frame_lhs_rules_rows.html
-== frame_rhs_rules_all.html frame_rhs_rules_all.html
-== frame_rhs_rules_cols.html frame_rhs_rules_cols.html
-== frame_rhs_rules_groups.html frame_rhs_rules_groups.html
-== frame_rhs_rules_none.html frame_rhs_rules_none.html
-== frame_rhs_rules_rows.html frame_rhs_rules_rows.html
-== frame_void_rules_all.html frame_void_rules_all.html
-== frame_void_rules_cols.html frame_void_rules_cols.html
-== frame_void_rules_groups.html frame_void_rules_groups.html
-== frame_void_rules_none.html frame_void_rules_none.html
-== frame_void_rules_rows.html frame_void_rules_rows.html
-== frame_vsides_rules_all.html frame_vsides_rules_all.html
-== frame_vsides_rules_cols.html frame_vsides_rules_cols.html
-== frame_vsides_rules_groups.html frame_vsides_rules_groups.html
-== frame_vsides_rules_none.html frame_vsides_rules_none.html
-== frame_vsides_rules_rows.html frame_vsides_rules_rows.html
-== borderhandling-1.html borderhandling-1.html
-== borderhandling-2.html borderhandling-2.html
-== borderhandling-3.html borderhandling-3.html
-== borderhandling-4.html borderhandling-4.html
-== borderhandling-5.xhtml borderhandling-5.xhtml
-== borderhandling-6.xhtml borderhandling-6.xhtml
-== borderhandling-7.xhtml borderhandling-7.xhtml
-== borderhandling-8.html borderhandling-8.html
-== borderhandling-frame-border.html borderhandling-frame-border.html
-== borderhandling-rules-border-empty-quirks.html borderhandling-rules-border-empty-quirks.html
-== borderhandling-rules-border-rules-quirks.html borderhandling-rules-border-rules-quirks.html
-== borderhandling-rules-border-none-quirks.html borderhandling-rules-border-none-quirks.html
-== borderhandling-rules-border-groups-quirks.html borderhandling-rules-border-groups-quirks.html
-== borderhandling-rules-border-rows-quirks.html borderhandling-rules-border-rows-quirks.html
-skip == borderhandling-rules-border-cols-quirks.html borderhandling-rules-border-cols-quirks.html
-== borderhandling-rules-border-all-quirks.html borderhandling-rules-border-all-quirks.html
-== borderhandling-rules-border-empty-strict.html borderhandling-rules-border-empty-strict.html
-== borderhandling-rules-border-rules-strict.html borderhandling-rules-border-rules-strict.html
-== borderhandling-rules-border-none-strict.html borderhandling-rules-border-none-strict.html
-== borderhandling-rules-border-groups-strict.html borderhandling-rules-border-groups-strict.html
-== borderhandling-rules-border-rows-strict.html borderhandling-rules-border-rows-strict.html
-== borderhandling-rules-border-cols-strict.html borderhandling-rules-border-cols-strict.html
-== borderhandling-rules-border-all-strict.html borderhandling-rules-border-all-strict.html
-== bordercolor-1.html bordercolor-1.html
-== bordercolor-2.html bordercolor-2.html
-== bordercolor-3.html bordercolor-3.html
-== bordercolor-4.html bordercolor-4.html
-== empty-toprow.html empty-toprow.html
-== double_borders.html double_borders.html
-== border-collapse-rtl.html border-collapse-rtl.html
-# Fuzzy because for some reason the corner beveling is antialiased differently.
-# So get 40 pixels of fuzz, 20 at each beveled corner (because the border width
-# is 20px).
-== border-style-outset-becomes-groove.html border-style-outset-becomes-groove.html
-# Fuzzy because for some reason the corner beveling is antialiased differently.
-# So get 40 pixels of fuzz, 20 at each beveled corner (because the border width
-# is 20px).
-== border-style-inset-becomes-ridge.html border-style-inset-becomes-ridge.html
diff --git a/layout/reftests/table-bordercollapse/reftest.list b/layout/reftests/table-bordercollapse/reftest.list
index 2610d202d..2cd93397e 100644
--- a/layout/reftests/table-bordercollapse/reftest.list
+++ b/layout/reftests/table-bordercollapse/reftest.list
@@ -3,6 +3,7 @@
== bug1375518-3.html bug1375518-ref.html
== bug1375518-4.html bug1375518-4-ref.html
== bug1375518-5.html bug1375518-5-ref.html
+== bug1379306.html bug1379306-ref.html
== bug1394226.html bug1394226-ref.html
!= bug1394226.html bug1394226-notref.html
== bc_dyn_cell1.html bc_dyn_cell1_ref.html
diff --git a/layout/reftests/table-dom/reftest-stylo.list b/layout/reftests/table-dom/reftest-stylo.list
deleted file mode 100644
index b046bd713..000000000
--- a/layout/reftests/table-dom/reftest-stylo.list
+++ /dev/null
@@ -1,45 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-skip == appendCells1.html appendCells1.html
-skip == appendCellsRebuild1.html appendCellsRebuild1.html
-skip == appendCellsZeroColspan.html appendCellsZeroColspan.html
-skip == appendCol1.html appendCol1.html
-skip == appendCol2.html appendCol2.html
-skip == appendColGroup1.html appendColGroup1.html
-skip == appendRowsExpand1.html appendRowsExpand1.html
-skip == appendTbodyExpand1.html appendTbodyExpand1.html
-== deleteCellsRebuild1.html deleteCellsRebuild1.html
-== deleteCellsShrink1.html deleteCellsShrink1.html
-== deleteCellsShrink2.html deleteCellsShrink2.html
-== deleteCellsExpandZeroColspan.html deleteCellsExpandZeroColspan.html
-== deleteCol1.html deleteCol1.html
-== deleteCol2.html deleteCol2.html
-== deleteCol3.html deleteCol3.html
-== deleteColGroup1.html deleteColGroup1.html
-== deleteColGroup2.html deleteColGroup2.html
-== deleteRowsRebuild1.html deleteRowsRebuild1.html
-== deleteRowsRebuild1a.html deleteRowsRebuild1a.html
-== deleteRowsShrink1.html deleteRowsShrink1.html
-== deleteTbodyExpand1.html deleteTbodyExpand1.html
-== deleteTbodyRebuild1.html deleteTbodyRebuild1.html
-== insertCaptionsAndRows1.html insertCaptionsAndRows1.html
-== insertCaptionsAndRows2.html insertCaptionsAndRows2.html
-== insertCaptionsAndRows3.html insertCaptionsAndRows3.html
-== insertCaptionsAndRows4.html insertCaptionsAndRows4.html
-== insertCellsExpand1.html insertCellsExpand1.html
-== insertCellsExpand2.html insertCellsExpand2.html
-== insertCellsExpandZeroRowspan.html insertCellsExpandZeroRowspan.html
-== insertCellsRebuild1.html insertCellsRebuild1.html
-== insertCellsRebuild2.html insertCellsRebuild2.html
-== insertCellsZeroColspan.html insertCellsZeroColspan.html
-== insertColGroups1.html insertColGroups1.html
-== insertColGroups2.html insertColGroups2.html
-== insertColgroupAndRowgroup.html insertColgroupAndRowgroup.html
-== insertCols1.html insertCols1.html
-== insertCols2.html insertCols2.html
-== insertCols3.html insertCols3.html
-== insertCols4.html insertCols4.html
-== insertCols5.html insertCols5.html
-== insertRowsExpand1.html insertRowsExpand1.html
-== insertRowsRebuild1.html insertRowsRebuild1.html
-== insertTbodyExpand1.html insertTbodyExpand1.html
-== insertTbodyRebuild1.html insertTbodyRebuild1.html
diff --git a/layout/reftests/table-html/bug1379306-2-ref.html b/layout/reftests/table-html/bug1379306-2-ref.html
new file mode 100644
index 000000000..a02d92bb2
--- /dev/null
+++ b/layout/reftests/table-html/bug1379306-2-ref.html
@@ -0,0 +1,21 @@
+<!DOCTYPE HTML>
+<title>Table Row Testcase, bug 1379306</title>
+<style>
+
+table { background: yellow }
+td { height: 50px; width: 200px; background: aqua; }
+div { background: fuchsia; height: 10px; width: 20px }
+
+tr { position: relative; border: 30px solid blue; }
+div { position: absolute; top: 0; left: 0 }
+
+</style>
+<h1>Table Row Testcase, bug 1379306</h1>
+
+<table>
+ <tr>
+ <td>
+ <div></div>
+ </td>
+ </tr>
+</table> \ No newline at end of file
diff --git a/layout/reftests/table-html/bug1379306-2.html b/layout/reftests/table-html/bug1379306-2.html
new file mode 100644
index 000000000..f04d0219f
--- /dev/null
+++ b/layout/reftests/table-html/bug1379306-2.html
@@ -0,0 +1,21 @@
+<!DOCTYPE HTML>
+<title>Testcase, bug 1379306</title>
+<style>
+
+table { background: yellow }
+td { height: 50px; width: 200px; background: aqua; }
+div { background: fuchsia; height: 10px; width: 20px }
+
+tr { position: relative; border: 10px solid blue }
+div { position: absolute; top: 0; left: 0 }
+
+</style>
+<h1>Table Row Testcase, bug 1379306</h1>
+
+<table>
+ <tr>
+ <td>
+ <div></div>
+ </td>
+ </tr>
+</table> \ No newline at end of file
diff --git a/layout/reftests/table-html/bug1379306-3-ref.html b/layout/reftests/table-html/bug1379306-3-ref.html
new file mode 100644
index 000000000..ffb70b46e
--- /dev/null
+++ b/layout/reftests/table-html/bug1379306-3-ref.html
@@ -0,0 +1,23 @@
+<!DOCTYPE HTML>
+<title>Testcase, bug 1379306</title>
+<style>
+
+table { background: yellow }
+td { height: 50px; width: 200px; background: aqua; }
+div { background: fuchsia; height: 10px; width: 20px }
+
+tbody { position: relative; border: 30px solid blue }
+div { position: absolute; top: 0; left: 0 }
+
+</style>
+<h1>Table Row Group Testcase, bug 1379306</h1>
+
+<table>
+ <tbody>
+ <tr>
+ <td>
+ <div></div>
+ </td>
+ </tr>
+ </tbody>
+</table> \ No newline at end of file
diff --git a/layout/reftests/table-html/bug1379306-3.html b/layout/reftests/table-html/bug1379306-3.html
new file mode 100644
index 000000000..3192902ef
--- /dev/null
+++ b/layout/reftests/table-html/bug1379306-3.html
@@ -0,0 +1,23 @@
+<!DOCTYPE HTML>
+<title>Testcase, bug 1379306</title>
+<style>
+
+table { background: yellow }
+td { height: 50px; width: 200px; background: aqua; }
+div { background: fuchsia; height: 10px; width: 20px }
+
+tbody { position: relative; border: 10px solid blue }
+div { position: absolute; top: 0; left: 0 }
+
+</style>
+<h1>Table Row Group Testcase, bug 1379306</h1>
+
+<table>
+ <tbody>
+ <tr>
+ <td>
+ <div></div>
+ </td>
+ </tr>
+ </tbody>
+</table> \ No newline at end of file
diff --git a/layout/reftests/table-html/reftest-stylo.list b/layout/reftests/table-html/reftest-stylo.list
deleted file mode 100644
index bb1436a54..000000000
--- a/layout/reftests/table-html/reftest-stylo.list
+++ /dev/null
@@ -1,3 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== cell-align-stopped-at-table-1-standards.html cell-align-stopped-at-table-1-standards.html
-== cell-align-stopped-at-table-1-quirks.html cell-align-stopped-at-table-1-quirks.html
diff --git a/layout/reftests/table-html/reftest.list b/layout/reftests/table-html/reftest.list
index 362a96096..c3a4010ca 100644
--- a/layout/reftests/table-html/reftest.list
+++ b/layout/reftests/table-html/reftest.list
@@ -1,2 +1,4 @@
== cell-align-stopped-at-table-1-standards.html cell-align-stopped-at-table-1-standards-ref.html
== cell-align-stopped-at-table-1-quirks.html cell-align-stopped-at-table-1-quirks-ref.html
+== bug1379306-2.html bug1379306-2-ref.html
+== bug1379306-3.html bug1379306-3-ref.html
diff --git a/layout/reftests/table-overflow/reftest-stylo.list b/layout/reftests/table-overflow/reftest-stylo.list
deleted file mode 100644
index 9797a2f8a..000000000
--- a/layout/reftests/table-overflow/reftest-stylo.list
+++ /dev/null
@@ -1,8 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== bug785684-x.html bug785684-x.html
-== bug785684-y.html bug785684-y.html
-skip-if(B2G||Mulet) == table-row-pagination.html table-row-pagination.html
-# Frequently failing on b2g (bug 1155426)
-== 963441.html 963441.html
-skip == table-caption-scroll.html table-caption-scroll.html
-== table-cell-block-overflow.html table-cell-block-overflow.html
diff --git a/layout/reftests/table-width/reftest-stylo.list b/layout/reftests/table-width/reftest-stylo.list
deleted file mode 100644
index 4b6ecf209..000000000
--- a/layout/reftests/table-width/reftest-stylo.list
+++ /dev/null
@@ -1,74 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== spacing-invariance-quirks-min.html spacing-invariance-quirks-min.html
-== spacing-invariance-quirks-pref.html spacing-invariance-quirks-pref.html
-== spacing-invariance-standards-min.html spacing-invariance-standards-min.html
-== spacing-invariance-standards-pref.html spacing-invariance-standards-pref.html
-== min-width.html min-width.html
-== pref-width.html pref-width.html
-skip == min-width-ref.html min-width-ref.html
-== percent-large.html percent-large.html
-== percent-large-min.html percent-large-min.html
-== percent-large-nested.html percent-large-nested.html
-== percent-small.html percent-small.html
-== percent-small-min.html percent-small-min.html
-== percent-small-nested.html percent-small-nested.html
-== percent-small-2.html percent-small-2.html
-== percent-zero.html percent-zero.html
-== shrink-wrap-pref.html shrink-wrap-pref.html
-== shrink-wrap-avail.html shrink-wrap-avail.html
-== shrink-wrap-min.html shrink-wrap-min.html
-== shrink-wrap-min-ref.html shrink-wrap-min-ref.html
-== shrink-wrap-pref-ref.html shrink-wrap-pref-ref.html
-== shrink-wrap-avail-ref.html shrink-wrap-avail-ref.html
-== conflicting-widths-1.html conflicting-widths-1.html
-== conflicting-widths-2.html conflicting-widths-2.html
-== conflicting-widths-3.html conflicting-widths-3.html
-== conflicting-widths-4.html conflicting-widths-4.html
-fuzzy-if(B2G,9,1) == conflicting-widths-5.html conflicting-widths-5.html
-# can't see the difference
-== conflicting-widths-6.html conflicting-widths-6.html
-fuzzy-if(B2G,9,1) == conflicting-widths-7.html conflicting-widths-7.html
-# can't see the difference
-fuzzy-if(B2G,9,1) == conflicting-widths-8.html conflicting-widths-8.html
-# can't see the difference
-== conflicting-widths-9.html conflicting-widths-9.html
-== conflicting-widths-10.html conflicting-widths-10.html
-== conflicting-percent-widths-1.html conflicting-percent-widths-1.html
-== conflicting-percent-widths-2.html conflicting-percent-widths-2.html
-== conflicting-percent-widths-3.html conflicting-percent-widths-3.html
-== percent-truncation-1.html percent-truncation-1.html
-== percent-truncation-2.html percent-truncation-2.html
-== percent-truncation-3.html percent-truncation-3.html
-skip-if(B2G||Mulet) == balancing-1.html balancing-1.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== balancing-2.html balancing-2.html
-== cellpadding.html cellpadding.html
-== cellspacing.html cellspacing.html
-== percent-basis.html percent-basis.html
-== default-box-sizing-separate-standards.html default-box-sizing-separate-standards.html
-== default-box-sizing-separate-quirks.html default-box-sizing-separate-quirks.html
-== default-box-sizing-collapse-standards.html default-box-sizing-collapse-standards.html
-# bug 371180
-== default-box-sizing-collapse-quirks.html default-box-sizing-collapse-quirks.html
-# bug 371180
-== colspan-percent-distribution-1.html colspan-percent-distribution-1.html
-== colspan-percent-distribution-2.html colspan-percent-distribution-2.html
-== spanning-cell-sort-1-small.html spanning-cell-sort-1-small.html
-== spanning-cell-sort-1-large.html spanning-cell-sort-1-large.html
-== spanning-cell-sort-1-small-fixed.html spanning-cell-sort-1-small-fixed.html
-== spanning-cell-sort-1-large-fixed.html spanning-cell-sort-1-large-fixed.html
-== spanning-cell-sort-2-small.html spanning-cell-sort-2-small.html
-== spanning-cell-sort-2-large.html spanning-cell-sort-2-large.html
-== spanning-cell-sort-2-small-fixed.html spanning-cell-sort-2-small-fixed.html
-skip == spanning-cell-sort-2-large-fixed.html spanning-cell-sort-2-large-fixed.html
-== colgroup-vs-column-1.html colgroup-vs-column-1.html
-== colgroup-vs-column-2.html colgroup-vs-column-2.html
-== colgroup-vs-column-3.html colgroup-vs-column-3.html
-== colgroup-vs-column-4.html colgroup-vs-column-4.html
-== dynamic-fixed-layout-1.html dynamic-fixed-layout-1.html
-== cell-pref-width-border-box.html cell-pref-width-border-box.html
-== colspan-distribute-to-empty-1a.html colspan-distribute-to-empty-1a.html
-== colspan-distribute-to-empty-1b.html colspan-distribute-to-empty-1b.html
-== colspan-distribute-to-empty-2.html colspan-distribute-to-empty-2.html
-== distribute-percent-nonoriginating.html distribute-percent-nonoriginating.html
diff --git a/layout/reftests/text-decoration/reftest-stylo.list b/layout/reftests/text-decoration/reftest-stylo.list
deleted file mode 100644
index 5f4e8122c..000000000
--- a/layout/reftests/text-decoration/reftest-stylo.list
+++ /dev/null
@@ -1,119 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-skip-if(B2G||Mulet) == complex-decoration-style-quirks.html complex-decoration-style-quirks.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == complex-decoration-style-standards.html complex-decoration-style-standards.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== decoration-color-quirks.html decoration-color-quirks.html
-== decoration-color-standards.html decoration-color-standards.html
-== decoration-style-quirks.html decoration-style-quirks.html
-== decoration-style-standards.html decoration-style-standards.html
-fuzzy-if(B2G,255,1) == dynamic-underline-vertical-align-quirks-1.html dynamic-underline-vertical-align-quirks-1.html
-fuzzy-if(B2G,255,1) == dynamic-underline-vertical-align-standards-1.html dynamic-underline-vertical-align-standards-1.html
-fuzzy-if(B2G,255,1) == dynamic-underline-vertical-align-quirks-2.html dynamic-underline-vertical-align-quirks-2.html
-fuzzy-if(B2G,255,1) == dynamic-underline-vertical-align-standards-2.html dynamic-underline-vertical-align-standards-2.html
-== line-through-style-block-solid-quirks.html line-through-style-block-solid-quirks.html
-== line-through-style-block-dotted-quirks.html line-through-style-block-dotted-quirks.html
-== line-through-style-block-dashed-quirks.html line-through-style-block-dashed-quirks.html
-skip == line-through-style-block-double-quirks.html line-through-style-block-double-quirks.html
-== line-through-style-block-wavy-quirks.html line-through-style-block-wavy-quirks.html
-== line-through-style-inline-solid-quirks.html line-through-style-inline-solid-quirks.html
-== line-through-style-inline-dotted-quirks.html line-through-style-inline-dotted-quirks.html
-== line-through-style-inline-dashed-quirks.html line-through-style-inline-dashed-quirks.html
-== line-through-style-inline-double-quirks.html line-through-style-inline-double-quirks.html
-== line-through-style-inline-wavy-quirks.html line-through-style-inline-wavy-quirks.html
-== line-through-style-block-solid-standards.html line-through-style-block-solid-standards.html
-== line-through-style-block-dotted-standards.html line-through-style-block-dotted-standards.html
-== line-through-style-block-dashed-standards.html line-through-style-block-dashed-standards.html
-== line-through-style-block-double-standards.html line-through-style-block-double-standards.html
-== line-through-style-block-wavy-standards.html line-through-style-block-wavy-standards.html
-== line-through-style-inline-solid-standards.html line-through-style-inline-solid-standards.html
-== line-through-style-inline-dotted-standards.html line-through-style-inline-dotted-standards.html
-skip == line-through-style-inline-dashed-standards.html line-through-style-inline-dashed-standards.html
-== line-through-style-inline-double-standards.html line-through-style-inline-double-standards.html
-== line-through-style-inline-wavy-standards.html line-through-style-inline-wavy-standards.html
-== overline-style-block-solid-quirks.html overline-style-block-solid-quirks.html
-== overline-style-block-dotted-quirks.html overline-style-block-dotted-quirks.html
-== overline-style-block-dashed-quirks.html overline-style-block-dashed-quirks.html
-== overline-style-block-double-quirks.html overline-style-block-double-quirks.html
-== overline-style-block-wavy-quirks.html overline-style-block-wavy-quirks.html
-== overline-style-inline-solid-quirks.html overline-style-inline-solid-quirks.html
-== overline-style-inline-dotted-quirks.html overline-style-inline-dotted-quirks.html
-== overline-style-inline-dashed-quirks.html overline-style-inline-dashed-quirks.html
-== overline-style-inline-double-quirks.html overline-style-inline-double-quirks.html
-== overline-style-inline-wavy-quirks.html overline-style-inline-wavy-quirks.html
-== overline-style-block-solid-standards.html overline-style-block-solid-standards.html
-== overline-style-block-dotted-standards.html overline-style-block-dotted-standards.html
-== overline-style-block-dashed-standards.html overline-style-block-dashed-standards.html
-== overline-style-block-double-standards.html overline-style-block-double-standards.html
-== overline-style-block-wavy-standards.html overline-style-block-wavy-standards.html
-== overline-style-inline-solid-standards.html overline-style-inline-solid-standards.html
-== overline-style-inline-dotted-standards.html overline-style-inline-dotted-standards.html
-== overline-style-inline-dashed-standards.html overline-style-inline-dashed-standards.html
-== overline-style-inline-double-standards.html overline-style-inline-double-standards.html
-== overline-style-inline-wavy-standards.html overline-style-inline-wavy-standards.html
-skip == underline-style-block-solid-quirks.html underline-style-block-solid-quirks.html
-== underline-style-block-dotted-quirks.html underline-style-block-dotted-quirks.html
-== underline-style-block-dashed-quirks.html underline-style-block-dashed-quirks.html
-== underline-style-block-double-quirks.html underline-style-block-double-quirks.html
-== underline-style-block-wavy-quirks.html underline-style-block-wavy-quirks.html
-== underline-style-inline-solid-quirks.html underline-style-inline-solid-quirks.html
-== underline-style-inline-dotted-quirks.html underline-style-inline-dotted-quirks.html
-== underline-style-inline-dashed-quirks.html underline-style-inline-dashed-quirks.html
-== underline-style-inline-double-quirks.html underline-style-inline-double-quirks.html
-== underline-style-inline-wavy-quirks.html underline-style-inline-wavy-quirks.html
-== underline-style-block-solid-standards.html underline-style-block-solid-standards.html
-== underline-style-block-dotted-standards.html underline-style-block-dotted-standards.html
-== underline-style-block-dashed-standards.html underline-style-block-dashed-standards.html
-== underline-style-block-double-standards.html underline-style-block-double-standards.html
-== underline-style-block-wavy-standards.html underline-style-block-wavy-standards.html
-== underline-style-inline-solid-standards.html underline-style-inline-solid-standards.html
-== underline-style-inline-dotted-standards.html underline-style-inline-dotted-standards.html
-== underline-style-inline-dashed-standards.html underline-style-inline-dashed-standards.html
-== underline-style-inline-double-standards.html underline-style-inline-double-standards.html
-== underline-style-inline-wavy-standards.html underline-style-inline-wavy-standards.html
-== underline-block-quirks.html underline-block-quirks.html
-== underline-block-quirks.html underline-block-quirks.html
-== underline-inline-block-quirks.html underline-inline-block-quirks.html
-== underline-inline-block-quirks.html underline-inline-block-quirks.html
-== underline-table-caption-quirks.html underline-table-caption-quirks.html
-== underline-table-caption-quirks.html underline-table-caption-quirks.html
-== underline-table-cell-quirks.html underline-table-cell-quirks.html
-== underline-table-cell-quirks.html underline-table-cell-quirks.html
-skip == underline-block-propagation-quirks.html underline-block-propagation-quirks.html
-== underline-block-propagation-2-quirks.html underline-block-propagation-2-quirks.html
-== underline-block-standards.html underline-block-standards.html
-== underline-block-standards.html underline-block-standards.html
-skip == underline-inline-block-standards.html underline-inline-block-standards.html
-skip == underline-inline-block-standards.html underline-inline-block-standards.html
-skip == underline-table-caption-standards.html underline-table-caption-standards.html
-skip == underline-table-caption-standards.html underline-table-caption-standards.html
-== underline-table-cell-standards.html underline-table-cell-standards.html
-== underline-table-cell-standards.html underline-table-cell-standards.html
-== underline-block-propagation-standards.html underline-block-propagation-standards.html
-skip == underline-block-propagation-2-standards.html underline-block-propagation-2-standards.html
-== text-decoration-zorder-1-standards.html text-decoration-zorder-1-standards.html
-== text-decoration-zorder-1-quirks.html text-decoration-zorder-1-quirks.html
-== table-quirk-1.html table-quirk-1.html
-== table-quirk-2.html table-quirk-2.html
-skip == text-decoration-propagation-1-quirks.html text-decoration-propagation-1-quirks.html
-== text-decoration-propagation-1-standards.html text-decoration-propagation-1-standards.html
-skip-if(B2G||Mulet) == 641444-1.html 641444-1.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== decoration-css21.html decoration-css21.html
-fuzzy-if(cocoaWidget,1,5) == decoration-color-override-quirks.html decoration-color-override-quirks.html
-# == decoration-color-override-standards.html decoration-color-override-standards.html
-== decoration-color-override-standards-ref.html decoration-color-override-standards-ref.html
-== decoration-css21-block.html decoration-css21-block.html
-== inline-baseline-almost-standards.html inline-baseline-almost-standards.html
-== inline-baseline-quirks.html inline-baseline-quirks.html
-== 676538-1.html 676538-1.html
-fuzzy-if(OSX==1010,1,4) == underline-button-1.html underline-button-1.html
-fuzzy-if(OSX==1010,1,2) == underline-button-2.html underline-button-2.html
-== underline-select-1.html underline-select-1.html
-== underline-select-2.html underline-select-2.html
-== 1133392.html 1133392.html
-== 1159729-offset-adjustment.html 1159729-offset-adjustment.html
-== emphasis-style-dynamic.html emphasis-style-dynamic.html
diff --git a/layout/reftests/text-indent/reftest-stylo.list b/layout/reftests/text-indent/reftest-stylo.list
deleted file mode 100644
index 6d5149e75..000000000
--- a/layout/reftests/text-indent/reftest-stylo.list
+++ /dev/null
@@ -1,20 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# XXX Need to repeat these tests for RTL. (Note that == tests can't can't
-# same file.)
-
-# Also need to test intrinsic widths (bug 368155).
-
-skip == text-indent-single-line-100.html text-indent-single-line-100.html
-skip == text-indent-single-line-100.html text-indent-single-line-100.html
-== text-indent-single-line-0.html text-indent-single-line-0.html
-== text-indent-single-line-percent.html text-indent-single-line-percent.html
-== text-indent-single-line-indent-inline.html text-indent-single-line-indent-inline.html
-== text-indent-single-line-indent-inline.html text-indent-single-line-indent-inline.html
-== text-indent-multiple-line.html text-indent-multiple-line.html
-== text-indent-multiple-line.html text-indent-multiple-line.html
-== text-indent-multiple-line.html text-indent-multiple-line.html
-skip == text-indent-intrinsic-pref.html text-indent-intrinsic-pref.html
-== text-indent-intrinsic-min.html text-indent-intrinsic-min.html
-== text-indent-negative-intrinsic-pref.html text-indent-negative-intrinsic-pref.html
-== text-indent-negative-intrinsic-min.html text-indent-negative-intrinsic-min.html
-== text-indent-parent-dynamic.html text-indent-parent-dynamic.html
diff --git a/layout/reftests/text-overflow/reftest-stylo.list b/layout/reftests/text-overflow/reftest-stylo.list
deleted file mode 100644
index c7d990f43..000000000
--- a/layout/reftests/text-overflow/reftest-stylo.list
+++ /dev/null
@@ -1,54 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-skip-if(B2G||Mulet) == ellipsis-font-fallback.html ellipsis-font-fallback.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== line-clipping.html line-clipping.html
-skip HTTP(..) == marker-basic.html marker-basic.html
-# Bug 1128229
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) HTTP(..) == marker-string.html marker-string.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(Android||B2G) HTTP(..) == bidi-simple.html bidi-simple.html
-# Fails on Android due to anti-aliasing
-fails skip-if(!gtkWidget) fuzzy-if(gtkWidget,2,289) HTTP(..) == bidi-simple-scrolled.html bidi-simple-scrolled.html
-# Fails on Windows and OSX due to anti-aliasing
-skip-if(B2G||Mulet) fuzzy-if(Android,24,4000) fuzzy-if(cocoaWidget,1,40) fuzzy-if(asyncPan&&!layersGPUAccelerated,121,1770) HTTP(..) == scroll-rounding.html scroll-rounding.html
-# bug 760264
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails fuzzy-if(skiaContent,9,1800) HTTP(..) == anonymous-block.html anonymous-block.html
-skip-if(B2G||Mulet) HTTP(..) == false-marker-overlap.html false-marker-overlap.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-HTTP(..) == visibility-hidden.html visibility-hidden.html
-skip-if(B2G||Mulet) fuzzy-if(asyncPan&&!layersGPUAccelerated,102,1724) fuzzy-if(gtkWidget,10,8) HTTP(..) == block-padding.html block-padding.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-HTTP(..) == quirks-decorations.html quirks-decorations.html
-HTTP(..) == quirks-line-height.html quirks-line-height.html
-HTTP(..) == standards-decorations.html standards-decorations.html
-HTTP(..) == standards-line-height.html standards-line-height.html
-fails skip-if(B2G||Mulet) random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) fuzzy-if(skiaContent,1,4200) HTTP(..) == selection.html selection.html
-# bug 668849
-# Initial mulet triage: parity with B2G/B2G Desktop
-HTTP(..) == marker-shadow.html marker-shadow.html
-== aligned-baseline.html aligned-baseline.html
-fails skip-if(Android||B2G) fuzzy-if(skiaContent,1,5) == clipped-elements.html clipped-elements.html
-HTTP(..) == theme-overflow.html theme-overflow.html
-skip-if(B2G||Mulet) HTTP(..) == table-cell.html table-cell.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails skip-if(Mulet) fuzzy-if(gtkWidget,10,32) HTTP(..) == two-value-syntax.html two-value-syntax.html
-# MULET: Bug 1144079: Re-enable Mulet mochitests and reftests taskcluster-specific disables
-skip-if(B2G||Mulet) HTTP(..) == single-value.html single-value.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails skip-if(B2G||Mulet) fuzzy-if(gtkWidget,10,2) HTTP(..) == atomic-under-marker.html atomic-under-marker.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(Android||B2G||Mulet) fuzzy-if(asyncPan&&!layersGPUAccelerated,102,12352) HTTP(..) == xulscroll.html xulscroll.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-HTTP(..) == combobox-zoom.html combobox-zoom.html
-
-# The vertical-text pref setting can be removed after bug 1138384 lands
-== vertical-decorations-1.html vertical-decorations-1.html
-== vertical-decorations-2.html vertical-decorations-2.html
-== vertical-decorations-1.html vertical-decorations-1.html
-== vertical-decorations-2.html vertical-decorations-2.html
-== vertical-decorations-3.html vertical-decorations-3.html
-== vertical-decorations-4.html vertical-decorations-4.html
-== vertical-decorations-3.html vertical-decorations-3.html
-== vertical-decorations-4.html vertical-decorations-4.html
diff --git a/layout/reftests/text-overflow/reftest.list b/layout/reftests/text-overflow/reftest.list
index 8a396db9d..570cdb37f 100644
--- a/layout/reftests/text-overflow/reftest.list
+++ b/layout/reftests/text-overflow/reftest.list
@@ -1,10 +1,10 @@
== ellipsis-font-fallback.html ellipsis-font-fallback-ref.html
== line-clipping.html line-clipping-ref.html
-fuzzy-if(Android,16,244) HTTP(..) == marker-basic.html marker-basic-ref.html # Bug 1128229
+HTTP(..) == marker-basic.html marker-basic-ref.html # Bug 1128229
HTTP(..) == marker-string.html marker-string-ref.html
-skip-if(Android) HTTP(..) == bidi-simple.html bidi-simple-ref.html # Fails on Android due to anti-aliasing
+HTTP(..) == bidi-simple.html bidi-simple-ref.html
skip-if(!gtkWidget) fuzzy-if(gtkWidget,2,289) HTTP(..) == 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,140,1836) HTTP(..) == scroll-rounding.html scroll-rounding-ref.html # bug 760264
+fuzzy-if(cocoaWidget,1,40) fuzzy-if(asyncPan&&!layersGPUAccelerated,140,1836) HTTP(..) == scroll-rounding.html scroll-rounding-ref.html # bug 760264
fuzzy(2,453) fuzzy-if(skiaContent,9,2100) fails-if(gtkWidget) HTTP(..) == anonymous-block.html anonymous-block-ref.html # gtkWidget:bug 1309103
HTTP(..) == false-marker-overlap.html false-marker-overlap-ref.html
HTTP(..) == visibility-hidden.html visibility-hidden-ref.html
@@ -16,13 +16,13 @@ HTTP(..) == standards-line-height.html standards-line-height-ref.html
random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) fuzzy-if(skiaContent,1,4200) HTTP(..) == selection.html selection-ref.html # bug 668849
HTTP(..) == marker-shadow.html marker-shadow-ref.html
== aligned-baseline.html aligned-baseline-ref.html
-skip-if(Android) fuzzy-if(skiaContent,1,5) == clipped-elements.html clipped-elements-ref.html
+fuzzy-if(skiaContent,1,5) == clipped-elements.html clipped-elements-ref.html
HTTP(..) == theme-overflow.html theme-overflow-ref.html
HTTP(..) == table-cell.html table-cell-ref.html
fuzzy-if(gtkWidget,10,32) HTTP(..) == two-value-syntax.html two-value-syntax-ref.html
HTTP(..) == single-value.html single-value-ref.html
fuzzy-if(gtkWidget,10,2) HTTP(..) == atomic-under-marker.html atomic-under-marker-ref.html
-fuzzy(1,2616) skip-if(Android) fuzzy-if(asyncPan&&!layersGPUAccelerated,102,12352) fails-if(http.oscpu=="Linux\u0020x86_64") HTTP(..) == xulscroll.html xulscroll-ref.html # Linux x86_64:bug 1309107
+fuzzy(1,2616) fuzzy-if(asyncPan&&!layersGPUAccelerated,102,12352) fails-if(http.oscpu=="Linux\u0020x86_64") HTTP(..) == xulscroll.html xulscroll-ref.html # Linux x86_64:bug 1309107
HTTP(..) == combobox-zoom.html combobox-zoom-ref.html
# The vertical-text pref setting can be removed after bug 1138384 lands
diff --git a/layout/reftests/text-shadow/reftest-stylo.list b/layout/reftests/text-shadow/reftest-stylo.list
deleted file mode 100644
index 84c0feff6..000000000
--- a/layout/reftests/text-shadow/reftest-stylo.list
+++ /dev/null
@@ -1,48 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== 723669.html 723669.html
-
-skip-if((B2G&&browserIsRemote)||Mulet) == basic.xul basic.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-random-if(Android) skip-if((B2G&&browserIsRemote)||Mulet) == basic-negcoord.xul basic-negcoord.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == blur.xul blur.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == color-inherit.xul color-inherit.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == multiple-noblur.xul multiple-noblur.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-HTTP(..) == blur-opacity.html blur-opacity.html
-
-== basic.html basic.html
-== basic-negcoord.html basic-negcoord.html
-== basic-opacity.html basic-opacity.html
-== blur.html blur.html
-== color-inherit.html color-inherit.html
-== color-parserorder.html color-parserorder.html
-== decorations-multiple-zorder.html decorations-multiple-zorder.html
-== multiple-noblur.html multiple-noblur.html
-== quirks-decor-noblur.html quirks-decor-noblur.html
-== standards-decor-noblur.html standards-decor-noblur.html
-== padding-decoration.html padding-decoration.html
-== textindent.html textindent.html
-== lineoverflow.html lineoverflow.html
-
-== overflow-not-scrollable-1.html overflow-not-scrollable-1.html
-== overflow-not-scrollable-1.html overflow-not-scrollable-1.html
-== overflow-not-scrollable-2.html overflow-not-scrollable-2.html
-
-needs-focus == text-shadow-selected-1.html text-shadow-selected-1.html
-fails-if(Android||B2G) fuzzy-if(skiaContent,1,1000) needs-focus == text-shadow-selected-1.html text-shadow-selected-1.html
-# different foreground selection color on Android/B2G
-needs-focus == text-shadow-selected-2.html text-shadow-selected-2.html
-fails-if(Android||B2G) fuzzy-if(skiaContent,1,1400) needs-focus == text-shadow-selected-2.html text-shadow-selected-2.html
-# different foreground selection color on Android/B2G
-
-# bug 692744
-== text-shadow-on-space-1.html text-shadow-on-space-1.html
-
-# bug 721750
-skip needs-focus == text-shadow-on-selection-1.html text-shadow-on-selection-1.html
-skip needs-focus == text-shadow-on-selection-2.html text-shadow-on-selection-2.html
-
-== overflow-decoration.html overflow-decoration.html
diff --git a/layout/reftests/text-shadow/reftest.list b/layout/reftests/text-shadow/reftest.list
index 7e5e4b5fc..c89725715 100644
--- a/layout/reftests/text-shadow/reftest.list
+++ b/layout/reftests/text-shadow/reftest.list
@@ -1,7 +1,7 @@
== 723669.html 723669-ref.html
== basic.xul basic-ref.xul
-random-if(Android) == basic-negcoord.xul basic-negcoord-ref.xul
+== basic-negcoord.xul basic-negcoord-ref.xul
!= blur.xul blur-notref.xul
== color-inherit.xul color-inherit-ref.xul
== multiple-noblur.xul multiple-noblur-ref.xul
@@ -26,9 +26,9 @@ HTTP(..) == blur-opacity.html blur-opacity-ref.html
== overflow-not-scrollable-2.html overflow-not-scrollable-2-ref.html
needs-focus != text-shadow-selected-1.html text-shadow-selected-1-notref.html
-fails-if(Android) fuzzy-if(skiaContent&&!Android,1,1000) needs-focus == text-shadow-selected-1.html text-shadow-selected-1-ref.html # different foreground selection color on Android
+fuzzy-if(skiaContent,1,1000) needs-focus == text-shadow-selected-1.html text-shadow-selected-1-ref.html
needs-focus != text-shadow-selected-2.html text-shadow-selected-2-notref.html
-fails-if(Android) fuzzy-if(skiaContent&&!Android,1,1400) needs-focus == text-shadow-selected-2.html text-shadow-selected-2-ref.html # different foreground selection color on Android
+fuzzy-if(skiaContent,1,1400) needs-focus == text-shadow-selected-2.html text-shadow-selected-2-ref.html
# bug 692744
== text-shadow-on-space-1.html text-shadow-on-space-1-ref.html
diff --git a/layout/reftests/text-stroke/reftest-stylo.list b/layout/reftests/text-stroke/reftest-stylo.list
deleted file mode 100644
index 7e0b32ed6..000000000
--- a/layout/reftests/text-stroke/reftest-stylo.list
+++ /dev/null
@@ -1,10 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# basic tests for webkit-text-stroke
-# fuzzy is needed here for platform dependent backends
-default-preferences pref(layout.css.prefixes.webkit,true)
-
-fuzzy-if(gtkWidget,255,20) fuzzy-if(winWidget,20,10) == webkit-text-stroke-property-001.html webkit-text-stroke-property-001.html
-fuzzy-if(gtkWidget,255,20) fuzzy-if(winWidget,20,10) == webkit-text-stroke-property-002.html webkit-text-stroke-property-002.html
-fuzzy-if(gtkWidget,255,20) fuzzy-if(winWidget,20,10) == webkit-text-stroke-property-003.html webkit-text-stroke-property-003.html
-fails fuzzy-if(gtkWidget,255,20) fuzzy-if(winWidget,20,10) == webkit-text-stroke-property-004.html webkit-text-stroke-property-004.html
-fails fuzzy-if(gtkWidget,255,20) fuzzy-if(winWidget,20,10) == webkit-text-stroke-property-005.html webkit-text-stroke-property-005.html
diff --git a/layout/reftests/text-svgglyphs/reftest-stylo.list b/layout/reftests/text-svgglyphs/reftest-stylo.list
deleted file mode 100644
index af81c4772..000000000
--- a/layout/reftests/text-svgglyphs/reftest-stylo.list
+++ /dev/null
@@ -1,27 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-pref(gfx.font_rendering.opentype_svg.enabled,false) == svg-glyph-basic.svg svg-glyph-basic.svg
-pref(gfx.font_rendering.opentype_svg.enabled,true) fuzzy-if(skiaContent,1,200) == svg-glyph-basic.svg svg-glyph-basic.svg
-pref(gfx.font_rendering.opentype_svg.enabled,true) == svg-glyph-invalid-ids.svg svg-glyph-invalid-ids.svg
-pref(gfx.font_rendering.opentype_svg.enabled,false) == svg-glyph-positioning.svg svg-glyph-positioning.svg
-pref(gfx.font_rendering.opentype_svg.enabled,true) fuzzy-if(skiaContent,2,350) == svg-glyph-positioning.svg svg-glyph-positioning.svg
-pref(gfx.font_rendering.opentype_svg.enabled,true) == svg-glyph-html.html svg-glyph-html.html
-pref(gfx.font_rendering.opentype_svg.enabled,true) == svg-glyph-direct.svg svg-glyph-direct.svg
-pref(gfx.font_rendering.opentype_svg.enabled,true) == svg-glyph-invalid.html svg-glyph-invalid.html
-pref(gfx.font_rendering.opentype_svg.enabled,true) == svg-glyph-objectfill-solid.svg svg-glyph-objectfill-solid.svg
-pref(gfx.font_rendering.opentype_svg.enabled,true) fuzzy-if(skiaContent,2,200) == svg-glyph-objectstroke-solid.svg svg-glyph-objectstroke-solid.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(B2G,1,21) fuzzy-if(skiaContent,1,300) == svg-glyph-objectgradient.svg svg-glyph-objectgradient.svg
-# see bug 871961#c5
-pref(gfx.font_rendering.opentype_svg.enabled,true) fuzzy-if(cocoaWidget,1,7028) fuzzy-if(gtkWidget&&/^Linux\x20x86_64/.test(http.oscpu),1,23) fuzzy-if(skiaContent,1,250) == svg-glyph-objectgradient-zoom.svg svg-glyph-objectgradient-zoom.svg
-pref(gfx.font_rendering.opentype_svg.enabled,true) fuzzy-if(gtkWidget,1,1438) fuzzy-if(winWidget,1,1954) fuzzy-if(Android||B2G,8,3795) == svg-glyph-objectpattern.svg svg-glyph-objectpattern.svg
-pref(gfx.font_rendering.opentype_svg.enabled,true) == clip.html clip.html
-pref(gfx.font_rendering.opentype_svg.enabled,true) fuzzy(1,13) fuzzy-if(gtkWidget&&/^Linux\x20x86_64/.test(http.oscpu),1,62) fuzzy-if(B2G,1,25) fuzzy-if(skiaContent,1,350) == svg-glyph-objectopacity.svg svg-glyph-objectopacity.svg
-# see bug 871961#c5
-pref(gfx.font_rendering.opentype_svg.enabled,true) fuzzy-if(gtkWidget,1,2268) fuzzy-if(winWidget,1,3074) fuzzy-if(Android||B2G,5,4715) == svg-glyph-objectopacity2.svg svg-glyph-objectopacity2.svg
-pref(gfx.font_rendering.opentype_svg.enabled,true) fuzzy-if(skiaContent,2,200) == svg-glyph-paintnone.svg svg-glyph-paintnone.svg
-pref(gfx.font_rendering.opentype_svg.enabled,true) fuzzy-if(skiaContent,2,200) == svg-glyph-cachedopacity.svg svg-glyph-cachedopacity.svg
-pref(gfx.font_rendering.opentype_svg.enabled,true) fuzzy-if(cocoaWidget,255,100) == svg-glyph-objectvalue.svg svg-glyph-objectvalue.svg
-pref(gfx.font_rendering.opentype_svg.enabled,true) == svg-glyph-mask.svg svg-glyph-mask.svg
-# bug 872483
-pref(gfx.font_rendering.opentype_svg.enabled,true) == svg-glyph-paint-server.svg svg-glyph-paint-server.svg
-pref(gfx.font_rendering.opentype_svg.enabled,true) == svg-glyph-transform.svg svg-glyph-transform.svg
-skip == svg-glyph-extents.html svg-glyph-extents.html
diff --git a/layout/reftests/text-svgglyphs/reftest.list b/layout/reftests/text-svgglyphs/reftest.list
index 7ff341f42..96a783f62 100644
--- a/layout/reftests/text-svgglyphs/reftest.list
+++ b/layout/reftests/text-svgglyphs/reftest.list
@@ -10,10 +10,10 @@ pref(gfx.font_rendering.opentype_svg.enabled,true) == svg-glyph-objectfill-so
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
pref(gfx.font_rendering.opentype_svg.enabled,true) fuzzy-if(cocoaWidget,1,7028) fuzzy-if(gtkWidget&&/^Linux\x20x86_64/.test(http.oscpu),1,23) fuzzy-if(skiaContent,1,250) == svg-glyph-objectgradient-zoom.svg svg-glyph-objectgradient-zoom-ref.svg
-pref(gfx.font_rendering.opentype_svg.enabled,true) fuzzy-if(gtkWidget,1,1438) fuzzy-if(winWidget,1,1954) fuzzy-if(Android,8,3795) fuzzy-if(skiaContent,14,13000) == svg-glyph-objectpattern.svg svg-glyph-objectpattern-ref.svg
+pref(gfx.font_rendering.opentype_svg.enabled,true) fuzzy-if(gtkWidget,1,1438) fuzzy-if(winWidget,1,1954) fuzzy-if(skiaContent,14,13000) == svg-glyph-objectpattern.svg svg-glyph-objectpattern-ref.svg
pref(gfx.font_rendering.opentype_svg.enabled,true) == clip.html clip-ref.html
pref(gfx.font_rendering.opentype_svg.enabled,true) fuzzy(1,13) fuzzy-if(gtkWidget&&/^Linux\x20x86_64/.test(http.oscpu),1,62) fuzzy-if(skiaContent,1,350) == svg-glyph-objectopacity.svg svg-glyph-objectopacity-ref.svg # see bug 871961#c5
-pref(gfx.font_rendering.opentype_svg.enabled,true) fuzzy-if(gtkWidget,1,2268) fuzzy-if(winWidget,1,3074) fuzzy-if(Android,5,4715) fuzzy-if(skiaContent,8,13000) == svg-glyph-objectopacity2.svg svg-glyph-objectopacity2-ref.svg
+pref(gfx.font_rendering.opentype_svg.enabled,true) fuzzy-if(gtkWidget,1,2268) fuzzy-if(winWidget,1,3074) fuzzy-if(skiaContent,8,13000) == svg-glyph-objectopacity2.svg svg-glyph-objectopacity2-ref.svg
pref(gfx.font_rendering.opentype_svg.enabled,true) fuzzy-if(skiaContent,2,200) == svg-glyph-paintnone.svg svg-glyph-paintnone-ref.svg
pref(gfx.font_rendering.opentype_svg.enabled,true) fuzzy-if(skiaContent,2,200) == svg-glyph-cachedopacity.svg svg-glyph-cachedopacity-ref.svg
pref(gfx.font_rendering.opentype_svg.enabled,true) fuzzy-if(cocoaWidget,255,100) == svg-glyph-objectvalue.svg svg-glyph-objectvalue-ref.svg
diff --git a/layout/reftests/text-transform/reftest-stylo.list b/layout/reftests/text-transform/reftest-stylo.list
deleted file mode 100644
index 4cd418c87..000000000
--- a/layout/reftests/text-transform/reftest-stylo.list
+++ /dev/null
@@ -1,46 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== capitalize-1.html capitalize-1.html
-== capitalize-2.html capitalize-2.html
-== capitalize-3.html capitalize-3.html
-== capitalize-4.html capitalize-4.html
-== capitalize-5.html capitalize-5.html
-== capitalize-6.html capitalize-6.html
-== capitalize-7.html capitalize-7.html
-== capitalize-7a.html capitalize-7a.html
-== lowercase-1.html lowercase-1.html
-== lowercase-sigma-1.html lowercase-sigma-1.html
-fails-if(B2G||Mulet) random-if(winWidget) == small-caps-1.html small-caps-1.html
-# fails if default font supports 'smcp'
-# Initial mulet triage: parity with B2G/B2G Desktop
-HTTP(..) == fake-small-caps-1.html fake-small-caps-1.html
-HTTP(..) == opentype-small-caps-1.html opentype-small-caps-1.html
-HTTP(..) == opentype-small-caps-1.html opentype-small-caps-1.html
-HTTP(..) == graphite-small-caps-1.html graphite-small-caps-1.html
-HTTP(..) == graphite-small-caps-1.html graphite-small-caps-1.html
-== uppercase-1.html uppercase-1.html
-== uppercase-szlig-1.html uppercase-szlig-1.html
-# these use DejaVu Sans via @font-face for consistency of results
-skip skip-if(B2G||Mulet) fuzzy-if(cocoaWidget,250,15) HTTP(..) == all-upper.html all-upper.html
-# bug 773482, 1140292
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails skip-if(B2G||Mulet) fuzzy-if(cocoaWidget,250,15) fuzzy-if(skiaContent,1,1800) HTTP(..) == all-lower.html all-lower.html
-# bug 773482, 1140292
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails skip-if(B2G||Mulet) fuzzy-if(skiaContent,1,80) HTTP(..) == all-title.html all-title.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip == smtp-upper.html smtp-upper.html
-== smtp-lower.html smtp-lower.html
-== smtp-title.html smtp-title.html
-== turkish-casing-1.html turkish-casing-1.html
-HTTP(..) == small-caps-turkish-1.html small-caps-turkish-1.html
-== greek-uppercase-1a.html greek-uppercase-1a.html
-== greek-uppercase-1b.html greek-uppercase-1b.html
-== greek-uppercase-2.html greek-uppercase-2.html
-HTTP(..) == greek-small-caps-1.html greek-small-caps-1.html
-== irish-uppercase-1.html irish-uppercase-1.html
-== irish-lowercase-1a.html irish-lowercase-1a.html
-== irish-lowercase-1b.html irish-lowercase-1b.html
-== fullwidth-1.html fullwidth-1.html
-== fullwidth-2.html fullwidth-2.html
-== fullwidth-all.html fullwidth-all.html
diff --git a/layout/reftests/text/reftest-stylo.list b/layout/reftests/text/reftest-stylo.list
deleted file mode 100644
index 61d79b0ac..000000000
--- a/layout/reftests/text/reftest-stylo.list
+++ /dev/null
@@ -1,366 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-fails-if(Android||B2G) == fallback-01.xhtml fallback-01.xhtml
-== font-selection-by-lang-01.html font-selection-by-lang-01.html
-skip-if(B2G||Mulet) HTTP(..) == font-selection-fallback-1.html font-selection-fallback-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) HTTP(..) == font-selection-generic-1.html font-selection-generic-1.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(Android||B2G) == font-size-adjust-01.html font-size-adjust-01.html
-# The following test passes consistently only on Mac OS X;
-# both Windows and Linux give results that vary depending on the font size/zoom factor used,
-# because hinting affects the metrics used to compute the font size adjustment. See bug 429605.
-random-if(!cocoaWidget) == font-size-adjust-02.html font-size-adjust-02.html
-# This currently fails because line spacing does not respect font-size-adjust
-# in the "obvious" way, but it is unclear what the behavior should really be;
-# see bug #366138 for some (inconclusive) discussion
-# == font-size-adjust-03.html font-size-adjust-03.html
-== justification-1.html justification-1.html
-== justification-2a.html justification-2a.html
-== justification-2b.html justification-2b.html
-== justification-2c.html justification-2c.html
-== justification-2d.html justification-2d.html
-== justification-cjk-extension.html justification-cjk-extension.html
-== justification-space-diacritic.html justification-space-diacritic.html
-skip HTTP(..) load ligature-with-space-1.html
-== line-editing-1a.html line-editing-1a.html
-== line-editing-1b.html line-editing-1b.html
-== line-editing-1c.html line-editing-1c.html
-== line-editing-1d.html line-editing-1d.html
-== line-editing-1e.html line-editing-1e.html
-fails-if(cocoaWidget||(winWidget&&d2d&&layersGPUAccelerated)||(winWidget&&skiaContent&&layersGPUAccelerated)) HTTP(..) == lineheight-metrics-1.html lineheight-metrics-1.html
-# bug 657864
-HTTP(..) == lineheight-metrics-2a.html lineheight-metrics-2a.html
-HTTP(..) == lineheight-metrics-2b.html lineheight-metrics-2b.html
-== lineheight-percentage-1.html lineheight-percentage-1.html
-skip-if(B2G||Mulet) == long-1.html long-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fuzzy-if(Android,255,147) == pre-line-1.html pre-line-1.html
-== pre-line-2.html pre-line-2.html
-== pre-line-3.html pre-line-3.html
-skip == pre-line-4.html pre-line-4.html
-== pre-space-1.html pre-space-1.html
-== soft-hyphens-1a.html soft-hyphens-1a.html
-== soft-hyphens-1b.html soft-hyphens-1b.html
-== soft-hyphens-1c.html soft-hyphens-1c.html
-== soft-hyphens-break-word-1a.html soft-hyphens-break-word-1a.html
-== soft-hyphens-break-word-1b.html soft-hyphens-break-word-1b.html
-== soft-hyphens-break-word-1c.html soft-hyphens-break-word-1c.html
-# Tests for soft hyphens in table cells, bug 418975
-skip == soft-hyphen-in-table-1.html soft-hyphen-in-table-1.html
-skip == soft-hyphen-in-table-1.html soft-hyphen-in-table-1.html
-== soft-hyphen-in-table-2.html soft-hyphen-in-table-2.html
-# Cairo's FreeType and GDI backends snap glyphs to pixels, while Mac (usually),
-# D2D, and Skia have subpixel positioning. The tests for pixel-snapping assume that
-# 1 CSS pixel == 1 device device
-fails-if(Android) skip-if(d2d||cocoaWidget||skiaContent) == subpixel-glyphs-x-1a.html subpixel-glyphs-x-1a.html
-# Platforms with subpixel positioning already have inconsistent glyphs by
-# design, but that is considered more tolerable because they are subpixel
-# inconsistencies. On those platforms we just test that glyph positions are
-# subpixel.
-# D2D/DirectWrite results depend on the rendering mode chosen, so considering this as random for now.
-skip-if(!(d2d||cocoaWidget)) random-if(d2d) == subpixel-glyphs-x-2a.html subpixel-glyphs-x-2a.html
-skip-if(B2G||Mulet) HTTP(..) == subpixel-glyphs-x-3a.html subpixel-glyphs-x-3a.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-# No platforms do subpixel positioning vertically
-fuzzy-if(Android,19,2) == subpixel-glyphs-y-1a.html subpixel-glyphs-y-1a.html
-fuzzy-if((Android||B2G),231,653) == subpixel-lineheight-1a.html subpixel-lineheight-1a.html
-skip == swash-1.html swash-1.html
-HTTP(..) == synthetic-bold-metrics-01.html synthetic-bold-metrics-01.html
-HTTP(..) == synthetic-bold-papyrus-01.html synthetic-bold-papyrus-01.html
-# Tests for text-align-last
-== text-align-last-start.html text-align-last-start.html
-== text-align-last-end.html text-align-last-end.html
-== text-align-last-center.html text-align-last-center.html
-== text-align-last-justify.html text-align-last-justify.html
-== text-align-last-justify-rtl.html text-align-last-justify-rtl.html
-#
-# Default values:
-# text-align defaults to start. text-align-last defaults to auto, which is
-# equivalent to the value of the ‘text-align’ property except when ‘text-align’
-# is set to ‘justify’, in which case it is currently equivalent to ‘start’
-# This will need to change when we implement text-justify
-== text-align-default-last-default.html text-align-default-last-default.html
-== text-align-start-last-default.html text-align-start-last-default.html
-== text-align-end-last-default.html text-align-end-last-default.html
-== text-align-center-last-default.html text-align-center-last-default.html
-== text-align-justify-last-default.html text-align-justify-last-default.html
-# All combinations of text-align and text-align-last should give different results
-# This only tests the combinations with the same value for text-align and
-# different values for text-align-last
-skip == text-align-start-last-start.html text-align-start-last-start.html
-skip == text-align-start-last-start.html text-align-start-last-start.html
-skip == text-align-start-last-start.html text-align-start-last-start.html
-== text-align-start-last-end.html text-align-start-last-end.html
-== text-align-start-last-end.html text-align-start-last-end.html
-== text-align-start-last-center.html text-align-start-last-center.html
-== text-align-end-last-start.html text-align-end-last-start.html
-== text-align-end-last-start.html text-align-end-last-start.html
-== text-align-end-last-start.html text-align-end-last-start.html
-== text-align-end-last-end.html text-align-end-last-end.html
-== text-align-end-last-end.html text-align-end-last-end.html
-== text-align-end-last-center.html text-align-end-last-center.html
-== text-align-center-last-start.html text-align-center-last-start.html
-== text-align-center-last-start.html text-align-center-last-start.html
-== text-align-center-last-start.html text-align-center-last-start.html
-== text-align-center-last-end.html text-align-center-last-end.html
-== text-align-center-last-end.html text-align-center-last-end.html
-== text-align-center-last-center.html text-align-center-last-center.html
-== text-align-justify-last-start.html text-align-justify-last-start.html
-== text-align-justify-last-start.html text-align-justify-last-start.html
-== text-align-justify-last-start.html text-align-justify-last-start.html
-== text-align-justify-last-end.html text-align-justify-last-end.html
-== text-align-justify-last-end.html text-align-justify-last-end.html
-== text-align-justify-last-center.html text-align-justify-last-center.html
-== text-align-left-in-rtl-block.html text-align-left-in-rtl-block.html
-HTTP(..) == variation-selector-unsupported-1.html variation-selector-unsupported-1.html
-== white-space-1a.html white-space-1a.html
-== white-space-1b.html white-space-1b.html
-== white-space-2.html white-space-2.html
-== wordbreak-1.html wordbreak-1.html
-== wordbreak-2.html wordbreak-2.html
-== wordbreak-3.html wordbreak-3.html
-skip-if((Android)||(B2G&&browserIsRemote)) == wordbreak-4a.html wordbreak-4a.html
-== wordbreak-4b.html wordbreak-4b.html
-== wordbreak-5.html wordbreak-5.html
-fails-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu)) == wordbreak-6.html wordbreak-6.html
-# Bug 1258239
-skip-if(B2G||Mulet) HTTP(..) == wordbreak-7a.html wordbreak-7a.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-HTTP(..) == wordbreak-7b.html wordbreak-7b.html
-# bug 479829
-== wordbreak-8.html wordbreak-8.html
-pref(gfx.font_rendering.graphite.enabled,true) HTTP(..) == wordbreak-9.html wordbreak-9.html
-== wordwrap-01.html wordwrap-01.html
-HTTP(..) == wordwrap-02.html wordwrap-02.html
-fuzzy-if(gtkWidget,1,177) fuzzy-if(skiaContent,1,50) skip-if(B2G||Mulet) HTTP(..) == wordwrap-03.html wordwrap-03.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-# Fuzzy on Linux because the native textbox gradient is painted in a slightly different position depending on the invalid area.
-== wordwrap-04.html wordwrap-04.html
-== overflowwrap-04.html overflowwrap-04.html
-== wordwrap-05.html wordwrap-05.html
-== overflowwrap-05.html overflowwrap-05.html
-== wordwrap-06.html wordwrap-06.html
-== overflowwrap-06.html overflowwrap-06.html
-== wordwrap-07.html wordwrap-07.html
-== overflowwrap-07.html overflowwrap-07.html
-skip-if(B2G||Mulet) == wordwrap-08.html wordwrap-08.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == wordwrap-08.html wordwrap-08.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == wordwrap-09.html wordwrap-09.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == overflowwrap-09.html overflowwrap-09.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == wordwrap-09.html wordwrap-09.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == overflowwrap-09.html overflowwrap-09.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== wordwrap-10.html wordwrap-10.html
-# bug 752459
-skip == overflowwrap-10.html overflowwrap-10.html
-== word-spacing-01.html word-spacing-01.html
-# the following will fail when rendering with Core Text (see bug 389074) due to what appears to be
-# an Apple bug: the presence of ZWNJ disturbs the positioning of an adjacent glyph. rdar://6427865
-random-if(cocoaWidget) HTTP(..) == zwnj-01.xhtml zwnj-01.xhtml
-HTTP(..) == zwnj-02.xhtml zwnj-02.xhtml
-# HTTP(..) for ../filters.svg
-== zwnj-01.html zwnj-01.html
-== initial-zwj-1.html initial-zwj-1.html
-== cgj-01.html cgj-01.html
-skip == 444656.html 444656.html
-== 449555-1.html 449555-1.html
-== 467722.html 467722.html
-fails skip-if(B2G||Mulet) fuzzy-if(skiaContent,1,600) HTTP(..) == 475092-sub.html 475092-sub.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(!winWidget&&!gtkWidget) skip-if(B2G||Mulet) fuzzy-if(skiaContent,89,3100) HTTP(..) == 475092-pos.html 475092-pos.html
-# bug 482596
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 476378-soft-hyphen-fallback.html 476378-soft-hyphen-fallback.html
-# Test for bug 484954
-== rgba-text.html rgba-text.html
-# Test for bug 575695, 'kern' table support
-HTTP(..) == kerning-01.html kerning-01.html
-# Test for bug 577380, support for AAT layout (on OS X only)
-skip random-if(!cocoaWidget) == 577380.html 577380.html
-# Test for OpenType Arabic shaping support
-HTTP(..) == arabic-shaping-1.html arabic-shaping-1.html
-# check ligature in Arial Bold on Windows, for bug 644184; may fail on other platforms depending on fonts
-random-if(!winWidget) == arial-bold-lam-alef-1.html arial-bold-lam-alef-1.html
-# Fallback (presentation-forms) shaping with a font that lacks GSUB/GPOS
-# These tests are not valid with Mac or FT2 font backends because our masking of complex-script ranges
-# in the 'cmap' will prevent the test font (without GSUB) being used.
-random HTTP(..) == arabic-fallback-1.html arabic-fallback-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-random HTTP(..) == arabic-fallback-2.html arabic-fallback-2.html
-random HTTP(..) == arabic-fallback-3.html arabic-fallback-3.html
-random HTTP(..) == arabic-fallback-4.html arabic-fallback-4.html
-== arabic-marks-1.html arabic-marks-1.html
-fails-if(OSX<1008) == arabic-final-ligature-spacing.html arabic-final-ligature-spacing.html
-# harfbuzz fallback mark stacking in the absence of GPOS:
-HTTP(..) == fallback-mark-stacking-1.html fallback-mark-stacking-1.html
-
-== 726392-1.html 726392-1.html
-== 726392-2.html 726392-2.html
-skip-if(B2G||Mulet) == 726392-3.html 726392-3.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== 745555-1.html 745555-1.html
-== 745555-2.html 745555-2.html
-== 820255.html 820255.html
-HTTP(..) == 1170688.html 1170688.html
-
-# ensure emoji chars don't render blank (bug 715798, bug 779042);
-# should at least render hexboxes if there's no font support
-== emoji-01.html emoji-01.html
-== emoji-02.html emoji-02.html
-
-# Bug 727276: tests with variation selectors 15 and 16 to control emoji rendering style
-== emoji-03.html emoji-03.html
-# the next two will fail on OS X 10.6 because no color emoji font is present,
-# and also on Android/B2G platforms until we have color emoji fonts there.
-# Tests rely on bundled EmojiOne Mozilla to pass on Windows <8.1 and Linux.
-fails-if(OSX==1006||B2G||Android) == emoji-03.html emoji-03.html
-fails-if(OSX==1006||B2G||Android) == emoji-04.html emoji-04.html
-== emoji-05.html emoji-05.html
-
-# check that Graphite shaping (bug 631479) is working
-pref(gfx.font_rendering.graphite.enabled,true) HTTP(..) == graphite-01.html graphite-01.html
-# Test 02 (using Pig Latin) is fuzzy on Win7 because glyph positioning is not guaranteed to match exactly
-# between a sequence of simple glyphs rendered individually, and the same sequence treated as a single cluster.
-fuzzy-if(winWidget,49,220) pref(gfx.font_rendering.graphite.enabled,true) HTTP(..) == graphite-02.html graphite-02.html
-pref(gfx.font_rendering.graphite.enabled,true) HTTP(..) == graphite-03a.html graphite-03a.html
-pref(gfx.font_rendering.graphite.enabled,true) HTTP(..) == graphite-03b.html graphite-03b.html
-pref(gfx.font_rendering.graphite.enabled,false) HTTP(..) == graphite-01.html graphite-01.html
-pref(gfx.font_rendering.graphite.enabled,false) HTTP(..) == graphite-02.html graphite-02.html
-# test 03a (lang setting in Padauk font) now works in opentype/harfbuzz as well
-pref(gfx.font_rendering.graphite.enabled,false) HTTP(..) == graphite-03a.html graphite-03a.html
-pref(gfx.font_rendering.graphite.enabled,false) HTTP(..) == graphite-03b.html graphite-03b.html
-
-# tests for graphite rendering with valid and invalid lang tags
-pref(gfx.font_rendering.graphite.enabled,true) HTTP(..) == graphite-04-fa.html graphite-04-fa.html
-pref(gfx.font_rendering.graphite.enabled,true) HTTP(..) == graphite-04-sd.html graphite-04-sd.html
-pref(gfx.font_rendering.graphite.enabled,true) HTTP(..) == graphite-04-snd.html graphite-04-snd.html
-pref(gfx.font_rendering.graphite.enabled,true) HTTP(..) == graphite-04-ur.html graphite-04-ur.html
-pref(gfx.font_rendering.graphite.enabled,true) HTTP(..) == graphite-04-urd.html graphite-04-urd.html
-pref(gfx.font_rendering.graphite.enabled,true) HTTP(..) == graphite-04-sd.html graphite-04-sd.html
-
-# tests to compare graphite to opentype (will trivially pass when graphite not enabled)
-skip HTTP(..) == graphite-05-ot-only.html graphite-05-ot-only.html
-skip HTTP(..) == graphite-05-ot-only.html graphite-05-ot-only.html
-HTTP(..) == graphite-05-simple.html graphite-05-simple.html
-HTTP(..) == graphite-05-multipass.html graphite-05-multipass.html
-HTTP(..) == graphite-05-lang.html graphite-05-lang.html
-HTTP(..) == graphite-05-badlang.html graphite-05-badlang.html
-HTTP(..) == graphite-05-feat.html graphite-05-feat.html
-
-# comparing composed and decomposed characters that should render identically
-# under both OpenType and Graphite shaping
-pref(gfx.font_rendering.graphite.enabled,false) HTTP(..) == glyph-decomposition-opentype.html glyph-decomposition-opentype.html
-pref(gfx.font_rendering.graphite.enabled,true) HTTP(..) == glyph-decomposition-graphite.html glyph-decomposition-graphite.html
-
-# test for bidi bug in graphite 1.3.2, fixed in 1.3.3 (bug 1207061)
-HTTP(..) == graphite-bidi-1.html graphite-bidi-1.html
-
-HTTP(..) == graphite-surrogate-selection.html graphite-surrogate-selection.html
-
-# Tests for hyphenation with hyphens property
-== auto-hyphenation-1.html auto-hyphenation-1.html
-== auto-hyphenation-1.html auto-hyphenation-1.html
-== auto-hyphenation-1a.html auto-hyphenation-1a.html
-== auto-hyphenation-2.html auto-hyphenation-2.html
-== auto-hyphenation-3.html auto-hyphenation-3.html
-== auto-hyphenation-4.html auto-hyphenation-4.html
-== auto-hyphenation-5.html auto-hyphenation-5.html
-== auto-hyphenation-6.html auto-hyphenation-6.html
-== auto-hyphenation-7.html auto-hyphenation-7.html
-== auto-hyphenation-8.html auto-hyphenation-8.html
-== auto-hyphenation-9.html auto-hyphenation-9.html
-== auto-hyphenation-10.html auto-hyphenation-10.html
-== auto-hyphenation-xmllang-1.xhtml auto-hyphenation-xmllang-1.xhtml
-== auto-hyphenation-xmllang-1.xhtml auto-hyphenation-xmllang-1.xhtml
-== auto-hyphenation-xmllang-1a.xhtml auto-hyphenation-xmllang-1a.xhtml
-== auto-hyphenation-xmllang-2.xhtml auto-hyphenation-xmllang-2.xhtml
-== auto-hyphenation-xmllang-3.xhtml auto-hyphenation-xmllang-3.xhtml
-== auto-hyphenation-xmllang-4.xhtml auto-hyphenation-xmllang-4.xhtml
-== auto-hyphenation-xmllang-5.xhtml auto-hyphenation-xmllang-5.xhtml
-== auto-hyphenation-xmllang-6.xhtml auto-hyphenation-xmllang-6.xhtml
-== auto-hyphenation-xmllang-7.xhtml auto-hyphenation-xmllang-7.xhtml
-== auto-hyphenation-xmllang-8.xhtml auto-hyphenation-xmllang-8.xhtml
-== auto-hyphenation-xmllang-9.xhtml auto-hyphenation-xmllang-9.xhtml
-== auto-hyphenation-xmllang-10.xhtml auto-hyphenation-xmllang-10.xhtml
-== auto-hyphenation-xmllang-11a.xhtml auto-hyphenation-xmllang-11a.xhtml
-skip == auto-hyphenation-xmllang-11b.xhtml auto-hyphenation-xmllang-11b.xhtml
-== auto-hyphenation-xmllang-12a.xhtml auto-hyphenation-xmllang-12a.xhtml
-== auto-hyphenation-xmllang-12b.xhtml auto-hyphenation-xmllang-12b.xhtml
-== auto-hyphenation-xmllang-13a.xhtml auto-hyphenation-xmllang-13a.xhtml
-== auto-hyphenation-xmllang-13b.xhtml auto-hyphenation-xmllang-13b.xhtml
-== auto-hyphenation-xmllang-14a.xhtml auto-hyphenation-xmllang-14a.xhtml
-== auto-hyphenation-xmllang-14b.xhtml auto-hyphenation-xmllang-14b.xhtml
-== auto-hyphenation-af-1.html auto-hyphenation-af-1.html
-== auto-hyphenation-bg-1.html auto-hyphenation-bg-1.html
-== auto-hyphenation-ca-1.html auto-hyphenation-ca-1.html
-== auto-hyphenation-cy-1.html auto-hyphenation-cy-1.html
-== auto-hyphenation-da-1.html auto-hyphenation-da-1.html
-== auto-hyphenation-de-1901-1.html auto-hyphenation-de-1901-1.html
-== auto-hyphenation-de-1996-1.html auto-hyphenation-de-1996-1.html
-== auto-hyphenation-de-1901-1.html auto-hyphenation-de-1901-1.html
-== auto-hyphenation-de-ch-1.html auto-hyphenation-de-ch-1.html
-== auto-hyphenation-eo-1.html auto-hyphenation-eo-1.html
-== auto-hyphenation-es-1.html auto-hyphenation-es-1.html
-== auto-hyphenation-et-1.html auto-hyphenation-et-1.html
-== auto-hyphenation-fi-1.html auto-hyphenation-fi-1.html
-== auto-hyphenation-fr-1.html auto-hyphenation-fr-1.html
-== auto-hyphenation-gl-1.html auto-hyphenation-gl-1.html
-== auto-hyphenation-hr-1.html auto-hyphenation-hr-1.html
-== auto-hyphenation-hsb-1.html auto-hyphenation-hsb-1.html
-== auto-hyphenation-hu-1.html auto-hyphenation-hu-1.html
-== auto-hyphenation-ia-1.html auto-hyphenation-ia-1.html
-== auto-hyphenation-is-1.html auto-hyphenation-is-1.html
-== auto-hyphenation-it-1.html auto-hyphenation-it-1.html
-== auto-hyphenation-kmr-1.html auto-hyphenation-kmr-1.html
-== auto-hyphenation-la-1.html auto-hyphenation-la-1.html
-== auto-hyphenation-lt-1.html auto-hyphenation-lt-1.html
-== auto-hyphenation-mn-1.html auto-hyphenation-mn-1.html
-== auto-hyphenation-nb-1.html auto-hyphenation-nb-1.html
-== auto-hyphenation-nl-1.html auto-hyphenation-nl-1.html
-== auto-hyphenation-nn-1.html auto-hyphenation-nn-1.html
-== auto-hyphenation-pl-1.html auto-hyphenation-pl-1.html
-== auto-hyphenation-pt-1.html auto-hyphenation-pt-1.html
-== auto-hyphenation-ru-1.html auto-hyphenation-ru-1.html
-== auto-hyphenation-sh-1.html auto-hyphenation-sh-1.html
-== auto-hyphenation-sl-1.html auto-hyphenation-sl-1.html
-== auto-hyphenation-sr-1.html auto-hyphenation-sr-1.html
-== auto-hyphenation-sv-1.html auto-hyphenation-sv-1.html
-# test swedish patterns
-== auto-hyphenation-sv-1.html auto-hyphenation-sv-1.html
-# verify swedish == ==
-== auto-hyphenation-tr-1.html auto-hyphenation-tr-1.html
-== auto-hyphenation-uk-1.html auto-hyphenation-uk-1.html
-
-== auto-hyphenation-transformed-1.html auto-hyphenation-transformed-1.html
-
-# osx-font-smoothing - with and without subpixel AA, only under OSX
-skip == osx-font-smoothing.html osx-font-smoothing.html
-skip == osx-font-smoothing-2.html osx-font-smoothing-2.html
-== osx-font-smoothing-2.html osx-font-smoothing-2.html
-
-pref(layout.css.text-align-unsafe-value.enabled,true) == text-align-unsafe.html text-align-unsafe.html
-
-# stray control chars should be visible by default, bug 1099557
-== control-chars-01a.html control-chars-01a.html
-== control-chars-01b.html control-chars-01b.html
-== control-chars-01c.html control-chars-01c.html
-== control-chars-01d.html control-chars-01d.html
-== control-chars-02.html control-chars-02.html
-== control-chars-03a.html control-chars-03a.html
-== control-chars-03b.html control-chars-03b.html
-pref(layout.css.control-characters.visible,true) == control-chars-04a.html control-chars-04a.html
-pref(layout.css.control-characters.visible,true) == control-chars-04b.html control-chars-04b.html
-pref(layout.css.control-characters.visible,true) == control-chars-04c.html control-chars-04c.html
-pref(layout.css.control-characters.visible,true) == control-chars-04d.html control-chars-04d.html
-
-# font fallback for <space> when not supported in the primary font family - bug 970891
-HTTP(..) == space-font-1.html space-font-1.html
-
-# handling of highly negative letter-spacing and intrinsic width
-== negative-letter-spacing-1.html negative-letter-spacing-1.html
diff --git a/layout/reftests/text/reftest.list b/layout/reftests/text/reftest.list
index 7e4bd55c0..8f8c2778c 100644
--- a/layout/reftests/text/reftest.list
+++ b/layout/reftests/text/reftest.list
@@ -1,8 +1,8 @@
-fails-if(Android) == fallback-01.xhtml fallback-01-ref.xhtml
+== fallback-01.xhtml fallback-01-ref.xhtml
== font-selection-by-lang-01.html font-selection-by-lang-01-ref.html
HTTP(..) == font-selection-fallback-1.html font-selection-fallback-1-ref.html
HTTP(..) == font-selection-generic-1.html font-selection-generic-1-ref.html
-fails-if(Android) != font-size-adjust-01.html font-size-adjust-01-ref.html
+!= font-size-adjust-01.html font-size-adjust-01-ref.html
# The following test passes consistently only on Mac OS X;
# both Windows and Linux give results that vary depending on the font size/zoom factor used,
# because hinting affects the metrics used to compute the font size adjustment. See bug 429605.
@@ -29,7 +29,7 @@ HTTP(..) == lineheight-metrics-2a.html lineheight-metrics-2-ref.html
HTTP(..) == lineheight-metrics-2b.html lineheight-metrics-2-ref.html
== lineheight-percentage-1.html lineheight-percentage-1-ref.html
== long-1.html long-ref.html
-fuzzy-if(Android,255,147) == pre-line-1.html pre-line-1-ref.html
+== pre-line-1.html pre-line-1-ref.html
== pre-line-2.html pre-line-2-ref.html
== pre-line-3.html pre-line-3-ref.html
== pre-line-4.html pre-line-4-ref.html
@@ -48,7 +48,7 @@ fuzzy-if(Android,255,147) == pre-line-1.html pre-line-1-ref.html
# Cairo's FreeType and GDI backends snap glyphs to pixels, while Mac (usually),
# D2D, and Skia have subpixel positioning. The tests for pixel-snapping assume that
# 1 CSS pixel == 1 device pixel
-fails-if(Android) skip-if(d2d||cocoaWidget||skiaContent) == subpixel-glyphs-x-1a.html subpixel-glyphs-x-1b.html
+skip-if(d2d||cocoaWidget||skiaContent) == subpixel-glyphs-x-1a.html subpixel-glyphs-x-1b.html
# Platforms with subpixel positioning already have inconsistent glyphs by
# design, but that is considered more tolerable because they are subpixel
# inconsistencies. On those platforms we just test that glyph positions are
@@ -57,8 +57,8 @@ fails-if(Android) skip-if(d2d||cocoaWidget||skiaContent) == subpixel-glyphs-x-1a
skip-if(!(d2d||cocoaWidget)) random-if(d2d) != subpixel-glyphs-x-2a.html subpixel-glyphs-x-2b.html
HTTP(..) == subpixel-glyphs-x-3a.html subpixel-glyphs-x-3b.html
# No platforms do subpixel positioning vertically
-fuzzy-if(Android,19,2) == subpixel-glyphs-y-1a.html subpixel-glyphs-y-1b.html
-fuzzy-if(Android,231,653) == subpixel-lineheight-1a.html subpixel-lineheight-1b.html
+== subpixel-glyphs-y-1a.html subpixel-glyphs-y-1b.html
+== subpixel-lineheight-1a.html subpixel-lineheight-1b.html
== swash-1.html swash-1-ref.html
HTTP(..) != synthetic-bold-metrics-01.html synthetic-bold-metrics-01-notref.html
HTTP(..) == synthetic-bold-papyrus-01.html synthetic-bold-papyrus-01-ref.html
@@ -114,7 +114,7 @@ HTTP(..) == variation-selector-unsupported-1.html variation-selector-unsupported
== wordbreak-1.html wordbreak-1-ref.html
== wordbreak-2.html wordbreak-2-ref.html
== wordbreak-3.html wordbreak-3-ref.html
-skip-if(Android) == wordbreak-4a.html wordbreak-4a-ref.html
+== wordbreak-4a.html wordbreak-4a-ref.html
== wordbreak-4b.html wordbreak-4b-ref.html
== wordbreak-5.html wordbreak-5-ref.html
fails-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu)) == wordbreak-6.html wordbreak-6-ref.html # Bug 1258239
@@ -153,7 +153,7 @@ HTTP(..) == zwnj-02.xhtml zwnj-02-ref.xhtml # HTTP(..) for ../filters.svg
== 449555-1.html 449555-1-ref.html
== 467722.html 467722-ref.html
fuzzy-if(skiaContent,1,600) HTTP(..) == 475092-sub.html 475092-ref.html
-fails-if(Android) fuzzy-if(skiaContent&&!Android,90,3100) HTTP(..) == 475092-pos.html 475092-sub.html # bug 482596
+fuzzy-if(skiaContent,90,3100) HTTP(..) == 475092-pos.html 475092-sub.html # bug 482596
== 476378-soft-hyphen-fallback.html 476378-soft-hyphen-fallback-ref.html
# Test for bug 484954
== rgba-text.html rgba-text-ref.html
@@ -168,10 +168,10 @@ random-if(!winWidget) == arial-bold-lam-alef-1.html arial-bold-lam-alef-1-ref.ht
# Fallback (presentation-forms) shaping with a font that lacks GSUB/GPOS
# These tests are not valid with Mac or FT2 font backends because our masking of complex-script ranges
# in the 'cmap' will prevent the test font (without GSUB) being used.
-fails-if(cocoaWidget||Android) HTTP(..) == arabic-fallback-1.html arabic-fallback-1-ref.html
-fails-if(cocoaWidget||Android) HTTP(..) == arabic-fallback-2.html arabic-fallback-2-ref.html
-fails-if(cocoaWidget||Android) HTTP(..) == arabic-fallback-3.html arabic-fallback-3-ref.html
-fails-if(!cocoaWidget&&!Android) HTTP(..) != arabic-fallback-4.html arabic-fallback-4-notref.html
+fails-if(cocoaWidget) HTTP(..) == arabic-fallback-1.html arabic-fallback-1-ref.html
+fails-if(cocoaWidget) HTTP(..) == arabic-fallback-2.html arabic-fallback-2-ref.html
+fails-if(cocoaWidget) HTTP(..) == arabic-fallback-3.html arabic-fallback-3-ref.html
+fails-if(!cocoaWidget) HTTP(..) != arabic-fallback-4.html arabic-fallback-4-notref.html
== arabic-marks-1.html arabic-marks-1-ref.html
fails-if(OSX<1008) == arabic-final-ligature-spacing.html arabic-final-ligature-spacing-ref.html
# harfbuzz fallback mark stacking in the absence of GPOS:
@@ -192,11 +192,10 @@ HTTP(..) != 1170688.html 1170688-ref.html
# Bug 727276: tests with variation selectors 15 and 16 to control emoji rendering style
== emoji-03.html emoji-03-ref.html
-# the next two will fail on OS X 10.6 because no color emoji font is present,
-# and also on Android platforms until we have color emoji fonts there.
+# the next two will fail on OS X 10.6 because no color emoji font is present.
# Tests rely on bundled EmojiOne Mozilla to pass on Windows <8.1 and Linux.
-fails-if(OSX==1006||Android) != emoji-03.html emoji-03-notref.html
-fails-if(OSX==1006||Android) == emoji-04.html emoji-04-ref.html
+fails-if(OSX==1006) != emoji-03.html emoji-03-notref.html
+fails-if(OSX==1006) == emoji-04.html emoji-04-ref.html
!= emoji-05.html emoji-05-notref.html
# check that Graphite shaping (bug 631479) is working
diff --git a/layout/reftests/transform-3d/reftest-stylo.list b/layout/reftests/transform-3d/reftest-stylo.list
deleted file mode 100644
index c153fc4fc..000000000
--- a/layout/reftests/transform-3d/reftest-stylo.list
+++ /dev/null
@@ -1,93 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== scalez-1a.html scalez-1a.html
-== rotatey-1a.html rotatey-1a.html
-== rotatex-1a.html rotatex-1a.html
-# Check that scaleZ(-1) rotateX(180deg) is the same as rotateY(180deg)
-== scalezrotatex-1.html scalezrotatex-1.html
-# Check that the perspectve() transform function results in some visual changes
-== rotatex-perspective-1a.html rotatex-perspective-1a.html
-# Check that -moz-perspective results in visual changes to child transformed elements
-== rotatex-perspective-1b.html rotatex-perspective-1b.html
-# -moz-perspective should only apply to child elements
-# == rotatex-perspective-1c.html rotatex-perspective-1c.html
-== rotatex-perspective-3a.html rotatex-perspective-3a.html
-== scalez-1a.html scalez-1a.html
-fails fuzzy-if(gtkWidget||winWidget,8,376) fuzzy-if(Android,8,441) fuzzy-if(cocoaWidget,17,4) fuzzy-if(skiaContent,16,250) == preserve3d-1a.html preserve3d-1a.html
-== preserve3d-1b.html preserve3d-1b.html
-== preserve3d-clipped.html preserve3d-clipped.html
-== preserve3d-2a.html preserve3d-2a.html
-== preserve3d-2b.html preserve3d-2b.html
-== preserve3d-2c.html preserve3d-2c.html
-== preserve3d-2d.html preserve3d-2d.html
-== preserve3d-3a.html preserve3d-3a.html
-== preserve3d-4a.html preserve3d-4a.html
-fails fuzzy-if(gtkWidget,4,200) fuzzy-if(Android,4,300) fuzzy-if(winWidget&&!layersGPUAccelerated,2,100) fuzzy-if(skiaContent,16,100) == preserve3d-5a.html preserve3d-5a.html
-== preserve3d-6a.html preserve3d-6a.html
-== scale3d-z.html scale3d-z.html
-fuzzy-if(winWidget,102,580) fuzzy-if(d2d,143,681) fuzzy-if(OSX>=1008,224,924) == scale3d-all.html scale3d-all.html
-# subpixel AA
-fuzzy-if(winWidget,102,580) fuzzy-if(d2d,143,681) fuzzy-if(OSX>=1008,224,924) == scale3d-all-separate.html scale3d-all-separate.html
-# subpixel AA
-== scale3d-xz.html scale3d-xz.html
-== translatez-1a.html translatez-1a.html
-== translatez-1b.html translatez-1b.html
-== translate3d-1a.html translate3d-1a.html
-fails fuzzy-if(skiaContent,1,4) == matrix3d-1a.html matrix3d-1a.html
-== matrix3d-2a.html matrix3d-2a.html
-== rotate3d-1a.html rotate3d-1a.html
-== rotate3d-2a.html rotate3d-2a.html
-== backface-visibility-1a.html backface-visibility-1a.html
-== backface-visibility-1b.html backface-visibility-1b.html
-== backface-visibility-1c.html backface-visibility-1c.html
-fuzzy-if(winWidget&&!layersGPUAccelerated,1,251) == backface-visibility-2.html backface-visibility-2.html
-== backface-visibility-3.html backface-visibility-3.html
-== perspective-clipping-1.html perspective-clipping-1.html
-== perspective-origin-1a.html perspective-origin-1a.html
-== perspective-origin-1b.html perspective-origin-1b.html
-random-if(Android&&!browserIsRemote) == perspective-origin-2a.html perspective-origin-2a.html
-# subpixel AA, bug 732568
-fuzzy-if(winWidget&&!layersGPUAccelerated,1,61) == perspective-origin-3a.html perspective-origin-3a.html
-== perspective-origin-4a.html perspective-origin-4a.html
-== perspective-zindex.html perspective-zindex.html
-== perspective-zindex-2.html perspective-zindex-2.html
-== sorting-1a.html sorting-1a.html
-# Parallel planes, different z depth
-== sorting-2a.html sorting-2a.html
-# Parallel planes, same z depth (shouldn't be sorted!)
-== sorting-2b.html sorting-2b.html
-== sorting-3a.html sorting-3a.html
-# Different, but equivalent (for the given transform) transform origins
-== rotatex-transformorigin-1a.html rotatex-transformorigin-1a.html
-fails fuzzy-if((gtkWidget&&layersOMTC)||(winWidget&&!layersGPUAccelerated),1,86) == overflow-hidden-1a.html overflow-hidden-1a.html
-== transform-style-flat-1a.html transform-style-flat-1a.html
-== willchange-containing-block.html?willchange willchange-containing-block.html?willchange
-== willchange-containing-block.html?willchange willchange-containing-block.html?willchange
-fuzzy-if(winWidget&&!layersGPUAccelerated,1,606) == scroll-perspective-1.html scroll-perspective-1.html
-# Bugs
-fails-if(!layersGPUAccelerated) == 1035611-1.html 1035611-1.html
-# Bug 1072898 for !layersGPUAccelerated failures
-== 1157984-1.html 1157984-1.html
-# Bug 1157984
-== animate-cube-radians.html animate-cube-radians.html
-# subpixel AA
-fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&!layersGPUAccelerated,16,6) fuzzy-if(Mulet,16,9) == animate-cube-radians-zoom.html animate-cube-radians-zoom.html
-== animate-cube-radians-ref.html animate-cube-radians-ref.html
-== animate-cube-degrees.html animate-cube-degrees.html
-# subpixel AA
-== animate-cube-degrees-zoom.html animate-cube-degrees-zoom.html
-== animate-cube-degrees-ref.html animate-cube-degrees-ref.html
-fails fuzzy-if(B2G||Android||OSX==1010,143,100) fuzzy-if(winWidget||OSX<1010,141,100) fuzzy-if(gtkWidget,128,100) == preserves3d-nested.html preserves3d-nested.html
-skip == animate-preserve3d-parent.html animate-preserve3d-parent.html
-# intermittently fuzzy on Mac
-skip == animate-preserve3d-child.html animate-preserve3d-child.html
-# intermittently fuzzy on Mac
-skip == animate-backface-hidden.html animate-backface-hidden.html
-== 1245450-1.html 1245450-1.html
-== opacity-preserve3d-1.html opacity-preserve3d-1.html
-== opacity-preserve3d-2.html opacity-preserve3d-2.html
-== opacity-preserve3d-3.html opacity-preserve3d-3.html
-== opacity-preserve3d-4.html opacity-preserve3d-4.html
-== snap-perspective-1.html snap-perspective-1.html
-== mask-layer-1.html mask-layer-1.html
-== mask-layer-2.html mask-layer-2.html
-== mask-layer-3.html mask-layer-3.html
diff --git a/layout/reftests/transform-3d/reftest.list b/layout/reftests/transform-3d/reftest.list
index 87b882f83..59a483790 100644
--- a/layout/reftests/transform-3d/reftest.list
+++ b/layout/reftests/transform-3d/reftest.list
@@ -11,7 +11,7 @@
== rotatex-perspective-1c.html rotatex-1-ref.html
== rotatex-perspective-3a.html rotatex-perspective-3-ref.html
== scalez-1a.html scalez-1-ref.html
-fuzzy-if(gtkWidget||winWidget,8,376) fuzzy-if(Android,8,441) fuzzy-if(cocoaWidget,17,4) fuzzy-if(skiaContent,16,286) == preserve3d-1a.html preserve3d-1-ref.html
+fuzzy-if(gtkWidget||winWidget,8,376) fuzzy-if(cocoaWidget,17,4) fuzzy-if(skiaContent,16,286) == preserve3d-1a.html preserve3d-1-ref.html
== preserve3d-1b.html about:blank
== preserve3d-clipped.html about:blank
== preserve3d-2a.html preserve3d-2-ref.html
@@ -20,7 +20,7 @@ fuzzy-if(gtkWidget||winWidget,8,376) fuzzy-if(Android,8,441) fuzzy-if(cocoaWidge
== preserve3d-2d.html preserve3d-2-ref.html
== preserve3d-3a.html preserve3d-3-ref.html
== preserve3d-4a.html about:blank
-fuzzy-if(gtkWidget,4,200) fuzzy-if(Android,4,300) fuzzy-if(winWidget&&!layersGPUAccelerated,2,100) fuzzy-if(skiaContent,16,100) == preserve3d-5a.html preserve3d-5-ref.html
+fuzzy-if(gtkWidget,4,200) fuzzy-if(winWidget&&!layersGPUAccelerated,2,100) fuzzy-if(skiaContent,16,100) == preserve3d-5a.html preserve3d-5-ref.html
== preserve3d-6a.html preserve3d-6-ref.html
== scale3d-z.html scalez-1-ref.html
fuzzy-if(winWidget,102,580) fuzzy-if(d2d,143,681) fuzzy-if(OSX>=1008,224,924) == scale3d-all.html scale3d-1-ref.html # subpixel AA
@@ -41,7 +41,7 @@ fuzzy-if(winWidget&&!layersGPUAccelerated,1,251) == backface-visibility-2.html b
== perspective-clipping-1.html perspective-clipping-1-ref.html
!= perspective-origin-1a.html rotatex-perspective-1a.html
== perspective-origin-1b.html perspective-origin-1a.html
-fuzzy(3,99) random-if(Android&&!browserIsRemote) == perspective-origin-2a.html perspective-origin-2-ref.html # subpixel AA, bug 732568
+fuzzy(3,99) == perspective-origin-2a.html perspective-origin-2-ref.html # subpixel AA, bug 732568
fuzzy-if(winWidget&&!layersGPUAccelerated,1,61) == perspective-origin-3a.html perspective-origin-3-ref.html
== perspective-origin-4a.html perspective-origin-4-ref.html
== perspective-zindex.html green-rect.html
@@ -68,7 +68,7 @@ fuzzy(3,99) fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&!layersGPUAccele
fuzzy(3,99) == animate-cube-degrees.html animate-cube-degrees-ref.html # subpixel AA
== animate-cube-degrees-zoom.html animate-cube-degrees-zoom-ref.html
!= animate-cube-degrees-ref.html animate-cube-degrees-zoom-ref.html
-fuzzy-if(gtkWidget,128,100) fuzzy-if(Android||OSX==1010||(gtkWidget&&layersGPUAccelerated),143,100) fuzzy-if(winWidget||OSX<1010,141,100) == preserves3d-nested.html preserves3d-nested-ref.html
+fuzzy-if(gtkWidget,128,100) fuzzy-if(OSX==1010||(gtkWidget&&layersGPUAccelerated),143,100) fuzzy-if(winWidget||OSX<1010,141,100) == preserves3d-nested.html preserves3d-nested-ref.html
fuzzy-if(cocoaWidget,128,9) == animate-preserve3d-parent.html animate-preserve3d-ref.html # intermittently fuzzy on Mac
fuzzy-if(cocoaWidget,128,9) == animate-preserve3d-child.html animate-preserve3d-ref.html # intermittently fuzzy on Mac
== animate-backface-hidden.html about:blank
diff --git a/layout/reftests/transform/reftest-stylo.list b/layout/reftests/transform/reftest-stylo.list
deleted file mode 100644
index 7ccbcba5f..000000000
--- a/layout/reftests/transform/reftest-stylo.list
+++ /dev/null
@@ -1,159 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# Transforms specifying singular matrices shouldn't display at all.
-# NOTE: Regressions might manifest themselves as reftest timeouts on
-# this test.
-== singular-1a.html singular-1a.html
-# Multiple transforms should act identically to nested divs.
-== compound-1a.html compound-1a.html
-== compound-1a.html compound-1a.html
-== dynamic-inherit-1.html dynamic-inherit-1.html
-== dynamic-addremove-1a.html dynamic-addremove-1a.html
-skip == dynamic-addremove-1b.html dynamic-addremove-1b.html
-== dynamic-addremove-1c.html dynamic-addremove-1c.html
-# translatex should act like position: relative
-skip-if(B2G||Mulet) == translatex-1a.html translatex-1a.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == translatex-1b.html translatex-1b.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == translatex-1c.html translatex-1c.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == translatex-1d.html translatex-1d.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == translatex-1e.html translatex-1e.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == translatex-1a.html translatex-1a.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-# translatey should act like position: relative
-== translatey-1a.html translatey-1a.html
-== translatey-1b.html translatey-1b.html
-== translatey-1c.html translatey-1c.html
-== translatey-1d.html translatey-1d.html
-== translatey-1e.html translatey-1e.html
-# matrices defined to be translations should act like position: relative
-skip-if(B2G||Mulet) == translatex-2.html translatex-2.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== translatey-2.html translatey-2.html
-# translate should act like position: relative
-skip-if(B2G||Mulet) == translate-1a.html translate-1a.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == translate-1b.html translate-1b.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == translate-1c.html translate-1c.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == translate-1d.html translate-1d.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == translate-1e.html translate-1e.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == translate-2a.html translate-2a.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-# rotate: Several rotations of the same object should be idempotent. These
-# tests are currently disabled because of subpixel (< 0.00001 gfx units)
-# rounding errors.
-random == rotate-1a.html rotate-1a.html
-random == rotate-1b.html rotate-1b.html
-random == rotate-1c.html rotate-1c.html
-random == rotate-1d.html rotate-1d.html
-random == rotate-1e.html rotate-1e.html
-random == rotate-1f.html rotate-1f.html
-# rotate: 90deg rotations should be indistinguishable from objects constructed
-# to look the same.
-== rotate-2a.html rotate-2a.html
-== rotate-2b.html rotate-2b.html
-# -transform-origin: We should NOT get the same images when using different
-# -transform-origins.
-== origin-1a.html origin-1a.html
-== origin-1b.html origin-1b.html
-# -transform-origin: We should get the same images when using equivalent
-# -transform-origins.
-== origin-2a.html origin-2a.html
-== origin-2b.html origin-2b.html
-== origin-2c.html origin-2c.html
-# "Translate" with percentages should be indistinguishable from translate with
-# equivalent values.
-== percent-1a.html percent-1a.html
-== percent-1b.html percent-1b.html
-fails fuzzy-if(skiaContent,1,80) == percent-1c.html percent-1c.html
-fails fuzzy-if(skiaContent,1,80) == percent-1d.html percent-1d.html
-fails fuzzy-if(skiaContent,1,80) == percent-1e.html percent-1e.html
-fails fuzzy-if(skiaContent,1,80) == percent-1f.html percent-1f.html
-fails fuzzy-if(skiaContent,1,80) == percent-1g.html percent-1g.html
-# Transformed elements are abs-pos and fixed-pos containing blocks.
-== abspos-1a.html abspos-1a.html
-== abspos-1b.html abspos-1b.html
-== abspos-1c.html abspos-1c.html
-== abspos-1d.html abspos-1d.html
-== abspos-1e.html abspos-1e.html
-== abspos-1f.html abspos-1f.html
-== abspos-1g.html abspos-1g.html
-# Origin can use "top" "right" etc.
-== origin-name-1a.html origin-name-1a.html
-== origin-name-1b.html origin-name-1b.html
-== origin-name-2a.html origin-name-2a.html
-== origin-name-2b.html origin-name-2b.html
-fails fuzzy-if(skiaContent,1,350) == origin-name-2c.html origin-name-2c.html
-== origin-name-3a.html origin-name-3a.html
-== origin-name-3b.html origin-name-3b.html
-# Snapping still applies after 90 degree rotations.
-skip == snapping-1.html snapping-1.html
-# SVG effects should work on transforms.
-== transform-svg-1a.xhtml transform-svg-1a.xhtml
-fuzzy-if(skiaContent,2,500) == transform-svg-2a.xhtml transform-svg-2a.xhtml
-== transform-svg-2a.xhtml transform-svg-2a.xhtml
-# skew should allow a mix of one and two parameters.
-== skew-1a.html skew-1a.html
-fails fuzzy-if(skiaContent,1,80) == skew-1b.html skew-1b.html
-skip == skew-2a.html skew-2a.html
-# matrix with values equal to other transforms should behave indistinguishably
-== matrix-1a.html matrix-1a.html
-== matrix-2a.html matrix-2a.html
-skip == matrix-3a.html matrix-3a.html
-== matrix-4a.html matrix-4a.html
-fails fuzzy-if(skiaContent,1,120) == matrix-5a.html matrix-5a.html
-fails fuzzy-if(skiaContent,1,110) == matrix-6a.html matrix-6a.html
-== matrix-7a.html matrix-7a.html
-# ensure matrix 3d does not break us - should do nothing
-== matrix3d-1.html matrix3d-1.html
-# Test that complex transform can be reversed
-skip-if(B2G||Mulet) fuzzy-if(skiaContent,2,5) == stresstest-1.html stresstest-1.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-# Test scale transforms
-== scalex-1.html scalex-1.html
-== scaley-1.html scaley-1.html
-== scale-1a.html scale-1a.html
-== scale-1b.html scale-1b.html
-== scale-percent-1.html scale-percent-1.html
-# Some simple checks that it obeys selector operations
-== descendant-1.html descendant-1.html
-== propagate-inherit-boolean.html propagate-inherit-boolean.html
-# Ensure you can't move outside an iframe
-== iframe-1.html iframe-1.html
-# Bugs
-== 601894-1.html 601894-1.html
-== 601894-2.html 601894-2.html
-== 830299-1.html 830299-1.html
-# Bug 722777
-== table-1a.html table-1a.html
-== table-1b.html table-1b.html
-== table-1c.html table-1c.html
-== table-2a.html table-2a.html
-== table-2b.html table-2b.html
-# Bug 722463
-== inline-1a.html inline-1a.html
-pref(svg.transform-box.enabled,true) == transform-box-svg-1a.svg transform-box-svg-1a.svg
-pref(svg.transform-box.enabled,true) == transform-box-svg-1b.svg transform-box-svg-1b.svg
-pref(svg.transform-box.enabled,true) == transform-box-svg-2a.svg transform-box-svg-2a.svg
-pref(svg.transform-box.enabled,true) == transform-box-svg-2b.svg transform-box-svg-2b.svg
-== transform-origin-svg-1a.svg transform-origin-svg-1a.svg
-== transform-origin-svg-1b.svg transform-origin-svg-1b.svg
-== transform-origin-svg-2a.svg transform-origin-svg-2a.svg
-== transform-origin-svg-2b.svg transform-origin-svg-2b.svg
-# Bug 1122526
-skip == animate-layer-scale-inherit-1.html animate-layer-scale-inherit-1.html
-skip == animate-layer-scale-inherit-2.html animate-layer-scale-inherit-2.html
-skip == animate-layer-scale-inherit-3.html animate-layer-scale-inherit-3.html
diff --git a/layout/reftests/unicode/reftest-stylo.list b/layout/reftests/unicode/reftest-stylo.list
deleted file mode 100644
index a61e29289..000000000
--- a/layout/reftests/unicode/reftest-stylo.list
+++ /dev/null
@@ -1,8 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== unicode-attribute-selector.html unicode-attribute-selector.html
-== unicode-element-selector.html unicode-element-selector.html
-== unicode-lang.html unicode-lang.html
-== unicode-media-query-media-type.html unicode-media-query-media-type.html
-== unicode-media-query-query.html unicode-media-query-query.html
-== unicode-pseudo-selector.html unicode-pseudo-selector.html
-== langattribute.html langattribute.html
diff --git a/layout/reftests/view-source/reftest-stylo.list b/layout/reftests/view-source/reftest-stylo.list
deleted file mode 100644
index 35c8a4463..000000000
--- a/layout/reftests/view-source/reftest-stylo.list
+++ /dev/null
@@ -1,3 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-random == view-source-image.html view-source-image.html
-# security checks prevent loading view-source:
diff --git a/layout/reftests/w3c-css/failures.list b/layout/reftests/w3c-css/failures.list
index 7999a7aeb..7fd6be846 100644
--- a/layout/reftests/w3c-css/failures.list
+++ b/layout/reftests/w3c-css/failures.list
@@ -64,7 +64,7 @@ fails css-multicol-1/multicol-count-002.xht
fails css-multicol-1/multicol-count-computed-001.xht
fails css-multicol-1/multicol-count-computed-002.xht
fails css-multicol-1/multicol-count-computed-003.xht
-fuzzy-if(winWidget||OSX||gtkWidget,112,861) fails-if(Android) css-multicol-1/multicol-count-computed-004.xht
+fuzzy-if(winWidget||OSX||gtkWidget,112,861) css-multicol-1/multicol-count-computed-004.xht
fails css-multicol-1/multicol-count-computed-005.xht
fails css-multicol-1/multicol-count-large-001.xht
fuzzy(255,132) css-multicol-1/multicol-count-large-002.xht
@@ -82,7 +82,7 @@ fuzzy(255,290) css-multicol-1/multicol-gap-001.xht
fuzzy(204,930) fuzzy-if(skiaContent,208,930) css-multicol-1/multicol-gap-002.xht
fuzzy(204,930) fuzzy-if(skiaContent,208,930) css-multicol-1/multicol-gap-003.xht
fuzzy(107,1823) css-multicol-1/multicol-gap-fraction-001.xht
-fuzzy-if(winWidget||OSX||gtkWidget,204,1048) fuzzy-if(skiaContent,208,1048) fails-if(Android) css-multicol-1/multicol-gap-large-001.xht
+fuzzy-if(winWidget||OSX||gtkWidget,204,1048) fuzzy-if(skiaContent,208,1048) css-multicol-1/multicol-gap-large-001.xht
fuzzy(225,920) css-multicol-1/multicol-gap-large-002.xht
fuzzy(204,930) fuzzy-if(skiaContent,208,930) css-multicol-1/multicol-gap-negative-001.xht
fails css-multicol-1/multicol-height-block-child-001.xht
diff --git a/layout/reftests/w3c-css/received/reftest-stylo.list b/layout/reftests/w3c-css/received/reftest-stylo.list
deleted file mode 100644
index 3c80dab8f..000000000
--- a/layout/reftests/w3c-css/received/reftest-stylo.list
+++ /dev/null
@@ -1,103 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# THIS FILE IS AUTOGENERATED BY import-tests.py
-# DO NOT EDIT!
-== css-conditional-3/at-media-whitespace-optional-001.html css-conditional-3/at-media-whitespace-optional-001.html
-== css-conditional-3/at-media-whitespace-optional-002.html css-conditional-3/at-media-whitespace-optional-002.html
-== css-conditional-3/at-supports-001.html css-conditional-3/at-supports-001.html
-== css-conditional-3/at-supports-002.html css-conditional-3/at-supports-002.html
-== css-conditional-3/at-supports-003.html css-conditional-3/at-supports-003.html
-== css-conditional-3/at-supports-004.html css-conditional-3/at-supports-004.html
-== css-conditional-3/at-supports-005.html css-conditional-3/at-supports-005.html
-== css-conditional-3/at-supports-006.html css-conditional-3/at-supports-006.html
-== css-conditional-3/at-supports-007.html css-conditional-3/at-supports-007.html
-== css-conditional-3/at-supports-008.html css-conditional-3/at-supports-008.html
-== css-conditional-3/at-supports-009.html css-conditional-3/at-supports-009.html
-== css-conditional-3/at-supports-010.html css-conditional-3/at-supports-010.html
-== css-conditional-3/at-supports-011.html css-conditional-3/at-supports-011.html
-== css-conditional-3/at-supports-012.html css-conditional-3/at-supports-012.html
-== css-conditional-3/at-supports-013.html css-conditional-3/at-supports-013.html
-== css-conditional-3/at-supports-014.html css-conditional-3/at-supports-014.html
-== css-conditional-3/at-supports-015.html css-conditional-3/at-supports-015.html
-== css-conditional-3/at-supports-016.html css-conditional-3/at-supports-016.html
-== css-conditional-3/at-supports-017.html css-conditional-3/at-supports-017.html
-== css-conditional-3/at-supports-018.html css-conditional-3/at-supports-018.html
-== css-conditional-3/at-supports-019.html css-conditional-3/at-supports-019.html
-== css-conditional-3/at-supports-020.html css-conditional-3/at-supports-020.html
-== css-conditional-3/at-supports-021.html css-conditional-3/at-supports-021.html
-== css-conditional-3/at-supports-022.html css-conditional-3/at-supports-022.html
-== css-conditional-3/at-supports-023.html css-conditional-3/at-supports-023.html
-== css-conditional-3/at-supports-024.html css-conditional-3/at-supports-024.html
-== css-conditional-3/at-supports-025.html css-conditional-3/at-supports-025.html
-== css-conditional-3/at-supports-026.html css-conditional-3/at-supports-026.html
-== css-conditional-3/at-supports-027.html css-conditional-3/at-supports-027.html
-== css-conditional-3/at-supports-028.html css-conditional-3/at-supports-028.html
-== css-conditional-3/at-supports-029.html css-conditional-3/at-supports-029.html
-== css-conditional-3/at-supports-030.html css-conditional-3/at-supports-030.html
-== css-conditional-3/at-supports-031.html css-conditional-3/at-supports-031.html
-== css-conditional-3/at-supports-032.html css-conditional-3/at-supports-032.html
-== css-conditional-3/at-supports-033.html css-conditional-3/at-supports-033.html
-== css-conditional-3/at-supports-034.html css-conditional-3/at-supports-034.html
-== css-conditional-3/at-supports-035.html css-conditional-3/at-supports-035.html
-== css-conditional-3/at-supports-036.html css-conditional-3/at-supports-036.html
-== css-conditional-3/at-supports-037.html css-conditional-3/at-supports-037.html
-== css-conditional-3/at-supports-038.html css-conditional-3/at-supports-038.html
-== css-conditional-3/at-supports-039.html css-conditional-3/at-supports-039.html
-== css-namespaces-3/prefix-001.xml css-namespaces-3/prefix-001.xml
-== css-namespaces-3/prefix-002.xml css-namespaces-3/prefix-002.xml
-== css-namespaces-3/prefix-003.xml css-namespaces-3/prefix-003.xml
-== css-namespaces-3/prefix-004.xml css-namespaces-3/prefix-004.xml
-== css-namespaces-3/prefix-005.xml css-namespaces-3/prefix-005.xml
-== css-namespaces-3/prefix-006.xml css-namespaces-3/prefix-006.xml
-== css-namespaces-3/scope-001.xml css-namespaces-3/scope-001.xml
-== css-namespaces-3/scope-002.xml css-namespaces-3/scope-002.xml
-== css-namespaces-3/syntax-001.xml css-namespaces-3/syntax-001.xml
-== css-namespaces-3/syntax-002.xml css-namespaces-3/syntax-002.xml
-== css-namespaces-3/syntax-003.xml css-namespaces-3/syntax-003.xml
-== css-namespaces-3/syntax-004.xml css-namespaces-3/syntax-004.xml
-== css-namespaces-3/syntax-005.xml css-namespaces-3/syntax-005.xml
-== css-namespaces-3/syntax-006.xml css-namespaces-3/syntax-006.xml
-== css-namespaces-3/syntax-007.xml css-namespaces-3/syntax-007.xml
-== css-namespaces-3/syntax-008.xml css-namespaces-3/syntax-008.xml
-== css-namespaces-3/syntax-009.xml css-namespaces-3/syntax-009.xml
-== css-namespaces-3/syntax-010.xml css-namespaces-3/syntax-010.xml
-== css-namespaces-3/syntax-011.xml css-namespaces-3/syntax-011.xml
-== css-namespaces-3/syntax-012.xml css-namespaces-3/syntax-012.xml
-== css-namespaces-3/syntax-013.xml css-namespaces-3/syntax-013.xml
-== css-namespaces-3/syntax-014.xml css-namespaces-3/syntax-014.xml
-== css-namespaces-3/syntax-015.xml css-namespaces-3/syntax-015.xml
-== css-values-3/attr-color-invalid-cast.html css-values-3/attr-color-invalid-cast.html
-== css-values-3/attr-color-invalid-fallback.html css-values-3/attr-color-invalid-fallback.html
-== css-values-3/attr-color-valid.html css-values-3/attr-color-valid.html
-== css-values-3/attr-invalid-type-001.html css-values-3/attr-invalid-type-001.html
-== css-values-3/attr-invalid-type-002.html css-values-3/attr-invalid-type-002.html
-== css-values-3/attr-invalid-type-003.html css-values-3/attr-invalid-type-003.html
-== css-values-3/attr-length-invalid-cast.html css-values-3/attr-length-invalid-cast.html
-== css-values-3/attr-length-invalid-fallback.html css-values-3/attr-length-invalid-fallback.html
-== css-values-3/attr-length-valid-zero-nofallback.html css-values-3/attr-length-valid-zero-nofallback.html
-== css-values-3/attr-length-valid-zero.html css-values-3/attr-length-valid-zero.html
-== css-values-3/attr-length-valid.html css-values-3/attr-length-valid.html
-== css-values-3/attr-px-invalid-cast.html css-values-3/attr-px-invalid-cast.html
-== css-values-3/attr-px-invalid-fallback.html css-values-3/attr-px-invalid-fallback.html
-== css-values-3/attr-px-valid.html css-values-3/attr-px-valid.html
-== css-values-3/calc-in-calc.html css-values-3/calc-in-calc.html
-skip == css-values-3/calc-in-media-queries-001.html css-values-3/calc-in-media-queries-001.html
-skip == css-values-3/calc-in-media-queries-002.html css-values-3/calc-in-media-queries-002.html
-== css-values-3/calc-invalid-range-clamping.html css-values-3/calc-invalid-range-clamping.html
-== css-values-3/calc-parenthesis-stack.html css-values-3/calc-parenthesis-stack.html
-fuzzy-if(OSX,40,6) == css-values-3/ch-unit-001.html css-values-3/ch-unit-001.html
-== css-values-3/initial-background-color.html css-values-3/initial-background-color.html
-== css-values-3/vh-calc-support-pct.html css-values-3/vh-calc-support-pct.html
-== css-values-3/vh-calc-support.html css-values-3/vh-calc-support.html
-== css-values-3/vh-em-inherit.html css-values-3/vh-em-inherit.html
-== css-values-3/vh-inherit.html css-values-3/vh-inherit.html
-== css-values-3/vh-interpolate-pct.html css-values-3/vh-interpolate-pct.html
-== css-values-3/vh-interpolate-px.html css-values-3/vh-interpolate-px.html
-== css-values-3/vh-interpolate-vh.html css-values-3/vh-interpolate-vh.html
-== css-values-3/vh-support-atviewport.html css-values-3/vh-support-atviewport.html
-== css-values-3/vh-support-margin.html css-values-3/vh-support-margin.html
-skip == css-values-3/vh-support-transform-origin.html css-values-3/vh-support-transform-origin.html
-skip == css-values-3/vh-support-transform-translate.html css-values-3/vh-support-transform-translate.html
-== css-values-3/vh-support.html css-values-3/vh-support.html
-== css-values-3/vh-zero-support.html css-values-3/vh-zero-support.html
-skip == css-values-3/vh_not_refreshing_on_chrome.html css-values-3/vh_not_refreshing_on_chrome.html
-skip == css-values-3/vh_not_refreshing_on_chrome_iframe.html css-values-3/vh_not_refreshing_on_chrome_iframe.html
diff --git a/layout/reftests/w3c-css/received/reftest.list b/layout/reftests/w3c-css/received/reftest.list
index 494ab4d12..43833a17f 100644
--- a/layout/reftests/w3c-css/received/reftest.list
+++ b/layout/reftests/w3c-css/received/reftest.list
@@ -70,7 +70,7 @@ fails HTTP(../../..) == css-multicol-1/multicol-count-002.xht css-multicol-1/mul
fails HTTP(../../..) == css-multicol-1/multicol-count-computed-001.xht css-multicol-1/multicol-count-computed-ref.xht
fails HTTP(../../..) == css-multicol-1/multicol-count-computed-002.xht css-multicol-1/multicol-count-computed-2-ref.xht
fails HTTP(../../..) == css-multicol-1/multicol-count-computed-003.xht css-multicol-1/multicol-count-computed-003-ref.xht
-fuzzy-if(winWidget||OSX||gtkWidget,112,861) fails-if(Android) HTTP(../../..) == css-multicol-1/multicol-count-computed-004.xht css-multicol-1/multicol-count-computed-004-ref.xht
+fuzzy-if(winWidget||OSX||gtkWidget,112,861) HTTP(../../..) == css-multicol-1/multicol-count-computed-004.xht css-multicol-1/multicol-count-computed-004-ref.xht
fails HTTP(../../..) == css-multicol-1/multicol-count-computed-005.xht css-multicol-1/multicol-count-computed-003-ref.xht
fails HTTP(../../..) == css-multicol-1/multicol-count-large-001.xht css-multicol-1/multicol-count-large-ref.xht
fuzzy(255,132) HTTP(../../..) == css-multicol-1/multicol-count-large-002.xht css-multicol-1/multicol-count-large-2-ref.xht
@@ -93,7 +93,7 @@ fuzzy(255,290) HTTP(../../..) == css-multicol-1/multicol-gap-001.xht css-multico
fuzzy(204,930) fuzzy-if(skiaContent,208,930) HTTP(../../..) == css-multicol-1/multicol-gap-002.xht css-multicol-1/multicol-gap-002-ref.xht
fuzzy(204,930) fuzzy-if(skiaContent,208,930) HTTP(../../..) == css-multicol-1/multicol-gap-003.xht css-multicol-1/multicol-gap-002-ref.xht
fuzzy(107,1823) HTTP(../../..) == css-multicol-1/multicol-gap-fraction-001.xht css-multicol-1/multicol-gap-fraction-001-ref.xht
-fuzzy-if(winWidget||OSX||gtkWidget,204,1048) fuzzy-if(skiaContent,208,1048) fails-if(Android) HTTP(../../..) == css-multicol-1/multicol-gap-large-001.xht css-multicol-1/multicol-gap-large-001-ref.xht
+fuzzy-if(winWidget||OSX||gtkWidget,204,1048) fuzzy-if(skiaContent,208,1048) HTTP(../../..) == css-multicol-1/multicol-gap-large-001.xht css-multicol-1/multicol-gap-large-001-ref.xht
fuzzy(225,920) HTTP(../../..) == css-multicol-1/multicol-gap-large-002.xht css-multicol-1/multicol-gap-large-002-ref.xht
fuzzy(204,930) fuzzy-if(skiaContent,208,930) HTTP(../../..) == css-multicol-1/multicol-gap-negative-001.xht css-multicol-1/multicol-gap-002-ref.xht
HTTP(../../..) == css-multicol-1/multicol-height-001.xht css-multicol-1/multicol-height-001-ref.xht
diff --git a/layout/reftests/w3c-css/submitted/background/reftest-stylo.list b/layout/reftests/w3c-css/submitted/background/reftest-stylo.list
deleted file mode 100644
index 5e15898af..000000000
--- a/layout/reftests/w3c-css/submitted/background/reftest-stylo.list
+++ /dev/null
@@ -1,35 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# background-repeat round/space test cases
-== background-repeat-space-1a.html background-repeat-space-1a.html
-== background-repeat-space-1b.html background-repeat-space-1b.html
-== background-repeat-space-1c.html background-repeat-space-1c.html
-== background-repeat-space-2.html background-repeat-space-2.html
-== background-repeat-space-3.html background-repeat-space-3.html
-== background-repeat-space-4.html background-repeat-space-4.html
-== background-repeat-space-5.html background-repeat-space-5.html
-== background-repeat-space-6.html background-repeat-space-6.html
-== background-repeat-space-7.html background-repeat-space-7.html
-== background-repeat-space-8.html background-repeat-space-8.html
-== background-repeat-space-9.html background-repeat-space-9.html
-== background-repeat-space-10.html background-repeat-space-10.html
-== background-repeat-round-1a.html background-repeat-round-1a.html
-== background-repeat-round-1b.html background-repeat-round-1b.html
-== background-repeat-round-1c.html background-repeat-round-1c.html
-== background-repeat-round-1d.html background-repeat-round-1d.html
-== background-repeat-round-1e.html background-repeat-round-1e.html
-== background-repeat-round-2.html background-repeat-round-2.html
-== background-repeat-round-3.html background-repeat-round-3.html
-== background-repeat-round-4.html background-repeat-round-4.html
-
-#border-image test cases
-== border-image-repeat-round-1.html border-image-repeat-round-1.html
-== border-image-repeat-round-2.html border-image-repeat-round-2.html
-== border-image-repeat-space-1.html border-image-repeat-space-1.html
-== border-image-repeat-space-2.html border-image-repeat-space-2.html
-== border-image-repeat-space-3.html border-image-repeat-space-3.html
-== border-image-repeat-space-4.html border-image-repeat-space-4.html
-== border-image-repeat-space-4.html border-image-repeat-space-4.html
-== border-image-repeat-space-5.html border-image-repeat-space-5.html
-== border-image-repeat-space-5.html border-image-repeat-space-5.html
-== border-image-repeat-space-6.html border-image-repeat-space-6.html
-== border-image-repeat-space-7.html border-image-repeat-space-7.html
diff --git a/layout/reftests/w3c-css/submitted/color4/reftest-stylo.list b/layout/reftests/w3c-css/submitted/color4/reftest-stylo.list
deleted file mode 100644
index 6299bfb24..000000000
--- a/layout/reftests/w3c-css/submitted/color4/reftest-stylo.list
+++ /dev/null
@@ -1,15 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-
-# This file was created in bug 1295456. Pretty sure they all fail with Stylo
-# since it doesn't implement css-color-4 yet.
-
-#css-color-4 function
-#hsl
-fails == background-color-hsl-001.html background-color-hsl-001-ref.html
-fails == background-color-hsl-002.html background-color-hsl-002-ref.html
-fails == background-color-hsl-003.html background-color-hsl-003-ref.html
-fails == background-color-hsl-004.html background-color-hsl-004-ref.html
-#rgb
-fails == background-color-rgb-001.html background-color-rgb-001-ref.html
-fails == background-color-rgb-002.html background-color-rgb-002-ref.html
-fails == background-color-rgb-003.html background-color-rgb-003-ref.html
diff --git a/layout/reftests/w3c-css/submitted/conditional3/reftest-stylo.list b/layout/reftests/w3c-css/submitted/conditional3/reftest-stylo.list
deleted file mode 100644
index b357a920f..000000000
--- a/layout/reftests/w3c-css/submitted/conditional3/reftest-stylo.list
+++ /dev/null
@@ -1,47 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== css-supports-001.xht css-supports-001.xht
-== css-supports-002.xht css-supports-002.xht
-== css-supports-003.xht css-supports-003.xht
-== css-supports-004.xht css-supports-004.xht
-== css-supports-005.xht css-supports-005.xht
-== css-supports-006.xht css-supports-006.xht
-== css-supports-007.xht css-supports-007.xht
-== css-supports-008.xht css-supports-008.xht
-== css-supports-009.xht css-supports-009.xht
-== css-supports-010.xht css-supports-010.xht
-== css-supports-011.xht css-supports-011.xht
-== css-supports-012.xht css-supports-012.xht
-== css-supports-013.xht css-supports-013.xht
-== css-supports-014.xht css-supports-014.xht
-== css-supports-015.xht css-supports-015.xht
-== css-supports-016.xht css-supports-016.xht
-== css-supports-017.xht css-supports-017.xht
-== css-supports-018.xht css-supports-018.xht
-== css-supports-019.xht css-supports-019.xht
-== css-supports-020.xht css-supports-020.xht
-== css-supports-021.xht css-supports-021.xht
-== css-supports-022.xht css-supports-022.xht
-== css-supports-023.xht css-supports-023.xht
-== css-supports-024.xht css-supports-024.xht
-== css-supports-025.xht css-supports-025.xht
-== css-supports-026.xht css-supports-026.xht
-== css-supports-027.xht css-supports-027.xht
-== css-supports-028.xht css-supports-028.xht
-== css-supports-029.xht css-supports-029.xht
-== css-supports-030.xht css-supports-030.xht
-== css-supports-031.xht css-supports-031.xht
-== css-supports-032.xht css-supports-032.xht
-== css-supports-033.xht css-supports-033.xht
-== css-supports-034.xht css-supports-034.xht
-== css-supports-035.xht css-supports-035.xht
-== css-supports-036.xht css-supports-036.xht
-== css-supports-037.xht css-supports-037.xht
-== css-supports-038.xht css-supports-038.xht
-== css-supports-039.xht css-supports-039.xht
-== css-supports-040.xht css-supports-040.xht
-== css-supports-041.xht css-supports-041.xht
-== css-supports-042.xht css-supports-042.xht
-skip == css-supports-043.xht css-supports-043.xht
-== css-supports-044.xht css-supports-044.xht
-== css-supports-045.xht css-supports-045.xht
-== css-supports-046.xht css-supports-046.xht
diff --git a/layout/reftests/w3c-css/submitted/contain/reftest-stylo.list b/layout/reftests/w3c-css/submitted/contain/reftest-stylo.list
deleted file mode 100644
index 3e54d34d8..000000000
--- a/layout/reftests/w3c-css/submitted/contain/reftest-stylo.list
+++ /dev/null
@@ -1,12 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-default-preferences pref(layout.css.contain.enabled,true)
-
-== contain-paint-clip-001.html contain-paint-clip-001.html
-== contain-paint-clip-002.html contain-paint-clip-002.html
-== contain-paint-clip-003.html contain-paint-clip-003.html
-== contain-paint-clip-004.html contain-paint-clip-004.html
-random == contain-paint-clip-005.html contain-paint-clip-005.html
-== contain-paint-containing-block-absolute-001.html contain-paint-containing-block-absolute-001.html
-== contain-paint-containing-block-fixed-001.html contain-paint-containing-block-fixed-001.html
-== contain-paint-formatting-context-float-001.html contain-paint-formatting-context-float-001.html
-== contain-paint-formatting-context-margin-001.html contain-paint-formatting-context-margin-001.html
diff --git a/layout/reftests/w3c-css/submitted/css21/pagination/reftest-stylo.list b/layout/reftests/w3c-css/submitted/css21/pagination/reftest-stylo.list
deleted file mode 100644
index fd092b6fb..000000000
--- a/layout/reftests/w3c-css/submitted/css21/pagination/reftest-stylo.list
+++ /dev/null
@@ -1,46 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== moz-css21-block-page-break-inside-avoid-1.html moz-css21-block-page-break-inside-avoid-1.html
-== moz-css21-block-page-break-inside-avoid-2.html moz-css21-block-page-break-inside-avoid-2.html
-== moz-css21-block-page-break-inside-avoid-3.html moz-css21-block-page-break-inside-avoid-3.html
-== moz-css21-block-page-break-inside-avoid-4.html moz-css21-block-page-break-inside-avoid-4.html
-== moz-css21-block-page-break-inside-avoid-5.html moz-css21-block-page-break-inside-avoid-5.html
-== moz-css21-block-page-break-inside-avoid-6.html moz-css21-block-page-break-inside-avoid-6.html
-skip == moz-css21-block-page-break-inside-avoid-7.html moz-css21-block-page-break-inside-avoid-7.html
-== moz-css21-block-page-break-inside-avoid-8.html moz-css21-block-page-break-inside-avoid-8.html
-== moz-css21-block-page-break-inside-avoid-9.html moz-css21-block-page-break-inside-avoid-9.html
-== moz-css21-block-page-break-inside-avoid-10.html moz-css21-block-page-break-inside-avoid-10.html
-== moz-css21-block-page-break-inside-avoid-11.html moz-css21-block-page-break-inside-avoid-11.html
-== moz-css21-block-page-break-inside-avoid-12.html moz-css21-block-page-break-inside-avoid-12.html
-== moz-css21-block-page-break-inside-avoid-13.html moz-css21-block-page-break-inside-avoid-13.html
-== moz-css21-block-page-break-inside-avoid-14.html moz-css21-block-page-break-inside-avoid-14.html
-== moz-css21-block-page-break-inside-avoid-15.html moz-css21-block-page-break-inside-avoid-15.html
-== moz-css21-table-page-break-inside-avoid-1.html moz-css21-table-page-break-inside-avoid-1.html
-== moz-css21-table-page-break-inside-avoid-2.html moz-css21-table-page-break-inside-avoid-2.html
-== moz-css21-table-page-break-inside-avoid-3.html moz-css21-table-page-break-inside-avoid-3.html
-== moz-css21-table-page-break-inside-avoid-4.html moz-css21-table-page-break-inside-avoid-4.html
-== moz-css21-table-page-break-inside-avoid-5.html moz-css21-table-page-break-inside-avoid-5.html
-== moz-css21-table-page-break-inside-avoid-6.html moz-css21-table-page-break-inside-avoid-6.html
-== moz-css21-table-page-break-inside-avoid-7.html moz-css21-table-page-break-inside-avoid-7.html
-== moz-css21-table-page-break-inside-avoid-8.html moz-css21-table-page-break-inside-avoid-8.html
-== moz-css21-float-page-break-inside-avoid-1.html moz-css21-float-page-break-inside-avoid-1.html
-fails-if(B2G||Mulet) == moz-css21-float-page-break-inside-avoid-2.html moz-css21-float-page-break-inside-avoid-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== moz-css21-float-page-break-inside-avoid-3.html moz-css21-float-page-break-inside-avoid-3.html
-skip == moz-css21-float-page-break-inside-avoid-4.html moz-css21-float-page-break-inside-avoid-4.html
-== moz-css21-float-page-break-inside-avoid-5.html moz-css21-float-page-break-inside-avoid-5.html
-== moz-css21-float-page-break-inside-avoid-6.html moz-css21-float-page-break-inside-avoid-6.html
-== moz-css21-float-page-break-inside-avoid-7.html moz-css21-float-page-break-inside-avoid-7.html
-fails-if(B2G||Mulet) == moz-css21-float-page-break-inside-avoid-8.html moz-css21-float-page-break-inside-avoid-8.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== moz-css21-float-page-break-inside-avoid-9.html moz-css21-float-page-break-inside-avoid-9.html
-== moz-css21-rowgroup-page-break-inside-avoid-1.html moz-css21-rowgroup-page-break-inside-avoid-1.html
-== moz-css21-rowgroup-page-break-inside-avoid-2.html moz-css21-rowgroup-page-break-inside-avoid-2.html
-== moz-css21-rowgroup-page-break-inside-avoid-3.html moz-css21-rowgroup-page-break-inside-avoid-3.html
-== moz-css21-rowgroup-page-break-inside-avoid-4.html moz-css21-rowgroup-page-break-inside-avoid-4.html
-== moz-css21-rowgroup-page-break-inside-avoid-5.html moz-css21-rowgroup-page-break-inside-avoid-5.html
-== moz-css21-rowgroup-page-break-inside-avoid-6.html moz-css21-rowgroup-page-break-inside-avoid-6.html
-== moz-css21-rowgroup-page-break-inside-avoid-7.html moz-css21-rowgroup-page-break-inside-avoid-7.html
-== moz-css21-rowgroup-page-break-inside-avoid-8.html moz-css21-rowgroup-page-break-inside-avoid-8.html
-== moz-css21-row-page-break-inside-avoid-1.html moz-css21-row-page-break-inside-avoid-1.html
-== moz-css21-row-page-break-inside-avoid-2.html moz-css21-row-page-break-inside-avoid-2.html
-== moz-css21-inline-page-break-inside-avoid-1.html moz-css21-inline-page-break-inside-avoid-1.html
diff --git a/layout/reftests/w3c-css/submitted/css21/reftest-stylo.list b/layout/reftests/w3c-css/submitted/css21/reftest-stylo.list
deleted file mode 100644
index fea521a7a..000000000
--- a/layout/reftests/w3c-css/submitted/css21/reftest-stylo.list
+++ /dev/null
@@ -1,3 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-include pagination/reftest-stylo.list
-include replaced-sizing/reftest-stylo.list
diff --git a/layout/reftests/w3c-css/submitted/css21/replaced-sizing/reftest-stylo.list b/layout/reftests/w3c-css/submitted/css21/replaced-sizing/reftest-stylo.list
deleted file mode 100644
index 54aaed9a7..000000000
--- a/layout/reftests/w3c-css/submitted/css21/replaced-sizing/reftest-stylo.list
+++ /dev/null
@@ -1,10 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== replaced-elements-all-auto.html replaced-elements-all-auto.html
-== replaced-elements-height-20.html replaced-elements-height-20.html
-== replaced-elements-width-40.html replaced-elements-width-40.html
-== replaced-elements-min-height-20.html replaced-elements-min-height-20.html
-== replaced-elements-min-width-40.html replaced-elements-min-width-40.html
-== replaced-elements-min-height-40.html replaced-elements-min-height-40.html
-== replaced-elements-min-width-80.html replaced-elements-min-width-80.html
-== replaced-elements-max-height-20.html replaced-elements-max-height-20.html
-== replaced-elements-max-width-40.html replaced-elements-max-width-40.html
diff --git a/layout/reftests/w3c-css/submitted/filters/reftest-stylo.list b/layout/reftests/w3c-css/submitted/filters/reftest-stylo.list
deleted file mode 100644
index bf1f7926c..000000000
--- a/layout/reftests/w3c-css/submitted/filters/reftest-stylo.list
+++ /dev/null
@@ -1,3 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== filter-containing-block-dynamic-1a.html filter-containing-block-dynamic-1a.html
-== filter-containing-block-dynamic-1b.html filter-containing-block-dynamic-1b.html
diff --git a/layout/reftests/w3c-css/submitted/flexbox/reftest-stylo.list b/layout/reftests/w3c-css/submitted/flexbox/reftest-stylo.list
deleted file mode 100644
index 41635050d..000000000
--- a/layout/reftests/w3c-css/submitted/flexbox/reftest-stylo.list
+++ /dev/null
@@ -1,206 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# Tests for absolutely-positioned children of a flex container
-== flexbox-abspos-child-001a.html flexbox-abspos-child-001a.html
-== flexbox-abspos-child-001b.html flexbox-abspos-child-001b.html
-
-# Tests for handling anonymous flex items
-== flexbox-anonymous-items-001.html flexbox-anonymous-items-001.html
-
-# Tests for alignment of flex lines (align-content property)
-== flexbox-align-content-horiz-001a.xhtml flexbox-align-content-horiz-001a.xhtml
-== flexbox-align-content-horiz-001b.xhtml flexbox-align-content-horiz-001b.xhtml
-== flexbox-align-content-vert-001a.xhtml flexbox-align-content-vert-001a.xhtml
-== flexbox-align-content-vert-001b.xhtml flexbox-align-content-vert-001b.xhtml
-
-# Tests for cross-axis alignment (align-self / align-items properties)
-== flexbox-align-self-baseline-horiz-001a.xhtml flexbox-align-self-baseline-horiz-001a.xhtml
-== flexbox-align-self-baseline-horiz-001b.xhtml flexbox-align-self-baseline-horiz-001b.xhtml
-== flexbox-align-self-baseline-horiz-002.xhtml flexbox-align-self-baseline-horiz-002.xhtml
-== flexbox-align-self-baseline-horiz-003.xhtml flexbox-align-self-baseline-horiz-003.xhtml
-== flexbox-align-self-baseline-horiz-004.xhtml flexbox-align-self-baseline-horiz-004.xhtml
-== flexbox-align-self-baseline-horiz-005.xhtml flexbox-align-self-baseline-horiz-005.xhtml
-
-== flexbox-align-self-stretch-vert-001.html flexbox-align-self-stretch-vert-001.html
-== flexbox-align-self-stretch-vert-002.html flexbox-align-self-stretch-vert-002.html
-
-== flexbox-align-self-horiz-001-block.xhtml flexbox-align-self-horiz-001-block.xhtml
-== flexbox-align-self-horiz-001-table.xhtml flexbox-align-self-horiz-001-table.xhtml
-random == flexbox-align-self-horiz-002.xhtml flexbox-align-self-horiz-002.xhtml
-== flexbox-align-self-horiz-003.xhtml flexbox-align-self-horiz-003.xhtml
-== flexbox-align-self-horiz-004.xhtml flexbox-align-self-horiz-004.xhtml
-== flexbox-align-self-horiz-005.xhtml flexbox-align-self-horiz-005.xhtml
-== flexbox-align-self-vert-001.xhtml flexbox-align-self-vert-001.xhtml
-== flexbox-align-self-vert-002.xhtml flexbox-align-self-vert-002.xhtml
-== flexbox-align-self-vert-003.xhtml flexbox-align-self-vert-003.xhtml
-== flexbox-align-self-vert-004.xhtml flexbox-align-self-vert-004.xhtml
-fuzzy-if(Android,158,32) == flexbox-align-self-vert-rtl-001.xhtml flexbox-align-self-vert-rtl-001.xhtml
-== flexbox-align-self-vert-rtl-002.xhtml flexbox-align-self-vert-rtl-002.xhtml
-== flexbox-align-self-vert-rtl-003.xhtml flexbox-align-self-vert-rtl-003.xhtml
-== flexbox-align-self-vert-rtl-004.xhtml flexbox-align-self-vert-rtl-004.xhtml
-
-# Tests for computing the baseline of a flex container
-== flexbox-baseline-align-self-baseline-horiz-001.html flexbox-baseline-align-self-baseline-horiz-001.html
-== flexbox-baseline-align-self-baseline-vert-001.html flexbox-baseline-align-self-baseline-vert-001.html
-== flexbox-baseline-empty-001a.html flexbox-baseline-empty-001a.html
-== flexbox-baseline-empty-001b.html flexbox-baseline-empty-001b.html
-== flexbox-baseline-multi-item-horiz-001.html flexbox-baseline-multi-item-horiz-001.html
-== flexbox-baseline-multi-item-vert-001.html flexbox-baseline-multi-item-vert-001.html
-== flexbox-baseline-multi-line-horiz-001.html flexbox-baseline-multi-line-horiz-001.html
-== flexbox-baseline-multi-line-horiz-002.html flexbox-baseline-multi-line-horiz-002.html
-== flexbox-baseline-multi-line-horiz-003.html flexbox-baseline-multi-line-horiz-003.html
-== flexbox-baseline-multi-line-horiz-004.html flexbox-baseline-multi-line-horiz-004.html
-== flexbox-baseline-multi-line-vert-001.html flexbox-baseline-multi-line-vert-001.html
-== flexbox-baseline-multi-line-vert-002.html flexbox-baseline-multi-line-vert-002.html
-== flexbox-baseline-single-item-001a.html flexbox-baseline-single-item-001a.html
-== flexbox-baseline-single-item-001b.html flexbox-baseline-single-item-001b.html
-
-# Basic tests with with blocks as flex items
-== flexbox-basic-block-horiz-001.xhtml flexbox-basic-block-horiz-001.xhtml
-== flexbox-basic-block-vert-001.xhtml flexbox-basic-block-vert-001.xhtml
-
-# Tests for basic handling of <canvas>/<img>/etc as a flex item
-== flexbox-basic-canvas-horiz-001.xhtml flexbox-basic-canvas-horiz-001.xhtml
-== flexbox-basic-canvas-vert-001.xhtml flexbox-basic-canvas-vert-001.xhtml
-== flexbox-basic-fieldset-horiz-001.xhtml flexbox-basic-fieldset-horiz-001.xhtml
-== flexbox-basic-fieldset-vert-001.xhtml flexbox-basic-fieldset-vert-001.xhtml
-== flexbox-basic-iframe-horiz-001.xhtml flexbox-basic-iframe-horiz-001.xhtml
-== flexbox-basic-iframe-vert-001.xhtml flexbox-basic-iframe-vert-001.xhtml
-== flexbox-basic-img-horiz-001.xhtml flexbox-basic-img-horiz-001.xhtml
-== flexbox-basic-img-vert-001.xhtml flexbox-basic-img-vert-001.xhtml
-== flexbox-basic-textarea-horiz-001.xhtml flexbox-basic-textarea-horiz-001.xhtml
-== flexbox-basic-textarea-vert-001.xhtml flexbox-basic-textarea-vert-001.xhtml
-== flexbox-basic-video-horiz-001.xhtml flexbox-basic-video-horiz-001.xhtml
-== flexbox-basic-video-vert-001.xhtml flexbox-basic-video-vert-001.xhtml
-
-# Tests for "page-break-before" / "page-break-after" on a flex item
-== flexbox-break-request-horiz-001a.html flexbox-break-request-horiz-001a.html
-== flexbox-break-request-horiz-001b.html flexbox-break-request-horiz-001b.html
-== flexbox-break-request-horiz-002a.html flexbox-break-request-horiz-002a.html
-== flexbox-break-request-horiz-002b.html flexbox-break-request-horiz-002b.html
-== flexbox-break-request-vert-001a.html flexbox-break-request-vert-001a.html
-== flexbox-break-request-vert-001b.html flexbox-break-request-vert-001b.html
-== flexbox-break-request-vert-002a.html flexbox-break-request-vert-002a.html
-== flexbox-break-request-vert-002b.html flexbox-break-request-vert-002b.html
-
-# Tests for flex items with "visibility:collapse"
-== flexbox-collapsed-item-baseline-001.html flexbox-collapsed-item-baseline-001.html
-== flexbox-collapsed-item-horiz-001.html flexbox-collapsed-item-horiz-001.html
-== flexbox-collapsed-item-horiz-002.html flexbox-collapsed-item-horiz-002.html
-== flexbox-collapsed-item-horiz-003.html flexbox-collapsed-item-horiz-003.html
-
-# Tests for flex-flow shorthand property
-== flexbox-flex-flow-001.html flexbox-flex-flow-001.html
-== flexbox-flex-flow-002.html flexbox-flex-flow-002.html
-
-# Tests for flex-wrap property
-== flexbox-flex-wrap-horiz-001.html flexbox-flex-wrap-horiz-001.html
-== flexbox-flex-wrap-horiz-002.html flexbox-flex-wrap-horiz-002.html
-== flexbox-flex-wrap-vert-001.html flexbox-flex-wrap-vert-001.html
-== flexbox-flex-wrap-vert-002.html flexbox-flex-wrap-vert-002.html
-
-# Tests for intrinsic ratio interactions on flex items.
-# (Note that tests 001 and 002 share a reference case; they render the same,
-# because they don't do any direction-specific stretching/flexing.)
-== flexbox-intrinsic-ratio-001.html flexbox-intrinsic-ratio-001.html
-== flexbox-intrinsic-ratio-002.html flexbox-intrinsic-ratio-002.html
-== flexbox-intrinsic-ratio-003.html flexbox-intrinsic-ratio-003.html
-== flexbox-intrinsic-ratio-004.html flexbox-intrinsic-ratio-004.html
-== flexbox-intrinsic-ratio-005.html flexbox-intrinsic-ratio-005.html
-== flexbox-intrinsic-ratio-006.html flexbox-intrinsic-ratio-006.html
-
-# Tests for flex items as (pseudo) stacking contexts
-== flexbox-items-as-stacking-contexts-001.xhtml flexbox-items-as-stacking-contexts-001.xhtml
-== flexbox-items-as-stacking-contexts-002.html flexbox-items-as-stacking-contexts-002.html
-== flexbox-items-as-stacking-contexts-003.html flexbox-items-as-stacking-contexts-003.html
-
-# Tests for main-axis alignment (jusify-content property)
-== flexbox-justify-content-horiz-001a.xhtml flexbox-justify-content-horiz-001a.xhtml
-== flexbox-justify-content-horiz-001b.xhtml flexbox-justify-content-horiz-001b.xhtml
-== flexbox-justify-content-horiz-002.xhtml flexbox-justify-content-horiz-002.xhtml
-== flexbox-justify-content-horiz-003.xhtml flexbox-justify-content-horiz-003.xhtml
-== flexbox-justify-content-horiz-004.xhtml flexbox-justify-content-horiz-004.xhtml
-== flexbox-justify-content-horiz-005.xhtml flexbox-justify-content-horiz-005.xhtml
-== flexbox-justify-content-vert-001a.xhtml flexbox-justify-content-vert-001a.xhtml
-== flexbox-justify-content-vert-001b.xhtml flexbox-justify-content-vert-001b.xhtml
-== flexbox-justify-content-vert-002.xhtml flexbox-justify-content-vert-002.xhtml
-== flexbox-justify-content-vert-003.xhtml flexbox-justify-content-vert-003.xhtml
-== flexbox-justify-content-vert-004.xhtml flexbox-justify-content-vert-004.xhtml
-== flexbox-justify-content-vert-005.xhtml flexbox-justify-content-vert-005.xhtml
-
-# Tests for flexbox with margin, border, and/or padding on flex items
-== flexbox-margin-auto-horiz-001.xhtml flexbox-margin-auto-horiz-001.xhtml
-== flexbox-margin-auto-horiz-002.xhtml flexbox-margin-auto-horiz-002.xhtml
-== flexbox-mbp-horiz-001.xhtml flexbox-mbp-horiz-001.xhtml
-== flexbox-mbp-horiz-001-reverse.xhtml flexbox-mbp-horiz-001-reverse.xhtml
-== flexbox-mbp-horiz-001-rtl.xhtml flexbox-mbp-horiz-001-rtl.xhtml
-== flexbox-mbp-horiz-001-rtl-reverse.xhtml flexbox-mbp-horiz-001-rtl-reverse.xhtml
-random == flexbox-mbp-horiz-002a.xhtml flexbox-mbp-horiz-002a.xhtml
-random == flexbox-mbp-horiz-002b.xhtml flexbox-mbp-horiz-002b.xhtml
-== flexbox-mbp-horiz-003.xhtml flexbox-mbp-horiz-003.xhtml
-== flexbox-mbp-horiz-003-reverse.xhtml flexbox-mbp-horiz-003-reverse.xhtml
-== flexbox-mbp-horiz-004.xhtml flexbox-mbp-horiz-004.xhtml
-
-# Tests for min-height:auto / min-width:auto on flex items
-== flexbox-min-height-auto-001.html flexbox-min-height-auto-001.html
-== flexbox-min-height-auto-002a.html flexbox-min-height-auto-002a.html
-== flexbox-min-height-auto-002b.html flexbox-min-height-auto-002b.html
-# bug 1055354
-== flexbox-min-height-auto-002c.html flexbox-min-height-auto-002c.html
-== flexbox-min-height-auto-003.html flexbox-min-height-auto-003.html
-== flexbox-min-height-auto-004.html flexbox-min-height-auto-004.html
-== flexbox-min-width-auto-001.html flexbox-min-width-auto-001.html
-== flexbox-min-width-auto-002a.html flexbox-min-width-auto-002a.html
-== flexbox-min-width-auto-002b.html flexbox-min-width-auto-002b.html
-== flexbox-min-width-auto-002c.html flexbox-min-width-auto-002c.html
-== flexbox-min-width-auto-003.html flexbox-min-width-auto-003.html
-== flexbox-min-width-auto-004.html flexbox-min-width-auto-004.html
-
-# Tests for flex containers with the "overflow" property set
-== flexbox-overflow-horiz-001.html flexbox-overflow-horiz-001.html
-== flexbox-overflow-horiz-002.html flexbox-overflow-horiz-002.html
-== flexbox-overflow-horiz-003.html flexbox-overflow-horiz-003.html
-== flexbox-overflow-horiz-004.html flexbox-overflow-horiz-004.html
-== flexbox-overflow-horiz-005.html flexbox-overflow-horiz-005.html
-== flexbox-overflow-vert-001.html flexbox-overflow-vert-001.html
-== flexbox-overflow-vert-002.html flexbox-overflow-vert-002.html
-== flexbox-overflow-vert-003.html flexbox-overflow-vert-003.html
-== flexbox-overflow-vert-004.html flexbox-overflow-vert-004.html
-== flexbox-overflow-vert-005.html flexbox-overflow-vert-005.html
-
-# Tests for the order in which we paint flex items
-== flexbox-paint-ordering-001.xhtml flexbox-paint-ordering-001.xhtml
-== flexbox-paint-ordering-002.xhtml flexbox-paint-ordering-002.xhtml
-
-# Tests for "display:flex" on root node
-== flexbox-root-node-001a.html flexbox-root-node-001a.html
-== flexbox-root-node-001b.html flexbox-root-node-001b.html
-
-# Tests for sizing of flex containers, e.g. under min/max size constraints
-== flexbox-sizing-horiz-001.xhtml flexbox-sizing-horiz-001.xhtml
-== flexbox-sizing-horiz-002.xhtml flexbox-sizing-horiz-002.xhtml
-== flexbox-sizing-vert-001.xhtml flexbox-sizing-vert-001.xhtml
-== flexbox-sizing-vert-002.xhtml flexbox-sizing-vert-002.xhtml
-
-# Tests for table-fixup *not happening* on direct children of a flex container
-== flexbox-table-fixup-001.xhtml flexbox-table-fixup-001.xhtml
-
-# Tests for handling of whitespace within anonymous flex items.
-== flexbox-whitespace-handling-001a.xhtml flexbox-whitespace-handling-001a.xhtml
-== flexbox-whitespace-handling-001b.xhtml flexbox-whitespace-handling-001b.xhtml
-== flexbox-whitespace-handling-002.xhtml flexbox-whitespace-handling-002.xhtml
-
-# Tests for flex containers with pseudo-elements
-== flexbox-with-pseudo-elements-001.html flexbox-with-pseudo-elements-001.html
-== flexbox-with-pseudo-elements-002.html flexbox-with-pseudo-elements-002.html
-== flexbox-with-pseudo-elements-003.html flexbox-with-pseudo-elements-003.html
-
-# Tests for combined influence of 'writing-mode' & 'direction' on flex axes
-== flexbox-writing-mode-001.html flexbox-writing-mode-001.html
-== flexbox-writing-mode-002.html flexbox-writing-mode-002.html
-== flexbox-writing-mode-003.html flexbox-writing-mode-003.html
-== flexbox-writing-mode-004.html flexbox-writing-mode-004.html
-== flexbox-writing-mode-005.html flexbox-writing-mode-005.html
-== flexbox-writing-mode-006.html flexbox-writing-mode-006.html
-== flexbox-writing-mode-007.html flexbox-writing-mode-007.html
-== flexbox-writing-mode-008.html flexbox-writing-mode-008.html
-== flexbox-writing-mode-009.html flexbox-writing-mode-009.html
diff --git a/layout/reftests/w3c-css/submitted/flexbox/reftest.list b/layout/reftests/w3c-css/submitted/flexbox/reftest.list
index 3df75aee6..281ef4758 100644
--- a/layout/reftests/w3c-css/submitted/flexbox/reftest.list
+++ b/layout/reftests/w3c-css/submitted/flexbox/reftest.list
@@ -34,7 +34,7 @@
== flexbox-align-self-vert-002.xhtml flexbox-align-self-vert-002-ref.xhtml
== flexbox-align-self-vert-003.xhtml flexbox-align-self-vert-003-ref.xhtml
== flexbox-align-self-vert-004.xhtml flexbox-align-self-vert-004-ref.xhtml
-fuzzy-if(Android,158,32) == flexbox-align-self-vert-rtl-001.xhtml flexbox-align-self-vert-rtl-001-ref.xhtml
+== flexbox-align-self-vert-rtl-001.xhtml flexbox-align-self-vert-rtl-001-ref.xhtml
== flexbox-align-self-vert-rtl-002.xhtml flexbox-align-self-vert-rtl-002-ref.xhtml
== flexbox-align-self-vert-rtl-003.xhtml flexbox-align-self-vert-rtl-003-ref.xhtml
== flexbox-align-self-vert-rtl-004.xhtml flexbox-align-self-vert-rtl-004-ref.xhtml
diff --git a/layout/reftests/w3c-css/submitted/fonts3/reftest-stylo.list b/layout/reftests/w3c-css/submitted/fonts3/reftest-stylo.list
deleted file mode 100644
index c8224dcab..000000000
--- a/layout/reftests/w3c-css/submitted/fonts3/reftest-stylo.list
+++ /dev/null
@@ -1,6 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== font-size-zero-1.html font-size-zero-1.html
-== font-size-zero-1-ref.html font-size-zero-1-ref.html
-== font-size-zero-2.html font-size-zero-2.html
-== font-size-adjust-zero-1.html font-size-adjust-zero-1.html
-== font-size-adjust-zero-2.html font-size-adjust-zero-2.html
diff --git a/layout/reftests/w3c-css/submitted/images3/reftest-stylo.list b/layout/reftests/w3c-css/submitted/images3/reftest-stylo.list
deleted file mode 100644
index 5dd182187..000000000
--- a/layout/reftests/w3c-css/submitted/images3/reftest-stylo.list
+++ /dev/null
@@ -1,209 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-default-preferences test-pref(layout.css.object-fit-and-position.enabled,true)
-# Tests for 'object-fit' / 'object-position' with a PNG image
-== object-fit-fill-png-001c.html object-fit-fill-png-001c.html
-fails == object-fit-fill-png-001e.html object-fit-fill-png-001e.html
-== object-fit-fill-png-001i.html object-fit-fill-png-001i.html
-fails == object-fit-fill-png-001o.html object-fit-fill-png-001o.html
-== object-fit-fill-png-001p.html object-fit-fill-png-001p.html
-== object-fit-fill-png-002c.html object-fit-fill-png-002c.html
-fails == object-fit-fill-png-002e.html object-fit-fill-png-002e.html
-== object-fit-fill-png-002i.html object-fit-fill-png-002i.html
-fails == object-fit-fill-png-002o.html object-fit-fill-png-002o.html
-== object-fit-fill-png-002p.html object-fit-fill-png-002p.html
-== object-fit-contain-png-001c.html object-fit-contain-png-001c.html
-fails == object-fit-contain-png-001e.html object-fit-contain-png-001e.html
-== object-fit-contain-png-001i.html object-fit-contain-png-001i.html
-fails == object-fit-contain-png-001o.html object-fit-contain-png-001o.html
-== object-fit-contain-png-001p.html object-fit-contain-png-001p.html
-== object-fit-contain-png-002c.html object-fit-contain-png-002c.html
-fails == object-fit-contain-png-002e.html object-fit-contain-png-002e.html
-== object-fit-contain-png-002i.html object-fit-contain-png-002i.html
-fails == object-fit-contain-png-002o.html object-fit-contain-png-002o.html
-== object-fit-contain-png-002p.html object-fit-contain-png-002p.html
-== object-fit-cover-png-001c.html object-fit-cover-png-001c.html
-fails == object-fit-cover-png-001e.html object-fit-cover-png-001e.html
-== object-fit-cover-png-001i.html object-fit-cover-png-001i.html
-== object-fit-cover-png-001o.html object-fit-cover-png-001o.html
-== object-fit-cover-png-001p.html object-fit-cover-png-001p.html
-== object-fit-cover-png-002c.html object-fit-cover-png-002c.html
-fails == object-fit-cover-png-002e.html object-fit-cover-png-002e.html
-== object-fit-cover-png-002i.html object-fit-cover-png-002i.html
-fails == object-fit-cover-png-002o.html object-fit-cover-png-002o.html
-== object-fit-cover-png-002p.html object-fit-cover-png-002p.html
-skip == object-fit-none-png-001c.html object-fit-none-png-001c.html
-== object-fit-none-png-001e.html object-fit-none-png-001e.html
-== object-fit-none-png-001i.html object-fit-none-png-001i.html
-fails == object-fit-none-png-001o.html object-fit-none-png-001o.html
-== object-fit-none-png-001p.html object-fit-none-png-001p.html
-== object-fit-none-png-002c.html object-fit-none-png-002c.html
-fails == object-fit-none-png-002e.html object-fit-none-png-002e.html
-== object-fit-none-png-002i.html object-fit-none-png-002i.html
-fails == object-fit-none-png-002o.html object-fit-none-png-002o.html
-== object-fit-none-png-002p.html object-fit-none-png-002p.html
-== object-fit-scale-down-png-001c.html object-fit-scale-down-png-001c.html
-== object-fit-scale-down-png-001e.html object-fit-scale-down-png-001e.html
-== object-fit-scale-down-png-001i.html object-fit-scale-down-png-001i.html
-== object-fit-scale-down-png-001o.html object-fit-scale-down-png-001o.html
-== object-fit-scale-down-png-001p.html object-fit-scale-down-png-001p.html
-== object-fit-scale-down-png-002c.html object-fit-scale-down-png-002c.html
-fails == object-fit-scale-down-png-002e.html object-fit-scale-down-png-002e.html
-== object-fit-scale-down-png-002i.html object-fit-scale-down-png-002i.html
-fails == object-fit-scale-down-png-002o.html object-fit-scale-down-png-002o.html
-== object-fit-scale-down-png-002p.html object-fit-scale-down-png-002p.html
-
-# Tests for 'object-fit' / 'object-position' with an SVG image
-fails == object-fit-fill-svg-001e.html object-fit-fill-svg-001e.html
-== object-fit-fill-svg-001i.html object-fit-fill-svg-001i.html
-== object-fit-fill-svg-001o.html object-fit-fill-svg-001o.html
-== object-fit-fill-svg-001p.html object-fit-fill-svg-001p.html
-fails == object-fit-fill-svg-002e.html object-fit-fill-svg-002e.html
-== object-fit-fill-svg-002i.html object-fit-fill-svg-002i.html
-fails == object-fit-fill-svg-002o.html object-fit-fill-svg-002o.html
-== object-fit-fill-svg-002p.html object-fit-fill-svg-002p.html
-fails == object-fit-fill-svg-003e.html object-fit-fill-svg-003e.html
-== object-fit-fill-svg-003i.html object-fit-fill-svg-003i.html
-fails == object-fit-fill-svg-003o.html object-fit-fill-svg-003o.html
-== object-fit-fill-svg-003p.html object-fit-fill-svg-003p.html
-fails == object-fit-fill-svg-004e.html object-fit-fill-svg-004e.html
-== object-fit-fill-svg-004i.html object-fit-fill-svg-004i.html
-== object-fit-fill-svg-004o.html object-fit-fill-svg-004o.html
-== object-fit-fill-svg-004p.html object-fit-fill-svg-004p.html
-== object-fit-fill-svg-005e.html object-fit-fill-svg-005e.html
-# bug 1092436
-== object-fit-fill-svg-005i.html object-fit-fill-svg-005i.html
-# bug 1092436
-== object-fit-fill-svg-005o.html object-fit-fill-svg-005o.html
-# bug 1092436
-== object-fit-fill-svg-005p.html object-fit-fill-svg-005p.html
-# bug 1092436
-fails == object-fit-fill-svg-006e.html object-fit-fill-svg-006e.html
-# bug 1092436
-== object-fit-fill-svg-006i.html object-fit-fill-svg-006i.html
-# bug 1092436
-fails == object-fit-fill-svg-006o.html object-fit-fill-svg-006o.html
-# bug 1092436
-== object-fit-fill-svg-006p.html object-fit-fill-svg-006p.html
-# bug 1092436
-fails skip-if(B2G) == object-fit-contain-svg-001e.html object-fit-contain-svg-001e.html
-== object-fit-contain-svg-001i.html object-fit-contain-svg-001i.html
-fails skip-if(B2G) == object-fit-contain-svg-001o.html object-fit-contain-svg-001o.html
-== object-fit-contain-svg-001p.html object-fit-contain-svg-001p.html
-skip-if(B2G) == object-fit-contain-svg-002e.html object-fit-contain-svg-002e.html
-== object-fit-contain-svg-002i.html object-fit-contain-svg-002i.html
-skip-if(B2G) == object-fit-contain-svg-002o.html object-fit-contain-svg-002o.html
-== object-fit-contain-svg-002p.html object-fit-contain-svg-002p.html
-fails == object-fit-contain-svg-003e.html object-fit-contain-svg-003e.html
-== object-fit-contain-svg-003i.html object-fit-contain-svg-003i.html
-fails == object-fit-contain-svg-003o.html object-fit-contain-svg-003o.html
-== object-fit-contain-svg-003p.html object-fit-contain-svg-003p.html
-== object-fit-contain-svg-004e.html object-fit-contain-svg-004e.html
-== object-fit-contain-svg-004i.html object-fit-contain-svg-004i.html
-== object-fit-contain-svg-004o.html object-fit-contain-svg-004o.html
-== object-fit-contain-svg-004p.html object-fit-contain-svg-004p.html
-fails == object-fit-contain-svg-005e.html object-fit-contain-svg-005e.html
-== object-fit-contain-svg-005i.html object-fit-contain-svg-005i.html
-== object-fit-contain-svg-005o.html object-fit-contain-svg-005o.html
-== object-fit-contain-svg-005p.html object-fit-contain-svg-005p.html
-fails == object-fit-contain-svg-006e.html object-fit-contain-svg-006e.html
-== object-fit-contain-svg-006i.html object-fit-contain-svg-006i.html
-fails == object-fit-contain-svg-006o.html object-fit-contain-svg-006o.html
-== object-fit-contain-svg-006p.html object-fit-contain-svg-006p.html
-== object-fit-cover-svg-001e.html object-fit-cover-svg-001e.html
-== object-fit-cover-svg-001i.html object-fit-cover-svg-001i.html
-== object-fit-cover-svg-001o.html object-fit-cover-svg-001o.html
-== object-fit-cover-svg-001p.html object-fit-cover-svg-001p.html
-skip-if(B2G) == object-fit-cover-svg-002e.html object-fit-cover-svg-002e.html
-== object-fit-cover-svg-002i.html object-fit-cover-svg-002i.html
-fails skip-if(B2G) == object-fit-cover-svg-002o.html object-fit-cover-svg-002o.html
-== object-fit-cover-svg-002p.html object-fit-cover-svg-002p.html
-fails skip-if(B2G) == object-fit-cover-svg-003e.html object-fit-cover-svg-003e.html
-== object-fit-cover-svg-003i.html object-fit-cover-svg-003i.html
-fails skip-if(B2G) == object-fit-cover-svg-003o.html object-fit-cover-svg-003o.html
-== object-fit-cover-svg-003p.html object-fit-cover-svg-003p.html
-fails skip-if(B2G) == object-fit-cover-svg-004e.html object-fit-cover-svg-004e.html
-== object-fit-cover-svg-004i.html object-fit-cover-svg-004i.html
-skip-if(B2G) == object-fit-cover-svg-004o.html object-fit-cover-svg-004o.html
-== object-fit-cover-svg-004p.html object-fit-cover-svg-004p.html
-skip-if(B2G) == object-fit-cover-svg-005e.html object-fit-cover-svg-005e.html
-== object-fit-cover-svg-005i.html object-fit-cover-svg-005i.html
-fails skip-if(B2G) == object-fit-cover-svg-005o.html object-fit-cover-svg-005o.html
-== object-fit-cover-svg-005p.html object-fit-cover-svg-005p.html
-fails skip-if(B2G) == object-fit-cover-svg-006e.html object-fit-cover-svg-006e.html
-== object-fit-cover-svg-006i.html object-fit-cover-svg-006i.html
-fails skip-if(B2G) == object-fit-cover-svg-006o.html object-fit-cover-svg-006o.html
-== object-fit-cover-svg-006p.html object-fit-cover-svg-006p.html
-fails == object-fit-none-svg-001e.html object-fit-none-svg-001e.html
-== object-fit-none-svg-001i.html object-fit-none-svg-001i.html
-fails == object-fit-none-svg-001o.html object-fit-none-svg-001o.html
-== object-fit-none-svg-001p.html object-fit-none-svg-001p.html
-== object-fit-none-svg-002e.html object-fit-none-svg-002e.html
-== object-fit-none-svg-002i.html object-fit-none-svg-002i.html
-fails == object-fit-none-svg-002o.html object-fit-none-svg-002o.html
-== object-fit-none-svg-002p.html object-fit-none-svg-002p.html
-fails == object-fit-none-svg-003e.html object-fit-none-svg-003e.html
-== object-fit-none-svg-003i.html object-fit-none-svg-003i.html
-== object-fit-none-svg-003o.html object-fit-none-svg-003o.html
-== object-fit-none-svg-003p.html object-fit-none-svg-003p.html
-fails == object-fit-none-svg-004e.html object-fit-none-svg-004e.html
-== object-fit-none-svg-004i.html object-fit-none-svg-004i.html
-fails == object-fit-none-svg-004o.html object-fit-none-svg-004o.html
-== object-fit-none-svg-004p.html object-fit-none-svg-004p.html
-fails skip-if(B2G) == object-fit-none-svg-005e.html object-fit-none-svg-005e.html
-== object-fit-none-svg-005i.html object-fit-none-svg-005i.html
-fails skip-if(B2G) == object-fit-none-svg-005o.html object-fit-none-svg-005o.html
-== object-fit-none-svg-005p.html object-fit-none-svg-005p.html
-fails skip-if(B2G) == object-fit-none-svg-006e.html object-fit-none-svg-006e.html
-== object-fit-none-svg-006i.html object-fit-none-svg-006i.html
-fails skip-if(B2G) == object-fit-none-svg-006o.html object-fit-none-svg-006o.html
-== object-fit-none-svg-006p.html object-fit-none-svg-006p.html
-fails skip-if(B2G) == object-fit-scale-down-svg-001e.html object-fit-scale-down-svg-001e.html
-== object-fit-scale-down-svg-001i.html object-fit-scale-down-svg-001i.html
-fails skip-if(B2G) == object-fit-scale-down-svg-001o.html object-fit-scale-down-svg-001o.html
-== object-fit-scale-down-svg-001p.html object-fit-scale-down-svg-001p.html
-skip-if(B2G) == object-fit-scale-down-svg-002e.html object-fit-scale-down-svg-002e.html
-== object-fit-scale-down-svg-002i.html object-fit-scale-down-svg-002i.html
-fails skip-if(B2G) == object-fit-scale-down-svg-002o.html object-fit-scale-down-svg-002o.html
-== object-fit-scale-down-svg-002p.html object-fit-scale-down-svg-002p.html
-fails == object-fit-scale-down-svg-003e.html object-fit-scale-down-svg-003e.html
-== object-fit-scale-down-svg-003i.html object-fit-scale-down-svg-003i.html
-fails == object-fit-scale-down-svg-003o.html object-fit-scale-down-svg-003o.html
-== object-fit-scale-down-svg-003p.html object-fit-scale-down-svg-003p.html
-== object-fit-scale-down-svg-004e.html object-fit-scale-down-svg-004e.html
-== object-fit-scale-down-svg-004i.html object-fit-scale-down-svg-004i.html
-fails == object-fit-scale-down-svg-004o.html object-fit-scale-down-svg-004o.html
-== object-fit-scale-down-svg-004p.html object-fit-scale-down-svg-004p.html
-== object-fit-scale-down-svg-005e.html object-fit-scale-down-svg-005e.html
-== object-fit-scale-down-svg-005i.html object-fit-scale-down-svg-005i.html
-fails == object-fit-scale-down-svg-005o.html object-fit-scale-down-svg-005o.html
-== object-fit-scale-down-svg-005p.html object-fit-scale-down-svg-005p.html
-fails == object-fit-scale-down-svg-006e.html object-fit-scale-down-svg-006e.html
-== object-fit-scale-down-svg-006i.html object-fit-scale-down-svg-006i.html
-== object-fit-scale-down-svg-006o.html object-fit-scale-down-svg-006o.html
-== object-fit-scale-down-svg-006p.html object-fit-scale-down-svg-006p.html
-== object-position-png-001c.html object-position-png-001c.html
-# bug 1105150
-fuzzy-if(Mulet,2,20) == object-position-png-001e.html object-position-png-001e.html
-# Bug 1150536
-== object-position-png-001i.html object-position-png-001i.html
-fails fuzzy-if(Mulet,2,20) == object-position-png-001o.html object-position-png-001o.html
-# Bug 1150492
-== object-position-png-001p.html object-position-png-001p.html
-== object-position-png-002c.html object-position-png-002c.html
-# bug 1105150
-== object-position-png-002e.html object-position-png-002e.html
-== object-position-png-002i.html object-position-png-002i.html
-fails == object-position-png-002o.html object-position-png-002o.html
-== object-position-png-002p.html object-position-png-002p.html
-== object-position-svg-001e.html object-position-svg-001e.html
-# bug 1103286
-== object-position-svg-001i.html object-position-svg-001i.html
-fails == object-position-svg-001o.html object-position-svg-001o.html
-# bug 1103286
-== object-position-svg-001p.html object-position-svg-001p.html
-fails == object-position-svg-002e.html object-position-svg-002e.html
-# bug 1103286
-== object-position-svg-002i.html object-position-svg-002i.html
-== object-position-svg-002o.html object-position-svg-002o.html
-# bug 1103286
-== object-position-svg-002p.html object-position-svg-002p.html
diff --git a/layout/reftests/w3c-css/submitted/lists-3/reftest-stylo.list b/layout/reftests/w3c-css/submitted/lists-3/reftest-stylo.list
deleted file mode 100644
index 569a549e7..000000000
--- a/layout/reftests/w3c-css/submitted/lists-3/reftest-stylo.list
+++ /dev/null
@@ -1,4 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# Tests for list-style-type
-== list-style-type-string-001a.html list-style-type-string-001a.html
-== list-style-type-string-001b.html list-style-type-string-001b.html
diff --git a/layout/reftests/w3c-css/submitted/masking/reftest-stylo.list b/layout/reftests/w3c-css/submitted/masking/reftest-stylo.list
deleted file mode 100644
index bc897987e..000000000
--- a/layout/reftests/w3c-css/submitted/masking/reftest-stylo.list
+++ /dev/null
@@ -1,85 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# All mask properties test cases are meant to be failed
-# until bug 1251161 is fixed, which means enabling mask shorthand.
-# To enable it in compile time, refer to bug 1243734
-
-# mask-composite test cases
-== mask-composite-1a.html mask-composite-1a.html
-== mask-composite-1b.html mask-composite-1b.html
-== mask-composite-1c.html mask-composite-1c.html
-== mask-composite-2a.html mask-composite-2a.html
-== mask-composite-2b.html mask-composite-2b.html
-== mask-composite-2c.html mask-composite-2c.html
-
-# mask-mode test cases
-== mask-mode-a.html mask-mode-a.html
-== mask-mode-b.html mask-mode-b.html
-== mask-mode-to-mask-type.html mask-mode-to-mask-type.html
-
-# mask-image test cases
-== mask-image-1a.html mask-image-1a.html
-== mask-image-1b.html mask-image-1b.html
-== mask-image-1c.html mask-image-1c.html
-== mask-image-2.html mask-image-2.html
-== mask-image-3a.html mask-image-3a.html
-== mask-image-3b.html mask-image-3b.html
-== mask-image-3c.html mask-image-3c.html
-== mask-image-3d.html mask-image-3d.html
-== mask-image-3e.html mask-image-3e.html
-== mask-image-3f.html mask-image-3f.html
-== mask-image-3g.html mask-image-3g.html
-== mask-image-4a.html mask-image-4a.html
-== mask-image-4b.html mask-image-4b.html
-
-# mask-clip test cases
-== mask-clip-1.html mask-clip-1.html
-
-# mask-position test cases
-== mask-position-1a.html mask-position-1a.html
-== mask-position-1b.html mask-position-1b.html
-== mask-position-1c.html mask-position-1c.html
-== mask-position-2a.html mask-position-2a.html
-== mask-position-2b.html mask-position-2b.html
-== mask-position-3a.html mask-position-3a.html
-== mask-position-3b.html mask-position-3b.html
-== mask-position-4a.html mask-position-4a.html
-== mask-position-4b.html mask-position-4b.html
-== mask-position-4c.html mask-position-4c.html
-== mask-position-4d.html mask-position-4d.html
-== mask-position-5.html mask-position-5.html
-== mask-position-6.html mask-position-6.html
-== mask-position-7.html mask-position-7.html
-
-# mask-repeat test cases
-== mask-repeat-1.html mask-repeat-1.html
-# bug 1258623
-== mask-repeat-2.html mask-repeat-2.html
-# bug 1258626
-== mask-repeat-3.html mask-repeat-3.html
-# bug 1258626
-
-# mask-origin test cases
-== mask-origin-1.html mask-origin-1.html
-# bug 1258286
-== mask-origin-2.html mask-origin-2.html
-# bug 1260094
-
-# mask-size test cases
-== mask-size-auto.html mask-size-auto.html
-== mask-size-auto-auto.html mask-size-auto-auto.html
-== mask-size-auto-length.html mask-size-auto-length.html
-== mask-size-auto-percent.html mask-size-auto-percent.html
-== mask-size-contain-clip-border.html mask-size-contain-clip-border.html
-== mask-size-contain-clip-padding.html mask-size-contain-clip-padding.html
-== mask-size-contain-position-fifty-fifty.html mask-size-contain-position-fifty-fifty.html
-== mask-size-contain.html mask-size-contain.html
-== mask-size-cover.html mask-size-cover.html
-== mask-size-length.html mask-size-length.html
-== mask-size-length-auto.html mask-size-length-auto.html
-== mask-size-length-length.html mask-size-length-length.html
-== mask-size-length-percent.html mask-size-length-percent.html
-== mask-size-percent.html mask-size-percent.html
-== mask-size-percent-auto.html mask-size-percent-auto.html
-== mask-size-percent-length.html mask-size-percent-length.html
-== mask-size-percent-percent.html mask-size-percent-percent.html
-== mask-size-percent-percent-stretch.html mask-size-percent-percent-stretch.html
diff --git a/layout/reftests/w3c-css/submitted/multicol3/reftest-stylo.list b/layout/reftests/w3c-css/submitted/multicol3/reftest-stylo.list
deleted file mode 100644
index 9ac502b8e..000000000
--- a/layout/reftests/w3c-css/submitted/multicol3/reftest-stylo.list
+++ /dev/null
@@ -1,3 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== moz-multicol3-column-balancing-break-inside-avoid-1.html moz-multicol3-column-balancing-break-inside-avoid-1.html
-== multicol-height-002.xht multicol-height-002.xht
diff --git a/layout/reftests/w3c-css/submitted/reftest-stylo.list b/layout/reftests/w3c-css/submitted/reftest-stylo.list
deleted file mode 100644
index 71dad7646..000000000
--- a/layout/reftests/w3c-css/submitted/reftest-stylo.list
+++ /dev/null
@@ -1,76 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# Do not assign a test to multiple references. Chain the references instead.
-# See README.
-
-== test-template-001.xht test-template-001.xht
-
-# Module includes, alphabetical sans "CSS". Add/uncomment as necessary.
-
-## CSS Snapshot 2007
-
-# CSS2.1
-include css21/reftest-stylo.list
-
-# Backgrounds and Borders
-include background/reftest-stylo.list
-
-# Color Level 4
-include color4/reftest-stylo.list
-
-# Conditional Rules Level 3
-include conditional3/reftest-stylo.list
-
-# Containment
-include contain/reftest-stylo.list
-
-# Filter Effects Module
-include filters/reftest-stylo.list
-
-# Flexible Box Layout Module
-include flexbox/reftest-stylo.list
-
-# Fonts Level 3
-include fonts3/reftest-stylo.list
-
-# Image Values and Replaced Content Level 3
-# Disabled due to svg intermittents
-# include images3/reftest-stylo.list
-
-# Lists and Counters Level 3
-include lists-3/reftest-stylo.list
-
-# Masking Level 1
-include masking/reftest-stylo.list
-
-# Multi-column Layout 3
-include multicol3/reftest-stylo.list
-
-# Ruby Layout Module
-include ruby/reftest-stylo.list
-
-# Selectors Level 4
-include selectors4/reftest-stylo.list
-
-# Text Level 3
-include text3/reftest-stylo.list
-
-# Text Decoration Level 3
-include text-decor-3/reftest-stylo.list
-
-# Transforms
-include transforms/reftest-stylo.list
-
-# User Interface Level 3
-include ui3/reftest-stylo.list
-
-# Values and Units Level 3
-include values3/reftest-stylo.list
-
-# Variables Level 1
-include variables/reftest-stylo.list
-
-# CSS will-change Level 1
-include will-change/reftest-stylo.list
-
-# CSS Writing Modes Level 3
-include writing-modes-3/reftest-stylo.list
diff --git a/layout/reftests/w3c-css/submitted/ruby/reftest-stylo.list b/layout/reftests/w3c-css/submitted/ruby/reftest-stylo.list
deleted file mode 100644
index d72859a10..000000000
--- a/layout/reftests/w3c-css/submitted/ruby/reftest-stylo.list
+++ /dev/null
@@ -1,19 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# Tests for inlinizing block-level boxes
-== ruby-inlinize-blocks-001.html ruby-inlinize-blocks-001.html
-skip == ruby-inlinize-blocks-002.html ruby-inlinize-blocks-002.html
-== ruby-inlinize-blocks-003.html ruby-inlinize-blocks-003.html
-== ruby-inlinize-blocks-004.html ruby-inlinize-blocks-004.html
-== ruby-inlinize-blocks-005.html ruby-inlinize-blocks-005.html
-
-# Tests for autohiding base-identical annotations
-== ruby-autohide-001.html ruby-autohide-001.html
-== ruby-autohide-002.html ruby-autohide-002.html
-== ruby-autohide-003.html ruby-autohide-003.html
-== ruby-autohide-004.html ruby-autohide-004.html
-
-# Tests for ruby with text-combine-upright
-== ruby-text-combine-upright-001a.html ruby-text-combine-upright-001a.html
-== ruby-text-combine-upright-001b.html ruby-text-combine-upright-001b.html
-== ruby-text-combine-upright-002a.html ruby-text-combine-upright-002a.html
-== ruby-text-combine-upright-002b.html ruby-text-combine-upright-002b.html
diff --git a/layout/reftests/w3c-css/submitted/selectors4/reftest-stylo.list b/layout/reftests/w3c-css/submitted/selectors4/reftest-stylo.list
deleted file mode 100644
index b86b5ca02..000000000
--- a/layout/reftests/w3c-css/submitted/selectors4/reftest-stylo.list
+++ /dev/null
@@ -1,8 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== dir-style-01a.html dir-style-01a.html
-== dir-style-01b.html dir-style-01b.html
-== dir-style-02a.html dir-style-02a.html
-== dir-style-02b.html dir-style-02b.html
-== dir-style-03a.html dir-style-03a.html
-== dir-style-03b.html dir-style-03b.html
-== dir-style-04.html dir-style-04.html
diff --git a/layout/reftests/w3c-css/submitted/text-decor-3/reftest-stylo.list b/layout/reftests/w3c-css/submitted/text-decor-3/reftest-stylo.list
deleted file mode 100644
index 7792a22e7..000000000
--- a/layout/reftests/w3c-css/submitted/text-decor-3/reftest-stylo.list
+++ /dev/null
@@ -1,134 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-
-
-== ruby-text-decoration-01.html ruby-text-decoration-01.html
-== text-decoration-propagation-01.html text-decoration-propagation-01.html
-
-# text-emphasis-style
-== text-emphasis-style-property-001.html text-emphasis-style-property-001.html
-fuzzy-if(gtkWidget,3,4) fuzzy-if(skiaContent,87,65) == text-emphasis-style-property-002.html text-emphasis-style-property-002.html
-skip-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) == text-emphasis-style-property-003.html text-emphasis-style-property-003.html
-skip-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) == text-emphasis-style-property-004.html text-emphasis-style-property-004.html
-== text-emphasis-style-property-005.html text-emphasis-style-property-005.html
-== text-emphasis-style-property-005a.html text-emphasis-style-property-005a.html
-# START tests from support/generate-text-emphasis-style-property-010-tests.sh
-== text-emphasis-style-property-010Zs.html text-emphasis-style-property-010Zs.html
-== text-emphasis-style-property-010Zl.html text-emphasis-style-property-010Zl.html
-== text-emphasis-style-property-010Zp.html text-emphasis-style-property-010Zp.html
-== text-emphasis-style-property-010Cc.html text-emphasis-style-property-010Cc.html
-fails fuzzy-if(skiaContent,1,336) == text-emphasis-style-property-010Cf.html text-emphasis-style-property-010Cf.html
-# END tests from support/generate-text-emphasis-style-property-010-tests.sh
-== text-emphasis-style-property-010Cn.html text-emphasis-style-property-010Cn.html
-# START tests from support/generate-text-emphasis-style-property-tests.py
-fuzzy-if(gtkWidget,3,4) == text-emphasis-style-property-011.html text-emphasis-style-property-011.html
-fails fuzzy-if(gtkWidget,3,4) == text-emphasis-style-property-011a.html text-emphasis-style-property-011a.html
-fails fuzzy-if(gtkWidget,3,4) == text-emphasis-style-property-011b.html text-emphasis-style-property-011b.html
-fuzzy-if(gtkWidget,3,4) == text-emphasis-style-property-012.html text-emphasis-style-property-012.html
-fails fuzzy-if(gtkWidget,3,4) == text-emphasis-style-property-012a.html text-emphasis-style-property-012a.html
-fails fuzzy-if(gtkWidget,3,4) == text-emphasis-style-property-012b.html text-emphasis-style-property-012b.html
-fails fuzzy-if(gtkWidget,3,4) == text-emphasis-style-property-012c.html text-emphasis-style-property-012c.html
-fuzzy-if(gtkWidget,3,4) == text-emphasis-style-property-013.html text-emphasis-style-property-013.html
-fails fuzzy-if(gtkWidget,3,4) == text-emphasis-style-property-013a.html text-emphasis-style-property-013a.html
-fails fuzzy-if(gtkWidget,3,4) == text-emphasis-style-property-013b.html text-emphasis-style-property-013b.html
-fails fuzzy-if(gtkWidget,3,4) == text-emphasis-style-property-014.html text-emphasis-style-property-014.html
-fails fuzzy-if(gtkWidget,3,4) == text-emphasis-style-property-014a.html text-emphasis-style-property-014a.html
-fails fuzzy-if(gtkWidget,3,4) == text-emphasis-style-property-014b.html text-emphasis-style-property-014b.html
-fails fuzzy-if(gtkWidget,3,4) skip-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) == text-emphasis-style-property-015.html text-emphasis-style-property-015.html
-fails fuzzy-if(gtkWidget,3,4) skip-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) == text-emphasis-style-property-015a.html text-emphasis-style-property-015a.html
-fails fuzzy-if(gtkWidget,3,4) skip-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) == text-emphasis-style-property-015b.html text-emphasis-style-property-015b.html
-fails fuzzy-if(gtkWidget,3,4) == text-emphasis-style-property-016.html text-emphasis-style-property-016.html
-fails fuzzy-if(gtkWidget,3,4) == text-emphasis-style-property-016a.html text-emphasis-style-property-016a.html
-fails fuzzy-if(gtkWidget,3,4) == text-emphasis-style-property-017.html text-emphasis-style-property-017.html
-fails fuzzy-if(gtkWidget,3,4) == text-emphasis-style-property-017a.html text-emphasis-style-property-017a.html
-fails fuzzy-if(gtkWidget,3,4) == text-emphasis-style-property-017b.html text-emphasis-style-property-017b.html
-fails fuzzy-if(gtkWidget,3,4) == text-emphasis-style-property-018.html text-emphasis-style-property-018.html
-fails fuzzy-if(gtkWidget,3,4) == text-emphasis-style-property-018a.html text-emphasis-style-property-018a.html
-fails fuzzy-if(gtkWidget,3,4) == text-emphasis-style-property-019.html text-emphasis-style-property-019.html
-fails fuzzy-if(gtkWidget,3,4) == text-emphasis-style-property-019a.html text-emphasis-style-property-019a.html
-fails fuzzy-if(gtkWidget,3,4) skip-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) == text-emphasis-style-property-020.html text-emphasis-style-property-020.html
-fails fuzzy-if(gtkWidget,3,4) skip-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) == text-emphasis-style-property-020a.html text-emphasis-style-property-020a.html
-# END tests from support/generate-text-emphasis-style-property-tests.py
-
-# text-emphasis-color
-fuzzy-if(gtkWidget,3,4) == text-emphasis-color-property-001.html text-emphasis-color-property-001.html
-fails fuzzy-if(gtkWidget,3,4) == text-emphasis-color-property-001a.html text-emphasis-color-property-001a.html
-fuzzy-if(gtkWidget,3,4) == text-emphasis-color-property-002.html text-emphasis-color-property-002.html
-
-# text-emphasis
-== text-emphasis-property-001.html text-emphasis-property-001.html
-fuzzy-if(gtkWidget,3,4) fuzzy-if(skiaContent,87,65) == text-emphasis-property-002.html text-emphasis-property-002.html
-fuzzy-if(gtkWidget,3,4) == text-emphasis-property-003.html text-emphasis-property-003.html
-fails fuzzy-if(gtkWidget,3,4) == text-emphasis-property-003a.html text-emphasis-property-003a.html
-fails fuzzy-if(gtkWidget,3,4) == text-emphasis-property-003b.html text-emphasis-property-003b.html
-fails fuzzy-if(gtkWidget,3,4) == text-emphasis-property-004.html text-emphasis-property-004.html
-fails fuzzy-if(gtkWidget,3,4) == text-emphasis-property-004a.html text-emphasis-property-004a.html
-
-# text-emphasis-position
-# START tests from support/generate-text-emphasis-position-property-tests.py
-fuzzy-if(gtkWidget,3,4) == text-emphasis-position-property-001.html text-emphasis-position-property-001.html
-fails fuzzy-if(gtkWidget,3,4) == text-emphasis-position-property-001a.html text-emphasis-position-property-001a.html
-fails fuzzy-if(gtkWidget,3,4) == text-emphasis-position-property-001b.html text-emphasis-position-property-001b.html
-fails fuzzy-if(gtkWidget,3,4) == text-emphasis-position-property-001c.html text-emphasis-position-property-001c.html
-fuzzy-if(gtkWidget,3,4) == text-emphasis-position-property-002.html text-emphasis-position-property-002.html
-fails fuzzy-if(gtkWidget,3,4) == text-emphasis-position-property-002a.html text-emphasis-position-property-002a.html
-fails fuzzy-if(gtkWidget,3,4) == text-emphasis-position-property-002b.html text-emphasis-position-property-002b.html
-fails fuzzy-if(gtkWidget,3,4) == text-emphasis-position-property-002c.html text-emphasis-position-property-002c.html
-== text-emphasis-position-property-003.html text-emphasis-position-property-003.html
-== text-emphasis-position-property-003a.html text-emphasis-position-property-003a.html
-== text-emphasis-position-property-003b.html text-emphasis-position-property-003b.html
-== text-emphasis-position-property-003c.html text-emphasis-position-property-003c.html
-== text-emphasis-position-property-003d.html text-emphasis-position-property-003d.html
-== text-emphasis-position-property-003e.html text-emphasis-position-property-003e.html
-== text-emphasis-position-property-003f.html text-emphasis-position-property-003f.html
-== text-emphasis-position-property-003g.html text-emphasis-position-property-003g.html
-== text-emphasis-position-property-004.html text-emphasis-position-property-004.html
-== text-emphasis-position-property-004a.html text-emphasis-position-property-004a.html
-== text-emphasis-position-property-004b.html text-emphasis-position-property-004b.html
-== text-emphasis-position-property-004c.html text-emphasis-position-property-004c.html
-== text-emphasis-position-property-004d.html text-emphasis-position-property-004d.html
-== text-emphasis-position-property-004e.html text-emphasis-position-property-004e.html
-== text-emphasis-position-property-004f.html text-emphasis-position-property-004f.html
-== text-emphasis-position-property-004g.html text-emphasis-position-property-004g.html
-== text-emphasis-position-property-005.html text-emphasis-position-property-005.html
-== text-emphasis-position-property-005a.html text-emphasis-position-property-005a.html
-== text-emphasis-position-property-005b.html text-emphasis-position-property-005b.html
-== text-emphasis-position-property-005c.html text-emphasis-position-property-005c.html
-== text-emphasis-position-property-005d.html text-emphasis-position-property-005d.html
-== text-emphasis-position-property-005e.html text-emphasis-position-property-005e.html
-== text-emphasis-position-property-005f.html text-emphasis-position-property-005f.html
-== text-emphasis-position-property-005g.html text-emphasis-position-property-005g.html
-== text-emphasis-position-property-006.html text-emphasis-position-property-006.html
-== text-emphasis-position-property-006a.html text-emphasis-position-property-006a.html
-== text-emphasis-position-property-006b.html text-emphasis-position-property-006b.html
-== text-emphasis-position-property-006c.html text-emphasis-position-property-006c.html
-== text-emphasis-position-property-006d.html text-emphasis-position-property-006d.html
-== text-emphasis-position-property-006e.html text-emphasis-position-property-006e.html
-== text-emphasis-position-property-006f.html text-emphasis-position-property-006f.html
-== text-emphasis-position-property-006g.html text-emphasis-position-property-006g.html
-# END tests from support/generate-text-emphasis-position-property-tests.py
-
-# START tests from support/generate-text-emphasis-ruby-tests.py
-== text-emphasis-ruby-001.html text-emphasis-ruby-001.html
-== text-emphasis-ruby-002.html text-emphasis-ruby-002.html
-== text-emphasis-ruby-003.html text-emphasis-ruby-003.html
-== text-emphasis-ruby-003a.html text-emphasis-ruby-003a.html
-== text-emphasis-ruby-004.html text-emphasis-ruby-004.html
-== text-emphasis-ruby-004a.html text-emphasis-ruby-004a.html
-# END tests from support/generate-text-emphasis-ruby-tests.py
-
-# text-emphasis line height
-# START tests from support/generate-text-emphasis-line-height-tests.py
-fails fuzzy-if(gtkWidget,3,4) == text-emphasis-line-height-001a.html text-emphasis-line-height-001a.html
-fails fuzzy-if(gtkWidget,3,4) == text-emphasis-line-height-001b.html text-emphasis-line-height-001b.html
-fails fuzzy-if(gtkWidget,3,4) == text-emphasis-line-height-002a.html text-emphasis-line-height-002a.html
-fails fuzzy-if(gtkWidget,3,4) == text-emphasis-line-height-002b.html text-emphasis-line-height-002b.html
-== text-emphasis-line-height-003a.html text-emphasis-line-height-003a.html
-== text-emphasis-line-height-003b.html text-emphasis-line-height-003b.html
-== text-emphasis-line-height-003c.html text-emphasis-line-height-003c.html
-== text-emphasis-line-height-003d.html text-emphasis-line-height-003d.html
-== text-emphasis-line-height-004a.html text-emphasis-line-height-004a.html
-== text-emphasis-line-height-004b.html text-emphasis-line-height-004b.html
-== text-emphasis-line-height-004c.html text-emphasis-line-height-004c.html
-== text-emphasis-line-height-004d.html text-emphasis-line-height-004d.html
-# END tests from support/generate-text-emphasis-line-height-tests.py
-fails fuzzy-if(gtkWidget,3,4) fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),43,1) == text-emphasis-line-height-001z.html text-emphasis-line-height-001z.html
diff --git a/layout/reftests/w3c-css/submitted/text3/reftest-stylo.list b/layout/reftests/w3c-css/submitted/text3/reftest-stylo.list
deleted file mode 100644
index c5f743719..000000000
--- a/layout/reftests/w3c-css/submitted/text3/reftest-stylo.list
+++ /dev/null
@@ -1,9 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== text-align-match-parent-01.html text-align-match-parent-01.html
-== text-align-match-parent-02.html text-align-match-parent-02.html
-== text-align-match-parent-03.html text-align-match-parent-03.html
-== text-align-match-parent-04.html text-align-match-parent-04.html
-== text-align-match-parent-root-ltr.html text-align-match-parent-root-ltr.html
-== text-align-match-parent-root-rtl.html text-align-match-parent-root-rtl.html
-
-== text-word-spacing-001.html text-word-spacing-001.html
diff --git a/layout/reftests/w3c-css/submitted/transforms/reftest-stylo.list b/layout/reftests/w3c-css/submitted/transforms/reftest-stylo.list
deleted file mode 100644
index 6ab706d2f..000000000
--- a/layout/reftests/w3c-css/submitted/transforms/reftest-stylo.list
+++ /dev/null
@@ -1,5 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== transform-containing-block-dynamic-1a.html transform-containing-block-dynamic-1a.html
-== transform-containing-block-dynamic-1b.html transform-containing-block-dynamic-1b.html
-== perspective-containing-block-dynamic-1a.html perspective-containing-block-dynamic-1a.html
-== perspective-containing-block-dynamic-1b.html perspective-containing-block-dynamic-1b.html
diff --git a/layout/reftests/w3c-css/submitted/ui3/reftest-stylo.list b/layout/reftests/w3c-css/submitted/ui3/reftest-stylo.list
deleted file mode 100644
index cba070397..000000000
--- a/layout/reftests/w3c-css/submitted/ui3/reftest-stylo.list
+++ /dev/null
@@ -1,16 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== box-sizing-border-box-001.xht box-sizing-border-box-001.xht
-== box-sizing-border-box-002.xht box-sizing-border-box-002.xht
-== box-sizing-border-box-003.xht box-sizing-border-box-003.xht
-== box-sizing-border-box-004.xht box-sizing-border-box-004.xht
-== box-sizing-content-box-001.xht box-sizing-content-box-001.xht
-== box-sizing-content-box-002.xht box-sizing-content-box-002.xht
-== box-sizing-content-box-003.xht box-sizing-content-box-003.xht
-fails == box-sizing-replaced-001.xht box-sizing-replaced-001-ref.xht #bug #bug
-# Initial mulet triage: parity with B2G/B2G Desktop
-fuzzy-if(Android,27,874) random-if((B2G&&browserIsRemote)||Mulet) == box-sizing-replaced-002.xht box-sizing-replaced-002.xht
-# Bug 1128229
-# Initial mulet triage: parity with B2G/B2G Desktop
-fuzzy-if(Android,27,925) random-if((B2G&&browserIsRemote)||Mulet) == box-sizing-replaced-003.xht box-sizing-replaced-003.xht
-# Bug 1128229
-# Initial mulet triage: parity with B2G/B2G Desktop
diff --git a/layout/reftests/w3c-css/submitted/ui3/reftest.list b/layout/reftests/w3c-css/submitted/ui3/reftest.list
index bb33f595c..6f7b13bb6 100644
--- a/layout/reftests/w3c-css/submitted/ui3/reftest.list
+++ b/layout/reftests/w3c-css/submitted/ui3/reftest.list
@@ -5,6 +5,6 @@
== box-sizing-content-box-001.xht box-sizing-content-box-001-ref.xht
== box-sizing-content-box-002.xht box-sizing-content-box-002-ref.xht
== box-sizing-content-box-003.xht box-sizing-content-box-003-ref.xht
-fuzzy-if(skiaContent,15,50) fuzzy-if(OSX,255,1575) skip-if(Android||gtkWidget) == box-sizing-replaced-001.xht box-sizing-replaced-001-ref.xht # bug 982547, Bug 1295466, Bug 1321707
-fuzzy-if(Android,27,874) fuzzy-if(gtkWidget,255,2775) == box-sizing-replaced-002.xht box-sizing-replaced-002-ref.xht # Bug 1128229, Bug 1313772
-fuzzy-if(Android,27,925) fuzzy-if(gtkWidget,14,43) == box-sizing-replaced-003.xht box-sizing-replaced-003-ref.xht # Bug 1128229
+fuzzy-if(skiaContent,15,50) fuzzy-if(OSX,255,1575) skip-if(gtkWidget) == box-sizing-replaced-001.xht box-sizing-replaced-001-ref.xht # bug 982547, Bug 1295466, Bug 1321707
+fuzzy-if(gtkWidget,255,2775) == box-sizing-replaced-002.xht box-sizing-replaced-002-ref.xht # Bug 1128229, Bug 1313772
+fuzzy-if(gtkWidget,14,43) == box-sizing-replaced-003.xht box-sizing-replaced-003-ref.xht # Bug 1128229
diff --git a/layout/reftests/w3c-css/submitted/values3/reftest-stylo.list b/layout/reftests/w3c-css/submitted/values3/reftest-stylo.list
deleted file mode 100644
index 9535b43e9..000000000
--- a/layout/reftests/w3c-css/submitted/values3/reftest-stylo.list
+++ /dev/null
@@ -1,33 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== calc-background-linear-gradient-1.html calc-background-linear-gradient-1.html
-== calc-background-image-gradient-1.html calc-background-image-gradient-1.html
-== calc-background-position-1.html calc-background-position-1.html
-== calc-background-size-1.html calc-background-size-1.html
-== calc-border-radius-1.html calc-border-radius-1.html
-== calc-height-block-1.html calc-height-block-1.html
-skip-if(B2G||Mulet) == calc-height-table-1.html calc-height-table-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== calc-margin-block-1.html calc-margin-block-1.html
-== calc-max-height-block-1.html calc-max-height-block-1.html
-== calc-max-width-block-1.html calc-max-width-block-1.html
-== calc-max-width-block-intrinsic-1.html calc-max-width-block-intrinsic-1.html
-== calc-min-height-block-1.html calc-min-height-block-1.html
-== calc-min-width-block-1.html calc-min-width-block-1.html
-== calc-min-width-block-intrinsic-1.html calc-min-width-block-intrinsic-1.html
-== calc-offsets-absolute-bottom-1.html calc-offsets-absolute-bottom-1.html
-== calc-offsets-absolute-left-1.html calc-offsets-absolute-left-1.html
-== calc-offsets-absolute-right-1.html calc-offsets-absolute-right-1.html
-== calc-offsets-absolute-top-1.html calc-offsets-absolute-top-1.html
-== calc-offsets-relative-bottom-1.html calc-offsets-relative-bottom-1.html
-== calc-offsets-relative-left-1.html calc-offsets-relative-left-1.html
-== calc-offsets-relative-right-1.html calc-offsets-relative-right-1.html
-== calc-offsets-relative-top-1.html calc-offsets-relative-top-1.html
-== calc-padding-block-1.html calc-padding-block-1.html
-== calc-text-indent-1.html calc-text-indent-1.html
-== calc-text-indent-intrinsic-1.html calc-text-indent-intrinsic-1.html
-fuzzy-if(skiaContent,1,11) == calc-transform-origin-1.html calc-transform-origin-1.html
-== calc-vertical-align-1.html calc-vertical-align-1.html
-== calc-width-block-1.html calc-width-block-1.html
-== calc-width-block-intrinsic-1.html calc-width-block-intrinsic-1.html
-== calc-width-table-auto-1.html calc-width-table-auto-1.html
-== calc-width-table-fixed-1.html calc-width-table-fixed-1.html
diff --git a/layout/reftests/w3c-css/submitted/variables/reftest-stylo.list b/layout/reftests/w3c-css/submitted/variables/reftest-stylo.list
deleted file mode 100644
index 20f4dc7d9..000000000
--- a/layout/reftests/w3c-css/submitted/variables/reftest-stylo.list
+++ /dev/null
@@ -1,175 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-default-preferences pref(layout.css.variables.enabled,true)
-
-== variable-declaration-01.html variable-declaration-01.html
-== variable-declaration-02.html variable-declaration-02.html
-== variable-declaration-03.html variable-declaration-03.html
-== variable-declaration-04.html variable-declaration-04.html
-== variable-declaration-05.html variable-declaration-05.html
-== variable-declaration-06.html variable-declaration-06.html
-== variable-declaration-07.html variable-declaration-07.html
-== variable-declaration-08.html variable-declaration-08.html
-== variable-declaration-09.html variable-declaration-09.html
-== variable-declaration-10.html variable-declaration-10.html
-== variable-declaration-11.html variable-declaration-11.html
-== variable-declaration-12.html variable-declaration-12.html
-== variable-declaration-13.html variable-declaration-13.html
-== variable-declaration-14.html variable-declaration-14.html
-== variable-declaration-15.html variable-declaration-15.html
-== variable-declaration-16.html variable-declaration-16.html
-== variable-declaration-17.html variable-declaration-17.html
-== variable-declaration-18.html variable-declaration-18.html
-== variable-declaration-19.html variable-declaration-19.html
-== variable-declaration-20.html variable-declaration-20.html
-== variable-declaration-21.html variable-declaration-21.html
-== variable-declaration-22.html variable-declaration-22.html
-== variable-declaration-23.html variable-declaration-23.html
-== variable-declaration-24.html variable-declaration-24.html
-== variable-declaration-25.html variable-declaration-25.html
-== variable-declaration-26.html variable-declaration-26.html
-== variable-declaration-28.html variable-declaration-28.html
-== variable-declaration-29.html variable-declaration-29.html
-== variable-declaration-30.html variable-declaration-30.html
-== variable-declaration-31.html variable-declaration-31.html
-== variable-declaration-32.html variable-declaration-32.html
-== variable-declaration-33.html variable-declaration-33.html
-== variable-declaration-34.html variable-declaration-34.html
-== variable-declaration-35.html variable-declaration-35.html
-== variable-declaration-36.html variable-declaration-36.html
-== variable-declaration-37.html variable-declaration-37.html
-== variable-declaration-38.html variable-declaration-38.html
-== variable-declaration-39.html variable-declaration-39.html
-== variable-declaration-40.html variable-declaration-40.html
-== variable-declaration-41.html variable-declaration-41.html
-== variable-declaration-42.html variable-declaration-42.html
-== variable-declaration-43.html variable-declaration-43.html
-== variable-declaration-44.html variable-declaration-44.html
-== variable-declaration-45.html variable-declaration-45.html
-== variable-declaration-46.html variable-declaration-46.html
-== variable-declaration-47.html variable-declaration-47.html
-== variable-declaration-48.html variable-declaration-48.html
-== variable-declaration-49.html variable-declaration-49.html
-== variable-declaration-50.html variable-declaration-50.html
-== variable-declaration-51.html variable-declaration-51.html
-== variable-declaration-52.html variable-declaration-52.html
-== variable-declaration-53.html variable-declaration-53.html
-== variable-declaration-54.html variable-declaration-54.html
-== variable-declaration-55.html variable-declaration-55.html
-== variable-declaration-56.html variable-declaration-56.html
-== variable-declaration-57.html variable-declaration-57.html
-== variable-declaration-58.html variable-declaration-58.html
-== variable-declaration-59.html variable-declaration-59.html
-== variable-declaration-60.html variable-declaration-60.html
-== variable-external-declaration-01.html variable-external-declaration-01.html
-== variable-external-font-face-01.html variable-external-font-face-01.html
-== variable-external-reference-01.html variable-external-reference-01.html
-== variable-external-supports-01.html variable-external-supports-01.html
-== variable-font-face-01.html variable-font-face-01.html
-== variable-font-face-02.html variable-font-face-02.html
-== variable-reference-01.html variable-reference-01.html
-== variable-reference-02.html variable-reference-02.html
-== variable-reference-03.html variable-reference-03.html
-== variable-reference-04.html variable-reference-04.html
-== variable-reference-05.html variable-reference-05.html
-== variable-reference-06.html variable-reference-06.html
-== variable-reference-07.html variable-reference-07.html
-== variable-reference-08.html variable-reference-08.html
-== variable-reference-09.html variable-reference-09.html
-== variable-reference-10.html variable-reference-10.html
-== variable-reference-11.html variable-reference-11.html
-== variable-reference-12.html variable-reference-12.html
-== variable-reference-13.html variable-reference-13.html
-== variable-reference-14.html variable-reference-14.html
-== variable-reference-15.html variable-reference-15.html
-== variable-reference-16.html variable-reference-16.html
-== variable-reference-17.html variable-reference-17.html
-== variable-reference-18.html variable-reference-18.html
-== variable-reference-19.html variable-reference-19.html
-== variable-reference-20.html variable-reference-20.html
-== variable-reference-21.html variable-reference-21.html
-== variable-reference-22.html variable-reference-22.html
-== variable-reference-23.html variable-reference-23.html
-== variable-reference-24.html variable-reference-24.html
-== variable-reference-25.html variable-reference-25.html
-== variable-reference-26.html variable-reference-26.html
-== variable-reference-27.html variable-reference-27.html
-== variable-reference-28.html variable-reference-28.html
-== variable-reference-29.html variable-reference-29.html
-== variable-reference-30.html variable-reference-30.html
-== variable-reference-31.html variable-reference-31.html
-== variable-reference-32.html variable-reference-32.html
-== variable-reference-33.html variable-reference-33.html
-== variable-reference-34.html variable-reference-34.html
-== variable-reference-35.html variable-reference-35.html
-== variable-reference-36.html variable-reference-36.html
-== variable-reference-37.html variable-reference-37.html
-== variable-reference-38.html variable-reference-38.html
-== variable-reference-39.html variable-reference-39.html
-== variable-reference-40.html variable-reference-40.html
-== variable-supports-01.html variable-supports-01.html
-== variable-supports-02.html variable-supports-02.html
-== variable-supports-03.html variable-supports-03.html
-== variable-supports-04.html variable-supports-04.html
-== variable-supports-05.html variable-supports-05.html
-== variable-supports-06.html variable-supports-06.html
-== variable-supports-07.html variable-supports-07.html
-== variable-supports-08.html variable-supports-08.html
-== variable-supports-09.html variable-supports-09.html
-== variable-supports-10.html variable-supports-10.html
-== variable-supports-11.html variable-supports-11.html
-== variable-supports-12.html variable-supports-12.html
-== variable-supports-13.html variable-supports-13.html
-== variable-supports-14.html variable-supports-14.html
-== variable-supports-15.html variable-supports-15.html
-== variable-supports-16.html variable-supports-16.html
-== variable-supports-17.html variable-supports-17.html
-== variable-supports-18.html variable-supports-18.html
-== variable-supports-19.html variable-supports-19.html
-== variable-supports-20.html variable-supports-20.html
-== variable-supports-21.html variable-supports-21.html
-== variable-supports-22.html variable-supports-22.html
-== variable-supports-23.html variable-supports-23.html
-== variable-supports-24.html variable-supports-24.html
-== variable-supports-25.html variable-supports-25.html
-== variable-supports-26.html variable-supports-26.html
-== variable-supports-27.html variable-supports-27.html
-== variable-supports-28.html variable-supports-28.html
-== variable-supports-29.html variable-supports-29.html
-== variable-supports-30.html variable-supports-30.html
-== variable-supports-31.html variable-supports-31.html
-== variable-supports-32.html variable-supports-32.html
-== variable-supports-33.html variable-supports-33.html
-== variable-supports-34.html variable-supports-34.html
-== variable-supports-35.html variable-supports-35.html
-== variable-supports-36.html variable-supports-36.html
-== variable-supports-37.html variable-supports-37.html
-== variable-supports-38.html variable-supports-38.html
-== variable-supports-39.html variable-supports-39.html
-== variable-supports-40.html variable-supports-40.html
-== variable-supports-41.html variable-supports-41.html
-== variable-supports-42.html variable-supports-42.html
-== variable-supports-43.html variable-supports-43.html
-== variable-supports-44.html variable-supports-44.html
-== variable-supports-45.html variable-supports-45.html
-== variable-supports-46.html variable-supports-46.html
-== variable-supports-47.html variable-supports-47.html
-== variable-supports-48.html variable-supports-48.html
-== variable-supports-49.html variable-supports-49.html
-== variable-supports-50.html variable-supports-50.html
-== variable-supports-51.html variable-supports-51.html
-== variable-supports-52.html variable-supports-52.html
-== variable-supports-53.html variable-supports-53.html
-== variable-supports-54.html variable-supports-54.html
-== variable-supports-55.html variable-supports-55.html
-== variable-supports-56.html variable-supports-56.html
-== variable-supports-57.html variable-supports-57.html
-== variable-supports-58.html variable-supports-58.html
-== variable-supports-59.html variable-supports-59.html
-== variable-supports-60.html variable-supports-60.html
-== variable-supports-61.html variable-supports-61.html
-== variable-supports-62.html variable-supports-62.html
-== variable-supports-63.html variable-supports-63.html
-== variable-supports-64.html variable-supports-64.html
-== variable-supports-65.html variable-supports-65.html
-== variable-supports-66.html variable-supports-66.html
-== variable-supports-67.html variable-supports-67.html
diff --git a/layout/reftests/w3c-css/submitted/will-change/reftest-stylo.list b/layout/reftests/w3c-css/submitted/will-change/reftest-stylo.list
deleted file mode 100644
index 685560a63..000000000
--- a/layout/reftests/w3c-css/submitted/will-change/reftest-stylo.list
+++ /dev/null
@@ -1,20 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== will-change-stacking-context-clip-path-1.html will-change-stacking-context-clip-path-1.html
-== will-change-stacking-context-filter-1.html will-change-stacking-context-filter-1.html
-== will-change-stacking-context-height-1.html will-change-stacking-context-height-1.html
-== will-change-stacking-context-isolation-1.html will-change-stacking-context-isolation-1.html
-== will-change-stacking-context-mask-1.html will-change-stacking-context-mask-1.html
-== will-change-stacking-context-mix-blend-mode-1.html will-change-stacking-context-mix-blend-mode-1.html
-== will-change-stacking-context-opacity-1.html will-change-stacking-context-opacity-1.html
-== will-change-stacking-context-perspective-1.html will-change-stacking-context-perspective-1.html
-== will-change-stacking-context-position-1.html will-change-stacking-context-position-1.html
-== will-change-stacking-context-transform-1.html will-change-stacking-context-transform-1.html
-== will-change-stacking-context-transform-style-1.html will-change-stacking-context-transform-style-1.html
-== will-change-stacking-context-z-index-1.html will-change-stacking-context-z-index-1.html
-test-pref(layout.css.contain.enabled,true) == will-change-fixpos-cb-contain-1.html will-change-fixpos-cb-contain-1.html
-== will-change-fixpos-cb-filter-1.html will-change-fixpos-cb-filter-1.html
-== will-change-fixpos-cb-height-1.html will-change-fixpos-cb-height-1.html
-== will-change-fixpos-cb-perspective-1.html will-change-fixpos-cb-perspective-1.html
-== will-change-fixpos-cb-position-1.html will-change-fixpos-cb-position-1.html
-== will-change-fixpos-cb-transform-1.html will-change-fixpos-cb-transform-1.html
-== will-change-fixpos-cb-transform-style-1.html will-change-fixpos-cb-transform-style-1.html
diff --git a/layout/reftests/w3c-css/submitted/writing-modes-3/reftest-stylo.list b/layout/reftests/w3c-css/submitted/writing-modes-3/reftest-stylo.list
deleted file mode 100644
index 5b10baf15..000000000
--- a/layout/reftests/w3c-css/submitted/writing-modes-3/reftest-stylo.list
+++ /dev/null
@@ -1,18 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-default-preferences pref(layout.css.text-combine-upright.enabled,true)
-
-== text-combine-upright-break-inside-001.html text-combine-upright-break-inside-001.html
-== text-combine-upright-break-inside-001a.html text-combine-upright-break-inside-001a.html
-== text-combine-upright-compression-001.html text-combine-upright-compression-001.html
-== text-combine-upright-compression-002.html text-combine-upright-compression-002.html
-== text-combine-upright-compression-003.html text-combine-upright-compression-003.html
-== text-combine-upright-compression-004.html text-combine-upright-compression-004.html
-== text-combine-upright-compression-005.html text-combine-upright-compression-005.html
-== text-combine-upright-compression-005a.html text-combine-upright-compression-005a.html
-== text-combine-upright-compression-006.html text-combine-upright-compression-006.html
-== text-combine-upright-compression-006a.html text-combine-upright-compression-006a.html
-== text-combine-upright-compression-007.html text-combine-upright-compression-007.html
-
-== text-orientation-upright-directionality-001.html text-orientation-upright-directionality-001.html
-
-== logical-physical-mapping-001.html logical-physical-mapping-001.html
diff --git a/layout/reftests/web-animations/reftest-stylo.list b/layout/reftests/web-animations/reftest-stylo.list
deleted file mode 100644
index cc9fbfdff..000000000
--- a/layout/reftests/web-animations/reftest-stylo.list
+++ /dev/null
@@ -1,9 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-skip test-pref(dom.animations-api.core.enabled,true) == 1246046-1.html 1246046-1.html
-skip test-pref(dom.animations-api.core.enabled,true) == 1267937-1.html 1267937-1.html
-skip test-pref(dom.animations-api.core.enabled,true) == stacking-context-transform-none-animation-before-appending-element.html stacking-context-transform-none-animation-before-appending-element.html
-skip test-pref(dom.animations-api.core.enabled,true) == stacking-context-opacity-changing-keyframe.html stacking-context-opacity-changing-keyframe.html
-skip test-pref(dom.animations-api.core.enabled,true) == stacking-context-opacity-changing-target.html stacking-context-opacity-changing-target.html
-skip test-pref(dom.animations-api.core.enabled,true) == stacking-context-transform-changing-keyframe.html stacking-context-transform-changing-keyframe.html
-skip test-pref(dom.animations-api.core.enabled,true) == stacking-context-transform-changing-target.html stacking-context-transform-changing-target.html
-skip test-pref(dom.animations-api.core.enabled,true) == stacking-context-transform-changing-display-property.html stacking-context-transform-changing-display-property.html
diff --git a/layout/reftests/web-animations/reftest.list b/layout/reftests/web-animations/reftest.list
index eefd41f49..da1d07089 100644
--- a/layout/reftests/web-animations/reftest.list
+++ b/layout/reftests/web-animations/reftest.list
@@ -15,6 +15,6 @@ test-pref(dom.animations-api.core.enabled,true) == stacking-context-transform-ch
test-pref(dom.animations-api.core.enabled,true) == stacking-context-transform-changing-effect.html stacking-context-animation-ref.html
test-pref(dom.animations-api.core.enabled,true) == stacking-context-transform-changing-display-property.html stacking-context-animation-ref.html
test-pref(dom.animations-api.core.enabled,true) == stacking-context-transform-losing-css-animation-in-delay.html stacking-context-animation-ref.html
-test-pref(dom.animations-api.core.enabled,true) == style-updates-on-iteration-composition-changed-from-accumulate-to-replace.html style-updates-for-iteration-composite-ref.html
-test-pref(dom.animations-api.core.enabled,true) == style-updates-on-iteration-composition-changed-from-replace-to-accumulate.html style-updates-for-iteration-composite-ref.html
-test-pref(dom.animations-api.core.enabled,true) == style-updates-on-current-iteration-changed.html style-updates-for-iteration-composite-ref.html
+test-pref(dom.animations-api.core.enabled,true) test-pref(dom.animations-api.compositing.enabled,true) == style-updates-on-iteration-composition-changed-from-accumulate-to-replace.html style-updates-for-iteration-composite-ref.html
+test-pref(dom.animations-api.core.enabled,true) test-pref(dom.animations-api.compositing.enabled,true) == style-updates-on-iteration-composition-changed-from-replace-to-accumulate.html style-updates-for-iteration-composite-ref.html
+test-pref(dom.animations-api.core.enabled,true) test-pref(dom.animations-api.compositing.enabled,true) == style-updates-on-current-iteration-changed.html style-updates-for-iteration-composite-ref.html
diff --git a/layout/reftests/webcomponents/adjacent-insertion-points-1-ref.html b/layout/reftests/webcomponents/adjacent-insertion-points-1-ref.html
deleted file mode 100644
index 2c1f4e341..000000000
--- a/layout/reftests/webcomponents/adjacent-insertion-points-1-ref.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<body>
-<div><span>Hello</span><span>World</span></div>
-</body>
-</html>
diff --git a/layout/reftests/webcomponents/adjacent-insertion-points-1.html b/layout/reftests/webcomponents/adjacent-insertion-points-1.html
deleted file mode 100644
index a8c6f983d..000000000
--- a/layout/reftests/webcomponents/adjacent-insertion-points-1.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
- <script>
- function tweak() {
- var oldShadowRoot = document.getElementById('outer').createShadowRoot();
- oldShadowRoot.innerHTML = 'World';
-
- var youngShadowRoot = document.getElementById('outer').createShadowRoot();
- youngShadowRoot.innerHTML = 'Hello<content></content><shadow></shadow>';
- }
- </script>
-</head>
-<body onload="tweak()">
-<div id="outer"></div>
-</body>
-</html>
diff --git a/layout/reftests/webcomponents/adjacent-insertion-points-2-ref.html b/layout/reftests/webcomponents/adjacent-insertion-points-2-ref.html
deleted file mode 100644
index 2c1f4e341..000000000
--- a/layout/reftests/webcomponents/adjacent-insertion-points-2-ref.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<body>
-<div><span>Hello</span><span>World</span></div>
-</body>
-</html>
diff --git a/layout/reftests/webcomponents/adjacent-insertion-points-2.html b/layout/reftests/webcomponents/adjacent-insertion-points-2.html
deleted file mode 100644
index f90cb206b..000000000
--- a/layout/reftests/webcomponents/adjacent-insertion-points-2.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
- <script>
- function tweak() {
- var oldShadowRoot = document.getElementById('outer').createShadowRoot();
- oldShadowRoot.innerHTML = 'Hello';
-
- var youngShadowRoot = document.getElementById('outer').createShadowRoot();
- youngShadowRoot.innerHTML = '<shadow></shadow><content></content>World';
- }
- </script>
-</head>
-<body onload="tweak()">
-<div id="outer"></div>
-</body>
-</html>
diff --git a/layout/reftests/webcomponents/basic-insertion-point-1-ref.html b/layout/reftests/webcomponents/basic-insertion-point-1-ref.html
deleted file mode 100644
index 16f6afb28..000000000
--- a/layout/reftests/webcomponents/basic-insertion-point-1-ref.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<body>
-<div>
- <div style="border: 10px solid green">Hello</div>
-</div>
-</body>
-</html>
diff --git a/layout/reftests/webcomponents/basic-insertion-point-1.html b/layout/reftests/webcomponents/basic-insertion-point-1.html
deleted file mode 100644
index 727175ef3..000000000
--- a/layout/reftests/webcomponents/basic-insertion-point-1.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
- <script>
- function tweak() {
- // div with style "border: 10px solid green"
- var shadowDiv = document.createElement("div");
- shadowDiv.style.border = "10px solid green";
-
- var insertionPoint = document.createElement("content");
- shadowDiv.appendChild(insertionPoint);
-
- var shadowRoot = document.getElementById('outer').createShadowRoot();
- shadowRoot.appendChild(shadowDiv);
- }
- </script>
-</head>
-<body onload="tweak()">
-<div id="outer">Hello</div>
-</body>
-</html>
diff --git a/layout/reftests/webcomponents/basic-insertion-point-2-ref.html b/layout/reftests/webcomponents/basic-insertion-point-2-ref.html
deleted file mode 100644
index 5e9213775..000000000
--- a/layout/reftests/webcomponents/basic-insertion-point-2-ref.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<body>
-<div>
- <div style="border: 10px solid green">
- <span style="background-color: purple">Hello</span>
- <span style="background-color: orange">World</span>
- </div>
-</div>
-</body>
-</html>
diff --git a/layout/reftests/webcomponents/basic-insertion-point-2.html b/layout/reftests/webcomponents/basic-insertion-point-2.html
deleted file mode 100644
index 595edb471..000000000
--- a/layout/reftests/webcomponents/basic-insertion-point-2.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
- <script>
- function tweak() {
- // div with style "border: 10px solid green"
- var shadowDiv = document.createElement("div");
- shadowDiv.style.border = "10px solid green";
-
- var insertionPoint = document.createElement("content");
- shadowDiv.appendChild(insertionPoint);
-
- var shadowRoot = document.getElementById('outer').createShadowRoot();
- shadowRoot.appendChild(shadowDiv);
- }
- </script>
-</head>
-<body onload="tweak()">
-<div id="outer">
- <span style="background-color: purple">Hello</span>
- <span style="background-color: orange">World</span>
-</div>
-</body>
-</html>
diff --git a/layout/reftests/webcomponents/basic-shadow-1.html b/layout/reftests/webcomponents/basic-shadow-1.html
index 944a594d2..8949dfc6d 100644
--- a/layout/reftests/webcomponents/basic-shadow-1.html
+++ b/layout/reftests/webcomponents/basic-shadow-1.html
@@ -9,7 +9,7 @@
shadowDiv.style.height = "100px";
shadowDiv.style.backgroundColor = "green";
- var shadowRoot = document.getElementById('outer').createShadowRoot();
+ var shadowRoot = document.getElementById('outer').attachShadow({mode: 'open'});
shadowRoot.appendChild(shadowDiv);
}
</script>
diff --git a/layout/reftests/webcomponents/basic-shadow-2.html b/layout/reftests/webcomponents/basic-shadow-2.html
index 587c47221..8e066997d 100644
--- a/layout/reftests/webcomponents/basic-shadow-2.html
+++ b/layout/reftests/webcomponents/basic-shadow-2.html
@@ -6,7 +6,7 @@
var shadowDiv = document.createElement("div");
shadowDiv.style.border = "10px solid green";
- var shadowRoot = document.getElementById('outer').createShadowRoot();
+ var shadowRoot = document.getElementById('outer').attachShadow({mode: 'open'});
shadowRoot.appendChild(shadowDiv);
var orangeDiv = document.createElement("div");
diff --git a/layout/reftests/webcomponents/basic-shadow-3.html b/layout/reftests/webcomponents/basic-shadow-3.html
index 2ae53b5a9..3226c4baa 100644
--- a/layout/reftests/webcomponents/basic-shadow-3.html
+++ b/layout/reftests/webcomponents/basic-shadow-3.html
@@ -6,7 +6,7 @@
var shadowDiv = document.createElement("div");
shadowDiv.style.border = "10px solid green";
- var shadowRoot = document.getElementById('outer').createShadowRoot();
+ var shadowRoot = document.getElementById('outer').attachShadow({mode: 'open'});
shadowRoot.appendChild(shadowDiv);
var orangeDiv = document.createElement("div");
diff --git a/layout/reftests/webcomponents/basic-shadow-4.html b/layout/reftests/webcomponents/basic-shadow-4.html
index 70f91773e..39dc51a9e 100644
--- a/layout/reftests/webcomponents/basic-shadow-4.html
+++ b/layout/reftests/webcomponents/basic-shadow-4.html
@@ -6,7 +6,7 @@
var shadowDiv = document.createElement("div");
shadowDiv.style.border = "10px solid green";
- var shadowRoot = document.getElementById('outer').createShadowRoot();
+ var shadowRoot = document.getElementById('outer').attachShadow({mode: 'open'});
shadowRoot.appendChild(shadowDiv);
var orangeDiv = document.createElement("div");
diff --git a/layout/reftests/webcomponents/basic-shadow-element-1-ref.html b/layout/reftests/webcomponents/basic-shadow-element-1-ref.html
deleted file mode 100644
index a47b9362a..000000000
--- a/layout/reftests/webcomponents/basic-shadow-element-1-ref.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-</head>
-<body>
-<div>
- <div style="width:100px; height:100px; background-color:green"></div><div style="width:100px; height:100px; background-color:orange">Hello World</div>
-</div>
-</body>
-</html>
diff --git a/layout/reftests/webcomponents/basic-shadow-element-1.html b/layout/reftests/webcomponents/basic-shadow-element-1.html
deleted file mode 100644
index e51bd8b72..000000000
--- a/layout/reftests/webcomponents/basic-shadow-element-1.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
- <script>
- function tweak() {
- var olderShadow = document.getElementById('outer').createShadowRoot();
- olderShadow.innerHTML = '<div style="width:100px; height:100px; background-color: orange"><content></content></div>';
-
- var youngerShadow = document.getElementById('outer').createShadowRoot();
- youngerShadow.innerHTML = '<div style="width:100px; height:100px; background-color: green"></div><shadow>Hello World</shadow>';
- }
- </script>
-</head>
-<body onload="tweak()">
-<div id="outer">
- <div style="width:300px; height:100px; background-color:red;"></div>
-</div>
-</body>
-</html>
diff --git a/layout/reftests/webcomponents/basic-slot-1-ref.html b/layout/reftests/webcomponents/basic-slot-1-ref.html
new file mode 100644
index 000000000..4f7418498
--- /dev/null
+++ b/layout/reftests/webcomponents/basic-slot-1-ref.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <style>
+ body { color: green; }
+ </style>
+ </head>
+ <body>
+ This text should be green
+ </body>
+</html>
diff --git a/layout/reftests/webcomponents/basic-slot-1.html b/layout/reftests/webcomponents/basic-slot-1.html
new file mode 100644
index 000000000..b31f4c1c3
--- /dev/null
+++ b/layout/reftests/webcomponents/basic-slot-1.html
@@ -0,0 +1,6 @@
+<!DOCTYPE HTML>
+<html>
+ <body>
+ <slot style="color: green">This text should be green</slot>
+ </body>
+</html>
diff --git a/layout/reftests/webcomponents/basic-slot-2-ref.html b/layout/reftests/webcomponents/basic-slot-2-ref.html
new file mode 100644
index 000000000..d4d1b8c06
--- /dev/null
+++ b/layout/reftests/webcomponents/basic-slot-2-ref.html
@@ -0,0 +1,16 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+ <style>
+ div {
+ width: 100px;
+ height: 100px;
+ background: green;
+ }
+ </style>
+</head>
+<body>
+ <p>There should be a green box below.</p>
+ <div></div>
+</body>
+</html>
diff --git a/layout/reftests/webcomponents/basic-slot-2.html b/layout/reftests/webcomponents/basic-slot-2.html
new file mode 100644
index 000000000..3754ace20
--- /dev/null
+++ b/layout/reftests/webcomponents/basic-slot-2.html
@@ -0,0 +1,7 @@
+<!DOCTYPE HTML>
+<html>
+ <body>
+ <p>There should be a green box below.</p>
+ <slot style="display: block; width: 100px; height: 100px; background: green;"></slot>
+ </body>
+</html>
diff --git a/layout/reftests/webcomponents/basic-slot-3-ref.html b/layout/reftests/webcomponents/basic-slot-3-ref.html
new file mode 100644
index 000000000..54be54848
--- /dev/null
+++ b/layout/reftests/webcomponents/basic-slot-3-ref.html
@@ -0,0 +1,8 @@
+<!DOCTYPE HTML>
+<html>
+<body>
+<div>
+ <div style="color: green">This text should be green</div>
+</div>
+</body>
+</html>
diff --git a/layout/reftests/webcomponents/basic-slot-3.html b/layout/reftests/webcomponents/basic-slot-3.html
new file mode 100644
index 000000000..c00483fe2
--- /dev/null
+++ b/layout/reftests/webcomponents/basic-slot-3.html
@@ -0,0 +1,18 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+ <script>
+ function tweak() {
+ var slot = document.createElement("slot");
+ slot.style.color = "green";
+
+ var shadowRoot =
+ document.getElementById('outer').attachShadow({mode: 'open'});
+ shadowRoot.appendChild(slot);
+ }
+ </script>
+</head>
+<body onload="tweak()">
+<div id="outer">This text should be green</div>
+</body>
+</html>
diff --git a/layout/reftests/webcomponents/basic-slot-4.html b/layout/reftests/webcomponents/basic-slot-4.html
new file mode 100644
index 000000000..496a92651
--- /dev/null
+++ b/layout/reftests/webcomponents/basic-slot-4.html
@@ -0,0 +1,20 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+ <script>
+ function tweak() {
+ var slot = document.createElement("slot");
+ // The border shouldn't be visible, due to display: contents.
+ slot.style.border = "1px solid red";
+ slot.style.color = "green";
+
+ var shadowRoot =
+ document.getElementById('outer').attachShadow({mode: 'open'});
+ shadowRoot.appendChild(slot);
+ }
+ </script>
+</head>
+<body onload="tweak()">
+<div id="outer">This text should be green</div>
+</body>
+</html>
diff --git a/layout/reftests/webcomponents/cross-tree-selection-1.html b/layout/reftests/webcomponents/cross-tree-selection-1.html
index 1e4f02747..01e7317f2 100644
--- a/layout/reftests/webcomponents/cross-tree-selection-1.html
+++ b/layout/reftests/webcomponents/cross-tree-selection-1.html
@@ -3,6 +3,11 @@
<head>
<script>
function tweak() {
+ if (!document.body.createShadowRoot) {
+ document.documentElement.className = "";
+ return;
+ }
+
var host = document.getElementById("host");
var shadow = host.createShadowRoot();
diff --git a/layout/reftests/webcomponents/dynamic-insertion-point-distribution-1.html b/layout/reftests/webcomponents/dynamic-insertion-point-distribution-1.html
index c57f72b37..8919a9c6a 100644
--- a/layout/reftests/webcomponents/dynamic-insertion-point-distribution-1.html
+++ b/layout/reftests/webcomponents/dynamic-insertion-point-distribution-1.html
@@ -5,9 +5,13 @@
<body>
<div id="host"></div>
<script>
- var host = document.getElementById("host");
- var root = host.createShadowRoot();
- root.innerHTML = 'a <content></content> c';
+ var host, root;
+
+ function run() {
+ host = document.getElementById("host");
+ root = host.createShadowRoot();
+ root.innerHTML = 'a <content></content> c';
+ }
function tweak() {
var span = document.createElement("span");
@@ -19,7 +23,12 @@
document.documentElement.removeAttribute("class");
}
- window.addEventListener("MozReftestInvalidate", tweak, false);
+ if (document.body.createShadowRoot) {
+ run();
+ window.addEventListener("MozReftestInvalidate", tweak, false);
+ } else {
+ document.documentElement.className = "";
+ }
</script>
</body>
</html>
diff --git a/layout/reftests/webcomponents/dynamic-insertion-point-distribution-2.html b/layout/reftests/webcomponents/dynamic-insertion-point-distribution-2.html
index 29a850e90..c58b9cfbd 100644
--- a/layout/reftests/webcomponents/dynamic-insertion-point-distribution-2.html
+++ b/layout/reftests/webcomponents/dynamic-insertion-point-distribution-2.html
@@ -5,9 +5,13 @@
<body>
<div id="host"></div>
<script>
- var host = document.getElementById("host");
- var root = host.createShadowRoot();
- root.innerHTML = "<span>a</span>";
+ var host, root;
+
+ function run() {
+ host = document.getElementById("host");
+ root = host.createShadowRoot();
+ root.innerHTML = "<span>a</span>";
+ }
function tweak() {
var span = document.createElement("span");
@@ -20,7 +24,12 @@
document.documentElement.removeAttribute("class");
}
- window.addEventListener("MozReftestInvalidate", tweak, false);
+ if (document.body.createShadowRoot) {
+ run();
+ window.addEventListener("MozReftestInvalidate", tweak);
+ } else {
+ document.documentElement.className = "";
+ }
</script>
</body>
</html>
diff --git a/layout/reftests/webcomponents/dynamic-shadow-element-1-ref.html b/layout/reftests/webcomponents/dynamic-shadow-element-1-ref.html
deleted file mode 100644
index a3b5150f6..000000000
--- a/layout/reftests/webcomponents/dynamic-shadow-element-1-ref.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-</head>
-<body>
-<div>
- <div style="background-color: green"><span>Hello</span><span> </span><span>World</span></div>
-</div>
-</body>
-</html>
diff --git a/layout/reftests/webcomponents/dynamic-shadow-element-1.html b/layout/reftests/webcomponents/dynamic-shadow-element-1.html
deleted file mode 100644
index 0142164a1..000000000
--- a/layout/reftests/webcomponents/dynamic-shadow-element-1.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
- <script>
- function tweak() {
- var oldestShadow = document.getElementById('outer').createShadowRoot();
- oldestShadow.innerHTML = 'Hello';
-
- var olderShadow = document.getElementById('outer').createShadowRoot();
-
- var youngerShadow = document.getElementById('outer').createShadowRoot();
- youngerShadow.innerHTML = '<div style="background-color:green"><shadow></shadow></div>';
-
- olderShadow.innerHTML = '<shadow></shadow> World';
- }
- </script>
-</head>
-<body onload="tweak()">
-<div id="outer">
- <div style="width:300px; height:100px; background-color:red;"></div>
-</div>
-</body>
-</html>
diff --git a/layout/reftests/webcomponents/fallback-content-1.html b/layout/reftests/webcomponents/fallback-content-1.html
index ac3b5d02a..0bcd2abbd 100644
--- a/layout/reftests/webcomponents/fallback-content-1.html
+++ b/layout/reftests/webcomponents/fallback-content-1.html
@@ -8,13 +8,13 @@
shadowDiv.style.border = "10px solid green";
// Insertion point will match nothing and use fallback content.
- var insertionPoint = document.createElement("content");
- shadowDiv.appendChild(insertionPoint);
+ var slot = document.createElement("slot");
+ shadowDiv.appendChild(slot);
// Append three nodes as children to use as fallback content.
- insertionPoint.innerHTML = '<span style="background-color: orange">Hello</span> <span style="background-color: green">World</span>';
+ slot.innerHTML = '<span style="background-color: orange">Hello</span> <span style="background-color: green">World</span>';
- var shadowRoot = document.getElementById('outer').createShadowRoot();
+ var shadowRoot = document.getElementById('outer').attachShadow({mode: 'open'});
shadowRoot.appendChild(shadowDiv);
}
</script>
diff --git a/layout/reftests/webcomponents/input-transition-1.html b/layout/reftests/webcomponents/input-transition-1.html
index ede0fa40b..a4be5271b 100644
--- a/layout/reftests/webcomponents/input-transition-1.html
+++ b/layout/reftests/webcomponents/input-transition-1.html
@@ -5,19 +5,28 @@
<body>
<div id="host"></div>
<script>
- var host = document.getElementById("host");
- var root = host.createShadowRoot();
- root.innerHTML = '<style>input ~ div { background: red; transition: background 100ms; } input:checked ~ div { background: green; }</style><input id="one" type="checkbox"><div style="height: 50px; width: 50px;"></div>';
+ var host, root;
+
+ function run() {
+ host = document.getElementById("host");
+ root = host.createShadowRoot();
+ root.innerHTML = '<style>input ~ div { background: red; transition: background 100ms; } input:checked ~ div { background: green; }</style><input id="one" type="checkbox"><div style="height: 50px; width: 50px;"></div>';
+ }
function tweak() {
- var el = root.getElementById("one");
- el.checked = true;
- el.nextSibling.addEventListener("transitionend", function() {
- document.documentElement.removeAttribute("class");
- }, false);
+ var el = root.getElementById("one");
+ el.checked = true;
+ el.nextSibling.addEventListener("transitionend", function() {
+ setTimeout(()=>{document.documentElement.removeAttribute("class")}, 1000); // wait for the checkbox SVG image to load on Android
+ });
}
- window.addEventListener("MozReftestInvalidate", tweak, false);
+ if (document.body.createShadowRoot) {
+ run();
+ window.addEventListener("MozReftestInvalidate", tweak);
+ } else {
+ document.documentElement.className = "";
+ }
</script>
</body>
</html>
diff --git a/layout/reftests/webcomponents/nested-insertion-point-1.html b/layout/reftests/webcomponents/nested-insertion-point-1.html
index 66892029a..3d0d92f0d 100644
--- a/layout/reftests/webcomponents/nested-insertion-point-1.html
+++ b/layout/reftests/webcomponents/nested-insertion-point-1.html
@@ -7,19 +7,20 @@
var outerShadow = document.createElement("div");
outerShadow.style.border = "10px solid green";
- var outerInsertionPoint = document.createElement("content");
+ var outerInsertionPoint = document.createElement("slot");
outerShadow.appendChild(outerInsertionPoint);
// div with style "border: 10px solid orange"
var innerShadow = document.createElement("div");
innerShadow.style.border = "10px solid orange";
- var innerInsertionPoint = document.createElement("content");
- innerShadow.appendChild(innerInsertionPoint);
+ var slot = document.createElement("slot");
+ innerShadow.appendChild(slot);
- outerShadow.createShadowRoot().appendChild(innerShadow);
+ outerShadow.attachShadow({mode: 'open'}).appendChild(innerShadow);
- var shadowRoot = document.getElementById('outer').createShadowRoot();
+ var shadowRoot =
+ document.getElementById('outer').attachShadow({mode: 'open'});
shadowRoot.appendChild(outerShadow);
}
</script>
diff --git a/layout/reftests/webcomponents/nested-shadow-element-1.html b/layout/reftests/webcomponents/nested-shadow-element-1.html
deleted file mode 100644
index cfaad3d49..000000000
--- a/layout/reftests/webcomponents/nested-shadow-element-1.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
- <script>
- function tweak() {
- var olderShadow = document.getElementById('outer').createShadowRoot();
- olderShadow.innerHTML = '<content></content><span>World</span>';
-
- var youngerShadow = document.getElementById('outer').createShadowRoot();
- youngerShadow.innerHTML = '<div id="shadowparent"><shadow id="youngshadow"><span>Hello</span></shadow></div>';
-
- var shadowParent = youngerShadow.getElementById("shadowparent");
- var nestedShadow = shadowParent.createShadowRoot();
- nestedShadow.innerHTML = '<div style="background-color: green"><content></content></div>';
-
- // Dynamically append a span to the shadow element in the younger ShadowRoot to make sure
- // it is projected into the nested shadow.
- var appendedSpan = document.createElement("span");
- appendedSpan.textContent = ' ';
- youngerShadow.getElementById("youngshadow").appendChild(appendedSpan);
- }
- </script>
-</head>
-<body onload="tweak()">
-<div id="outer">
- <div style="width:300px; height:100px; background-color:red;"></div>
-</div>
-</body>
-</html>
diff --git a/layout/reftests/webcomponents/reframe-shadow-child-1.html b/layout/reftests/webcomponents/reframe-shadow-child-1.html
new file mode 100644
index 000000000..d953beb6d
--- /dev/null
+++ b/layout/reftests/webcomponents/reframe-shadow-child-1.html
@@ -0,0 +1,16 @@
+<!doctype html>
+<template id="tmpl">
+ <div style="display: table">
+ Some text
+ <span style="display: table-cell">something</span>
+ More text
+ </div>
+</template>
+<div id="host"></div>
+<script>
+ let shadowRoot = document.getElementById("host").attachShadow({mode: 'open'});
+ let tmpl = document.getElementById("tmpl");
+ shadowRoot.appendChild(document.importNode(tmpl.content, true));
+ document.body.offsetTop;
+ shadowRoot.firstElementChild.querySelector("span").remove();
+</script>
diff --git a/layout/reftests/webcomponents/reframe-shadow-child-2.html b/layout/reftests/webcomponents/reframe-shadow-child-2.html
new file mode 100644
index 000000000..0ebbe7433
--- /dev/null
+++ b/layout/reftests/webcomponents/reframe-shadow-child-2.html
@@ -0,0 +1,15 @@
+<!doctype html>
+<template id="tmpl">
+ <div style="display: block">
+ Some text
+ More text
+ </div>
+</template>
+<div id="host"></div>
+<script>
+ let shadowRoot = document.getElementById("host").attachShadow({mode: 'open'});
+ let tmpl = document.getElementById("tmpl");
+ shadowRoot.appendChild(document.importNode(tmpl.content, true));
+ document.body.offsetTop;
+ shadowRoot.firstElementChild.style.display = "table";
+</script>
diff --git a/layout/reftests/webcomponents/reftest-stylo.list b/layout/reftests/webcomponents/reftest-stylo.list
deleted file mode 100644
index 8271f1a5a..000000000
--- a/layout/reftests/webcomponents/reftest-stylo.list
+++ /dev/null
@@ -1,22 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-pref(dom.webcomponents.enabled,true) == cross-tree-selection-1.html cross-tree-selection-1.html
-pref(dom.webcomponents.enabled,true) == basic-shadow-1.html basic-shadow-1.html
-pref(dom.webcomponents.enabled,true) == basic-shadow-2.html basic-shadow-2.html
-pref(dom.webcomponents.enabled,true) == basic-shadow-3.html basic-shadow-3.html
-pref(dom.webcomponents.enabled,true) == basic-shadow-4.html basic-shadow-4.html
-pref(dom.webcomponents.enabled,true) == basic-insertion-point-1.html basic-insertion-point-1.html
-pref(dom.webcomponents.enabled,true) == basic-insertion-point-2.html basic-insertion-point-2.html
-pref(dom.webcomponents.enabled,true) == adjacent-insertion-points-1.html adjacent-insertion-points-1.html
-pref(dom.webcomponents.enabled,true) == adjacent-insertion-points-2.html adjacent-insertion-points-2.html
-pref(dom.webcomponents.enabled,true) == fallback-content-1.html fallback-content-1.html
-pref(dom.webcomponents.enabled,true) == remove-insertion-point-1.html remove-insertion-point-1.html
-pref(dom.webcomponents.enabled,true) == nested-insertion-point-1.html nested-insertion-point-1.html
-pref(dom.webcomponents.enabled,true) == basic-shadow-element-1.html basic-shadow-element-1.html
-pref(dom.webcomponents.enabled,true) == nested-shadow-element-1.html nested-shadow-element-1.html
-pref(dom.webcomponents.enabled,true) == update-dist-node-descendants-1.html update-dist-node-descendants-1.html
-skip pref(dom.webcomponents.enabled,true) random-if((B2G&&browserIsRemote)||Mulet) == input-transition-1.html input-transition-1.html
-# Failure on B2G emulator due to Bug 1018381
-# Initial mulet triage: parity with B2G/B2G Desktop
-pref(dom.webcomponents.enabled,true) == dynamic-insertion-point-distribution-1.html dynamic-insertion-point-distribution-1.html
-skip pref(dom.webcomponents.enabled,true) == dynamic-insertion-point-distribution-2.html dynamic-insertion-point-distribution-2.html
-skip pref(dom.webcomponents.enabled,true) == remove-append-shadow-host-1.html remove-append-shadow-host-1.html
diff --git a/layout/reftests/webcomponents/reftest.list b/layout/reftests/webcomponents/reftest.list
index beba21b18..6afbc2720 100644
--- a/layout/reftests/webcomponents/reftest.list
+++ b/layout/reftests/webcomponents/reftest.list
@@ -3,17 +3,17 @@ pref(dom.webcomponents.enabled,true) == basic-shadow-1.html basic-shadow-1-ref.h
pref(dom.webcomponents.enabled,true) == basic-shadow-2.html basic-shadow-2-ref.html
pref(dom.webcomponents.enabled,true) == basic-shadow-3.html basic-shadow-3-ref.html
pref(dom.webcomponents.enabled,true) == basic-shadow-4.html basic-shadow-4-ref.html
-pref(dom.webcomponents.enabled,true) == basic-insertion-point-1.html basic-insertion-point-1-ref.html
-pref(dom.webcomponents.enabled,true) == basic-insertion-point-2.html basic-insertion-point-2-ref.html
-pref(dom.webcomponents.enabled,true) == adjacent-insertion-points-1.html adjacent-insertion-points-1-ref.html
-pref(dom.webcomponents.enabled,true) == adjacent-insertion-points-2.html adjacent-insertion-points-2-ref.html
pref(dom.webcomponents.enabled,true) == fallback-content-1.html fallback-content-1-ref.html
pref(dom.webcomponents.enabled,true) == remove-insertion-point-1.html remove-insertion-point-1-ref.html
-pref(dom.webcomponents.enabled,true) == nested-insertion-point-1.html nested-insertion-point-1-ref.html
-pref(dom.webcomponents.enabled,true) == basic-shadow-element-1.html basic-shadow-element-1-ref.html
-pref(dom.webcomponents.enabled,true) == nested-shadow-element-1.html nested-shadow-element-1-ref.html
-pref(dom.webcomponents.enabled,true) == update-dist-node-descendants-1.html update-dist-node-descendants-1-ref.html
+#bug 1421542 pref(dom.webcomponents.enabled,true) == nested-insertion-point-1.html nested-insertion-point-1-ref.html
+#bug 1421542 pref(dom.webcomponents.enabled,true) == update-dist-node-descendants-1.html update-dist-node-descendants-1-ref.html
pref(dom.webcomponents.enabled,true) == input-transition-1.html input-transition-1-ref.html
-pref(dom.webcomponents.enabled,true) == dynamic-insertion-point-distribution-1.html dynamic-insertion-point-distribution-1-ref.html
+#bug 1421542 pref(dom.webcomponents.enabled,true) == dynamic-insertion-point-distribution-1.html dynamic-insertion-point-distribution-1-ref.html
pref(dom.webcomponents.enabled,true) == dynamic-insertion-point-distribution-2.html dynamic-insertion-point-distribution-2-ref.html
pref(dom.webcomponents.enabled,true) == remove-append-shadow-host-1.html remove-append-shadow-host-1-ref.html
+pref(dom.webcomponents.enabled,true) == basic-slot-1.html basic-slot-1-ref.html
+pref(dom.webcomponents.enabled,true) == basic-slot-2.html basic-slot-2-ref.html
+pref(dom.webcomponents.enabled,true) == basic-slot-3.html basic-slot-3-ref.html
+pref(dom.webcomponents.enabled,true) == basic-slot-4.html basic-slot-3-ref.html
+pref(dom.webcomponents.enabled,true) == basic-slot-5.html basic-slot-5-ref.html
+pref(dom.webcomponents.enabled,true) == basic-slot-6.html basic-slot-6-ref.html
diff --git a/layout/reftests/webcomponents/remove-append-shadow-host-1.html b/layout/reftests/webcomponents/remove-append-shadow-host-1.html
index 85161565e..1a752eba6 100644
--- a/layout/reftests/webcomponents/remove-append-shadow-host-1.html
+++ b/layout/reftests/webcomponents/remove-append-shadow-host-1.html
@@ -6,7 +6,7 @@
<div id="container"><div id="host"></div></div>
<script>
var host = document.getElementById("host");
- var root = host.createShadowRoot();
+ var root = host.attachShadow({mode: 'open'});
root.innerHTML = 'inside shadow DOM';
var container = document.getElementById("container");
diff --git a/layout/reftests/webcomponents/remove-insertion-point-1.html b/layout/reftests/webcomponents/remove-insertion-point-1.html
index 195673ca8..1b7588daf 100644
--- a/layout/reftests/webcomponents/remove-insertion-point-1.html
+++ b/layout/reftests/webcomponents/remove-insertion-point-1.html
@@ -8,15 +8,15 @@
shadowDiv.style.border = "10px solid green";
// Insertion point will match nothing and use fallback content.
- var insertionPoint = document.createElement("content");
- shadowDiv.appendChild(insertionPoint);
+ var slot = document.createElement("slot");
+ shadowDiv.appendChild(slot);
- var shadowRoot = document.getElementById('outer').createShadowRoot();
+ var shadowRoot = document.getElementById('outer').attachShadow({mode: 'open'});
shadowRoot.appendChild(shadowDiv);
// Remove the insertion point from the ShadowRoot, "Hello" should no
// longer be rendered.
- shadowDiv.removeChild(insertionPoint);
+ shadowDiv.removeChild(slot);
}
</script>
</head>
diff --git a/layout/reftests/webcomponents/style-sharing-across-shadow.html b/layout/reftests/webcomponents/style-sharing-across-shadow.html
new file mode 100644
index 000000000..b41cf7479
--- /dev/null
+++ b/layout/reftests/webcomponents/style-sharing-across-shadow.html
@@ -0,0 +1,22 @@
+<!doctype html>
+<style>
+ div { display: contents }
+</style>
+<div></div>
+<div></div>
+<script>
+ let divs = document.querySelectorAll('div');
+ divs[0].attachShadow({mode: 'open'}).innerHTML = `
+ <style>
+ * { color: green; }
+ </style>
+ <span>Should be green</span>
+ `;
+ divs[1].attachShadow({mode: 'open'}).innerHTML = `
+ <style>
+ * { color: initial; }
+ [foo] { }
+ </style>
+ <span>Should not be green</span>
+ `;
+</script>
diff --git a/layout/reftests/webcomponents/style-sharing.html b/layout/reftests/webcomponents/style-sharing.html
new file mode 100644
index 000000000..0a1e3c95c
--- /dev/null
+++ b/layout/reftests/webcomponents/style-sharing.html
@@ -0,0 +1,14 @@
+<!doctype html>
+<div id="host"></div>
+<script>
+ let root = host.attachShadow({mode: 'open'});
+ root.innerHTML = `
+ <style>
+ #test {
+ color: green;
+ }
+ </style>
+ <span id="test">Should be green</span>
+ <span id="test2">Should not be green</span>
+ `;
+</script>
diff --git a/layout/reftests/webcomponents/update-dist-node-descendants-1.html b/layout/reftests/webcomponents/update-dist-node-descendants-1.html
index e2dd4ebb7..3ba96594b 100644
--- a/layout/reftests/webcomponents/update-dist-node-descendants-1.html
+++ b/layout/reftests/webcomponents/update-dist-node-descendants-1.html
@@ -5,17 +5,25 @@
<body>
<div id="outer"><span id="distnode">text</span></div>
<script>
-var shadowRoot = document.getElementById('outer').createShadowRoot();
-shadowRoot.innerHTML = '<div><content></content></div>';
-function tweak() {
- var distNode = document.getElementById("distnode");
- distNode.textContent = "Hello World";
-
- document.documentElement.removeAttribute("class");
+function run() {
+ var shadowRoot = document.getElementById('outer').createShadowRoot();
+ shadowRoot.innerHTML = '<div><content></content></div>';
}
-window.addEventListener("MozReftestInvalidate", tweak);
+ function tweak() {
+ var distNode = document.getElementById("distnode");
+ distNode.textContent = "Hello World";
+
+ document.documentElement.removeAttribute("class");
+ }
+
+if (document.body.createShadowRoot) {
+ run();
+ window.addEventListener("MozReftestInvalidate", tweak);
+} else {
+ document.documentElement.className = "";
+}
</script>
</body>
</html>
diff --git a/layout/reftests/webkit-box/reftest-stylo.list b/layout/reftests/webkit-box/reftest-stylo.list
deleted file mode 100644
index a230fc8c1..000000000
--- a/layout/reftests/webkit-box/reftest-stylo.list
+++ /dev/null
@@ -1,43 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# This directory contains tests for "display: -webkit-box" and associated
-# CSS properties. These tests require webkit prefix support to be enabled.
-default-preferences pref(layout.css.prefixes.webkit,true)
-
-# Tests for anonymous flex item formation inside of a "-webkit-box":
-# Note: some of these tests are marked as failing, because we don't match
-# WebKit/Blink on them. (The reference case represents the WebKit/Blink
-# rendering.) We could probably make them pass by implementing some quirks, if
-# it turns out that the web depends on WebKit/Blink's behavior in these cases.
-== webkit-box-anon-flex-items-1.html webkit-box-anon-flex-items-1.html
-== webkit-box-anon-flex-items-2.html webkit-box-anon-flex-items-2.html
-== webkit-box-anon-flex-items-3.html webkit-box-anon-flex-items-3.html
-
-# Tests for "-webkit-box" & "-webkit-inline-box" as display values:
-== webkit-display-values-1.html webkit-display-values-1.html
-
-# Tests for "-webkit-box-align" (cross-axis alignment):
-== webkit-box-align-horiz-1a.html webkit-box-align-horiz-1a.html
-== webkit-box-align-horiz-1b.html webkit-box-align-horiz-1b.html
-== webkit-box-align-vert-1.html webkit-box-align-vert-1.html
-
-# Tests for "-webkit-box-direction":
-== webkit-box-direction-1.html webkit-box-direction-1.html
-== webkit-box-direction-2.html webkit-box-direction-2.html
-
-# Tests for "-webkit-box-flex" (flexibility of items)
-== webkit-box-flex-1.html webkit-box-flex-1.html
-
-# Tests for "-webkit-box-ordinal-group"
-== webkit-box-ordinal-group-1.html webkit-box-ordinal-group-1.html
-# XXXdholbert The following test fails because we accept "0" as a valid value
-# for -webkit-box-ordinal-group (unlike Chrome/Blink), because that's simply
-# how its aliased property (-moz-box-ordinal-group) behaves. This shouldn't
-# matter in practice; it could only cause trouble if sites accidentally depend
-# on the "0" value being rejected.
-== webkit-box-ordinal-group-2.html webkit-box-ordinal-group-2.html
-== webkit-box-ordinal-group-3.html webkit-box-ordinal-group-3.html
-
-# Tests for "-webkit-box-pack" (main-axis alignment):
-== webkit-box-pack-horiz-1a.html webkit-box-pack-horiz-1a.html
-== webkit-box-pack-horiz-1b.html webkit-box-pack-horiz-1b.html
-== webkit-box-pack-vert-1.html webkit-box-pack-vert-1.html
diff --git a/layout/reftests/webkit-gradient/reftest-stylo.list b/layout/reftests/webkit-gradient/reftest-stylo.list
deleted file mode 100644
index 629e8f184..000000000
--- a/layout/reftests/webkit-gradient/reftest-stylo.list
+++ /dev/null
@@ -1,23 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# This directory contains tests for -webkit-gradient() expressions.
-# They require webkit prefix support to be enabled.
-default-preferences pref(layout.css.prefixes.webkit,true)
-
-# Tests where we don't render a "-webkit-gradient" exactly correctly.
-# (These just ensure that our approximate/do-something rendering does not
-# change unexpectedly.)
-skip fuzzy-if(cocoaWidget,3,3369) == webkit-gradient-approx-linear-1.html webkit-gradient-approx-linear-1.html
-# bug 1225372
-skip == webkit-gradient-approx-radial-1.html webkit-gradient-approx-radial-1.html
-
-# Tests for -webkit-gradient(linear, ...)
-== webkit-gradient-linear-1a.html webkit-gradient-linear-1a.html
-== webkit-gradient-linear-1b.html webkit-gradient-linear-1b.html
-== webkit-gradient-linear-1c.html webkit-gradient-linear-1c.html
-== webkit-gradient-linear-1d.html webkit-gradient-linear-1d.html
-== webkit-gradient-linear-2.html webkit-gradient-linear-2.html
-
-# Tests for -webkit-gradient(radial, ...)
-== webkit-gradient-radial-1a.html webkit-gradient-radial-1a.html
-== webkit-gradient-radial-1b.html webkit-gradient-radial-1b.html
-== webkit-gradient-radial-2.html webkit-gradient-radial-2.html
diff --git a/layout/reftests/webm-video/reftest-stylo.list b/layout/reftests/webm-video/reftest-stylo.list
deleted file mode 100644
index 719c4e312..000000000
--- a/layout/reftests/webm-video/reftest-stylo.list
+++ /dev/null
@@ -1,110 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# NOTE: bug 1084564 covers "fails"/"skip" annotations for b2g/android below:
-fails-if(Android||B2G||Mulet) HTTP(..) == aspect-ratio-1a.xhtml aspect-ratio-1a.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(Android||B2G||Mulet) HTTP(..) == aspect-ratio-1b.xhtml aspect-ratio-1b.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(Android||B2G||Mulet) skip-if(gtkWidget) HTTP(..) == aspect-ratio-2a.xhtml aspect-ratio-2a.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(Android||B2G||Mulet) skip-if(gtkWidget) HTTP(..) == aspect-ratio-2b.xhtml aspect-ratio-2b.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-HTTP(..) == aspect-ratio-3a.xhtml aspect-ratio-3a.xhtml
-HTTP(..) == aspect-ratio-3b.xhtml aspect-ratio-3b.xhtml
-fails-if(Android||B2G||Mulet) random-if(layersGPUAccelerated) == encoded-aspect-ratio-1.html encoded-aspect-ratio-1.html
-# bug 623460 for WinXP
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(Android||B2G||Mulet) HTTP(..) == basic-1.xhtml basic-1.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(Android||B2G||Mulet) HTTP(..) == canvas-1a.xhtml canvas-1a.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(Android||B2G||Mulet) HTTP(..) == canvas-1b.xhtml canvas-1b.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-== clipping-1a.html clipping-1a.html
-== empty-1a.html empty-1a.html
-== empty-1b.html empty-1b.html
-#these is skipped because we hang on the htmlparser tests when this is ran
-random skip-if(Android||B2G||Mulet) HTTP(..) == object-aspect-ratio-1a.xhtml object-aspect-ratio-1a.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-random skip-if(Android||B2G||Mulet) HTTP(..) == object-aspect-ratio-1b.xhtml object-aspect-ratio-1b.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(Android||B2G||Mulet) HTTP(..) == offset-1.xhtml offset-1.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-random skip-if(Android||B2G||Mulet) HTTP(..) == object-aspect-ratio-2a.xhtml object-aspect-ratio-2a.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip random skip-if(Android||B2G||Mulet) HTTP(..) == object-aspect-ratio-2b.xhtml object-aspect-ratio-2b.xhtml
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(Android||B2G||Mulet) fuzzy-if(winWidget,1,56000) fuzzy-if(cocoaWidget,1,56000) HTTP(..) == zoomed-1.xhtml zoomed-1.xhtml
-# bug 778995 for fuzzy
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(Android||B2G||Mulet) == poster-1.html poster-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(Android||B2G||Mulet) == poster-2.html poster-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(Android||B2G||Mulet) == poster-3.html poster-3.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(Android||B2G||Mulet) == poster-4.html poster-4.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(Android||B2G||Mulet) == poster-5.html poster-5.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(Android||B2G||Mulet) == poster-6.html poster-6.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(Android||B2G||Mulet) == poster-7.html poster-7.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(Android||B2G||Mulet) == poster-8.html poster-8.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-random skip-if(Android||B2G||Mulet) == poster-10.html poster-10.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-random skip-if(Android||B2G||Mulet) == poster-11.html poster-11.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-random skip-if(Android||B2G||Mulet) == poster-12.html poster-12.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(Android||B2G||Mulet) == poster-13.html poster-13.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(Android||B2G||Mulet) == poster-15.html poster-15.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-random-if(winWidget) random-if(cocoaWidget) skip-if(Android||B2G||Mulet) == bug686957.html bug686957.html
-# bug 922951 for OS X
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-# Tests for <video src> with 'object-fit' & 'object-position':
-# These tests should be very similar to tests in our w3c-css/submitted/images3
-# reftest directory. They live here because they use WebM video (VP9), and it
-# wouldn't be fair of us to make a W3C testsuite implicitly depend on any
-# particular (non-spec-mandated) video codec.
-default-preferences test-pref(layout.css.object-fit-and-position.enabled,true) test-pref(gfx.ycbcr.accurate-conversion,true)
-skip fails-if(layersGPUAccelerated) skip-if(Android||B2G||Mulet) == object-fit-contain-webm-001.html object-fit-contain-webm-001.html
-# Bug 1083516 for layersGPUAccelerated failures, Bug 1084564 for Android/B2G failures
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(layersGPUAccelerated) skip-if(Android||B2G||Mulet) == object-fit-contain-webm-002.html object-fit-contain-webm-002.html
-# Bug 1083516 for layersGPUAccelerated failures, Bug 1084564 for Android/B2G failures
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(layersGPUAccelerated) skip-if(Android||B2G||Mulet) == object-fit-cover-webm-001.html object-fit-cover-webm-001.html
-# Bug 1083516 for layersGPUAccelerated failures, Bug 1084564 for Android/B2G failures
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(layersGPUAccelerated) skip-if(Android||B2G||Mulet) == object-fit-cover-webm-002.html object-fit-cover-webm-002.html
-# Bug 1083516 for layersGPUAccelerated failures, Bug 1084564 for Android/B2G failures
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip fails-if(layersGPUAccelerated) skip-if(Android||B2G||Mulet) == object-fit-fill-webm-001.html object-fit-fill-webm-001.html
-# Bug 1083516 for layersGPUAccelerated failures, Bug 1084564 for Android/B2G failures
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip fails-if(layersGPUAccelerated) skip-if(Android||B2G||Mulet) == object-fit-fill-webm-002.html object-fit-fill-webm-002.html
-# Bug 1083516 for layersGPUAccelerated failures, Bug 1084564 for Android/B2G failures
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(layersGPUAccelerated) skip-if(Android||B2G||Mulet) == object-fit-none-webm-001.html object-fit-none-webm-001.html
-# Bug 1083516 for layersGPUAccelerated failures, Bug 1084564 for Android/B2G failures
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(layersGPUAccelerated) skip-if(Android||B2G||Mulet) == object-fit-none-webm-002.html object-fit-none-webm-002.html
-# Bug 1083516 for layersGPUAccelerated failures, Bug 1084564 for Android/B2G failures
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(layersGPUAccelerated) skip-if(Android||B2G||Mulet) == object-fit-scale-down-webm-001.html object-fit-scale-down-webm-001.html
-# Bug 1083516 for layersGPUAccelerated failures, Bug 1084564 for Android/B2G failures
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(layersGPUAccelerated) skip-if(Android||B2G||Mulet) == object-fit-scale-down-webm-002.html object-fit-scale-down-webm-002.html
-# Bug 1083516 for layersGPUAccelerated failures, Bug 1084564 for Android/B2G failures
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(layersGPUAccelerated) skip-if(Android||B2G||Mulet) fails == object-position-webm-001.html object-position-webm-001.html
-# Bug 1098417 for across-the-board failure, Bug 1083516 for layersGPUAccelerated failures, Bug 1084564 for Android/B2G failures
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(layersGPUAccelerated) skip-if(Android||B2G||Mulet) fails == object-position-webm-002.html object-position-webm-002.html
-# Bug 1098417 for across-the-board failure, Bug 1083516 for layersGPUAccelerated failures, Bug 1084564 for Android/B2G failures
-# Initial mulet triage: parity with B2G/B2G Desktop
diff --git a/layout/reftests/webm-video/reftest.list b/layout/reftests/webm-video/reftest.list
index 109ad58c8..91532af2b 100644
--- a/layout/reftests/webm-video/reftest.list
+++ b/layout/reftests/webm-video/reftest.list
@@ -1,38 +1,37 @@
-# NOTE: bug 1084564 covers "fails"/"skip" annotations for android below:
-fails-if(Android) HTTP(..) == aspect-ratio-1a.xhtml aspect-ratio-1-ref.html
-fails-if(Android) HTTP(..) == aspect-ratio-1b.xhtml aspect-ratio-1-ref.html
-fails-if(Android) skip-if(gtkWidget) HTTP(..) == aspect-ratio-2a.xhtml aspect-ratio-2-ref.html
-fails-if(Android) skip-if(gtkWidget) HTTP(..) == aspect-ratio-2b.xhtml aspect-ratio-2-ref.html
+HTTP(..) == aspect-ratio-1a.xhtml aspect-ratio-1-ref.html
+HTTP(..) == aspect-ratio-1b.xhtml aspect-ratio-1-ref.html
+skip-if(gtkWidget) HTTP(..) == aspect-ratio-2a.xhtml aspect-ratio-2-ref.html
+skip-if(gtkWidget) HTTP(..) == aspect-ratio-2b.xhtml aspect-ratio-2-ref.html
HTTP(..) == aspect-ratio-3a.xhtml aspect-ratio-3-ref.xhtml
HTTP(..) == aspect-ratio-3b.xhtml aspect-ratio-3-ref.xhtml
-fails-if(Android) random-if(layersGPUAccelerated) == encoded-aspect-ratio-1.html encoded-aspect-ratio-1-ref.html # bug 623460 for WinXP
-fails-if(Android) HTTP(..) == basic-1.xhtml basic-1-ref.html
-skip-if(Android) HTTP(..) == canvas-1a.xhtml basic-1-ref.html
-fails-if(Android) HTTP(..) == canvas-1b.xhtml basic-1-ref.html
+random-if(layersGPUAccelerated) == encoded-aspect-ratio-1.html encoded-aspect-ratio-1-ref.html # bug 623460 for WinXP
+HTTP(..) == basic-1.xhtml basic-1-ref.html
+HTTP(..) == canvas-1a.xhtml basic-1-ref.html
+HTTP(..) == canvas-1b.xhtml basic-1-ref.html
== clipping-1a.html clipping-1-ref.html
== empty-1a.html empty-1-ref.html
== empty-1b.html empty-1-ref.html
#these is skipped because we hang on the htmlparser tests when this is ran
-random skip-if(Android) HTTP(..) == object-aspect-ratio-1a.xhtml aspect-ratio-1-ref.html
-random skip-if(Android) HTTP(..) == object-aspect-ratio-1b.xhtml aspect-ratio-1-ref.html
-skip-if(Android) HTTP(..) == offset-1.xhtml offset-1-ref.html
-random skip-if(Android) HTTP(..) == object-aspect-ratio-2a.xhtml aspect-ratio-2-ref.html
-random skip-if(Android) HTTP(..) == object-aspect-ratio-2b.xhtml aspect-ratio-2-ref.html
-skip-if(Android) fuzzy-if(winWidget,1,56000) fuzzy-if(cocoaWidget,1,56000) HTTP(..) == zoomed-1.xhtml zoomed-1-ref.html # bug 778995 for fuzzy
-skip-if(Android) == poster-1.html poster-ref-blue250x200.html
-skip-if(Android) == poster-2.html poster-ref-black140x100.html
-skip-if(Android) == poster-3.html poster-ref-black140x100.html
-skip-if(Android) == poster-4.html poster-ref-black140x100.html
-skip-if(Android) == poster-5.html poster-ref-black140x100.html
-skip-if(Android) == poster-6.html poster-ref-black140x100.html
-skip-if(Android) == poster-7.html poster-ref-red140x100.html
-skip-if(Android) == poster-8.html poster-ref-black140x100.html
-random skip-if(Android) == poster-10.html poster-ref-blue125x100.html
-random skip-if(Android) == poster-11.html poster-ref-blue140x100.html
-random skip-if(Android) == poster-12.html poster-ref-blue140x100.html
-skip-if(Android) == poster-13.html poster-ref-blue400x300.html
-skip-if(Android) == poster-15.html poster-ref-green70x30.html
-random-if(winWidget) random-if(cocoaWidget) skip-if(Android) == bug686957.html bug686957-ref.html # bug 922951 for OS X
+random HTTP(..) == object-aspect-ratio-1a.xhtml aspect-ratio-1-ref.html
+random HTTP(..) == object-aspect-ratio-1b.xhtml aspect-ratio-1-ref.html
+HTTP(..) == offset-1.xhtml offset-1-ref.html
+random HTTP(..) == object-aspect-ratio-2a.xhtml aspect-ratio-2-ref.html
+random HTTP(..) == object-aspect-ratio-2b.xhtml aspect-ratio-2-ref.html
+fuzzy-if(winWidget,1,56000) fuzzy-if(cocoaWidget,1,56000) HTTP(..) == zoomed-1.xhtml zoomed-1-ref.html # bug 778995 for fuzzy
+== poster-1.html poster-ref-blue250x200.html
+== poster-2.html poster-ref-black140x100.html
+== poster-3.html poster-ref-black140x100.html
+== poster-4.html poster-ref-black140x100.html
+== poster-5.html poster-ref-black140x100.html
+== poster-6.html poster-ref-black140x100.html
+== poster-7.html poster-ref-red140x100.html
+== poster-8.html poster-ref-black140x100.html
+random == poster-10.html poster-ref-blue125x100.html
+random == poster-11.html poster-ref-blue140x100.html
+random == poster-12.html poster-ref-blue140x100.html
+== poster-13.html poster-ref-blue400x300.html
+== poster-15.html poster-ref-green70x30.html
+random-if(winWidget) random-if(cocoaWidget) == bug686957.html bug686957-ref.html # bug 922951 for OS X
# Tests for <video src> with 'object-fit' & 'object-position':
# These tests should be very similar to tests in our w3c-css/submitted/images3
@@ -40,15 +39,15 @@ random-if(winWidget) random-if(cocoaWidget) skip-if(Android) == bug686957.html b
# wouldn't be fair of us to make a W3C testsuite implicitly depend on any
# particular (non-spec-mandated) video codec.
default-preferences test-pref(layout.css.object-fit-and-position.enabled,true) test-pref(gfx.ycbcr.accurate-conversion,true)
-fails-if(layersGPUAccelerated) skip-if(Android) == object-fit-contain-webm-001.html object-fit-contain-webm-001-ref.html # Bug 1083516 for layersGPUAccelerated failures, Bug 1084564 for Android failures
-fails-if(layersGPUAccelerated) skip-if(Android) == object-fit-contain-webm-002.html object-fit-contain-webm-002-ref.html # Bug 1083516 for layersGPUAccelerated failures, Bug 1084564 for Android failures
-fails-if(layersGPUAccelerated) skip-if(Android) == object-fit-cover-webm-001.html object-fit-cover-webm-001-ref.html # Bug 1083516 for layersGPUAccelerated failures, Bug 1084564 for Android failures
-fails-if(layersGPUAccelerated) skip-if(Android) == object-fit-cover-webm-002.html object-fit-cover-webm-002-ref.html # Bug 1083516 for layersGPUAccelerated failures, Bug 1084564 for Android failures
-fails-if(layersGPUAccelerated) skip-if(Android) == object-fit-fill-webm-001.html object-fit-fill-webm-001-ref.html # Bug 1083516 for layersGPUAccelerated failures, Bug 1084564 for Android failures
-fails-if(layersGPUAccelerated) skip-if(Android) == object-fit-fill-webm-002.html object-fit-fill-webm-002-ref.html # Bug 1083516 for layersGPUAccelerated failures, Bug 1084564 for Android failures
-fails-if(layersGPUAccelerated) skip-if(Android) == object-fit-none-webm-001.html object-fit-none-webm-001-ref.html # Bug 1083516 for layersGPUAccelerated failures, Bug 1084564 for Android failures
-fails-if(layersGPUAccelerated) skip-if(Android) == object-fit-none-webm-002.html object-fit-none-webm-002-ref.html # Bug 1083516 for layersGPUAccelerated failures, Bug 1084564 for Android failures
-fails-if(layersGPUAccelerated) skip-if(Android) == object-fit-scale-down-webm-001.html object-fit-scale-down-webm-001-ref.html # Bug 1083516 for layersGPUAccelerated failures, Bug 1084564 for Android failures
-fails-if(layersGPUAccelerated) skip-if(Android) == object-fit-scale-down-webm-002.html object-fit-scale-down-webm-002-ref.html # Bug 1083516 for layersGPUAccelerated failures, Bug 1084564 for Android failures
-fails-if(layersGPUAccelerated) skip-if(Android) fails == object-position-webm-001.html object-position-webm-001-ref.html # Bug 1098417 for across-the-board failure, Bug 1083516 for layersGPUAccelerated failures, Bug 1084564 for Android failures
-fails-if(layersGPUAccelerated) skip-if(Android) fails == object-position-webm-002.html object-position-webm-002-ref.html # Bug 1098417 for across-the-board failure, Bug 1083516 for layersGPUAccelerated failures, Bug 1084564 for Android failures
+fails-if(layersGPUAccelerated) == object-fit-contain-webm-001.html object-fit-contain-webm-001-ref.html # Bug 1083516 for layersGPUAccelerated failures
+fails-if(layersGPUAccelerated) == object-fit-contain-webm-002.html object-fit-contain-webm-002-ref.html # Bug 1083516 for layersGPUAccelerated failures
+fails-if(layersGPUAccelerated) == object-fit-cover-webm-001.html object-fit-cover-webm-001-ref.html # Bug 1083516 for layersGPUAccelerated failures
+fails-if(layersGPUAccelerated) == object-fit-cover-webm-002.html object-fit-cover-webm-002-ref.html # Bug 1083516 for layersGPUAccelerated failures
+fails-if(layersGPUAccelerated) == object-fit-fill-webm-001.html object-fit-fill-webm-001-ref.html # Bug 1083516 for layersGPUAccelerated failures
+fails-if(layersGPUAccelerated) == object-fit-fill-webm-002.html object-fit-fill-webm-002-ref.html # Bug 1083516 for layersGPUAccelerated failures
+fails-if(layersGPUAccelerated) == object-fit-none-webm-001.html object-fit-none-webm-001-ref.html # Bug 1083516 for layersGPUAccelerated failures
+fails-if(layersGPUAccelerated) == object-fit-none-webm-002.html object-fit-none-webm-002-ref.html # Bug 1083516 for layersGPUAccelerated failures
+fails-if(layersGPUAccelerated) == object-fit-scale-down-webm-001.html object-fit-scale-down-webm-001-ref.html # Bug 1083516 for layersGPUAccelerated failures
+fails-if(layersGPUAccelerated) == object-fit-scale-down-webm-002.html object-fit-scale-down-webm-002-ref.html # Bug 1083516 for layersGPUAccelerated failures
+fails-if(layersGPUAccelerated) == object-position-webm-001.html object-position-webm-001-ref.html # Bug 1098417 for across-the-board failure, Bug 1083516 for layersGPUAccelerated failures
+fails-if(layersGPUAccelerated) fails == object-position-webm-002.html object-position-webm-002-ref.html # Bug 1098417 for across-the-board failure, Bug 1083516 for layersGPUAccelerated failures
diff --git a/layout/reftests/writing-mode/abspos/reftest-stylo.list b/layout/reftests/writing-mode/abspos/reftest-stylo.list
deleted file mode 100644
index 8874e96ef..000000000
--- a/layout/reftests/writing-mode/abspos/reftest-stylo.list
+++ /dev/null
@@ -1,130 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# This directory contains tests for position:absolute and vertical writing modes.
-# They require the vertical-text pref to be true, otherwise lots of them will fail.
-# (See bug 1079151 for the origin of these testcases by Gérard Talbot.)
-
-
-# All of these are fuzzy-if on skia content on OS X due to subpixel text positioning.
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vlr-003.xht s71-abs-pos-non-replaced-vlr-003.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vlr-005.xht s71-abs-pos-non-replaced-vlr-005.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vlr-007.xht s71-abs-pos-non-replaced-vlr-007.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vlr-009.xht s71-abs-pos-non-replaced-vlr-009.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vlr-011.xht s71-abs-pos-non-replaced-vlr-011.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vlr-013.xht s71-abs-pos-non-replaced-vlr-013.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vlr-015.xht s71-abs-pos-non-replaced-vlr-015.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vlr-017.xht s71-abs-pos-non-replaced-vlr-017.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vlr-019.xht s71-abs-pos-non-replaced-vlr-019.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vlr-021.xht s71-abs-pos-non-replaced-vlr-021.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vlr-023.xht s71-abs-pos-non-replaced-vlr-023.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vlr-025.xht s71-abs-pos-non-replaced-vlr-025.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vlr-027.xht s71-abs-pos-non-replaced-vlr-027.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vlr-029.xht s71-abs-pos-non-replaced-vlr-029.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vlr-031.xht s71-abs-pos-non-replaced-vlr-031.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vlr-033.xht s71-abs-pos-non-replaced-vlr-033.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vlr-035.xht s71-abs-pos-non-replaced-vlr-035.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vlr-037.xht s71-abs-pos-non-replaced-vlr-037.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vlr-039.xht s71-abs-pos-non-replaced-vlr-039.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vlr-041.xht s71-abs-pos-non-replaced-vlr-041.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vlr-043.xht s71-abs-pos-non-replaced-vlr-043.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vlr-045.xht s71-abs-pos-non-replaced-vlr-045.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vlr-047.xht s71-abs-pos-non-replaced-vlr-047.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vlr-049.xht s71-abs-pos-non-replaced-vlr-049.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vlr-051.xht s71-abs-pos-non-replaced-vlr-051.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vlr-053.xht s71-abs-pos-non-replaced-vlr-053.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vlr-055.xht s71-abs-pos-non-replaced-vlr-055.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vlr-057.xht s71-abs-pos-non-replaced-vlr-057.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vlr-059.xht s71-abs-pos-non-replaced-vlr-059.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vlr-061.xht s71-abs-pos-non-replaced-vlr-061.xht
-fails fuzzy-if(cocoaWidget,118,242) fuzzy-if(winWidget,116,240) fuzzy-if(skiaContent,154,320) == s71-abs-pos-non-replaced-vlr-063.xht s71-abs-pos-non-replaced-vlr-063.xht
-fails fuzzy-if(cocoaWidget,118,242) fuzzy-if(winWidget,116,240) fuzzy-if(skiaContent,154,320) == s71-abs-pos-non-replaced-vlr-065.xht s71-abs-pos-non-replaced-vlr-065.xht
-fails fuzzy-if(cocoaWidget,118,242) fuzzy-if(winWidget,116,240) fuzzy-if(skiaContent,154,320) == s71-abs-pos-non-replaced-vlr-067.xht s71-abs-pos-non-replaced-vlr-067.xht
-fails fuzzy-if(cocoaWidget,118,242) fuzzy-if(winWidget,116,240) fuzzy-if(skiaContent,154,320) == s71-abs-pos-non-replaced-vlr-069.xht s71-abs-pos-non-replaced-vlr-069.xht
-fails fuzzy-if(cocoaWidget,118,242) fuzzy-if(winWidget,116,240) fuzzy-if(skiaContent,154,320) == s71-abs-pos-non-replaced-vlr-071.xht s71-abs-pos-non-replaced-vlr-071.xht
-fails fuzzy-if(cocoaWidget,118,242) fuzzy-if(winWidget,116,240) fuzzy-if(skiaContent,154,320) == s71-abs-pos-non-replaced-vlr-073.xht s71-abs-pos-non-replaced-vlr-073.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vlr-075.xht s71-abs-pos-non-replaced-vlr-075.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vlr-077.xht s71-abs-pos-non-replaced-vlr-077.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vlr-079.xht s71-abs-pos-non-replaced-vlr-079.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vlr-081.xht s71-abs-pos-non-replaced-vlr-081.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vlr-083.xht s71-abs-pos-non-replaced-vlr-083.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vlr-085.xht s71-abs-pos-non-replaced-vlr-085.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vlr-087.xht s71-abs-pos-non-replaced-vlr-087.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vlr-089.xht s71-abs-pos-non-replaced-vlr-089.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vlr-091.xht s71-abs-pos-non-replaced-vlr-091.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vlr-093.xht s71-abs-pos-non-replaced-vlr-093.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vlr-095.xht s71-abs-pos-non-replaced-vlr-095.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vlr-097.xht s71-abs-pos-non-replaced-vlr-097.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vrl-002.xht s71-abs-pos-non-replaced-vrl-002.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vrl-004.xht s71-abs-pos-non-replaced-vrl-004.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vrl-006.xht s71-abs-pos-non-replaced-vrl-006.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vrl-008.xht s71-abs-pos-non-replaced-vrl-008.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vrl-010.xht s71-abs-pos-non-replaced-vrl-010.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vrl-012.xht s71-abs-pos-non-replaced-vrl-012.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vrl-014.xht s71-abs-pos-non-replaced-vrl-014.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vrl-016.xht s71-abs-pos-non-replaced-vrl-016.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vrl-018.xht s71-abs-pos-non-replaced-vrl-018.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vrl-020.xht s71-abs-pos-non-replaced-vrl-020.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vrl-022.xht s71-abs-pos-non-replaced-vrl-022.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vrl-024.xht s71-abs-pos-non-replaced-vrl-024.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vrl-026.xht s71-abs-pos-non-replaced-vrl-026.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vrl-028.xht s71-abs-pos-non-replaced-vrl-028.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vrl-030.xht s71-abs-pos-non-replaced-vrl-030.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vrl-032.xht s71-abs-pos-non-replaced-vrl-032.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vrl-034.xht s71-abs-pos-non-replaced-vrl-034.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vrl-036.xht s71-abs-pos-non-replaced-vrl-036.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vrl-038.xht s71-abs-pos-non-replaced-vrl-038.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vrl-040.xht s71-abs-pos-non-replaced-vrl-040.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vrl-042.xht s71-abs-pos-non-replaced-vrl-042.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vrl-044.xht s71-abs-pos-non-replaced-vrl-044.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vrl-046.xht s71-abs-pos-non-replaced-vrl-046.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vrl-048.xht s71-abs-pos-non-replaced-vrl-048.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vrl-050.xht s71-abs-pos-non-replaced-vrl-050.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vrl-052.xht s71-abs-pos-non-replaced-vrl-052.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vrl-054.xht s71-abs-pos-non-replaced-vrl-054.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vrl-056.xht s71-abs-pos-non-replaced-vrl-056.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vrl-058.xht s71-abs-pos-non-replaced-vrl-058.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vrl-060.xht s71-abs-pos-non-replaced-vrl-060.xht
-fails fuzzy-if(cocoaWidget,118,242) fuzzy-if(winWidget,116,240) fuzzy-if(skiaContent,154,320) == s71-abs-pos-non-replaced-vrl-062.xht s71-abs-pos-non-replaced-vrl-062.xht
-fails fuzzy-if(cocoaWidget,118,242) fuzzy-if(winWidget,116,240) fuzzy-if(skiaContent,154,320) == s71-abs-pos-non-replaced-vrl-064.xht s71-abs-pos-non-replaced-vrl-064.xht
-fails fuzzy-if(cocoaWidget,118,242) fuzzy-if(winWidget,116,240) fuzzy-if(skiaContent,154,320) == s71-abs-pos-non-replaced-vrl-066.xht s71-abs-pos-non-replaced-vrl-066.xht
-fails fuzzy-if(cocoaWidget,118,242) fuzzy-if(winWidget,116,240) fuzzy-if(skiaContent,154,320) == s71-abs-pos-non-replaced-vrl-068.xht s71-abs-pos-non-replaced-vrl-068.xht
-fails fuzzy-if(cocoaWidget,118,242) fuzzy-if(winWidget,116,240) fuzzy-if(skiaContent,154,320) == s71-abs-pos-non-replaced-vrl-070.xht s71-abs-pos-non-replaced-vrl-070.xht
-fails fuzzy-if(cocoaWidget,118,242) fuzzy-if(winWidget,116,240) fuzzy-if(skiaContent,154,320) == s71-abs-pos-non-replaced-vrl-072.xht s71-abs-pos-non-replaced-vrl-072.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vrl-074.xht s71-abs-pos-non-replaced-vrl-074.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vrl-076.xht s71-abs-pos-non-replaced-vrl-076.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vrl-078.xht s71-abs-pos-non-replaced-vrl-078.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vrl-080.xht s71-abs-pos-non-replaced-vrl-080.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vrl-082.xht s71-abs-pos-non-replaced-vrl-082.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vrl-084.xht s71-abs-pos-non-replaced-vrl-084.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vrl-086.xht s71-abs-pos-non-replaced-vrl-086.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vrl-088.xht s71-abs-pos-non-replaced-vrl-088.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vrl-090.xht s71-abs-pos-non-replaced-vrl-090.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vrl-092.xht s71-abs-pos-non-replaced-vrl-092.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vrl-094.xht s71-abs-pos-non-replaced-vrl-094.xht
-fails fuzzy-if(cocoaWidget,15,5) fuzzy-if(d2d,102,164) fuzzy-if(skiaContent,255,248) == s71-abs-pos-non-replaced-vrl-096.xht s71-abs-pos-non-replaced-vrl-096.xht
-
-== 1183431-orthogonal-modes-1a.html 1183431-orthogonal-modes-1a.html
-== 1183431-orthogonal-modes-1b.html 1183431-orthogonal-modes-1b.html
-== 1183431-orthogonal-modes-1c.html 1183431-orthogonal-modes-1c.html
-== 1183431-orthogonal-modes-2a.html 1183431-orthogonal-modes-2a.html
-== 1183431-orthogonal-modes-2b.html 1183431-orthogonal-modes-2b.html
-== 1183431-orthogonal-modes-2c.html 1183431-orthogonal-modes-2c.html
-== 1183431-orthogonal-modes-3a.html 1183431-orthogonal-modes-3a.html
-== 1183431-orthogonal-modes-3b.html 1183431-orthogonal-modes-3b.html
-== 1183431-orthogonal-modes-3c.html 1183431-orthogonal-modes-3c.html
-== 1183431-orthogonal-modes-4a.html 1183431-orthogonal-modes-4a.html
-== 1183431-orthogonal-modes-4b.html 1183431-orthogonal-modes-4b.html
-== 1183431-orthogonal-modes-4c.html 1183431-orthogonal-modes-4c.html
-== 1183431-orthogonal-modes-5a.html 1183431-orthogonal-modes-5a.html
-== 1183431-orthogonal-modes-5b.html 1183431-orthogonal-modes-5b.html
-== 1183431-orthogonal-modes-5c.html 1183431-orthogonal-modes-5c.html
-== 1183431-orthogonal-modes-6a.html 1183431-orthogonal-modes-6a.html
-# bug 1191801
-== 1183431-orthogonal-modes-6b.html 1183431-orthogonal-modes-6b.html
-== 1183431-orthogonal-modes-6c.html 1183431-orthogonal-modes-6c.html
-== 1183431-orthogonal-modes-7a.html 1183431-orthogonal-modes-7a.html
-== 1183431-orthogonal-modes-7b.html 1183431-orthogonal-modes-7b.html
-== 1183431-orthogonal-modes-7c.html 1183431-orthogonal-modes-7c.html
-== 1183431-orthogonal-modes-8a.html 1183431-orthogonal-modes-8a.html
-# bug 1191801
-== 1183431-orthogonal-modes-8b.html 1183431-orthogonal-modes-8b.html
-== 1183431-orthogonal-modes-8c.html 1183431-orthogonal-modes-8c.html
diff --git a/layout/reftests/writing-mode/reftest-stylo.list b/layout/reftests/writing-mode/reftest-stylo.list
deleted file mode 100644
index 76f6813e6..000000000
--- a/layout/reftests/writing-mode/reftest-stylo.list
+++ /dev/null
@@ -1,192 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# This directory contains tests for vertical text and logical layout coordinates.
-# They require the vertical-text pref to be true, otherwise lots of them will fail.
-
-
-HTTP(..) == 1079154-1-vertical-rl-columns.html 1079154-1-vertical-rl-columns.html
-== 1082844.html 1082844.html
-HTTP(..) == 1083748.html 1083748.html
-HTTP(..) == 1083848-1-inline-border.html 1083848-1-inline-border.html
-HTTP(..) == 1083848-2-inline-background.html 1083848-2-inline-background.html
-fails fuzzy-if(gtkWidget,255,2) fuzzy-if(winWidget||Android||B2G,4,8704) HTTP(..) == 1083848-3-inline-background-repeat.html 1083848-3-inline-background-repeat.html
-== 1083892-1.html 1083892-1.html
-== 1086883-1a.html 1086883-1a.html
-== 1086883-1b.html 1086883-1b.html
-== 1088025-1.html 1088025-1.html
-== 1089388-1.html 1089388-1.html
-== 1089388-2.html 1089388-2.html
-== 1090159-1.html 1090159-1.html
-# bug 1230357 fuzz on b2g for subpixel text positioning on skia.
-fuzzy-if(B2G&&azureSkia,130,200) == 1090168-1.html 1090168-1.html
-== 1090168-1.html 1090168-1.html
-fuzzy-if(B2G&&azureSkia,130,200) == 1090168-2.html 1090168-2.html
-fuzzy-if(B2G,244,173) fuzzy-if(Mulet,255,165) fuzzy-if(azureSkia,255,2700) == 1090168-3.html 1090168-3.html
-# bug 1142928: mark fuzzy on Mulet as on B2G, bug 1230357 for skia.
-== 1091058-1.html 1091058-1.html
-random-if(gtkWidget) == 1094434-1.html 1094434-1.html
-# bug 1094845
-random-if(gtkWidget) == 1094434-2.html 1094434-2.html
-# bug 1094845
-== 1094914-1a.html 1094914-1a.html
-== 1094914-1b.html 1094914-1b.html
-== 1096224-1a.html 1096224-1a.html
-== 1096224-1b.html 1096224-1b.html
-== 1102175-1a.html 1102175-1a.html
-== 1102175-1b.html 1102175-1b.html
-== 1103613-1.html 1103613-1.html
-== 1105268-1-min-max-dimensions.html 1105268-1-min-max-dimensions.html
-== 1105268-2-min-max-dimensions.html 1105268-2-min-max-dimensions.html
-== 1106669-1-intrinsic-for-container.html 1106669-1-intrinsic-for-container.html
-== 1108923-1-percentage-margins.html 1108923-1-percentage-margins.html
-== 1111944-1-list-marker.html 1111944-1-list-marker.html
-HTTP(..) == 1115916-1-vertical-metrics.html 1115916-1-vertical-metrics.html
-== 1117210-1-vertical-baseline-snap.html 1117210-1-vertical-baseline-snap.html
-== 1117227-1-text-overflow.html 1117227-1-text-overflow.html
-== 1122366-1-margin-collapse.html 1122366-1-margin-collapse.html
-== 1124636-1-fieldset-max-height.html 1124636-1-fieldset-max-height.html
-== 1124636-2-fieldset-min-height.html 1124636-2-fieldset-min-height.html
-
-== ua-style-sheet-margin-1.html ua-style-sheet-margin-1.html
-== ua-style-sheet-margin-2.html ua-style-sheet-margin-2.html
-== ua-style-sheet-margin-3.html ua-style-sheet-margin-3.html
-== ua-style-sheet-margin-4.html ua-style-sheet-margin-4.html
-== ua-style-sheet-margin-5.html ua-style-sheet-margin-5.html
-== ua-style-sheet-margin-6.html ua-style-sheet-margin-6.html
-== ua-style-sheet-margin-7.html ua-style-sheet-margin-7.html
-== ua-style-sheet-margin-8.html ua-style-sheet-margin-8.html
-== ua-style-sheet-margin-9.html ua-style-sheet-margin-9.html
-== ua-style-sheet-margin-10.html ua-style-sheet-margin-10.html
-== ua-style-sheet-margin-11.html ua-style-sheet-margin-11.html
-== ua-style-sheet-margin-12.html ua-style-sheet-margin-12.html
-== ua-style-sheet-margin-13.html ua-style-sheet-margin-13.html
-== ua-style-sheet-margin-14.html ua-style-sheet-margin-14.html
-== ua-style-sheet-border-1.html ua-style-sheet-border-1.html
-== ua-style-sheet-border-2.html ua-style-sheet-border-2.html
-== ua-style-sheet-border-3.html ua-style-sheet-border-3.html
-== ua-style-sheet-border-4.html ua-style-sheet-border-4.html
-== ua-style-sheet-border-5.html ua-style-sheet-border-5.html
-
-== ua-style-sheet-fieldset-1.html ua-style-sheet-fieldset-1.html
-skip-if(Android||B2G||Mulet||(winWidget&&!/^Windows\x20NT\x205\.1/.test(http.oscpu))) == ua-style-sheet-textarea-1.html ua-style-sheet-textarea-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(!(Android||B2G||Mulet)) == ua-style-sheet-textarea-1.html ua-style-sheet-textarea-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(!winWidget||/^Windows\x20NT\x205\.1/.test(http.oscpu)) == ua-style-sheet-textarea-1.html ua-style-sheet-textarea-1.html
-== ua-style-sheet-checkbox-radio-1.html ua-style-sheet-checkbox-radio-1.html
-skip-if(Android||B2G||Mulet) fuzzy-if(skiaContent,2,6) == ua-style-sheet-button-1.html ua-style-sheet-button-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(!(Android||B2G||Mulet)) == ua-style-sheet-button-1.html ua-style-sheet-button-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== ua-style-sheet-input-color-1.html ua-style-sheet-input-color-1.html
-# skip fuzzy-if(gtkWidget,1,15) == ua-style-sheet-input-number-1.html ua-style-sheet-input-number-1.html
-
-HTTP(..) == 1127488-align-default-horizontal-tb-ltr.html 1127488-align-default-horizontal-tb-ltr.html
-HTTP(..) == 1127488-align-start-horizontal-tb-ltr.html 1127488-align-start-horizontal-tb-ltr.html
-HTTP(..) == 1127488-align-end-horizontal-tb-ltr.html 1127488-align-end-horizontal-tb-ltr.html
-HTTP(..) == 1127488-align-left-horizontal-tb-ltr.html 1127488-align-left-horizontal-tb-ltr.html
-HTTP(..) == 1127488-align-right-horizontal-tb-ltr.html 1127488-align-right-horizontal-tb-ltr.html
-HTTP(..) == 1127488-align-default-horizontal-tb-rtl.html 1127488-align-default-horizontal-tb-rtl.html
-HTTP(..) == 1127488-align-start-horizontal-tb-rtl.html 1127488-align-start-horizontal-tb-rtl.html
-HTTP(..) == 1127488-align-end-horizontal-tb-rtl.html 1127488-align-end-horizontal-tb-rtl.html
-HTTP(..) == 1127488-align-left-horizontal-tb-rtl.html 1127488-align-left-horizontal-tb-rtl.html
-HTTP(..) == 1127488-align-right-horizontal-tb-rtl.html 1127488-align-right-horizontal-tb-rtl.html
-HTTP(..) == 1127488-align-default-vertical-rl-rtl.html 1127488-align-default-vertical-rl-rtl.html
-HTTP(..) == 1127488-align-start-vertical-rl-rtl.html 1127488-align-start-vertical-rl-rtl.html
-HTTP(..) == 1127488-align-end-vertical-rl-rtl.html 1127488-align-end-vertical-rl-rtl.html
-HTTP(..) == 1127488-align-left-vertical-rl-rtl.html 1127488-align-left-vertical-rl-rtl.html
-HTTP(..) == 1127488-align-right-vertical-rl-rtl.html 1127488-align-right-vertical-rl-rtl.html
-HTTP(..) == 1127488-align-default-vertical-rl-ltr.html 1127488-align-default-vertical-rl-ltr.html
-HTTP(..) == 1127488-align-start-vertical-rl-ltr.html 1127488-align-start-vertical-rl-ltr.html
-HTTP(..) == 1127488-align-end-vertical-rl-ltr.html 1127488-align-end-vertical-rl-ltr.html
-HTTP(..) == 1127488-align-left-vertical-rl-ltr.html 1127488-align-left-vertical-rl-ltr.html
-HTTP(..) == 1127488-align-right-vertical-rl-ltr.html 1127488-align-right-vertical-rl-ltr.html
-HTTP(..) == 1127488-align-default-vertical-lr-rtl.html 1127488-align-default-vertical-lr-rtl.html
-HTTP(..) == 1127488-align-start-vertical-lr-rtl.html 1127488-align-start-vertical-lr-rtl.html
-HTTP(..) == 1127488-align-end-vertical-lr-rtl.html 1127488-align-end-vertical-lr-rtl.html
-HTTP(..) == 1127488-align-left-vertical-lr-rtl.html 1127488-align-left-vertical-lr-rtl.html
-HTTP(..) == 1127488-align-right-vertical-lr-rtl.html 1127488-align-right-vertical-lr-rtl.html
-HTTP(..) == 1127488-align-default-vertical-lr-ltr.html 1127488-align-default-vertical-lr-ltr.html
-HTTP(..) == 1127488-align-start-vertical-lr-ltr.html 1127488-align-start-vertical-lr-ltr.html
-HTTP(..) == 1127488-align-end-vertical-lr-ltr.html 1127488-align-end-vertical-lr-ltr.html
-HTTP(..) == 1127488-align-left-vertical-lr-ltr.html 1127488-align-left-vertical-lr-ltr.html
-HTTP(..) == 1127488-align-right-vertical-lr-ltr.html 1127488-align-right-vertical-lr-ltr.html
-== 1130907-intrinsic-sizing-1.html 1130907-intrinsic-sizing-1.html
-== 1130907-intrinsic-sizing-2.html 1130907-intrinsic-sizing-2.html
-== 1131013-vertical-bidi.html 1131013-vertical-bidi.html
-== 1133945-1-vertical-align.html 1133945-1-vertical-align.html
-== 1134744-radio-checkbox-baseline-1.html 1134744-radio-checkbox-baseline-1.html
-== 1134849-orthogonal-inline.html 1134849-orthogonal-inline.html
-random == 1135361-ruby-justify-1.html 1135361-ruby-justify-1.html
-# bug 1136067
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails skip-if(Mulet) fuzzy-if(winWidget,255,163) fuzzy-if(skiaContent,159,111) == 1136557-1-nested-spans.html 1136557-1-nested-spans.html
-# MULET: Bug 1144079: Re-enable Mulet mochitests and reftests taskcluster-specific disables
-fails skip-if(Mulet) fuzzy-if(winWidget,255,221) fuzzy-if(skiaContent,159,111) == 1136557-2-nested-spans.html 1136557-2-nested-spans.html
-# MULET: Bug 1144079: Re-enable Mulet mochitests and reftests taskcluster-specific disables
-skip-if(Mulet) fuzzy-if(winWidget,255,236) == 1136557-3-nested-spans.html 1136557-3-nested-spans.html
-# MULET: Bug 1144079: Re-enable Mulet mochitests and reftests taskcluster-specific disables
-== 1138356-1-button-contents-alignment.html 1138356-1-button-contents-alignment.html
-== 1138356-2-button-contents-alignment.html 1138356-2-button-contents-alignment.html
-
-# Font inflation behaves wrong in vertical writing mode: bug 1138495
-fails test-pref(dom.meta-viewport.enabled,true) test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == font-inflation-1a.html font-inflation-1a.html
-fails test-pref(dom.meta-viewport.enabled,true) test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == font-inflation-1b.html font-inflation-1b.html
-test-pref(dom.meta-viewport.enabled,true) test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == font-inflation-1c.html font-inflation-1c.html
-test-pref(dom.meta-viewport.enabled,true) test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == font-inflation-1d.html font-inflation-1d.html
-pref(dom.meta-viewport.enabled,true) pref(font.size.inflation.emPerLine,15) pref(font.size.inflation.forceEnabled,true) pref(font.size.inflation.lineThreshold,0) == font-inflation-1c.html font-inflation-1c.html
-test-pref(dom.meta-viewport.enabled,true) test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == font-inflation-1c.html font-inflation-1c.html
-test-pref(dom.meta-viewport.enabled,true) test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == font-inflation-1d.html font-inflation-1d.html
-
-== 1144501-1a-block-end-margin-orthogonal-size.html 1144501-1a-block-end-margin-orthogonal-size.html
-== 1144501-1b-block-end-margin-orthogonal-size.html 1144501-1b-block-end-margin-orthogonal-size.html
-== 1147834-relative-overconstrained-horizontal-tb-ltr.html 1147834-relative-overconstrained-horizontal-tb-ltr.html
-== 1147834-relative-overconstrained-horizontal-tb-rtl.html 1147834-relative-overconstrained-horizontal-tb-rtl.html
-== 1147834-relative-overconstrained-vertical-lr-ltr.html 1147834-relative-overconstrained-vertical-lr-ltr.html
-== 1147834-relative-overconstrained-vertical-lr-rtl.html 1147834-relative-overconstrained-vertical-lr-rtl.html
-== 1147834-relative-overconstrained-vertical-rl-ltr.html 1147834-relative-overconstrained-vertical-rl-ltr.html
-== 1147834-relative-overconstrained-vertical-rl-rtl.html 1147834-relative-overconstrained-vertical-rl-rtl.html
-== 1151993-1-orthogonal-block-size.html 1151993-1-orthogonal-block-size.html
-== 1152941-1-orthogonal-blocksize-overflow.html 1152941-1-orthogonal-blocksize-overflow.html
-== 1156021-text-indent-percent.html 1156021-text-indent-percent.html
-== 1157752-upright-bidi.html 1157752-upright-bidi.html
-== 1157758-1-vertical-arabic.html 1157758-1-vertical-arabic.html
-== 1158549-1-vertical-block-size-constraints.html 1158549-1-vertical-block-size-constraints.html
-== 1163238-orthogonal-auto-margins.html 1163238-orthogonal-auto-margins.html
-== 1172774-percent-margin-1.html 1172774-percent-margin-1.html
-== 1172774-percent-margin-2.html 1172774-percent-margin-2.html
-== 1172774-percent-margin-3.html 1172774-percent-margin-3.html
-== 1172774-percent-margin-4.html 1172774-percent-margin-4.html
-random == 1172774-percent-padding-1.html 1172774-percent-padding-1.html
-== 1172774-percent-padding-2.html 1172774-percent-padding-2.html
-random == 1172774-percent-padding-3.html 1172774-percent-padding-3.html
-== 1172774-percent-padding-4.html 1172774-percent-padding-4.html
-== 1174450-intrinsic-sizing.html 1174450-intrinsic-sizing.html
-== 1175789-underline-overline-1.html 1175789-underline-overline-1.html
-== 1188061-1-nsChangeHint_ClearAncestorIntrinsics.html 1188061-1-nsChangeHint_ClearAncestorIntrinsics.html
-== 1188061-2-nsChangeHint_UpdateComputedBSize.html 1188061-2-nsChangeHint_UpdateComputedBSize.html
-
-# tests involving sideways-lr mode
-== 1193519-sideways-lr-1.html 1193519-sideways-lr-1.html
-== 1193519-sideways-lr-2.html 1193519-sideways-lr-2.html
-fuzzy-if(winWidget,3,84) == 1193519-sideways-lr-3.html 1193519-sideways-lr-3.html
-fuzzy-if(winWidget,3,112) == 1193519-sideways-lr-4.html 1193519-sideways-lr-4.html
-fails fuzzy-if(gtkWidget||B2G,255,6) fuzzy-if(cocoaWidget,65,69) == 1193519-sideways-lr-decoration-1.html 1193519-sideways-lr-decoration-1.html
-
-== 1196887-1-computed-display-inline-block.html 1196887-1-computed-display-inline-block.html
-== 1205787-legacy-svg-values-1.html 1205787-legacy-svg-values-1.html
-
-== 1216747-1.html 1216747-1.html
-== 1216747-1.html 1216747-1.html
-
-== 1243125-1-floats-overflowing.html 1243125-1-floats-overflowing.html
-
-skip-if(Android) HTTP(..) == 1248248-1-orientation-break-glyphrun.html 1248248-1-orientation-break-glyphrun.html
-# Android bug 1250229
-
-# Suite of tests from Gérard Talbot in bug 1079151
-# Frequent Windows 7 load failed: timed out waiting for test to complete (waiting for onload scripts to complete), bug 1167155 and friends
-# All tests are intermittent/fuzzy on stylo
-# include abspos/reftest-stylo.list
-
-# Tests for tables with vertical writing modes
-include tables/reftest-stylo.list
diff --git a/layout/reftests/writing-mode/reftest.list b/layout/reftests/writing-mode/reftest.list
index 13c58d2cb..ac1b68032 100644
--- a/layout/reftests/writing-mode/reftest.list
+++ b/layout/reftests/writing-mode/reftest.list
@@ -5,7 +5,7 @@ HTTP(..) == 1079154-1-vertical-rl-columns.html 1079154-1-vertical-rl-columns-ref
HTTP(..) == 1083748.html 1083748-ref.html
HTTP(..) == 1083848-1-inline-border.html 1083848-1-inline-border-ref.html
HTTP(..) == 1083848-2-inline-background.html 1083848-2-inline-background-ref.html
-fuzzy-if(gtkWidget,255,2) fuzzy-if(winWidget||Android,4,8704) HTTP(..) == 1083848-3-inline-background-repeat.html 1083848-3-inline-background-repeat-ref.html
+fuzzy-if(gtkWidget,255,2) fuzzy-if(winWidget,4,8704) HTTP(..) == 1083848-3-inline-background-repeat.html 1083848-3-inline-background-repeat-ref.html
== 1083892-1.html 1083892-1-ref.html
== 1086883-1a.html 1086883-1-ref.html
== 1086883-1b.html 1086883-1-ref.html
@@ -60,12 +60,10 @@ fuzzy(116,94) fuzzy-if(winWidget,135,124) HTTP(..) == 1115916-1-vertical-metrics
== ua-style-sheet-border-5.html ua-style-sheet-border-5-ref.html
== ua-style-sheet-fieldset-1.html ua-style-sheet-fieldset-1-ref.html
-skip-if(Android||(winWidget&&!/^Windows\x20NT\x205\.1/.test(http.oscpu))) == ua-style-sheet-textarea-1.html ua-style-sheet-textarea-1a-ref.html
-skip-if(!(Android)) == ua-style-sheet-textarea-1.html ua-style-sheet-textarea-1b-ref.html
-skip-if(!winWidget||/^Windows\x20NT\x205\.1/.test(http.oscpu)) == ua-style-sheet-textarea-1.html ua-style-sheet-textarea-1c-ref.html
+== ua-style-sheet-textarea-1.html ua-style-sheet-textarea-1a-ref.html
+skip-if(!winWidget) == ua-style-sheet-textarea-1.html ua-style-sheet-textarea-1c-ref.html
== ua-style-sheet-checkbox-radio-1.html ua-style-sheet-checkbox-radio-1-ref.html
-skip-if(Android) fuzzy-if(skiaContent&&!Android,2,6) == ua-style-sheet-button-1.html ua-style-sheet-button-1a-ref.html
-skip-if(!(Android)) == ua-style-sheet-button-1.html ua-style-sheet-button-1b-ref.html
+fuzzy-if(skiaContent,2,6) == ua-style-sheet-button-1.html ua-style-sheet-button-1a-ref.html
== ua-style-sheet-input-color-1.html ua-style-sheet-input-color-1-ref.html
fuzzy-if(gtkWidget,1,15) == ua-style-sheet-input-number-1.html ua-style-sheet-input-number-1-ref.html
@@ -164,7 +162,7 @@ fuzzy-if(gtkWidget,255,6) fuzzy-if(cocoaWidget,65,69) == 1193519-sideways-lr-dec
== 1243125-1-floats-overflowing.html 1243125-1-floats-overflowing-ref.html
-skip-if(Android) HTTP(..) == 1248248-1-orientation-break-glyphrun.html 1248248-1-orientation-break-glyphrun-ref.html # Android bug 1250229
+HTTP(..) == 1248248-1-orientation-break-glyphrun.html 1248248-1-orientation-break-glyphrun-ref.html
== 1302734-bidi-plaintext-1a.html 1302734-bidi-plaintext-1-ref.html
== 1302734-bidi-plaintext-1b.html 1302734-bidi-plaintext-1-ref.html
@@ -174,13 +172,13 @@ skip-if(Android) HTTP(..) == 1248248-1-orientation-break-glyphrun.html 1248248-1
== 1302734-bidi-plaintext-2d.html 1302734-bidi-plaintext-2-ref.html
== 1302389-scrolled-rect-1a.html 1302389-scrolled-rect-1-ref.html
-fuzzy-if(Android,54,852) == 1302389-scrolled-rect-1b.html 1302389-scrolled-rect-1-ref.html
-fuzzy-if(Android,54,852) fuzzy-if(gtkWidget,1,25) fuzzy-if(cocoaWidget,1,2) == 1302389-scrolled-rect-1c.html 1302389-scrolled-rect-1-ref.html
+== 1302389-scrolled-rect-1b.html 1302389-scrolled-rect-1-ref.html
+fuzzy-if(gtkWidget,1,25) fuzzy-if(cocoaWidget,1,2) == 1302389-scrolled-rect-1c.html 1302389-scrolled-rect-1-ref.html
fuzzy-if(gtkWidget,1,25) fuzzy-if(cocoaWidget,1,2) == 1302389-scrolled-rect-1d.html 1302389-scrolled-rect-1-ref.html
-fuzzy-if(Android,54,852) fuzzy-if(gtkWidget,1,25) fuzzy-if(cocoaWidget,1,2) == 1302389-scrolled-rect-2a.html 1302389-scrolled-rect-2-ref.html
+fuzzy-if(gtkWidget,1,25) fuzzy-if(cocoaWidget,1,2) == 1302389-scrolled-rect-2a.html 1302389-scrolled-rect-2-ref.html
fuzzy-if(gtkWidget,1,25) fuzzy-if(cocoaWidget,1,2) == 1302389-scrolled-rect-2b.html 1302389-scrolled-rect-2-ref.html
== 1302389-scrolled-rect-2c.html 1302389-scrolled-rect-2-ref.html
-fuzzy-if(Android,54,852) == 1302389-scrolled-rect-2d.html 1302389-scrolled-rect-2-ref.html
+== 1302389-scrolled-rect-2d.html 1302389-scrolled-rect-2-ref.html
# Suite of tests from Gérard Talbot in bug 1079151
# Frequent Windows 7 load failed: timed out waiting for test to complete (waiting for onload scripts to complete), bug 1167155 and friends
diff --git a/layout/reftests/writing-mode/tables/reftest-stylo.list b/layout/reftests/writing-mode/tables/reftest-stylo.list
deleted file mode 100644
index 331706545..000000000
--- a/layout/reftests/writing-mode/tables/reftest-stylo.list
+++ /dev/null
@@ -1,95 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== vertical-table-1a.html vertical-table-1a.html
-== vertical-table-1b.html vertical-table-1b.html
-== vertical-table-2a.html vertical-table-2a.html
-fuzzy-if(skiaContent,3,750) == vertical-table-2b.html vertical-table-2b.html
-== vertical-table-rowspan-1.html vertical-table-rowspan-1.html
-== vertical-table-rowspan-2.html vertical-table-rowspan-2.html
-== vertical-table-colspan-1.html vertical-table-colspan-1.html
-== vertical-table-colspan-2.html vertical-table-colspan-2.html
-== vertical-table-specified-width-1.html vertical-table-specified-width-1.html
-asserts(1) == vertical-table-specified-width-2.html vertical-table-specified-width-2.html
-# bug 1179741
-fuzzy-if(cocoaWidget,141,24) == vertical-border-collapse-1.html vertical-border-collapse-1.html
-fuzzy-if(cocoaWidget,141,24) == vertical-border-collapse-2.html vertical-border-collapse-2.html
-
-fuzzy-if(B2G,5,1) == fixed-table-layout-002-vlr.html fixed-table-layout-002-vlr.html
-fuzzy-if(B2G,5,1) == fixed-table-layout-003-vlr.html fixed-table-layout-003-vlr.html
-== fixed-table-layout-004-vlr.html fixed-table-layout-004-vlr.html
-== fixed-table-layout-005-vlr.html fixed-table-layout-005-vlr.html
-== fixed-table-layout-006-vlr.html fixed-table-layout-006-vlr.html
-fuzzy-if(B2G,5,1) == fixed-table-layout-007-vlr.html fixed-table-layout-007-vlr.html
-== fixed-table-layout-009-vlr.html fixed-table-layout-009-vlr.html
-fuzzy-if(Android,255,400) == fixed-table-layout-010-vlr.html fixed-table-layout-010-vlr.html
-fuzzy-if(B2G,5,1) == fixed-table-layout-012-vlr.html fixed-table-layout-012-vlr.html
-== fixed-table-layout-013-vlr.html fixed-table-layout-013-vlr.html
-== fixed-table-layout-014-vlr.html fixed-table-layout-014-vlr.html
-== fixed-table-layout-015-vlr.html fixed-table-layout-015-vlr.html
-== fixed-table-layout-016-vlr.html fixed-table-layout-016-vlr.html
-fails fuzzy-if(skiaContent,1,50) == fixed-table-layout-017-vlr.html fixed-table-layout-017-vlr.html
-fails fuzzy-if(skiaContent,1,50) == fixed-table-layout-018-vlr.html fixed-table-layout-018-vlr.html
-fails fuzzy-if(skiaContent,1,90) == fixed-table-layout-021-vlr.html fixed-table-layout-021-vlr.html
-fails fuzzy-if(skiaContent,1,90) == fixed-table-layout-022-vlr.html fixed-table-layout-022-vlr.html
-fails fuzzy-if(skiaContent,1,90) == fixed-table-layout-023-vlr.html fixed-table-layout-023-vlr.html
-== fixed-table-layout-025-vlr.html fixed-table-layout-025-vlr.html
-== fixed-table-layout-026-vlr.html fixed-table-layout-026-vlr.html
-== fixed-table-layout-027-vlr.html fixed-table-layout-027-vlr.html
-== fixed-table-layout-028-vlr.html fixed-table-layout-028-vlr.html
-== fixed-table-layout-029-vlr.html fixed-table-layout-029-vlr.html
-== fixed-table-layout-030-vlr.html fixed-table-layout-030-vlr.html
-== fixed-table-layout-031-vlr.html fixed-table-layout-031-vlr.html
-
-fuzzy-if(B2G,5,1) == fixed-table-layout-002-vrl.html fixed-table-layout-002-vrl.html
-fuzzy-if(B2G,5,1) == fixed-table-layout-003-vrl.html fixed-table-layout-003-vrl.html
-== fixed-table-layout-004-vrl.html fixed-table-layout-004-vrl.html
-== fixed-table-layout-005-vrl.html fixed-table-layout-005-vrl.html
-== fixed-table-layout-006-vrl.html fixed-table-layout-006-vrl.html
-fuzzy-if(B2G,5,1) == fixed-table-layout-007-vrl.html fixed-table-layout-007-vrl.html
-== fixed-table-layout-009-vrl.html fixed-table-layout-009-vrl.html
-fuzzy-if(Android,255,400) == fixed-table-layout-010-vrl.html fixed-table-layout-010-vrl.html
-fuzzy-if(B2G,5,1) == fixed-table-layout-012-vrl.html fixed-table-layout-012-vrl.html
-== fixed-table-layout-013-vrl.html fixed-table-layout-013-vrl.html
-== fixed-table-layout-014-vrl.html fixed-table-layout-014-vrl.html
-== fixed-table-layout-015-vrl.html fixed-table-layout-015-vrl.html
-== fixed-table-layout-016-vrl.html fixed-table-layout-016-vrl.html
-fails fuzzy-if(skiaContent,1,50) == fixed-table-layout-017-vrl.html fixed-table-layout-017-vrl.html
-fails fuzzy-if(skiaContent,1,50) == fixed-table-layout-018-vrl.html fixed-table-layout-018-vrl.html
-fails fuzzy-if(skiaContent,1,90) == fixed-table-layout-021-vrl.html fixed-table-layout-021-vrl.html
-fails fuzzy-if(skiaContent,1,90) == fixed-table-layout-022-vrl.html fixed-table-layout-022-vrl.html
-fails fuzzy-if(skiaContent,1,90) == fixed-table-layout-023-vrl.html fixed-table-layout-023-vrl.html
-== fixed-table-layout-025-vrl.html fixed-table-layout-025-vrl.html
-== fixed-table-layout-026-vrl.html fixed-table-layout-026-vrl.html
-== fixed-table-layout-027-vrl.html fixed-table-layout-027-vrl.html
-== fixed-table-layout-028-vrl.html fixed-table-layout-028-vrl.html
-== fixed-table-layout-029-vrl.html fixed-table-layout-029-vrl.html
-== fixed-table-layout-030-vrl.html fixed-table-layout-030-vrl.html
-== fixed-table-layout-031-vrl.html fixed-table-layout-031-vrl.html
-
-HTTP(../..) == s72-border-spacing-002.xht s72-border-spacing-002.xht
-HTTP(../..) == s72-border-spacing-003.xht s72-border-spacing-003.xht
-HTTP(../..) == s72-border-spacing-004.xht s72-border-spacing-004.xht
-HTTP(../..) == s72-border-spacing-005.xht s72-border-spacing-005.xht
-fuzzy-if(winWidget,48,600) fuzzy-if(cocoaWidget,19,97) HTTP(../..) == wm-row-progression-002.xht wm-row-progression-002.xht
-fuzzy-if(winWidget,48,600) fuzzy-if(cocoaWidget,19,97) HTTP(../..) == wm-row-progression-003.xht wm-row-progression-003.xht
-fuzzy-if(winWidget,48,600) fuzzy-if(cocoaWidget,19,97) HTTP(../..) == wm-row-progression-004.xht wm-row-progression-004.xht
-fuzzy-if(winWidget,48,600) fuzzy-if(cocoaWidget,19,97) HTTP(../..) == wm-row-progression-005.xht wm-row-progression-005.xht
-fuzzy-if(winWidget,48,600) fuzzy-if(cocoaWidget,19,97) HTTP(../..) == wm-row-progression-006.xht wm-row-progression-006.xht
-fuzzy-if(winWidget,48,600) fuzzy-if(cocoaWidget,19,97) HTTP(../..) == wm-row-progression-007.xht wm-row-progression-007.xht
-
-fuzzy-if(Android,255,38) == table-caption-top-1.html table-caption-top-1.html
-skip fuzzy-if(Android,255,38) == table-caption-bottom-1.html table-caption-bottom-1.html
-== table-caption-left-1.html table-caption-left-1.html
-== table-caption-right-1.html table-caption-right-1.html
-
-== border-collapse-bevels-1a.html border-collapse-bevels-1a.html
-fuzzy-if(cocoaWidget,23,162) == border-collapse-bevels-1b.html border-collapse-bevels-1b.html
-fuzzy-if(cocoaWidget,23,162) == border-collapse-bevels-1c.html border-collapse-bevels-1c.html
-fuzzy-if(cocoaWidget,23,162) == border-collapse-bevels-1d.html border-collapse-bevels-1d.html
-fuzzy-if(cocoaWidget,23,162) == border-collapse-bevels-1e.html border-collapse-bevels-1e.html
-
-== vertical-rl-row-progression-1a.html vertical-rl-row-progression-1a.html
-== vertical-rl-row-progression-1b.html vertical-rl-row-progression-1b.html
-== sideways-lr-row-progression-1a.html sideways-lr-row-progression-1a.html
-== sideways-lr-row-progression-1b.html sideways-lr-row-progression-1b.html
-== sideways-rl-row-progression-1a.html sideways-rl-row-progression-1a.html
-== sideways-rl-row-progression-1b.html sideways-rl-row-progression-1b.html
diff --git a/layout/reftests/writing-mode/tables/reftest.list b/layout/reftests/writing-mode/tables/reftest.list
index 66723ceeb..b9c8f2c44 100644
--- a/layout/reftests/writing-mode/tables/reftest.list
+++ b/layout/reftests/writing-mode/tables/reftest.list
@@ -18,7 +18,7 @@ fuzzy-if(cocoaWidget,141,24) == vertical-border-collapse-2.html vertical-border-
== fixed-table-layout-006-vlr.html fixed-table-layout-006-ref.html
== fixed-table-layout-007-vlr.html fixed-table-layout-007-ref.html
== fixed-table-layout-009-vlr.html fixed-table-layout-009-ref.html
-fuzzy-if(Android,255,400) == fixed-table-layout-010-vlr.html fixed-table-layout-010-ref.html
+== fixed-table-layout-010-vlr.html fixed-table-layout-010-ref.html
== fixed-table-layout-012-vlr.html fixed-table-layout-012-ref.html
== fixed-table-layout-013-vlr.html fixed-table-layout-002-ref.html
== fixed-table-layout-014-vlr.html fixed-table-layout-002-ref.html
@@ -44,7 +44,7 @@ fuzzy-if(skiaContent,1,90) == fixed-table-layout-023-vlr.html fixed-table-layout
== fixed-table-layout-006-vrl.html fixed-table-layout-006-ref.html
== fixed-table-layout-007-vrl.html fixed-table-layout-007-ref.html
== fixed-table-layout-009-vrl.html fixed-table-layout-009-ref.html
-fuzzy-if(Android,255,400) == fixed-table-layout-010-vrl.html fixed-table-layout-010-ref.html
+== fixed-table-layout-010-vrl.html fixed-table-layout-010-ref.html
== fixed-table-layout-012-vrl.html fixed-table-layout-012-ref.html
== fixed-table-layout-013-vrl.html fixed-table-layout-002-ref.html
== fixed-table-layout-014-vrl.html fixed-table-layout-002-ref.html
@@ -74,10 +74,10 @@ fuzzy-if(winWidget,48,600) fuzzy-if(cocoaWidget,19,97) HTTP(../..) == wm-row-pro
fuzzy-if(winWidget,48,600) fuzzy-if(cocoaWidget,19,97) HTTP(../..) == wm-row-progression-006.xht multicol-count-002-ref.xht
fuzzy-if(winWidget,48,600) fuzzy-if(cocoaWidget,19,97) HTTP(../..) == wm-row-progression-007.xht multicol-count-002-ref.xht
-fuzzy-if(Android,255,38) == table-caption-top-1.html table-caption-top-1-ref.html
-fuzzy-if(Android,255,38) == table-caption-bottom-1.html table-caption-bottom-1-ref.html
-fuzzy-if(Android,244,27) == table-caption-left-1.html table-caption-left-1-ref.html
-fuzzy-if(Android,244,27) == table-caption-right-1.html table-caption-right-1-ref.html
+== table-caption-top-1.html table-caption-top-1-ref.html
+== table-caption-bottom-1.html table-caption-bottom-1-ref.html
+== table-caption-left-1.html table-caption-left-1-ref.html
+== table-caption-right-1.html table-caption-right-1-ref.html
== border-collapse-bevels-1a.html border-collapse-bevels-1-ref.html
fuzzy-if(cocoaWidget,23,162) == border-collapse-bevels-1b.html border-collapse-bevels-1-ref.html
diff --git a/layout/reftests/xul-document-load/reftest-stylo.list b/layout/reftests/xul-document-load/reftest-stylo.list
deleted file mode 100644
index dbd58425e..000000000
--- a/layout/reftests/xul-document-load/reftest-stylo.list
+++ /dev/null
@@ -1,46 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-skip-if((B2G&&browserIsRemote)||Mulet) == test001.xul test001.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == test002.xul test002.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == test003.xul test003.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == test004.xul test004.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == test005.xul test005.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == test006.xul test006.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == test007.xul test007.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == test008.xul test008.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == test009.xul test009.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == test010.xul test010.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == test011.xul test011.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == test012.xul test012.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-# skip-if((B2G&&browserIsRemote)||Mulet) == test013.xul test013.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == test014.xul test014.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-# Disabled due to compartments for now.
-#skip-if((B2G&&browserIsRemote)||Mulet) == test015.xul test015.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == test016.xul test016.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == test017.xul test017.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == test018.xul test018.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == test019.xul test019.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == test020.xul test020.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == test021.xul test021.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == test022.xul test022.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
diff --git a/layout/reftests/xul/reftest-stylo.list b/layout/reftests/xul/reftest-stylo.list
deleted file mode 100644
index e1d13825f..000000000
--- a/layout/reftests/xul/reftest-stylo.list
+++ /dev/null
@@ -1,90 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-skip-if((B2G&&browserIsRemote)||Mulet) == menuitem-key.xul menuitem-key.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-# these random-if(Android) are due to differences between Android Native & Xul, see bug 732569
-random-if(Android||B2G) skip-if((B2G&&browserIsRemote)||Mulet) == menulist-shrinkwrap-1.xul menulist-shrinkwrap-1.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-random-if(Android||B2G) fails-if(winWidget) skip-if((B2G&&browserIsRemote)||Mulet) == menulist-shrinkwrap-2.xul menulist-shrinkwrap-2.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == textbox-overflow-1.xul textbox-overflow-1.xul
-# for bug 749658
-# Initial mulet triage: parity with B2G/B2G Desktop
-# accesskeys are not normally displayed on Mac, so skip this test
-skip-if(cocoaWidget) skip-if((B2G&&browserIsRemote)||Mulet) == accesskey.xul accesskey.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(cocoaWidget) fails-if(browserIsRemote&&d2d) fuzzy-if(xulRuntime.widgetToolkit=="gtk3",1,11) skip-if((B2G&&browserIsRemote)||Mulet) == tree-row-outline-1.xul tree-row-outline-1.xul
-# Initial mulet triage: parity with B2G/B2G Desktop, win8: bug 1254832
-skip-if((B2G&&browserIsRemote)||Mulet) == tree-row-outline-1.xul tree-row-outline-1.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == text-small-caps-1.xul text-small-caps-1.xul
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) fuzzy-if(skiaContent,1,60) fuzzy-if(cocoaWidget&&browserIsRemote&&!skiaContent,1,31) fuzzy-if(winWidget&&browserIsRemote&&layersGPUAccelerated,1,50) == inactive-fixed-bg-bug1205630.xul inactive-fixed-bg-bug1205630.xul
-skip-if((B2G&&browserIsRemote)||Mulet) fuzzy-if(skiaContent,1,60) fuzzy-if(cocoaWidget&&browserIsRemote&&!skiaContent,1,31) fuzzy-if(winWidget&&browserIsRemote&&layersGPUAccelerated,1,50) == inactive-fixed-bg-bug1272525.xul inactive-fixed-bg-bug1272525.xul
-
-# Tests for XUL <image> with 'object-fit' & 'object-position':
-# These tests should be very similar to tests in our w3c-css/submitted/images3
-# reftest directory. They live here because they use XUL, and it
-# wouldn't be fair of us to make a W3C testsuite implicitly depend on XUL.
-# NOTE: These are marked "skip-if(Mulet)" for now, because they seem to impact
-# the reftest-chunking in a way that makes later tests fail (likely through no
-# fault of these tests here, aside from their impact on chunking). See:
-# https://bugzilla.mozilla.org/show_bug.cgi?id=1170052#c25
-# And they're skipped on B2G Emulator (like everything else in this file)
-# because XUL reftests trigger error pages on that platform.
-default-preferences test-pref(layout.css.object-fit-and-position.enabled,true)
-skip-if((B2G&&browserIsRemote)||Mulet) == object-fit-contain-png-001.xul object-fit-contain-png-001.xul
-skip-if((B2G&&browserIsRemote)||Mulet) == object-fit-contain-png-002.xul object-fit-contain-png-002.xul
-skip-if((B2G&&browserIsRemote)||Mulet) == object-fit-contain-svg-001.xul object-fit-contain-svg-001.xul
-skip-if((B2G&&browserIsRemote)||Mulet) == object-fit-contain-svg-002.xul object-fit-contain-svg-002.xul
-skip-if((B2G&&browserIsRemote)||Mulet) == object-fit-contain-svg-003.xul object-fit-contain-svg-003.xul
-skip-if((B2G&&browserIsRemote)||Mulet) == object-fit-contain-svg-004.xul object-fit-contain-svg-004.xul
-skip-if((B2G&&browserIsRemote)||Mulet) == object-fit-contain-svg-005.xul object-fit-contain-svg-005.xul
-skip-if((B2G&&browserIsRemote)||Mulet) == object-fit-contain-svg-006.xul object-fit-contain-svg-006.xul
-skip-if((B2G&&browserIsRemote)||Mulet) == object-fit-cover-png-001.xul object-fit-cover-png-001.xul
-skip-if((B2G&&browserIsRemote)||Mulet) == object-fit-cover-png-002.xul object-fit-cover-png-002.xul
-skip-if((B2G&&browserIsRemote)||Mulet) == object-fit-cover-svg-001.xul object-fit-cover-svg-001.xul
-skip-if((B2G&&browserIsRemote)||Mulet) == object-fit-cover-svg-002.xul object-fit-cover-svg-002.xul
-skip-if((B2G&&browserIsRemote)||Mulet) == object-fit-cover-svg-003.xul object-fit-cover-svg-003.xul
-skip-if((B2G&&browserIsRemote)||Mulet) == object-fit-cover-svg-004.xul object-fit-cover-svg-004.xul
-skip-if((B2G&&browserIsRemote)||Mulet) == object-fit-cover-svg-005.xul object-fit-cover-svg-005.xul
-skip-if((B2G&&browserIsRemote)||Mulet) == object-fit-cover-svg-006.xul object-fit-cover-svg-006.xul
-skip-if((B2G&&browserIsRemote)||Mulet) == object-fit-fill-png-001.xul object-fit-fill-png-001.xul
-skip-if((B2G&&browserIsRemote)||Mulet) == object-fit-fill-png-002.xul object-fit-fill-png-002.xul
-skip-if((B2G&&browserIsRemote)||Mulet) == object-fit-fill-svg-001.xul object-fit-fill-svg-001.xul
-skip-if((B2G&&browserIsRemote)||Mulet) == object-fit-fill-svg-002.xul object-fit-fill-svg-002.xul
-skip-if((B2G&&browserIsRemote)||Mulet) == object-fit-fill-svg-003.xul object-fit-fill-svg-003.xul
-skip-if((B2G&&browserIsRemote)||Mulet) == object-fit-fill-svg-004.xul object-fit-fill-svg-004.xul
-skip-if((B2G&&browserIsRemote)||Mulet) == object-fit-fill-svg-005.xul object-fit-fill-svg-005.xul
-# bug 1092436
-skip-if((B2G&&browserIsRemote)||Mulet) == object-fit-fill-svg-006.xul object-fit-fill-svg-006.xul
-# bug 1092436
-skip-if((B2G&&browserIsRemote)||Mulet) == object-fit-none-png-001.xul object-fit-none-png-001.xul
-skip-if((B2G&&browserIsRemote)||Mulet) == object-fit-none-png-002.xul object-fit-none-png-002.xul
-skip-if((B2G&&browserIsRemote)||Mulet) == object-fit-none-svg-001.xul object-fit-none-svg-001.xul
-skip-if((B2G&&browserIsRemote)||Mulet) == object-fit-none-svg-002.xul object-fit-none-svg-002.xul
-skip-if((B2G&&browserIsRemote)||Mulet) == object-fit-none-svg-003.xul object-fit-none-svg-003.xul
-skip-if((B2G&&browserIsRemote)||Mulet) == object-fit-none-svg-004.xul object-fit-none-svg-004.xul
-skip-if((B2G&&browserIsRemote)||Mulet) == object-fit-none-svg-005.xul object-fit-none-svg-005.xul
-skip-if((B2G&&browserIsRemote)||Mulet) == object-fit-none-svg-006.xul object-fit-none-svg-006.xul
-skip-if((B2G&&browserIsRemote)||Mulet) == object-fit-scale-down-png-001.xul object-fit-scale-down-png-001.xul
-skip-if((B2G&&browserIsRemote)||Mulet) == object-fit-scale-down-png-002.xul object-fit-scale-down-png-002.xul
-skip-if((B2G&&browserIsRemote)||Mulet) == object-fit-scale-down-svg-001.xul object-fit-scale-down-svg-001.xul
-skip-if((B2G&&browserIsRemote)||Mulet) == object-fit-scale-down-svg-002.xul object-fit-scale-down-svg-002.xul
-skip-if((B2G&&browserIsRemote)||Mulet) == object-fit-scale-down-svg-003.xul object-fit-scale-down-svg-003.xul
-skip-if((B2G&&browserIsRemote)||Mulet) == object-fit-scale-down-svg-004.xul object-fit-scale-down-svg-004.xul
-skip-if((B2G&&browserIsRemote)||Mulet) == object-fit-scale-down-svg-005.xul object-fit-scale-down-svg-005.xul
-skip-if((B2G&&browserIsRemote)||Mulet) == object-fit-scale-down-svg-006.xul object-fit-scale-down-svg-006.xul
-skip-if((B2G&&browserIsRemote)||Mulet) == object-position-png-001.xul object-position-png-001.xul
-skip-if((B2G&&browserIsRemote)||Mulet) == object-position-png-002.xul object-position-png-002.xul
-
-# Tests for rendering SVG images in a XUL <treecell>:
-# XXXdholbert: These are marked as "random" right now, since they might not
-# render the images they trying to test in time for the reftest snapshot, per
-# bug 1218954. Once that bug is fixed, we should replace the "random"
-# annotation with "skip-if((B2G&&browserIsRemote)||Mulet)", like above tests.
-skip == treecell-image-svg-1a.xul treecell-image-svg-1a.xul
-# bug 1218954
-skip == treecell-image-svg-1b.xul treecell-image-svg-1b.xul
-# bug 1218954
-
-skip-if((B2G&&browserIsRemote)||Mulet) == treechildren-padding-percent-1.xul treechildren-padding-percent-1.xul
diff --git a/layout/reftests/xul/reftest.list b/layout/reftests/xul/reftest.list
index 35b9f9025..8bd79ee0c 100644
--- a/layout/reftests/xul/reftest.list
+++ b/layout/reftests/xul/reftest.list
@@ -1,9 +1,8 @@
== css-flex-1.xul css-flex-1-ref.html
== menuitem-key.xul menuitem-key-ref.xul
-# these random-if(Android) are due to differences between Android Native & Xul, see bug 732569
-random-if(Android) == menulist-shrinkwrap-1.xul menulist-shrinkwrap-1-ref.xul
-random-if(Android) fails-if(winWidget) == menulist-shrinkwrap-2.xul menulist-shrinkwrap-2-ref.xul
+== menulist-shrinkwrap-1.xul menulist-shrinkwrap-1-ref.xul
+fails-if(winWidget) == menulist-shrinkwrap-2.xul menulist-shrinkwrap-2-ref.xul
== textbox-overflow-1.xul textbox-overflow-1-ref.xul # for bug 749658
# accesskeys are not normally displayed on Mac, so skip this test
skip-if(cocoaWidget) == accesskey.xul accesskey-ref.xul
diff --git a/layout/reftests/z-index/reftest-stylo.list b/layout/reftests/z-index/reftest-stylo.list
deleted file mode 100644
index 69a763ca6..000000000
--- a/layout/reftests/z-index/reftest-stylo.list
+++ /dev/null
@@ -1,13 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== 480053-1.html 480053-1.html
-== z-index-1.html z-index-1.html
-== stacking-context-yes.html stacking-context-yes.html
-fails fuzzy-if(skiaContent,1,1500) == stacking-context-perspective.html stacking-context-perspective.html
-== stacking-context-backface-visibility.html stacking-context-backface-visibility.html
-
-fails-if(Android&&!asyncPan) == overlayscrollbar-sorting-ref-visible.html overlayscrollbar-sorting-ref-visible.html
-random-if(transparentScrollbars) == overlayscrollbar-sorting-1.html overlayscrollbar-sorting-1.html
-== overlayscrollbar-sorting-2.html overlayscrollbar-sorting-2.html
-== overlayscrollbar-sorting-3.html overlayscrollbar-sorting-3.html
-== overlayscrollbar-sorting-4.html overlayscrollbar-sorting-4.html
-random-if(transparentScrollbars) == overlayscrollbar-sorting-5.html overlayscrollbar-sorting-5.html
diff --git a/layout/reftests/z-index/reftest.list b/layout/reftests/z-index/reftest.list
index fc8edab76..4da2a3415 100644
--- a/layout/reftests/z-index/reftest.list
+++ b/layout/reftests/z-index/reftest.list
@@ -4,7 +4,7 @@
fuzzy-if(skiaContent,1,1500) == stacking-context-perspective.html stacking-context-yes.html
== stacking-context-backface-visibility.html stacking-context-no.html
-fails-if(Android&&!asyncPan) != overlayscrollbar-sorting-ref-visible.html overlayscrollbar-sorting-ref-hidden.html
+!= overlayscrollbar-sorting-ref-visible.html overlayscrollbar-sorting-ref-hidden.html
random-if(transparentScrollbars) == overlayscrollbar-sorting-1.html overlayscrollbar-sorting-ref-visible.html
== overlayscrollbar-sorting-2.html overlayscrollbar-sorting-ref-visible.html
== overlayscrollbar-sorting-3.html overlayscrollbar-sorting-ref-hidden.html
diff --git a/layout/style/AnimationCollection.cpp b/layout/style/AnimationCollection.cpp
index f7826f5ed..fc913f27f 100644
--- a/layout/style/AnimationCollection.cpp
+++ b/layout/style/AnimationCollection.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/AnimationCollection.h b/layout/style/AnimationCollection.h
index 96163fcc8..efab94bdc 100644
--- a/layout/style/AnimationCollection.h
+++ b/layout/style/AnimationCollection.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/AnimationCommon.cpp b/layout/style/AnimationCommon.cpp
index f4ebc2a93..27682e0ea 100644
--- a/layout/style/AnimationCommon.cpp
+++ b/layout/style/AnimationCommon.cpp
@@ -1,4 +1,3 @@
-/* vim: set shiftwidth=2 tabstop=8 autoindent cindent expandtab: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/AnimationCommon.h b/layout/style/AnimationCommon.h
index 025c034a4..61a60a53e 100644
--- a/layout/style/AnimationCommon.h
+++ b/layout/style/AnimationCommon.h
@@ -1,4 +1,3 @@
-/* vim: set shiftwidth=2 tabstop=8 autoindent cindent expandtab: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/CSSCalc.h b/layout/style/CSSCalc.h
index 141ca9c0a..06a570c73 100644
--- a/layout/style/CSSCalc.h
+++ b/layout/style/CSSCalc.h
@@ -1,4 +1,3 @@
-/* vim: set shiftwidth=2 tabstop=8 autoindent cindent expandtab: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/CSSEnabledState.h b/layout/style/CSSEnabledState.h
index 650397072..da9a10fe0 100644
--- a/layout/style/CSSEnabledState.h
+++ b/layout/style/CSSEnabledState.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/CSSRuleList.cpp b/layout/style/CSSRuleList.cpp
index 8493e8a37..0e4df33d2 100644
--- a/layout/style/CSSRuleList.cpp
+++ b/layout/style/CSSRuleList.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/CSSStyleSheet.cpp b/layout/style/CSSStyleSheet.cpp
index 9404fa713..40a4ee4d8 100644
--- a/layout/style/CSSStyleSheet.cpp
+++ b/layout/style/CSSStyleSheet.cpp
@@ -695,7 +695,7 @@ nsMediaList::GetMediaText(nsAString& aMediaText)
// nsCOMPtr<nsIDocument>
#define BEGIN_MEDIA_CHANGE(sheet, doc) \
if (sheet) { \
- doc = sheet->GetOwningDocument(); \
+ doc = sheet->GetAssociatedDocument(); \
} \
mozAutoDocUpdate updateBatch(doc, UPDATE_STYLE, true); \
if (sheet) { \
@@ -865,7 +865,8 @@ struct ChildSheetListBuilder {
void SetParentLinks(CSSStyleSheet* aSheet) {
aSheet->mParent = parent;
- aSheet->SetOwningDocument(parent->mDocument);
+ aSheet->SetAssociatedDocument(parent->mDocument,
+ parent->mDocumentAssociationMode);
}
static void ReparentChildList(CSSStyleSheet* aPrimarySheet,
@@ -873,7 +874,8 @@ struct ChildSheetListBuilder {
{
for (CSSStyleSheet *child = aFirstChild; child; child = child->mNext) {
child->mParent = aPrimarySheet;
- child->SetOwningDocument(aPrimarySheet->mDocument);
+ child->SetAssociatedDocument(aPrimarySheet->mDocument,
+ aPrimarySheet->mDocumentAssociationMode);
}
}
};
@@ -1360,16 +1362,22 @@ CSSStyleSheet::GetParentSheet() const
}
void
-CSSStyleSheet::SetOwningDocument(nsIDocument* aDocument)
-{ // not ref counted
+CSSStyleSheet::SetAssociatedDocument(nsIDocument* aDocument,
+ DocumentAssociationMode aAssociationMode)
+{
+ MOZ_ASSERT_IF(!aDocument, aAssociationMode == NotOwnedByDocument);
+
+ // not ref counted
mDocument = aDocument;
+ mDocumentAssociationMode = aAssociationMode;
+
// Now set the same document on all our child sheets....
// XXXbz this is a little bogus; see the XXX comment where we
// declare mFirstChild.
for (CSSStyleSheet* child = mInner->mFirstChild;
child; child = child->mNext) {
if (child->mParent == this) {
- child->SetOwningDocument(aDocument);
+ child->SetAssociatedDocument(aDocument, aAssociationMode);
}
}
}
diff --git a/layout/style/CSSStyleSheet.h b/layout/style/CSSStyleSheet.h
index 74e12291e..89189d781 100644
--- a/layout/style/CSSStyleSheet.h
+++ b/layout/style/CSSStyleSheet.h
@@ -129,7 +129,8 @@ public:
// style sheet owner info
CSSStyleSheet* GetParentSheet() const; // may be null
- void SetOwningDocument(nsIDocument* aDocument);
+ void SetAssociatedDocument(nsIDocument* aDocument,
+ DocumentAssociationMode aAssociationMode);
// Find the ID of the owner inner window.
uint64_t FindOwningWindowInnerID() const;
diff --git a/layout/style/CSSUnprefixingService.js b/layout/style/CSSUnprefixingService.js
index 801ea198c..f6c63a023 100644
--- a/layout/style/CSSUnprefixingService.js
+++ b/layout/style/CSSUnprefixingService.js
@@ -1,5 +1,4 @@
/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- /
-/* vim: set shiftwidth=2 tabstop=8 autoindent cindent expandtab: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/CSSValue.h b/layout/style/CSSValue.h
index ecba05e84..c02341d01 100644
--- a/layout/style/CSSValue.h
+++ b/layout/style/CSSValue.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/CSSVariableDeclarations.cpp b/layout/style/CSSVariableDeclarations.cpp
index 67bb8d732..34a2bb035 100644
--- a/layout/style/CSSVariableDeclarations.cpp
+++ b/layout/style/CSSVariableDeclarations.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/CSSVariableDeclarations.h b/layout/style/CSSVariableDeclarations.h
index ebc17285b..294e71a00 100644
--- a/layout/style/CSSVariableDeclarations.h
+++ b/layout/style/CSSVariableDeclarations.h
@@ -1,4 +1,3 @@
-/* vim: set shiftwidth=2 tabstop=8 autoindent cindent expandtab: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/CSSVariableResolver.cpp b/layout/style/CSSVariableResolver.cpp
index 0d25b747b..abf9fc12a 100644
--- a/layout/style/CSSVariableResolver.cpp
+++ b/layout/style/CSSVariableResolver.cpp
@@ -1,4 +1,3 @@
-/* vim: set shiftwidth=2 tabstop=8 autoindent cindent expandtab: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/CSSVariableResolver.h b/layout/style/CSSVariableResolver.h
index f9758ca3a..ec7d1386f 100644
--- a/layout/style/CSSVariableResolver.h
+++ b/layout/style/CSSVariableResolver.h
@@ -1,4 +1,3 @@
-/* vim: set shiftwidth=2 tabstop=8 autoindent cindent expandtab: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/CSSVariableValues.h b/layout/style/CSSVariableValues.h
index e26566be1..3e4c6d9d0 100644
--- a/layout/style/CSSVariableValues.h
+++ b/layout/style/CSSVariableValues.h
@@ -1,4 +1,3 @@
-/* vim: set shiftwidth=2 tabstop=8 autoindent cindent expandtab: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/CounterStyleManager.cpp b/layout/style/CounterStyleManager.cpp
index bccc9b836..b36fe5021 100644
--- a/layout/style/CounterStyleManager.cpp
+++ b/layout/style/CounterStyleManager.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/CounterStyleManager.h b/layout/style/CounterStyleManager.h
index 2f760f340..8445562ef 100644
--- a/layout/style/CounterStyleManager.h
+++ b/layout/style/CounterStyleManager.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/DeclarationBlock.h b/layout/style/DeclarationBlock.h
index c3ed663b4..180b32cba 100644
--- a/layout/style/DeclarationBlock.h
+++ b/layout/style/DeclarationBlock.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/DeclarationBlockInlines.h b/layout/style/DeclarationBlockInlines.h
index 791d24498..e8ff3ebba 100644
--- a/layout/style/DeclarationBlockInlines.h
+++ b/layout/style/DeclarationBlockInlines.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/DocumentStyleRootIterator.cpp b/layout/style/DocumentStyleRootIterator.cpp
new file mode 100644
index 000000000..d99454ee0
--- /dev/null
+++ b/layout/style/DocumentStyleRootIterator.cpp
@@ -0,0 +1,40 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "DocumentStyleRootIterator.h"
+
+#include "nsContentUtils.h"
+
+namespace mozilla {
+
+DocumentStyleRootIterator::DocumentStyleRootIterator(nsIDocument* aDocument)
+ : mPosition(0)
+{
+ MOZ_COUNT_CTOR(DocumentStyleRootIterator);
+ if (Element* root = aDocument->GetRootElement()) {
+ mStyleRoots.AppendElement(root);
+ }
+ nsContentUtils::AppendDocumentLevelNativeAnonymousContentTo(
+ aDocument, mStyleRoots);
+}
+
+Element*
+DocumentStyleRootIterator::GetNextStyleRoot()
+{
+ for (;;) {
+ if (mPosition >= mStyleRoots.Length()) {
+ return nullptr;
+ }
+
+ nsIContent* next = mStyleRoots[mPosition];
+ ++mPosition;
+
+ if (next->IsElement()) {
+ return next->AsElement();
+ }
+ }
+}
+
+} // namespace mozilla
diff --git a/layout/style/DocumentStyleRootIterator.h b/layout/style/DocumentStyleRootIterator.h
new file mode 100644
index 000000000..7c07d5c2c
--- /dev/null
+++ b/layout/style/DocumentStyleRootIterator.h
@@ -0,0 +1,37 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef DocumentStyleRootIterator_h
+#define DocumentStyleRootIterator_h
+
+#include "nsTArray.h"
+#include "mozilla/dom/Element.h"
+
+class nsIContent;
+class nsIDocument;
+
+namespace mozilla {
+
+/**
+ * DocumentStyleRootIterator traverses the roots of the document from the
+ * perspective of the Servo-backed style system. This will first traverse
+ * the document root, followed by any document level native anonymous content.
+ */
+class DocumentStyleRootIterator
+{
+public:
+ explicit DocumentStyleRootIterator(nsIDocument* aDocument);
+ ~DocumentStyleRootIterator() { MOZ_COUNT_DTOR(DocumentStyleRootIterator); }
+
+ Element* GetNextStyleRoot();
+
+private:
+ AutoTArray<nsIContent*, 8> mStyleRoots;
+ uint32_t mPosition;
+};
+
+} // namespace mozilla
+
+#endif // DocumentStyleRootIterator_h
diff --git a/layout/style/FontFaceSet.cpp b/layout/style/FontFaceSet.cpp
index 81c5ede0e..7309ef3fb 100644
--- a/layout/style/FontFaceSet.cpp
+++ b/layout/style/FontFaceSet.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 40 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/HandleRefPtr.h b/layout/style/HandleRefPtr.h
index 0a73a4cf7..487634c47 100644
--- a/layout/style/HandleRefPtr.h
+++ b/layout/style/HandleRefPtr.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: set ts=2 sw=2 et tw=78:
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/layout/style/IncrementalClearCOMRuleArray.cpp b/layout/style/IncrementalClearCOMRuleArray.cpp
index 92cdced22..76baec794 100644
--- a/layout/style/IncrementalClearCOMRuleArray.cpp
+++ b/layout/style/IncrementalClearCOMRuleArray.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/IncrementalClearCOMRuleArray.h b/layout/style/IncrementalClearCOMRuleArray.h
index 9934fd683..2b17b9163 100644
--- a/layout/style/IncrementalClearCOMRuleArray.h
+++ b/layout/style/IncrementalClearCOMRuleArray.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/LayerAnimationInfo.cpp b/layout/style/LayerAnimationInfo.cpp
index 8a119512b..035054eb4 100644
--- a/layout/style/LayerAnimationInfo.cpp
+++ b/layout/style/LayerAnimationInfo.cpp
@@ -1,4 +1,3 @@
-/* vim: set shiftwidth=2 tabstop=8 autoindent cindent expandtab: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/LayerAnimationInfo.h b/layout/style/LayerAnimationInfo.h
index 53c5ae9bf..461695c63 100644
--- a/layout/style/LayerAnimationInfo.h
+++ b/layout/style/LayerAnimationInfo.h
@@ -1,4 +1,3 @@
-/* vim: set shiftwidth=2 tabstop=8 autoindent cindent expandtab: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/Loader.cpp b/layout/style/Loader.cpp
index a06dd3737..155ecbeee 100644
--- a/layout/style/Loader.cpp
+++ b/layout/style/Loader.cpp
@@ -50,6 +50,7 @@
#include "nsGkAtoms.h"
#include "nsIThreadInternal.h"
#include "nsINetworkPredictor.h"
+#include "nsITimedChannel.h"
#include "mozilla/dom/ShadowRoot.h"
#include "mozilla/dom/URL.h"
#include "mozilla/AsyncEventDispatcher.h"
@@ -1335,7 +1336,7 @@ Loader::InsertSheetInDoc(StyleSheet* aSheet,
// XXX Need to cancel pending sheet loads for this element, if any
- int32_t sheetCount = aDocument->GetNumberOfStyleSheets();
+ int32_t sheetCount = aDocument->SheetCount();
/*
* Start the walk at the _end_ of the list, since in the typical
@@ -1347,7 +1348,7 @@ Loader::InsertSheetInDoc(StyleSheet* aSheet,
*/
int32_t insertionPoint;
for (insertionPoint = sheetCount - 1; insertionPoint >= 0; --insertionPoint) {
- StyleSheet* curSheet = aDocument->GetStyleSheetAt(insertionPoint);
+ StyleSheet* curSheet = aDocument->SheetAt(insertionPoint);
NS_ASSERTION(curSheet, "There must be a sheet here!");
nsCOMPtr<nsINode> sheetOwner = curSheet->GetOwnerNode();
if (sheetOwner && !aLinkingContent) {
@@ -2215,9 +2216,9 @@ Loader::LoadChildSheet(StyleSheet* aParentSheet,
nsCOMPtr<nsINode> owningNode;
- // check for an owning document: if none, don't bother walking up the parent
- // sheets
- if (aParentSheet->GetOwningDocument()) {
+ // check for an associated document: if none, don't bother walking up the
+ // parent sheets
+ if (aParentSheet->GetAssociatedDocument()) {
StyleSheet* topSheet = aParentSheet;
while (StyleSheet* parent = topSheet->GetParentSheet()) {
topSheet = parent;
diff --git a/layout/style/MediaQueryList.h b/layout/style/MediaQueryList.h
index d2acb34c1..b660d523e 100644
--- a/layout/style/MediaQueryList.h
+++ b/layout/style/MediaQueryList.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=8 autoindent cindent expandtab: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/RuleNodeCacheConditions.cpp b/layout/style/RuleNodeCacheConditions.cpp
index 2dbb6c344..194b27591 100644
--- a/layout/style/RuleNodeCacheConditions.cpp
+++ b/layout/style/RuleNodeCacheConditions.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=78: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/RuleProcessorCache.cpp b/layout/style/RuleProcessorCache.cpp
index e2e788c56..caaec4dde 100644
--- a/layout/style/RuleProcessorCache.cpp
+++ b/layout/style/RuleProcessorCache.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/RuleProcessorCache.h b/layout/style/RuleProcessorCache.h
index 7eb808fc9..8d43aed34 100644
--- a/layout/style/RuleProcessorCache.h
+++ b/layout/style/RuleProcessorCache.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/ServoBindingList.h b/layout/style/ServoBindingList.h
index 3badfc37f..ff0fba408 100644
--- a/layout/style/ServoBindingList.h
+++ b/layout/style/ServoBindingList.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/ServoBindingTypes.h b/layout/style/ServoBindingTypes.h
index b315d9b49..c1e25aad5 100644
--- a/layout/style/ServoBindingTypes.h
+++ b/layout/style/ServoBindingTypes.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/ServoBindings.cpp b/layout/style/ServoBindings.cpp
index ad34633e9..5f6842da6 100644
--- a/layout/style/ServoBindings.cpp
+++ b/layout/style/ServoBindings.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/ServoBindings.h b/layout/style/ServoBindings.h
index 81ea48d5b..a8a621467 100644
--- a/layout/style/ServoBindings.h
+++ b/layout/style/ServoBindings.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/ServoElementSnapshot.cpp b/layout/style/ServoElementSnapshot.cpp
index 2b1dd840d..ed40ea0f1 100644
--- a/layout/style/ServoElementSnapshot.cpp
+++ b/layout/style/ServoElementSnapshot.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/ServoElementSnapshot.h b/layout/style/ServoElementSnapshot.h
index 638b2fd31..5f157f817 100644
--- a/layout/style/ServoElementSnapshot.h
+++ b/layout/style/ServoElementSnapshot.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/ServoStyleSet.cpp b/layout/style/ServoStyleSet.cpp
index f0230b55b..38752bcc9 100644
--- a/layout/style/ServoStyleSet.cpp
+++ b/layout/style/ServoStyleSet.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -340,7 +339,7 @@ ServoStyleSet::AddDocStyleSheet(ServoStyleSheet* aSheet,
mSheets[SheetType::Doc].RemoveElement(aSheet);
size_t index =
- aDocument->FindDocStyleSheetInsertionPoint(mSheets[SheetType::Doc], aSheet);
+ aDocument->FindDocStyleSheetInsertionPoint(mSheets[SheetType::Doc], *aSheet);
mSheets[SheetType::Doc].InsertElementAt(index, aSheet);
// Maintain a mirrored list of sheets on the servo side.
diff --git a/layout/style/ServoStyleSet.h b/layout/style/ServoStyleSet.h
index 26b515afd..eacb8378b 100644
--- a/layout/style/ServoStyleSet.h
+++ b/layout/style/ServoStyleSet.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/ServoStyleSheet.cpp b/layout/style/ServoStyleSheet.cpp
index 340ecc22a..8b6decb4f 100644
--- a/layout/style/ServoStyleSheet.cpp
+++ b/layout/style/ServoStyleSheet.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -34,19 +33,23 @@ ServoStyleSheet::HasRules() const
}
void
-ServoStyleSheet::SetOwningDocument(nsIDocument* aDocument)
+ServoStyleSheet::SetAssociatedDocument(nsIDocument* aDocument,
+ DocumentAssociationMode aAssociationMode)
{
+ MOZ_ASSERT_IF(!aDocument, aAssociationMode == NotOwnedByDocument);
+
// XXXheycam: Traverse to child ServoStyleSheets to set this, like
- // CSSStyleSheet::SetOwningDocument does.
+ // CSSStyleSheet::SetAssociatedDocument does.
mDocument = aDocument;
+ mDocumentAssociationMode = aAssociationMode;
}
ServoStyleSheet*
ServoStyleSheet::GetParentSheet() const
{
// XXXheycam: When we implement support for child sheets, we'll have
- // to fix SetOwningDocument to propagate the owning document down
+ // to fix SetAssociatedDocument to propagate the associated document down
// to the children.
MOZ_CRASH("stylo: not implemented");
}
diff --git a/layout/style/ServoStyleSheet.h b/layout/style/ServoStyleSheet.h
index 079f196eb..d32d57674 100644
--- a/layout/style/ServoStyleSheet.h
+++ b/layout/style/ServoStyleSheet.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -29,7 +28,8 @@ public:
bool HasRules() const;
- void SetOwningDocument(nsIDocument* aDocument);
+ void SetAssociatedDocument(nsIDocument* aDocument,
+ DocumentAssociationMode aAssociationMode);
ServoStyleSheet* GetParentSheet() const;
void AppendStyleSheet(ServoStyleSheet* aSheet);
diff --git a/layout/style/ServoTypes.h b/layout/style/ServoTypes.h
index 6d1324b88..8bfed9b5a 100644
--- a/layout/style/ServoTypes.h
+++ b/layout/style/ServoTypes.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/ServoUtils.h b/layout/style/ServoUtils.h
index b116b9c4f..047cbb7a0 100644
--- a/layout/style/ServoUtils.h
+++ b/layout/style/ServoUtils.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/SheetParsingMode.h b/layout/style/SheetParsingMode.h
index 2eb6b2f64..132b99a79 100644
--- a/layout/style/SheetParsingMode.h
+++ b/layout/style/SheetParsingMode.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/StyleAnimationValue.cpp b/layout/style/StyleAnimationValue.cpp
index d931961d4..ff6783553 100644
--- a/layout/style/StyleAnimationValue.cpp
+++ b/layout/style/StyleAnimationValue.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/StyleBackendType.h b/layout/style/StyleBackendType.h
index f02b86213..99d5c154d 100644
--- a/layout/style/StyleBackendType.h
+++ b/layout/style/StyleBackendType.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/StyleComplexColor.h b/layout/style/StyleComplexColor.h
index 6385b57a1..f3ff126a4 100644
--- a/layout/style/StyleComplexColor.h
+++ b/layout/style/StyleComplexColor.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/StyleRule.cpp b/layout/style/StyleRule.cpp
index 6c374404d..8fde72534 100644
--- a/layout/style/StyleRule.cpp
+++ b/layout/style/StyleRule.cpp
@@ -1079,6 +1079,16 @@ public:
return mRule ? mRule->GetDocument() : nullptr;
}
+ virtual DocGroup* GetDocGroup() const override
+ {
+ if (!mRule) {
+ return nullptr;
+ }
+
+ nsIDocument* document = mRule->GetDocument();
+ return document ? document->GetDocGroup() : nullptr;
+ }
+
friend class css::DOMCSSStyleRule;
protected:
@@ -1210,13 +1220,13 @@ DOMCSSDeclarationImpl::SetCSSDeclaration(DeclarationBlock* aDecl)
NS_PRECONDITION(mRule,
"can only be called when |GetCSSDeclaration| returned a declaration");
- nsCOMPtr<nsIDocument> owningDoc;
+ nsCOMPtr<nsIDocument> doc;
RefPtr<CSSStyleSheet> sheet = mRule->GetStyleSheet();
if (sheet) {
- owningDoc = sheet->GetOwningDocument();
+ doc = sheet->GetAssociatedDocument();
}
- mozAutoDocUpdate updateBatch(owningDoc, UPDATE_STYLE, true);
+ mozAutoDocUpdate updateBatch(doc, UPDATE_STYLE, true);
mRule->SetDeclaration(aDecl->AsGecko());
@@ -1224,8 +1234,8 @@ DOMCSSDeclarationImpl::SetCSSDeclaration(DeclarationBlock* aDecl)
sheet->DidDirty();
}
- if (owningDoc) {
- owningDoc->StyleRuleChanged(sheet, mRule);
+ if (doc) {
+ doc->StyleRuleChanged(sheet, mRule);
}
return NS_OK;
}
diff --git a/layout/style/StyleSetHandle.h b/layout/style/StyleSetHandle.h
index ad75f75ae..6c67a058d 100644
--- a/layout/style/StyleSetHandle.h
+++ b/layout/style/StyleSetHandle.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/StyleSetHandleInlines.h b/layout/style/StyleSetHandleInlines.h
index 2bb32101f..8cc1f53fe 100644
--- a/layout/style/StyleSetHandleInlines.h
+++ b/layout/style/StyleSetHandleInlines.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/StyleSheet.cpp b/layout/style/StyleSheet.cpp
index 1a7178edb..03f8e19d8 100644
--- a/layout/style/StyleSheet.cpp
+++ b/layout/style/StyleSheet.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -12,8 +11,8 @@
#include "mozilla/ServoStyleSheet.h"
#include "mozilla/StyleSheetInlines.h"
#include "mozilla/CSSStyleSheet.h"
-#include "mozAutoDocUpdate.h"
+#include "mozAutoDocUpdate.h"
#include "nsIMediaList.h"
#include "nsNullPrincipal.h"
@@ -27,6 +26,7 @@ StyleSheet::StyleSheet(StyleBackendType aType, css::SheetParsingMode aParsingMod
, mParsingMode(aParsingMode)
, mType(aType)
, mDisabled(false)
+ , mDocumentAssociationMode(NotOwnedByDocument)
{
}
@@ -39,6 +39,9 @@ StyleSheet::StyleSheet(const StyleSheet& aCopy,
, mParsingMode(aCopy.mParsingMode)
, mType(aCopy.mType)
, mDisabled(aCopy.mDisabled)
+ // We only use this constructor during cloning. It's the cloner's
+ // responsibility to notify us if we end up being owned by a document.
+ , mDocumentAssociationMode(NotOwnedByDocument)
{
}
@@ -354,7 +357,7 @@ StyleSheet::AreRulesAvailable(nsIPrincipal& aSubjectPrincipal,
JSObject*
StyleSheet::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
{
- return CSSStyleSheetBinding::Wrap(aCx, this, aGivenProto);
+ return dom::CSSStyleSheetBinding::Wrap(aCx, this, aGivenProto);
}
} // namespace mozilla
diff --git a/layout/style/StyleSheet.h b/layout/style/StyleSheet.h
index 863f6d22f..55d114700 100644
--- a/layout/style/StyleSheet.h
+++ b/layout/style/StyleSheet.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -95,8 +94,22 @@ public:
inline bool HasRules() const;
// style sheet owner info
- nsIDocument* GetOwningDocument() const { return mDocument; }
- inline void SetOwningDocument(nsIDocument* aDocument);
+ enum DocumentAssociationMode {
+ // OwnedByDocument means mDocument owns us (possibly via a chain of other
+ // stylesheets).
+ OwnedByDocument,
+ // NotOwnedByDocument means we're owned by something that might have a
+ // different lifetime than mDocument.
+ NotOwnedByDocument
+ };
+ nsIDocument* GetAssociatedDocument() const { return mDocument; }
+ bool IsOwnedByDocument() const {
+ return mDocumentAssociationMode == OwnedByDocument;
+ }
+ // aDocument must not be null.
+ inline void SetAssociatedDocument(nsIDocument* aDocument,
+ DocumentAssociationMode aMode);
+ inline void ClearAssociatedDocument();
nsINode* GetOwnerNode() const { return mOwningNode; }
inline StyleSheet* GetParentSheet() const;
@@ -206,6 +219,11 @@ protected:
const StyleBackendType mType;
bool mDisabled;
+
+ // mDocumentAssociationMode determines whether mDocument directly owns us (in
+ // the sense that if it's known-live then we're known-live). Always
+ // NotOwnedByDocument when mDocument is null.
+ DocumentAssociationMode mDocumentAssociationMode;
};
} // namespace mozilla
diff --git a/layout/style/StyleSheetInfo.h b/layout/style/StyleSheetInfo.h
index 9d085fa81..519222ab1 100644
--- a/layout/style/StyleSheetInfo.h
+++ b/layout/style/StyleSheetInfo.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/StyleSheetInlines.h b/layout/style/StyleSheetInlines.h
index d03a3741b..6426ea5d7 100644
--- a/layout/style/StyleSheetInlines.h
+++ b/layout/style/StyleSheetInlines.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -83,9 +82,17 @@ StyleSheet::HasRules() const
}
void
-StyleSheet::SetOwningDocument(nsIDocument* aDocument)
+StyleSheet::SetAssociatedDocument(nsIDocument* aDocument,
+ DocumentAssociationMode aAssociationMode)
{
- MOZ_STYLO_FORWARD(SetOwningDocument, (aDocument))
+ MOZ_ASSERT(aDocument);
+ MOZ_STYLO_FORWARD(SetAssociatedDocument, (aDocument, aAssociationMode))
+}
+
+void
+StyleSheet::ClearAssociatedDocument()
+{
+ MOZ_STYLO_FORWARD(SetAssociatedDocument, (nullptr, NotOwnedByDocument));
}
StyleSheet*
diff --git a/layout/style/crashtests/1017798-1.html b/layout/style/crashtests/1017798-1.html
index 097217d18..0460c8756 100644
--- a/layout/style/crashtests/1017798-1.html
+++ b/layout/style/crashtests/1017798-1.html
@@ -50,27 +50,27 @@ gaia_switch/examples/index.html from the Gaia repository.
window.GaiaSwitch = (function(win) {
// Extend from the HTMLElement prototype
- var proto = Object.create(HTMLElement.prototype);
+ class GaiaSwitch extends HTMLElement {
+ connectedCallback() {
+ var shadow = this.createShadowRoot();
+ this._template = template.content.cloneNode(true);
+ this._input = this._template.querySelector('input[type="checkbox"]');
+
+ var checked = this.getAttribute('checked');
+ if (checked !== null) {
+ this._input.checked = true;
+ }
- proto.createdCallback = function() {
- var shadow = this.createShadowRoot();
- this._template = template.content.cloneNode(true);
- this._input = this._template.querySelector('input[type="checkbox"]');
+ shadow.appendChild(this._template);
- var checked = this.getAttribute('checked');
- if (checked !== null) {
- this._input.checked = true;
+ ComponentUtils.style.call(this, '');
}
-
- shadow.appendChild(this._template);
-
- ComponentUtils.style.call(this, '');
};
/**
* Proxy the checked property to the input element.
*/
- Object.defineProperty( proto, 'checked', {
+ Object.defineProperty( GaiaSwitch.prototype, 'checked', {
get: function() {
return this._input.checked;
},
@@ -82,7 +82,7 @@ window.GaiaSwitch = (function(win) {
/**
* Proxy the name property to the input element.
*/
- Object.defineProperty( proto, 'name', {
+ Object.defineProperty( GaiaSwitch.prototype, 'name', {
get: function() {
return this.getAttribute('name');
},
diff --git a/layout/style/crashtests/786108-2.html b/layout/style/crashtests/786108-2.html
index 1b2892040..df9fe7844 100644
--- a/layout/style/crashtests/786108-2.html
+++ b/layout/style/crashtests/786108-2.html
@@ -6,7 +6,7 @@
// are reported from CSS embedded in a file with a long data URI. Addressed
// by 786108; should finish quickly with that patch and run for a very long
// time otherwise. This version is designed for slow / memory constrained
- // platforms like Android.
+ // platforms.
var img = new Array;
img.push('<img src="data:image/svg+xml,');
diff --git a/layout/style/moz.build b/layout/style/moz.build
index bdc86ee99..7f08fc236 100644
--- a/layout/style/moz.build
+++ b/layout/style/moz.build
@@ -1,5 +1,4 @@
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -87,6 +86,7 @@ EXPORTS.mozilla += [
'CSSVariableValues.h',
'DeclarationBlock.h',
'DeclarationBlockInlines.h',
+ 'DocumentStyleRootIterator.h',
'HandleRefPtr.h',
'IncrementalClearCOMRuleArray.h',
'LayerAnimationInfo.h',
@@ -150,6 +150,7 @@ SOURCES += [
'CSSVariableResolver.cpp',
'CSSVariableValues.cpp',
'Declaration.cpp',
+ 'DocumentStyleRootIterator.cpp',
'ErrorReporter.cpp',
'FontFace.cpp',
'FontFaceSet.cpp',
diff --git a/layout/style/nsAnimationManager.cpp b/layout/style/nsAnimationManager.cpp
index 268117738..718870985 100644
--- a/layout/style/nsAnimationManager.cpp
+++ b/layout/style/nsAnimationManager.cpp
@@ -1,4 +1,3 @@
-/* vim: set shiftwidth=2 tabstop=8 autoindent cindent expandtab: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -11,7 +10,6 @@
#include "mozilla/EffectSet.h"
#include "mozilla/MemoryReporting.h"
#include "mozilla/StyleAnimationValue.h"
-#include "mozilla/dom/AnimationEffectReadOnly.h"
#include "mozilla/dom/DocumentTimeline.h"
#include "mozilla/dom/KeyframeEffectReadOnly.h"
@@ -31,7 +29,6 @@ using namespace mozilla;
using namespace mozilla::css;
using mozilla::dom::Animation;
using mozilla::dom::AnimationPlayState;
-using mozilla::dom::AnimationEffectReadOnly;
using mozilla::dom::KeyframeEffectReadOnly;
using mozilla::dom::CSSAnimation;
@@ -369,7 +366,7 @@ UpdateOldAnimationPropertiesWithNew(
// Update the old from the new so we can keep the original object
// identity (and any expando properties attached to it).
if (aOld.GetEffect()) {
- AnimationEffectReadOnly* oldEffect = aOld.GetEffect();
+ dom::AnimationEffectReadOnly* oldEffect = aOld.GetEffect();
animationChanged = oldEffect->SpecifiedTiming() != aNewTiming;
oldEffect->SetSpecifiedTiming(aNewTiming);
diff --git a/layout/style/nsAnimationManager.h b/layout/style/nsAnimationManager.h
index d838d090a..a2846e5cc 100644
--- a/layout/style/nsAnimationManager.h
+++ b/layout/style/nsAnimationManager.h
@@ -1,4 +1,3 @@
-/* vim: set shiftwidth=2 tabstop=8 autoindent cindent expandtab: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/nsCSSDataBlock.cpp b/layout/style/nsCSSDataBlock.cpp
index 1dfdaed0e..33c309dd4 100644
--- a/layout/style/nsCSSDataBlock.cpp
+++ b/layout/style/nsCSSDataBlock.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/nsCSSDataBlock.h b/layout/style/nsCSSDataBlock.h
index 76deaa911..b699c408b 100644
--- a/layout/style/nsCSSDataBlock.h
+++ b/layout/style/nsCSSDataBlock.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/nsCSSKeywordList.h b/layout/style/nsCSSKeywordList.h
index 86ba59142..689ff47eb 100644
--- a/layout/style/nsCSSKeywordList.h
+++ b/layout/style/nsCSSKeywordList.h
@@ -509,6 +509,7 @@ CSS_KEY(scrollbar, scrollbar)
CSS_KEY(scrollbar-small, scrollbar_small)
CSS_KEY(scrollbar-horizontal, scrollbar_horizontal)
CSS_KEY(scrollbar-vertical, scrollbar_vertical)
+CSS_KEY(scrollbar-width, scrollbar_width)
CSS_KEY(se-resize, se_resize)
CSS_KEY(select-after, select_after)
CSS_KEY(select-all, select_all)
diff --git a/layout/style/nsCSSParser.cpp b/layout/style/nsCSSParser.cpp
index a8ed48894..0f1b04a17 100644
--- a/layout/style/nsCSSParser.cpp
+++ b/layout/style/nsCSSParser.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=78: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -15328,17 +15327,17 @@ CSSParserImpl::ParseFontFeatureSettings(nsCSSValue& aValue)
return true;
}
-bool
-CSSParserImpl::ParseFontVariationSettings(nsCSSValue& aValue)
-{
- // TODO: Actually implement this.
-
- // This stub is here because websites insist on considering this
- // very hardware-dependent and O.S.-variable low-level font-control
- // as a "critical feature" which it isn't as there is 0 guarantee
- // that font variation settings are supported or honored by any
- // operating system used by the client.
- return true;
+bool
+CSSParserImpl::ParseFontVariationSettings(nsCSSValue& aValue)
+{
+ // TODO: Actually implement this.
+
+ // This stub is here because websites insist on considering this
+ // very hardware-dependent and O.S.-variable low-level font-control
+ // as a "critical feature" which it isn't as there is 0 guarantee
+ // that font variation settings are supported or honored by any
+ // operating system used by the client.
+ return true;
}
bool
diff --git a/layout/style/nsCSSPropAliasList.h b/layout/style/nsCSSPropAliasList.h
index 334f3b1ac..4f2a6e6b6 100644
--- a/layout/style/nsCSSPropAliasList.h
+++ b/layout/style/nsCSSPropAliasList.h
@@ -1,4 +1,3 @@
-/* vim: set shiftwidth=2 tabstop=8 autoindent cindent expandtab: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/nsCSSPropList.h b/layout/style/nsCSSPropList.h
index 658ea68d7..e78dafcc5 100644
--- a/layout/style/nsCSSPropList.h
+++ b/layout/style/nsCSSPropList.h
@@ -3709,6 +3709,16 @@ CSS_PROP_DISPLAY(
kScrollSnapTypeKTable,
CSS_PROP_NO_OFFSET,
eStyleAnimType_Discrete)
+CSS_PROP_USERINTERFACE(
+ scrollbar-width,
+ scrollbar_width,
+ ScrollbarWidth,
+ CSS_PROPERTY_PARSE_VALUE,
+ "layout.css.scrollbar-width.enabled",
+ VARIANT_HK,
+ kScrollbarWidthKTable,
+ CSS_PROP_NO_OFFSET,
+ eStyleAnimType_Discrete)
CSS_PROP_DISPLAY(
shape-outside,
shape_outside,
diff --git a/layout/style/nsCSSProps.cpp b/layout/style/nsCSSProps.cpp
index e0cda2488..b6ffe7952 100644
--- a/layout/style/nsCSSProps.cpp
+++ b/layout/style/nsCSSProps.cpp
@@ -2009,6 +2009,12 @@ const KTableEntry nsCSSProps::kScrollSnapTypeKTable[] = {
{ eCSSKeyword_UNKNOWN, -1 }
};
+const KTableEntry nsCSSProps::kScrollbarWidthKTable[] = {
+ { eCSSKeyword_auto, StyleScrollbarWidth::Auto },
+ { eCSSKeyword_thin, StyleScrollbarWidth::Thin },
+ { eCSSKeyword_none, StyleScrollbarWidth::None }
+};
+
const KTableEntry nsCSSProps::kStackSizingKTable[] = {
{ eCSSKeyword_ignore, NS_STYLE_STACK_SIZING_IGNORE },
{ eCSSKeyword_stretch_to_fit, NS_STYLE_STACK_SIZING_STRETCH_TO_FIT },
diff --git a/layout/style/nsCSSProps.h b/layout/style/nsCSSProps.h
index 34d457c08..7b8c56860 100644
--- a/layout/style/nsCSSProps.h
+++ b/layout/style/nsCSSProps.h
@@ -856,6 +856,7 @@ public:
static const KTableEntry kRubyPositionKTable[];
static const KTableEntry kScrollBehaviorKTable[];
static const KTableEntry kScrollSnapTypeKTable[];
+ static const KTableEntry kScrollbarWidthKTable[];
static const KTableEntry kSpeakKTable[];
static const KTableEntry kSpeakHeaderKTable[];
static const KTableEntry kSpeakNumeralKTable[];
diff --git a/layout/style/nsCSSPseudoClassList.h b/layout/style/nsCSSPseudoClassList.h
index ec7bfcb77..7f620ec32 100644
--- a/layout/style/nsCSSPseudoClassList.h
+++ b/layout/style/nsCSSPseudoClassList.h
@@ -92,9 +92,6 @@ CSS_PSEUDO_CLASS(nthLastOfType, ":nth-last-of-type", 0, "")
// Match nodes that are HTML but not XHTML
CSS_PSEUDO_CLASS(mozIsHTML, ":-moz-is-html", 0, "")
-// Match all custom elements whose created callback has not yet been invoked
- CSS_STATE_PSEUDO_CLASS(unresolved, ":unresolved", 0, "", NS_EVENT_STATE_UNRESOLVED)
-
// Matches nodes that are in a native-anonymous subtree (i.e., nodes in
// a subtree of C++ anonymous content constructed by Gecko for its own
// purposes).
@@ -213,6 +210,19 @@ CSS_STATE_PSEUDO_CLASS(mozMathIncrementScriptLevel,
":-moz-math-increment-script-level", 0, "",
NS_EVENT_STATE_INCREMENT_SCRIPT_LEVEL)
+CSS_STATE_PSEUDO_CLASS(mozHasDirAttr, ":-moz-has-dir-attr",
+ CSS_PSEUDO_CLASS_ENABLED_IN_UA_SHEETS, "",
+ NS_EVENT_STATE_HAS_DIR_ATTR)
+CSS_STATE_PSEUDO_CLASS(mozDirAttrLTR, ":-moz-dir-attr-ltr",
+ CSS_PSEUDO_CLASS_ENABLED_IN_UA_SHEETS, "",
+ NS_EVENT_STATE_DIR_ATTR_LTR)
+CSS_STATE_PSEUDO_CLASS(mozDirAttrRTL, ":-moz-dir-attr-rtl",
+ CSS_PSEUDO_CLASS_ENABLED_IN_UA_SHEETS, "",
+ NS_EVENT_STATE_DIR_ATTR_RTL)
+CSS_STATE_PSEUDO_CLASS(mozDirAttrLikeAuto, ":-moz-dir-attr-like-auto",
+ CSS_PSEUDO_CLASS_ENABLED_IN_UA_SHEETS, "",
+ NS_EVENT_STATE_DIR_ATTR_LIKE_AUTO)
+
// CSS 3 UI
// http://www.w3.org/TR/2004/CR-css3-ui-20040511/#pseudo-classes
CSS_STATE_PSEUDO_CLASS(required, ":required", 0, "", NS_EVENT_STATE_REQUIRED)
diff --git a/layout/style/nsCSSPseudoElements.h b/layout/style/nsCSSPseudoElements.h
index acf818a2c..22c744ad0 100644
--- a/layout/style/nsCSSPseudoElements.h
+++ b/layout/style/nsCSSPseudoElements.h
@@ -36,6 +36,10 @@
#define CSS_PSEUDO_ELEMENT_SUPPORTS_USER_ACTION_STATE (1<<3)
// Is content prevented from parsing selectors containing this pseudo-element?
#define CSS_PSEUDO_ELEMENT_UA_SHEET_ONLY (1<<4)
+// Can we use the ChromeOnly document.createElement(..., { pseudo: "::foo" })
+// API for creating pseudo-implementing native anonymous content in JS with this
+// pseudo-element?
+#define CSS_PSEUDO_ELEMENT_IS_JS_CREATED_NAC (1<<5)
namespace mozilla {
@@ -98,6 +102,11 @@ public:
static bool PseudoElementSupportsUserActionState(const Type aType);
+ static bool PseudoElementIsJSCreatedNAC(Type aType)
+ {
+ return PseudoElementHasFlags(aType, CSS_PSEUDO_ELEMENT_IS_JS_CREATED_NAC);
+ }
+
static bool IsEnabled(Type aType, EnabledState aEnabledState)
{
return !PseudoElementHasFlags(aType, CSS_PSEUDO_ELEMENT_UA_SHEET_ONLY) ||
@@ -106,15 +115,6 @@ public:
private:
// Does the given pseudo-element have all of the flags given?
-
- // Work around https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64037 ,
- // which is a general gcc bug that we seem to have hit only on Android/x86.
-#if defined(ANDROID) && defined(__i386__) && defined(__GNUC__) && \
- !defined(__clang__)
-#if (MOZ_GCC_VERSION_AT_MOST(4,9,2))
- __attribute__((noinline))
-#endif
-#endif
static bool PseudoElementHasFlags(const Type aType, uint32_t aFlags)
{
MOZ_ASSERT(aType < Type::Count);
diff --git a/layout/style/nsCSSRules.cpp b/layout/style/nsCSSRules.cpp
index 4b90b6f0c..dc79e471d 100644
--- a/layout/style/nsCSSRules.cpp
+++ b/layout/style/nsCSSRules.cpp
@@ -1515,6 +1515,13 @@ nsCSSFontFaceStyleDecl::GetParentObject()
return ContainingRule()->GetDocument();
}
+DocGroup*
+nsCSSFontFaceStyleDecl::GetDocGroup() const
+{
+ nsIDocument* document = ContainingRule()->GetDocument();
+ return document ? document->GetDocGroup() : nullptr;
+}
+
JSObject*
nsCSSFontFaceStyleDecl::WrapObject(JSContext *cx, JS::Handle<JSObject*> aGivenProto)
{
@@ -1991,6 +1998,17 @@ nsCSSKeyframeStyleDeclaration::GetParentObject()
return mRule ? mRule->GetDocument() : nullptr;
}
+DocGroup*
+nsCSSKeyframeStyleDeclaration::GetDocGroup() const
+{
+ if (!mRule) {
+ return nullptr;
+ }
+
+ nsIDocument* document = mRule->GetDocument();
+ return document ? document->GetDocGroup() : nullptr;
+}
+
// -------------------------------------------
// nsCSSKeyframeRule
//
@@ -2538,6 +2556,17 @@ nsCSSPageStyleDeclaration::GetParentObject()
return mRule ? mRule->GetDocument() : nullptr;
}
+DocGroup*
+nsCSSPageStyleDeclaration::GetDocGroup() const
+{
+ if (!mRule) {
+ return nullptr;
+ }
+
+ nsIDocument* document = mRule->GetDocument();
+ return document ? document->GetDocGroup() : nullptr;
+}
+
// -------------------------------------------
// nsCSSPageRule
//
diff --git a/layout/style/nsCSSRules.h b/layout/style/nsCSSRules.h
index daefaf3f9..1c6361c3e 100644
--- a/layout/style/nsCSSRules.h
+++ b/layout/style/nsCSSRules.h
@@ -39,6 +39,10 @@ class nsMediaList;
namespace mozilla {
+namespace dom {
+class DocGroup;
+} // namespace dom
+
class ErrorResult;
namespace css {
@@ -209,6 +213,7 @@ public:
using nsICSSDeclaration::GetPropertyCSSValue;
virtual nsINode *GetParentObject() override;
+ virtual mozilla::dom::DocGroup* GetDocGroup() const override;
virtual void IndexedGetter(uint32_t aIndex, bool& aFound, nsAString& aPropName) override;
nsresult GetPropertyValue(nsCSSFontDesc aFontDescID,
@@ -366,6 +371,7 @@ public:
nsICSSDeclaration)
virtual nsINode* GetParentObject() override;
+ virtual mozilla::dom::DocGroup* GetDocGroup() const override;
protected:
virtual ~nsCSSKeyframeStyleDeclaration();
@@ -496,6 +502,7 @@ public:
nsICSSDeclaration)
virtual nsINode *GetParentObject() override;
+ virtual mozilla::dom::DocGroup* GetDocGroup() const override;
protected:
virtual ~nsCSSPageStyleDeclaration();
diff --git a/layout/style/nsCSSValue.cpp b/layout/style/nsCSSValue.cpp
index 0a905a055..40d804b02 100644
--- a/layout/style/nsCSSValue.cpp
+++ b/layout/style/nsCSSValue.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/nsComputedDOMStyle.cpp b/layout/style/nsComputedDOMStyle.cpp
index bbad9c371..7ac5fa604 100644
--- a/layout/style/nsComputedDOMStyle.cpp
+++ b/layout/style/nsComputedDOMStyle.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -640,6 +639,34 @@ nsComputedDOMStyle::SetFrameStyleContext(nsStyleContext* aContext)
mStyleContext = aContext;
}
+/**
+ * The following function checks whether we need to explicitly resolve the style
+ * again, even though we have a style context coming from the frame.
+ *
+ * This basically checks whether the style is or may be under a ::first-line or
+ * ::first-letter frame, in which case we can't return the frame style, and we
+ * need to resolve it. See bug 505515.
+ */
+static bool
+MustReresolveStyle(const nsStyleContext* aContext)
+{
+ MOZ_ASSERT(aContext);
+
+ if (aContext->HasPseudoElementData()) {
+ if (!aContext->GetPseudo() ||
+ aContext->StyleSource().IsServoComputedValues()) {
+ // TODO(emilio): When ::first-line is supported in Servo, we may want to
+ // fix this to avoid re-resolving pseudo-element styles.
+ return true;
+ }
+
+ return aContext->GetParent() &&
+ aContext->GetParent()->HasPseudoElementData();
+ }
+
+ return false;
+}
+
void
nsComputedDOMStyle::UpdateCurrentStyleSources(bool aNeedsLayoutFlush)
{
@@ -692,9 +719,20 @@ nsComputedDOMStyle::UpdateCurrentStyleSources(bool aNeedsLayoutFlush)
// XXX the !mElement->IsHTMLElement(nsGkAtoms::area)
// check is needed due to bug 135040 (to avoid using
// mPrimaryFrame). Remove it once that's fixed.
- if (!mPseudo && mStyleType == eAll &&
- !mElement->IsHTMLElement(nsGkAtoms::area)) {
- mOuterFrame = mElement->GetPrimaryFrame();
+ if (mStyleType == eAll && !mElement->IsHTMLElement(nsGkAtoms::area)) {
+ mOuterFrame = nullptr;
+
+ if (!mPseudo) {
+ mOuterFrame = mElement->GetPrimaryFrame();
+ } else if (mPseudo == nsCSSPseudoElements::before ||
+ mPseudo == nsCSSPseudoElements::after) {
+ nsIAtom* property = mPseudo == nsCSSPseudoElements::before
+ ? nsGkAtoms::beforePseudoProperty
+ : nsGkAtoms::afterPseudoProperty;
+
+ auto* pseudo = static_cast<Element*>(mElement->GetProperty(property));
+ mOuterFrame = pseudo ? pseudo->GetPrimaryFrame() : nullptr;
+ }
mInnerFrame = mOuterFrame;
if (mOuterFrame) {
nsIAtom* type = mOuterFrame->GetType();
@@ -713,13 +751,15 @@ nsComputedDOMStyle::UpdateCurrentStyleSources(bool aNeedsLayoutFlush)
}
}
- if (!mStyleContext || mStyleContext->HasPseudoElementData()) {
+ if (!mStyleContext || MustReresolveStyle(mStyleContext)) {
#ifdef DEBUG
if (mStyleContext) {
// We want to check that going through this path because of
// HasPseudoElementData is rare, because it slows us down a good
// bit. So check that we're really inside something associated
- // with a pseudo-element that contains elements.
+ // with a pseudo-element that contains elements. (We also allow
+ // the element to be NAC, just in case some chrome JS calls
+ // getComputedStyle on a NAC-implemented pseudo.)
nsStyleContext* topWithPseudoElementData = mStyleContext;
while (topWithPseudoElementData->GetParent()->HasPseudoElementData()) {
topWithPseudoElementData = topWithPseudoElementData->GetParent();
@@ -730,7 +770,8 @@ nsComputedDOMStyle::UpdateCurrentStyleSources(bool aNeedsLayoutFlush)
NS_LITERAL_STRING("we should be in a pseudo-element that is expected to contain elements ("));
assertMsg.Append(nsDependentString(pseudoAtom->GetUTF16String()));
assertMsg.Append(')');
- NS_ASSERTION(nsCSSPseudoElements::PseudoElementContainsElements(pseudo),
+ NS_ASSERTION(nsCSSPseudoElements::PseudoElementContainsElements(pseudo) ||
+ mElement->IsNativeAnonymous(),
NS_LossyConvertUTF16toASCII(assertMsg).get());
}
#endif
@@ -3264,6 +3305,16 @@ nsComputedDOMStyle::DoGetScrollSnapTypeY()
return val.forget();
}
+already_AddRefed<CSSValue>
+nsComputedDOMStyle::DoGetScrollbarWidth()
+{
+ RefPtr<nsROCSSPrimitiveValue> val = new nsROCSSPrimitiveValue;
+ val->SetIdent(
+ nsCSSProps::ValueToKeywordEnum(StyleUserInterface()->mScrollbarWidth,
+ nsCSSProps::kScrollbarWidthKTable));
+ return val.forget();
+}
+
already_AddRefed<CSSValue>
nsComputedDOMStyle::GetScrollSnapPoints(const nsStyleCoord& aCoord)
{
diff --git a/layout/style/nsComputedDOMStyle.h b/layout/style/nsComputedDOMStyle.h
index 79c7ed519..38a61e23c 100644
--- a/layout/style/nsComputedDOMStyle.h
+++ b/layout/style/nsComputedDOMStyle.h
@@ -27,6 +27,7 @@
namespace mozilla {
namespace dom {
+class DocGroup;
class Element;
} // namespace dom
struct ComputedGridTrackInfo;
@@ -84,6 +85,11 @@ public:
return mElement;
}
+ virtual mozilla::dom::DocGroup* GetDocGroup() const override
+ {
+ return mElement ? mElement->GetDocGroup() : nullptr;
+ }
+
static already_AddRefed<nsStyleContext>
GetStyleContextForElement(mozilla::dom::Element* aElement, nsIAtom* aPseudo,
nsIPresShell* aPresShell,
@@ -486,6 +492,7 @@ private:
already_AddRefed<CSSValue> DoGetCursor();
already_AddRefed<CSSValue> DoGetForceBrokenImageIcon();
already_AddRefed<CSSValue> DoGetIMEMode();
+ already_AddRefed<CSSValue> DoGetScrollbarWidth();
already_AddRefed<CSSValue> DoGetUserFocus();
already_AddRefed<CSSValue> DoGetUserInput();
already_AddRefed<CSSValue> DoGetUserModify();
diff --git a/layout/style/nsComputedDOMStylePropertyList.h b/layout/style/nsComputedDOMStylePropertyList.h
index 6a18a7ad0..ec223cda4 100644
--- a/layout/style/nsComputedDOMStylePropertyList.h
+++ b/layout/style/nsComputedDOMStylePropertyList.h
@@ -226,6 +226,7 @@ COMPUTED_STYLE_PROP(scroll_snap_points_x, ScrollSnapPointsX)
COMPUTED_STYLE_PROP(scroll_snap_points_y, ScrollSnapPointsY)
COMPUTED_STYLE_PROP(scroll_snap_type_x, ScrollSnapTypeX)
COMPUTED_STYLE_PROP(scroll_snap_type_y, ScrollSnapTypeY)
+COMPUTED_STYLE_PROP(scrollbar_width, ScrollbarWidth)
COMPUTED_STYLE_PROP(shape_outside, ShapeOutside)
//// COMPUTED_STYLE_PROP(size, Size)
COMPUTED_STYLE_PROP(tab_size, TabSize)
diff --git a/layout/style/nsDOMCSSAttrDeclaration.cpp b/layout/style/nsDOMCSSAttrDeclaration.cpp
index f94998478..652bd4ad1 100644
--- a/layout/style/nsDOMCSSAttrDeclaration.cpp
+++ b/layout/style/nsDOMCSSAttrDeclaration.cpp
@@ -183,6 +183,12 @@ nsDOMCSSAttributeDeclaration::GetParentObject()
return mElement;
}
+/* virtual */ DocGroup*
+nsDOMCSSAttributeDeclaration::GetDocGroup() const
+{
+ return mElement ? mElement->OwnerDoc()->GetDocGroup() : nullptr;
+}
+
NS_IMETHODIMP
nsDOMCSSAttributeDeclaration::SetPropertyValue(const nsCSSPropertyID aPropID,
const nsAString& aValue)
diff --git a/layout/style/nsDOMCSSAttrDeclaration.h b/layout/style/nsDOMCSSAttrDeclaration.h
index 7c0fbacc0..482d665ea 100644
--- a/layout/style/nsDOMCSSAttrDeclaration.h
+++ b/layout/style/nsDOMCSSAttrDeclaration.h
@@ -35,6 +35,8 @@ public:
NS_IMETHOD GetParentRule(nsIDOMCSSRule **aParent) override;
virtual nsINode* GetParentObject() override;
+ typedef mozilla::dom::DocGroup DocGroup;
+ virtual DocGroup* GetDocGroup() const override;
NS_IMETHOD SetPropertyValue(const nsCSSPropertyID aPropID,
const nsAString& aValue) override;
diff --git a/layout/style/nsDOMCSSDeclaration.cpp b/layout/style/nsDOMCSSDeclaration.cpp
index bd6c6069d..51ce8c335 100644
--- a/layout/style/nsDOMCSSDeclaration.cpp
+++ b/layout/style/nsDOMCSSDeclaration.cpp
@@ -267,7 +267,7 @@ nsDOMCSSDeclaration::GetCSSParsingEnvironmentForRule(css::Rule* aRule,
return;
}
- nsIDocument* document = sheet->GetOwningDocument();
+ nsIDocument* document = sheet->GetAssociatedDocument();
aCSSParseEnv.mSheetURI = sheet->GetSheetURI();
aCSSParseEnv.mBaseURI = sheet->GetBaseURI();
aCSSParseEnv.mPrincipal = sheet->Principal();
diff --git a/layout/style/nsHTMLCSSStyleSheet.cpp b/layout/style/nsHTMLCSSStyleSheet.cpp
index f5e8cde0b..9b3bd65fb 100644
--- a/layout/style/nsHTMLCSSStyleSheet.cpp
+++ b/layout/style/nsHTMLCSSStyleSheet.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/nsICSSDeclaration.h b/layout/style/nsICSSDeclaration.h
index ff6ec4a78..fa80c17f5 100644
--- a/layout/style/nsICSSDeclaration.h
+++ b/layout/style/nsICSSDeclaration.h
@@ -31,6 +31,11 @@
#include "nsCOMPtr.h"
class nsINode;
+namespace mozilla {
+namespace dom {
+class DocGroup;
+} // namespace dom
+} // namespace mozilla
// dbeabbfa-6cb3-4f5c-aec2-dd558d9d681f
#define NS_ICSSDECLARATION_IID \
@@ -62,6 +67,7 @@ public:
const nsAString& aValue) = 0;
virtual nsINode *GetParentObject() = 0;
+ virtual mozilla::dom::DocGroup* GetDocGroup() const = 0;
// Also have to declare all the nsIDOMCSSStyleDeclaration methods,
// since we want to be able to call them from the WebIDL versions.
diff --git a/layout/style/nsLayoutStylesheetCache.cpp b/layout/style/nsLayoutStylesheetCache.cpp
index e8c6d09d7..bf87b006c 100644
--- a/layout/style/nsLayoutStylesheetCache.cpp
+++ b/layout/style/nsLayoutStylesheetCache.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -122,11 +121,6 @@ nsLayoutStylesheetCache::UASheet()
StyleSheet*
nsLayoutStylesheetCache::HTMLSheet()
{
- if (!mHTMLSheet) {
- LoadSheetURL("resource://gre-resources/html.css",
- &mHTMLSheet, eAgentSheetFeatures, eCrash);
- }
-
return mHTMLSheet;
}
@@ -322,6 +316,8 @@ nsLayoutStylesheetCache::nsLayoutStylesheetCache(StyleBackendType aType)
// per-profile, since they're profile-invariant.
LoadSheetURL("resource://gre-resources/counterstyles.css",
&mCounterStylesSheet, eAgentSheetFeatures, eCrash);
+ LoadSheetURL("resource://gre-resources/html.css",
+ &mHTMLSheet, eAgentSheetFeatures, eCrash);
LoadSheetURL("chrome://global/content/minimal-xul.css",
&mMinimalXULSheet, eAgentSheetFeatures, eCrash);
LoadSheetURL("resource://gre-resources/quirk.css",
@@ -382,8 +378,6 @@ nsLayoutStylesheetCache::For(StyleBackendType aType)
// "layout.css.example-pref.enabled");
Preferences::RegisterCallback(&DependentPrefChanged,
"layout.css.grid.enabled");
- Preferences::RegisterCallback(&DependentPrefChanged,
- "dom.details_element.enabled");
}
return cache;
@@ -555,7 +549,6 @@ nsLayoutStylesheetCache::DependentPrefChanged(const char* aPref, void* aData)
gStyleCache_Servo ? &gStyleCache_Servo->sheet_ : nullptr);
INVALIDATE(mUASheet); // for layout.css.grid.enabled
- INVALIDATE(mHTMLSheet); // for dom.details_element.enabled
#undef INVALIDATE
}
diff --git a/layout/style/nsLayoutStylesheetCache.h b/layout/style/nsLayoutStylesheetCache.h
index 48391cc7a..70ab5e88d 100644
--- a/layout/style/nsLayoutStylesheetCache.h
+++ b/layout/style/nsLayoutStylesheetCache.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/nsMediaFeatures.cpp b/layout/style/nsMediaFeatures.cpp
index f33f8dd33..e44003ce4 100644
--- a/layout/style/nsMediaFeatures.cpp
+++ b/layout/style/nsMediaFeatures.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/nsMediaFeatures.h b/layout/style/nsMediaFeatures.h
index 76e94837d..f6c4b5806 100644
--- a/layout/style/nsMediaFeatures.h
+++ b/layout/style/nsMediaFeatures.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/nsROCSSPrimitiveValue.cpp b/layout/style/nsROCSSPrimitiveValue.cpp
index 2721bd609..e72c16b5f 100644
--- a/layout/style/nsROCSSPrimitiveValue.cpp
+++ b/layout/style/nsROCSSPrimitiveValue.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/nsRuleNode.cpp b/layout/style/nsRuleNode.cpp
index 8b0dd9bbb..04715aa99 100644
--- a/layout/style/nsRuleNode.cpp
+++ b/layout/style/nsRuleNode.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=78: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -425,7 +424,7 @@ static nsSize CalcViewportUnitsScale(nsPresContext* aPresContext)
nsIScrollableFrame* scrollFrame =
aPresContext->PresShell()->GetRootScrollFrameAsScrollable();
if (scrollFrame) {
- ScrollbarStyles styles(scrollFrame->GetScrollbarStyles());
+ ScrollStyles styles(scrollFrame->GetScrollStyles());
if (styles.mHorizontal == NS_STYLE_OVERFLOW_SCROLL ||
styles.mVertical == NS_STYLE_OVERFLOW_SCROLL) {
@@ -1395,6 +1394,7 @@ struct SetEnumValueHelper
DEFINE_ENUM_CLASS_SETTER(StyleFillRule, Nonzero, Evenodd)
DEFINE_ENUM_CLASS_SETTER(StyleFloat, None, InlineEnd)
DEFINE_ENUM_CLASS_SETTER(StyleFloatEdge, ContentBox, MarginBox)
+ DEFINE_ENUM_CLASS_SETTER(StyleScrollbarWidth, Auto, None)
DEFINE_ENUM_CLASS_SETTER(StyleTextJustify, None, InterCharacter)
DEFINE_ENUM_CLASS_SETTER(StyleUserFocus, None, SelectMenu)
DEFINE_ENUM_CLASS_SETTER(StyleUserSelect, None, MozText)
@@ -5236,6 +5236,14 @@ nsRuleNode::ComputeUserInterfaceData(void* aStartStruct,
// caret-color: auto, color, inherit
setComplexColor(aRuleData->ValueForCaretColor(),
&nsStyleUserInterface::mCaretColor);
+
+ // scrollbar-width: auto, thin, none
+ SetValue(*aRuleData->ValueForScrollbarWidth(),
+ ui->mScrollbarWidth,
+ conditions,
+ SETVAL_ENUMERATED,
+ parentUI->mScrollbarWidth,
+ StyleScrollbarWidth::Auto);
COMPUTE_END_INHERITED(UserInterface, ui)
}
diff --git a/layout/style/nsStyleConsts.h b/layout/style/nsStyleConsts.h
index e6a0cc65a..308a66647 100644
--- a/layout/style/nsStyleConsts.h
+++ b/layout/style/nsStyleConsts.h
@@ -187,6 +187,13 @@ enum class StyleFloatEdge : uint8_t {
MarginBox,
};
+// scrollbar-width
+enum class StyleScrollbarWidth : uint8_t {
+ Auto,
+ Thin,
+ None,
+};
+
// shape-box for shape-outside
enum class StyleShapeOutsideShapeBox : uint8_t {
NoBox,
diff --git a/layout/style/nsStyleSet.cpp b/layout/style/nsStyleSet.cpp
index 414eee4d4..558b9fa7f 100644
--- a/layout/style/nsStyleSet.cpp
+++ b/layout/style/nsStyleSet.cpp
@@ -734,7 +734,7 @@ nsStyleSet::AddDocStyleSheet(CSSStyleSheet* aSheet, nsIDocument* aDocument)
bool present = sheets.RemoveElement(aSheet);
- size_t index = aDocument->FindDocStyleSheetInsertionPoint(sheets, aSheet);
+ size_t index = aDocument->FindDocStyleSheetInsertionPoint(sheets, *aSheet);
sheets.InsertElementAt(index, aSheet);
if (!present) {
diff --git a/layout/style/nsStyleStruct.cpp b/layout/style/nsStyleStruct.cpp
index a2b6833ac..acf287ea8 100644
--- a/layout/style/nsStyleStruct.cpp
+++ b/layout/style/nsStyleStruct.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -3265,7 +3264,7 @@ nsStyleDisplay::CalcDifference(const nsStyleDisplay& aNewData) const
if (mOverflowX != aNewData.mOverflowX
|| mOverflowY != aNewData.mOverflowY) {
- hint |= nsChangeHint_CSSOverflowChange;
+ hint |= nsChangeHint_ScrollbarChange;
}
/* Note: When mScrollBehavior, mScrollSnapTypeX, mScrollSnapTypeY,
@@ -4025,6 +4024,7 @@ nsStyleUserInterface::nsStyleUserInterface(StyleStructContext aContext)
, mPointerEvents(NS_STYLE_POINTER_EVENTS_AUTO)
, mCursor(NS_STYLE_CURSOR_AUTO)
, mCaretColor(StyleComplexColor::Auto())
+ , mScrollbarWidth(StyleScrollbarWidth::Auto)
{
MOZ_COUNT_CTOR(nsStyleUserInterface);
}
@@ -4037,6 +4037,7 @@ nsStyleUserInterface::nsStyleUserInterface(const nsStyleUserInterface& aSource)
, mCursor(aSource.mCursor)
, mCursorImages(aSource.mCursorImages)
, mCaretColor(aSource.mCaretColor)
+ , mScrollbarWidth(aSource.mScrollbarWidth)
{
MOZ_COUNT_CTOR(nsStyleUserInterface);
}
@@ -4088,6 +4089,13 @@ nsStyleUserInterface::CalcDifference(const nsStyleUserInterface& aNewData) const
if (mCaretColor != aNewData.mCaretColor) {
hint |= nsChangeHint_RepaintFrame;
}
+
+ if (mScrollbarWidth != aNewData.mScrollbarWidth) {
+ // For scrollbar-width change, we need some special handling similar
+ // to overflow properties. Specifically, we may need to reconstruct
+ // the scrollbar or force reflow of the viewport scrollbar.
+ hint |= nsChangeHint_ScrollbarChange;
+ }
return hint;
}
diff --git a/layout/style/nsStyleStruct.h b/layout/style/nsStyleStruct.h
index c948d6056..35ff071a5 100644
--- a/layout/style/nsStyleStruct.h
+++ b/layout/style/nsStyleStruct.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -3418,6 +3417,7 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleUserInterface
uint8_t mCursor; // [inherited] See nsStyleConsts.h
nsTArray<nsCursorImage> mCursorImages; // [inherited] images and coords
mozilla::StyleComplexColor mCaretColor; // [inherited]
+ mozilla::StyleScrollbarWidth mScrollbarWidth;
inline uint8_t GetEffectivePointerEvents(nsIFrame* aFrame) const;
};
diff --git a/layout/style/nsStyleStructInlines.h b/layout/style/nsStyleStructInlines.h
index 9cb5e1a8a..63ad921ed 100644
--- a/layout/style/nsStyleStructInlines.h
+++ b/layout/style/nsStyleStructInlines.h
@@ -1,4 +1,3 @@
-/* vim: set shiftwidth=2 tabstop=8 autoindent cindent expandtab: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/nsStyleUtil.cpp b/layout/style/nsStyleUtil.cpp
index 5f51192bd..9c3c0f449 100644
--- a/layout/style/nsStyleUtil.cpp
+++ b/layout/style/nsStyleUtil.cpp
@@ -8,6 +8,7 @@
#include "nsIContent.h"
#include "nsCSSProps.h"
+#include "nsContentUtils.h"
#include "nsRuleNode.h"
#include "nsROCSSPrimitiveValue.h"
#include "nsStyleStruct.h"
@@ -15,7 +16,6 @@
#include "nsIContentSecurityPolicy.h"
#include "nsIURI.h"
#include "nsPrintfCString.h"
-#include "nsContentUtils.h"
using namespace mozilla;
diff --git a/layout/style/nsTransitionManager.cpp b/layout/style/nsTransitionManager.cpp
index a317f9943..027ae8b38 100644
--- a/layout/style/nsTransitionManager.cpp
+++ b/layout/style/nsTransitionManager.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=8 autoindent cindent expandtab: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -44,7 +43,6 @@ using mozilla::dom::CSSTransition;
using mozilla::dom::KeyframeEffectReadOnly;
using namespace mozilla;
-using namespace mozilla::dom;
using namespace mozilla::css;
namespace {
@@ -379,7 +377,7 @@ CSSTransition::HasLowerCompositeOrderThan(const CSSTransition& aOther) const
}
/* static */ Nullable<TimeDuration>
-CSSTransition::GetCurrentTimeAt(const DocumentTimeline& aTimeline,
+CSSTransition::GetCurrentTimeAt(const dom::DocumentTimeline& aTimeline,
const TimeStamp& aBaseTime,
const TimeDuration& aStartTime,
double aPlaybackRate)
@@ -396,7 +394,7 @@ CSSTransition::GetCurrentTimeAt(const DocumentTimeline& aTimeline,
}
void
-CSSTransition::SetEffectFromStyle(AnimationEffectReadOnly* aEffect)
+CSSTransition::SetEffectFromStyle(dom::AnimationEffectReadOnly* aEffect)
{
Animation::SetEffectNoUpdate(aEffect);
diff --git a/layout/style/nsTransitionManager.h b/layout/style/nsTransitionManager.h
index 1c48cc8cd..af7b6c611 100644
--- a/layout/style/nsTransitionManager.h
+++ b/layout/style/nsTransitionManager.h
@@ -1,4 +1,3 @@
-/* vim: set shiftwidth=2 tabstop=8 autoindent cindent expandtab: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/res/forms.css b/layout/style/res/forms.css
index e7566e183..db75151d4 100644
--- a/layout/style/res/forms.css
+++ b/layout/style/res/forms.css
@@ -1100,6 +1100,7 @@ input[type=number]::-moz-number-spin-box {
}
input[type=number]::-moz-number-spin-up {
+ writing-mode: horizontal-tb;
-moz-appearance: spinner-upbutton;
display: block; /* bug 926670 */
flex: none;
@@ -1117,6 +1118,7 @@ input[type=number]::-moz-number-spin-up {
}
input[type=number]::-moz-number-spin-down {
+ writing-mode: horizontal-tb;
-moz-appearance: spinner-downbutton;
display: block; /* bug 926670 */
flex: none;
diff --git a/layout/style/res/html.css b/layout/style/res/html.css
index b975bf0c9..066aab397 100644
--- a/layout/style/res/html.css
+++ b/layout/style/res/html.css
@@ -7,18 +7,18 @@
/* bidi */
-[dir] {
+:-moz-has-dir-attr {
unicode-bidi: isolate;
}
-[dir="rtl"] {
+:-moz-dir-attr-rtl {
direction: rtl;
}
-[dir="ltr"] {
+:-moz-dir-attr-ltr {
direction: ltr;
}
-bdi:dir(ltr), [dir="auto"]:dir(ltr) { direction: ltr; }
-bdi:dir(rtl), [dir="auto"]:dir(rtl) { direction: rtl; }
+:-moz-dir-attr-like-auto:dir(ltr) { direction: ltr; }
+:-moz-dir-attr-like-auto:dir(rtl) { direction: rtl; }
/* To ensure http://www.w3.org/TR/REC-html40/struct/dirlang.html#style-bidi:
*
@@ -88,10 +88,15 @@ xmp {
bdi, output {
unicode-bidi: isolate;
}
-bdo, bdo[dir] {
+/* We need the "bdo:-moz-has-dir-attr" bit because "bdo" has lower
+ specificity than the ":-moz-has-dir-attr" selector above. */
+bdo, bdo:-moz-has-dir-attr {
unicode-bidi: isolate-override;
}
-textarea[dir="auto"], pre[dir="auto"] { unicode-bidi: plaintext; }
+textarea:-moz-dir-attr-like-auto,
+pre:-moz-dir-attr-like-auto {
+ unicode-bidi: plaintext;
+}
/* blocks */
diff --git a/layout/style/res/ua.css b/layout/style/res/ua.css
index ab51f67c5..a8425d472 100644
--- a/layout/style/res/ua.css
+++ b/layout/style/res/ua.css
@@ -474,3 +474,9 @@ div:-moz-native-anonymous.moz-custom-content-container {
width: 100%;
height: 100%;
}
+
+/* Shadow DOM v1
+ * https://drafts.csswg.org/css-scoping/#slots-in-shadow-tree */
+slot {
+ display: contents;
+} \ No newline at end of file
diff --git a/layout/style/test/ListCSSProperties.cpp b/layout/style/test/ListCSSProperties.cpp
index 9f727104b..5e0405bb5 100644
--- a/layout/style/test/ListCSSProperties.cpp
+++ b/layout/style/test/ListCSSProperties.cpp
@@ -1,4 +1,3 @@
-/* vim: set shiftwidth=4 tabstop=8 autoindent cindent expandtab: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/test/chrome/chrome.ini b/layout/style/test/chrome/chrome.ini
index e34fce671..c3e1e5130 100644
--- a/layout/style/test/chrome/chrome.ini
+++ b/layout/style/test/chrome/chrome.ini
@@ -1,5 +1,4 @@
[DEFAULT]
-skip-if = os == 'android'
support-files =
bug418986-2.js
bug535806-css.css
@@ -10,6 +9,7 @@ support-files =
mismatch.png
[test_author_specified_style.html]
+[test_bug1346623.html]
[test_bug418986-2.xul]
[test_bug1157097.html]
[test_bug1160724.xul]
diff --git a/layout/style/test/chrome/test_bug1346623.html b/layout/style/test/chrome/test_bug1346623.html
new file mode 100644
index 000000000..d24d66646
--- /dev/null
+++ b/layout/style/test/chrome/test_bug1346623.html
@@ -0,0 +1,60 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+ <title>Test for bug 1346623</title>
+ <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
+ <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"></script>
+ <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
+</head>
+<body onload="startTest();">
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1346623">Mozilla Bug 1346623</a>
+<div id="display">
+
+</div>
+<pre id="test">
+<script type="application/javascript">
+
+var Ci = Components.interfaces;
+var winUtils = window.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils);
+
+function startTest() {
+ // load some styles at the agent level
+ var css = `
+ #ac-parent { color: green; }
+ #ac-child.abc { }
+ `;
+ var sheetURL = "data:text/css," + encodeURIComponent(css);
+ winUtils.loadSheetUsingURIString(sheetURL, winUtils.AGENT_SHEET);
+
+ // add canvas anonymous content
+ var bq = document.createElement("blockquote");
+ bq.id = "ac-parent";
+ bq.textContent = "This blockquote text should be green.";
+ var div = document.createElement("div");
+ div.id = "ac-child";
+ div.textContent = " This div text should be green.";
+ bq.appendChild(div);
+ var ac = document.insertAnonymousContent(bq);
+ document.body.offsetWidth;
+
+ is(ac.getComputedStylePropertyValue("ac-child", "color"), "rgb(0, 128, 0)",
+ "color before reframing");
+
+ // reframe the root
+ document.documentElement.style.display = "flex";
+ document.body.offsetWidth;
+
+ // restyle the div
+ ac.setAttributeForElement("ac-child", "class", "abc");
+ document.body.offsetWidth;
+
+ is(ac.getComputedStylePropertyValue("ac-child", "color"), "rgb(0, 128, 0)",
+ "color after reframing");
+ SimpleTest.finish();
+}
+
+SimpleTest.waitForExplicitFinish();
+</script>
+</pre>
+</body>
+</html>
diff --git a/layout/style/test/descriptor_database.js b/layout/style/test/descriptor_database.js
index da672d03b..2af5ef922 100644
--- a/layout/style/test/descriptor_database.js
+++ b/layout/style/test/descriptor_database.js
@@ -1,5 +1,4 @@
/* -*- tab-width: 4; indent-tabs-mode: nil; js-indent-level: 4 -*- */
-/* vim: set shiftwidth=4 tabstop=4 autoindent cindent noexpandtab: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/style/test/flexbox_layout_testcases.js b/layout/style/test/flexbox_layout_testcases.js
index 719583630..63adfe04a 100644
--- a/layout/style/test/flexbox_layout_testcases.js
+++ b/layout/style/test/flexbox_layout_testcases.js
@@ -1,5 +1,4 @@
/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* vim: set ts=2 sw=2 sts=2 et: */
/*
* This Source Code is subject to the terms of the Mozilla Public License
diff --git a/layout/style/test/mochitest.ini b/layout/style/test/mochitest.ini
index 8182691ca..8b36e3e1e 100644
--- a/layout/style/test/mochitest.ini
+++ b/layout/style/test/mochitest.ini
@@ -1,4 +1,7 @@
[DEFAULT]
+prefs =
+ dom.animations-api.core.enabled=true
+ dom.animations-api.timelines.enabled=true
support-files =
animation_utils.js
ccd-quirks.html
@@ -41,7 +44,6 @@ support-files = additional_sheets_helper.html
support-files = additional_sheets_helper.html
[test_all_shorthand.html]
[test_animations.html]
-skip-if = toolkit == 'android'
[test_animations_async_tests.html]
support-files = ../../reftests/fonts/Ahem.ttf file_animations_async_tests.html
[test_animations_dynamic_changes.html]
@@ -85,7 +87,6 @@ support-files = file_animations_with_disabled_properties.html
[test_bug373293.html]
[test_bug377947.html]
[test_bug379440.html]
-skip-if = toolkit == 'android'
[test_bug379741.html]
[test_bug382027.html]
[test_bug383075.html]
@@ -99,7 +100,6 @@ skip-if = toolkit == 'android'
skip-if = true # Bug 701060
[test_bug405818.html]
[test_bug412901.html]
-skip-if = android_version == '18' # bug 1147986
[test_bug413958.html]
[test_bug418986-2.html]
[test_bug437915.html]
@@ -152,7 +152,6 @@ support-files = file_bug1089417_iframe.html
[test_change_hint_optimizations.html]
[test_clip-path_polygon.html]
[test_compute_data_with_start_struct.html]
-skip-if = toolkit == 'android'
[test_computed_style.html]
[test_computed_style_min_size_auto.html]
[test_computed_style_no_pseudo.html]
@@ -163,7 +162,6 @@ skip-if = toolkit == 'android'
[test_counter_descriptor_storage.html]
[test_counter_style.html]
[test_css_cross_domain.html]
-skip-if = toolkit == 'android' #bug 536603
[test_css_eof_handling.html]
[test_css_escape_api.html]
[test_css_function_mismatched_parenthesis.html]
@@ -205,16 +203,13 @@ support-files =
[test_html_attribute_computed_values.html]
[test_ident_escaping.html]
[test_inherit_computation.html]
-skip-if = toolkit == 'android'
[test_inherit_storage.html]
[test_initial_computation.html]
-skip-if = toolkit == 'android'
[test_initial_storage.html]
[test_keyframes_rules.html]
[test_load_events_on_stylesheets.html]
[test_logical_properties.html]
[test_media_queries.html]
-skip-if = android_version == '18' #debug-only failure; timed out #Android 4.3 aws only; bug 1030419
[test_media_queries_dynamic.html]
[test_media_queries_dynamic_xbl.html]
[test_media_query_list.html]
@@ -245,7 +240,6 @@ support-files = redundant_font_download.sjs
[test_rule_serialization.html]
[test_rules_out_of_sheets.html]
[test_selectors.html]
-skip-if = toolkit == 'android' #bug 775227
[test_selectors_on_anonymous_content.html]
[test_setPropertyWithNull.html]
[test_shorthand_property_getters.html]
@@ -264,11 +258,9 @@ skip-if = toolkit == 'android' #bug 775227
[test_transitions_computed_value_combinations.html]
[test_transitions_events.html]
[test_transitions.html]
-skip-if = (android_version == '18' && debug) # bug 1159532
[test_transitions_bug537151.html]
[test_transitions_dynamic_changes.html]
[test_transitions_per_property.html]
-skip-if = toolkit == 'android' #bug 775227
[test_transitions_replacement_on_busy_frame.html]
support-files = file_transitions_replacement_on_busy_frame.html
[test_transitions_step_functions.html]
@@ -286,9 +278,7 @@ support-files = unprefixing_service_iframe.html unprefixing_service_utils.js
[test_unprefixing_service_prefs.html]
support-files = unprefixing_service_iframe.html unprefixing_service_utils.js
[test_value_cloning.html]
-skip-if = toolkit == 'android' #bug 775227
[test_value_computation.html]
-skip-if = toolkit == 'android'
[test_value_storage.html]
[test_variable_serialization_computed.html]
[test_variable_serialization_specified.html]
@@ -298,15 +288,10 @@ support-files = support/external-variable-url.css
[test_viewport_scrollbar_causing_reflow.html]
[test_viewport_units.html]
[test_visited_image_loading.html]
-skip-if = toolkit == 'android' #TIMED_OUT
[test_visited_image_loading_empty.html]
-skip-if = toolkit == 'android' #TIMED_OUT
[test_visited_lying.html]
-skip-if = toolkit == 'android' #TIMED_OUT
[test_visited_pref.html]
-skip-if = toolkit == 'android' #TIMED_OUT
[test_visited_reftests.html]
-skip-if = toolkit == 'android' #TIMED_OUT
[test_webkit_device_pixel_ratio.html]
[test_webkit_flex_display.html]
[test_asyncopen2.html]
diff --git a/layout/style/test/moz.build b/layout/style/test/moz.build
index ca61f607a..4ae0e44b4 100644
--- a/layout/style/test/moz.build
+++ b/layout/style/test/moz.build
@@ -1,5 +1,4 @@
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/layout/style/test/property_database.js b/layout/style/test/property_database.js
index 6b1ef5602..1d5dc989f 100644
--- a/layout/style/test/property_database.js
+++ b/layout/style/test/property_database.js
@@ -1,5 +1,4 @@
/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* vim: set ts=2 sw=2 sts=2 et: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -7945,6 +7944,18 @@ for (var prop in gCSSProperties) {
}
}
+if (IsCSSPropertyPrefEnabled("layout.css.scrollbar-width.enabled")) {
+ gCSSProperties["scrollbar-width"] = {
+ domProp: "scrollbarWidth",
+ inherited: false,
+ type: CSS_TYPE_LONGHAND,
+ initial_values: [ "auto" ],
+ other_values: [ "none", "thin" ],
+ invalid_values: [ "1px" ]
+ };
+}
+
+
if (false) {
// TODO These properties are chrome-only, and are not exposed via CSSOM.
// We may still want to find a way to test them. See bug 1206999.
diff --git a/layout/style/test/test_cascade.html b/layout/style/test/test_cascade.html
index 0a5d27a8b..b2836d25c 100644
--- a/layout/style/test/test_cascade.html
+++ b/layout/style/test/test_cascade.html
@@ -1,5 +1,4 @@
<!DOCTYPE HTML>
-<!-- vim: set shiftwidth=4 tabstop=8 autoindent expandtab: -->
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
diff --git a/layout/style/test/test_pseudoelement_state.html b/layout/style/test/test_pseudoelement_state.html
index ad4bf5242..bdc4dc8f2 100644
--- a/layout/style/test/test_pseudoelement_state.html
+++ b/layout/style/test/test_pseudoelement_state.html
@@ -8,8 +8,6 @@
<iframe src="data:text/html,<!DOCTYPE html><style></style><div></div>"></iframe>
<script>
-var gIsAndroid = navigator.appVersion.indexOf("Android") != -1;
-
var gTests = [
// Interact with the ::-moz-progress-bar.
{ markup: '<progress value="75" max="100"></progress>',
@@ -124,29 +122,23 @@ function runTests() {
is(countPixelDifferences(canvas1, canvas2), 0, "hover subtest #" + aIndex + ", number of different pixels");
is(getComputedStyle(div.firstChild, test.pseudoelement).backgroundColor, "rgb(0, 128, 0)", "hover subtest #" + aIndex + ", computed style");
- if (!gIsAndroid) {
- style.textContent = test.common_style + test.active_test_style;
- synthesizeMouseAtCenter(div.lastChild, { type: 'mousedown' }, iframe.contentWindow);
- }
+ style.textContent = test.common_style + test.active_test_style;
+ synthesizeMouseAtCenter(div.lastChild, { type: 'mousedown' }, iframe.contentWindow);
}
function runTestPart4(aIndex) {
- if (!gIsAndroid) {
- var test = gTests[aIndex];
- canvas1 = SpecialPowers.snapshotWindow(iframe.contentWindow, false);
- synthesizeMouseAtCenter(div.lastChild, { type: 'mouseup' }, iframe.contentWindow);
- style.textContent = test.common_style + test.active_reference_style;
- }
+ var test = gTests[aIndex];
+ canvas1 = SpecialPowers.snapshotWindow(iframe.contentWindow, false);
+ synthesizeMouseAtCenter(div.lastChild, { type: 'mouseup' }, iframe.contentWindow);
+ style.textContent = test.common_style + test.active_reference_style;
}
function runTestPart5(aIndex) {
- if (!gIsAndroid) {
- var test = gTests[aIndex];
- canvas2 = SpecialPowers.snapshotWindow(iframe.contentWindow, false);
- ok(canvas1.width == canvas2.width && canvas1.height == canvas2.height, "active subtest #" + aIndex + ", canvas sizes equal");
- is(countPixelDifferences(canvas1, canvas2), 0, "active subtest #" + aIndex + ", number of different pixels");
- is(getComputedStyle(div.firstChild, test.pseudoelement).backgroundColor, "rgb(0, 255, 0)", "active subtest #" + aIndex + ", computed style");
- }
+ var test = gTests[aIndex];
+ canvas2 = SpecialPowers.snapshotWindow(iframe.contentWindow, false);
+ ok(canvas1.width == canvas2.width && canvas1.height == canvas2.height, "active subtest #" + aIndex + ", canvas sizes equal");
+ is(countPixelDifferences(canvas1, canvas2), 0, "active subtest #" + aIndex + ", number of different pixels");
+ is(getComputedStyle(div.firstChild, test.pseudoelement).backgroundColor, "rgb(0, 255, 0)", "active subtest #" + aIndex + ", computed style");
}
for (var i = 0; i < gTests.length; i++) {
diff --git a/layout/style/test/test_rule_insertion.html b/layout/style/test/test_rule_insertion.html
index a55ec08c5..90886973a 100644
--- a/layout/style/test/test_rule_insertion.html
+++ b/layout/style/test/test_rule_insertion.html
@@ -99,9 +99,7 @@ var innerRuleInfo = [
if (aException) {
return false;
}
- if (navigator.oscpu.match(/Linux/) ||
- navigator.oscpu.match(/Android/) ||
- SpecialPowers.Services.appinfo.name == "B2G") {
+ if (navigator.oscpu.match(/Linux/)) {
return true;
}
return Math.abs(width - (aApplied ? monospaceWidth : serifWidth)) <= 1; // bug 769194 prevents local()
diff --git a/layout/style/test/test_value_storage.html b/layout/style/test/test_value_storage.html
index 5e7fa6b69..1ca3bd510 100644
--- a/layout/style/test/test_value_storage.html
+++ b/layout/style/test/test_value_storage.html
@@ -91,24 +91,6 @@ var gComputedStyle = window.getComputedStyle(gElement, "");
var gPrereqDeclaration =
document.getElementById("prereqsheet").sheet.cssRules[0].style;
-// On Android, avoid most 'TEST-PASS' logging by overriding
-// SimpleTest.is/isnot, to improve performance
-if (navigator.appVersion.indexOf("Android") >= 0) {
- is = function is(a, b, name)
- {
- var pass = Object.is(a, b);
- if (!pass)
- SimpleTest.is(a, b, name);
- }
-
- isnot = function isnot(a, b, name)
- {
- var pass = !Object.is(a, b);
- if (!pass)
- SimpleTest.isnot(a, b, name);
- }
-}
-
// Returns true if propA and propB are equivalent, considering aliasing.
// (i.e. if one is an alias of the other, or if they're both aliases of
// the same 3rd property)
diff --git a/layout/svg/moz.build b/layout/svg/moz.build
index 69d5d2a3b..0def568b0 100644
--- a/layout/svg/moz.build
+++ b/layout/svg/moz.build
@@ -1,5 +1,4 @@
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/layout/tables/TableArea.h b/layout/tables/TableArea.h
index a94eea6e6..1e7e2720f 100644
--- a/layout/tables/TableArea.h
+++ b/layout/tables/TableArea.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/tables/moz.build b/layout/tables/moz.build
index 554ffebec..c068290fe 100644
--- a/layout/tables/moz.build
+++ b/layout/tables/moz.build
@@ -1,5 +1,4 @@
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/layout/tables/nsTableFrame.cpp b/layout/tables/nsTableFrame.cpp
index eb8efb0ec..7e11a978b 100644
--- a/layout/tables/nsTableFrame.cpp
+++ b/layout/tables/nsTableFrame.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 sw=2 et tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/tools/layout-debug/moz.build b/layout/tools/layout-debug/moz.build
index 84cb4fb7e..1c547fc50 100644
--- a/layout/tools/layout-debug/moz.build
+++ b/layout/tools/layout-debug/moz.build
@@ -1,5 +1,4 @@
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/layout/tools/layout-debug/src/moz.build b/layout/tools/layout-debug/src/moz.build
index b3f7d5e06..8cc33aae4 100644
--- a/layout/tools/layout-debug/src/moz.build
+++ b/layout/tools/layout-debug/src/moz.build
@@ -1,5 +1,4 @@
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/layout/tools/layout-debug/ui/content/layoutdebug.xul b/layout/tools/layout-debug/ui/content/layoutdebug.xul
index 8de04847f..f5c60cd72 100644
--- a/layout/tools/layout-debug/ui/content/layoutdebug.xul
+++ b/layout/tools/layout-debug/ui/content/layoutdebug.xul
@@ -1,8 +1,5 @@
<?xml version="1.0"?>
-<!-- vim: set shiftwidth=2 tabstop=8 expandtab :
- -
- -
- - This Source Code Form is subject to the terms of the Mozilla Public
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
diff --git a/layout/tools/layout-debug/ui/moz.build b/layout/tools/layout-debug/ui/moz.build
index eb4454d28..635fa39c9 100644
--- a/layout/tools/layout-debug/ui/moz.build
+++ b/layout/tools/layout-debug/ui/moz.build
@@ -1,5 +1,4 @@
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/layout/tools/recording/moz.build b/layout/tools/recording/moz.build
index 74b7e9a6d..ea25bd991 100644
--- a/layout/tools/recording/moz.build
+++ b/layout/tools/recording/moz.build
@@ -1,5 +1,4 @@
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/layout/tools/recording/recording.js b/layout/tools/recording/recording.js
index 552423c9f..8bacf98d3 100644
--- a/layout/tools/recording/recording.js
+++ b/layout/tools/recording/recording.js
@@ -1,5 +1,4 @@
/* -*- indent-tabs-mode: nil; js-indent-level: 4 -*- /
-/* vim: set shiftwidth=4 tabstop=8 autoindent cindent expandtab: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/tools/recording/recording.xul b/layout/tools/recording/recording.xul
index 276d3aa71..96ba45e57 100644
--- a/layout/tools/recording/recording.xul
+++ b/layout/tools/recording/recording.xul
@@ -1,4 +1,3 @@
-<!-- vim: set shiftwidth=4 tabstop=8 autoindent expandtab: -->
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
diff --git a/layout/tools/reftest/Makefile.in b/layout/tools/reftest/Makefile.in
index 7ff59cd8b..bbd4cb7e4 100644
--- a/layout/tools/reftest/Makefile.in
+++ b/layout/tools/reftest/Makefile.in
@@ -1,4 +1,3 @@
-# vim: set shiftwidth=8 tabstop=8 autoindent noexpandtab copyindent:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/layout/tools/reftest/bootstrap.js b/layout/tools/reftest/bootstrap.js
index 18ca74f69..3e86a45a9 100644
--- a/layout/tools/reftest/bootstrap.js
+++ b/layout/tools/reftest/bootstrap.js
@@ -33,12 +33,6 @@ var WindowListener = {
};
function startup(data, reason) {
- if (Services.appinfo.OS == "Android") {
- Cm.addBootstrappedManifestLocation(data.installPath);
- Services.wm.addListener(WindowListener);
- return;
- }
-
let orig = Services.wm.getMostRecentWindow("navigator:browser");
let ios = Cc["@mozilla.org/network/io-service;1"]
@@ -61,12 +55,7 @@ function startup(data, reason) {
}
function shutdown(data, reason) {
- if (Services.appinfo.OS == "Android") {
- Services.wm.removeListener(WindowListener);
- Cm.removedBootstrappedManifestLocation(data.installPath);
- OnRefTestUnload();
- Cu.unload("chrome://reftest/content/reftest.jsm");
- }
+ // Any special shutdown commands go here.
}
diff --git a/layout/tools/reftest/clean-reftest-output.pl b/layout/tools/reftest/clean-reftest-output.pl
index b1959281d..0daef31ed 100755
--- a/layout/tools/reftest/clean-reftest-output.pl
+++ b/layout/tools/reftest/clean-reftest-output.pl
@@ -1,5 +1,4 @@
#!/usr/bin/perl
-# vim: set shiftwidth=4 tabstop=8 autoindent expandtab:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/layout/tools/reftest/mach_commands.py b/layout/tools/reftest/mach_commands.py
index e790486ef..a85181f9a 100644
--- a/layout/tools/reftest/mach_commands.py
+++ b/layout/tools/reftest/mach_commands.py
@@ -208,80 +208,6 @@ class ReftestRunner(MozbuildObject):
return rv
- def run_android_test(self, **kwargs):
- """Runs a reftest, in Firefox for Android."""
-
- args = Namespace(**kwargs)
- if args.suite not in ('reftest', 'crashtest', 'jstestbrowser'):
- raise Exception('None or unrecognized reftest suite type.')
-
- self._setup_objdir(args)
- import remotereftest
-
- default_manifest = {
- "reftest": (self.topsrcdir, "layout", "reftests", "reftest.list"),
- "crashtest": (self.topsrcdir, "testing", "crashtest", "crashtests.list"),
- "jstestbrowser": ("jsreftest", "tests", "jstests.list")
- }
-
- if not args.tests:
- args.tests = [os.path.join(*default_manifest[args.suite])]
-
- args.extraProfileFiles.append(
- os.path.join(self.topsrcdir, "mobile", "android", "fonts"))
-
- hyphenation_path = os.path.join(self.topsrcdir, "intl", "locales")
-
- for (dirpath, dirnames, filenames) in os.walk(hyphenation_path):
- for filename in filenames:
- if filename.endswith('.dic'):
- args.extraProfileFiles.append(os.path.join(dirpath, filename))
-
- if not args.httpdPath:
- args.httpdPath = os.path.join(self.tests_dir, "modules")
- if not args.symbolsPath:
- args.symbolsPath = os.path.join(self.topobjdir, "crashreporter-symbols")
- if not args.xrePath:
- args.xrePath = os.environ.get("MOZ_HOST_BIN")
- if not args.app:
- args.app = self.substs["ANDROID_PACKAGE_NAME"]
- if not args.utilityPath:
- args.utilityPath = args.xrePath
- args.dm_trans = "adb"
- args.ignoreWindowSize = True
- args.printDeviceInfo = False
-
- from mozrunner.devices.android_device import grant_runtime_permissions
- grant_runtime_permissions(self)
-
- # A symlink and some path manipulations are required so that test
- # manifests can be found both locally and remotely (via a url)
- # using the same relative path.
- if args.suite == "jstestbrowser":
- staged_js_dir = os.path.join(self.topobjdir, "dist", "test-stage", "jsreftest")
- tests = os.path.join(self.reftest_dir, 'jsreftest')
- if not os.path.isdir(tests):
- os.symlink(staged_js_dir, tests)
- args.extraProfileFiles.append(os.path.join(staged_js_dir, "tests", "user.js"))
- else:
- tests = os.path.join(self.reftest_dir, "tests")
- if not os.path.isdir(tests):
- os.symlink(self.topsrcdir, tests)
- for i, path in enumerate(args.tests):
- # Non-absolute paths are relative to the packaged directory, which
- # has an extra tests/ at the start
- if os.path.exists(os.path.abspath(path)):
- path = os.path.relpath(path, os.path.join(self.topsrcdir))
- args.tests[i] = os.path.join('tests', path)
-
- self.log_manager.enable_unstructured()
- try:
- rv = remotereftest.run_test_harness(parser, args)
- finally:
- self.log_manager.disable_unstructured()
-
- return rv
-
def process_test_objects(kwargs):
"""|mach test| works by providing a test_objects argument, from
@@ -299,12 +225,7 @@ def get_parser():
global parser
here = os.path.abspath(os.path.dirname(__file__))
build_obj = MozbuildObject.from_environment(cwd=here)
- if conditions.is_android(build_obj):
- parser = reftestcommandline.RemoteArgumentsParser()
- elif conditions.is_mulet(build_obj):
- parser = reftestcommandline.B2GArgumentParser()
- else:
- parser = reftestcommandline.DesktopArgumentsParser()
+ parser = reftestcommandline.DesktopArgumentsParser()
return parser
@@ -340,12 +261,6 @@ class MachCommands(MachCommandBase):
def _run_reftest(self, **kwargs):
process_test_objects(kwargs)
reftest = self._spawn(ReftestRunner)
- if conditions.is_android(self):
- from mozrunner.devices.android_device import verify_android_device
- verify_android_device(self, install=True, xre=True)
- return reftest.run_android_test(**kwargs)
- elif conditions.is_mulet(self):
- return reftest.run_mulet_test(**kwargs)
return reftest.run_desktop_test(**kwargs)
diff --git a/layout/tools/reftest/mach_test_package_commands.py b/layout/tools/reftest/mach_test_package_commands.py
index e3bf64cb8..197800cf2 100644
--- a/layout/tools/reftest/mach_test_package_commands.py
+++ b/layout/tools/reftest/mach_test_package_commands.py
@@ -29,8 +29,6 @@ def run_reftest(context, **kwargs):
normalize = partial(context.normalize_test_path, test_root)
args.tests = map(normalize, args.tests)
- if mozinfo.info.get('buildapp') == 'mobile/android':
- return run_reftest_android(context, args)
return run_reftest_desktop(context, args)
@@ -44,37 +42,13 @@ def run_reftest_desktop(context, args):
return run_test_harness(parser, args)
-def run_reftest_android(context, args):
- from remotereftest import run_test_harness
-
- args.app = args.app or 'org.mozilla.fennec'
- args.utilityPath = context.hostutils
- args.xrePath = context.hostutils
- args.httpdPath = context.module_dir
- args.dm_trans = 'adb'
- args.ignoreWindowSize = True
- args.printDeviceInfo = False
-
- config = context.mozharness_config
- if config:
- args.remoteWebServer = config['remote_webserver']
- args.httpPort = config['emulator']['http_port']
- args.sslPort = config['emulator']['ssl_port']
- args.adb_path = config['exes']['adb'] % {'abs_work_dir': context.mozharness_workdir}
-
- return run_test_harness(parser, args)
-
-
def setup_argument_parser():
import mozinfo
import reftestcommandline
global parser
mozinfo.find_and_update_from_json(here)
- if mozinfo.info.get('buildapp') == 'mobile/android':
- parser = reftestcommandline.RemoteArgumentsParser()
- else:
- parser = reftestcommandline.DesktopArgumentsParser()
+ parser = reftestcommandline.DesktopArgumentsParser()
return parser
diff --git a/layout/tools/reftest/moz.build b/layout/tools/reftest/moz.build
index 4dcf1a6f6..77d30b9aa 100644
--- a/layout/tools/reftest/moz.build
+++ b/layout/tools/reftest/moz.build
@@ -1,5 +1,4 @@
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/layout/tools/reftest/reftest-analyzer-structured.xhtml b/layout/tools/reftest/reftest-analyzer-structured.xhtml
index b06bd8169..a399521d4 100644
--- a/layout/tools/reftest/reftest-analyzer-structured.xhtml
+++ b/layout/tools/reftest/reftest-analyzer-structured.xhtml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- -*- Mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- -->
-<!-- vim: set shiftwidth=2 tabstop=2 autoindent expandtab: -->
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
diff --git a/layout/tools/reftest/reftest-analyzer.xhtml b/layout/tools/reftest/reftest-analyzer.xhtml
index 64a50253e..deed7bad6 100644
--- a/layout/tools/reftest/reftest-analyzer.xhtml
+++ b/layout/tools/reftest/reftest-analyzer.xhtml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- -*- Mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- -->
-<!-- vim: set shiftwidth=2 tabstop=2 autoindent expandtab: -->
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
diff --git a/layout/tools/reftest/reftest-content.js b/layout/tools/reftest/reftest-content.js
index f26cae8ef..04e4714ff 100644
--- a/layout/tools/reftest/reftest-content.js
+++ b/layout/tools/reftest/reftest-content.js
@@ -1,5 +1,4 @@
/* -*- indent-tabs-mode: nil; js-indent-level: 4 -*- /
-/* vim: set shiftwidth=4 tabstop=8 autoindent cindent expandtab: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/tools/reftest/reftest.jsm b/layout/tools/reftest/reftest.jsm
index c885150a4..cd2e02f27 100644
--- a/layout/tools/reftest/reftest.jsm
+++ b/layout/tools/reftest/reftest.jsm
@@ -1,5 +1,4 @@
/* -*- indent-tabs-mode: nil; js-indent-level: 4 -*- /
-/* vim: set shiftwidth=4 tabstop=8 autoindent cindent expandtab: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -303,16 +302,7 @@ this.OnRefTestLoad = function OnRefTestLoad(win)
// what size our window is
gBrowser.setAttribute("style", "padding: 0px; margin: 0px; border:none; min-width: 800px; min-height: 1000px; max-width: 800px; max-height: 1000px");
- if (Services.appinfo.OS == "Android") {
- let doc;
- doc = gContainingWindow.document.getElementById('main-window');
- while (doc.hasChildNodes()) {
- doc.removeChild(doc.firstChild);
- }
- doc.appendChild(gBrowser);
- } else {
- document.getElementById("reftest-window").appendChild(gBrowser);
- }
+ document.getElementById("reftest-window").appendChild(gBrowser);
// reftests should have the test plugins enabled, not click-to-play
let plugin1 = getTestPlugin("Test Plug-in");
@@ -342,10 +332,6 @@ function InitAndStartRefTests()
logger.error("EXCEPTION: " + e);
}
- try {
- prefs.setBoolPref("android.widget_paints_background", false);
- } catch (e) {}
-
/* set the gLoadTimeout */
gLoadTimeout = prefs.getIntPref("reftest.timeout", 5 * 60 * 1000); //5 minutes as per bug 479518
@@ -621,7 +607,7 @@ function BuildConditionSandbox(aURL) {
// Shortcuts for widget toolkits.
sandbox.B2G = false;
- sandbox.Android = xr.OS == "Android" && !sandbox.B2G;
+ sandbox.Android = false;
sandbox.cocoaWidget = xr.widgetToolkit == "cocoa";
sandbox.gtkWidget = xr.widgetToolkit == "gtk2"
|| xr.widgetToolkit == "gtk3";
@@ -631,14 +617,6 @@ function BuildConditionSandbox(aURL) {
// Scrollbars that are semi-transparent. See bug 1169666.
sandbox.transparentScrollbars = xr.widgetToolkit == "gtk3";
- if (sandbox.Android) {
- var sysInfo = CC["@mozilla.org/system-info;1"].getService(CI.nsIPropertyBag2);
-
- // This is currently used to distinguish Android 4.0.3 (SDK version 15)
- // and later from Android 2.x
- sandbox.AndroidVersion = sysInfo.getPropertyAsInt32("version");
- }
-
#if MOZ_ASAN
sandbox.AddressSanitizer = true;
#else
diff --git a/layout/tools/reftest/reftest.xul b/layout/tools/reftest/reftest.xul
index ae5355d20..46ae6e29e 100644
--- a/layout/tools/reftest/reftest.xul
+++ b/layout/tools/reftest/reftest.xul
@@ -1,4 +1,3 @@
-<!-- vim: set shiftwidth=4 tabstop=8 autoindent expandtab: -->
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
diff --git a/layout/tools/reftest/reftestcommandline.py b/layout/tools/reftest/reftestcommandline.py
index f983be528..40bd8a5ee 100644
--- a/layout/tools/reftest/reftestcommandline.py
+++ b/layout/tools/reftest/reftestcommandline.py
@@ -352,8 +352,7 @@ class DesktopArgumentsParser(ReftestArgumentsParser):
if options.app is None:
bin_dir = (self.build_obj.get_binary_path() if
- self.build_obj and self.build_obj.substs[
- 'MOZ_BUILD_APP'] != 'mobile/android'
+ self.build_obj
else None)
if bin_dir:
@@ -744,7 +743,5 @@ class RemoteArgumentsParser(ReftestArgumentsParser):
self.error("ERROR: Invalid screen resolution %sx%s, please adjust to 1366x1050 or higher" % (
width, height))
- # Disable e10s by default on Android because we don't run Android
- # e10s jobs anywhere yet.
options.e10s = False
return options
diff --git a/layout/xul/BoxObject.cpp b/layout/xul/BoxObject.cpp
index 347205fff..c8e7b221a 100644
--- a/layout/xul/BoxObject.cpp
+++ b/layout/xul/BoxObject.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/xul/crashtests/crashtests.list b/layout/xul/crashtests/crashtests.list
index 4ee6654c6..ad7c84770 100644
--- a/layout/xul/crashtests/crashtests.list
+++ b/layout/xul/crashtests/crashtests.list
@@ -32,7 +32,7 @@ load 360642-1.xul
load 365151.xul
load 366112-1.xul
asserts(0-50) load 366203-1.xul # bug 1217984
-asserts(24) asserts-if(Android&&!asyncPan,9) load 367185-1.xhtml # bug 1220345
+asserts(24) load 367185-1.xhtml # bug 1220345
load 369942-1.xhtml
load 374102-1.xul
load 376137-1.html
@@ -77,7 +77,7 @@ load 434458-1.xul
load 452185.html
load 460900-1.xul
load 464149-1.xul
-asserts-if(winWidget,1) asserts-if(Android,0-1) load 464407-1.xhtml # Bug 450974 on win, Bug 1267054 on Android
+asserts-if(winWidget,1) load 464407-1.xhtml # Bug 450974
load 467080.xul
load 467481-1.xul
load 470063-1.html
diff --git a/layout/xul/grid/moz.build b/layout/xul/grid/moz.build
index 049489ab2..33f8e9f07 100644
--- a/layout/xul/grid/moz.build
+++ b/layout/xul/grid/moz.build
@@ -1,5 +1,4 @@
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/layout/xul/moz.build b/layout/xul/moz.build
index 18b120b34..e4186674b 100644
--- a/layout/xul/moz.build
+++ b/layout/xul/moz.build
@@ -1,5 +1,4 @@
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/layout/xul/nsBoxFrame.cpp b/layout/xul/nsBoxFrame.cpp
index 09573fb96..d63861794 100644
--- a/layout/xul/nsBoxFrame.cpp
+++ b/layout/xul/nsBoxFrame.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 sw=2 et tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/xul/nsListBoxBodyFrame.cpp b/layout/xul/nsListBoxBodyFrame.cpp
index 8c4a5e2fd..0ff07bd91 100644
--- a/layout/xul/nsListBoxBodyFrame.cpp
+++ b/layout/xul/nsListBoxBodyFrame.cpp
@@ -296,7 +296,7 @@ nsListBoxBodyFrame::GetXULMinSizeForScrollArea(nsBoxLayoutState& aBoxLayoutState
result.height = 0;
nsIScrollableFrame* scrollFrame = nsLayoutUtils::GetScrollableFrameFor(this);
if (scrollFrame &&
- scrollFrame->GetScrollbarStyles().mVertical == NS_STYLE_OVERFLOW_AUTO) {
+ scrollFrame->GetScrollStyles().mVertical == NS_STYLE_OVERFLOW_AUTO) {
nsMargin scrollbars =
scrollFrame->GetDesiredScrollbarSizes(&aBoxLayoutState);
result.width += scrollbars.left + scrollbars.right;
@@ -316,7 +316,7 @@ nsListBoxBodyFrame::GetXULPrefSize(nsBoxLayoutState& aBoxLayoutState)
nsIScrollableFrame* scrollFrame = nsLayoutUtils::GetScrollableFrameFor(this);
if (scrollFrame &&
- scrollFrame->GetScrollbarStyles().mVertical == NS_STYLE_OVERFLOW_AUTO) {
+ scrollFrame->GetScrollStyles().mVertical == NS_STYLE_OVERFLOW_AUTO) {
nsMargin scrollbars = scrollFrame->GetDesiredScrollbarSizes(&aBoxLayoutState);
pref.width += scrollbars.left + scrollbars.right;
}
diff --git a/layout/xul/nsMenuPopupFrame.cpp b/layout/xul/nsMenuPopupFrame.cpp
index 3f934b208..378d719d4 100644
--- a/layout/xul/nsMenuPopupFrame.cpp
+++ b/layout/xul/nsMenuPopupFrame.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 sw=2 et tw=78: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/xul/reftest/reftest.list b/layout/xul/reftest/reftest.list
index 39f353577..4f927b5d0 100644
--- a/layout/xul/reftest/reftest.list
+++ b/layout/xul/reftest/reftest.list
@@ -1,6 +1,6 @@
-fails-if(Android) == textbox-multiline-noresize.xul textbox-multiline-ref.xul # reference is blank on Android (due to no native theme support?)
+== textbox-multiline-noresize.xul textbox-multiline-ref.xul
!= textbox-multiline-resize.xul textbox-multiline-ref.xul
== popup-explicit-size.xul popup-explicit-size-ref.xul
-random-if(Android) == image-size.xul image-size-ref.xul
+== image-size.xul image-size-ref.xul
== image-scaling-min-height-1.xul image-scaling-min-height-1-ref.xul
== textbox-text-transform.xul textbox-text-transform-ref.xul
diff --git a/layout/xul/test/chrome.ini b/layout/xul/test/chrome.ini
index 2a647b6b7..44224dca8 100644
--- a/layout/xul/test/chrome.ini
+++ b/layout/xul/test/chrome.ini
@@ -1,5 +1,4 @@
[DEFAULT]
-skip-if = os == 'android'
support-files =
window_resizer.xul
window_resizer_element.xul
diff --git a/layout/xul/test/mochitest.ini b/layout/xul/test/mochitest.ini
index 540abc730..e48262ab0 100644
--- a/layout/xul/test/mochitest.ini
+++ b/layout/xul/test/mochitest.ini
@@ -3,10 +3,7 @@
[test_bug386386.html]
[test_bug394800.xhtml]
[test_bug511075.html]
-skip-if = toolkit == 'android' #bug 798806
[test_bug563416.html]
[test_bug1197913.xul]
-skip-if = toolkit == 'android'
[test_resizer_incontent.xul]
[test_splitter.xul]
-skip-if = toolkit == 'android' # no XUL theme
diff --git a/layout/xul/tree/moz.build b/layout/xul/tree/moz.build
index 7d150881a..706ccdd7a 100644
--- a/layout/xul/tree/moz.build
+++ b/layout/xul/tree/moz.build
@@ -1,5 +1,4 @@
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/layout/xul/tree/nsTreeBodyFrame.cpp b/layout/xul/tree/nsTreeBodyFrame.cpp
index 608d802ea..b31d1de36 100644
--- a/layout/xul/tree/nsTreeBodyFrame.cpp
+++ b/layout/xul/tree/nsTreeBodyFrame.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */