| 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 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 } | 146 } |
| 147 | 147 |
| 148 WebRect WebFontImpl::estimateTextBounds(const WebTextRun& run, const WebFloatPoi
nt& leftBaseline) const | 148 WebRect WebFontImpl::estimateTextBounds(const WebTextRun& run, const WebFloatPoi
nt& leftBaseline) const |
| 149 { | 149 { |
| 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 |