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

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

Issue 1758383002: Revert of Use FontFallbackPriority Fonts in FontFallbackIterator (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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, 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 11 matching lines...) Expand all
22 * 22 *
23 */ 23 */
24 24
25 #ifndef Font_h 25 #ifndef Font_h
26 #define Font_h 26 #define Font_h
27 27
28 #include "platform/LayoutUnit.h" 28 #include "platform/LayoutUnit.h"
29 #include "platform/PlatformExport.h" 29 #include "platform/PlatformExport.h"
30 #include "platform/fonts/FontDescription.h" 30 #include "platform/fonts/FontDescription.h"
31 #include "platform/fonts/FontFallbackList.h" 31 #include "platform/fonts/FontFallbackList.h"
32 #include "platform/fonts/FontFallbackPriority.h"
33 #include "platform/fonts/SimpleFontData.h" 32 #include "platform/fonts/SimpleFontData.h"
34 #include "platform/text/TabSize.h" 33 #include "platform/text/TabSize.h"
35 #include "platform/text/TextDirection.h" 34 #include "platform/text/TextDirection.h"
36 #include "platform/text/TextPath.h" 35 #include "platform/text/TextPath.h"
37 #include "wtf/Allocator.h" 36 #include "wtf/Allocator.h"
38 #include "wtf/HashMap.h" 37 #include "wtf/HashMap.h"
39 #include "wtf/HashSet.h" 38 #include "wtf/HashSet.h"
40 #include "wtf/MathExtras.h" 39 #include "wtf/MathExtras.h"
41 #include "wtf/text/CharacterNames.h" 40 #include "wtf/text/CharacterNames.h"
42 41
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 float floatWidthForComplexText(const TextRun&, HashSet<const SimpleFontData* >* fallbackFonts, FloatRect* glyphBounds) const; 132 float floatWidthForComplexText(const TextRun&, HashSet<const SimpleFontData* >* fallbackFonts, FloatRect* glyphBounds) const;
134 int offsetForPositionForComplexText(const TextRun&, float position, bool inc ludePartialGlyphs) const; 133 int offsetForPositionForComplexText(const TextRun&, float position, bool inc ludePartialGlyphs) const;
135 FloatRect selectionRectForComplexText(const TextRun&, const FloatPoint&, int h, int from, int to) const; 134 FloatRect selectionRectForComplexText(const TextRun&, const FloatPoint&, int h, int from, int to) const;
136 135
137 bool computeCanShapeWordByWord() const; 136 bool computeCanShapeWordByWord() const;
138 137
139 friend struct SimpleShaper; 138 friend struct SimpleShaper;
140 139
141 public: 140 public:
142 FontSelector* fontSelector() const; 141 FontSelector* fontSelector() const;
143 PassRefPtr<FontFallbackIterator> createFontFallbackIterator( 142 PassRefPtr<FontFallbackIterator> createFontFallbackIterator() const;
144 FontFallbackPriority) const;
145 143
146 void willUseFontData(UChar32) const; 144 void willUseFontData(UChar32) const;
147 145
148 bool loadingCustomFonts() const; 146 bool loadingCustomFonts() const;
149 bool isFallbackValid() const; 147 bool isFallbackValid() const;
150 148
151 private: 149 private:
152 bool shouldSkipDrawing() const 150 bool shouldSkipDrawing() const
153 { 151 {
154 return m_fontFallbackList && m_fontFallbackList->shouldSkipDrawing(); 152 return m_fontFallbackList && m_fontFallbackList->shouldSkipDrawing();
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 // 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.
196 if (distanceToTabStop < std::max(fontDescription().letterSpacing(), LayoutUn it::epsilon())) 194 if (distanceToTabStop < std::max(fontDescription().letterSpacing(), LayoutUn it::epsilon()))
197 distanceToTabStop += baseTabWidth; 195 distanceToTabStop += baseTabWidth;
198 196
199 return distanceToTabStop; 197 return distanceToTabStop;
200 } 198 }
201 199
202 } // namespace blink 200 } // namespace blink
203 201
204 #endif 202 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/TestExpectations ('k') | third_party/WebKit/Source/platform/fonts/Font.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698