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

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

Issue 1292593003: Revert "Revert "Reland 2: mac: Use a placeholder string for the family name of the system font." Br… (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 4 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/core/layout/LayoutThemeMac.mm ('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 297 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 ['include', 'audio/mac/FFTFrameMac\\.cpp$'], 308 ['include', 'audio/mac/FFTFrameMac\\.cpp$'],
309 ['include', 'fonts/mac/GlyphPageTreeNodeMac\\.cpp$'], 309 ['include', 'fonts/mac/GlyphPageTreeNodeMac\\.cpp$'],
310 ['include', 'mac/ColorMac\\.mm$'], 310 ['include', 'mac/ColorMac\\.mm$'],
311 ['include', 'mac/BlockExceptions\\.mm$'], 311 ['include', 'mac/BlockExceptions\\.mm$'],
312 ['include', 'mac/KillRingMac\\.mm$'], 312 ['include', 'mac/KillRingMac\\.mm$'],
313 ['include', 'mac/LocalCurrentGraphicsContext\\.mm$'], 313 ['include', 'mac/LocalCurrentGraphicsContext\\.mm$'],
314 ['include', 'mac/NSScrollerImpDetails\\.mm$'], 314 ['include', 'mac/NSScrollerImpDetails\\.mm$'],
315 ['include', 'mac/ScrollAnimatorMac\\.mm$'], 315 ['include', 'mac/ScrollAnimatorMac\\.mm$'],
316 ['include', 'mac/ThemeMac\\.h$'], 316 ['include', 'mac/ThemeMac\\.h$'],
317 ['include', 'mac/ThemeMac\\.mm$'], 317 ['include', 'mac/ThemeMac\\.mm$'],
318 ['include', 'mac/VersionUtilMac\\.h$'],
319 ['include', 'mac/VersionUtilMac\\.mm$'],
318 ['include', 'mac/WebCoreNSCellExtras\\.h$'], 320 ['include', 'mac/WebCoreNSCellExtras\\.h$'],
319 ['include', 'mac/WebCoreNSCellExtras\\.mm$'], 321 ['include', 'mac/WebCoreNSCellExtras\\.mm$'],
320 322
321 # Mac uses only ScrollAnimatorMac. 323 # Mac uses only ScrollAnimatorMac.
322 ['exclude', 'scroll/ScrollbarThemeNonMacCommon\\.(cpp|h)$'], 324 ['exclude', 'scroll/ScrollbarThemeNonMacCommon\\.(cpp|h)$'],
323 ['exclude', 'scroll/ScrollAnimatorNone\\.cpp$'], 325 ['exclude', 'scroll/ScrollAnimatorNone\\.cpp$'],
324 ['exclude', 'scroll/ScrollAnimatorNone\\.h$'], 326 ['exclude', 'scroll/ScrollAnimatorNone\\.h$'],
325 327
326 ['exclude', 'fonts/skia/FontCacheSkia\\.cpp$'], 328 ['exclude', 'fonts/skia/FontCacheSkia\\.cpp$'],
327 329
328 ['include', 'geometry/mac/FloatPointMac\\.mm$'], 330 ['include', 'geometry/mac/FloatPointMac\\.mm$'],
329 ['include', 'geometry/mac/FloatRectMac\\.mm$'], 331 ['include', 'geometry/mac/FloatRectMac\\.mm$'],
330 ['include', 'geometry/mac/FloatSizeMac\\.mm$'], 332 ['include', 'geometry/mac/FloatSizeMac\\.mm$'],
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
457 ['OS=="android"', { 459 ['OS=="android"', {
458 'cflags!': ['-mthumb'], 460 'cflags!': ['-mthumb'],
459 }], 461 }],
460 ], 462 ],
461 },{ # target_arch!="arm" 463 },{ # target_arch!="arm"
462 'type': 'none', 464 'type': 'none',
463 }], 465 }],
464 ], 466 ],
465 }], 467 }],
466 } 468 }
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutThemeMac.mm ('k') | Source/platform/blink_platform.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698