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

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

Issue 619923003: Remove HarfBuzzFaceCoreText (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased on top of eae's gyp changes 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 | « LayoutTests/TestExpectations ('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 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 228
229 # Additional .cpp files from platform_generated.gyp:make_platform_generate d actions. 229 # Additional .cpp files from platform_generated.gyp:make_platform_generate d actions.
230 '<(blink_platform_output_dir)/FontFamilyNames.cpp', 230 '<(blink_platform_output_dir)/FontFamilyNames.cpp',
231 '<(blink_platform_output_dir)/RuntimeEnabledFeatures.cpp', 231 '<(blink_platform_output_dir)/RuntimeEnabledFeatures.cpp',
232 '<(blink_platform_output_dir)/RuntimeEnabledFeatures.h', 232 '<(blink_platform_output_dir)/RuntimeEnabledFeatures.h',
233 '<(blink_platform_output_dir)/ColorData.cpp', 233 '<(blink_platform_output_dir)/ColorData.cpp',
234 ], 234 ],
235 'sources/': [ 235 'sources/': [
236 # Exclude all platform specific things, reinclude them below on a per-plat form basis 236 # Exclude all platform specific things, reinclude them below on a per-plat form basis
237 # FIXME: Figure out how to store these patterns in a variable. 237 # FIXME: Figure out how to store these patterns in a variable.
238 ['exclude', '(cf|cg|harfbuzz|mac|opentype|win)/'], 238 ['exclude', '(cf|cg|mac|opentype|win)/'],
239 ['exclude', '(?<!Chromium)(CF|CG|Mac|Win)\\.(cpp|mm?)$'], 239 ['exclude', '(?<!Chromium)(CF|CG|Mac|Win)\\.(cpp|mm?)$'],
240 240
241 # *NEON.cpp files need special compile options. 241 # *NEON.cpp files need special compile options.
242 # They are moved to the webcore_0_neon target. 242 # They are moved to the webcore_0_neon target.
243 ['exclude', 'graphics/cpu/arm/.*NEON\\.(cpp|h)'], 243 ['exclude', 'graphics/cpu/arm/.*NEON\\.(cpp|h)'],
244 ['exclude', 'graphics/cpu/arm/filters/.*NEON\\.(cpp|h)'], 244 ['exclude', 'graphics/cpu/arm/filters/.*NEON\\.(cpp|h)'],
245 ], 245 ],
246 # Disable c4267 warnings until we fix size_t to int truncations. 246 # Disable c4267 warnings until we fix size_t to int truncations.
247 # Disable c4724 warnings which is generated in VS2012 due to improper 247 # Disable c4724 warnings which is generated in VS2012 due to improper
248 # compiler optimizations, see crbug.com/237063 248 # compiler optimizations, see crbug.com/237063
249 'msvs_disabled_warnings': [ 4267, 4334, 4724 ], 249 'msvs_disabled_warnings': [ 4267, 4334, 4724 ],
250 'conditions': [ 250 'conditions': [
251 ['OS=="linux" or OS=="android" or OS=="win"', { 251 ['OS=="linux" or OS=="android" or OS=="win"', {
252 'sources/': [ 252 'sources/': [
253 # Cherry-pick files excluded by the broader regular expressions above. 253 # Cherry-pick files excluded by the broader regular expressions above.
254 ['include', 'fonts/harfbuzz/HarfBuzzFace\\.(cpp|h)$'],
255 ['include', 'fonts/harfbuzz/HarfBuzzFaceSkia\\.cpp$'],
256 ['include', 'fonts/harfbuzz/HarfBuzzShaper\\.(cpp|h)$'],
257 ['include', 'fonts/opentype/OpenTypeTypes\\.h$'], 254 ['include', 'fonts/opentype/OpenTypeTypes\\.h$'],
258 ['include', 'fonts/opentype/OpenTypeVerticalData\\.(cpp|h)$'], 255 ['include', 'fonts/opentype/OpenTypeVerticalData\\.(cpp|h)$'],
259 ['include', 'fonts/skia/SimpleFontDataSkia\\.cpp$'], 256 ['include', 'fonts/skia/SimpleFontDataSkia\\.cpp$'],
260 ], 257 ],
261 'dependencies': [ 258 'dependencies': [
262 '<(DEPTH)/third_party/harfbuzz-ng/harfbuzz.gyp:harfbuzz-ng', 259 '<(DEPTH)/third_party/harfbuzz-ng/harfbuzz.gyp:harfbuzz-ng',
263 ], 260 ],
264 }, { # OS!="linux" and OS!="android" and OS!="win" 261 },
265 'sources/': [ 262 ],
266 ['exclude', 'Harfbuzz[^/]+\\.(cpp|h)$'],
267 ],
268 }],
269 ['OS=="linux" or OS=="android"', { 263 ['OS=="linux" or OS=="android"', {
270 'sources/': [ 264 'sources/': [
271 ['include', 'fonts/linux/FontPlatformDataLinux\\.cpp$'], 265 ['include', 'fonts/linux/FontPlatformDataLinux\\.cpp$'],
272 ] 266 ]
273 }, { # OS!="linux" and OS!="android" 267 }, { # OS!="linux" and OS!="android"
274 'sources/': [ 268 'sources/': [
275 ['exclude', 'fonts/linux/FontPlatformDataLinux\\.cpp$'], 269 ['exclude', 'fonts/linux/FontPlatformDataLinux\\.cpp$'],
276 ] 270 ]
277 }], 271 }],
278 ['OS=="mac"', { 272 ['OS=="mac"', {
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 ['exclude', 'scroll/ScrollAnimatorNone\\.h$'], 322 ['exclude', 'scroll/ScrollAnimatorNone\\.h$'],
329 323
330 # The Mac currently uses FontCustomPlatformDataMac.cpp, 324 # The Mac currently uses FontCustomPlatformDataMac.cpp,
331 # included by regex above, instead. 325 # included by regex above, instead.
332 ['exclude', 'fonts/skia/FontCustomPlatformDataSkia\\.cpp$'], 326 ['exclude', 'fonts/skia/FontCustomPlatformDataSkia\\.cpp$'],
333 327
334 ['exclude', 'fonts/skia/FontCacheSkia\\.cpp$'], 328 ['exclude', 'fonts/skia/FontCacheSkia\\.cpp$'],
335 329
336 ['include', 'fonts/skia/SimpleFontDataSkia\\.cpp$'], 330 ['include', 'fonts/skia/SimpleFontDataSkia\\.cpp$'],
337 331
338 # Mac uses Harfbuzz.
339 ['include', 'fonts/harfbuzz/HarfBuzzFaceCoreText\\.mm$'],
340 ['include', 'fonts/harfbuzz/HarfBuzzFace\\.(cpp|h)$'],
341 ['include', 'fonts/harfbuzz/HarfBuzzShaper\\.(cpp|h)$'],
342
343 ['include', 'geometry/mac/FloatPointMac\\.mm$'], 332 ['include', 'geometry/mac/FloatPointMac\\.mm$'],
344 ['include', 'geometry/mac/FloatRectMac\\.mm$'], 333 ['include', 'geometry/mac/FloatRectMac\\.mm$'],
345 ['include', 'geometry/mac/FloatSizeMac\\.mm$'], 334 ['include', 'geometry/mac/FloatSizeMac\\.mm$'],
346 ['include', 'geometry/mac/IntPointMac\\.mm$'], 335 ['include', 'geometry/mac/IntPointMac\\.mm$'],
347 ['include', 'geometry/mac/IntRectMac\\.mm$'], 336 ['include', 'geometry/mac/IntRectMac\\.mm$'],
348 337
349 ['include', 'geometry/cg/FloatPointCG\\.cpp$'], 338 ['include', 'geometry/cg/FloatPointCG\\.cpp$'],
350 ['include', 'geometry/cg/FloatRectCG\\.cpp$'], 339 ['include', 'geometry/cg/FloatRectCG\\.cpp$'],
351 ['include', 'geometry/cg/FloatSizeCG\\.cpp$'], 340 ['include', 'geometry/cg/FloatSizeCG\\.cpp$'],
352 ['include', 'geometry/cg/IntPointCG\\.cpp$'], 341 ['include', 'geometry/cg/IntPointCG\\.cpp$'],
353 ['include', 'geometry/cg/IntRectCG\\.cpp$'], 342 ['include', 'geometry/cg/IntRectCG\\.cpp$'],
354 ['include', 'geometry/cg/IntSizeCG\\.cpp$'], 343 ['include', 'geometry/cg/IntSizeCG\\.cpp$'],
355 ], 344 ],
356 'defines': [ 345 'defines': [
357 'WebFontCache=ChromiumWebCoreObjCWebFontCache', 346 'WebFontCache=ChromiumWebCoreObjCWebFontCache',
358 ], 347 ],
359 }, { # OS!="mac" 348 }, { # OS!="mac"
360 'sources/': [ 349 'sources/': [
361 ['exclude', 'mac/'], 350 ['exclude', 'mac/'],
362 ['exclude', 'geometry/mac/'], 351 ['exclude', 'geometry/mac/'],
363 ['exclude', 'geometry/cg/'], 352 ['exclude', 'geometry/cg/'],
364 ['exclude', 'scroll/ScrollbarThemeMac'], 353 ['exclude', 'scroll/ScrollbarThemeMac'],
365
366 ['exclude', 'fonts/harfbuzz/HarfBuzzFaceCoreText\\.cpp$'],
367 ], 354 ],
368 }], 355 }],
369 ['OS != "linux" and OS != "mac" and OS != "win"', { 356 ['OS != "linux" and OS != "mac" and OS != "win"', {
370 'sources/': [ 357 'sources/': [
371 ['exclude', 'VDMX[^/]+\\.(cpp|h)$'], 358 ['exclude', 'VDMX[^/]+\\.(cpp|h)$'],
372 ], 359 ],
373 }], 360 }],
374 ['OS=="win"', { 361 ['OS=="win"', {
375 'sources/': [ 362 'sources/': [
376 # We use LocaleWin.cpp instead of LocaleICU.cpp 363 # We use LocaleWin.cpp instead of LocaleICU.cpp
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
480 ['OS=="android"', { 467 ['OS=="android"', {
481 'cflags!': ['-mthumb'], 468 'cflags!': ['-mthumb'],
482 }], 469 }],
483 ], 470 ],
484 },{ # target_arch!="arm" 471 },{ # target_arch!="arm"
485 'type': 'none', 472 'type': 'none',
486 }], 473 }],
487 ], 474 ],
488 }], 475 }],
489 } 476 }
OLDNEW
« no previous file with comments | « LayoutTests/TestExpectations ('k') | Source/platform/blink_platform.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698