Update from https://crrev.com/304715

cc/resources/raster_worker_pool.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/resources/raster_worker_pool.h"
 
 #include <algorithm>
 
 #include "base/debug/trace_event.h"
 #include "base/lazy_instance.h"
@@ skipping 210 matching lines @@
                                         const gfx::Rect& rect,
                                         float scale) {
   DCHECK(IsSupportedPlaybackToMemoryFormat(format)) << format;
 
   // Uses kPremul_SkAlphaType since the result is not known to be opaque.
   SkImageInfo info =
       SkImageInfo::MakeN32(size.width(), size.height(), kPremul_SkAlphaType);
   SkColorType buffer_color_type = ResourceFormatToSkColorType(format);
   bool needs_copy = buffer_color_type != info.colorType();
 
-  // TODO(danakj): Make a SkSurfaceProps with an SkPixelGeometry to enable or
-  // disable LCD text.
-  // TODO(danakj): Disable LCD text on Mac during layout tests:
-  // https://cs.chromium.org#chromium/src/third_party/WebKit/Source/platform/fonts/mac/FontPlatformDataMac.mm&l=55
-  // TODO(danakj): On Windows when LCD text is disabled, ask skia to draw LCD
-  // text offscreen and downsample it to AA text.
-  // https://cs.chromium.org#chromium/src/third_party/WebKit/Source/platform/fonts/win/FontPlatformDataWin.cpp&l=86
-  SkSurfaceProps* surface_props = nullptr;
+  // Use unknown pixel geometry to disable LCD text.
+  SkSurfaceProps surface_props(0, kUnknown_SkPixelGeometry);
+  if (raster_source->CanUseLCDText()) {
+    // LegacyFontHost will get LCD text and skia figures out what type to use.
+    surface_props = SkSurfaceProps(SkSurfaceProps::kLegacyFontHost_InitType);
+  }
 
   if (!stride)
     stride = info.minRowBytes();
 
   if (!needs_copy) {
     skia::RefPtr<SkSurface> surface = skia::AdoptRef(
-        SkSurface::NewRasterDirect(info, memory, stride, surface_props));
+        SkSurface::NewRasterDirect(info, memory, stride, &surface_props));
     skia::RefPtr<SkCanvas> canvas = skia::SharePtr(surface->getCanvas());
     raster_source->PlaybackToCanvas(canvas.get(), rect, scale);
     return;
   }
 
   skia::RefPtr<SkSurface> surface =
-      skia::AdoptRef(SkSurface::NewRaster(info, surface_props));
+      skia::AdoptRef(SkSurface::NewRaster(info, &surface_props));
   skia::RefPtr<SkCanvas> canvas = skia::SharePtr(surface->getCanvas());
   raster_source->PlaybackToCanvas(canvas.get(), rect, scale);
 
   SkImageInfo dst_info = info;
   dst_info.fColorType = buffer_color_type;
   // TODO(kaanb): The GL pipeline assumes a 4-byte alignment for the
   // bitmap data. There will be no need to call SkAlign4 once crbug.com/293728
   // is fixed.
   const size_t dst_row_bytes = SkAlign4(dst_info.minRowBytes());
   DCHECK_EQ(0u, dst_row_bytes % 4);
   bool success = canvas->readPixels(dst_info, memory, dst_row_bytes, 0, 0);
   DCHECK_EQ(true, success);
 }
 
 }  // namespace cc