Bug 1120331 - "crash in mozilla::ipc::MessageChannel::Send(IPC::Message*)". r=sotaro

gfx/layers/client/ClientLayerManager.cpp

@@ -712,6 +712,10 @@ ClientLayerManager::ReportClientLost(TextureClient& aClient) {
 void
 ClientLayerManager::ClearCachedResources(Layer* aSubtree)
 {
+  if (mDestroyed) {
+    // ClearCachedResource was already called by ClientLayerManager::Destroy
+    return;
+  }
   MOZ_ASSERT(!HasShadowManager() || !aSubtree);
   mForwarder->ClearCachedResources();
   if (aSubtree) {

gfx/layers/client/ClientLayerManager.h

@@ -45,8 +45,10 @@ public:
 
   virtual void Destroy() MOZ_OVERRIDE
   {
-    LayerManager::Destroy();
+    // It's important to call ClearCachedResource before Destroy because the
+    // former will early-return if the later has already run.
     ClearCachedResources();
+    LayerManager::Destroy();
   }
 
 protected: