From adeadb6775abfd1999b69a0acf7bfeec4bd2c113 Mon Sep 17 00:00:00 2001
From: Ed Morley <bmo@edmorley.co.uk>
Date: Wed, 11 Jan 2012 01:22:15 +0000
Subject: [PATCH] Backout b9e154713763 (bug 702158) for pgo linux failures

---
 config/system-headers                         |  5 ----
 configure.in                                  |  2 +-
 .../src/nsCanvasRenderingContext2DAzure.cpp   |  2 +-
 gfx/skia/Makefile.in                          | 14 -----------
 gfx/thebes/gfxPlatformGtk.cpp                 | 25 -------------------
 gfx/thebes/gfxPlatformGtk.h                   |  5 ----
 js/src/config/system-headers                  |  5 ----
 7 files changed, 2 insertions(+), 56 deletions(-)

diff --git a/config/system-headers b/config/system-headers
index a4c34167f196..6544f6b7ed03 100644
--- a/config/system-headers
+++ b/config/system-headers
@@ -268,11 +268,6 @@ freetype/ftoutln.h
 freetype/ttnameid.h
 freetype/tttables.h
 freetype/t1tables.h
-freetype/ftlcdfil.h
-freetype/ftsizes.h
-freetype/ftadvanc.h
-freetype/ftbitmap.h
-freetype/ftxf86.h
 fribidi/fribidi.h
 FSp_fopen.h
 fstream
diff --git a/configure.in b/configure.in
index afb83cf82adb..21f3fb702e90 100644
--- a/configure.in
+++ b/configure.in
@@ -7997,7 +7997,7 @@ dnl ========================================================
 dnl Graphics checks.
 dnl ========================================================
 
-if test "${OS_ARCH}" = "Darwin" -o "${MOZ_WIDGET_TOOLKIT}" = "android" -o "${MOZ_WIDGET_TOOLKIT}" = "gtk2"; then
+if test "${OS_ARCH}" = "Darwin" -o "${MOZ_WIDGET_TOOLKIT}" = "android"; then
 MOZ_ENABLE_SKIA=1
 else
 MOZ_ENABLE_SKIA=
diff --git a/content/canvas/src/nsCanvasRenderingContext2DAzure.cpp b/content/canvas/src/nsCanvasRenderingContext2DAzure.cpp
index d9c5a8619820..866fc655cc2c 100644
--- a/content/canvas/src/nsCanvasRenderingContext2DAzure.cpp
+++ b/content/canvas/src/nsCanvasRenderingContext2DAzure.cpp
@@ -995,7 +995,7 @@ NS_NewCanvasRenderingContext2DAzure(nsIDOMCanvasRenderingContext2D** aResult)
       !Preferences::GetBool("gfx.canvas.azure.prefer-skia", false)) {
     return NS_ERROR_NOT_AVAILABLE;
   }
-#elif !defined(XP_MACOSX) && !defined(ANDROID) && !defined(XP_LINUX)
+#elif !defined(XP_MACOSX) && !defined(ANDROID)
   return NS_ERROR_NOT_AVAILABLE;
 #endif
 
diff --git a/gfx/skia/Makefile.in b/gfx/skia/Makefile.in
index 2ead7b8ea2c4..1a41171fa19c 100644
--- a/gfx/skia/Makefile.in
+++ b/gfx/skia/Makefile.in
@@ -68,7 +68,6 @@ VPATH += \
 	$(srcdir)/src/ports \
 	$(srcdir)/src/opts \
 	$(srcdir)/src/effects \
-	$(srcdir)/src/utils \
 	$(NULL)
 
 EXPORTS_skia = \
@@ -320,19 +319,6 @@ DEFINES += -DSK_BUILD_FOR_ANDROID_NDK
 OS_CXXFLAGS += $(CAIRO_FT_CFLAGS)
 endif
 
-ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT))
-CPPSRCS += \
-	SkFontHost_FreeType.cpp \
-	SkFontHost_linux.cpp \
-	SkFontHost_gamma.cpp \
-	SkTime_Unix.cpp \
-	SkMMapStream.cpp \
-	SkOSFile.cpp \
-	$(NULL)
-
-OS_CXXFLAGS += $(MOZ_PANGO_CFLAGS)
-endif
-
 ifeq (windows,$(MOZ_WIDGET_TOOLKIT))
 EXPORTS_skia += \
 	include/config/sk_stdint.h \
diff --git a/gfx/thebes/gfxPlatformGtk.cpp b/gfx/thebes/gfxPlatformGtk.cpp
index c3614d8ccbe4..94e5ab27e8e0 100644
--- a/gfx/thebes/gfxPlatformGtk.cpp
+++ b/gfx/thebes/gfxPlatformGtk.cpp
@@ -56,8 +56,6 @@
 #include "gfxFT2Fonts.h"
 #endif
 
-#include "mozilla/gfx/2D.h"
-
 #include "cairo.h"
 #include <gtk/gtk.h>
 
@@ -85,9 +83,6 @@
 #include FT_FREETYPE_H
 #endif
 
-using namespace mozilla;
-using namespace mozilla::gfx;
-
 gfxFontconfigUtils *gfxPlatformGtk::sFontconfigUtils = nsnull;
 
 #ifndef MOZ_PANGO
@@ -766,23 +761,3 @@ gfxPlatformGtk::GetGdkDrawable(gfxASurface *target)
 
     return NULL;
 }
-
-RefPtr<ScaledFont>
-gfxPlatformGtk::GetScaledFontForFont(gfxFont *aFont)
-{
-  NativeFont nativeFont;
-  nativeFont.mType = NATIVE_FONT_SKIA_FONT_FACE;
-  nativeFont.mFont = aFont;
-  RefPtr<ScaledFont> scaledFont =
-    Factory::CreateScaledFontForNativeFont(nativeFont, aFont->GetAdjustedSize());
-
-  return scaledFont;
-}
-
-bool
-gfxPlatformGtk::SupportsAzure(BackendType& aBackend)
-{
-  aBackend = BACKEND_SKIA;
-  return true;
-}
-
diff --git a/gfx/thebes/gfxPlatformGtk.h b/gfx/thebes/gfxPlatformGtk.h
index 2ec617c19c1f..b383f30d7afd 100644
--- a/gfx/thebes/gfxPlatformGtk.h
+++ b/gfx/thebes/gfxPlatformGtk.h
@@ -66,11 +66,6 @@ public:
     already_AddRefed<gfxASurface> CreateOffscreenSurface(const gfxIntSize& size,
                                                          gfxASurface::gfxContentType contentType);
 
-    mozilla::RefPtr<mozilla::gfx::ScaledFont>
-      GetScaledFontForFont(gfxFont *aFont);
-
-    virtual bool SupportsAzure(mozilla::gfx::BackendType& aBackend);
-
     nsresult GetFontList(nsIAtom *aLangGroup,
                          const nsACString& aGenericFamily,
                          nsTArray<nsString>& aListOfFonts);
diff --git a/js/src/config/system-headers b/js/src/config/system-headers
index a4c34167f196..6544f6b7ed03 100644
--- a/js/src/config/system-headers
+++ b/js/src/config/system-headers
@@ -268,11 +268,6 @@ freetype/ftoutln.h
 freetype/ttnameid.h
 freetype/tttables.h
 freetype/t1tables.h
-freetype/ftlcdfil.h
-freetype/ftsizes.h
-freetype/ftadvanc.h
-freetype/ftbitmap.h
-freetype/ftxf86.h
 fribidi/fribidi.h
 FSp_fopen.h
 fstream