From b1acf344609a2e4d8288506783ae259c8b7393c2 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Wed, 23 Apr 2014 14:20:54 -0700
Subject: [PATCH] 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 | 3 ---
 gfx/layers/composite/TiledContentHost.h    | 1 +
 gfx/thebes/gfxFont.cpp                     | 5 +----
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/gfx/layers/client/ClientTiledThebesLayer.h b/gfx/layers/client/ClientTiledThebesLayer.h
index 0fe80f91c0ba..f021d3305663 100644
--- a/gfx/layers/client/ClientTiledThebesLayer.h
+++ b/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) {
diff --git a/gfx/layers/composite/TiledContentHost.h b/gfx/layers/composite/TiledContentHost.h
index 5d73a98637d1..18a38d22cff1 100644
--- a/gfx/layers/composite/TiledContentHost.h
+++ b/gfx/layers/composite/TiledContentHost.h
@@ -47,6 +47,7 @@ class Compositor;
 class ISurfaceAllocator;
 class Layer;
 class ThebesBufferData;
+class TiledThebesLayerComposite;
 struct EffectChain;
 
 
diff --git a/gfx/thebes/gfxFont.cpp b/gfx/thebes/gfxFont.cpp
index 7023415d12b0..c4fcb932bf7d 100644
--- a/gfx/thebes/gfxFont.cpp
+++ b/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;