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

Side by Side Diff: skia/skia.gyp

Issue 11299292: Roll Skia DEPS to r6640 & remove supressions (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 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 # skia uses static initializers to initialize the serialization logic 225 # skia uses static initializers to initialize the serialization logic
226 # of its "pictures" library. This is currently not used in chrome; if 226 # 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 227 # it ever gets used the processes that use it need to call
228 # SkGraphics::Init(). 228 # SkGraphics::Init().
229 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0', 229 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0',
230 230
231 # Temporarily keep old int-srcrect behavior, until we determine if 231 # Temporarily keep old int-srcrect behavior, until we determine if
232 # the few failures are a bug or not. 232 # the few failures are a bug or not.
233 'SK_SUPPORT_INT_SRCRECT_DRAWBITMAPRECT', 233 'SK_SUPPORT_INT_SRCRECT_DRAWBITMAPRECT',
234 234
235 # Moved from SkUserConfig.h, so we can rebaseline when we remove this.
236 'SK_DISABLE_DITHER_32BIT_GRADIENT',
237
238 'SK_DISABLE_DASHING_OPTIMIZATION',
239 'SK_DISABLE_SEPARABLE_MASK_BLUR', 235 'SK_DISABLE_SEPARABLE_MASK_BLUR',
240 ], 236 ],
241 'sources!': [ 237 'sources!': [
242 '../third_party/skia/include/core/SkTypes.h', 238 '../third_party/skia/include/core/SkTypes.h',
243 ], 239 ],
244 'conditions': [ 240 'conditions': [
245 ['skia_support_gpu != 0', { 241 ['skia_support_gpu != 0', {
246 'includes': [ 242 'includes': [
247 '../third_party/skia/gyp/gpu.gypi', 243 '../third_party/skia/gyp/gpu.gypi',
248 ], 244 ],
(...skipping 593 matching lines...) Expand 10 before | Expand all | Expand 10 after
842 'sources': [ 838 'sources': [
843 '../third_party/skia/src/opts/SkBitmapProcState_opts_none.cpp', 839 '../third_party/skia/src/opts/SkBitmapProcState_opts_none.cpp',
844 '../third_party/skia/src/opts/SkBlitRow_opts_none.cpp', 840 '../third_party/skia/src/opts/SkBlitRow_opts_none.cpp',
845 '../third_party/skia/src/opts/SkUtils_opts_none.cpp', 841 '../third_party/skia/src/opts/SkUtils_opts_none.cpp',
846 ], 842 ],
847 }, 843 },
848 ], 844 ],
849 }], 845 }],
850 ], 846 ],
851 } 847 }
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