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

Side by Side Diff: Source/core/platform/graphics/Font.h

Issue 68483006: Remove ComplexTextController dependency on core (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Try one more time Created 7 years, 1 month 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/inspector/InspectorCSSAgent.h ('k') | Source/core/platform/graphics/Font.cpp » ('j') | 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, 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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 namespace WebCore { 44 namespace WebCore {
45 45
46 class FloatPoint; 46 class FloatPoint;
47 class FloatRect; 47 class FloatRect;
48 class FontData; 48 class FontData;
49 class FontMetrics; 49 class FontMetrics;
50 class FontPlatformData; 50 class FontPlatformData;
51 class FontSelector; 51 class FontSelector;
52 class GlyphBuffer; 52 class GlyphBuffer;
53 class GraphicsContext; 53 class GraphicsContext;
54 class RenderText;
55 class TextLayout; 54 class TextLayout;
56 class TextRun; 55 class TextRun;
57 struct TextRunPaintInfo; 56 struct TextRunPaintInfo;
58 57
59 struct GlyphData; 58 struct GlyphData;
60 59
61 struct GlyphOverflow { 60 struct GlyphOverflow {
62 GlyphOverflow() 61 GlyphOverflow()
63 : left(0) 62 : left(0)
64 , right(0) 63 , right(0)
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 96
98 void update(PassRefPtr<FontSelector>) const; 97 void update(PassRefPtr<FontSelector>) const;
99 98
100 enum CustomFontNotReadyAction { DoNotPaintIfFontNotReady, UseFallbackIfFontN otReady }; 99 enum CustomFontNotReadyAction { DoNotPaintIfFontNotReady, UseFallbackIfFontN otReady };
101 void drawText(GraphicsContext*, const TextRunPaintInfo&, const FloatPoint&, CustomFontNotReadyAction = DoNotPaintIfFontNotReady) const; 100 void drawText(GraphicsContext*, const TextRunPaintInfo&, const FloatPoint&, CustomFontNotReadyAction = DoNotPaintIfFontNotReady) const;
102 void drawEmphasisMarks(GraphicsContext*, const TextRunPaintInfo&, const Atom icString& mark, const FloatPoint&) const; 101 void drawEmphasisMarks(GraphicsContext*, const TextRunPaintInfo&, const Atom icString& mark, const FloatPoint&) const;
103 102
104 float width(const TextRun&, HashSet<const SimpleFontData*>* fallbackFonts = 0, GlyphOverflow* = 0) const; 103 float width(const TextRun&, HashSet<const SimpleFontData*>* fallbackFonts = 0, GlyphOverflow* = 0) const;
105 float width(const TextRun&, int& charsConsumed, String& glyphName) const; 104 float width(const TextRun&, int& charsConsumed, String& glyphName) const;
106 105
107 PassOwnPtr<TextLayout> createLayout(RenderText*, float xPos, bool collapseWh iteSpace) const; 106 PassOwnPtr<TextLayout> createLayoutForMacComplexText(const TextRun&, unsigne d textLength, float xPos, bool collapseWhiteSpace) const;
108 static void deleteLayout(TextLayout*); 107 static void deleteLayout(TextLayout*);
109 static float width(TextLayout&, unsigned from, unsigned len, HashSet<const S impleFontData*>* fallbackFonts = 0); 108 static float width(TextLayout&, unsigned from, unsigned len, HashSet<const S impleFontData*>* fallbackFonts = 0);
110 109
111 int offsetForPosition(const TextRun&, float position, bool includePartialGly phs) const; 110 int offsetForPosition(const TextRun&, float position, bool includePartialGly phs) const;
112 FloatRect selectionRectForText(const TextRun&, const FloatPoint&, int h, int from = 0, int to = -1) const; 111 FloatRect selectionRectForText(const TextRun&, const FloatPoint&, int h, int from = 0, int to = -1) const;
113 112
114 bool isSmallCaps() const { return m_fontDescription.smallCaps(); } 113 bool isSmallCaps() const { return m_fontDescription.smallCaps(); }
115 114
116 float wordSpacing() const { return m_wordSpacing; } 115 float wordSpacing() const { return m_wordSpacing; }
117 float letterSpacing() const { return m_letterSpacing; } 116 float letterSpacing() const { return m_letterSpacing; }
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 332
334 namespace WTF { 333 namespace WTF {
335 334
336 template <> struct OwnedPtrDeleter<WebCore::TextLayout> { 335 template <> struct OwnedPtrDeleter<WebCore::TextLayout> {
337 static void deletePtr(WebCore::TextLayout*); 336 static void deletePtr(WebCore::TextLayout*);
338 }; 337 };
339 338
340 } 339 }
341 340
342 #endif 341 #endif
OLDNEW
« no previous file with comments | « Source/core/inspector/InspectorCSSAgent.h ('k') | Source/core/platform/graphics/Font.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698