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

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

Issue 754743004: Don't return false for RenderStyle::operator== while fonts load. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed review issue and regressions. Created 6 years 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/style/RenderStyle.cpp ('k') | Source/platform/fonts/Font.cpp » ('j') | 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) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2003, 2006, 2007, 2010, 2011 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2006, 2007, 2010, 2011 Apple Inc. All rights reserved.
6 * Copyright (C) 2008 Holger Hans Peter Freyther 6 * Copyright (C) 2008 Holger Hans Peter Freyther
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 164
165 friend struct SimpleShaper; 165 friend struct SimpleShaper;
166 166
167 public: 167 public:
168 FontSelector* fontSelector() const; 168 FontSelector* fontSelector() const;
169 169
170 FontFallbackList* fontList() const { return m_fontFallbackList.get(); } 170 FontFallbackList* fontList() const { return m_fontFallbackList.get(); }
171 171
172 void willUseFontData(UChar32) const; 172 void willUseFontData(UChar32) const;
173 173
174 private:
175 bool loadingCustomFonts() const 174 bool loadingCustomFonts() const
176 { 175 {
177 return m_fontFallbackList && m_fontFallbackList->loadingCustomFonts(); 176 return m_fontFallbackList && m_fontFallbackList->loadingCustomFonts();
178 } 177 }
179 178
179 private:
180 bool shouldSkipDrawing() const 180 bool shouldSkipDrawing() const
181 { 181 {
182 return m_fontFallbackList && m_fontFallbackList->shouldSkipDrawing(); 182 return m_fontFallbackList && m_fontFallbackList->shouldSkipDrawing();
183 } 183 }
184 184
185 FontDescription m_fontDescription; 185 FontDescription m_fontDescription;
186 mutable RefPtr<FontFallbackList> m_fontFallbackList; 186 mutable RefPtr<FontFallbackList> m_fontFallbackList;
187 }; 187 };
188 188
189 inline Font::~Font() 189 inline Font::~Font()
(...skipping 27 matching lines...) Expand all
217 { 217 {
218 if (!tabSize) 218 if (!tabSize)
219 return fontDescription().letterSpacing(); 219 return fontDescription().letterSpacing();
220 float tabWidth = tabSize * fontData.spaceWidth() + fontDescription().letterS pacing(); 220 float tabWidth = tabSize * fontData.spaceWidth() + fontDescription().letterS pacing();
221 return tabWidth - fmodf(position, tabWidth); 221 return tabWidth - fmodf(position, tabWidth);
222 } 222 }
223 223
224 } // namespace blink 224 } // namespace blink
225 225
226 #endif 226 #endif
OLDNEW
« no previous file with comments | « Source/core/rendering/style/RenderStyle.cpp ('k') | Source/platform/fonts/Font.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698