diff options
| author | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-16 13:34:42 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-16 13:34:42 +0000 |
| commit | d5ba10f22180bbe7ce945d559c4e5a3938c354a7 (patch) | |
| tree | 6dba2d3ae785a6aac3eeb5cd0f059503ecf7dcd4 /skia/skia.gyp | |
| parent | 31e85f3e16a2bc44aba894b6a8d461541fcc1dd0 (diff) | |
| download | chromium_src-d5ba10f22180bbe7ce945d559c4e5a3938c354a7.zip chromium_src-d5ba10f22180bbe7ce945d559c4e5a3938c354a7.tar.gz chromium_src-d5ba10f22180bbe7ce945d559c4e5a3938c354a7.tar.bz2 | |
Roll Skia DEPS to r7212
control: https://codereview.chromium.org/11966002/
Review URL: https://codereview.chromium.org/11958003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177148 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/skia.gyp')
| -rw-r--r-- | skia/skia.gyp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp index f31324b..8646a2f 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -218,6 +218,7 @@ 'GR_STATIC_RECT_VB=1', 'GR_AGGRESSIVE_SHADER_OPTS=1', 'SK_DEFERRED_CANVAS_USES_GPIPE=1', + 'SK_ENABLE_INST_COUNT=0', # this flag can be removed entirely once this has baked for a while 'SK_ALLOW_OVER_32K_BITMAPS', @@ -560,6 +561,7 @@ 'SK_DEFERRED_CANVAS_USES_GPIPE=1', 'GR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"', 'GR_AGGRESSIVE_SHADER_OPTS=1', + 'SK_ENABLE_INST_COUNT=0', ], 'conditions': [ [ 'chromeos == 1', { |