| 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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 96 WebCore::FloatRect textClipRect(clip); | 96 WebCore::FloatRect textClipRect(clip); |
| 97 TextRun textRun(run); | 97 TextRun textRun(run); |
| 98 TextRunPaintInfo runInfo(textRun); | 98 TextRunPaintInfo runInfo(textRun); |
| 99 runInfo.from = from; | 99 runInfo.from = from; |
| 100 runInfo.to = to == -1 ? textRun.length() : to; | 100 runInfo.to = to == -1 ? textRun.length() : to; |
| 101 runInfo.bounds = textClipRect; | 101 runInfo.bounds = textClipRect; |
| 102 GraphicsContext gc(canvas); | 102 GraphicsContext gc(canvas); |
| 103 | 103 |
| 104 gc.save(); | 104 gc.save(); |
| 105 gc.setShouldSmoothFonts(canvasIsOpaque); | 105 gc.setShouldSmoothFonts(canvasIsOpaque); |
| 106 gc.setFillColor(color, ColorSpaceDeviceRGB); | 106 gc.setFillColor(color); |
| 107 gc.clip(textClipRect); | 107 gc.clip(textClipRect); |
| 108 m_font.drawText(&gc, runInfo, leftBaseline); | 108 m_font.drawText(&gc, runInfo, leftBaseline); |
| 109 gc.restore(); | 109 gc.restore(); |
| 110 | 110 |
| 111 #if defined(WIN32) | 111 #if defined(WIN32) |
| 112 if (canvasIsOpaque && SkColorGetA(color) == 0xFF && !canvas->isDrawingToLaye
r()) { | 112 if (canvasIsOpaque && SkColorGetA(color) == 0xFF && !canvas->isDrawingToLaye
r()) { |
| 113 // The text drawing logic on Windows ignores the alpha component | 113 // The text drawing logic on Windows ignores the alpha component |
| 114 // intentionally, for performance reasons. | 114 // intentionally, for performance reasons. |
| 115 // (Please see TransparencyAwareFontPainter::initializeForGDI in | 115 // (Please see TransparencyAwareFontPainter::initializeForGDI in |
| 116 // FontChromiumWin.cpp.) | 116 // FontChromiumWin.cpp.) |
| (...skipping 33 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 |