Rolling Skia DEPS to r1385 (and modifying affected gyp file)

skia/skia.gyp

 # Copyright (c) 2011 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.
 
 {
   'targets': [
     {
       'target_name': 'skia',
       'type': '<(component)',
       'msvs_guid': 'CD9CA56E-4E94-444C-87D4-58CA1E6F300D',
@@ skipping 313 matching lines @@
         '../third_party/skia/src/core/SkEdge.cpp',
         '../third_party/skia/src/core/SkEdge.h',
         '../third_party/skia/src/core/SkFP.h',
         '../third_party/skia/src/core/SkFilterProc.cpp',
         '../third_party/skia/src/core/SkFilterProc.h',
         '../third_party/skia/src/core/SkFlate.cpp',
         '../third_party/skia/src/core/SkFlattenable.cpp',
         '../third_party/skia/src/core/SkFloat.cpp',
         '../third_party/skia/src/core/SkFloat.h',
         '../third_party/skia/src/core/SkFloatBits.cpp',
+        '../third_party/skia/src/core/SkFontHost.cpp',
         '../third_party/skia/src/core/SkGeometry.cpp',
         '../third_party/skia/src/core/SkGlobals.cpp',
         '../third_party/skia/src/core/SkGlyphCache.cpp',
         '../third_party/skia/src/core/SkGlyphCache.h',
         '../third_party/skia/src/core/SkGraphics.cpp',
         '../third_party/skia/src/core/SkLineClipper.cpp',
         '../third_party/skia/src/core/SkMMapStream.cpp',
         '../third_party/skia/src/core/SkMallocPixelRef.cpp',
         '../third_party/skia/src/core/SkMask.cpp',
         '../third_party/skia/src/core/SkMaskFilter.cpp',
@@ skipping 425 matching lines @@
           ],
           'cflags': [
             '-Wno-unused',
             '-Wno-unused-function',
           ],
           'sources': [
             'ext/SkFontHost_fontconfig.cpp',
             'ext/SkFontHost_fontconfig_direct.cpp',
             '../third_party/skia/src/core/SkBlitter_ARGB32_Subpixel.cpp',
             '../third_party/skia/src/ports/SkFontHost_FreeType_Subpixel.cpp',
-            '../third_party/skia/src/core/SkFontHost.cpp',
           ],
           'defines': [
             'SK_SUPPORT_LCDTEXT',
           ],
         }],
         [ 'OS == "mac"', {
           'defines': [
             'SK_BUILD_FOR_MAC',
           ],
           'sources/': [
@@ skipping 154 matching lines @@
       ],
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: