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

Side by Side Diff: public/blink_skia_config.gyp

Issue 665223004: Adaptation to Skia FontMgr API change (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Track Ben's API change Created 6 years, 1 month 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/fonts/android/FontCacheAndroid.cpp ('k') | no next file » | 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) 2012 Google Inc. All rights reserved. 2 # Copyright (C) 2012 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 25 matching lines...) Expand all
36 'target_name': 'blink_skia_config', 36 'target_name': 'blink_skia_config',
37 'type': 'none', 37 'type': 'none',
38 'direct_dependent_settings': { 38 'direct_dependent_settings': {
39 'defines': [ 39 'defines': [
40 # Place defines here that require significant Blink rebaselining, or t hat 40 # Place defines here that require significant Blink rebaselining, or t hat
41 # are otherwise best removed in Blink and then rolled into Chromium. 41 # are otherwise best removed in Blink and then rolled into Chromium.
42 # Defines should be in single quotes and a comma must appear after eve ry one. 42 # Defines should be in single quotes and a comma must appear after eve ry one.
43 # DO NOT remove the define until you are ready to rebaseline, and 43 # DO NOT remove the define until you are ready to rebaseline, and
44 # AFTER the flag has been removed from skia.gyp in Chromium. 44 # AFTER the flag has been removed from skia.gyp in Chromium.
45 'SK_DEFERRED_CANVAS_USES_FACTORIES=1', 45 'SK_DEFERRED_CANVAS_USES_FACTORIES=1',
46 'SK_FM_NEW_MATCH_FAMILY_STYLE_CHARACTER=1',
bungeman-chromium 2014/10/24 15:00:54 Need to rebase this patch now that 'SK_DEFERRED_CA
46 ], 47 ],
47 }, 48 },
48 }, 49 },
49 ], 50 ],
50 } 51 }
OLDNEW
« no previous file with comments | « Source/platform/fonts/android/FontCacheAndroid.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698