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

Side by Side Diff: skia/skia.gyp

Issue 10542063: Roll out http://crrev.com/140760 , because we encountered errors when rebaselining in webkit. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: added_more_expected_failures_based_on_patch4_trybots Created 8 years, 6 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 | « no previous file | 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 787 matching lines...) Expand 10 before | Expand all | Expand 10 after
798 # skia uses static initializers to initialize the serialization logic 798 # skia uses static initializers to initialize the serialization logic
799 # of its "pictures" library. This is currently not used in chrome; if 799 # of its "pictures" library. This is currently not used in chrome; if
800 # it ever gets used the processes that use it need to call 800 # it ever gets used the processes that use it need to call
801 # SkGraphics::Init(). 801 # SkGraphics::Init().
802 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0', 802 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0',
803 803
804 # Temporarily disable the Skia fix in 804 # Temporarily disable the Skia fix in
805 # http://code.google.com/p/skia/source/detail?r=3037 ; enabling that 805 # http://code.google.com/p/skia/source/detail?r=3037 ; enabling that
806 # fix will require substantial rebaselining. 806 # fix will require substantial rebaselining.
807 'SK_DRAW_POS_TEXT_IGNORE_SUBPIXEL_LEFT_ALIGN_FIX', 807 'SK_DRAW_POS_TEXT_IGNORE_SUBPIXEL_LEFT_ALIGN_FIX',
808
809 # Temporarily ignore fix to antialias coverage, until we can rebaseline
810 'SK_USE_LEGACY_AA_COVERAGE',
808 ], 811 ],
809 'sources!': [ 812 'sources!': [
810 '../third_party/skia/include/core/SkTypes.h', 813 '../third_party/skia/include/core/SkTypes.h',
811 ], 814 ],
812 'conditions': [ 815 'conditions': [
813 ['order_profiling != 0', { 816 ['order_profiling != 0', {
814 'target_conditions' : [ 817 'target_conditions' : [
815 ['_toolset=="target"', { 818 ['_toolset=="target"', {
816 'cflags!': [ '-finstrument-functions' ], 819 'cflags!': [ '-finstrument-functions' ],
817 }], 820 }],
(...skipping 455 matching lines...) Expand 10 before | Expand all | Expand 10 after
1273 ], 1276 ],
1274 'include_dirs': [ 1277 'include_dirs': [
1275 '..', 1278 '..',
1276 ], 1279 ],
1277 'sources': [ 1280 'sources': [
1278 'ext/image_operations_bench.cc', 1281 'ext/image_operations_bench.cc',
1279 ], 1282 ],
1280 }, 1283 },
1281 ], 1284 ],
1282 } 1285 }
OLDNEW
« no previous file with comments | « no previous file | skia/skia_test_expectations.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698