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

Side by Side Diff: third_party/WebKit/Source/core/style/ComputedStyle.h

Issue 2416033003: Remove unsafe getFontMetrics methods (Closed)
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, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
6 * rights reserved. 6 * rights reserved.
7 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 7 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.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
(...skipping 2496 matching lines...) Expand 10 before | Expand all | Expand 10 after
2507 EUserSelect userSelect() const { 2507 EUserSelect userSelect() const {
2508 return static_cast<EUserSelect>(m_rareInheritedData->userSelect); 2508 return static_cast<EUserSelect>(m_rareInheritedData->userSelect);
2509 } 2509 }
2510 void setUserSelect(EUserSelect s) { 2510 void setUserSelect(EUserSelect s) {
2511 SET_VAR(m_rareInheritedData, userSelect, s); 2511 SET_VAR(m_rareInheritedData, userSelect, s);
2512 } 2512 }
2513 2513
2514 // Font properties. 2514 // Font properties.
2515 const Font& font() const; 2515 const Font& font() const;
2516 void setFont(const Font&); 2516 void setFont(const Font&);
2517 const FontMetrics& getFontMetrics() const;
wkorman 2016/10/13 22:54:30 Discussed in person -- an alternative approach tha
2518 const FontDescription& getFontDescription() const; 2517 const FontDescription& getFontDescription() const;
2519 bool setFontDescription(const FontDescription&); 2518 bool setFontDescription(const FontDescription&);
2520 bool hasIdenticalAscentDescentAndLineGap(const ComputedStyle& other) const; 2519 bool hasIdenticalAscentDescentAndLineGap(const ComputedStyle& other) const;
2521 2520
2522 // font-size 2521 // font-size
2523 int fontSize() const; 2522 int fontSize() const;
2524 float specifiedFontSize() const; 2523 float specifiedFontSize() const;
2525 float computedFontSize() const; 2524 float computedFontSize() const;
2526 2525
2527 // font-size-adjust 2526 // font-size-adjust
(...skipping 1583 matching lines...) Expand 10 before | Expand all | Expand 10 after
4111 m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1); 4110 m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1);
4112 } 4111 }
4113 4112
4114 inline bool ComputedStyle::hasPseudoElementStyle() const { 4113 inline bool ComputedStyle::hasPseudoElementStyle() const {
4115 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask; 4114 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask;
4116 } 4115 }
4117 4116
4118 } // namespace blink 4117 } // namespace blink
4119 4118
4120 #endif // ComputedStyle_h 4119 #endif // ComputedStyle_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698