third_party/WebKit/Source/platform/fonts/Font.h - Issue 1686483002: Oilpan: Remove most WillBe types from the code base

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

Issue 1686483002: Oilpan: Remove most WillBe types from the code base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 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

« third_party/WebKit/Source/core/animation/CSSLengthInterpolationType.cpp ('K') | « third_party/WebKit/Source/platform/exported/WebThreadedDataReceiver.cpp ('k') | third_party/WebKit/Source/platform/fonts/Font.cpp » ('j') | third_party/WebKit/Source/willbe.pl » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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, 2006, 2007, 2010, 2011 Apple Inc. All rights reserved.	5 * Copyright (C) 2003, 2006, 2007, 2010, 2011 Apple Inc. All rights reserved.

6 * Copyright (C) 2008 Holger Hans Peter Freyther	6 * Copyright (C) 2008 Holger Hans Peter Freyther

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 54 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
65 ~Font();	65 ~Font();

66	66

67 Font(const Font&);	67 Font(const Font&);

68 Font& operator=(const Font&);	68 Font& operator=(const Font&);

69	69

70 bool operator==(const Font& other) const;	70 bool operator==(const Font& other) const;

71 bool operator!=(const Font& other) const { return !(*this == other); }	71 bool operator!=(const Font& other) const { return !(*this == other); }

72	72

73 const FontDescription& fontDescription() const { return m_fontDescription; }	73 const FontDescription& fontDescription() const { return m_fontDescription; }

74	74

75 void update(PassRefPtrWillBeRawPtr<FontSelector>) const;	75 void update(RawPtr<FontSelector>) const;

76	76

77 enum CustomFontNotReadyAction { DoNotPaintIfFontNotReady, UseFallbackIfFontN otReady };	77 enum CustomFontNotReadyAction { DoNotPaintIfFontNotReady, UseFallbackIfFontN otReady };

78 bool drawText(SkCanvas*, const TextRunPaintInfo&, const FloatPoint&, float d eviceScaleFactor, const SkPaint&) const;	78 bool drawText(SkCanvas*, const TextRunPaintInfo&, const FloatPoint&, float d eviceScaleFactor, const SkPaint&) const;

79 bool drawBidiText(SkCanvas*, const TextRunPaintInfo&, const FloatPoint&, Cus tomFontNotReadyAction, float deviceScaleFactor, const SkPaint&) const;	79 bool drawBidiText(SkCanvas*, const TextRunPaintInfo&, const FloatPoint&, Cus tomFontNotReadyAction, float deviceScaleFactor, const SkPaint&) const;

80 void drawEmphasisMarks(SkCanvas*, const TextRunPaintInfo&, const AtomicStrin g& mark, const FloatPoint&, float deviceScaleFactor, const SkPaint&) const;	80 void drawEmphasisMarks(SkCanvas*, const TextRunPaintInfo&, const AtomicStrin g& mark, const FloatPoint&, float deviceScaleFactor, const SkPaint&) const;

81	81

82 // Glyph bounds will be the minimum rect containing all glyph strokes, in co ordinates using	82 // Glyph bounds will be the minimum rect containing all glyph strokes, in co ordinates using

83 // (<text run x position>, <baseline position>) as the origin.	83 // (<text run x position>, <baseline position>) as the origin.

84 float width(const TextRun&, HashSet<const SimpleFontData> fallbackFonts = nullptr, FloatRect* glyphBounds = nullptr) const;	84 float width(const TextRun&, HashSet<const SimpleFontData> fallbackFonts = nullptr, FloatRect* glyphBounds = nullptr) const;

85	85

(...skipping 107 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
193 // if the distance to the next tab stop is less than that, advance an additi onal tab stop.	193 // if the distance to the next tab stop is less than that, advance an additi onal tab stop.

194 if (distanceToTabStop < std::max(fontDescription().letterSpacing(), LayoutUn it::epsilon()))	194 if (distanceToTabStop < std::max(fontDescription().letterSpacing(), LayoutUn it::epsilon()))

195 distanceToTabStop += baseTabWidth;	195 distanceToTabStop += baseTabWidth;

196	196

197 return distanceToTabStop;	197 return distanceToTabStop;

198 }	198 }

199	199

200 } // namespace blink	200 } // namespace blink

201	201

202 #endif	202 #endif

OLD	NEW