Skip to content

Commit 31e501f

Browse files
author
Razvan Maries
committed
Backed out 3 changesets (bug 1683753) for WebRender bustages. CLOSED TREE
Backed out changeset 9ecf9ce11807 (bug 1683753) Backed out changeset df2921234c95 (bug 1683753) Backed out changeset be651eeda6d3 (bug 1683753)
1 parent 98e1a76 commit 31e501f

File tree

4 files changed

+3
-12
lines changed

4 files changed

+3
-12
lines changed

gfx/wr/webrender/src/texture_cache.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ struct SharedTextures {
235235
alpha8_linear: AllocatorList<ShelfAllocator, TextureParameters>,
236236
alpha16_linear: AllocatorList<SlabAllocator, TextureParameters>,
237237
color8_linear: AllocatorList<ShelfAllocator, TextureParameters>,
238-
color8_glyphs: AllocatorList<ShelfAllocator, TextureParameters>,
238+
color8_glyphs: AllocatorList<BucketedShelfAllocator, TextureParameters>,
239239
}
240240

241241
impl SharedTextures {

gfx/wr/wrench/reftests/border/reftest.list

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ fuzzy(128,69) == border-overlapping-corner.yaml border-overlapping-corner-ref.ya
99
== border-overlapping-edge.yaml border-overlapping-edge-ref.yaml
1010
== border-invisible.yaml border-invisible-ref.yaml
1111
platform(linux,mac) fuzzy(3,80) == border-suite.yaml border-suite.png
12-
platform(linux,mac) fuzzy(8,105) == border-suite-2.yaml border-suite-2.png
12+
platform(linux,mac) fuzzy(8,90) == border-suite-2.yaml border-suite-2.png
1313
platform(linux,mac) fuzzy(1,10) == border-suite-3.yaml border-suite-3.png
1414
skip_on(android,device) == border-double-simple.yaml border-double-simple-ref.yaml # Fails on Pixel2
1515
== border-double-simple-2.yaml border-double-simple-2-ref.yaml

gfx/wr/wrench/reftests/text/reftest.list

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ fuzzy(1,1) platform(linux) == two-shadows.yaml two-shadows.png
6262
== shadow-fast-clip.yaml shadow-fast-clip-ref.yaml
6363
skip_on(android,device) == shadow-partial-glyph.yaml shadow-partial-glyph-ref.yaml # Fails on Pixel2
6464
fuzzy(2,210) platform(linux) == shadow-transforms.yaml shadow-transforms.png
65-
fuzzy(2,320) platform(linux) == raster-space.yaml raster-space.png
65+
fuzzy(1,200) platform(linux) == raster-space.yaml raster-space.png
6666
skip_on(android) skip_on(mac,>=10.14) != allow-subpixel.yaml allow-subpixel-ref.yaml # Android: we don't enable sub-px aa on this platform.
6767
skip_on(android,device) == bg-color.yaml bg-color-ref.yaml # Fails on Pixel2
6868
!= large-glyphs.yaml blank.yaml

gfx/wr/wrench/src/reftest.rs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -509,15 +509,6 @@ impl ReftestManifest {
509509
let reference = paths.pop().unwrap();
510510
let test = paths;
511511

512-
if environment.platform == "android" {
513-
// Add some fuzz on mobile.
514-
// See https://searchfox.org/mozilla-central/rev/a0ccd492719b1ad2106f6456549be62a76f45acb/layout/tools/reftest/reftest.jsm#1192
515-
// First remove the ranges with difference <= 2, otherwise they might cause the
516-
// test to fail before the new range is picked up.
517-
fuzziness.retain(|fuzzy| fuzzy.max_difference > 2);
518-
fuzziness.push(RefTestFuzzy { max_difference: 2, num_differences: std::usize::MAX });
519-
}
520-
521512
// to avoid changing the meaning of existing tests, the case of
522513
// only a single (or no) 'fuzzy' keyword means we use the max
523514
// of that fuzzy and options.allow_.. (we don't want that to

0 commit comments

Comments
 (0)