Merge SimpleFontData.cpp and SimpleFontDataSkia.cpp

Source/platform/blink_platform.gyp

 #
 # Copyright (C) 2013 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
@@ skipping 235 matching lines @@
     # Disable c4267 warnings until we fix size_t to int truncations.
     # Disable c4724 warnings which is generated in VS2012 due to improper
     # compiler optimizations, see crbug.com/237063
     'msvs_disabled_warnings': [ 4267, 4334, 4724 ],
     'conditions': [
       ['OS=="linux" or OS=="android" or OS=="win"', {
         'sources/': [
           # Cherry-pick files excluded by the broader regular expressions above.
           ['include', 'fonts/opentype/OpenTypeTypes\\.h$'],
           ['include', 'fonts/opentype/OpenTypeVerticalData\\.(cpp|h)$'],
-          ['include', 'fonts/skia/SimpleFontDataSkia\\.cpp$'],
         ],
         'dependencies': [
           '<(DEPTH)/third_party/harfbuzz-ng/harfbuzz.gyp:harfbuzz-ng',
         ],
       },
       ],
       ['OS=="linux" or OS=="android"', {
         'sources/': [
           ['include', 'fonts/linux/FontPlatformDataLinux\\.cpp$'],
         ]
@@ skipping 53 matching lines @@
           ['exclude', 'scroll/ScrollbarThemeNonMacCommon\\.(cpp|h)$'],
           ['exclude', 'scroll/ScrollAnimatorNone\\.cpp$'],
           ['exclude', 'scroll/ScrollAnimatorNone\\.h$'],
 
           # The Mac currently uses FontCustomPlatformDataMac.cpp,
           # included by regex above, instead.
           ['exclude', 'fonts/skia/FontCustomPlatformDataSkia\\.cpp$'],
 
           ['exclude', 'fonts/skia/FontCacheSkia\\.cpp$'],
 
-          ['include', 'fonts/skia/SimpleFontDataSkia\\.cpp$'],
-
           ['include', 'geometry/mac/FloatPointMac\\.mm$'],
           ['include', 'geometry/mac/FloatRectMac\\.mm$'],
           ['include', 'geometry/mac/FloatSizeMac\\.mm$'],
           ['include', 'geometry/mac/IntPointMac\\.mm$'],
           ['include', 'geometry/mac/IntRectMac\\.mm$'],
 
           ['include', 'geometry/cg/FloatPointCG\\.cpp$'],
           ['include', 'geometry/cg/FloatRectCG\\.cpp$'],
           ['include', 'geometry/cg/FloatSizeCG\\.cpp$'],
           ['include', 'geometry/cg/IntPointCG\\.cpp$'],
@@ skipping 20 matching lines @@
         'sources/': [
           # We use LocaleWin.cpp instead of LocaleICU.cpp
           ['exclude', 'text/LocaleICU\\.(cpp|h)$'],
           ['include', 'text/LocaleWin\\.(cpp|h)$'],
 
           ['include', 'clipboard/ClipboardUtilitiesWin\\.(cpp|h)$'],
 
           ['include', 'fonts/opentype/'],
           ['include', 'fonts/skia/FontCustomPlatformDataSkia\\.cpp$'],
           ['include', 'fonts/skia/FontCustomPlatformDataSkia\\.cpp$'],
-          ['include', 'fonts/skia/SimpleFontDataSkia\\.cpp$'],
           ['include', 'fonts/win/FontCacheSkiaWin\\.cpp$'],
           ['include', 'fonts/win/FontFallbackWin\\.(cpp|h)$'],
           ['include', 'fonts/win/FontPlatformDataWin\\.cpp$'],
 
           # SystemInfo.cpp is useful and we don't want to copy it.
           ['include', 'win/SystemInfo\\.cpp$'],
         ],
       }, { # OS!="win"
         'sources/': [
           ['exclude', 'win/'],
@@ skipping 84 matching lines @@
           ['OS=="android"', {
             'cflags!': ['-mthumb'],
           }],
         ],
       },{  # target_arch!="arm"
         'type': 'none',
       }],
     ],
   }],
 }