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

Side by Side Diff: Source/core/rendering/svg/SVGTextRunRenderingContext.h

Issue 652483002: TextRun::length() should return an unsigned (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 6 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) Research In Motion Limited 2011. All rights reserved. 2 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 23 matching lines...) Expand all
34 static PassRefPtr<SVGTextRunRenderingContext> create(RenderObject* renderer) 34 static PassRefPtr<SVGTextRunRenderingContext> create(RenderObject* renderer)
35 { 35 {
36 return adoptRef(new SVGTextRunRenderingContext(renderer)); 36 return adoptRef(new SVGTextRunRenderingContext(renderer));
37 } 37 }
38 38
39 RenderObject* renderer() const { return m_renderer; } 39 RenderObject* renderer() const { return m_renderer; }
40 40
41 #if ENABLE(SVG_FONTS) 41 #if ENABLE(SVG_FONTS)
42 virtual GlyphData glyphDataForCharacter(const Font&, const TextRun&, SimpleS haper&, UChar32 character, bool mirror, int currentCharacter, unsigned& advanceL ength) override; 42 virtual GlyphData glyphDataForCharacter(const Font&, const TextRun&, SimpleS haper&, UChar32 character, bool mirror, int currentCharacter, unsigned& advanceL ength) override;
43 virtual void drawSVGGlyphs(GraphicsContext*, const TextRun&, const SimpleFon tData*, const GlyphBuffer&, int from, int to, const FloatPoint&) const override; 43 virtual void drawSVGGlyphs(GraphicsContext*, const TextRun&, const SimpleFon tData*, const GlyphBuffer&, int from, int to, const FloatPoint&) const override;
44 virtual float floatWidthUsingSVGFont(const Font&, const TextRun&, int& chars Consumed, Glyph& glyphId) const override; 44 virtual float floatWidthUsingSVGFont(const Font&, const TextRun&, unsigned& charsConsumed, Glyph& glyphId) const override;
45 #else 45 #else
46 virtual GlyphData glyphDataForCharacter(const Font&, const TextRun&, SimpleS haper&, UChar32 character, bool mirror, int currentCharacter, unsigned& advanceL ength) override { return 0; } 46 virtual GlyphData glyphDataForCharacter(const Font&, const TextRun&, SimpleS haper&, UChar32 character, bool mirror, int currentCharacter, unsigned& advanceL ength) override { return 0; }
47 virtual void drawSVGGlyphs(GraphicsContext*, const TextRun&, const SimpleFon tData*, const GlyphBuffer&, int from, int to, const FloatPoint&) const override { } 47 virtual void drawSVGGlyphs(GraphicsContext*, const TextRun&, const SimpleFon tData*, const GlyphBuffer&, int from, int to, const FloatPoint&) const override { }
48 virtual float floatWidthUsingSVGFont(const Font&, const TextRun&, int& chars Consumed, Glyph& glyphId) const override { return 0; } 48 virtual float floatWidthUsingSVGFont(const Font&, const TextRun&, unsigned& charsConsumed, Glyph& glyphId) const override { return 0; }
49 #endif 49 #endif
50 50
51 private: 51 private:
52 SVGTextRunRenderingContext(RenderObject* renderer) 52 SVGTextRunRenderingContext(RenderObject* renderer)
53 : m_renderer(renderer) 53 : m_renderer(renderer)
54 { 54 {
55 } 55 }
56 56
57 virtual ~SVGTextRunRenderingContext() { } 57 virtual ~SVGTextRunRenderingContext() { }
58 58
59 RenderObject* m_renderer; 59 RenderObject* m_renderer;
60 }; 60 };
61 61
62 inline bool textRunNeedsRenderingContext(const Font& font) 62 inline bool textRunNeedsRenderingContext(const Font& font)
63 { 63 {
64 // Only save the extra data if SVG Fonts are used, which depend on them. 64 // Only save the extra data if SVG Fonts are used, which depend on them.
65 // FIXME: SVG Fonts won't work as segmented fonts at the moment, if that's f ixed, we need to check for them as well below. 65 // FIXME: SVG Fonts won't work as segmented fonts at the moment, if that's f ixed, we need to check for them as well below.
66 ASSERT(font.primaryFont()); 66 ASSERT(font.primaryFont());
67 return font.primaryFont()->isSVGFont(); 67 return font.primaryFont()->isSVGFont();
68 } 68 }
69 69
70 } // namespace blink 70 } // namespace blink
71 71
72 #endif // SVGTextRunRenderingContext_h 72 #endif // SVGTextRunRenderingContext_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698