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

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

Issue 715633006: Remove FontDescriptionChangeScope, and let FontBuilder partially apply values. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: IsSetFlag -> PropertySetFlag. Created 5 years, 10 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
« no previous file with comments | « Source/core/dom/Document.cpp ('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) 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 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 , m_syntheticItalic(false) 82 , m_syntheticItalic(false)
83 , m_subpixelTextPosition(s_useSubpixelTextPositioning) 83 , m_subpixelTextPosition(s_useSubpixelTextPositioning)
84 , m_typesettingFeatures(s_defaultTypesettingFeatures) 84 , m_typesettingFeatures(s_defaultTypesettingFeatures)
85 { 85 {
86 } 86 }
87 87
88 bool operator==(const FontDescription&) const; 88 bool operator==(const FontDescription&) const;
89 bool operator!=(const FontDescription& other) const { return !(*this == othe r); } 89 bool operator!=(const FontDescription& other) const { return !(*this == othe r); }
90 90
91 struct VariantLigatures { 91 struct VariantLigatures {
92 VariantLigatures() 92 VariantLigatures(LigaturesState state = NormalLigaturesState)
93 : common(NormalLigaturesState) 93 : common(state)
94 , discretionary(NormalLigaturesState) 94 , discretionary(state)
95 , historical(NormalLigaturesState) 95 , historical(state)
96 , contextual(NormalLigaturesState) 96 , contextual(state)
97 { 97 {
98 } 98 }
99 99
100 unsigned common : 2; 100 unsigned common : 2;
101 unsigned discretionary : 2; 101 unsigned discretionary : 2;
102 unsigned historical : 2; 102 unsigned historical : 2;
103 unsigned contextual : 2; 103 unsigned contextual : 2;
104 }; 104 };
105 105
106 struct Size { 106 struct Size {
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 && m_script == other.m_script 290 && m_script == other.m_script
291 && m_syntheticBold == other.m_syntheticBold 291 && m_syntheticBold == other.m_syntheticBold
292 && m_syntheticItalic == other.m_syntheticItalic 292 && m_syntheticItalic == other.m_syntheticItalic
293 && m_featureSettings == other.m_featureSettings 293 && m_featureSettings == other.m_featureSettings
294 && m_subpixelTextPosition == other.m_subpixelTextPosition; 294 && m_subpixelTextPosition == other.m_subpixelTextPosition;
295 } 295 }
296 296
297 } // namespace blink 297 } // namespace blink
298 298
299 #endif 299 #endif
OLDNEW
« no previous file with comments | « Source/core/dom/Document.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698