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

Side by Side Diff: skia/skia.gyp

Issue 11411125: Roll Skia DEPS to r6523 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years 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 | Annotate | Revision Log
« no previous file with comments | « DEPS ('k') | skia/skia_test_expectations.txt » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'skia', 8 'target_name': 'skia',
9 'type': '<(component)', 9 'type': '<(component)',
10 'variables': { 10 'variables': {
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 ], 211 ],
212 'msvs_disabled_warnings': [4244, 4267, 4341, 4345, 4390, 4554, 4748, 4800] , 212 'msvs_disabled_warnings': [4244, 4267, 4341, 4345, 4390, 4554, 4748, 4800] ,
213 'defines': [ 213 'defines': [
214 #'SK_GAMMA_SRGB', 214 #'SK_GAMMA_SRGB',
215 #'SK_GAMMA_APPLY_TO_A8', 215 #'SK_GAMMA_APPLY_TO_A8',
216 'SK_BUILD_NO_IMAGE_ENCODE', 216 'SK_BUILD_NO_IMAGE_ENCODE',
217 'GR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"', 217 'GR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"',
218 'GR_STATIC_RECT_VB=1', 218 'GR_STATIC_RECT_VB=1',
219 'GR_AGGRESSIVE_SHADER_OPTS=1', 219 'GR_AGGRESSIVE_SHADER_OPTS=1',
220 'SK_DEFERRED_CANVAS_USES_GPIPE=1', 220 'SK_DEFERRED_CANVAS_USES_GPIPE=1',
221 'SK_IGNORE_NEW_STROKERECT',
221 222
222 # this flag can be removed entirely once this has baked for a while 223 # this flag can be removed entirely once this has baked for a while
223 'SK_ALLOW_OVER_32K_BITMAPS', 224 'SK_ALLOW_OVER_32K_BITMAPS',
224 225
225 # skia uses static initializers to initialize the serialization logic 226 # skia uses static initializers to initialize the serialization logic
226 # of its "pictures" library. This is currently not used in chrome; if 227 # of its "pictures" library. This is currently not used in chrome; if
227 # it ever gets used the processes that use it need to call 228 # it ever gets used the processes that use it need to call
228 # SkGraphics::Init(). 229 # SkGraphics::Init().
229 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0', 230 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0',
230 231
(...skipping 603 matching lines...) Expand 10 before | Expand all | Expand 10 after
834 'sources': [ 835 'sources': [
835 '../third_party/skia/src/opts/SkBitmapProcState_opts_none.cpp', 836 '../third_party/skia/src/opts/SkBitmapProcState_opts_none.cpp',
836 '../third_party/skia/src/opts/SkBlitRow_opts_none.cpp', 837 '../third_party/skia/src/opts/SkBlitRow_opts_none.cpp',
837 '../third_party/skia/src/opts/SkUtils_opts_none.cpp', 838 '../third_party/skia/src/opts/SkUtils_opts_none.cpp',
838 ], 839 ],
839 }, 840 },
840 ], 841 ],
841 }], 842 }],
842 ], 843 ],
843 } 844 }
OLDNEW
« no previous file with comments | « DEPS ('k') | skia/skia_test_expectations.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698