Restore more webkit-font-smoothing.

Source/platform/fonts/mac/FontPlatformDataMac.mm

Index: Source/platform/fonts/mac/FontPlatformDataMac.mm
diff --git a/Source/platform/fonts/mac/FontPlatformDataMac.mm b/Source/platform/fonts/mac/FontPlatformDataMac.mm
index f8b9fdbc105f7bcbf9d0836e36a06297f0445df2..6a5da23dd7d1eaf84777db8d5f1d406284c21570 100644
--- a/Source/platform/fonts/mac/FontPlatformDataMac.mm
+++ b/Source/platform/fonts/mac/FontPlatformDataMac.mm
@@ -50,10 +50,29 @@ void FontPlatformData::setupPaint(SkPaint* paint, GraphicsContext*, const Font*
     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);