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

Side by Side Diff: sky/engine/platform/fonts/FontDescription.h

Issue 714783003: Remove some straggling zoom-related code. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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
« no previous file with comments | « sky/engine/platform/LengthFunctions.cpp ('k') | sky/engine/public/web/WebSettings.h » ('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, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserv ed. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserv ed.
6 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> 6 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
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 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 static TypesettingFeatures defaultTypesettingFeatures(); 185 static TypesettingFeatures defaultTypesettingFeatures();
186 186
187 private: 187 private:
188 FontFamily m_familyList; // The list of font families to be used. 188 FontFamily m_familyList; // The list of font families to be used.
189 RefPtr<FontFeatureSettings> m_featureSettings; 189 RefPtr<FontFeatureSettings> m_featureSettings;
190 String m_locale; 190 String m_locale;
191 191
192 void updateTypesettingFeatures() const; 192 void updateTypesettingFeatures() const;
193 193
194 float m_specifiedSize; // Specified CSS value. Independent of rendering is sues such as integer 194 float m_specifiedSize; // Specified CSS value. Independent of rendering is sues such as integer
195 // rounding, minimum font sizes, and zooming. 195 // rounding, minimum font sizes.
196 float m_computedSize; // Computed size adjusted for the minimum font size and the zoom factor. 196 float m_computedSize; // Computed size adjusted for the minimum font size .
197 197
198 float m_letterSpacing; 198 float m_letterSpacing;
199 float m_wordSpacing; 199 float m_wordSpacing;
200 200
201 unsigned m_orientation : 1; // FontOrientation - Whether the font is renderi ng on a horizontal line or a vertical line. 201 unsigned m_orientation : 1; // FontOrientation - Whether the font is renderi ng on a horizontal line or a vertical line.
202 unsigned m_nonCJKGlyphOrientation : 1; // NonCJKGlyphOrientation - Only used by vertical text. Determines the default orientation for non-ideograph glyphs. 202 unsigned m_nonCJKGlyphOrientation : 1; // NonCJKGlyphOrientation - Only used by vertical text. Determines the default orientation for non-ideograph glyphs.
203 203
204 unsigned m_widthVariant : 2; // FontWidthVariant 204 unsigned m_widthVariant : 2; // FontWidthVariant
205 205
206 unsigned m_style : 1; // FontStyle 206 unsigned m_style : 1; // FontStyle
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 && m_script == other.m_script 263 && m_script == other.m_script
264 && m_syntheticBold == other.m_syntheticBold 264 && m_syntheticBold == other.m_syntheticBold
265 && m_syntheticItalic == other.m_syntheticItalic 265 && m_syntheticItalic == other.m_syntheticItalic
266 && m_featureSettings == other.m_featureSettings 266 && m_featureSettings == other.m_featureSettings
267 && m_subpixelTextPosition == other.m_subpixelTextPosition; 267 && m_subpixelTextPosition == other.m_subpixelTextPosition;
268 } 268 }
269 269
270 } // namespace blink 270 } // namespace blink
271 271
272 #endif 272 #endif
OLDNEW
« no previous file with comments | « sky/engine/platform/LengthFunctions.cpp ('k') | sky/engine/public/web/WebSettings.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698