Bug 1640293 - Remove EARLY_BETA_OR_EARLIER conditional, so that word-cache expiration is enabled for all builds. r=lsalzman
authorJonathan Kew <jkew@mozilla.com>
Fri, 22 May 2020 21:52:27 +0000
changeset 531723 2a12cb31119ac2820e2b3240940147be24d49557
parent 531722 519535f418ad8c35529c565d43996f5597d00bca
child 531724 4c08b1cd8604b8c35cbaad4fbe5afdbae9d6bce9
push id37442
push userncsoregi@mozilla.com
push dateSat, 23 May 2020 09:21:24 +0000
treeherdermozilla-central@bbcc193fe0f0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerslsalzman
bugs1640293
milestone78.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1640293 - Remove EARLY_BETA_OR_EARLIER conditional, so that word-cache expiration is enabled for all builds. r=lsalzman Differential Revision: https://phabricator.services.mozilla.com/D76553
gfx/thebes/gfxFont.cpp
--- a/gfx/thebes/gfxFont.cpp
+++ b/gfx/thebes/gfxFont.cpp
@@ -178,30 +178,25 @@ void gfxFontCache::Shutdown() {
 
 gfxFontCache::gfxFontCache(nsIEventTarget* aEventTarget)
     : gfxFontCacheExpirationTracker(aEventTarget) {
   nsCOMPtr<nsIObserverService> obs = GetObserverService();
   if (obs) {
     obs->AddObserver(new Observer, "memory-pressure", false);
   }
 
-#ifdef EARLY_BETA_OR_EARLIER
-  // Currently disabled for release builds, due to unexplained crashes
-  // during expiration; see bug 717175 & 894798.
-  // Bug 1548661: enabled for early beta, to see what crash-stats shows.
   nsIEventTarget* target = nullptr;
   if (XRE_IsContentProcess() && NS_IsMainThread()) {
     target = aEventTarget;
   }
   NS_NewTimerWithFuncCallback(getter_AddRefs(mWordCacheExpirationTimer),
                               WordCacheExpirationTimerCallback, this,
                               SHAPED_WORD_TIMEOUT_SECONDS * 1000,
                               nsITimer::TYPE_REPEATING_SLACK,
                               "gfxFontCache::gfxFontCache", target);
-#endif
 }
 
 gfxFontCache::~gfxFontCache() {
   // Ensure the user font cache releases its references to font entries,
   // so they aren't kept alive after the font instances and font-list
   // have been shut down.
   gfxUserFontSet::UserFontCache::Shutdown();