From cf9c5e0706519302ccaecc73c397056557412f33 Mon Sep 17 00:00:00 2001 From: Nicolas Silva Date: Mon, 4 Nov 2019 14:11:22 +0000 Subject: [PATCH] Bug 1584101 - Temporarily disable resource cache leak checks. r=jrmuizel Bug 1593013 was filed to reenable them. Differential Revision: https://phabricator.services.mozilla.com/D51284 --HG-- extra : moz-landing-system : lando --- gfx/wr/webrender/Cargo.toml | 1 + gfx/wr/webrender/src/resource_cache.rs | 17 ++++++++++++----- gfx/wr/wrench/Cargo.toml | 2 +- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/gfx/wr/webrender/Cargo.toml b/gfx/wr/webrender/Cargo.toml index 3910c95f4f84..10c866958720 100644 --- a/gfx/wr/webrender/Cargo.toml +++ b/gfx/wr/webrender/Cargo.toml @@ -18,6 +18,7 @@ replay = ["api/deserialize", "ron", "serde", "smallvec/serde"] display_list_stats = ["api/display_list_stats"] serialize_program = ["serde", "webrender_build/serialize_program"] no_static_freetype = [] +leak_checks = [] [build-dependencies] webrender_build = { version = "0.0.1", path = "../webrender_build" } diff --git a/gfx/wr/webrender/src/resource_cache.rs b/gfx/wr/webrender/src/resource_cache.rs index 05c15620cdd4..a9aa8dab7c7f 100644 --- a/gfx/wr/webrender/src/resource_cache.rs +++ b/gfx/wr/webrender/src/resource_cache.rs @@ -1958,11 +1958,18 @@ impl ResourceCache { self.delete_image_template(key); } - let blob_f = |key: &BlobImageKey| { f(&key.as_image()) }; - debug_assert!(!self.resources.image_templates.images.keys().any(&f)); - debug_assert!(!self.cached_images.resources.keys().any(&f)); - debug_assert!(!self.blob_image_templates.keys().any(&blob_f)); - debug_assert!(!self.rasterized_blob_images.keys().any(&blob_f)); + #[cfg(features="leak_checks")] + let check_leaks = true; + #[cfg(not(features="leak_checks"))] + let check_leaks = false; + + if check_leaks { + let blob_f = |key: &BlobImageKey| { f(&key.as_image()) }; + assert!(!self.resources.image_templates.images.keys().any(&f)); + assert!(!self.cached_images.resources.keys().any(&f)); + assert!(!self.blob_image_templates.keys().any(&blob_f)); + assert!(!self.rasterized_blob_images.keys().any(&blob_f)); + } } } diff --git a/gfx/wr/wrench/Cargo.toml b/gfx/wr/wrench/Cargo.toml index f1dd38cb13ee..65d2232825d1 100644 --- a/gfx/wr/wrench/Cargo.toml +++ b/gfx/wr/wrench/Cargo.toml @@ -25,7 +25,7 @@ time = "0.1" crossbeam = "0.2" osmesa-sys = { version = "0.1.2", optional = true } osmesa-src = { git = "https://github.com/servo/osmesa-src", optional = true } -webrender = {path = "../webrender", features=["capture","replay","debugger","png","profiler","no_static_freetype"]} +webrender = {path = "../webrender", features=["capture","replay","debugger","png","profiler","no_static_freetype", "leak_checks"]} webrender_api = {path = "../webrender_api", features=["serialize","deserialize"]} winit = "0.19" serde = {version = "1.0", features = ["derive"] }