Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. | 3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. |
| 4 * Copyright (C) 2013 Google Inc. All rights reserved. | 4 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 5 * | 5 * |
| 6 * This library is free software; you can redistribute it and/or | 6 * This library is free software; you can redistribute it and/or |
| 7 * modify it under the terms of the GNU Library General Public | 7 * modify it under the terms of the GNU Library General Public |
| 8 * License as published by the Free Software Foundation; either | 8 * License as published by the Free Software Foundation; either |
| 9 * version 2 of the License, or (at your option) any later version. | 9 * version 2 of the License, or (at your option) any later version. |
| 10 * | 10 * |
| (...skipping 23 matching lines...) Expand all Loading... | |
| 34 class CSSValue; | 34 class CSSValue; |
| 35 class FontSelector; | 35 class FontSelector; |
| 36 class RenderStyle; | 36 class RenderStyle; |
| 37 | 37 |
| 38 class FontDescriptionChangeScope; | 38 class FontDescriptionChangeScope; |
| 39 | 39 |
| 40 class FontBuilder { | 40 class FontBuilder { |
| 41 STACK_ALLOCATED(); | 41 STACK_ALLOCATED(); |
| 42 WTF_MAKE_NONCOPYABLE(FontBuilder); | 42 WTF_MAKE_NONCOPYABLE(FontBuilder); |
| 43 public: | 43 public: |
| 44 FontBuilder(const Document&); | 44 FontBuilder(const Document&, RenderStyle*); |
|
rune
2014/10/29 12:01:15
Seems like the FontBuilder construction change is
| |
| 45 | 45 |
| 46 void setStyle(RenderStyle* style) { m_style = style; } | |
| 47 void setInitial(float effectiveZoom); | 46 void setInitial(float effectiveZoom); |
| 48 | 47 |
| 49 void didChangeFontParameters(bool); | 48 void didChangeFontParameters(bool); |
| 50 | 49 |
| 51 void inheritFrom(const FontDescription&); | 50 void inheritFrom(const FontDescription&); |
| 52 | 51 |
| 53 FontFamily standardFontFamily() const; | 52 FontFamily standardFontFamily() const; |
| 54 AtomicString standardFontFamilyName() const; | 53 AtomicString standardFontFamilyName() const; |
| 55 AtomicString genericFontFamilyName(FontDescription::GenericFamilyType) const ; | 54 AtomicString genericFontFamilyName(FontDescription::GenericFamilyType) const ; |
| 56 | 55 |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 118 // is changed, FontBuilder tracks the need to update | 117 // is changed, FontBuilder tracks the need to update |
| 119 // style->font() with this bool. | 118 // style->font() with this bool. |
| 120 bool m_fontDirty; | 119 bool m_fontDirty; |
| 121 | 120 |
| 122 friend class FontBuilderTest; | 121 friend class FontBuilderTest; |
| 123 }; | 122 }; |
| 124 | 123 |
| 125 } | 124 } |
| 126 | 125 |
| 127 #endif | 126 #endif |
| OLD | NEW |