| 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. |
| 4 * All rights reserved. |
| 4 * Copyright (C) 2013 Google Inc. All rights reserved. | 5 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 5 * | 6 * |
| 6 * This library is free software; you can redistribute it and/or | 7 * This library is free software; you can redistribute it and/or |
| 7 * modify it under the terms of the GNU Library General Public | 8 * modify it under the terms of the GNU Library General Public |
| 8 * License as published by the Free Software Foundation; either | 9 * License as published by the Free Software Foundation; either |
| 9 * version 2 of the License, or (at your option) any later version. | 10 * version 2 of the License, or (at your option) any later version. |
| 10 * | 11 * |
| 11 * This library is distributed in the hope that it will be useful, | 12 * This library is distributed in the hope that it will be useful, |
| 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 } | 107 } |
| 107 static FontSmoothingMode initialFontSmoothing() { return AutoSmoothing; } | 108 static FontSmoothingMode initialFontSmoothing() { return AutoSmoothing; } |
| 108 static FontStretch initialStretch() { return FontStretchNormal; } | 109 static FontStretch initialStretch() { return FontStretchNormal; } |
| 109 static FontWeight initialWeight() { return FontWeightNormal; } | 110 static FontWeight initialWeight() { return FontWeightNormal; } |
| 110 | 111 |
| 111 private: | 112 private: |
| 112 void setFamilyDescription(FontDescription&, | 113 void setFamilyDescription(FontDescription&, |
| 113 const FontDescription::FamilyDescription&); | 114 const FontDescription::FamilyDescription&); |
| 114 void setSize(FontDescription&, const FontDescription::Size&); | 115 void setSize(FontDescription&, const FontDescription::Size&); |
| 115 void updateOrientation(FontDescription&, const ComputedStyle&); | 116 void updateOrientation(FontDescription&, const ComputedStyle&); |
| 116 // This function fixes up the default font size if it detects that the current
generic font family has changed. -dwh | 117 // This function fixes up the default font size if it detects that the current |
| 118 // generic font family has changed. -dwh |
| 117 void checkForGenericFamilyChange(const FontDescription&, FontDescription&); | 119 void checkForGenericFamilyChange(const FontDescription&, FontDescription&); |
| 118 void updateSpecifiedSize(FontDescription&, const ComputedStyle&); | 120 void updateSpecifiedSize(FontDescription&, const ComputedStyle&); |
| 119 void updateComputedSize(FontDescription&, const ComputedStyle&); | 121 void updateComputedSize(FontDescription&, const ComputedStyle&); |
| 120 void updateAdjustedSize(FontDescription&, | 122 void updateAdjustedSize(FontDescription&, |
| 121 const ComputedStyle&, | 123 const ComputedStyle&, |
| 122 FontSelector*); | 124 FontSelector*); |
| 123 | 125 |
| 124 float getComputedSizeFromSpecifiedSize(FontDescription&, | 126 float getComputedSizeFromSpecifiedSize(FontDescription&, |
| 125 float effectiveZoom, | 127 float effectiveZoom, |
| 126 float specifiedSize); | 128 float specifiedSize); |
| (...skipping 26 matching lines...) Expand all Loading... |
| 153 bool isSet(PropertySetFlag flag) const { | 155 bool isSet(PropertySetFlag flag) const { |
| 154 return m_flags & (1 << unsigned(flag)); | 156 return m_flags & (1 << unsigned(flag)); |
| 155 } | 157 } |
| 156 | 158 |
| 157 unsigned m_flags; | 159 unsigned m_flags; |
| 158 }; | 160 }; |
| 159 | 161 |
| 160 } // namespace blink | 162 } // namespace blink |
| 161 | 163 |
| 162 #endif | 164 #endif |
| OLD | NEW |