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

Side by Side Diff: Source/platform/fonts/FontFallbackList.h

Issue 1038193002: Clear baseLayoutStyle when the font selector version has increased. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 9 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
« Source/platform/fonts/Font.h ('K') | « Source/platform/fonts/Font.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2010 Apple Inc. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 57
58 private: 58 private:
59 FontFallbackList& m_fallbackList; 59 FontFallbackList& m_fallbackList;
60 GlyphPages& m_pages; 60 GlyphPages& m_pages;
61 GlyphPageTreeNodeBase* m_pageZero; 61 GlyphPageTreeNodeBase* m_pageZero;
62 }; 62 };
63 63
64 static PassRefPtr<FontFallbackList> create() { return adoptRef(new FontFallb ackList()); } 64 static PassRefPtr<FontFallbackList> create() { return adoptRef(new FontFallb ackList()); }
65 65
66 ~FontFallbackList() { releaseFontData(); } 66 ~FontFallbackList() { releaseFontData(); }
67 bool isValid() const { return m_fontSelector ? m_fontSelector->version() == m_fontSelectorVersion : m_fontSelectorVersion == 0; }
esprehn 2015/03/26 23:28:15 Can we move this out of line instead?
rune 2015/03/27 07:14:22 Done.
67 void invalidate(PassRefPtrWillBeRawPtr<FontSelector>); 68 void invalidate(PassRefPtrWillBeRawPtr<FontSelector>);
68 69
69 bool isFixedPitch(const FontDescription& fontDescription) const 70 bool isFixedPitch(const FontDescription& fontDescription) const
70 { 71 {
71 if (m_pitch == UnknownPitchFont) 72 if (m_pitch == UnknownPitchFont)
72 determinePitch(fontDescription); 73 determinePitch(fontDescription);
73 return m_pitch == FixedPitchFont; 74 return m_pitch == FixedPitchFont;
74 } 75 }
75 void determinePitch(const FontDescription&) const; 76 void determinePitch(const FontDescription&) const;
76 77
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 unsigned m_fontSelectorVersion; 125 unsigned m_fontSelectorVersion;
125 mutable int m_familyIndex; 126 mutable int m_familyIndex;
126 unsigned short m_generation; 127 unsigned short m_generation;
127 mutable FixedPitchFontType m_pitch : 3; // Pitch 128 mutable FixedPitchFontType m_pitch : 3; // Pitch
128 mutable bool m_hasLoadingFallback : 1; 129 mutable bool m_hasLoadingFallback : 1;
129 }; 130 };
130 131
131 } // namespace blink 132 } // namespace blink
132 133
133 #endif 134 #endif
OLDNEW
« Source/platform/fonts/Font.h ('K') | « Source/platform/fonts/Font.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698