Improve Skia configuration.

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.
 {
   'dependencies': [
@@ skipping 75 matching lines @@
     '../third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp',
     '../third_party/skia/src/ports/SkFontHost_fontconfig.cpp',
 
     '../third_party/skia/src/ports/SkFontHost_FreeType.cpp',
     '../third_party/skia/src/ports/SkFontHost_FreeType_common.cpp',
     '../third_party/skia/src/ports/SkFontHost_FreeType_common.h',
     '../third_party/skia/src/ports/SkFontConfigParser_android.cpp',
     '../third_party/skia/src/ports/SkFontHost_mac.cpp',
     '../third_party/skia/src/ports/SkFontHost_win.cpp',
     '../third_party/skia/src/ports/SkFontHost_win_dw.cpp',
+   #'../third_party/skia/src/ports/SkFontMgr_default_dw.cpp',
     '../third_party/skia/src/ports/SkFontMgr_default_gdi.cpp',
     '../third_party/skia/src/ports/SkGlobalInitialization_chromium.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/SkThread_pthread.cpp',

[bungeman-chromium, 2013/09/26 22:42:46]

The changes to this file would have to be done with the roll which includes
https://codereview.chromium.org/19808007/ .

-    '../third_party/skia/src/ports/SkThread_win.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/sfnt/SkOTTable_name.cpp',
     '../third_party/skia/src/sfnt/SkOTTable_name.h',
     '../third_party/skia/src/sfnt/SkOTUtils.cpp',
     '../third_party/skia/src/sfnt/SkOTUtils.h',
 
     '../third_party/skia/include/utils/mac/SkCGUtils.h',
@@ skipping 253 matching lines @@
           '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
         ],
       },
       'sources': [
         '../third_party/skia/src/utils/mac/SkStream_mac.cpp',
       ],
     }],
     [ 'OS == "win"', {
       'sources!': [
         '../third_party/skia/src/ports/SkOSFile_posix.cpp',
-        '../third_party/skia/src/ports/SkThread_pthread.cpp',
         '../third_party/skia/src/ports/SkTime_Unix.cpp',
         '../third_party/skia/src/ports/SkTLS_pthread.cpp',
       ],
       'include_dirs': [
         '../third_party/skia/include/utils/win',
         '../third_party/skia/src/utils/win',
       ],
       'defines': [
         'SK_FONTHOST_USES_FONTMGR',
       ],
     },{ # not 'OS == "win"'
       'sources!': [
         '../third_party/skia/src/ports/SkFontHost_win_dw.cpp',
+        '../third_party/skia/src/ports/SkFontMgr_default_dw.cpp',

[djsollen, 2013/09/27 13:52:25]

seems like this is unrelated to the rest of the CL.

[bungeman-skia, 2013/09/27 17:59:13]

Yes, I suppose I should remove these for this CL. Done.

         '../third_party/skia/src/ports/SkFontMgr_default_gdi.cpp',
 
         '../third_party/skia/src/utils/win/SkDWriteFontFileStream.cpp',
         '../third_party/skia/src/utils/win/SkDWriteFontFileStream.h',
         '../third_party/skia/src/utils/win/SkDWriteGeometrySink.cpp',
         '../third_party/skia/src/utils/win/SkDWriteGeometrySink.h',
         '../third_party/skia/src/utils/win/SkHRESULT.cpp',
       ],
     }],
     # TODO(scottmg): http://crbug.com/177306
@@ skipping 59 matching lines @@
       '../third_party/skia/include/pathops',
       '../third_party/skia/include/pipe',
       '../third_party/skia/include/ports',
       '../third_party/skia/include/utils',
     ],
     'defines': [
       '<@(skia_export_defines)',
     ],
   },
 }