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

Side by Side Diff: trunk/src/ui/ui.gyp

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

Powered by Google App Engine
This is Rietveld 408576698