Revert "Merge FontPlatformDataHarfBuzz into FontPlatformData"

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 234 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/harfbuzz/FontHarfBuzz\\.cpp$'],
+          ['include', 'fonts/harfbuzz/FontPlatformDataHarfBuzz\\.cpp$'],
           ['include', 'fonts/harfbuzz/HarfBuzzFace\\.(cpp|h)$'],
           ['include', 'fonts/harfbuzz/HarfBuzzFaceSkia\\.cpp$'],
           ['include', 'fonts/harfbuzz/HarfBuzzShaper\\.(cpp|h)$'],
           ['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',
         ],
@@ skipping 88 matching lines @@
         'defines': [
         'WebFontCache=ChromiumWebCoreObjCWebFontCache',
         ],
       }, { # OS!="mac"
         'sources/': [
           ['exclude', 'mac/'],
           ['exclude', 'geometry/mac/'],
           ['exclude', 'geometry/cg/'],
           ['exclude', 'scroll/ScrollbarThemeMac'],
 
+          # FIXME: We will eventually compile this too, but for now it's
+          # only used on mac.
+          ['exclude', 'fonts/FontPlatformData\\.cpp$'],
           ['exclude', 'fonts/harfbuzz/HarfBuzzFaceCoreText\\.cpp$'],
         ],
       }],
       ['OS != "linux" and OS != "mac" and OS != "win"', {
         'sources/': [
           ['exclude', 'VDMX[^/]+\\.(cpp|h)$'],
         ],
       }],
       ['OS=="win"', {
         'sources/': [
@@ skipping 104 matching lines @@
           ['OS=="android"', {
             'cflags!': ['-mthumb'],
           }],
         ],
       },{  # target_arch!="arm"
         'type': 'none',
       }],
     ],
   }],
 }