| Index: third_party/WebKit/Source/platform/fonts/FontDataForRangeSet.h
|
| diff --git a/third_party/WebKit/Source/platform/fonts/FontDataForRangeSet.h b/third_party/WebKit/Source/platform/fonts/FontDataForRangeSet.h
|
| index a31bb4727afba4b999b470fc1244e9a32af0f49c..9b4950d40572814d935cbc2c0af890414c21c7f6 100644
|
| --- a/third_party/WebKit/Source/platform/fonts/FontDataForRangeSet.h
|
| +++ b/third_party/WebKit/Source/platform/fonts/FontDataForRangeSet.h
|
| @@ -36,9 +36,8 @@ namespace blink {
|
|
|
| class SimpleFontData;
|
|
|
| -class FontDataForRangeSet final {
|
| - DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
|
| -
|
| +class PLATFORM_EXPORT FontDataForRangeSet : public RefCounted<FontDataForRangeSet> {
|
| +public:
|
| explicit FontDataForRangeSet(PassRefPtr<SimpleFontData> fontData = nullptr, PassRefPtr<UnicodeRangeSet> rangeSet = nullptr)
|
| : m_fontData(fontData)
|
| , m_rangeSet(rangeSet)
|
| @@ -55,6 +54,9 @@ class FontDataForRangeSet final {
|
| m_rangeSet = adoptRef(new UnicodeRangeSet(rangeVector));
|
| }
|
|
|
| + FontDataForRangeSet(const FontDataForRangeSet& other);
|
| +
|
| + virtual ~FontDataForRangeSet() { };
|
|
|
| bool contains(UChar32 testChar) const { return m_rangeSet->contains(testChar); }
|
| bool isEntireRange() const { return m_rangeSet->isEntireRange(); }
|
| @@ -62,11 +64,21 @@ class FontDataForRangeSet final {
|
| bool hasFontData() const { return m_fontData.get(); }
|
| const SimpleFontData* fontData() const { return m_fontData.get(); }
|
|
|
| -private:
|
| +protected:
|
| RefPtr<SimpleFontData> m_fontData;
|
| RefPtr<UnicodeRangeSet> m_rangeSet;
|
| };
|
|
|
| +class PLATFORM_EXPORT FontDataForRangeSetFromCache : public FontDataForRangeSet {
|
| +public:
|
| + explicit FontDataForRangeSetFromCache(PassRefPtr<SimpleFontData> fontData,
|
| + PassRefPtr<UnicodeRangeSet> rangeSet = nullptr)
|
| + : FontDataForRangeSet(fontData, rangeSet)
|
| + {
|
| + }
|
| + virtual ~FontDataForRangeSetFromCache();
|
| +};
|
| +
|
| } // namespace blink
|
|
|
| #endif
|
|
|