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

Side by Side Diff: skia/skia_common.gypi

Issue 124503002: Roll Skia DEPS to r12906 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Roll to 12906 Created 6 years, 11 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 | 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 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 # This gypi file handles the removal of platform-specific files from the 5 # This gypi file handles the removal of platform-specific files from the
6 # Skia build. 6 # Skia build.
7 { 7 {
8 'include_dirs': [ 8 'include_dirs': [
9 '..', 9 '..',
10 'config', 10 'config',
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 'skia_export_defines': [ 140 'skia_export_defines': [
141 'SK_ENABLE_INST_COUNT=0', 141 'SK_ENABLE_INST_COUNT=0',
142 'SK_SUPPORT_GPU=<(skia_support_gpu)', 142 'SK_SUPPORT_GPU=<(skia_support_gpu)',
143 'GR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"', 143 'GR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"',
144 'SK_ENABLE_LEGACY_API_ALIASING=1', 144 'SK_ENABLE_LEGACY_API_ALIASING=1',
145 'SK_ATTR_DEPRECATED=SK_NOTHING_ARG1', 145 'SK_ATTR_DEPRECATED=SK_NOTHING_ARG1',
146 'SK_SUPPORT_LEGACY_COLORTYPE=1', 146 'SK_SUPPORT_LEGACY_COLORTYPE=1',
147 'GR_GL_IGNORE_ES3_MSAA=0', 147 'GR_GL_IGNORE_ES3_MSAA=0',
148 'SK_SUPPORT_DEPRECATED_SCALARROUND', 148 'SK_SUPPORT_DEPRECATED_SCALARROUND',
149 'SK_SUPPORT_LEGACY_SK64', 149 'SK_SUPPORT_LEGACY_SK64',
150 'SK_SUPPORT_LEGACY_ONLOCKPIXELS',
150 ], 151 ],
151 152
152 'default_font_cache_limit%': '(20*1024*1024)', 153 'default_font_cache_limit%': '(20*1024*1024)',
153 154
154 'conditions': [ 155 'conditions': [
155 ['OS== "android"', { 156 ['OS== "android"', {
156 # Android devices are typically more memory constrained, so 157 # Android devices are typically more memory constrained, so
157 # default to a smaller glyph cache (it may be overriden at runtime 158 # default to a smaller glyph cache (it may be overriden at runtime
158 # when the renderer starts up, depending on the actual device memory). 159 # when the renderer starts up, depending on the actual device memory).
159 'default_font_cache_limit': '(1*1024*1024)', 160 'default_font_cache_limit': '(1*1024*1024)',
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 # re-export if they include Skia headers in their public headers. 205 # re-export if they include Skia headers in their public headers.
205 'all_dependent_settings': { 206 'all_dependent_settings': {
206 'include_dirs': [ 207 'include_dirs': [
207 '..', 208 '..',
208 'config', 209 'config',
209 ], 210 ],
210 }, 211 },
211 212
212 'msvs_disabled_warnings': [4244, 4267, 4341, 4345, 4390, 4554, 4748, 4800], 213 'msvs_disabled_warnings': [4244, 4267, 4341, 4345, 4390, 4554, 4748, 4800],
213 } 214 }
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