Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(863)

Side by Side Diff: Source/platform/blink_platform.gyp

Issue 618723003: Revert of Switch to HarfBuzz on Mac and remove CoreText shaper (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/platform/BUILD.gn ('k') | Source/platform/blink_platform.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # 1 #
2 # Copyright (C) 2013 Google Inc. All rights reserved. 2 # Copyright (C) 2013 Google Inc. All rights reserved.
3 # 3 #
4 # Redistribution and use in source and binary forms, with or without 4 # Redistribution and use in source and binary forms, with or without
5 # modification, are permitted provided that the following conditions are 5 # modification, are permitted provided that the following conditions are
6 # met: 6 # met:
7 # 7 #
8 # * Redistributions of source code must retain the above copyright 8 # * Redistributions of source code must retain the above copyright
9 # notice, this list of conditions and the following disclaimer. 9 # notice, this list of conditions and the following disclaimer.
10 # * Redistributions in binary form must reproduce the above 10 # * Redistributions in binary form must reproduce the above
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 294
295 # The Mac uses mac/KillRingMac.mm instead of the dummy 295 # The Mac uses mac/KillRingMac.mm instead of the dummy
296 # implementation. 296 # implementation.
297 ['exclude', 'KillRingNone\\.cpp$'], 297 ['exclude', 'KillRingNone\\.cpp$'],
298 298
299 # The Mac build is USE(CF). 299 # The Mac build is USE(CF).
300 ['include', 'CF\\.cpp$'], 300 ['include', 'CF\\.cpp$'],
301 301
302 # Use native Mac font code from core. 302 # Use native Mac font code from core.
303 ['include', '(fonts/)?mac/[^/]*Font[^/]*\\.(cpp|mm?)$'], 303 ['include', '(fonts/)?mac/[^/]*Font[^/]*\\.(cpp|mm?)$'],
304 304 ['include', 'fonts/mac/ComplexText[^/]*\\.(cpp|h)$'],
305 # TODO(dro): Merge the opentype vertical data files inclusion across a ll platforms.
306 ['include', 'fonts/opentype/OpenTypeTypes\\.h$'],
307 ['include', 'fonts/opentype/OpenTypeVerticalData\\.(cpp|h)$'],
308 305
309 # Cherry-pick some files that can't be included by broader regexps. 306 # Cherry-pick some files that can't be included by broader regexps.
310 # Some of these are used instead of Chromium platform files, see 307 # Some of these are used instead of Chromium platform files, see
311 # the specific exclusions in the "exclude" list below. 308 # the specific exclusions in the "exclude" list below.
312 ['include', 'audio/mac/FFTFrameMac\\.cpp$'], 309 ['include', 'audio/mac/FFTFrameMac\\.cpp$'],
313 ['include', 'fonts/mac/GlyphPageTreeNodeMac\\.cpp$'], 310 ['include', 'fonts/mac/ComplexTextControllerCoreText\\.mm$'],
314 ['include', 'mac/ColorMac\\.mm$'], 311 ['include', 'mac/ColorMac\\.mm$'],
315 ['include', 'mac/BlockExceptions\\.mm$'], 312 ['include', 'mac/BlockExceptions\\.mm$'],
316 ['include', 'mac/KillRingMac\\.mm$'], 313 ['include', 'mac/KillRingMac\\.mm$'],
317 ['include', 'mac/LocalCurrentGraphicsContext\\.mm$'], 314 ['include', 'mac/LocalCurrentGraphicsContext\\.mm$'],
318 ['include', 'mac/NSScrollerImpDetails\\.mm$'], 315 ['include', 'mac/NSScrollerImpDetails\\.mm$'],
319 ['include', 'mac/ScrollAnimatorMac\\.mm$'], 316 ['include', 'mac/ScrollAnimatorMac\\.mm$'],
320 ['include', 'mac/ScrollElasticityController\\.mm$'], 317 ['include', 'mac/ScrollElasticityController\\.mm$'],
321 ['include', 'mac/ThemeMac\\.h$'], 318 ['include', 'mac/ThemeMac\\.h$'],
322 ['include', 'mac/ThemeMac\\.mm$'], 319 ['include', 'mac/ThemeMac\\.mm$'],
323 ['include', 'mac/WebCoreNSCellExtras\\.h$'], 320 ['include', 'mac/WebCoreNSCellExtras\\.h$'],
324 ['include', 'mac/WebCoreNSCellExtras\\.mm$'], 321 ['include', 'mac/WebCoreNSCellExtras\\.mm$'],
325 322
326 # Mac uses only ScrollAnimatorMac. 323 # Mac uses only ScrollAnimatorMac.
327 ['exclude', 'scroll/ScrollbarThemeNonMacCommon\\.(cpp|h)$'], 324 ['exclude', 'scroll/ScrollbarThemeNonMacCommon\\.(cpp|h)$'],
328 ['exclude', 'scroll/ScrollAnimatorNone\\.cpp$'], 325 ['exclude', 'scroll/ScrollAnimatorNone\\.cpp$'],
329 ['exclude', 'scroll/ScrollAnimatorNone\\.h$'], 326 ['exclude', 'scroll/ScrollAnimatorNone\\.h$'],
330 327
331 # The Mac currently uses FontCustomPlatformDataMac.cpp, 328 # The Mac currently uses FontCustomPlatformDataMac.cpp,
332 # included by regex above, instead. 329 # included by regex above, instead.
333 ['exclude', 'fonts/skia/FontCustomPlatformDataSkia\\.cpp$'], 330 ['exclude', 'fonts/skia/FontCustomPlatformDataSkia\\.cpp$'],
334 331
335 ['exclude', 'fonts/skia/FontCacheSkia\\.cpp$'], 332 ['exclude', 'fonts/skia/FontCacheSkia\\.cpp$'],
336 333 ['exclude', 'fonts/skia/SimpleFontDataSkia\\.cpp$'],
337 ['include', 'fonts/skia/SimpleFontDataSkia\\.cpp$'],
338 334
339 # Mac uses Harfbuzz. 335 # Mac uses Harfbuzz.
340 ['include', 'fonts/harfbuzz/FontHarfBuzz\\.cpp$'], 336 ['include', 'fonts/harfbuzz/HarfBuzzFaceCoreText\\.cpp$'],
341 ['include', 'fonts/harfbuzz/HarfBuzzFaceCoreText\\.mm$'],
342 ['include', 'fonts/harfbuzz/HarfBuzzFace\\.(cpp|h)$'], 337 ['include', 'fonts/harfbuzz/HarfBuzzFace\\.(cpp|h)$'],
343 ['include', 'fonts/harfbuzz/HarfBuzzShaper\\.(cpp|h)$'], 338 ['include', 'fonts/harfbuzz/HarfBuzzShaper\\.(cpp|h)$'],
344 339
345 ['include', 'geometry/mac/FloatPointMac\\.mm$'], 340 ['include', 'geometry/mac/FloatPointMac\\.mm$'],
346 ['include', 'geometry/mac/FloatRectMac\\.mm$'], 341 ['include', 'geometry/mac/FloatRectMac\\.mm$'],
347 ['include', 'geometry/mac/FloatSizeMac\\.mm$'], 342 ['include', 'geometry/mac/FloatSizeMac\\.mm$'],
348 ['include', 'geometry/mac/IntPointMac\\.mm$'], 343 ['include', 'geometry/mac/IntPointMac\\.mm$'],
349 ['include', 'geometry/mac/IntRectMac\\.mm$'], 344 ['include', 'geometry/mac/IntRectMac\\.mm$'],
350 345
351 ['include', 'geometry/cg/FloatPointCG\\.cpp$'], 346 ['include', 'geometry/cg/FloatPointCG\\.cpp$'],
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
482 ['OS=="android"', { 477 ['OS=="android"', {
483 'cflags!': ['-mthumb'], 478 'cflags!': ['-mthumb'],
484 }], 479 }],
485 ], 480 ],
486 },{ # target_arch!="arm" 481 },{ # target_arch!="arm"
487 'type': 'none', 482 'type': 'none',
488 }], 483 }],
489 ], 484 ],
490 }], 485 }],
491 } 486 }
OLDNEW
« no previous file with comments | « Source/platform/BUILD.gn ('k') | Source/platform/blink_platform.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698