Audit GN cflags and defines to match GYP build.

skia/BUILD.gn

 # Copyright (c) 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.
 
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//testing/test.gni")
 if (current_cpu == "arm") {
   import("//build/config/arm.gni")
 }
@@ skipping 121 matching lines @@
     # need to move this to internal. see crbug.com/457691
     "//third_party/skia/src/core",
   ]
 
   defines = gypi_blink_skia_defines.blink_skia_defines
   defines += gypi_skia_defines.skia_for_chromium_defines
 
   defines += []
 
   if (component_mode == "shared_library") {
-    defines += [ "SKIA_DLL" ]
+    defines += [
+      "SKIA_DLL",
+      "GR_GL_IGNORE_ES3_MSAA=0",
+    ]
   }
 
   if (skia_support_gpu) {
     include_dirs += [
       "//third_party/skia/include/gpu",
       "//third_party/skia/src/gpu",
     ]
     defines += [ "SK_SUPPORT_GPU=1" ]
   } else {
     defines += [ "SK_SUPPORT_GPU=0" ]
@@ skipping 84 matching lines @@
   } else {
     defines += [ "SK_DEFAULT_FONT_CACHE_LIMIT=20971520" ]  # 20 * 1024 * 1024
   }
 
   if (is_win) {
     include_dirs += [
       "//third_party/skia/include/utils/win",
       "//third_party/skia/src/utils/win",
     ]
 
-    defines += [ "SK_FONTHOST_USES_FONTMGR" ]
+    defines += [
+      # On windows, GDI handles are a scarse system-wide resource so we have to
+      # keep the glyph cache, which holds up to 4 GDI handles per entry, to a
+      # fairly small size. http://crbug.com/314387
+      "SK_DEFAULT_FONT_CACHE_COUNT_LIMIT=256",
+    ]
 
     cflags = [
       "/wd4244",  # conversion from 'type1( __int64)' to 'type2 (unsigned int)'
       "/wd4267",  # conversion from 'size_t' (64 bit) to 'type'(32 bit).
       "/wd4341",  # signed value is out of range for enum constant.
       "/wd4345",  # Object is default-initialized if initialization is omitted.
       "/wd4390",  # ';'empty statement found in looping;is it what was intended?
       "/wd4554",  # 'operator' : check operator precedence for possible error
       "/wd4748",  # compiler will disable optimizations if a function has inline
                   # assembly code contains flow control(jmp or jcc) statements.
+

[brettw, 2015/03/05 21:56:53]

gn format did this.

       "/wd4800",  # forcing value to bool 'true/false'(assigning int to bool).
     ]
   }
 }
 
 component("skia") {
   sources = [
     # Chrome sources.
     "config/SkUserConfig.h",
     "ext/SkDiscardableMemory_chrome.cc",
@@ skipping 224 matching lines @@
   ]
   public_configs = [ ":skia_config" ]
 
   deps = [
     ":skia_opts",
     "//base",
     "//base/third_party/dynamic_annotations",
     "//third_party/zlib",
   ]
 
-  if (is_win) {
-    configs -= [
-      # Some files define WIN32_LEAN_AND_MEAN and we want to avoid a duplicate
-      # definition warning.
-      "//build/config/win:lean_and_mean",
-    ]
-  }
-
   if (is_linux) {
     configs += [
       "//build/config/linux:fontconfig",
       "//build/config/linux:freetype2",
     ]
     if (use_pango) {
       configs += [ "//build/config/linux:pangocairo" ]
     }
     deps += [ "//third_party/icu:icuuc" ]
   }
@@ skipping 103 matching lines @@
   deps = [
     ":skia",
     "//base",
     "//base/test:run_all_unittests",
     "//cc:test_support",  # TODO: Fix this test to not depend on cc.
     "//testing/gtest",
     "//ui/gfx",
     "//ui/gfx/geometry",
   ]
 }