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

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

Issue 6913012: Merge 85335 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/742/
Patch Set: Created 9 years, 7 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) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz> 2 * Copyright (C) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz>
3 * Copyright (C) 2006, 2008 Apple Inc. All rights reserved. 3 * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
4 * Copyright (C) 2008 Rob Buis <buis@kde.org> 4 * Copyright (C) 2008 Rob Buis <buis@kde.org>
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 30 matching lines...) Expand all
41 void storeLayoutAttributes(const SVGTextLayoutAttributes& attributes) { m_at tributes = attributes; } 41 void storeLayoutAttributes(const SVGTextLayoutAttributes& attributes) { m_at tributes = attributes; }
42 42
43 float scalingFactor() const { return m_scalingFactor; } 43 float scalingFactor() const { return m_scalingFactor; }
44 const Font& scaledFont() const { return m_scaledFont; } 44 const Font& scaledFont() const { return m_scaledFont; }
45 void updateScaledFont(); 45 void updateScaledFont();
46 static void computeNewScaledFontForStyle(RenderObject*, const RenderStyle*, float& scalingFactor, Font& scaledFont); 46 static void computeNewScaledFontForStyle(RenderObject*, const RenderStyle*, float& scalingFactor, Font& scaledFont);
47 47
48 private: 48 private:
49 virtual const char* renderName() const { return "RenderSVGInlineText"; } 49 virtual const char* renderName() const { return "RenderSVGInlineText"; }
50 50
51 virtual void destroy();
51 virtual void styleDidChange(StyleDifference, const RenderStyle*); 52 virtual void styleDidChange(StyleDifference, const RenderStyle*);
52 53
53 // FIXME: We need objectBoundingBox for DRT results and filters at the momen t. 54 // FIXME: We need objectBoundingBox for DRT results and filters at the momen t.
54 // This should be fixed to give back the objectBoundingBox of the text root. 55 // This should be fixed to give back the objectBoundingBox of the text root.
55 virtual FloatRect objectBoundingBox() const { return FloatRect(); } 56 virtual FloatRect objectBoundingBox() const { return FloatRect(); }
56 57
57 virtual bool requiresLayer() const { return false; } 58 virtual bool requiresLayer() const { return false; }
58 virtual bool isSVGInlineText() const { return true; } 59 virtual bool isSVGInlineText() const { return true; }
59 60
60 virtual VisiblePosition positionForPoint(const IntPoint&); 61 virtual VisiblePosition positionForPoint(const IntPoint&);
(...skipping 18 matching lines...) Expand all
79 return static_cast<const RenderSVGInlineText*>(object); 80 return static_cast<const RenderSVGInlineText*>(object);
80 } 81 }
81 82
82 // This will catch anyone doing an unnecessary cast. 83 // This will catch anyone doing an unnecessary cast.
83 void toRenderSVGInlineText(const RenderSVGInlineText*); 84 void toRenderSVGInlineText(const RenderSVGInlineText*);
84 85
85 } 86 }
86 87
87 #endif // ENABLE(SVG) 88 #endif // ENABLE(SVG)
88 #endif // RenderSVGInlineText_h 89 #endif // RenderSVGInlineText_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698