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

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

Issue 2427773002: Fixing superscript and subscript baseline for tiny fonts in SVG
Patch Set: Created 4 years, 2 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
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 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights
6 * reserved. 6 * reserved.
7 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> 7 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
11 * License as published by the Free Software Foundation; either 11 * License as published by the Free Software Foundation; either
12 * version 2 of the License, or (at your option) any later version. 12 * version 2 of the License, or (at your option) any later version.
13 * 13 *
14 * This library is distributed in the hope that it will be useful, 14 * This library is distributed in the hope that it will be useful,
15 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17 * Library General Public License for more details. 17 * Library General Public License for more details.
18 * 18 *
19 * You should have received a copy of the GNU Library General Public License 19 * You should have received a copy of the GNU Library General Public License
20 * along with this library; see the file COPYING.LIother.m_ If not, write to 20 * along with this library; see the file COPYING.LIB. If not, write to
eae 2016/10/17 20:14:23 ?
zakerinasab 2016/10/18 15:51:16 It seems to has been replaced by someone by mistak
21 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 21 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
22 * Boston, MA 02110-1301, USA. 22 * Boston, MA 02110-1301, USA.
23 * 23 *
24 */ 24 */
25 25
26 #ifndef FontDescription_h 26 #ifndef FontDescription_h
27 #define FontDescription_h 27 #define FontDescription_h
28 28
29 #include "SkFontStyle.h" 29 #include "SkFontStyle.h"
30 #include "platform/FontFamilyNames.h" 30 #include "platform/FontFamilyNames.h"
(...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 BitFields m_fields; 409 BitFields m_fields;
410 FieldsAsUnsignedType m_fieldsAsUnsigned; 410 FieldsAsUnsignedType m_fieldsAsUnsigned;
411 }; 411 };
412 412
413 static TypesettingFeatures s_defaultTypesettingFeatures; 413 static TypesettingFeatures s_defaultTypesettingFeatures;
414 414
415 static bool s_useSubpixelTextPositioning; 415 static bool s_useSubpixelTextPositioning;
416 }; 416 };
417 417
418 inline bool FontDescription::operator==(const FontDescription& other) const { 418 inline bool FontDescription::operator==(const FontDescription& other) const {
419 return m_familyList == other.m_familyList && m_locale == other.m_locale && 419 FontDescription other2 = other;
420 m_specifiedSize == other.m_specifiedSize && 420 other2.setSubpixelAscentDescent(m_fields.m_subpixelAscentDescent);
eae 2016/10/17 20:14:23 This shouldn't be needed, the fields are compared
zakerinasab 2016/10/18 15:51:16 Acknowledged.
421 m_computedSize == other.m_computedSize && 421 return m_familyList == other2.m_familyList && m_locale == other2.m_locale &&
422 m_adjustedSize == other.m_adjustedSize && 422 m_specifiedSize == other2.m_specifiedSize &&
423 m_sizeAdjust == other.m_sizeAdjust && 423 m_computedSize == other2.m_computedSize &&
424 m_letterSpacing == other.m_letterSpacing && 424 m_adjustedSize == other2.m_adjustedSize &&
425 m_wordSpacing == other.m_wordSpacing && 425 m_sizeAdjust == other2.m_sizeAdjust &&
426 m_fieldsAsUnsigned.parts[0] == other.m_fieldsAsUnsigned.parts[0] && 426 m_letterSpacing == other2.m_letterSpacing &&
427 m_fieldsAsUnsigned.parts[1] == other.m_fieldsAsUnsigned.parts[1] && 427 m_wordSpacing == other2.m_wordSpacing &&
428 (m_featureSettings == other.m_featureSettings || 428 m_fieldsAsUnsigned.parts[0] == other2.m_fieldsAsUnsigned.parts[0] &&
429 (m_featureSettings && other.m_featureSettings && 429 m_fieldsAsUnsigned.parts[1] == other2.m_fieldsAsUnsigned.parts[1] &&
430 *m_featureSettings == *other.m_featureSettings)); 430 (m_featureSettings == other2.m_featureSettings ||
431 (m_featureSettings && other2.m_featureSettings &&
432 *m_featureSettings == *other2.m_featureSettings));
431 } 433 }
432 434
433 } // namespace blink 435 } // namespace blink
434 436
435 #endif 437 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698