Bug 1275266 - Fix broken merge conflict. r=orange on CLOSED TREE
authorJonathan Watt <jwatt@jwatt.org>
Thu, 19 May 2016 14:01:31 +0100
changeset 298847 b306ec471adff16c34c07bfaa322168943031acd
parent 298846 91532055b0e91b75c4b4434f53bca5e789174def
child 298848 cf196c79e5e5b22c35957c08e6d0b3d6fbc2b0e2
push id30285
push usercbook@mozilla.com
push dateWed, 25 May 2016 13:06:07 +0000
treeherdermozilla-central@d6d4e8417d2f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersorange
bugs1275266
milestone49.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 1275266 - Fix broken merge conflict. r=orange on CLOSED TREE
gfx/thebes/gfxWindowsPlatform.cpp
--- a/gfx/thebes/gfxWindowsPlatform.cpp
+++ b/gfx/thebes/gfxWindowsPlatform.cpp
@@ -459,20 +459,20 @@ gfxWindowsPlatform::HandleDeviceReset()
   // Reset local state. Note: we leave feature status variables as-is. They
   // will be recomputed by InitializeDevices().
   mHasDeviceReset = false;
   mHasFakeDeviceReset = false;
   mHasD3D9DeviceReset = false;
   mCompositorD3D11TextureSharingWorks = false;
   mDeviceResetReason = DeviceResetReason::OK;
 
-  imgLoader::Singleton()->NormalLoader(true);
-  imgLoader::Singleton()->NormalLoader(false);
-  imgLoader::Singleton()->PrivateBrowsingLoader(true);
-  imgLoader::Singleton()->PrivateBrowsingLoader(false);
+  imgLoader::NormalLoader()->ClearCache(true);
+  imgLoader::NormalLoader()->ClearCache(false);
+  imgLoader::PrivateBrowsingLoader()->ClearCache(true);
+  imgLoader::PrivateBrowsingLoader()->ClearCache(false);
   gfxAlphaBoxBlur::ShutdownBlurCache();
 
   InitializeDevices();
   UpdateANGLEConfig();
   BumpDeviceCounter();
   return true;
 }