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
59 lines
1.5 KiB
C++
59 lines
1.5 KiB
C++
/*
|
|
* Copyright (C) 2014 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.
|
|
*/
|
|
|
|
// Base class for reference counted objects in Minikin
|
|
|
|
#ifndef MINIKIN_REF_COUNTED_H
|
|
#define MINIKIN_REF_COUNTED_H
|
|
|
|
namespace android {
|
|
|
|
class MinikinRefCounted {
|
|
public:
|
|
void RefLocked() { mRefcount_++; }
|
|
void UnrefLocked() { if (--mRefcount_ == 0) { delete this; } }
|
|
|
|
// These refcount operations take the global lock.
|
|
void Ref();
|
|
void Unref();
|
|
|
|
MinikinRefCounted() : mRefcount_(1) { }
|
|
|
|
virtual ~MinikinRefCounted() { };
|
|
private:
|
|
int mRefcount_;
|
|
};
|
|
|
|
// An RAII container for reference counted objects.
|
|
// Note: this is only suitable for clients which are _not_ holding the global lock.
|
|
template <typename T>
|
|
class MinikinAutoUnref {
|
|
public:
|
|
MinikinAutoUnref(T* obj) : mObj(obj) {
|
|
}
|
|
~MinikinAutoUnref() {
|
|
mObj->Unref();
|
|
}
|
|
T& operator*() const { return *mObj; }
|
|
T* operator->() const { return mObj; }
|
|
T* get() const { return mObj; }
|
|
private:
|
|
T* mObj;
|
|
};
|
|
|
|
}
|
|
|
|
#endif // MINIKIN_REF_COUNTED_H
|