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

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

Issue 1021483004: Revert of Remove Mac native font type members from FontPlatformData (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 9 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 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 ['include', 'mac/ThemeMac\\.h$'], 310 ['include', 'mac/ThemeMac\\.h$'],
311 ['include', 'mac/ThemeMac\\.mm$'], 311 ['include', 'mac/ThemeMac\\.mm$'],
312 ['include', 'mac/WebCoreNSCellExtras\\.h$'], 312 ['include', 'mac/WebCoreNSCellExtras\\.h$'],
313 ['include', 'mac/WebCoreNSCellExtras\\.mm$'], 313 ['include', 'mac/WebCoreNSCellExtras\\.mm$'],
314 314
315 # Mac uses only ScrollAnimatorMac. 315 # Mac uses only ScrollAnimatorMac.
316 ['exclude', 'scroll/ScrollbarThemeNonMacCommon\\.(cpp|h)$'], 316 ['exclude', 'scroll/ScrollbarThemeNonMacCommon\\.(cpp|h)$'],
317 ['exclude', 'scroll/ScrollAnimatorNone\\.cpp$'], 317 ['exclude', 'scroll/ScrollAnimatorNone\\.cpp$'],
318 ['exclude', 'scroll/ScrollAnimatorNone\\.h$'], 318 ['exclude', 'scroll/ScrollAnimatorNone\\.h$'],
319 319
320 # The Mac currently uses FontCustomPlatformDataMac.cpp,
321 # included by regex above, instead.
322 ['exclude', 'fonts/skia/FontCustomPlatformDataSkia\\.cpp$'],
323
320 ['exclude', 'fonts/skia/FontCacheSkia\\.cpp$'], 324 ['exclude', 'fonts/skia/FontCacheSkia\\.cpp$'],
321 325
322 ['include', 'geometry/mac/FloatPointMac\\.mm$'], 326 ['include', 'geometry/mac/FloatPointMac\\.mm$'],
323 ['include', 'geometry/mac/FloatRectMac\\.mm$'], 327 ['include', 'geometry/mac/FloatRectMac\\.mm$'],
324 ['include', 'geometry/mac/FloatSizeMac\\.mm$'], 328 ['include', 'geometry/mac/FloatSizeMac\\.mm$'],
325 ['include', 'geometry/mac/IntPointMac\\.mm$'], 329 ['include', 'geometry/mac/IntPointMac\\.mm$'],
326 ['include', 'geometry/mac/IntRectMac\\.mm$'], 330 ['include', 'geometry/mac/IntRectMac\\.mm$'],
327 331
328 ['include', 'geometry/cg/FloatPointCG\\.cpp$'], 332 ['include', 'geometry/cg/FloatPointCG\\.cpp$'],
329 ['include', 'geometry/cg/FloatRectCG\\.cpp$'], 333 ['include', 'geometry/cg/FloatRectCG\\.cpp$'],
(...skipping 17 matching lines...) Expand all
347 }], 351 }],
348 ['OS=="win"', { 352 ['OS=="win"', {
349 'sources/': [ 353 'sources/': [
350 # We use LocaleWin.cpp instead of LocaleICU.cpp 354 # We use LocaleWin.cpp instead of LocaleICU.cpp
351 ['exclude', 'text/LocaleICU\\.(cpp|h)$'], 355 ['exclude', 'text/LocaleICU\\.(cpp|h)$'],
352 ['include', 'text/LocaleWin\\.(cpp|h)$'], 356 ['include', 'text/LocaleWin\\.(cpp|h)$'],
353 357
354 ['include', 'clipboard/ClipboardUtilitiesWin\\.(cpp|h)$'], 358 ['include', 'clipboard/ClipboardUtilitiesWin\\.(cpp|h)$'],
355 359
356 ['include', 'fonts/opentype/'], 360 ['include', 'fonts/opentype/'],
361 ['include', 'fonts/skia/FontCustomPlatformDataSkia\\.cpp$'],
362 ['include', 'fonts/skia/FontCustomPlatformDataSkia\\.cpp$'],
357 ['include', 'fonts/win/FontCacheSkiaWin\\.cpp$'], 363 ['include', 'fonts/win/FontCacheSkiaWin\\.cpp$'],
358 ['include', 'fonts/win/FontFallbackWin\\.(cpp|h)$'], 364 ['include', 'fonts/win/FontFallbackWin\\.(cpp|h)$'],
359 ['include', 'fonts/win/FontPlatformDataWin\\.cpp$'], 365 ['include', 'fonts/win/FontPlatformDataWin\\.cpp$'],
360 366
361 # SystemInfo.cpp is useful and we don't want to copy it. 367 # SystemInfo.cpp is useful and we don't want to copy it.
362 ['include', 'win/SystemInfo\\.cpp$'], 368 ['include', 'win/SystemInfo\\.cpp$'],
363 ], 369 ],
364 }, { # OS!="win" 370 }, { # OS!="win"
365 'sources/': [ 371 'sources/': [
366 ['exclude', 'win/'], 372 ['exclude', 'win/'],
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
451 ['OS=="android"', { 457 ['OS=="android"', {
452 'cflags!': ['-mthumb'], 458 'cflags!': ['-mthumb'],
453 }], 459 }],
454 ], 460 ],
455 },{ # target_arch!="arm" 461 },{ # target_arch!="arm"
456 'type': 'none', 462 'type': 'none',
457 }], 463 }],
458 ], 464 ],
459 }], 465 }],
460 } 466 }
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