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

Side by Side Diff: skia/skia.gyp

Issue 492028: Merge 33863 - Roll DEPS for Skia 450:451. Enable USE_NEW_BUILDER in Skia. M... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/249/src/
Patch Set: Created 11 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
Property Changes:
Added: svn:mergeinfo
Merged /branches/chrome_webkit_merge_branch/skia/skia.gyp:r69-2775
OLDNEW
1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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': '<(library)', 9 'type': '<(library)',
10 'msvs_guid': 'CD9CA56E-4E94-444C-87D4-58CA1E6F300D', 10 'msvs_guid': 'CD9CA56E-4E94-444C-87D4-58CA1E6F300D',
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 '../third_party/skia/src/core/SkCubicClipper.cpp', 214 '../third_party/skia/src/core/SkCubicClipper.cpp',
215 '../third_party/skia/src/core/SkCubicClipper.h', 215 '../third_party/skia/src/core/SkCubicClipper.h',
216 '../third_party/skia/src/core/SkDebug.cpp', 216 '../third_party/skia/src/core/SkDebug.cpp',
217 #'../third_party/skia/src/core/SkDebug_stdio.cpp', 217 #'../third_party/skia/src/core/SkDebug_stdio.cpp',
218 '../third_party/skia/src/core/SkDeque.cpp', 218 '../third_party/skia/src/core/SkDeque.cpp',
219 '../third_party/skia/src/core/SkDevice.cpp', 219 '../third_party/skia/src/core/SkDevice.cpp',
220 '../third_party/skia/src/core/SkDither.cpp', 220 '../third_party/skia/src/core/SkDither.cpp',
221 '../third_party/skia/src/core/SkDraw.cpp', 221 '../third_party/skia/src/core/SkDraw.cpp',
222 '../third_party/skia/src/core/SkDrawProcs.h', 222 '../third_party/skia/src/core/SkDrawProcs.h',
223 #'../third_party/skia/src/core/SkDrawing.cpp', 223 #'../third_party/skia/src/core/SkDrawing.cpp',
224 '../third_party/skia/src/core/SkEdgeBuilder.cpp',
225 '../third_party/skia/src/core/SkEdgeClipper.cpp',
224 '../third_party/skia/src/core/SkEdge.cpp', 226 '../third_party/skia/src/core/SkEdge.cpp',
225 '../third_party/skia/src/core/SkEdge.h', 227 '../third_party/skia/src/core/SkEdge.h',
226 '../third_party/skia/src/core/SkFP.h', 228 '../third_party/skia/src/core/SkFP.h',
227 '../third_party/skia/src/core/SkFilterProc.cpp', 229 '../third_party/skia/src/core/SkFilterProc.cpp',
228 '../third_party/skia/src/core/SkFilterProc.h', 230 '../third_party/skia/src/core/SkFilterProc.h',
229 '../third_party/skia/src/core/SkFlattenable.cpp', 231 '../third_party/skia/src/core/SkFlattenable.cpp',
230 '../third_party/skia/src/core/SkFloat.cpp', 232 '../third_party/skia/src/core/SkFloat.cpp',
231 '../third_party/skia/src/core/SkFloat.h', 233 '../third_party/skia/src/core/SkFloat.h',
232 '../third_party/skia/src/core/SkFloatBits.cpp', 234 '../third_party/skia/src/core/SkFloatBits.cpp',
233 '../third_party/skia/src/core/SkGeometry.cpp', 235 '../third_party/skia/src/core/SkGeometry.cpp',
(...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after
660 }, 662 },
661 }, 663 },
662 ], 664 ],
663 } 665 }
664 666
665 # Local Variables: 667 # Local Variables:
666 # tab-width:2 668 # tab-width:2
667 # indent-tabs-mode:nil 669 # indent-tabs-mode:nil
668 # End: 670 # End:
669 # vim: set expandtab tabstop=2 shiftwidth=2: 671 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « skia/ext/data/vectorcanvastest/clippingintersect/00_vc_intersect.png ('k') | webkit/tools/layout_tests/test_expectations.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698