Bug 1524687: Follow-up: Work around continued sporatic Windows PGO bustage. r=bustage
☠☠ backed out by 3b1b94e39795 ☠ ☠
authorKris Maglione <maglione.k@gmail.com>
Wed, 13 Feb 2019 22:59:04 -0800
changeset 517002 68a001a42406
parent 517001 a0752d7e8073
child 517003 3b1b94e39795
push id10862
push userffxbld-merge
push dateMon, 11 Mar 2019 13:01:11 +0000
treeherdermozilla-beta@a2e7f5c935da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage
bugs1524687
milestone67.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 1524687: Follow-up: Work around continued sporatic Windows PGO bustage. r=bustage
gfx/thebes/gfxPlatform.cpp
--- a/gfx/thebes/gfxPlatform.cpp
+++ b/gfx/thebes/gfxPlatform.cpp
@@ -1543,16 +1543,20 @@ void gfxPlatform::ComputeTileSize() {
 
   gfxVars::SetTileSize(IntSize(w, h));
 }
 
 void gfxPlatform::PopulateScreenInfo() {
   nsCOMPtr<nsIScreenManager> manager =
       do_GetService("@mozilla.org/gfx/screenmanager;1");
   MOZ_ASSERT(manager, "failed to get nsIScreenManager");
+  if (!manager) {
+    // This can happen in xpcshell, for instance
+    return;
+  }
 
   nsCOMPtr<nsIScreen> screen;
   manager->GetPrimaryScreen(getter_AddRefs(screen));
   if (!screen) {
     // This can happen in xpcshell, for instance
     return;
   }