Modified: trunk/Source/WebCore/platform/graphics/win/FontCGWin.cpp (126665 => 126666)
--- trunk/Source/WebCore/platform/graphics/win/FontCGWin.cpp 2012-08-25 00:40:35 UTC (rev 126665)
+++ trunk/Source/WebCore/platform/graphics/win/FontCGWin.cpp 2012-08-25 00:50:05 UTC (rev 126666)
@@ -127,176 +127,6 @@
return path;
}
-static void drawGDIGlyphs(GraphicsContext* graphicsContext, const SimpleFontData* font, const GlyphBuffer& glyphBuffer,
- int from, int numGlyphs, const FloatPoint& point)
-{
- Color fillColor = graphicsContext->fillColor();
-
- bool drawIntoBitmap = false;
- TextDrawingModeFlags drawingMode = graphicsContext->textDrawingMode();
- if (drawingMode == TextModeFill) {
- if (!fillColor.alpha())
- return;
-
- drawIntoBitmap = fillColor.alpha() != 255 || graphicsContext->isInTransparencyLayer();
- if (!drawIntoBitmap) {
- FloatSize offset;
- float blur;
- Color color;
- ColorSpace shadowColorSpace;
-
- graphicsContext->getShadow(offset, blur, color, shadowColorSpace);
- drawIntoBitmap = offset.width() || offset.height() || blur;
- }
- }
-
- // We have to convert CG's two-dimensional floating point advances to just horizontal integer advances.
- Vector<int, 2048> gdiAdvances;
- int totalWidth = 0;
- for (int i = 0; i < numGlyphs; i++) {
- gdiAdvances.append(lroundf(glyphBuffer.advanceAt(from + i)));
- totalWidth += gdiAdvances[i];
- }
-
- HDC hdc = 0;
- OwnPtr<GraphicsContext::WindowsBitmap> bitmap;
- IntRect textRect;
- if (!drawIntoBitmap)
- hdc = graphicsContext->getWindowsContext(textRect, true, false);
- if (!hdc) {
- drawIntoBitmap = true;
- // We put slop into this rect, since glyphs can overflow the ascent/descent bounds and the left/right edges.
- // FIXME: Can get glyphs' optical bounds (even from CG) to get this right.
- const FontMetrics& fontMetrics = font->fontMetrics();
- int lineGap = fontMetrics.lineGap();
- textRect = IntRect(point.x() - (fontMetrics.ascent() + fontMetrics.descent()) / 2,
- point.y() - fontMetrics.ascent() - lineGap,
- totalWidth + fontMetrics.ascent() + fontMetrics.descent(),
- fontMetrics.lineSpacing());
- bitmap = graphicsContext->createWindowsBitmap(textRect.size());
- memset(bitmap->buffer(), 255, bitmap->bufferLength());
- hdc = bitmap->hdc();
-
- XFORM xform;
- xform.eM11 = 1.0f;
- xform.eM12 = 0.0f;
- xform.eM21 = 0.0f;
- xform.eM22 = 1.0f;
- xform.eDx = -textRect.x();
- xform.eDy = -textRect.y();
- SetWorldTransform(hdc, &xform);
- }
-
- SelectObject(hdc, font->platformData().hfont());
-
- // Set the correct color.
- if (drawIntoBitmap)
- SetTextColor(hdc, RGB(0, 0, 0));
- else
- SetTextColor(hdc, RGB(fillColor.red(), fillColor.green(), fillColor.blue()));
-
- SetBkMode(hdc, TRANSPARENT);
- SetTextAlign(hdc, TA_LEFT | TA_BASELINE);
-
- // Uniscribe gives us offsets to help refine the positioning of combining glyphs.
- FloatSize translation = glyphBuffer.offsetAt(from);
- if (translation.width() || translation.height()) {
- XFORM xform;
- xform.eM11 = 1.0;
- xform.eM12 = 0;
- xform.eM21 = 0;
- xform.eM22 = 1.0;
- xform.eDx = translation.width();
- xform.eDy = translation.height();
- ModifyWorldTransform(hdc, &xform, MWT_LEFTMULTIPLY);
- }
-
- if (drawingMode == TextModeFill) {
- XFORM xform;
- xform.eM11 = 1.0;
- xform.eM12 = 0;
- xform.eM21 = font->platformData().syntheticOblique() ? -tanf(syntheticObliqueAngle * piFloat / 180.0f) : 0;
- xform.eM22 = 1.0;
- xform.eDx = point.x();
- xform.eDy = point.y();
- ModifyWorldTransform(hdc, &xform, MWT_LEFTMULTIPLY);
- ExtTextOut(hdc, 0, 0, ETO_GLYPH_INDEX, 0, reinterpret_cast<const WCHAR*>(glyphBuffer.glyphs(from)), numGlyphs, gdiAdvances.data());
- if (font->syntheticBoldOffset()) {
- xform.eM21 = 0;
- xform.eDx = font->syntheticBoldOffset();
- xform.eDy = 0;
- ModifyWorldTransform(hdc, &xform, MWT_LEFTMULTIPLY);
- ExtTextOut(hdc, 0, 0, ETO_GLYPH_INDEX, 0, reinterpret_cast<const WCHAR*>(glyphBuffer.glyphs(from)), numGlyphs, gdiAdvances.data());
- }
- } else {
- XFORM xform;
- GetWorldTransform(hdc, &xform);
- AffineTransform hdcTransform(xform.eM11, xform.eM21, xform.eM12, xform.eM22, xform.eDx, xform.eDy);
- CGAffineTransform initialGlyphTransform = hdcTransform.isInvertible() ? hdcTransform.inverse() : CGAffineTransformIdentity;
- if (font->platformData().syntheticOblique())
- initialGlyphTransform = CGAffineTransformConcat(initialGlyphTransform, CGAffineTransformMake(1, 0, tanf(syntheticObliqueAngle * piFloat / 180.0f), 1, 0, 0));
- initialGlyphTransform.tx = 0;
- initialGlyphTransform.ty = 0;
- CGContextRef cgContext = graphicsContext->platformContext();
-
- CGContextSaveGState(cgContext);
-
- BOOL fontSmoothingEnabled = false;
- SystemParametersInfo(SPI_GETFONTSMOOTHING, 0, &fontSmoothingEnabled, 0);
- CGContextSetShouldAntialias(cgContext, fontSmoothingEnabled);
-
- CGContextScaleCTM(cgContext, 1.0, -1.0);
- CGContextTranslateCTM(cgContext, point.x() + glyphBuffer.offsetAt(from).width(), -(point.y() + glyphBuffer.offsetAt(from).height()));
-
- for (unsigned i = 0; i < numGlyphs; ++i) {
- RetainPtr<CGPathRef> glyphPath(AdoptCF, createPathForGlyph(hdc, glyphBuffer.glyphAt(from + i)));
- CGContextSaveGState(cgContext);
- CGContextConcatCTM(cgContext, initialGlyphTransform);
-
- if (drawingMode & TextModeFill) {
- CGContextAddPath(cgContext, glyphPath.get());
- CGContextFillPath(cgContext);
- if (font->syntheticBoldOffset()) {
- CGContextTranslateCTM(cgContext, font->syntheticBoldOffset(), 0);
- CGContextAddPath(cgContext, glyphPath.get());
- CGContextFillPath(cgContext);
- CGContextTranslateCTM(cgContext, -font->syntheticBoldOffset(), 0);
- }
- }
- if (drawingMode & TextModeStroke) {
- CGContextAddPath(cgContext, glyphPath.get());
- CGContextStrokePath(cgContext);
- if (font->syntheticBoldOffset()) {
- CGContextTranslateCTM(cgContext, font->syntheticBoldOffset(), 0);
- CGContextAddPath(cgContext, glyphPath.get());
- CGContextStrokePath(cgContext);
- CGContextTranslateCTM(cgContext, -font->syntheticBoldOffset(), 0);
- }
- }
-
- CGContextRestoreGState(cgContext);
- CGContextTranslateCTM(cgContext, gdiAdvances[i], 0);
- }
-
- CGContextRestoreGState(cgContext);
- }
-
- if (drawIntoBitmap) {
- UInt8* buffer = bitmap->buffer();
- unsigned bufferLength = bitmap->bufferLength();
- for (unsigned i = 0; i < bufferLength; i += 4) {
- // Use green, which is always in the middle.
- UInt8 alpha = (255 - buffer[i + 1]) * fillColor.alpha() / 255;
- buffer[i] = fillColor.blue();
- buffer[i + 1] = fillColor.green();
- buffer[i + 2] = fillColor.red();
- buffer[i + 3] = alpha;
- }
- graphicsContext->drawWindowsBitmap(bitmap.get(), textRect.location());
- } else
- graphicsContext->releaseWindowsContext(hdc, textRect, true, false);
-}
-
void Font::drawGlyphs(GraphicsContext* graphicsContext, const SimpleFontData* font, const GlyphBuffer& glyphBuffer,
int from, int numGlyphs, const FloatPoint& point) const
{
@@ -327,11 +157,6 @@
ASSERT_NOT_REACHED();
}
- if (font->platformData().useGDI() && !shouldUseFontSmoothing) {
- drawGDIGlyphs(graphicsContext, font, glyphBuffer, from, numGlyphs, point);
- return;
- }
-
uint32_t oldFontSmoothingStyle = wkSetFontSmoothingStyle(cgContext, shouldUseFontSmoothing);
const FontPlatformData& platformData = font->platformData();
