WebKit merge 41660:41709 (WebKit side)....

third_party/WebKit/WebCore/platform/graphics/chromium/FontChromiumWin.cpp

 /*
  * Copyright (C) 2006, 2007 Apple Computer, Inc.
  * Copyright (c) 2006, 2007, 2008, 2009, Google Inc. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  * 
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 168 matching lines @@
     m_hdc = m_transparency.platformContext()->canvas()->beginPlatformPaint();
     m_oldFont = ::SelectObject(m_hdc, m_font->platformData().hfont());
     SetTextColor(m_hdc, skia::SkColorToCOLORREF(color));
     SetBkMode(m_hdc, TRANSPARENT);
 }
 
 TransparencyAwareFontPainter::~TransparencyAwareFontPainter()
 {
     if (!m_useGDI)
         return;  // Nothing to do.
+    m_transparency.composite();
     if (m_createdTransparencyLayer)
         m_graphicsContext->endTransparencyLayer();
 
     ::SelectObject(m_hdc, m_oldFont);
     m_platformContext->canvas()->endPlatformPaint();
 }
 
 bool TransparencyAwareFontPainter::drawGlyphs(int numGlyphs,
                                               const WORD* glyphs,
                                               const int* advances,
@@ skipping 135 matching lines @@
     int charIndex = state.xToCharacter(x);
 
     // XToCharacter will return -1 if the position is before the first
     // character (we get called like this sometimes).
     if (charIndex < 0)
         charIndex = 0;
     return charIndex;
 }
 
 } // namespace WebCore