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

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

Issue 550083005: Merge FontPlatformDataHarfBuzz into FontPlatformData (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Formatting fix in FontPlatformData.h (Daniel's comment) Created 6 years, 3 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 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
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/FontHarfBuzz\\.cpp$'], 254 ['include', 'fonts/harfbuzz/FontHarfBuzz\\.cpp$'],
255 ['include', 'fonts/harfbuzz/FontPlatformDataHarfBuzz\\.cpp$'],
256 ['include', 'fonts/harfbuzz/HarfBuzzFace\\.(cpp|h)$'], 255 ['include', 'fonts/harfbuzz/HarfBuzzFace\\.(cpp|h)$'],
257 ['include', 'fonts/harfbuzz/HarfBuzzFaceSkia\\.cpp$'], 256 ['include', 'fonts/harfbuzz/HarfBuzzFaceSkia\\.cpp$'],
258 ['include', 'fonts/harfbuzz/HarfBuzzShaper\\.(cpp|h)$'], 257 ['include', 'fonts/harfbuzz/HarfBuzzShaper\\.(cpp|h)$'],
259 ['include', 'fonts/opentype/OpenTypeTypes\\.h$'], 258 ['include', 'fonts/opentype/OpenTypeTypes\\.h$'],
260 ['include', 'fonts/opentype/OpenTypeVerticalData\\.(cpp|h)$'], 259 ['include', 'fonts/opentype/OpenTypeVerticalData\\.(cpp|h)$'],
261 ['include', 'fonts/skia/SimpleFontDataSkia\\.cpp$'], 260 ['include', 'fonts/skia/SimpleFontDataSkia\\.cpp$'],
262 ], 261 ],
263 'dependencies': [ 262 'dependencies': [
264 '<(DEPTH)/third_party/harfbuzz-ng/harfbuzz.gyp:harfbuzz-ng', 263 '<(DEPTH)/third_party/harfbuzz-ng/harfbuzz.gyp:harfbuzz-ng',
265 ], 264 ],
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 'defines': [ 353 'defines': [
355 'WebFontCache=ChromiumWebCoreObjCWebFontCache', 354 'WebFontCache=ChromiumWebCoreObjCWebFontCache',
356 ], 355 ],
357 }, { # OS!="mac" 356 }, { # OS!="mac"
358 'sources/': [ 357 'sources/': [
359 ['exclude', 'mac/'], 358 ['exclude', 'mac/'],
360 ['exclude', 'geometry/mac/'], 359 ['exclude', 'geometry/mac/'],
361 ['exclude', 'geometry/cg/'], 360 ['exclude', 'geometry/cg/'],
362 ['exclude', 'scroll/ScrollbarThemeMac'], 361 ['exclude', 'scroll/ScrollbarThemeMac'],
363 362
364 # FIXME: We will eventually compile this too, but for now it's
365 # only used on mac.
366 ['exclude', 'fonts/FontPlatformData\\.cpp$'],
367 ['exclude', 'fonts/harfbuzz/HarfBuzzFaceCoreText\\.cpp$'], 363 ['exclude', 'fonts/harfbuzz/HarfBuzzFaceCoreText\\.cpp$'],
368 ], 364 ],
369 }], 365 }],
370 ['OS != "linux" and OS != "mac" and OS != "win"', { 366 ['OS != "linux" and OS != "mac" and OS != "win"', {
371 'sources/': [ 367 'sources/': [
372 ['exclude', 'VDMX[^/]+\\.(cpp|h)$'], 368 ['exclude', 'VDMX[^/]+\\.(cpp|h)$'],
373 ], 369 ],
374 }], 370 }],
375 ['OS=="win"', { 371 ['OS=="win"', {
376 'sources/': [ 372 'sources/': [
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
481 ['OS=="android"', { 477 ['OS=="android"', {
482 'cflags!': ['-mthumb'], 478 'cflags!': ['-mthumb'],
483 }], 479 }],
484 ], 480 ],
485 },{ # target_arch!="arm" 481 },{ # target_arch!="arm"
486 'type': 'none', 482 'type': 'none',
487 }], 483 }],
488 ], 484 ],
489 }], 485 }],
490 } 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