OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
45 | 45 |
46 using namespace WebCore; | 46 using namespace WebCore; |
47 | 47 |
48 namespace WebKit { | 48 namespace WebKit { |
49 | 49 |
50 WebFont* WebFont::create(const WebFontDescription& desc) | 50 WebFont* WebFont::create(const WebFontDescription& desc) |
51 { | 51 { |
52 return new WebFontImpl(desc, desc.letterSpacing, desc.wordSpacing); | 52 return new WebFontImpl(desc, desc.letterSpacing, desc.wordSpacing); |
53 } | 53 } |
54 | 54 |
55 WebFontImpl::WebFontImpl(const FontDescription& desc, short letterSpacing, short
wordSpacing) | 55 WebFontImpl::WebFontImpl(const FontDescription& desc, float letterSpacing, float
wordSpacing) |
56 : m_font(desc, letterSpacing, wordSpacing) | 56 : m_font(desc, letterSpacing, wordSpacing) |
57 { | 57 { |
58 m_font.update(0); | 58 m_font.update(0); |
59 } | 59 } |
60 | 60 |
61 WebFontDescription WebFontImpl::fontDescription() const | 61 WebFontDescription WebFontImpl::fontDescription() const |
62 { | 62 { |
63 return WebFontDescription(m_font.fontDescription(), m_font.letterSpacing(),
m_font.wordSpacing()); | 63 return WebFontDescription(m_font.fontDescription(), m_font.letterSpacing(),
m_font.wordSpacing()); |
64 } | 64 } |
65 | 65 |
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
150 FontCachePurgePreventer fontCachePurgePreventer; | 150 FontCachePurgePreventer fontCachePurgePreventer; |
151 int totalWidth = m_font.width(run, 0); | 151 int totalWidth = m_font.width(run, 0); |
152 const WebCore::FontMetrics& fontMetrics = m_font.fontMetrics(); | 152 const WebCore::FontMetrics& fontMetrics = m_font.fontMetrics(); |
153 return WebRect(leftBaseline.x - (fontMetrics.ascent() + fontMetrics.descent(
)) / 2, | 153 return WebRect(leftBaseline.x - (fontMetrics.ascent() + fontMetrics.descent(
)) / 2, |
154 leftBaseline.y - fontMetrics.ascent() - fontMetrics.lineGap()
, | 154 leftBaseline.y - fontMetrics.ascent() - fontMetrics.lineGap()
, |
155 totalWidth + fontMetrics.ascent() + fontMetrics.descent(), | 155 totalWidth + fontMetrics.ascent() + fontMetrics.descent(), |
156 fontMetrics.lineSpacing()); | 156 fontMetrics.lineSpacing()); |
157 } | 157 } |
158 | 158 |
159 } // namespace WebKit | 159 } // namespace WebKit |
OLD | NEW |