Merge FontPlatformDataSkia with FontPlatformData

Merge FontPlatformDataSkia with FontPlatformData

FontPlatformDataSkia is now compiled on all platforms. Merge it with
FontPlatformData.

BUG=286450
R=pdr@chromium.org

Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=183169

[eae, 2014-10-02 20:37:39]

eae@chromium.org changed reviewers:
+ pdr@chromium.org

[pdr., 2014-10-02 21:14:17]

The CQ bit was checked by pdr@chromium.org

[pdr., 2014-10-02 21:14:18]

lgtm

[commit-bot: I haz the power, 2014-10-02 21:14:35]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/622883002/1

[commit-bot: I haz the power, 2014-10-02 22:19:36]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-10-02 22:19:37]

Failed to apply patch for Source/platform/blink_platform.gypi:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file Source/platform/blink_platform.gypi
  Hunk #1 FAILED at 407.
  1 out of 1 hunk FAILED -- saving rejects to file
Source/platform/blink_platform.gypi.rej

Patch:       Source/platform/blink_platform.gypi
Index: Source/platform/blink_platform.gypi
diff --git a/Source/platform/blink_platform.gypi
b/Source/platform/blink_platform.gypi
index
86de134dd6177ef949d25058a48d05ba423f9760..4951a3569327e2d100ff079b8ee62dab5dfd28aa
100644
--- a/Source/platform/blink_platform.gypi
+++ b/Source/platform/blink_platform.gypi
@@ -407,7 +407,6 @@
       'fonts/opentype/OpenTypeVerticalData.h',
       'fonts/skia/FontCacheSkia.cpp',
       'fonts/skia/FontCustomPlatformDataSkia.cpp',
-      'fonts/skia/FontPlatformDataSkia.cpp',
       'fonts/skia/SimpleFontDataSkia.cpp',
       'fonts/win/FontCacheSkiaWin.cpp',
       'fonts/win/FontFallbackWin.cpp',

[eae, 2014-10-02 22:25:19]

The CQ bit was checked by eae@chromium.org

[commit-bot: I haz the power, 2014-10-02 22:25:47]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/622883002/20001

[commit-bot: I haz the power, 2014-10-03 00:33:39]

Committed patchset #2 (id:20001) as 183169