From 5070b17ee709461f8373f572166f972a2faac0b4 Mon Sep 17 00:00:00 2001 From: Alexis Beingessner Date: Thu, 1 Feb 2018 14:00:26 -0500 Subject: [PATCH] Bug 1362115 - turn on blob-images by default with webrender. r=kats MozReview-Commit-ID: GH4Ukj01rJ5 --HG-- extra : rebase_source : 7022cb76018ae06147e257ed3854352627687031 --- .../webcompat-reporter/content/WebCompatReporter.jsm | 2 +- layout/reftests/invalidation/reftest.list | 12 ++++++------ layout/reftests/svg/as-image/reftest.list | 4 ++-- layout/reftests/svg/reftest.list | 4 ++-- layout/reftests/svg/smil/transform/reftest.list | 2 +- .../svg/svg-integration/clip-path/reftest.list | 2 +- layout/reftests/text-stroke/reftest.list | 2 +- layout/reftests/text-svgglyphs/reftest.list | 2 +- modules/libpref/init/all.js | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/browser/extensions/webcompat-reporter/content/WebCompatReporter.jsm b/browser/extensions/webcompat-reporter/content/WebCompatReporter.jsm index cbe5fa2db1ed..681281d9d208 100644 --- a/browser/extensions/webcompat-reporter/content/WebCompatReporter.jsm +++ b/browser/extensions/webcompat-reporter/content/WebCompatReporter.jsm @@ -21,7 +21,7 @@ XPCOMUtils.defineLazyGetter(this, "wcStrings", function() { // Gather values for prefs we want to appear in reports. let prefs = {}; XPCOMUtils.defineLazyPreferenceGetter(prefs, "gfx.webrender.all", "gfx.webrender.all", false); -XPCOMUtils.defineLazyPreferenceGetter(prefs, "gfx.webrender.blob-images", "gfx.webrender.blob-images", 2); +XPCOMUtils.defineLazyPreferenceGetter(prefs, "gfx.webrender.blob-images", "gfx.webrender.blob-images", 1); XPCOMUtils.defineLazyPreferenceGetter(prefs, "gfx.webrender.enabled", "gfx.webrender.enabled", false); XPCOMUtils.defineLazyPreferenceGetter(prefs, "image.mem.shared", "image.mem.shared", 2); XPCOMUtils.defineLazyPreferenceGetter(prefs, "layout.css.servo.enabled", "layout.css.servo.enabled", false); diff --git a/layout/reftests/invalidation/reftest.list b/layout/reftests/invalidation/reftest.list index 2a53d73072d0..4f1c59bcb83e 100644 --- a/layout/reftests/invalidation/reftest.list +++ b/layout/reftests/invalidation/reftest.list @@ -43,14 +43,14 @@ pref(layout.animated-image-layers.enabled,true) skip-if(Android||gtkWidget) == t == filter-userspace-offset.svg?offsetContainer=rect&filter=matrix-fillPaint-boundingBox filter-userspace-offset.svg == filter-userspace-offset.svg?offsetContainer=rect&filter=matrix-fillPaint-userSpace-at100 filter-userspace-offset.svg -!= scroll-inactive-layers.html about:blank -!= scroll-inactive-layers-2.html about:blank +fails-if(webrender) != scroll-inactive-layers.html about:blank +fails-if(webrender) != scroll-inactive-layers-2.html about:blank != inactive-layertree-visible-region-1.html about:blank != inactive-layertree-visible-region-2.html about:blank -!= transform-floating-point-invalidation.html about:blank -!= transform-floating-point-invalidation.html?reverse about:blank -!= nudge-to-integer-invalidation.html about:blank -!= nudge-to-integer-invalidation.html?reverse about:blank +fails-if(webrender) != transform-floating-point-invalidation.html about:blank +fails-if(webrender) != transform-floating-point-invalidation.html?reverse about:blank +fails-if(webrender) != nudge-to-integer-invalidation.html about:blank +fails-if(webrender) != nudge-to-integer-invalidation.html?reverse about:blank != clipped-animated-transform-1.html about:blank != paintedlayer-recycling-1.html about:blank != paintedlayer-recycling-2.html about:blank diff --git a/layout/reftests/svg/as-image/reftest.list b/layout/reftests/svg/as-image/reftest.list index a976ef2e050a..018d3a2b6bb4 100644 --- a/layout/reftests/svg/as-image/reftest.list +++ b/layout/reftests/svg/as-image/reftest.list @@ -174,8 +174,8 @@ fuzzy-if(skiaContent,255,10) == img-novb-width-slice-1.html img-novb-width-al == svg-image-simple-3.svg lime100x100.svg # tests for files that include themselves as an -fuzzy-if(webrender,1-1,4-4) == svg-image-recursive-1a.svg svg-image-recursive-1-ref.svg -fuzzy-if(webrender,1-1,4-4) == svg-image-recursive-1b.svg svg-image-recursive-1-ref.svg +== svg-image-recursive-1a.svg svg-image-recursive-1-ref.svg +== svg-image-recursive-1b.svg svg-image-recursive-1-ref.svg == svg-image-recursive-2a.svg svg-image-recursive-2-ref.svg == svg-image-recursive-2b.html svg-image-recursive-2-ref.svg diff --git a/layout/reftests/svg/reftest.list b/layout/reftests/svg/reftest.list index 33ffab419415..f8939cedc72a 100644 --- a/layout/reftests/svg/reftest.list +++ b/layout/reftests/svg/reftest.list @@ -335,7 +335,7 @@ fuzzy-if(skiaContent,7,175) == outline.html outline-ref.html == paint-on-maskLayer-1b.html paint-on-maskLayer-1-ref.html == paint-on-maskLayer-1c.html paint-on-maskLayer-1-ref.html pref(svg.paint-order.enabled,true) == paint-order-01.svg paint-order-01-ref.svg -pref(svg.paint-order.enabled,true) fuzzy-if(webrender,1-1,112-112) == paint-order-02.svg paint-order-02-ref.svg +pref(svg.paint-order.enabled,true) == paint-order-02.svg paint-order-02-ref.svg pref(svg.paint-order.enabled,true) == paint-order-03.svg paint-order-03-ref.svg #fuzzy(23,60) fails-if(d2d) == path-01.svg path-01-ref.svg @@ -415,7 +415,7 @@ fuzzy-if(skiaContent,1,340) == stroke-dasharray-03.svg pass.svg == style-property-on-script-element-01.svg pass.svg == style-without-type-attribute.svg pass.svg -fuzzy-if(webrender,1-1,262-262) == svg-in-foreignObject-01.xhtml svg-in-foreignObject-01-ref.xhtml +== svg-in-foreignObject-01.xhtml svg-in-foreignObject-01-ref.xhtml fuzzy-if(skiaContent,1,2600) == svg-in-foreignObject-02.xhtml svg-in-foreignObject-01-ref.xhtml # reuse -01-ref.xhtml == svg-in-inner-svg-dimensions.svg pass.svg == switch-01.svg pass.svg diff --git a/layout/reftests/svg/smil/transform/reftest.list b/layout/reftests/svg/smil/transform/reftest.list index 287143c4df2c..72b8b79998c0 100644 --- a/layout/reftests/svg/smil/transform/reftest.list +++ b/layout/reftests/svg/smil/transform/reftest.list @@ -9,7 +9,7 @@ fuzzy-if(skiaContent,7,90) == rotate-angle-2.svg rotate-angle-ref.svg fuzzy-if(skiaContent,7,130) == rotate-angle-3.svg rotate-angle-ref.svg fuzzy-if(skiaContent,7,90) == rotate-angle-4.svg rotate-angle-ref.svg fuzzy-if(skiaContent,7,60) == rotate-angle-5.svg rotate-angle-ref.svg -fuzzy(12,27) fuzzy-if(skiaContent,1,180) fuzzy-if(Android,16,3) fuzzy-if(webrender,7-7,306-306) == scale-1.svg scale-1-ref.svg # bug 981004 +fuzzy(12,27) fuzzy-if(skiaContent,1,180) fuzzy-if(Android,16,3) == scale-1.svg scale-1-ref.svg # bug 981004 == set-transform-1.svg lime.svg fuzzy-if(winWidget||gtkWidget||OSX,1,27) fuzzy-if(skiaContent,7,1548) == skew-1.svg skew-1-ref.svg # bug 983671, Bug 1260629 == translate-clipPath-1.svg lime.svg diff --git a/layout/reftests/svg/svg-integration/clip-path/reftest.list b/layout/reftests/svg/svg-integration/clip-path/reftest.list index e7484a5a2230..88de49840a04 100644 --- a/layout/reftests/svg/svg-integration/clip-path/reftest.list +++ b/layout/reftests/svg/svg-integration/clip-path/reftest.list @@ -56,6 +56,6 @@ fuzzy(64,146) == clip-path-inset-002b.html clip-path-inset-002-ref.html fuzzy(64,146) == clip-path-inset-002c.html clip-path-inset-002-ref.html fuzzy(64,340) fuzzy-if(webrender,72-72,292-292) == clip-path-inset-003.html clip-path-inset-003-ref.html -fuzzy-if(webrender,4-4,304-304) == clip-path-stroke-001.html clip-path-stroke-001-ref.html +== clip-path-stroke-001.html clip-path-stroke-001-ref.html == clip-path-transform-001.html clip-path-transform-001-ref.html diff --git a/layout/reftests/text-stroke/reftest.list b/layout/reftests/text-stroke/reftest.list index 944141a59119..08ccd495d914 100644 --- a/layout/reftests/text-stroke/reftest.list +++ b/layout/reftests/text-stroke/reftest.list @@ -3,7 +3,7 @@ default-preferences pref(layout.css.prefixes.webkit,true) fuzzy-if(gtkWidget,255,20) fuzzy-if(winWidget,20,10) fails-if(skiaContent&&(gtkWidget||winWidget)) == webkit-text-stroke-property-001.html webkit-text-stroke-property-001-ref.html -fuzzy-if(gtkWidget,255,20) fuzzy-if(winWidget,20,10) fails-if(skiaContent&&(gtkWidget||winWidget)) == webkit-text-stroke-property-002.html webkit-text-stroke-property-002-ref.html +fuzzy-if(gtkWidget,255,20) fuzzy-if(winWidget,20,10) fails-if(skiaContent&&!webrender&&(gtkWidget||winWidget)) == webkit-text-stroke-property-002.html webkit-text-stroke-property-002-ref.html fuzzy-if(gtkWidget,255,20) fuzzy-if(winWidget,20,10) fails-if(skiaContent&&(gtkWidget||winWidget)) == webkit-text-stroke-property-003.html webkit-text-stroke-property-003-ref.html fuzzy-if(gtkWidget,255,20) fuzzy-if(winWidget,20,10) fails-if(skiaContent&&(gtkWidget||winWidget)) == webkit-text-stroke-property-004.html webkit-text-stroke-property-004-ref.html fuzzy-if(gtkWidget,255,20) fuzzy-if(winWidget,20,10) fails-if(skiaContent&&(gtkWidget||winWidget)) == webkit-text-stroke-property-005.html webkit-text-stroke-property-005-ref.html diff --git a/layout/reftests/text-svgglyphs/reftest.list b/layout/reftests/text-svgglyphs/reftest.list index 781e98718210..3c4eaa47a576 100644 --- a/layout/reftests/text-svgglyphs/reftest.list +++ b/layout/reftests/text-svgglyphs/reftest.list @@ -9,7 +9,7 @@ pref(gfx.font_rendering.opentype_svg.enabled,true) == svg-glyph-invalid.html pref(gfx.font_rendering.opentype_svg.enabled,true) == svg-glyph-objectfill-solid.svg svg-glyph-objectfill-solid-ref.svg pref(gfx.font_rendering.opentype_svg.enabled,true) fuzzy-if(skiaContent,2,200) == svg-glyph-objectstroke-solid.svg svg-glyph-objectstroke-solid-ref.svg pref(gfx.font_rendering.opentype_svg.enabled,true) fuzzy(1,7) fuzzy-if(gtkWidget&&/^Linux\x20x86_64/.test(http.oscpu),1,79) fuzzy-if(skiaContent,1,300) == svg-glyph-objectgradient.svg svg-glyph-objectgradient-ref.svg # see bug 871961#c5 -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) fuzzy-if(webrender,128-128,90-90) == svg-glyph-objectgradient-zoom.svg svg-glyph-objectgradient-zoom-ref.svg +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) fuzzy-if(webrender,128-128,90-94) == 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) == 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 diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index 269874d54d80..cb7930dbb06d 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -908,7 +908,7 @@ pref("gfx.webrender.program-binary", true); #endif pref("gfx.webrender.highlight-painted-layers", false); -pref("gfx.webrender.blob-images", 2); +pref("gfx.webrender.blob-images", 1); pref("gfx.webrender.hit-test", true); // WebRender debugging utilities.