fix windows build; add blend modes

skia/skia_library.gypi

 # 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.
 
 
 # This gypi file contains the Skia library.
 # In component mode (shared_lib) it is folded into a single shared library with
 # the Chrome-specific enhancements but in all other cases it is a separate lib.
 
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!WARNING!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ skipping 18 matching lines @@
 
     '../third_party/skia/src/ports/SkImageDecoder_empty.cpp',
     '../third_party/skia/src/images/SkScaledBitmapSampler.cpp',
 
     '../third_party/skia/src/ports/SkFontConfigInterface_direct.cpp',
     '../third_party/skia/src/ports/SkFontConfigInterface_direct_factory.cpp',
 
     '../third_party/skia/src/ports/SkDiscardableMemory_none.cpp',
 
     '../third_party/skia/src/fonts/SkFontMgr_indirect.cpp',
-    '../third_party/skia/src/ports/SkFontHost_FreeType.cpp',
-
-    '../third_party/skia/src/ports/SkFontMgr_empty_factory.cpp',
-    '../third_party/skia/src/fonts/SkFontMgr_indirect.cpp',
     '../third_party/skia/src/fonts/SkRemotableFontMgr.cpp',
     '../third_party/skia/src/ports/SkRemotableFontMgr_win_dw.cpp',
 
     '../third_party/skia/src/ports/SkImageGenerator_none.cpp',
 
     '../third_party/skia/src/ports/SkFontHost_FreeType.cpp',
     '../third_party/skia/src/ports/SkFontHost_FreeType_common.cpp',
     '../third_party/skia/src/ports/SkFontHost_mac.cpp',
     '../third_party/skia/src/ports/SkFontHost_win.cpp',
     "../third_party/skia/src/ports/SkFontMgr_android.cpp",
     "../third_party/skia/src/ports/SkFontMgr_android_factory.cpp",
     '../third_party/skia/src/ports/SkFontMgr_android_parser.cpp',
-    '../third_party/skia/src/ports/SkFontMgr_win_dw.cpp',
+    '../third_party/skia/src/ports/SkFontMgr_custom.cpp',
+    '../third_party/skia/src/ports/SkFontMgr_custom_empty_factory.cpp',
+
     '../third_party/skia/src/ports/SkGlobalInitialization_default.cpp',
     '../third_party/skia/src/ports/SkMemory_malloc.cpp',
     '../third_party/skia/src/ports/SkOSFile_posix.cpp',
     '../third_party/skia/src/ports/SkOSFile_stdio.cpp',
     '../third_party/skia/src/ports/SkOSFile_win.cpp',
     '../third_party/skia/src/ports/SkScalerContext_win_dw.cpp',
     '../third_party/skia/src/ports/SkTime_Unix.cpp',
     '../third_party/skia/src/ports/SkTLS_pthread.cpp',
     '../third_party/skia/src/ports/SkTLS_win.cpp',
     '../third_party/skia/src/ports/SkTypeface_win_dw.cpp',
 
     '../third_party/skia/src/sfnt/SkOTTable_name.cpp',
     '../third_party/skia/src/sfnt/SkOTUtils.cpp',
   ],
 
   # Exclude all unused files in skia utils.gypi file
   'sources!': [
   '../third_party/skia/src/utils/SkBoundaryPatch.cpp',
   '../third_party/skia/src/utils/SkFrontBufferedStream.cpp',
   '../third_party/skia/src/utils/SkCamera.cpp',
   '../third_party/skia/src/utils/SkDumpCanvas.cpp',
   '../third_party/skia/src/utils/SkInterpolator.cpp',
   '../third_party/skia/src/utils/SkLayer.cpp',
   '../third_party/skia/src/utils/SkMD5.cpp',
   '../third_party/skia/src/utils/SkMeshUtils.cpp',
   '../third_party/skia/src/utils/SkNinePatch.cpp',
-  '../third_party/skia/src/utils/SkOSFile.cpp',
   '../third_party/skia/src/utils/SkParsePath.cpp',
 
 #windows
   '../third_party/skia/src/utils/win/SkAutoCoInitialize.cpp',
   '../third_party/skia/src/utils/win/SkIStream.cpp',
   '../third_party/skia/src/utils/win/SkWGL_win.cpp',
 
 #testing
   '../third_party/skia/src/fonts/SkGScalerContext.cpp',
   ],
