Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 20:05:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1416542 - lock access to the blob image font data table. r=nical

Browse Source 
MozReview-Commit-ID: 30dwLt74L38
This commit is contained in:
Lee Salzman 2017-11-20 11:34:36 -05:00
parent 3ed4d2fbab
commit 001e79ef65
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gfx/webrender_bindings/Moz2DImageRenderer.cpp
View File

@ -5,6 +5,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "gfxUtils.h"
#include "mozilla/Mutex.h"
#include "mozilla/Range.h"
#include "mozilla/gfx/2D.h"
#include "mozilla/gfx/InlineTranslator.h"
@ -51,11 +52,13 @@ struct FontTemplate {
RefPtr<UnscaledFont> mUnscaledFont;
};
StaticMutex sFontDataTableLock;
std::unordered_map<FontKey, FontTemplate> sFontDataTable;
extern "C" {
void
AddFontData(WrFontKey aKey, const uint8_t *aData, size_t aSize, uint32_t aIndex, const ArcVecU8 *aVec) {
StaticMutexAutoLock lock(sFontDataTableLock);
auto i = sFontDataTable.find(aKey);
if (i == sFontDataTable.end()) {
FontTemplate font;
@ -69,6 +72,7 @@ AddFontData(WrFontKey aKey, const uint8_t *aData, size_t aSize, uint32_t aIndex,
void
AddNativeFontHandle(WrFontKey aKey, void* aHandle, uint32_t aIndex) {
StaticMutexAutoLock lock(sFontDataTableLock);
auto i = sFontDataTable.find(aKey);
if (i == sFontDataTable.end()) {
FontTemplate font;
@ -91,6 +95,7 @@ AddNativeFontHandle(WrFontKey aKey, void* aHandle, uint32_t aIndex) {
void
DeleteFontData(WrFontKey aKey) {
StaticMutexAutoLock lock(sFontDataTableLock);
auto i = sFontDataTable.find(aKey);
if (i != sFontDataTable.end()) {
if (i->second.mVec) {
@ -103,8 +108,13 @@ DeleteFontData(WrFontKey aKey) {
RefPtr<UnscaledFont>
GetUnscaledFont(Translator *aTranslator, wr::FontKey key) {
MOZ_ASSERT(sFontDataTable.find(key) != sFontDataTable.end());
auto &data = sFontDataTable[key];
StaticMutexAutoLock lock(sFontDataTableLock);
auto i = sFontDataTable.find(key);
if (i == sFontDataTable.end()) {
gfxDevCrash(LogReason::UnscaledFontNotFound) << "Failed to get UnscaledFont entry for FontKey " << key.mHandle;
return nullptr;
}
auto &data = i->second;
if (data.mUnscaledFont) {
return data.mUnscaledFont;
}