From a64a8df71bcb5aa8b213fc42febcd2e27bf9a533 Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Tue, 5 Nov 2013 20:00:05 +1300
Subject: [PATCH] Backout c99d15a060e2 for causing windows Ru reftest failures.

---
 gfx/2d/2D.h                | 2 +-
 gfx/2d/DrawTargetCairo.cpp | 8 --------
 gfx/2d/DrawTargetCairo.h   | 2 --
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/gfx/2d/2D.h b/gfx/2d/2D.h
index 01dbfaa4a893..9ad93ba05fea 100644
--- a/gfx/2d/2D.h
+++ b/gfx/2d/2D.h
@@ -888,7 +888,7 @@ public:
     return mOpaqueRect;
   }
 
-  virtual void SetPermitSubpixelAA(bool aPermitSubpixelAA) {
+  void SetPermitSubpixelAA(bool aPermitSubpixelAA) {
     mPermitSubpixelAA = aPermitSubpixelAA;
   }
 
diff --git a/gfx/2d/DrawTargetCairo.cpp b/gfx/2d/DrawTargetCairo.cpp
index 0b8c7514bd1a..ef56217e1932 100644
--- a/gfx/2d/DrawTargetCairo.cpp
+++ b/gfx/2d/DrawTargetCairo.cpp
@@ -843,14 +843,6 @@ DrawTargetCairo::Fill(const Path *aPath,
   DrawPattern(aPattern, StrokeOptions(), aOptions, DRAW_FILL);
 }
 
-void
-DrawTargetCairo::SetPermitSubpixelAA(bool aPermitSubpixelAA)
-{
-  DrawTarget::SetPermitSubpixelAA(aPermitSubpixelAA);
-  cairo_surface_set_subpixel_antialiasing(mSurface,
-    aPermitSubpixelAA ? CAIRO_SUBPIXEL_ANTIALIASING_ENABLED : CAIRO_SUBPIXEL_ANTIALIASING_DISABLED);
-}
-
 void
 DrawTargetCairo::FillGlyphs(ScaledFont *aFont,
                             const GlyphBuffer &aBuffer,
diff --git a/gfx/2d/DrawTargetCairo.h b/gfx/2d/DrawTargetCairo.h
index 690ea0d6e812..9308253dff94 100644
--- a/gfx/2d/DrawTargetCairo.h
+++ b/gfx/2d/DrawTargetCairo.h
@@ -60,8 +60,6 @@ public:
   virtual TemporaryRef<SourceSurface> Snapshot();
   virtual IntSize GetSize();
 
-  virtual void SetPermitSubpixelAA(bool aPermitSubpixelAA);
-
   virtual bool LockBits(uint8_t** aData, IntSize* aSize,
                         int32_t* aStride, SurfaceFormat* aFormat);
   virtual void ReleaseBits(uint8_t* aData);