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

Side by Side Diff: ui/ui.gyp

Issue 23454018: Turn on canvas_skia for OSX (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review nits Created 7 years, 3 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 | « ui/gfx/canvas_unittest_mac.mm ('k') | ui/ui_unittests.gypi » ('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 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 'shell_dialogs.gypi', 10 'shell_dialogs.gypi',
(...skipping 397 matching lines...) Expand 10 before | Expand all | Expand 10 after
408 'gfx/android/java_bitmap.cc', 408 'gfx/android/java_bitmap.cc',
409 'gfx/android/java_bitmap.h', 409 'gfx/android/java_bitmap.h',
410 'gfx/blit.cc', 410 'gfx/blit.cc',
411 'gfx/blit.h', 411 'gfx/blit.h',
412 'gfx/box_f.cc', 412 'gfx/box_f.cc',
413 'gfx/box_f.h', 413 'gfx/box_f.h',
414 'gfx/break_list.h', 414 'gfx/break_list.h',
415 'gfx/canvas.cc', 415 'gfx/canvas.cc',
416 'gfx/canvas.h', 416 'gfx/canvas.h',
417 'gfx/canvas_android.cc', 417 'gfx/canvas_android.cc',
418 'gfx/canvas_mac.mm',
419 'gfx/canvas_paint_gtk.cc', 418 'gfx/canvas_paint_gtk.cc',
420 'gfx/canvas_paint_gtk.h', 419 'gfx/canvas_paint_gtk.h',
421 'gfx/canvas_paint_mac.h', 420 'gfx/canvas_paint_mac.h',
422 'gfx/canvas_paint_mac.mm', 421 'gfx/canvas_paint_mac.mm',
423 'gfx/canvas_paint_win.cc', 422 'gfx/canvas_paint_win.cc',
424 'gfx/canvas_paint_win.h', 423 'gfx/canvas_paint_win.h',
425 'gfx/canvas_skia.cc', 424 'gfx/canvas_skia.cc',
426 'gfx/canvas_skia_paint.h', 425 'gfx/canvas_skia_paint.h',
427 'gfx/codec/jpeg_codec.cc', 426 'gfx/codec/jpeg_codec.cc',
428 'gfx/codec/jpeg_codec.h', 427 'gfx/codec/jpeg_codec.h',
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
640 'libraries': [ 639 'libraries': [
641 '$(SDKROOT)/System/Library/Frameworks/CoreGraphics.framework', 640 '$(SDKROOT)/System/Library/Frameworks/CoreGraphics.framework',
642 ], 641 ],
643 }, 642 },
644 }], 643 }],
645 # TODO(asvitkine): Switch all platforms to use canvas_skia.cc. 644 # TODO(asvitkine): Switch all platforms to use canvas_skia.cc.
646 # http://crbug.com/105550 645 # http://crbug.com/105550
647 ['use_canvas_skia==1', { 646 ['use_canvas_skia==1', {
648 'sources!': [ 647 'sources!': [
649 'gfx/canvas_android.cc', 648 'gfx/canvas_android.cc',
650 'gfx/canvas_mac.mm',
651 ], 649 ],
652 }, { # use_canvas_skia!=1 650 }, { # use_canvas_skia!=1
653 'sources!': [ 651 'sources!': [
654 'gfx/canvas_skia.cc', 652 'gfx/canvas_skia.cc',
655 ], 653 ],
656 }], 654 }],
657 ['use_aura==1', { 655 ['use_aura==1', {
658 'sources/': [ 656 'sources/': [
659 ['exclude', 'gfx/gtk_'], 657 ['exclude', 'gfx/gtk_'],
660 ['exclude', 'gfx/gtk_util.cc'], 658 ['exclude', 'gfx/gtk_util.cc'],
(...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after
1075 'xcode_settings': { 1073 'xcode_settings': {
1076 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', 1074 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO',
1077 }, 1075 },
1078 }], 1076 }],
1079 ], 1077 ],
1080 }, 1078 },
1081 ], 1079 ],
1082 }], 1080 }],
1083 ], 1081 ],
1084 } 1082 }
OLDNEW
« no previous file with comments | « ui/gfx/canvas_unittest_mac.mm ('k') | ui/ui_unittests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698