From 8ae1282ff9fe261b293fb7cc6b5ed3cb6363677e Mon Sep 17 00:00:00 2001 From: Chris Jones Date: Thu, 19 Aug 2010 19:04:21 -0500 Subject: [PATCH] Backed out changeset b3e968d831ec --- gfx/thebes/gfxPlatform.cpp | 9 --------- gfx/thebes/gfxPlatform.h | 8 +------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/gfx/thebes/gfxPlatform.cpp b/gfx/thebes/gfxPlatform.cpp index 4b7c86ed289..9e480553b04 100644 --- a/gfx/thebes/gfxPlatform.cpp +++ b/gfx/thebes/gfxPlatform.cpp @@ -238,15 +238,6 @@ gfxPlatform::Init() if (!gPlatform) return NS_ERROR_OUT_OF_MEMORY; - gPlatform->mScreenReferenceSurface = - gPlatform->CreateOffscreenSurface(gfxIntSize(1,1), - gfxASurface::ImageFormatARGB32); - if (!gPlatform->mScreenReferenceSurface) { - NS_ERROR("Could not initialize mScreenReferenceSurface"); - Shutdown(); - return NS_ERROR_OUT_OF_MEMORY; - } - nsresult rv; #if defined(XP_MACOSX) || defined(XP_WIN) || defined(ANDROID) // temporary, until this is implemented on others diff --git a/gfx/thebes/gfxPlatform.h b/gfx/thebes/gfxPlatform.h index f1f3ff413b7..14883c79fb8 100644 --- a/gfx/thebes/gfxPlatform.h +++ b/gfx/thebes/gfxPlatform.h @@ -339,12 +339,6 @@ public: virtual void FontsPrefsChanged(nsIPrefBranch *aPrefBranch, const char *aPref); - /** - * Returns a 1x1 surface that can be used to create graphics contexts - * for measuring text etc as if they will be rendered to the screen - */ - gfxASurface* ScreenReferenceSurface() { return mScreenReferenceSurface; } - protected: gfxPlatform(); virtual ~gfxPlatform(); @@ -362,8 +356,8 @@ protected: private: virtual qcms_profile* GetPlatformCMSOutputProfile(); - nsRefPtr mScreenReferenceSurface; nsTArray mCJKPrefLangs; + nsCOMPtr overrideObserver; };