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

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

Issue 329143007: Fix some SVGFonts compilation errors (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase against ToT Created 6 years, 6 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
« no previous file with comments | « Source/core/rendering/svg/SVGResources.cpp ('k') | Source/core/svg/SVGDocumentExtensions.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) 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 27 matching lines...) Expand all
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 RenderSVGResource* activePaintingResource() const { return m_activePaintingR esource; } 42 RenderSVGResource* activePaintingResource() const { return m_activePaintingR esource; }
43 void setActivePaintingResource(RenderSVGResource* object) { m_activePainting Resource = object; } 43 void setActivePaintingResource(RenderSVGResource* object) { m_activePainting Resource = object; }
44 44
45 virtual GlyphData glyphDataForCharacter(const Font&, const TextRun&, WidthIt erator&, UChar32 character, bool mirror, int currentCharacter, unsigned& advance Length) OVERRIDE; 45 virtual GlyphData glyphDataForCharacter(const Font&, const TextRun&, WidthIt erator&, UChar32 character, bool mirror, int currentCharacter, unsigned& advance Length) OVERRIDE;
46 virtual void drawSVGGlyphs(GraphicsContext*, const TextRun&, const SimpleFon tData*, const GlyphBuffer&, int from, int to, const FloatPoint&) const OVERRIDE; 46 virtual void drawSVGGlyphs(GraphicsContext*, const TextRun&, const SimpleFon tData*, const GlyphBuffer&, int from, int to, const FloatPoint&) const OVERRIDE;
47 virtual float floatWidthUsingSVGFont(const Font&, const TextRun&, int& chars Consumed, Glyph& glyphId) const OVERRIDE; 47 virtual float floatWidthUsingSVGFont(const Font&, const TextRun&, int& chars Consumed, Glyph& glyphId) const OVERRIDE;
48 #else
49 virtual GlyphData glyphDataForCharacter(const Font&, const TextRun&, WidthIt erator&, UChar32 character, bool mirror, int currentCharacter, unsigned& advance Length) OVERRIDE { return 0; }
50 virtual void drawSVGGlyphs(GraphicsContext*, const TextRun&, const SimpleFon tData*, const GlyphBuffer&, int from, int to, const FloatPoint&) const OVERRIDE { }
51 virtual float floatWidthUsingSVGFont(const Font&, const TextRun&, int& chars Consumed, Glyph& glyphId) const OVERRIDE { return 0; }
48 #endif 52 #endif
49 53
50 private: 54 private:
51 SVGTextRunRenderingContext(RenderObject* renderer) 55 SVGTextRunRenderingContext(RenderObject* renderer)
52 : m_renderer(renderer) 56 : m_renderer(renderer)
53 #if ENABLE(SVG_FONTS) 57 #if ENABLE(SVG_FONTS)
54 , m_activePaintingResource(0) 58 , m_activePaintingResource(0)
55 #endif 59 #endif
56 { 60 {
57 } 61 }
(...skipping 11 matching lines...) Expand all
69 { 73 {
70 // Only save the extra data if SVG Fonts are used, which depend on them. 74 // Only save the extra data if SVG Fonts are used, which depend on them.
71 // 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. 75 // 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.
72 ASSERT(font.primaryFont()); 76 ASSERT(font.primaryFont());
73 return font.primaryFont()->isSVGFont(); 77 return font.primaryFont()->isSVGFont();
74 } 78 }
75 79
76 } // namespace WebCore 80 } // namespace WebCore
77 81
78 #endif // SVGTextRunRenderingContext_h 82 #endif // SVGTextRunRenderingContext_h
OLDNEW
« no previous file with comments | « Source/core/rendering/svg/SVGResources.cpp ('k') | Source/core/svg/SVGDocumentExtensions.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698