Index: Source/platform/blink_platform.gyp |
diff --git a/Source/platform/blink_platform.gyp b/Source/platform/blink_platform.gyp |
index 48e15018840e2ae348281e4d4dd23b2d27c57176..9f09481cc6a2af1ccd6bbbf9365f321c809a1244 100644 |
--- a/Source/platform/blink_platform.gyp |
+++ b/Source/platform/blink_platform.gyp |
@@ -301,16 +301,13 @@ |
# Use native Mac font code from core. |
['include', '(fonts/)?mac/[^/]*Font[^/]*\\.(cpp|mm?)$'], |
- |
- # TODO(dro): Merge the opentype vertical data files inclusion across all platforms. |
- ['include', 'fonts/opentype/OpenTypeTypes\\.h$'], |
- ['include', 'fonts/opentype/OpenTypeVerticalData\\.(cpp|h)$'], |
+ ['include', 'fonts/mac/ComplexText[^/]*\\.(cpp|h)$'], |
# Cherry-pick some files that can't be included by broader regexps. |
# Some of these are used instead of Chromium platform files, see |
# the specific exclusions in the "exclude" list below. |
['include', 'audio/mac/FFTFrameMac\\.cpp$'], |
- ['include', 'fonts/mac/GlyphPageTreeNodeMac\\.cpp$'], |
+ ['include', 'fonts/mac/ComplexTextControllerCoreText\\.mm$'], |
['include', 'mac/ColorMac\\.mm$'], |
['include', 'mac/BlockExceptions\\.mm$'], |
['include', 'mac/KillRingMac\\.mm$'], |
@@ -333,12 +330,10 @@ |
['exclude', 'fonts/skia/FontCustomPlatformDataSkia\\.cpp$'], |
['exclude', 'fonts/skia/FontCacheSkia\\.cpp$'], |
- |
- ['include', 'fonts/skia/SimpleFontDataSkia\\.cpp$'], |
+ ['exclude', 'fonts/skia/SimpleFontDataSkia\\.cpp$'], |
# Mac uses Harfbuzz. |
- ['include', 'fonts/harfbuzz/FontHarfBuzz\\.cpp$'], |
- ['include', 'fonts/harfbuzz/HarfBuzzFaceCoreText\\.mm$'], |
+ ['include', 'fonts/harfbuzz/HarfBuzzFaceCoreText\\.cpp$'], |
['include', 'fonts/harfbuzz/HarfBuzzFace\\.(cpp|h)$'], |
['include', 'fonts/harfbuzz/HarfBuzzShaper\\.(cpp|h)$'], |