mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
159d7b9c2f
- Bug 967693 - Temporarily turn on HTTP cache v2 on for Desktop Firefox Nightly users, r=jduell+ehsan (0fb43bca09)
- Bug 1230939 - check the return of sGlobalEntryTables->Get(aContextKey, &diskEntries). r=mayhemer (da62f5bd04)
- fix header include (52d6efa786)
- Bug 1193605 - Part 3: do not stop non-started service; r=mcmanus (dfe2187f22)
- Bug 1193605 - Part 4: add UUID for listeners; r=mcmanus (fee78fd19d)
- Bug 1214176 - fix typo in _onOffer. r=junior. (b388d1f2a6)
- align test to 1216398 (74d505d1d6)
- Bug 1228457 create pref to allow blocking .onion at dns level rfc 7687 r=valentin.gosu (521aab1e58)
- Bug 1216370 - For safety and searchability, define the nsHostResolver::RES_* enum in terms of the nsIDNSService::RESOLVE_* enum. r=mayhemer (84c22f815f)
- Bug 1194763 - Ensure non-cluster-start flag is set properly for a run-initial supplementary-plane combining mark when shaping text. r=jdaggett (17c3ad163d)
- Bug 1168176 - Mark gfxFontShaper::mFont as MOZ_NON_OWNING_REF. r=jtd (0f3ca78c16)
- Bug 1167403 - Mark gfxFont::GlyphChangeObserver::mFont as MOZ_NON_OWNING_REF. r=jtd (ec77538943)
- align gfxContext to pre-1232822 (part 6) (bb7fa256c9)
- Bug 1231889 - Moz2Dify gfxWindowsNativeDrawing::PaintToContext(). r=mattwoodrow. (69b1d62395)
- Bug 1231864 (part 1) - Remove useless GetCairo() call in gfxWindowsNativeDrawing::BeginNativeDrawing(). r=mattwoodrow. (aa3017c392)
- Bug 1231864 (part 2) - Clean up gfxWindowsNativeDrawing::BeginNativeDrawing(). r=mattwoodrow. (860a81ba59)
- Bug 1225682 - Don't use nsAuto{,C}String as class member variables in gfx/. r=jrmuizel (a1cc11b749)
- Bug 1230611 - Make gfxWindowsPlatform::SupportsApzTouchInput use a pref cache to speed it up. r=dvander (4026e5dfe8)
- Bug 1193842 - Delete touch resampling preference and non resampling paths. r=kats (ff58c7753c)
- Bug 1177335 - Skip resampling if the time difference of touches is less than 2ms. (b98e40343d)
- Bug 1204518 - Fix warnings in widget/gonk/. r=mwu. (ddc13a4c24)
- Bug 1231832. Make IsActive work on Querys that have not begun. r=jgilbert (4b70a8fb0b)
- Bug 1218881. Enforce queries' new availability semantics. r=jgilbert (503bf80f8b)
- Bug 1233858 - Part 1 - ensure Skia's SkGraphics::Init is called from gfxPlatform::Init. r=jmuizelaar (db5fde96b1)
- Bug 1233858 -Part 2 - implement runtime-detected SSE2 optimizations for Skia. r=jmuizelaar (3c9ebaa64d)
- Bug 1233858 - work around Skia __vectorcall bugs on Win32. r=jmuizelaar (b5b5e2bbcf)
- Bug 1222569 - remove unused function from gfxPlatformFontList.cpp; r=Bas (68e1615eb2)
- Bug 1234566: Use LoadLibraryA instead of LoadLibrary in some skia Windows code to allow UNICODE to be defined. r=lsalzman (e45bf51ef7)
- Bug 1156742 Part 1: Change Moz2D recording, so that it can be used in isolation. r=bas (f02fd4992b)
- Bug 1156742 Part 2: Make gfx thebes/gl/2d work with UNICODE defined. r=bas, r=glandium (8fca45d9a3)
- Bug 1156742 Part 3: Add support for FontType::CAIRO to CreateScaledFontForTrueTypeData on Windows. r=bas (863ea539c4)
- Bug 1156742 Part 4: Add an in memory DrawEventRecorder. r=bas (c9196512a1)
- Bug 1156742 Part 5: Add a skeleton RemotePrintJob. r=mconley (aa48df9f32)
- Bug 1156742 Part 6: Add RemotePrintJob to PrintSession and PrintData. r=roc, r=mconley (607a3e6b9b)
- Bug 1233444 - add override declarations for widget/windows/; r=roc (edab847cb0)
- Bug 1156742 Part 7: Refactor nsDeviceContext.cpp to use printing surface for size and nsIDeviceContextSpec for DPI and scale. r=roc (ec6ff3d592)
- Bug 1156742 Part 8: Change gfxWindowsSurface, so that a non-printing surface can be used when recording a print. r=roc (1ab167635e)
- Bug 1156742 Part 9: Add a new nsIDeviceContextSpec for proxied printing. r=roc (11c3909a8f)
- Bug 1156742 Part 10: Allow RemotePrintJob to influence nsPagePrintTimer. r=roc (c658e96338)
- Bug 1156742 Part 11: Allow RemotePrintJobChild to abort the print. r=roc (30f3e9bce4)
- Bug 1156742 Part 12: Record CreateSimilarDrawTarget separately for Moz2D. r=bas (a978b691c3)
- Bug 1156742 Part 13: Create a Moz2D PrintTranslator. r=bas (1eca4e9b33)
- Bug 1156742 Part 14: Complete RemotePrintJob using PrintTranslator. r=mconley (7db80f0ba7)
- Bug 1156742 Part 15: Add pref for turning on printing via the parent process. r=mconley (e3dbf281ea)
- Bug 1156742 Part 16: Add recording and forwarding of Matrix attribute set for Moz2D recording. r=bas (cd5da598ea)
- Bug 1156742 Part 17: Add virtual destructor to RecorededEvent and fix subsequent crash with DWrite playback fonts. r=bas (c20a0b84fc)
- Bug 1156742 Part 18: Fix the way we hold custom font data so that they can be recorded with Moz2D. r=bas (54b4630927)
- Bug 1156742 Part 19: Implement GetFontFileData for ScaledFontWin. r=bas (f1df40b31b)
- Bug 1156742 Part 20: Move Moz2D PreferenceAccess into its own header. r=bas (0afdff8e14)
- Bug 1156742 Part 21: Use GetDirect3D11Device instead of DrawTargetD2D::GetDWriteFactory to determine if DWrite fonts should be used. r=Bas (0c87a5866d)
- Bug 1156742 Part 22: Change ScaledFontDWrite to support creation from TrueType Collection data. r=bas (5f2c607e64)
- Bug 1156742 Part 23: Assert in PrintTranslator when a lookup fails. r=bas (72e24c789f)
- Bug 1156742 Part 24: Add new Recorded event to record font data. r=bas (a0c6f951aa)
- Bug 1156742 Part 25: Flip the big switch and wait for the lightning. r=mconley (082a1a3ede)
- Bug 1203232 - Fix -Wshadow warnings in some ipc/chromium headers. r=njn (018499b8a1)
- Bug 1089837 - Make IPC::Message use MOZ_COUNT_CTOR/DTOR. r=jld (124e011902)
- Bug 1235234 - Fix unintentional switch fallthrough in ipc/chromium/ found by -Wimplicit-fallthrough warning. r=gcp (af37d85c1c)
- Bug 1207498 - Part 2: Remove use of expression closure from tests in toolkit/components/. r=Gijs (98915956bd)
- Bug 1157282 - Add test coverage for telemetry histogram recording. r=gfritzsche (f403b07c7f)
- Bug 1228147: part 1: Add telemetry RecordingEnabled support. r=gfritzsche f=froydnj (610c92394f)
- Bug 1228147: part 2: Add telemetry probe for synchronous scroll. r=kats (6816099c37)
- Bug 1201492 - Remove extended_statistics_ok from Telemetry histograms. r=dexter (f7f991249f)
- Bug 842894 - Support DirectWrite using the Skia backend. r=bas (f2487cf863)
288 lines
8.0 KiB
C++
288 lines
8.0 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* 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 "NativeFontResourceDWrite.h"
|
|
|
|
#include <unordered_map>
|
|
|
|
#include "DrawTargetD2D.h"
|
|
#include "Logging.h"
|
|
#include "mozilla/RefPtr.h"
|
|
|
|
namespace mozilla {
|
|
namespace gfx {
|
|
|
|
static Atomic<uint64_t> sNextFontFileKey;
|
|
static std::unordered_map<uint64_t, IDWriteFontFileStream*> sFontFileStreams;
|
|
|
|
class DWriteFontFileLoader : public IDWriteFontFileLoader
|
|
{
|
|
public:
|
|
DWriteFontFileLoader()
|
|
{
|
|
}
|
|
|
|
// IUnknown interface
|
|
IFACEMETHOD(QueryInterface)(IID const& iid, OUT void** ppObject)
|
|
{
|
|
if (iid == __uuidof(IDWriteFontFileLoader)) {
|
|
*ppObject = static_cast<IDWriteFontFileLoader*>(this);
|
|
return S_OK;
|
|
} else if (iid == __uuidof(IUnknown)) {
|
|
*ppObject = static_cast<IUnknown*>(this);
|
|
return S_OK;
|
|
} else {
|
|
return E_NOINTERFACE;
|
|
}
|
|
}
|
|
|
|
IFACEMETHOD_(ULONG, AddRef)()
|
|
{
|
|
return 1;
|
|
}
|
|
|
|
IFACEMETHOD_(ULONG, Release)()
|
|
{
|
|
return 1;
|
|
}
|
|
|
|
// IDWriteFontFileLoader methods
|
|
/**
|
|
* Important! Note the key here has to be a uint64_t that will have been
|
|
* generated by incrementing sNextFontFileKey.
|
|
*/
|
|
virtual HRESULT STDMETHODCALLTYPE
|
|
CreateStreamFromKey(void const* fontFileReferenceKey,
|
|
UINT32 fontFileReferenceKeySize,
|
|
OUT IDWriteFontFileStream** fontFileStream);
|
|
|
|
/**
|
|
* Gets the singleton loader instance. Note that when using this font
|
|
* loader, the key must be a uint64_t that has been generated by incrementing
|
|
* sNextFontFileKey.
|
|
* Also note that this is _not_ threadsafe.
|
|
*/
|
|
static IDWriteFontFileLoader* Instance()
|
|
{
|
|
if (!mInstance) {
|
|
mInstance = new DWriteFontFileLoader();
|
|
DrawTargetD2D::GetDWriteFactory()->
|
|
RegisterFontFileLoader(mInstance);
|
|
}
|
|
return mInstance;
|
|
}
|
|
|
|
private:
|
|
static IDWriteFontFileLoader* mInstance;
|
|
};
|
|
|
|
class DWriteFontFileStream : public IDWriteFontFileStream
|
|
{
|
|
public:
|
|
/**
|
|
* Used by the FontFileLoader to create a new font stream,
|
|
* this font stream is created from data in memory. The memory
|
|
* passed may be released after object creation, it will be
|
|
* copied internally.
|
|
*
|
|
* @param aData Font data
|
|
*/
|
|
DWriteFontFileStream(uint8_t *aData, uint32_t aSize, uint64_t aFontFileKey);
|
|
~DWriteFontFileStream();
|
|
|
|
// IUnknown interface
|
|
IFACEMETHOD(QueryInterface)(IID const& iid, OUT void** ppObject)
|
|
{
|
|
if (iid == __uuidof(IDWriteFontFileStream)) {
|
|
*ppObject = static_cast<IDWriteFontFileStream*>(this);
|
|
return S_OK;
|
|
} else if (iid == __uuidof(IUnknown)) {
|
|
*ppObject = static_cast<IUnknown*>(this);
|
|
return S_OK;
|
|
} else {
|
|
return E_NOINTERFACE;
|
|
}
|
|
}
|
|
|
|
IFACEMETHOD_(ULONG, AddRef)()
|
|
{
|
|
++mRefCnt;
|
|
return mRefCnt;
|
|
}
|
|
|
|
IFACEMETHOD_(ULONG, Release)()
|
|
{
|
|
--mRefCnt;
|
|
if (mRefCnt == 0) {
|
|
delete this;
|
|
return 0;
|
|
}
|
|
return mRefCnt;
|
|
}
|
|
|
|
// IDWriteFontFileStream methods
|
|
virtual HRESULT STDMETHODCALLTYPE ReadFileFragment(void const** fragmentStart,
|
|
UINT64 fileOffset,
|
|
UINT64 fragmentSize,
|
|
OUT void** fragmentContext);
|
|
|
|
virtual void STDMETHODCALLTYPE ReleaseFileFragment(void* fragmentContext);
|
|
|
|
virtual HRESULT STDMETHODCALLTYPE GetFileSize(OUT UINT64* fileSize);
|
|
|
|
virtual HRESULT STDMETHODCALLTYPE GetLastWriteTime(OUT UINT64* lastWriteTime);
|
|
|
|
private:
|
|
std::vector<uint8_t> mData;
|
|
uint32_t mRefCnt;
|
|
uint64_t mFontFileKey;
|
|
};
|
|
|
|
IDWriteFontFileLoader* DWriteFontFileLoader::mInstance = nullptr;
|
|
|
|
HRESULT STDMETHODCALLTYPE
|
|
DWriteFontFileLoader::CreateStreamFromKey(const void *fontFileReferenceKey,
|
|
UINT32 fontFileReferenceKeySize,
|
|
IDWriteFontFileStream **fontFileStream)
|
|
{
|
|
if (!fontFileReferenceKey || !fontFileStream) {
|
|
return E_POINTER;
|
|
}
|
|
|
|
uint64_t fontFileKey = *static_cast<const uint64_t*>(fontFileReferenceKey);
|
|
auto found = sFontFileStreams.find(fontFileKey);
|
|
if (found == sFontFileStreams.end()) {
|
|
*fontFileStream = nullptr;
|
|
return E_FAIL;
|
|
}
|
|
|
|
found->second->AddRef();
|
|
*fontFileStream = found->second;
|
|
return S_OK;
|
|
}
|
|
|
|
DWriteFontFileStream::DWriteFontFileStream(uint8_t *aData, uint32_t aSize,
|
|
uint64_t aFontFileKey)
|
|
: mRefCnt(0)
|
|
, mFontFileKey(aFontFileKey)
|
|
{
|
|
mData.resize(aSize);
|
|
memcpy(&mData.front(), aData, aSize);
|
|
}
|
|
|
|
DWriteFontFileStream::~DWriteFontFileStream()
|
|
{
|
|
sFontFileStreams.erase(mFontFileKey);
|
|
}
|
|
|
|
HRESULT STDMETHODCALLTYPE
|
|
DWriteFontFileStream::GetFileSize(UINT64 *fileSize)
|
|
{
|
|
*fileSize = mData.size();
|
|
return S_OK;
|
|
}
|
|
|
|
HRESULT STDMETHODCALLTYPE
|
|
DWriteFontFileStream::GetLastWriteTime(UINT64 *lastWriteTime)
|
|
{
|
|
return E_NOTIMPL;
|
|
}
|
|
|
|
HRESULT STDMETHODCALLTYPE
|
|
DWriteFontFileStream::ReadFileFragment(const void **fragmentStart,
|
|
UINT64 fileOffset,
|
|
UINT64 fragmentSize,
|
|
void **fragmentContext)
|
|
{
|
|
// We are required to do bounds checking.
|
|
if (fileOffset + fragmentSize > mData.size()) {
|
|
return E_FAIL;
|
|
}
|
|
|
|
// truncate the 64 bit fileOffset to size_t sized index into mData
|
|
size_t index = static_cast<size_t>(fileOffset);
|
|
|
|
// We should be alive for the duration of this.
|
|
*fragmentStart = &mData[index];
|
|
*fragmentContext = nullptr;
|
|
return S_OK;
|
|
}
|
|
|
|
void STDMETHODCALLTYPE
|
|
DWriteFontFileStream::ReleaseFileFragment(void *fragmentContext)
|
|
{
|
|
}
|
|
|
|
/* static */
|
|
already_AddRefed<NativeFontResourceDWrite>
|
|
NativeFontResourceDWrite::Create(uint8_t *aFontData, uint32_t aDataLength,
|
|
bool aNeedsCairo)
|
|
{
|
|
IDWriteFactory *factory = DrawTargetD2D::GetDWriteFactory();
|
|
if (!factory) {
|
|
gfxWarning() << "Failed to get DWrite Factory.";
|
|
return nullptr;
|
|
}
|
|
|
|
uint64_t fontFileKey = sNextFontFileKey++;
|
|
RefPtr<IDWriteFontFileStream> ffsRef =
|
|
new DWriteFontFileStream(aFontData, aDataLength, fontFileKey);
|
|
sFontFileStreams[fontFileKey] = ffsRef;
|
|
|
|
RefPtr<IDWriteFontFile> fontFile;
|
|
HRESULT hr =
|
|
factory->CreateCustomFontFileReference(&fontFileKey, sizeof(fontFileKey),
|
|
DWriteFontFileLoader::Instance(),
|
|
getter_AddRefs(fontFile));
|
|
if (FAILED(hr)) {
|
|
gfxWarning() << "Failed to load font file from data!";
|
|
return nullptr;
|
|
}
|
|
|
|
BOOL isSupported;
|
|
DWRITE_FONT_FILE_TYPE fileType;
|
|
DWRITE_FONT_FACE_TYPE faceType;
|
|
UINT32 numberOfFaces;
|
|
hr = fontFile->Analyze(&isSupported, &fileType, &faceType, &numberOfFaces);
|
|
if (FAILED(hr) || !isSupported) {
|
|
gfxWarning() << "Font file is not supported.";
|
|
return nullptr;
|
|
}
|
|
|
|
RefPtr<NativeFontResourceDWrite> fontResource =
|
|
new NativeFontResourceDWrite(factory, fontFile.forget(), faceType,
|
|
numberOfFaces, aNeedsCairo);
|
|
return fontResource.forget();
|
|
}
|
|
|
|
already_AddRefed<ScaledFont>
|
|
NativeFontResourceDWrite::CreateScaledFont(uint32_t aIndex, uint32_t aGlyphSize)
|
|
{
|
|
if (aIndex >= mNumberOfFaces) {
|
|
gfxWarning() << "Font face index is too high for font resource.";
|
|
return nullptr;
|
|
}
|
|
|
|
IDWriteFontFile *fontFile = mFontFile;
|
|
RefPtr<IDWriteFontFace> fontFace;
|
|
if (FAILED(mFactory->CreateFontFace(mFaceType, 1, &fontFile, aIndex,
|
|
DWRITE_FONT_SIMULATIONS_NONE, getter_AddRefs(fontFace)))) {
|
|
gfxWarning() << "Failed to create font face from font file data.";
|
|
return nullptr;
|
|
}
|
|
|
|
RefPtr<ScaledFontBase> scaledFont = new ScaledFontDWrite(fontFace, aGlyphSize);
|
|
if (mNeedsCairo && !scaledFont->PopulateCairoScaledFont()) {
|
|
gfxWarning() << "Unable to create cairo scaled font DWrite font.";
|
|
return nullptr;
|
|
}
|
|
|
|
return scaledFont.forget();
|
|
}
|
|
|
|
} // gfx
|
|
} // mozilla
|