From 4f6f7b7336dd020ef20a12788e1f770263c60a17 Mon Sep 17 00:00:00 2001 From: Bogdan Tara Date: Tue, 10 Sep 2019 03:49:53 +0300 Subject: [PATCH] Backed out changeset 3519c255f86e (bug 1284651) for gtest failures CLOSED TREE --- image/SurfaceCache.cpp | 5 ----- modules/libpref/init/StaticPrefList.yaml | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/image/SurfaceCache.cpp b/image/SurfaceCache.cpp index ae24cde6b82a..babdf45c951a 100644 --- a/image/SurfaceCache.cpp +++ b/image/SurfaceCache.cpp @@ -1391,11 +1391,6 @@ void SurfaceCache::Initialize() { uint64_t surfaceCacheMaxSizeKB = StaticPrefs::image_mem_surfacecache_max_size_kb_AtStartup(); - if (sizeof(uintptr_t) <= 4) { - // Limit surface cache to 1 GB if our address space is 32 bit. - surfaceCacheMaxSizeKB = 1024 * 1024; - } - // A knob determining the actual size of the surface cache. Currently the // cache is (size of main memory) / (surface cache size factor) KB // or (surface cache max size) KB, whichever is smaller. The formula diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml index c71cde329164..595a0dd39e21 100644 --- a/modules/libpref/init/StaticPrefList.yaml +++ b/modules/libpref/init/StaticPrefList.yaml @@ -3750,7 +3750,7 @@ # Maximum size for the surface cache, in kilobytes. - name: image.mem.surfacecache.max_size_kb type: uint32_t - value: 2024 * 1024 + value: 1024 * 1024 mirror: once # Minimum timeout for expiring unused images from the surface cache, in