Merge FontPlatformData::setupPaint and setupPaintForFont on Win

Source/core/platform/graphics/chromium/FontPlatformDataChromiumWin.cpp

 /*
  * Copyright (C) 2006, 2007 Apple Computer, Inc.
  * Copyright (c) 2006, 2007, 2008, 2009, 2012 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 20 matching lines @@
 
 #include "config.h"
 #include "core/platform/graphics/FontPlatformData.h"
 
 #include <windows.h>
 #include <mlang.h>
 #include <objidl.h>
 #include "core/platform/LayoutTestSupport.h"
 #include "core/platform/SharedBuffer.h"
 #include "core/platform/graphics/FontCache.h"
+#include "core/platform/graphics/GraphicsContext.h"
 #include "core/platform/graphics/skia/SkiaFontWin.h"
 #include "core/platform/win/HWndDC.h"
 #include "public/platform/Platform.h"
 #include "public/platform/win/WebSandboxSupport.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkTypeface.h"
 #include "third_party/skia/include/ports/SkTypeface_win.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/StdLibExtras.h"
 
 namespace WebCore {
 
-#if !ENABLE(GDI_FONTS_ON_WINDOWS)
-void FontPlatformData::setupPaint(SkPaint* paint) const
+void FontPlatformData::setupPaint(SkPaint* paint, GraphicsContext* context) const
 {
     const float ts = m_size >= 0 ? m_size : 12;
     paint->setTextSize(SkFloatToScalar(m_size));
     paint->setTypeface(typeface());
+
+    // Only set painting flags when we're actually painting.
+    if (context) {
+        int textFlags = paintTextFlags();
+        if (!context->couldUseLCDRenderedText()) {
+            textFlags &= ~SkPaint::kLCDRenderText_Flag;
+            // If we *just* clear our request for LCD, then GDI seems to
+            // sometimes give us AA text, and sometimes give us BW text. Since the
+            // original intent was LCD, we want to force AA (rather than BW), so we
+            // add a special bit to tell Skia to do its best to avoid the BW: by
+            // drawing LCD offscreen and downsampling that to AA.
+            textFlags |= SkPaint::kGenA8FromLCD_Flag;
+        }
+
+        static const uint32_t textFlagsMask = SkPaint::kAntiAlias_Flag |
+            SkPaint::kLCDRenderText_Flag |
+            SkPaint::kGenA8FromLCD_Flag;
+
+        SkASSERT(!(textFlags & ~textFlagsMask));
+        uint32_t flags = paint->getFlags();
+        flags &= ~textFlagsMask;
+        flags |= textFlags;
+        paint->setFlags(flags);
+    }
 }
-#endif
 
 // Lookup the current system settings for font smoothing.
 // We cache these values for performance, but if the browser has a way to be
 // notified when these change, we could re-query them at that time.
 static uint32_t getDefaultGDITextFlags()
 {
     static bool gInited;
     static uint32_t gFlags;
     if (!gInited) {
         BOOL enabled;
@@ skipping 262 matching lines @@
 
 bool FontPlatformData::ensureFontLoaded(HFONT font)
 {
     WebKit::WebSandboxSupport* sandboxSupport = WebKit::Platform::current()->sandboxSupport();
     // if there is no sandbox, then we can assume the font
     // was able to be loaded successfully already
     return sandboxSupport ? sandboxSupport->ensureFontLoaded(font) : true;
 }
 
 }