Backed out 3 changesets (bug 1000170, bug 1000370) for landing with the wrong patch author.

Backed out changeset a3f42079e69c (bug 1000370)
Backed out changeset e4e33370b648 (bug 1000170)
Backed out changeset bca2faf314bf (bug 1000170)

gfx/layers/client/ClientTiledThebesLayer.h

@@ -44,9 +44,6 @@ public:
   ClientTiledThebesLayer(ClientLayerManager* const aManager);
   ~ClientTiledThebesLayer();
 
-  // Override name to distinguish it from ClientThebesLayer in layer dumps
-  virtual const char* Name() const { return "TiledThebesLayer"; }
-
   // Thebes Layer
   virtual Layer* AsLayer() { return this; }
   virtual void InvalidateRegion(const nsIntRegion& aRegion) {

gfx/layers/composite/TiledContentHost.h

@@ -47,6 +47,7 @@ class Compositor;
 class ISurfaceAllocator;
 class Layer;
 class ThebesBufferData;
+class TiledThebesLayerComposite;
 struct EffectChain;
 
 

gfx/thebes/gfxFont.cpp

@@ -2031,9 +2031,6 @@ gfxFont::~gfxFont()
 gfxFloat
 gfxFont::GetGlyphHAdvance(gfxContext *aCtx, uint16_t aGID)
 {
-    if (!SetupCairoFont(aCtx)) {
-        return 0;
-    }
     if (ProvidesGlyphWidths()) {
         return GetGlyphWidth(aCtx, aGID) / 65536.0;
     }
@@ -2047,7 +2044,7 @@ gfxFont::GetGlyphHAdvance(gfxContext *aCtx, uint16_t aGID)
     }
     gfxHarfBuzzShaper* shaper =
         static_cast<gfxHarfBuzzShaper*>(mHarfBuzzShaper.get());
-    if (!shaper->Initialize()) {
+    if (!shaper->Initialize() || !SetupCairoFont(aCtx)) {
         return 0;
     }
     return shaper->GetGlyphHAdvance(aCtx, aGID) / 65536.0;