diff -r 000000000000 -r 6474c204b198 gfx/layers/LayersLogging.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gfx/layers/LayersLogging.h	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,118 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef GFX_LAYERSLOGGING_H
+#define GFX_LAYERSLOGGING_H
+
+#include "FrameMetrics.h"               // for FrameMetrics, etc
+#include "GraphicsFilter.h"             // for GraphicsFilter
+#include "mozilla/gfx/Point.h"          // for IntSize, etc
+#include "mozilla/gfx/Types.h"          // for Filter, SurfaceFormat
+#include "mozilla/layers/CompositorTypes.h"  // for TextureFlags
+#include "nsAString.h"
+#include "nsPrintfCString.h"            // for nsPrintfCString
+#include "nsRegion.h"                   // for nsIntRegion
+#include "nscore.h"                     // for nsACString, etc
+
+class gfx3DMatrix;
+struct gfxRGBA;
+struct nsIntPoint;
+struct nsIntRect;
+struct nsIntSize;
+
+namespace mozilla {
+namespace gfx {
+class Matrix4x4;
+template <class units> struct RectTyped;
+}
+
+namespace layers {
+
+nsACString&
+AppendToString(nsACString& s, const void* p,
+               const char* pfx="", const char* sfx="");
+
+nsACString&
+AppendToString(nsACString& s, const GraphicsFilter& f,
+               const char* pfx="", const char* sfx="");
+
+nsACString&
+AppendToString(nsACString& s, FrameMetrics::ViewID n,
+               const char* pfx="", const char* sfx="");
+
+nsACString&
+AppendToString(nsACString& s, const gfxRGBA& c,
+               const char* pfx="", const char* sfx="");
+
+nsACString&
+AppendToString(nsACString& s, const gfx3DMatrix& m,
+               const char* pfx="", const char* sfx="");
+
+nsACString&
+AppendToString(nsACString& s, const nsIntPoint& p,
+               const char* pfx="", const char* sfx="");
+
+template<class T>
+nsACString&
+AppendToString(nsACString& s, const mozilla::gfx::PointTyped<T>& p,
+               const char* pfx="", const char* sfx="")
+{
+  s += pfx;
+  s += nsPrintfCString("(x=%f, y=%f)", p.x, p.y);
+  return s += sfx;
+}
+
+nsACString&
+AppendToString(nsACString& s, const nsIntRect& r,
+               const char* pfx="", const char* sfx="");
+
+template<class T>
+nsACString&
+AppendToString(nsACString& s, const mozilla::gfx::RectTyped<T>& r,
+               const char* pfx="", const char* sfx="")
+{
+  s += pfx;
+  s.AppendPrintf(
+    "(x=%f, y=%f, w=%f, h=%f)",
+    r.x, r.y, r.width, r.height);
+  return s += sfx;
+}
+
+nsACString&
+AppendToString(nsACString& s, const nsIntRegion& r,
+               const char* pfx="", const char* sfx="");
+
+nsACString&
+AppendToString(nsACString& s, const nsIntSize& sz,
+               const char* pfx="", const char* sfx="");
+
+nsACString&
+AppendToString(nsACString& s, const FrameMetrics& m,
+               const char* pfx="", const char* sfx="");
+
+nsACString&
+AppendToString(nsACString& s, const mozilla::gfx::IntSize& size,
+               const char* pfx="", const char* sfx="");
+
+nsACString&
+AppendToString(nsACString& s, const mozilla::gfx::Matrix4x4& m,
+               const char* pfx="", const char* sfx="");
+
+nsACString&
+AppendToString(nsACString& s, const mozilla::gfx::Filter filter,
+               const char* pfx="", const char* sfx="");
+
+nsACString&
+AppendToString(nsACString& s, mozilla::layers::TextureFlags flags,
+               const char* pfx="", const char* sfx="");
+
+nsACString&
+AppendToString(nsACString& s, mozilla::gfx::SurfaceFormat format,
+               const char* pfx="", const char* sfx="");
+
+} // namespace
+} // namespace
+
+#endif /* GFX_LAYERSLOGGING_H */