From 6489c5114d3295f8823ef2826aa6a927f5e6cec0 Mon Sep 17 00:00:00 2001
From: Jerry Shih <hshih@mozilla.com>
Date: Thu, 12 Sep 2013 11:08:50 -0400
Subject: [PATCH] Bug 911730 - Only dump layer tree(using MOZ_LAYERS_HAVE_LOG).
 r=mattwoodrow

---
 gfx/layers/Layers.cpp                         | 4 ++++
 gfx/layers/composite/CanvasLayerComposite.cpp | 2 +-
 gfx/layers/composite/ThebesLayerComposite.cpp | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/gfx/layers/Layers.cpp b/gfx/layers/Layers.cpp
index e6ca8b23d3d..c064f427b01 100644
--- a/gfx/layers/Layers.cpp
+++ b/gfx/layers/Layers.cpp
@@ -1173,9 +1173,13 @@ Layer::Dump(FILE* aFile, const char* aPrefix, bool aDumpHtml)
     fprintf(aFile, ">");
   }
   DumpSelf(aFile, aPrefix);
+
+#ifdef MOZ_DUMP_PAINTING
   if (AsLayerComposite() && AsLayerComposite()->GetCompositableHost()) {
     AsLayerComposite()->GetCompositableHost()->Dump(aFile, aPrefix, aDumpHtml);
   }
+#endif
+
   if (aDumpHtml) {
     fprintf(aFile, "</a>");
   }
diff --git a/gfx/layers/composite/CanvasLayerComposite.cpp b/gfx/layers/composite/CanvasLayerComposite.cpp
index 17b85e1725c..c599d20b3af 100644
--- a/gfx/layers/composite/CanvasLayerComposite.cpp
+++ b/gfx/layers/composite/CanvasLayerComposite.cpp
@@ -106,7 +106,7 @@ CanvasLayerComposite::RenderLayer(const nsIntPoint& aOffset,
 CompositableHost*
 CanvasLayerComposite::GetCompositableHost()
 {
-  if (mImageHost->IsAttached()) {
+  if ( mImageHost && mImageHost->IsAttached()) {
     return mImageHost.get();
   }
 
diff --git a/gfx/layers/composite/ThebesLayerComposite.cpp b/gfx/layers/composite/ThebesLayerComposite.cpp
index c74eb87778a..199fbf544ee 100644
--- a/gfx/layers/composite/ThebesLayerComposite.cpp
+++ b/gfx/layers/composite/ThebesLayerComposite.cpp
@@ -158,7 +158,7 @@ ThebesLayerComposite::RenderLayer(const nsIntPoint& aOffset,
 CompositableHost*
 ThebesLayerComposite::GetCompositableHost()
 {
-  if (mBuffer->IsAttached()) {
+  if ( mBuffer && mBuffer->IsAttached()) {
     return mBuffer.get();
   }