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

Side by Side Diff: Source/WebCore/rendering/svg/SVGInlineTextBox.h

Issue 9703008: Merge 110593 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1025/
Patch Set: Created 8 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
« no previous file with comments | « Source/WebCore/rendering/InlineBox.h ('k') | Source/WebCore/rendering/svg/SVGInlineTextBox.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) 2007 Rob Buis <buis@kde.org> 2 * Copyright (C) 2007 Rob Buis <buis@kde.org>
3 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org> 3 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>
4 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 4 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 virtual IntRect localSelectionRect(int startPosition, int endPosition); 50 virtual IntRect localSelectionRect(int startPosition, int endPosition);
51 51
52 bool mapStartEndPositionsIntoFragmentCoordinates(const SVGTextFragment&, int & startPosition, int& endPosition) const; 52 bool mapStartEndPositionsIntoFragmentCoordinates(const SVGTextFragment&, int & startPosition, int& endPosition) const;
53 53
54 virtual FloatRect calculateBoundaries() const; 54 virtual FloatRect calculateBoundaries() const;
55 55
56 void clearTextFragments() { m_textFragments.clear(); } 56 void clearTextFragments() { m_textFragments.clear(); }
57 Vector<SVGTextFragment>& textFragments() { return m_textFragments; } 57 Vector<SVGTextFragment>& textFragments() { return m_textFragments; }
58 const Vector<SVGTextFragment>& textFragments() const { return m_textFragment s; } 58 const Vector<SVGTextFragment>& textFragments() const { return m_textFragment s; }
59 59
60 void dirtyLineBoxes() OVERRIDE;
61
60 bool startsNewTextChunk() const { return m_startsNewTextChunk; } 62 bool startsNewTextChunk() const { return m_startsNewTextChunk; }
61 void setStartsNewTextChunk(bool newTextChunk) { m_startsNewTextChunk = newTe xtChunk; } 63 void setStartsNewTextChunk(bool newTextChunk) { m_startsNewTextChunk = newTe xtChunk; }
62 64
63 int offsetForPositionInFragment(const SVGTextFragment&, float position, bool includePartialGlyphs) const; 65 int offsetForPositionInFragment(const SVGTextFragment&, float position, bool includePartialGlyphs) const;
64 FloatRect selectionRectForTextFragment(const SVGTextFragment&, int fragmentS tartPosition, int fragmentEndPosition, RenderStyle*); 66 FloatRect selectionRectForTextFragment(const SVGTextFragment&, int fragmentS tartPosition, int fragmentEndPosition, RenderStyle*);
65 67
66 private: 68 private:
67 TextRun constructTextRun(RenderStyle*, const SVGTextFragment&) const; 69 TextRun constructTextRun(RenderStyle*, const SVGTextFragment&) const;
68 70
69 bool acquirePaintingResource(GraphicsContext*&, float scalingFactor, RenderO bject*, RenderStyle*); 71 bool acquirePaintingResource(GraphicsContext*&, float scalingFactor, RenderO bject*, RenderStyle*);
(...skipping 14 matching lines...) Expand all
84 int m_paintingResourceMode; 86 int m_paintingResourceMode;
85 bool m_startsNewTextChunk : 1; 87 bool m_startsNewTextChunk : 1;
86 RenderSVGResource* m_paintingResource; 88 RenderSVGResource* m_paintingResource;
87 Vector<SVGTextFragment> m_textFragments; 89 Vector<SVGTextFragment> m_textFragments;
88 }; 90 };
89 91
90 } // namespace WebCore 92 } // namespace WebCore
91 93
92 #endif 94 #endif
93 #endif // SVGInlineTextBox_h 95 #endif // SVGInlineTextBox_h
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/InlineBox.h ('k') | Source/WebCore/rendering/svg/SVGInlineTextBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698