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

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

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

Powered by Google App Engine
This is Rietveld 408576698