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

Side by Side Diff: Source/core/layout/svg/SVGTextLayoutEngineBaseline.h

Issue 1081813003: Remove effective zoom from font metrics before SVG text layout. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Update expectations Created 5 years, 8 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) Research In Motion Limited 2010. All rights reserved. 2 * Copyright (C) Research In Motion Limited 2010. 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 18 matching lines...) Expand all
29 class Font; 29 class Font;
30 class LayoutObject; 30 class LayoutObject;
31 class ComputedStyle; 31 class ComputedStyle;
32 class SVGComputedStyle; 32 class SVGComputedStyle;
33 class SVGTextMetrics; 33 class SVGTextMetrics;
34 34
35 // Helper class used by SVGTextLayoutEngine to handle 'alignment-baseline' / 'do minant-baseline' and 'baseline-shift'. 35 // Helper class used by SVGTextLayoutEngine to handle 'alignment-baseline' / 'do minant-baseline' and 'baseline-shift'.
36 class SVGTextLayoutEngineBaseline { 36 class SVGTextLayoutEngineBaseline {
37 WTF_MAKE_NONCOPYABLE(SVGTextLayoutEngineBaseline); 37 WTF_MAKE_NONCOPYABLE(SVGTextLayoutEngineBaseline);
38 public: 38 public:
39 SVGTextLayoutEngineBaseline(const Font&); 39 SVGTextLayoutEngineBaseline(const Font&, float effectiveZoom);
40 40
41 float calculateBaselineShift(const ComputedStyle&) const; 41 float calculateBaselineShift(const ComputedStyle&) const;
42 float calculateAlignmentBaselineShift(bool isVerticalText, const LayoutObjec t* textRenderer) const; 42 float calculateAlignmentBaselineShift(bool isVerticalText, const LayoutObjec t* textRenderer) const;
43 float calculateGlyphOrientationAngle(bool isVerticalText, const SVGComputedS tyle&, const UChar& character) const; 43 float calculateGlyphOrientationAngle(bool isVerticalText, const SVGComputedS tyle&, const UChar& character) const;
44 float calculateGlyphAdvanceAndOrientation(bool isVerticalText, const SVGText Metrics&, float angle, float& xOrientationShift, float& yOrientationShift) const ; 44 float calculateGlyphAdvanceAndOrientation(bool isVerticalText, const SVGText Metrics&, float angle, float& xOrientationShift, float& yOrientationShift) const ;
45 45
46 private: 46 private:
47 EAlignmentBaseline dominantBaselineToAlignmentBaseline(bool isVerticalText, const LayoutObject* textRenderer) const; 47 EAlignmentBaseline dominantBaselineToAlignmentBaseline(bool isVerticalText, const LayoutObject* textRenderer) const;
48 48
49 const Font& m_font; 49 const Font& m_font;
50
51 // Everything we read from the m_font's font descriptor during layout is sca led by the effective
52 // zoom, as fonts always are in computed style. Since layout inside SVG take s place in unzoomed
53 // coordinates we have to compensate for zoom when reading values from the f ont descriptor.
54 float m_effectiveZoom;
50 }; 55 };
51 56
52 } // namespace blink 57 } // namespace blink
53 58
54 #endif 59 #endif
OLDNEW
« no previous file with comments | « Source/core/layout/svg/SVGTextLayoutEngine.cpp ('k') | Source/core/layout/svg/SVGTextLayoutEngineBaseline.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698