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

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

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/svg/SVGInlineTextBox.h ('k') | no next file » | 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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 46
47 SVGInlineTextBox::SVGInlineTextBox(RenderObject* object) 47 SVGInlineTextBox::SVGInlineTextBox(RenderObject* object)
48 : InlineTextBox(object) 48 : InlineTextBox(object)
49 , m_logicalHeight(0) 49 , m_logicalHeight(0)
50 , m_paintingResourceMode(ApplyToDefaultMode) 50 , m_paintingResourceMode(ApplyToDefaultMode)
51 , m_startsNewTextChunk(false) 51 , m_startsNewTextChunk(false)
52 , m_paintingResource(0) 52 , m_paintingResource(0)
53 { 53 {
54 } 54 }
55 55
56 void SVGInlineTextBox::dirtyLineBoxes()
57 {
58 InlineTextBox::dirtyLineBoxes();
59
60 // Clear the now stale text fragments
61 clearTextFragments();
62 }
63
56 int SVGInlineTextBox::offsetForPosition(float, bool) const 64 int SVGInlineTextBox::offsetForPosition(float, bool) const
57 { 65 {
58 // SVG doesn't use the standard offset <-> position selection system, as it' s not suitable for SVGs complex needs. 66 // SVG doesn't use the standard offset <-> position selection system, as it' s not suitable for SVGs complex needs.
59 // vertical text selection, inline boxes spanning multiple lines (contrary t o HTML, etc.) 67 // vertical text selection, inline boxes spanning multiple lines (contrary t o HTML, etc.)
60 ASSERT_NOT_REACHED(); 68 ASSERT_NOT_REACHED();
61 return 0; 69 return 0;
62 } 70 }
63 71
64 int SVGInlineTextBox::offsetForPositionInFragment(const SVGTextFragment& fragmen t, float position, bool includePartialGlyphs) const 72 int SVGInlineTextBox::offsetForPositionInFragment(const SVGTextFragment& fragmen t, float position, bool includePartialGlyphs) const
65 { 73 {
(...skipping 675 matching lines...) Expand 10 before | Expand all | Expand 10 after
741 return true; 749 return true;
742 } 750 }
743 } 751 }
744 } 752 }
745 return false; 753 return false;
746 } 754 }
747 755
748 } // namespace WebCore 756 } // namespace WebCore
749 757
750 #endif 758 #endif
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/svg/SVGInlineTextBox.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698