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

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

Issue 176853009: Fix crash in SVGFontFaceElement::associatedFontElement crash when removing SVGFontFaceElement. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed patch conflict Created 6 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006 Apple Computer, Inc. 2 * Copyright (C) 2006 Apple Computer, Inc.
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-2012. All rights reserved. 4 * Copyright (C) Research In Motion Limited 2010-2012. 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 static RenderSVGText* locateRenderSVGTextAncestor(RenderObject*); 47 static RenderSVGText* locateRenderSVGTextAncestor(RenderObject*);
48 static const RenderSVGText* locateRenderSVGTextAncestor(const RenderObject*) ; 48 static const RenderSVGText* locateRenderSVGTextAncestor(const RenderObject*) ;
49 49
50 bool needsReordering() const { return m_needsReordering; } 50 bool needsReordering() const { return m_needsReordering; }
51 Vector<SVGTextLayoutAttributes*>& layoutAttributes() { return m_layoutAttrib utes; } 51 Vector<SVGTextLayoutAttributes*>& layoutAttributes() { return m_layoutAttrib utes; }
52 52
53 void subtreeChildWasAdded(RenderObject*); 53 void subtreeChildWasAdded(RenderObject*);
54 void subtreeChildWillBeRemoved(RenderObject*, Vector<SVGTextLayoutAttributes *, 2>& affectedAttributes); 54 void subtreeChildWillBeRemoved(RenderObject*, Vector<SVGTextLayoutAttributes *, 2>& affectedAttributes);
55 void subtreeChildWasRemoved(const Vector<SVGTextLayoutAttributes*, 2>& affec tedAttributes); 55 void subtreeChildWasRemoved(const Vector<SVGTextLayoutAttributes*, 2>& affec tedAttributes);
56 void subtreeStyleDidChange(RenderSVGInlineText*); 56 void subtreeStyleDidChange();
57 void subtreeTextDidChange(RenderSVGInlineText*); 57 void subtreeTextDidChange(RenderSVGInlineText*);
58 58
59 private: 59 private:
60 virtual const char* renderName() const OVERRIDE { return "RenderSVGText"; } 60 virtual const char* renderName() const OVERRIDE { return "RenderSVGText"; }
61 virtual bool isSVGText() const OVERRIDE { return true; } 61 virtual bool isSVGText() const OVERRIDE { return true; }
62 62
63 virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE; 63 virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE;
64 virtual bool nodeAtFloatPoint(const HitTestRequest&, HitTestResult&, const F loatPoint& pointInParent, HitTestAction) OVERRIDE; 64 virtual bool nodeAtFloatPoint(const HitTestRequest&, HitTestResult&, const F loatPoint& pointInParent, HitTestAction) OVERRIDE;
65 virtual PositionWithAffinity positionForPoint(const LayoutPoint&) OVERRIDE; 65 virtual PositionWithAffinity positionForPoint(const LayoutPoint&) OVERRIDE;
66 66
(...skipping 24 matching lines...) Expand all
91 bool m_needsTextMetricsUpdate : 1; 91 bool m_needsTextMetricsUpdate : 1;
92 SVGTextLayoutAttributesBuilder m_layoutAttributesBuilder; 92 SVGTextLayoutAttributesBuilder m_layoutAttributesBuilder;
93 Vector<SVGTextLayoutAttributes*> m_layoutAttributes; 93 Vector<SVGTextLayoutAttributes*> m_layoutAttributes;
94 }; 94 };
95 95
96 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderSVGText, isSVGText()); 96 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderSVGText, isSVGText());
97 97
98 } 98 }
99 99
100 #endif 100 #endif
OLDNEW
« no previous file with comments | « Source/core/rendering/svg/RenderSVGInlineText.cpp ('k') | Source/core/rendering/svg/RenderSVGText.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698