From c7d766dbc78a7c2649db68afb630db1cdf557dcf Mon Sep 17 00:00:00 2001
From: Jonathan Watt <jwatt@jwatt.org>
Date: Thu, 19 May 2016 14:01:31 +0100
Subject: [PATCH] Bug 1275266 - Fix broken merge conflict. r=orange on CLOSED
 TREE

---
 gfx/thebes/gfxWindowsPlatform.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gfx/thebes/gfxWindowsPlatform.cpp b/gfx/thebes/gfxWindowsPlatform.cpp
index d78a7ec9bcd5..546c76e26717 100755
--- a/gfx/thebes/gfxWindowsPlatform.cpp
+++ b/gfx/thebes/gfxWindowsPlatform.cpp
@@ -464,10 +464,10 @@ gfxWindowsPlatform::HandleDeviceReset()
   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();