зеркало из https://github.com/mozilla/gecko-dev.git
Backed out 3 changesets (bug 1730867) for multiple reftest failures. CLOSED TREE
Backed out changeset aed4ce969bb6 (bug 1730867) Backed out changeset 84abb450636b (bug 1730867) Backed out changeset bbd4d5126a19 (bug 1730867)
This commit is contained in:
Csoregi Natalia
Родитель
429b427faa
Коммит
58cdf74c34
|
|
@ -3,27 +3,27 @@
|
|||
# First make sure that we are actually drawing scrollbars
|
||||
skip-if(!asyncPan) pref(apz.allow_zooming,true) != async-scrollbar-1-v.html about:blank
|
||||
skip-if(!asyncPan) pref(apz.allow_zooming,true) != async-scrollbar-1-v-ref.html about:blank
|
||||
fuzzy-if(Android,0-3,0-6) fuzzy-if(webrender&>kWidget,1-8,8-32) fuzzy-if(webrender&&cocoaWidget,18-22,20-44) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-v.html async-scrollbar-1-v-ref.html
|
||||
fuzzy-if(Android,0-9,0-6) fuzzy-if(webrender&>kWidget,1-30,4-32) fuzzy-if(webrender&&cocoaWidget,18-22,20-44) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-h.html async-scrollbar-1-h-ref.html
|
||||
fuzzy-if(Android,0-11,0-17) fuzzy-if(webrender&>kWidget,1-2,4-20) fuzzy-if(webrender&&cocoaWidget,14-18,48-88) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-vh.html async-scrollbar-1-vh-ref.html
|
||||
fuzzy-if(Android,0-4,0-6) fuzzy-if(webrender&>kWidget,1-8,8-32) fuzzy-if(webrender&&cocoaWidget,18-22,20-44) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-v-rtl.html async-scrollbar-1-v-rtl-ref.html
|
||||
fuzzy-if(Android,0-14,0-10) fuzzy-if(webrender&>kWidget,1-30,12-32) fuzzy-if(webrender&&cocoaWidget,18-22,20-44) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-h-rtl.html async-scrollbar-1-h-rtl-ref.html
|
||||
fuzzy-if(Android,0-43,0-26) fuzzy-if(webrender&>kWidget,8-14,12-32) fuzzy-if(webrender&&cocoaWidget,14-18,26-54) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-vh-rtl.html async-scrollbar-1-vh-rtl-ref.html
|
||||
fuzzy-if(Android&&!swgl,0-1,0-2) fuzzy-if(Android&&swgl,3-3,4-4) fuzzy-if(webrender&>kWidget,1-8,8-32) fuzzy-if(webrender&&cocoaWidget,18-22,20-44) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-v.html async-scrollbar-1-v-ref.html
|
||||
fuzzy-if(Android&&!swgl,0-4,0-5) fuzzy-if(Android&&swgl,11-11,4-4) fuzzy-if(webrender&>kWidget,1-30,4-32) fuzzy-if(webrender&&cocoaWidget,18-22,20-44) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-h.html async-scrollbar-1-h-ref.html
|
||||
fuzzy-if(Android&&!swgl,0-7,0-6) fuzzy-if(Android&&swgl,11-11,8-8) fuzzy-if(webrender&>kWidget,1-2,4-20) fuzzy-if(webrender&&cocoaWidget,14-18,48-88) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-vh.html async-scrollbar-1-vh-ref.html
|
||||
fuzzy-if(Android&&!swgl,0-1,0-2) fuzzy-if(Android&&swgl,3-3,4-4) fuzzy-if(webrender&>kWidget,1-8,8-32) fuzzy-if(webrender&&cocoaWidget,18-22,20-44) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-v-rtl.html async-scrollbar-1-v-rtl-ref.html
|
||||
fuzzy-if(Android,0-14,0-5) fuzzy-if(webrender&>kWidget,1-30,12-32) fuzzy-if(webrender&&cocoaWidget,18-22,20-44) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-h-rtl.html async-scrollbar-1-h-rtl-ref.html
|
||||
fuzzy-if(Android,0-8,0-8) fuzzy-if(webrender&>kWidget,8-14,12-32) fuzzy-if(webrender&&cocoaWidget,14-18,26-54) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-vh-rtl.html async-scrollbar-1-vh-rtl-ref.html
|
||||
|
||||
# Different async zoom levels. Since the scrollthumb gets async-scaled in the
|
||||
# compositor, the border-radius ends of the scrollthumb are going to be a little
|
||||
# off, hence the fuzzy-if clauses.
|
||||
fuzzy-if(Android,0-54,0-33) skip-if(!Android) pref(apz.allow_zooming,true) == async-scrollbar-zoom-1.html async-scrollbar-zoom-1-ref.html
|
||||
fuzzy-if(Android,0-45,0-30) skip-if(!Android) pref(apz.allow_zooming,true) == async-scrollbar-zoom-2.html async-scrollbar-zoom-2-ref.html
|
||||
fuzzy-if(Android&&!webrender,0-54,0-20) fuzzy-if(Android&&webrender&&!swgl,0-45,0-214) fuzzy-if(Android&&webrender&&swgl,54-55,20-20) skip-if(!Android) pref(apz.allow_zooming,true) == async-scrollbar-zoom-1.html async-scrollbar-zoom-1-ref.html
|
||||
fuzzy-if(Android,0-45,0-27) skip-if(!Android) pref(apz.allow_zooming,true) == async-scrollbar-zoom-2.html async-scrollbar-zoom-2-ref.html
|
||||
|
||||
# Test scrollbars working properly with pinch-zooming, i.e. different document resolutions.
|
||||
# As above, the end of the scrollthumb won't match perfectly, but the bulk of the scrollbar should be present and identical.
|
||||
# On desktop, even more fuzz is needed because thumb scaling is not exactly proportional: making the page twice as long
|
||||
# On desktop, even more fuzz is needed because thumb scaling is not exactly proportional: making the page twice as long
|
||||
# won't make the thumb exactly twice as short, which is what the test expects. That's fine, as the purpose of the test is
|
||||
# to catch more fundamental scrollbar rendering bugs such as the entire track being mispositioned or the thumb being
|
||||
# clipped away.
|
||||
fuzzy-if(Android,0-54,0-22) fuzzy-if(!Android,0-128,0-137) pref(apz.allow_zooming,true) == scrollbar-zoom-resolution-1.html scrollbar-zoom-resolution-1-ref.html
|
||||
fuzzy-if(Android,0-54,0-22) fuzzy-if(!Android,0-128,0-137) pref(apz.allow_zooming,true) pref(apz.allow_zooming_out,true) == scrollbar-zoom-resolution-2.html scrollbar-zoom-resolution-2-ref.html
|
||||
fuzzy-if(Android,0-54,0-14) fuzzy-if(!Android,0-128,0-137) pref(apz.allow_zooming,true) == scrollbar-zoom-resolution-1.html scrollbar-zoom-resolution-1-ref.html
|
||||
fuzzy-if(Android,0-51,0-22) fuzzy-if(!Android,0-128,0-137) pref(apz.allow_zooming,true) pref(apz.allow_zooming_out,true) == scrollbar-zoom-resolution-2.html scrollbar-zoom-resolution-2-ref.html
|
||||
|
||||
# Meta-viewport tag support
|
||||
skip-if(!Android) pref(apz.allow_zooming,true) == initial-scale-1.html initial-scale-1-ref.html
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),0-1,0-3120) skip-if(!asyncPa
|
|||
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,0-15,0-11) fuzzy-if(webrender&>kWidget,20-33,14-32) fuzzy-if(webrender&&cocoaWidget,9-21,20-44) skip-if(!asyncPan) == position-fixed-transformed-1.html position-fixed-transformed-1-ref.html # Bug 1604338
|
||||
fuzzy-if(Android,0-8,0-4) fuzzy-if(webrender&>kWidget,20-33,14-32) fuzzy-if(webrender&&cocoaWidget,9-21,20-44) skip-if(!asyncPan) == position-fixed-transformed-1.html position-fixed-transformed-1-ref.html # Bug 1604338
|
||||
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,0-2,0-240000) fuzzy-if(browserIsRemote&&!skiaContent&&(cocoaWidget||winWidget),0-1,0-240000) skip-if(!asyncPan) == split-opacity-layers-1.html split-opacity-layers-1-ref.html
|
||||
|
|
@ -49,33 +49,33 @@ skip-if(!asyncPan) fails-if(!webrender) == sticky-inside-transform-1.html sticky
|
|||
fuzzy(0-1,0-60000) skip-if(!asyncPan) == group-opacity-surface-size-1.html group-opacity-surface-size-1-ref.html
|
||||
fuzzy-if(Android,0-1,0-197) fuzzy-if(webrender,0-9,0-99) skip-if(!asyncPan) == position-sticky-transformed.html position-sticky-transformed-ref.html
|
||||
skip-if(!asyncPan) fuzzy-if(webrender&&cocoaWidget,0-1,0-396) fuzzy-if(webrender&&winWidget,0-1,0-396) == offscreen-prerendered-active-opacity.html offscreen-prerendered-active-opacity-ref.html
|
||||
fuzzy-if(Android,0-43,0-14) fuzzy-if(skiaContent&&!Android,0-1,0-34) fuzzy-if(webrender&>kWidget,22-74,20-32) fuzzy-if(webrender&&cocoaWidget,6-7,18-39) fuzzy-if(swgl&&cocoaWidget&&isDebugBuild,0-7,0-39) skip-if(!asyncPan) == offscreen-clipped-blendmode-1.html offscreen-clipped-blendmode-ref.html # Bug 1604338
|
||||
fuzzy-if(Android,0-43,0-14) fuzzy-if(webrender&>kWidget,22-74,20-32) fuzzy-if(webrender&&cocoaWidget,6-7,18-39) fuzzy-if(swgl&&cocoaWidget&&isDebugBuild,0-7,0-39) skip-if(!asyncPan) == offscreen-clipped-blendmode-2.html offscreen-clipped-blendmode-ref.html # Bug 1604338
|
||||
fuzzy-if(Android,0-43,0-14) skip == offscreen-clipped-blendmode-3.html offscreen-clipped-blendmode-ref.html # bug 1251588 - wrong AGR on mix-blend-mode item
|
||||
fuzzy-if(Android,0-43,0-14) fuzzy-if(webrender&>kWidget,22-74,20-32) fuzzy-if(webrender&&cocoaWidget,6-7,18-39) fuzzy-if(swgl&&cocoaWidget&&isDebugBuild,0-7,0-39) skip-if(!asyncPan) == offscreen-clipped-blendmode-4.html offscreen-clipped-blendmode-ref.html # Bug 1604338
|
||||
fuzzy-if(Android,0-6,0-4) fuzzy-if(skiaContent&&!Android,0-1,0-34) fuzzy-if(webrender&>kWidget,22-74,20-32) fuzzy-if(webrender&&cocoaWidget,6-7,18-39) fuzzy-if(swgl&&cocoaWidget&&isDebugBuild,0-7,0-39) skip-if(!asyncPan) == offscreen-clipped-blendmode-1.html offscreen-clipped-blendmode-ref.html # Bug 1604338
|
||||
fuzzy-if(Android,0-6,0-4) fuzzy-if(webrender&>kWidget,22-74,20-32) fuzzy-if(webrender&&cocoaWidget,6-7,18-39) fuzzy-if(swgl&&cocoaWidget&&isDebugBuild,0-7,0-39) skip-if(!asyncPan) == offscreen-clipped-blendmode-2.html offscreen-clipped-blendmode-ref.html # Bug 1604338
|
||||
fuzzy-if(Android,0-6,0-4) skip == offscreen-clipped-blendmode-3.html offscreen-clipped-blendmode-ref.html # bug 1251588 - wrong AGR on mix-blend-mode item
|
||||
fuzzy-if(Android,0-6,0-4) fuzzy-if(webrender&>kWidget,22-74,20-32) fuzzy-if(webrender&&cocoaWidget,6-7,18-39) fuzzy-if(swgl&&cocoaWidget&&isDebugBuild,0-7,0-39) skip-if(!asyncPan) == offscreen-clipped-blendmode-4.html offscreen-clipped-blendmode-ref.html # Bug 1604338
|
||||
fuzzy-if(Android,0-7,0-1680) fuzzy-if(webrender&>kWidget,1-1,2-20) fuzzy-if(webrender&&cocoaWidget,1-2,10-18) fuzzy-if(swgl&&cocoaWidget&&isDebugBuild,0-2,0-18) skip-if(!asyncPan) == perspective-scrolling-1.html perspective-scrolling-1-ref.html # Bug 1604338
|
||||
fuzzy-if(Android,0-7,0-4) skip-if(!asyncPan) == perspective-scrolling-2.html perspective-scrolling-2-ref.html
|
||||
fuzzy-if(Android,0-19,0-6) fuzzy-if(webrender&>kWidget,8-13,12-32) fuzzy-if(webrender&&cocoaWidget,10-13,20-44) skip-if(!asyncPan) == perspective-scrolling-3.html perspective-scrolling-3-ref.html # Bug 1604338
|
||||
fuzzy-if(Android,0-13,0-11) fuzzy-if(webrender&>kWidget,18-30,14-32) fuzzy-if(webrender&&cocoaWidget,16-20,20-44) skip-if(!asyncPan) == perspective-scrolling-4.html perspective-scrolling-4-ref.html # Bug 1604338
|
||||
fuzzy-if(Android,0-19,0-4) fuzzy-if(webrender&>kWidget,8-13,12-32) fuzzy-if(webrender&&cocoaWidget,10-13,20-44) skip-if(!asyncPan) == perspective-scrolling-3.html perspective-scrolling-3-ref.html # Bug 1604338
|
||||
fuzzy-if(Android,0-7,0-4) fuzzy-if(webrender&>kWidget,18-30,14-32) fuzzy-if(webrender&&cocoaWidget,16-20,20-44) skip-if(!asyncPan) == perspective-scrolling-4.html perspective-scrolling-4-ref.html # Bug 1604338
|
||||
skip-if(!asyncPan) == perspective-scrolling-5.html perspective-scrolling-5-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,0-1,0-22) skip-if(!asyncPan) fuzzy-if(geckoview,2-2,242-242) skip-if(geckoview&&debug) fuzzy-if(webrender&&swgl,0-255,0-11) == background-blend-mode-1.html background-blend-mode-1-ref.html # bug 1558286 for GV
|
||||
skip-if(Android||!asyncPan) != opaque-fractional-displayport-1.html about:blank
|
||||
skip-if(Android||!asyncPan) != opaque-fractional-displayport-2.html about:blank
|
||||
fuzzy-if(Android,0-19,0-10) fuzzy-if(webrender&>kWidget,12-19,12-32) fuzzy-if(webrender&&cocoaWidget,17-21,20-44) skip-if(!asyncPan) == fixed-pos-scrolled-clip-1.html fixed-pos-scrolled-clip-1-ref.html # Bug 1604338
|
||||
fuzzy-if(Android,0-44,0-17) fuzzy-if(webrender&>kWidget,16-26,26-64) fuzzy-if(webrender&&cocoaWidget,10-13,38-82) fuzzy-if(winWidget&&!nativeThemePref,0-4,0-36) skip-if(!asyncPan) == fixed-pos-scrolled-clip-2.html fixed-pos-scrolled-clip-2-ref.html # Bug 1604338
|
||||
fuzzy-if(Android,0-13,0-16) fuzzy-if(webrender&>kWidget,17-28,24-60) fuzzy-if(webrender&&cocoaWidget,15-19,40-75) skip-if(!asyncPan) == fixed-pos-scrolled-clip-3.html fixed-pos-scrolled-clip-3-ref.html # Bug 1604338
|
||||
fuzzy-if(Android,0-13,0-16) fuzzy-if(webrender&>kWidget,17-29,24-60) fuzzy-if(webrender&&cocoaWidget,15-19,40-75) skip-if(!asyncPan) == fixed-pos-scrolled-clip-4.html fixed-pos-scrolled-clip-4-ref.html # Bug 1604338
|
||||
fuzzy-if(Android,0-19,0-4) fuzzy-if(webrender&>kWidget,12-19,12-32) fuzzy-if(webrender&&cocoaWidget,17-21,20-44) skip-if(!asyncPan) == fixed-pos-scrolled-clip-1.html fixed-pos-scrolled-clip-1-ref.html # Bug 1604338
|
||||
fuzzy-if(Android,0-44,0-10) fuzzy-if(Android&&webrender&&swgl,0-44,0-126) fuzzy-if(webrender&>kWidget,16-26,26-64) fuzzy-if(webrender&&cocoaWidget,10-13,38-82) fuzzy-if(winWidget&&!nativeThemePref,0-4,0-36) skip-if(!asyncPan) == fixed-pos-scrolled-clip-2.html fixed-pos-scrolled-clip-2-ref.html # Bug 1604338
|
||||
fuzzy-if(Android,0-6,0-8) fuzzy-if(webrender&>kWidget,17-28,24-60) fuzzy-if(webrender&&cocoaWidget,15-19,40-75) skip-if(!asyncPan) == fixed-pos-scrolled-clip-3.html fixed-pos-scrolled-clip-3-ref.html # Bug 1604338
|
||||
fuzzy-if(Android,0-6,0-8) fuzzy-if(webrender&>kWidget,17-29,24-60) fuzzy-if(webrender&&cocoaWidget,15-19,40-75) skip-if(!asyncPan) == fixed-pos-scrolled-clip-4.html fixed-pos-scrolled-clip-4-ref.html # Bug 1604338
|
||||
skip-if(!asyncPan) == fixed-pos-scrolled-clip-5.html fixed-pos-scrolled-clip-5-ref.html
|
||||
skip-if(!asyncPan) == position-sticky-bug1434250.html position-sticky-bug1434250-ref.html
|
||||
fuzzy-if(Android,0-12,0-11) fuzzy-if(webrender&>kWidget,16-25,12-32) fuzzy-if(webrender&&cocoaWidget,13-16,20-44) skip-if(!asyncPan) == position-sticky-scrolled-clip-1.html position-sticky-scrolled-clip-1-ref.html # Bug 1604338
|
||||
fuzzy-if(Android,0-8,0-4) fuzzy-if(webrender&>kWidget,16-25,12-32) fuzzy-if(webrender&&cocoaWidget,13-16,20-44) skip-if(!asyncPan) == position-sticky-scrolled-clip-1.html position-sticky-scrolled-clip-1-ref.html # Bug 1604338
|
||||
fuzzy-if(Android,0-6,0-4) skip == position-sticky-scrolled-clip-2.html position-sticky-scrolled-clip-2-ref.html # bug ?????? - incorrectly applying clip to sticky contents
|
||||
fuzzy-if(Android,0-8,0-27) fuzzy-if(webrender&&cocoaWidget,9-11,20-44) skip-if(!asyncPan) == curtain-effect-1.html curtain-effect-1-ref.html
|
||||
fuzzy-if(Android,0-7,0-6) fuzzy-if(webrender&>kWidget,10-15,12-32) fuzzy-if(webrender&&cocoaWidget,5-9,20-42) skip-if(!asyncPan) == transformed-1.html transformed-1-ref.html # Bug 1604338
|
||||
fuzzy-if(Android,2-6,1-12) fuzzy-if(webrender&>kWidget,3-5,12-28) fuzzy-if(webrender&&cocoaWidget,5-6,18-38) skip-if(!asyncPan) fuzzy-if(swgl&&cocoaWidget&&isDebugBuild,0-6,0-38) == position-sticky-transformed-in-scrollframe-1.html position-sticky-transformed-in-scrollframe-1-ref.html # Bug 1604338
|
||||
fuzzy-if(Android,3-3,1-12) fuzzy-if(webrender&>kWidget,13-20,12-32) fuzzy-if(webrender&&cocoaWidget,12-16,20-44) skip-if(!asyncPan) == position-sticky-transformed-in-scrollframe-2.html position-sticky-transformed-in-scrollframe-2-ref.html # Bug 1604338
|
||||
fuzzy-if(Android,12-13,4-24) fuzzy-if(webrender&>kWidget,16-27,14-32) fuzzy-if(webrender&&cocoaWidget,13-16,20-44) skip-if(!asyncPan) == position-sticky-in-transformed-scrollframe-1.html position-sticky-in-transformed-scrollframe-ref.html # Bug 1604338
|
||||
fuzzy-if(Android,12-13,4-24) fuzzy-if(webrender&>kWidget,16-27,14-32) fuzzy-if(webrender&&cocoaWidget,13-16,20-44) skip-if(!asyncPan) == position-sticky-in-transformed-scrollframe-2.html position-sticky-in-transformed-scrollframe-ref.html # Bug 1604338
|
||||
fuzzy-if(Android,0-7,0-4) fuzzy-if(webrender&>kWidget,10-15,12-32) fuzzy-if(webrender&&cocoaWidget,5-9,20-42) skip-if(!asyncPan) == transformed-1.html transformed-1-ref.html # Bug 1604338
|
||||
fuzzy-if(Android&&!webrender,2-6,4-4) fuzzy-if(Android&&webrender,6-7,4-4) fuzzy-if(webrender&>kWidget,3-5,12-28) fuzzy-if(webrender&&cocoaWidget,5-6,18-38) skip-if(!asyncPan) fuzzy-if(swgl&&cocoaWidget&&isDebugBuild,0-6,0-38) == position-sticky-transformed-in-scrollframe-1.html position-sticky-transformed-in-scrollframe-1-ref.html # Bug 1604338
|
||||
fuzzy-if(Android&&!webrender,3-3,4-4) fuzzy-if(Android&&webrender,10-10,4-449) fuzzy-if(webrender&>kWidget,13-20,12-32) fuzzy-if(webrender&&cocoaWidget,12-16,20-44) skip-if(!asyncPan) == position-sticky-transformed-in-scrollframe-2.html position-sticky-transformed-in-scrollframe-2-ref.html # Bug 1604338
|
||||
fuzzy-if(Android&&!webrender,3-3,4-4) fuzzy-if(Android&&webrender,12-13,4-24) fuzzy-if(webrender&>kWidget,16-27,14-32) fuzzy-if(webrender&&cocoaWidget,13-16,20-44) skip-if(!asyncPan) == position-sticky-in-transformed-scrollframe-1.html position-sticky-in-transformed-scrollframe-ref.html # Bug 1604338
|
||||
fuzzy-if(Android&&!webrender,3-3,4-4) fuzzy-if(Android&&webrender,12-13,4-24) fuzzy-if(webrender&>kWidget,16-27,14-32) fuzzy-if(webrender&&cocoaWidget,13-16,20-44) skip-if(!asyncPan) == position-sticky-in-transformed-scrollframe-2.html position-sticky-in-transformed-scrollframe-ref.html # Bug 1604338
|
||||
|
||||
# for the following tests, we want to disable the low-precision buffer
|
||||
# as it will expand the displayport beyond what the test specifies in
|
||||
|
|
|
|||
|
|
@ -1853,23 +1853,23 @@ pref(apz.allow_zooming,true) skip-if(!Android) == 1133905-4.html 1133905-ref.htm
|
|||
pref(apz.allow_zooming,true) skip-if(!Android) == 1133905-5.html 1133905-ref.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) == 1133905-6.html 1133905-ref.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) == 1133905-1-v.html 1133905-ref-v.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) fuzzy-if(Android,0-43,0-9) == 1133905-2-v.html 1133905-ref-v.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) fuzzy-if(Android,0-43,0-9) == 1133905-3-v.html 1133905-ref-v.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) == 1133905-2-v.html 1133905-ref-v.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) fuzzy-if(Android,0-45,0-4) == 1133905-3-v.html 1133905-ref-v.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) == 1133905-4-v.html 1133905-ref-v.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) fuzzy-if(Android,0-43,0-9) == 1133905-5-v.html 1133905-ref-v.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) == 1133905-6-v.html 1133905-ref-v.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) == 1133905-5-v.html 1133905-ref-v.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) fails-if(Android) == 1133905-6-v.html 1133905-ref-v.html # bug 1308702
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) == 1133905-1-h.html 1133905-ref-h.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) == 1133905-2-h.html 1133905-ref-h.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) == 1133905-3-h.html 1133905-ref-h.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) == 1133905-4-h.html 1133905-ref-h.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) == 1133905-5-h.html 1133905-ref-h.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) == 1133905-6-h.html 1133905-ref-h.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) fuzzy-if(Android,0-54,0-17) == 1133905-1-vh.html 1133905-ref-vh.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) fuzzy-if(Android,0-43,0-9) == 1133905-2-vh.html 1133905-ref-vh.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) fuzzy-if(Android,0-43,0-9) == 1133905-3-vh.html 1133905-ref-vh.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) fuzzy-if(Android,0-43,0-9) == 1133905-4-vh.html 1133905-ref-vh.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) fuzzy-if(Android,0-43,0-9) == 1133905-5-vh.html 1133905-ref-vh.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) fuzzy-if(Android,0-54,0-17) == 1133905-6-vh.html 1133905-ref-vh.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) fuzzy-if(Android,0-54,0-6) == 1133905-1-vh.html 1133905-ref-vh.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) fuzzy-if(Android,0-45,0-4) == 1133905-2-vh.html 1133905-ref-vh.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) == 1133905-3-vh.html 1133905-ref-vh.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) fuzzy-if(Android,0-45,0-4) == 1133905-4-vh.html 1133905-ref-vh.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) fuzzy-if(Android,0-54,0-6) == 1133905-5-vh.html 1133905-ref-vh.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) fuzzy-if(Android,0-54,0-8) == 1133905-6-vh.html 1133905-ref-vh.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) != 1133905-ref-vh.html about:blank # make sure it doesn't render blank
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) == 1133905-1-rtl.html 1133905-ref-rtl.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) == 1133905-2-rtl.html 1133905-ref-rtl.html
|
||||
|
|
@ -1878,23 +1878,23 @@ pref(apz.allow_zooming,true) skip-if(!Android) == 1133905-4-rtl.html 1133905-ref
|
|||
pref(apz.allow_zooming,true) skip-if(!Android) == 1133905-5-rtl.html 1133905-ref-rtl.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) == 1133905-6-rtl.html 1133905-ref-rtl.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) == 1133905-1-v-rtl.html 1133905-ref-v-rtl.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) fuzzy-if(Android,0-43,0-9) == 1133905-2-v-rtl.html 1133905-ref-v-rtl.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) fuzzy-if(Android,0-43,0-9) == 1133905-3-v-rtl.html 1133905-ref-v-rtl.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) == 1133905-2-v-rtl.html 1133905-ref-v-rtl.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) fuzzy-if(Android,0-45,0-4) == 1133905-3-v-rtl.html 1133905-ref-v-rtl.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) == 1133905-4-v-rtl.html 1133905-ref-v-rtl.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) fuzzy-if(Android,0-43,0-9) == 1133905-5-v-rtl.html 1133905-ref-v-rtl.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) == 1133905-6-v-rtl.html 1133905-ref-v-rtl.html # bug 1308702
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) == 1133905-5-v-rtl.html 1133905-ref-v-rtl.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) fails-if(Android) == 1133905-6-v-rtl.html 1133905-ref-v-rtl.html # bug 1308702
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) == 1133905-1-h-rtl.html 1133905-ref-h-rtl.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) == 1133905-2-h-rtl.html 1133905-ref-h-rtl.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) == 1133905-3-h-rtl.html 1133905-ref-h-rtl.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) == 1133905-4-h-rtl.html 1133905-ref-h-rtl.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) == 1133905-5-h-rtl.html 1133905-ref-h-rtl.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) == 1133905-6-h-rtl.html 1133905-ref-h-rtl.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) fuzzy-if(Android,0-54,0-17) == 1133905-1-vh-rtl.html 1133905-ref-vh-rtl.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) fuzzy-if(Android,0-43,0-9) == 1133905-2-vh-rtl.html 1133905-ref-vh-rtl.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) fuzzy-if(Android,0-43,0-9) == 1133905-3-vh-rtl.html 1133905-ref-vh-rtl.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) fuzzy-if(Android,0-43,0-9) == 1133905-4-vh-rtl.html 1133905-ref-vh-rtl.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) fuzzy-if(Android,0-43,0-9) == 1133905-5-vh-rtl.html 1133905-ref-vh-rtl.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) fuzzy-if(Android,0-54,0-17) == 1133905-6-vh-rtl.html 1133905-ref-vh-rtl.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) fuzzy-if(Android,0-54,0-6) == 1133905-1-vh-rtl.html 1133905-ref-vh-rtl.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) fuzzy-if(Android,0-45,0-4) == 1133905-2-vh-rtl.html 1133905-ref-vh-rtl.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) == 1133905-3-vh-rtl.html 1133905-ref-vh-rtl.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) fuzzy-if(Android,0-45,0-4) == 1133905-4-vh-rtl.html 1133905-ref-vh-rtl.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) fuzzy-if(Android,0-54,0-6) == 1133905-5-vh-rtl.html 1133905-ref-vh-rtl.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) fuzzy-if(Android,0-54,0-8) == 1133905-6-vh-rtl.html 1133905-ref-vh-rtl.html
|
||||
pref(apz.allow_zooming,true) skip-if(!Android) != 1133905-ref-vh-rtl.html about:blank # make sure it doesn't render blank
|
||||
== 1149304-1-transform-change.html 1149304-1-transform-change-ref.html
|
||||
== chrome://reftest/content/bugs/1150021-1.xhtml chrome://reftest/content/bugs/1150021-1-ref.xhtml
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ fuzzy-if(d2d,0-255,0-24) fuzzy-if(!useDrawSnapshot&&webrender,255-255,56-72) ==
|
|||
# For !nativeThemePref: element() uses fallback / skia in WebRender, which antialiases differently from WR.
|
||||
# For !nativeThemePref+Windows+WebRender: bug 1496542, the scrollframe snaps differently.
|
||||
# For the rest: -ref the scrollframe is active and layerized differently with APZ.
|
||||
fuzzy-if(asyncPan,0-2,0-140) fuzzy-if(skiaContent,0-24,0-106) fuzzy-if(winWidget&&!layersGPUAccelerated,149-149,1203-1203) fuzzy-if(!useDrawSnapshot&&webrender&&!nativeThemePref,1-48,5-68) fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu),0-53,0-1204) fuzzy-if(webrender&&winWidget,47-222,1197-1588) fuzzy-if(Android,0-40,0-81) == element-paint-native-widget.html element-paint-native-widget-ref.html
|
||||
fuzzy-if(asyncPan,0-2,0-140) fuzzy-if(skiaContent,0-24,0-106) fuzzy-if(winWidget&&!layersGPUAccelerated,149-149,1203-1203) fuzzy-if(webrender&&geckoview,0-7,0-1321) fuzzy-if(!useDrawSnapshot&&webrender&&!nativeThemePref,1-48,5-68) fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu),0-53,0-1204) fuzzy-if(webrender&&winWidget,47-222,1197-1588) == element-paint-native-widget.html element-paint-native-widget-ref.html
|
||||
|
||||
fails-if(usesRepeatResampling&&!(webrender&&winWidget)) == element-paint-subimage-sampling-restriction.html about:blank
|
||||
== element-paint-clippath.html element-paint-clippath-ref.html
|
||||
|
|
|
|||
|
|
@ -50,6 +50,6 @@ fuzzy-if(Android,0-8,0-630) fuzzy-if(OSX,0-1,0-11) fuzzy-if(skiaContent,0-1,0-22
|
|||
== block-in-inline-continuations.html block-in-inline-continuations-ref.html
|
||||
== iframe-1.html iframe-1-ref.html
|
||||
== transformed-1.html transformed-1-ref.html
|
||||
fuzzy-if(Android,0-8,0-6) fuzzy-if(webrender&>kWidget,10-17,12-32) fuzzy-if(webrender&&cocoaWidget,7-8,18-42) skip-if(!asyncPan) fails-if(useDrawSnapshot) == transformed-2.html transformed-2-ref.html # Bug 1604644
|
||||
skip-if(!asyncPan) fuzzy-if(Android,0-14,0-11) fuzzy-if(webrender&>kWidget,19-30,12-32) fuzzy-if(webrender&&cocoaWidget,13-16,20-44) fails-if(useDrawSnapshot) == nested-sticky-1.html nested-sticky-1-ref.html # Bug 1604644
|
||||
skip-if(!asyncPan) fuzzy-if(Android,0-14,0-11) fuzzy-if(webrender&>kWidget,19-30,12-32) fuzzy-if(webrender&&cocoaWidget,13-16,20-44) fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu),0-4,0-104) fails-if(useDrawSnapshot) == nested-sticky-2.html nested-sticky-2-ref.html # Bug 1604644
|
||||
fuzzy-if(Android,0-5,0-4) fuzzy-if(webrender&>kWidget,10-17,12-32) fuzzy-if(webrender&&cocoaWidget,7-8,18-42) skip-if(!asyncPan) fails-if(useDrawSnapshot) == transformed-2.html transformed-2-ref.html # Bug 1604644
|
||||
skip-if(!asyncPan) fuzzy-if(Android,0-10,0-4) fuzzy-if(webrender&>kWidget,19-30,12-32) fuzzy-if(webrender&&cocoaWidget,13-16,20-44) fails-if(useDrawSnapshot) == nested-sticky-1.html nested-sticky-1-ref.html # Bug 1604644
|
||||
skip-if(!asyncPan) fuzzy-if(Android,0-10,0-4) fuzzy-if(webrender&>kWidget,19-30,12-32) fuzzy-if(webrender&&cocoaWidget,13-16,20-44) fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu),0-4,0-104) fails-if(useDrawSnapshot) == nested-sticky-2.html nested-sticky-2-ref.html # Bug 1604644
|
||||
|
|
|
|||
|
|
@ -99,5 +99,5 @@ fuzzy(0-1,0-2) fuzzy-if(asyncPan&&!layersGPUAccelerated,0-102,0-2420) fuzzy-if(g
|
|||
== propagated-overflow-style-2d.html propagated-overflow-style-2-ref.html
|
||||
== propagated-overflow-style-2e.html propagated-overflow-style-2-ref.html
|
||||
|
||||
fuzzy-if(Android,54-54,8-29) == xul-scrollbar-iterate.html xul-scrollbar-iterate-ref.html
|
||||
fuzzy-if(Android,54-54,8-8) == xul-scrollbar-iterate.html xul-scrollbar-iterate-ref.html
|
||||
== scrollbars-area-in-iframe.html scrollbars-area-in-iframe-ref.html
|
||||
|
|
|
|||
|
|
@ -11657,8 +11657,6 @@
|
|||
type: uint32_t
|
||||
#if defined(MOZ_WIDGET_GTK)
|
||||
value: 12
|
||||
#elif defined(ANDROID)
|
||||
value: 6
|
||||
#else
|
||||
value: 17
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
[grid-areas-overflowing-grid-container-006.html]
|
||||
fuzzy:
|
||||
if os == "android": maxDifference=1;totalPixels=0-2
|
||||
|
|
@ -2,39 +2,78 @@
|
|||
* 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/. */
|
||||
|
||||
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
|
||||
|
||||
scrollbar, resizer, scrollcorner {
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
scrollbar {
|
||||
appearance: auto;
|
||||
-moz-default-appearance: scrollbar-horizontal;
|
||||
}
|
||||
@namespace url("http://www.w3.org/1999/xhtml");
|
||||
@namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
|
||||
|
||||
/* Style the scrollbars */
|
||||
scrollbar[root="true"] {
|
||||
xul|scrollbar[root="true"] {
|
||||
position: relative;
|
||||
z-index: 2147483647;
|
||||
}
|
||||
|
||||
scrollbar[orient="vertical"] {
|
||||
-moz-default-appearance: scrollbar-vertical;
|
||||
xul|scrollbar {
|
||||
appearance: none;
|
||||
pointer-events: none;
|
||||
display: block;
|
||||
}
|
||||
|
||||
thumb {
|
||||
appearance: auto;
|
||||
-moz-default-appearance: scrollbarthumb-horizontal;
|
||||
/* We don't show resizers on android, so they may as well have
|
||||
* pointer-events: none to simplify scrollbar caching */
|
||||
xul|resizer,
|
||||
xul|scrollcorner {
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
thumb[orient="vertical"] {
|
||||
-moz-default-appearance: scrollbarthumb-vertical;
|
||||
xul|scrollbar[orient="vertical"] {
|
||||
min-width: 6px;
|
||||
max-width: 6px;
|
||||
}
|
||||
|
||||
scrollbar:not([active="true"]),
|
||||
scrollbar[disabled] {
|
||||
xul|scrollbar[orient="vertical"] xul|thumb {
|
||||
appearance: none;
|
||||
max-width: 2px;
|
||||
min-width: 2px;
|
||||
}
|
||||
|
||||
xul|scrollbar[orient="horizontal"] {
|
||||
min-height: 6px;
|
||||
max-height: 6px;
|
||||
}
|
||||
|
||||
xul|scrollbar[orient="horizontal"] xul|thumb {
|
||||
appearance: none;
|
||||
max-height: 2px;
|
||||
min-height: 2px;
|
||||
}
|
||||
|
||||
xul|scrollbar:not([active="true"]),
|
||||
xul|scrollbar[disabled] {
|
||||
/* Mac and Windows with overlay scrollbars use visibility: hidden here, but
|
||||
* that breaks the scrollbar style caching, see bug 1620866. */
|
||||
opacity: 0;
|
||||
}
|
||||
|
||||
xul|scrollbarbutton {
|
||||
appearance: none;
|
||||
min-height: 6px;
|
||||
min-width: 6px;
|
||||
visibility: hidden;
|
||||
}
|
||||
|
||||
xul|scrollbarbutton[sbattr="scrollbar-up-top"] {
|
||||
display: none;
|
||||
}
|
||||
|
||||
xul|scrollbar xul|thumb {
|
||||
background-color: rgba(119, 119, 119, 0.4);
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
select:not([size], [multiple]) > xul|scrollbar,
|
||||
select[size="1"] > xul|scrollbar,
|
||||
select:not([size], [multiple]) > xul|scrollbar > xul|scrollbarbutton,
|
||||
select[size="1"] > xul|scrollbar > xul|scrollbarbutton {
|
||||
display: block;
|
||||
margin-left: 0;
|
||||
min-width: 16px;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -121,14 +121,6 @@ nsresult nsLookAndFeel::NativeGetColor(ColorID aID, ColorScheme aColorScheme,
|
|||
// not used?
|
||||
aColor = mSystemColors.textColorPrimary;
|
||||
break;
|
||||
|
||||
case ColorID::ThemedScrollbarThumbInactive:
|
||||
case ColorID::ThemedScrollbarThumb:
|
||||
// We don't need to care about the Active and Hover colors because Android
|
||||
// scrollbars can't be hovered (they always have pointer-events: none).
|
||||
aColor = NS_RGBA(119, 119, 119, 102);
|
||||
break;
|
||||
|
||||
case ColorID::Highlight: {
|
||||
// Matched to action_accent in java codebase. This works fine with both
|
||||
// light and dark color scheme.
|
||||
|
|
@ -339,10 +331,6 @@ nsresult nsLookAndFeel::NativeGetInt(IntID aID, int32_t& aResult) {
|
|||
aResult = eScrollThumbStyle_Proportional;
|
||||
break;
|
||||
|
||||
case IntID::UseOverlayScrollbars:
|
||||
aResult = 1;
|
||||
break;
|
||||
|
||||
case IntID::WindowsDefaultTheme:
|
||||
case IntID::WindowsThemeIdentifier:
|
||||
case IntID::OperatingSystemVersionIdentifier:
|
||||
|
|
|
|||
|
|
@ -6,84 +6,6 @@
|
|||
#include "nsNativeBasicThemeAndroid.h"
|
||||
|
||||
#include "mozilla/ClearOnShutdown.h"
|
||||
#include "nsStyleConsts.h"
|
||||
#include "nsIFrame.h"
|
||||
|
||||
auto nsNativeBasicThemeAndroid::GetScrollbarSizes(nsPresContext* aPresContext,
|
||||
StyleScrollbarWidth aWidth,
|
||||
Overlay aOverlay)
|
||||
-> ScrollbarSizes {
|
||||
// We force auto-width scrollbars because scrollbars on android are already
|
||||
// thin enough.
|
||||
return nsNativeBasicTheme::GetScrollbarSizes(
|
||||
aPresContext, StyleScrollbarWidth::Auto, aOverlay);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsNativeBasicThemeAndroid::GetMinimumWidgetSize(
|
||||
nsPresContext* aPresContext, nsIFrame* aFrame, StyleAppearance aAppearance,
|
||||
mozilla::LayoutDeviceIntSize* aResult, bool* aIsOverridable) {
|
||||
if (!IsWidgetScrollbarPart(aAppearance)) {
|
||||
return nsNativeBasicTheme::GetMinimumWidgetSize(
|
||||
aPresContext, aFrame, aAppearance, aResult, aIsOverridable);
|
||||
}
|
||||
|
||||
auto sizes =
|
||||
GetScrollbarSizes(aPresContext, StyleScrollbarWidth::Auto, Overlay::Yes);
|
||||
aResult->SizeTo(sizes.mHorizontal, sizes.mHorizontal);
|
||||
MOZ_ASSERT(sizes.mHorizontal == sizes.mVertical);
|
||||
|
||||
*aIsOverridable = true;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
template <typename PaintBackendData>
|
||||
void nsNativeBasicThemeAndroid::DoPaintScrollbarThumb(
|
||||
PaintBackendData& aPaintData, const LayoutDeviceRect& aRect,
|
||||
bool aHorizontal, nsIFrame* aFrame, const ComputedStyle& aStyle,
|
||||
const EventStates& aElementState, const EventStates& aDocumentState,
|
||||
UseSystemColors aUseSystemColors, DPIRatio aDpiRatio) {
|
||||
// TODO(emilio): Maybe do like macOS and draw a stroke?
|
||||
const auto color = ComputeScrollbarThumbColor(
|
||||
aFrame, aStyle, aElementState, aDocumentState, aUseSystemColors);
|
||||
|
||||
// Draw the thumb rect centered in the scrollbar.
|
||||
LayoutDeviceRect thumbRect(aRect);
|
||||
if (aHorizontal) {
|
||||
thumbRect.height *= 0.5f;
|
||||
thumbRect.y += thumbRect.height * 0.5f;
|
||||
} else {
|
||||
thumbRect.width *= 0.5f;
|
||||
thumbRect.x += thumbRect.width * 0.5f;
|
||||
}
|
||||
|
||||
const LayoutDeviceCoord radius =
|
||||
(aHorizontal ? thumbRect.height : thumbRect.width) / 2.0f;
|
||||
PaintRoundedRectWithRadius(aPaintData, thumbRect, color,
|
||||
sRGBColor::White(0.0f), 0.0f, radius / aDpiRatio,
|
||||
aDpiRatio);
|
||||
}
|
||||
|
||||
bool nsNativeBasicThemeAndroid::PaintScrollbarThumb(
|
||||
DrawTarget& aDt, const LayoutDeviceRect& aRect, bool aHorizontal,
|
||||
nsIFrame* aFrame, const ComputedStyle& aStyle,
|
||||
const EventStates& aElementState, const EventStates& aDocumentState,
|
||||
UseSystemColors aUseSystemColors, DPIRatio aDpiRatio) {
|
||||
DoPaintScrollbarThumb(aDt, aRect, aHorizontal, aFrame, aStyle, aElementState,
|
||||
aDocumentState, aUseSystemColors, aDpiRatio);
|
||||
return true;
|
||||
}
|
||||
|
||||
bool nsNativeBasicThemeAndroid::PaintScrollbarThumb(
|
||||
WebRenderBackendData& aWrData, const LayoutDeviceRect& aRect,
|
||||
bool aHorizontal, nsIFrame* aFrame, const ComputedStyle& aStyle,
|
||||
const EventStates& aElementState, const EventStates& aDocumentState,
|
||||
UseSystemColors aUseSystemColors, DPIRatio aDpiRatio) {
|
||||
DoPaintScrollbarThumb(aWrData, aRect, aHorizontal, aFrame, aStyle,
|
||||
aElementState, aDocumentState, aUseSystemColors,
|
||||
aDpiRatio);
|
||||
return true;
|
||||
}
|
||||
|
||||
already_AddRefed<nsITheme> do_GetBasicNativeThemeDoNotUseDirectly() {
|
||||
static mozilla::StaticRefPtr<nsITheme> gInstance;
|
||||
|
|
|
|||
|
|
@ -9,90 +9,10 @@
|
|||
|
||||
#include "nsNativeBasicTheme.h"
|
||||
|
||||
class nsNativeBasicThemeAndroid final : public nsNativeBasicTheme {
|
||||
class nsNativeBasicThemeAndroid : public nsNativeBasicTheme {
|
||||
public:
|
||||
nsNativeBasicThemeAndroid() = default;
|
||||
|
||||
NS_IMETHOD GetMinimumWidgetSize(nsPresContext*, nsIFrame*, StyleAppearance,
|
||||
mozilla::LayoutDeviceIntSize* aResult,
|
||||
bool* aIsOverridable) override;
|
||||
|
||||
ScrollbarSizes GetScrollbarSizes(nsPresContext*, StyleScrollbarWidth,
|
||||
Overlay) override;
|
||||
|
||||
template <typename PaintBackendData>
|
||||
void DoPaintScrollbarThumb(PaintBackendData&, const LayoutDeviceRect& aRect,
|
||||
bool aHorizontal, nsIFrame* aFrame,
|
||||
const ComputedStyle& aStyle,
|
||||
const EventStates& aElementState,
|
||||
const EventStates& aDocumentState, UseSystemColors,
|
||||
DPIRatio);
|
||||
bool PaintScrollbarThumb(DrawTarget&, const LayoutDeviceRect& aRect,
|
||||
bool aHorizontal, nsIFrame* aFrame,
|
||||
const ComputedStyle& aStyle,
|
||||
const EventStates& aElementState,
|
||||
const EventStates& aDocumentState, UseSystemColors,
|
||||
DPIRatio) override;
|
||||
bool PaintScrollbarThumb(WebRenderBackendData&, const LayoutDeviceRect& aRect,
|
||||
bool aHorizontal, nsIFrame* aFrame,
|
||||
const ComputedStyle& aStyle,
|
||||
const EventStates& aElementState,
|
||||
const EventStates& aDocumentState, UseSystemColors,
|
||||
DPIRatio) override;
|
||||
|
||||
bool PaintScrollbarTrack(DrawTarget&, const LayoutDeviceRect& aRect,
|
||||
bool aHorizontal, nsIFrame* aFrame,
|
||||
const ComputedStyle& aStyle,
|
||||
const EventStates& aDocumentState, UseSystemColors,
|
||||
DPIRatio) override {
|
||||
// There's no visible track on android.
|
||||
return true;
|
||||
}
|
||||
bool PaintScrollbarTrack(WebRenderBackendData&, const LayoutDeviceRect& aRect,
|
||||
bool aHorizontal, nsIFrame* aFrame,
|
||||
const ComputedStyle& aStyle,
|
||||
const EventStates& aDocumentState, UseSystemColors,
|
||||
DPIRatio) override {
|
||||
// There's no visible track on Android.
|
||||
return true;
|
||||
}
|
||||
|
||||
bool PaintScrollbar(DrawTarget&, const LayoutDeviceRect& aRect,
|
||||
bool aHorizontal, nsIFrame* aFrame,
|
||||
const ComputedStyle& aStyle,
|
||||
const EventStates& aElementState,
|
||||
const EventStates& aDocumentState, UseSystemColors,
|
||||
DPIRatio) override {
|
||||
// Draw nothing, we only draw the thumb.
|
||||
return true;
|
||||
}
|
||||
bool PaintScrollbar(WebRenderBackendData&, const LayoutDeviceRect& aRect,
|
||||
bool aHorizontal, nsIFrame* aFrame,
|
||||
const ComputedStyle& aStyle,
|
||||
const EventStates& aElementState,
|
||||
const EventStates& aDocumentState, UseSystemColors,
|
||||
DPIRatio) override {
|
||||
// Draw nothing, we only draw the thumb.
|
||||
return true;
|
||||
}
|
||||
|
||||
bool PaintScrollCorner(DrawTarget&, const LayoutDeviceRect& aRect,
|
||||
nsIFrame* aFrame, const ComputedStyle& aStyle,
|
||||
const EventStates& aDocumentState, UseSystemColors,
|
||||
DPIRatio aDpiRatio) override {
|
||||
// Draw nothing, we only draw the thumb.
|
||||
return true;
|
||||
}
|
||||
bool PaintScrollCorner(WebRenderBackendData&, const LayoutDeviceRect& aRect,
|
||||
nsIFrame* aFrame, const ComputedStyle& aStyle,
|
||||
const EventStates& aDocumentState, UseSystemColors,
|
||||
DPIRatio aDpiRatio) override {
|
||||
// Draw nothing, we only draw the thumb.
|
||||
return true;
|
||||
}
|
||||
|
||||
bool ThemeSupportsScrollbarButtons() override { return false; }
|
||||
|
||||
protected:
|
||||
virtual ~nsNativeBasicThemeAndroid() = default;
|
||||
};
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче