From abf91025d55ceaede84f11e5347ffe059176c91b Mon Sep 17 00:00:00 2001
From: "Carsten \"Tomcat\" Book" <cbook@mozilla.com>
Date: Wed, 12 Jul 2017 10:32:13 +0200
Subject: [PATCH] Backed out changeset 9a0e26964591 (bug 1376964)

---
 gfx/thebes/gfxFontSrcPrincipal.cpp | 33 ---------------------
 gfx/thebes/gfxFontSrcPrincipal.h   | 46 ------------------------------
 gfx/thebes/moz.build               |  2 --
 3 files changed, 81 deletions(-)
 delete mode 100644 gfx/thebes/gfxFontSrcPrincipal.cpp
 delete mode 100644 gfx/thebes/gfxFontSrcPrincipal.h

diff --git a/gfx/thebes/gfxFontSrcPrincipal.cpp b/gfx/thebes/gfxFontSrcPrincipal.cpp
deleted file mode 100644
index 1841ada4ace8..000000000000
--- a/gfx/thebes/gfxFontSrcPrincipal.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "gfxFontSrcPrincipal.h"
-
-#include "nsURIHashKey.h"
-
-gfxFontSrcPrincipal::gfxFontSrcPrincipal(nsIPrincipal* aPrincipal)
-{
-  MOZ_ASSERT(NS_IsMainThread());
-  MOZ_ASSERT(aPrincipal);
-
-  mPrincipal = aPrincipal;
-
-  uint32_t hash = 0;
-  mPrincipal->GetHashValue(&hash);
-  mHash = hash;
-}
-
-gfxFontSrcPrincipal::~gfxFontSrcPrincipal()
-{
-  NS_ReleaseOnMainThread("gfxFontSrcPrincipal::mPrincipal",
-                         mPrincipal.forget());
-}
-
-bool
-gfxFontSrcPrincipal::Equals(gfxFontSrcPrincipal* aOther)
-{
-  return BasePrincipal::Cast(mPrincipal)->
-           FastEquals(BasePrincipal::Cast(aOther->mPrincipal));
-}
diff --git a/gfx/thebes/gfxFontSrcPrincipal.h b/gfx/thebes/gfxFontSrcPrincipal.h
deleted file mode 100644
index 8175a87cc3dc..000000000000
--- a/gfx/thebes/gfxFontSrcPrincipal.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef MOZILLA_GFX_FONTSRCPRINCIPAL_H
-#define MOZILLA_GFX_FONTSRCPRINCIPAL_H
-
-#include "nsIPrincipal.h"
-#include "nsProxyRelease.h"
-#include "PLDHashTable.h"
-
-namespace mozilla {
-namespace net {
-class nsSimpleURI;
-} // namespace net
-} // namespace mozilla
-
-/**
- * A wrapper for an nsIPrincipal that can be used OMT, which has cached
- * information useful for the gfxUserFontSet.
- */
-class gfxFontSrcPrincipal
-{
-public:
-  gfxFontSrcPrincipal(nsIPrincipal* aPrincipal);
-
-  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(gfxFontSrcPrincipal)
-
-  nsIPrincipal* get() { return mPrincipal; }
-
-  bool Equals(gfxFontSrcPrincipal* aOther);
-
-  PLDHashNumber Hash() const { return mHash; }
-
-private:
-  ~gfxFontSrcPrincipal();
-
-  // The principal.
-  nsCOMPtr<nsIPrincipal> mPrincipal;
-
-  // Precomputed hash for mPrincipal.
-  PLDHashNumber mHash;
-};
-
-#endif // MOZILLA_GFX_FONTSRCPRINCIPAL_H
diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build
index 9e4233cb1ca8..cc7eb7010617 100644
--- a/gfx/thebes/moz.build
+++ b/gfx/thebes/moz.build
@@ -30,7 +30,6 @@ EXPORTS += [
     'gfxFontFeatures.h',
     'gfxFontInfoLoader.h',
     'gfxFontPrefLangList.h',
-    'gfxFontSrcPrincipal.h',
     'gfxFontSrcURI.h',
     'gfxFontUtils.h',
     'gfxFontVariations.h',
@@ -194,7 +193,6 @@ UNIFIED_SOURCES += [
     'gfxFontFeatures.cpp',
     'gfxFontInfoLoader.cpp',
     'gfxFontMissingGlyphs.cpp',
-    'gfxFontSrcPrincipal.cpp',
     'gfxFontSrcURI.cpp',
     'gfxGlyphExtents.cpp',
     'gfxGradientCache.cpp',