mirror of
https://github.com/flutter/flutter.git
synced 2026-02-20 02:29:02 +08:00
6c60831cfc
This CL fixes following test cases in minikin_tests - FontFamilyTest.hasVariationSelectorTest - HbFontCacheTest.getHbFontLockedTest - HbFontCacheTest.purgeCacheTest For the fix of FontFamilyTest.hasVariationSelectorTest, removing virtual from GetUniqueId() in MinikinFont. After [1], MinikinFont's destructor started calling purgeHbCache() which calls virtual method, MinikinFont::GetUniqueId(). Fortunately, the SkTypeface::uniqueID() returns just internal value, so we can store it at the construction time and use it instead of calling SkTypeface::uniqueID() every time. This patch also changes purgeHbFont to purgeHbFontLocked, as all uses of it were already under global mutex. This change avoids deadlock on explicit unref, as when invoked by a Java finalizer from the Java object that holds a reference to the font. Some of the tests needed to change to using the ref counting protocol rather than explicitly destructing font objects, as well. [1] 9afcc6e2bd4d89e4e1deb6e18c3c4daca4e114fd Bug: 28105730 Bug: 28105688 Change-Id: Ie5983c4869147dacabdca81af1605066cd680b3f
64 lines
2.0 KiB
C++
64 lines
2.0 KiB
C++
/*
|
|
* Copyright (C) 2015 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#include "MinikinFontForTest.h"
|
|
|
|
#include <minikin/MinikinFont.h>
|
|
|
|
#include <SkTypeface.h>
|
|
|
|
#include <cutils/log.h>
|
|
|
|
MinikinFontForTest::MinikinFontForTest(const std::string& font_path) :
|
|
MinikinFontForTest(font_path, SkTypeface::CreateFromFile(font_path.c_str())) {
|
|
}
|
|
|
|
MinikinFontForTest::MinikinFontForTest(const std::string& font_path, SkTypeface* typeface) :
|
|
MinikinFont(typeface->uniqueID()),
|
|
mTypeface(typeface),
|
|
mFontPath(font_path) {
|
|
}
|
|
|
|
MinikinFontForTest::~MinikinFontForTest() {
|
|
}
|
|
|
|
float MinikinFontForTest::GetHorizontalAdvance(uint32_t /* glyph_id */,
|
|
const android::MinikinPaint& /* paint */) const {
|
|
LOG_ALWAYS_FATAL("MinikinFontForTest::GetHorizontalAdvance is not yet implemented");
|
|
return 0.0f;
|
|
}
|
|
|
|
void MinikinFontForTest::GetBounds(android::MinikinRect* /* bounds */, uint32_t /* glyph_id */,
|
|
const android::MinikinPaint& /* paint */) const {
|
|
LOG_ALWAYS_FATAL("MinikinFontForTest::GetBounds is not yet implemented");
|
|
}
|
|
|
|
const void* MinikinFontForTest::GetTable(uint32_t tag, size_t* size,
|
|
android::MinikinDestroyFunc* destroy) {
|
|
const size_t tableSize = mTypeface->getTableSize(tag);
|
|
*size = tableSize;
|
|
if (tableSize == 0) {
|
|
return nullptr;
|
|
}
|
|
void* buf = malloc(tableSize);
|
|
if (buf == nullptr) {
|
|
return nullptr;
|
|
}
|
|
mTypeface->getTableData(tag, 0, tableSize, buf);
|
|
*destroy = free;
|
|
return buf;
|
|
}
|