зеркало из https://github.com/mozilla/gecko-dev.git
Backed out changeset 9a0e26964591 (bug 1376964)
This commit is contained in:
Родитель
c897b5dc70
Коммит
abf91025d5
|
@ -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));
|
|
||||||
}
|
|
|
@ -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
|
|
|
@ -30,7 +30,6 @@ EXPORTS += [
|
||||||
'gfxFontFeatures.h',
|
'gfxFontFeatures.h',
|
||||||
'gfxFontInfoLoader.h',
|
'gfxFontInfoLoader.h',
|
||||||
'gfxFontPrefLangList.h',
|
'gfxFontPrefLangList.h',
|
||||||
'gfxFontSrcPrincipal.h',
|
|
||||||
'gfxFontSrcURI.h',
|
'gfxFontSrcURI.h',
|
||||||
'gfxFontUtils.h',
|
'gfxFontUtils.h',
|
||||||
'gfxFontVariations.h',
|
'gfxFontVariations.h',
|
||||||
|
@ -194,7 +193,6 @@ UNIFIED_SOURCES += [
|
||||||
'gfxFontFeatures.cpp',
|
'gfxFontFeatures.cpp',
|
||||||
'gfxFontInfoLoader.cpp',
|
'gfxFontInfoLoader.cpp',
|
||||||
'gfxFontMissingGlyphs.cpp',
|
'gfxFontMissingGlyphs.cpp',
|
||||||
'gfxFontSrcPrincipal.cpp',
|
|
||||||
'gfxFontSrcURI.cpp',
|
'gfxFontSrcURI.cpp',
|
||||||
'gfxGlyphExtents.cpp',
|
'gfxGlyphExtents.cpp',
|
||||||
'gfxGradientCache.cpp',
|
'gfxGradientCache.cpp',
|
||||||
|
|
Загрузка…
Ссылка в новой задаче