@@ skipping 12 matching lines @@
     '../third_party/skia/include/private',
     '../third_party/skia/include/utils',
     '../third_party/skia/src/core',
     '../third_party/skia/src/opts',
     '../third_party/skia/src/image',
     '../third_party/skia/src/pdf',
     '../third_party/skia/src/ports',
     '../third_party/skia/src/sfnt',
     '../third_party/skia/src/utils',
     '../third_party/skia/src/lazy',
+    # TODO(dsinclair): Right way to use third_party.gyp:fx_freetype?
+    '../third_party/freetype/include',
   ],
   'conditions': [
     ['skia_support_gpu != 0', {
       'includes': [
         '../third_party/skia/gyp/gpu.gypi',
       ],
       'sources': [
         '<@(skgpu_null_gl_sources)',
         '<@(skgpu_sources)',
       ],
@@ skipping 12 matching lines @@
       'dependencies': [
         '../third_party/sfntly/sfntly.gyp:sfntly',
       ],
     }],
 
     [ 'OS == "win"', {
       'sources!': [
         # Keeping _win.cpp
         "../third_party/skia/src/utils/SkThreadUtils_pthread.cpp",
       ],
+       'dependencies': [
+        '../third_party/third_party.gyp:fx_freetype'
+      ],
     },{
       'sources!': [
         # Keeping _pthread.cpp
         "../third_party/skia/src/utils/SkThreadUtils_win.cpp",
       ],
     }],
 
     [ 'OS != "mac"', {
       'sources/': [
         ['exclude', '/mac/']
       ],
     }],
     [ 'OS == "android" and target_arch == "arm"', {
       'sources': [
         '../third_party/skia/src/core/SkUtilsArm.cpp',
       ],
     }],
     [ 'OS=="linux"', {
       'dependencies': [
         '../third_party/third_party.gyp:fx_freetype'
       ],
       'cflags': [
         '-Wno-unused',
         '-Wno-unused-function',
       ],
-      # TODO(dsinclair): Right way to use third_party.gyp:fx_freetype?
-      'include_dirs': [
-        '../third_party/freetype/include',
-      ],
     }],
     [ 'OS=="win" or OS=="mac" or OS=="ios" or OS=="android"', {
       'sources!': [
         '../third_party/skia/src/ports/SkFontConfigInterface_direct.cpp',
         '../third_party/skia/src/ports/SkFontConfigInterface_direct_factory.cpp',
         '../third_party/skia/src/ports/SkFontHost_fontconfig.cpp',
         '../third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp',
       ],
     }],
-    [ 'OS=="win" or OS=="mac" or OS=="ios"', {
+    [ 'OS=="mac" or OS=="ios"', {
       'sources!': [
         '../third_party/skia/src/ports/SkFontHost_FreeType.cpp',
         '../third_party/skia/src/ports/SkFontHost_FreeType_common.cpp',
 
       ],
     }],
     [ 'OS == "android"', {
       'dependencies': [
         '../third_party/expat/expat.gyp:expat',
         '../third_party/freetype-android/freetype.gyp:ft2',
@@ skipping 107 matching lines @@
       '../third_party/skia/include/pdf',
       '../third_party/skia/include/gpu',
       '../third_party/skia/include/lazy',
       '../third_party/skia/include/pathops',
       '../third_party/skia/include/pipe',
       '../third_party/skia/include/ports',
       '../third_party/skia/include/utils',
     ],
   },
 }