Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(83)

Side by Side Diff: third_party/WebKit/Source/platform/fonts/FontDataForRangeSet.h

Issue 2230233002: Skip redundant fonts returned by FontFallbackIterator (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Logging removed Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2008, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2008, 2009 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 UnicodeRange range(from, to); 51 UnicodeRange range(from, to);
52 Vector<UnicodeRange> rangeVector; 52 Vector<UnicodeRange> rangeVector;
53 rangeVector.append(range); 53 rangeVector.append(range);
54 m_rangeSet = adoptRef(new UnicodeRangeSet(rangeVector)); 54 m_rangeSet = adoptRef(new UnicodeRangeSet(rangeVector));
55 } 55 }
56 56
57 FontDataForRangeSet(const FontDataForRangeSet& other); 57 FontDataForRangeSet(const FontDataForRangeSet& other);
58 58
59 virtual ~FontDataForRangeSet() { }; 59 virtual ~FontDataForRangeSet() { };
60 60
61 bool contains(UChar32 testChar) const { return m_rangeSet->contains(testChar ); } 61 bool contains(UChar32 testChar) const { return !m_rangeSet || m_rangeSet->co ntains(testChar); }
62 bool isEntireRange() const { return m_rangeSet->isEntireRange(); } 62 bool isEntireRange() const { return !m_rangeSet || m_rangeSet->isEntireRange (); }
63 UnicodeRangeSet* ranges() const { return m_rangeSet.get(); } 63 UnicodeRangeSet* ranges() const { return m_rangeSet.get(); }
64 bool hasFontData() const { return m_fontData.get(); } 64 bool hasFontData() const { return m_fontData.get(); }
65 const SimpleFontData* fontData() const { return m_fontData.get(); } 65 const SimpleFontData* fontData() const { return m_fontData.get(); }
66 66
67 protected: 67 protected:
68 RefPtr<SimpleFontData> m_fontData; 68 RefPtr<SimpleFontData> m_fontData;
69 RefPtr<UnicodeRangeSet> m_rangeSet; 69 RefPtr<UnicodeRangeSet> m_rangeSet;
70 }; 70 };
71 71
72 class PLATFORM_EXPORT FontDataForRangeSetFromCache : public FontDataForRangeSet { 72 class PLATFORM_EXPORT FontDataForRangeSetFromCache : public FontDataForRangeSet {
73 public: 73 public:
74 explicit FontDataForRangeSetFromCache(PassRefPtr<SimpleFontData> fontData, 74 explicit FontDataForRangeSetFromCache(PassRefPtr<SimpleFontData> fontData,
75 PassRefPtr<UnicodeRangeSet> rangeSet = nullptr) 75 PassRefPtr<UnicodeRangeSet> rangeSet = nullptr)
76 : FontDataForRangeSet(fontData, rangeSet) 76 : FontDataForRangeSet(fontData, rangeSet)
77 { 77 {
78 } 78 }
79 virtual ~FontDataForRangeSetFromCache(); 79 virtual ~FontDataForRangeSetFromCache();
80 }; 80 };
81 81
82 } // namespace blink 82 } // namespace blink
83 83
84 #endif 84 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698