Restore more webkit-font-smoothing.

Source/platform/fonts/mac/FontPlatformDataMac.mm

 /*
  * This file is part of the internal font implementation.
  *
  * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (c) 2010 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 32 matching lines @@
     ASSERT(m_font || !m_cgFont);
     uintptr_t hashCodes[2] = { (uintptr_t)m_font, static_cast<uintptr_t>(m_isHashTableDeletedValue << 3 | m_orientation << 2 | m_syntheticBold << 1 | m_syntheticItalic) };
     return StringHasher::hashMemory<sizeof(hashCodes)>(hashCodes);
 }
 
 void FontPlatformData::setupPaint(SkPaint* paint, GraphicsContext*, const Font* font) const
 {
     bool shouldSmoothFonts = true;
     bool shouldAntialias = true;
 
-    shouldAntialias = shouldAntialias && (!LayoutTestSupport::isRunningLayoutTest()
-        || LayoutTestSupport::isFontAntialiasingEnabledForTest());
+    if (font) {
+        switch (font->fontDescription().fontSmoothing()) {
+        case Antialiased:
+            shouldSmoothFonts = false;
+            break;
+        case SubpixelAntialiased:
+            break;
+        case NoSmoothing:
+            shouldAntialias = false;
+            shouldSmoothFonts = false;
+            break;
+        case AutoSmoothing:
+            // For the AutoSmooth case, don't do anything! Keep the default settings.
+            break;
+        }
+    }
+
+    if (LayoutTestSupport::isRunningLayoutTest()) {
+        shouldSmoothFonts = false;
+        shouldAntialias = shouldAntialias && LayoutTestSupport::isFontAntialiasingEnabledForTest();
+    }
+
     bool useSubpixelText = RuntimeEnabledFeatures::subpixelFontScalingEnabled();
-    shouldSmoothFonts = shouldSmoothFonts && !LayoutTestSupport::isRunningLayoutTest();
 
     paint->setAntiAlias(shouldAntialias);
     paint->setEmbeddedBitmapText(false);
     const float ts = m_textSize >= 0 ? m_textSize : 12;
     paint->setTextSize(SkFloatToScalar(ts));
     paint->setTypeface(typeface());
     paint->setFakeBoldText(m_syntheticBold);
     paint->setTextSkewX(m_syntheticItalic ? -SK_Scalar1 / 4 : 0);
     paint->setLCDRenderText(shouldSmoothFonts);
     paint->setSubpixelText(useSubpixelText);
@@ skipping 186 matching lines @@
         else
             fontDescriptor = cascadeToLastResortFontDescriptor();
         m_CTFont.adoptCF(CTFontCreateCopyWithAttributes(m_CTFont.get(), m_textSize, 0, fontDescriptor));
     } else
         m_CTFont.adoptCF(CTFontCreateWithGraphicsFont(m_cgFont.get(), m_textSize, 0, cascadeToLastResortFontDescriptor()));
 
     return m_CTFont.get();
 }
 
 } // namespace blink