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

Side by Side Diff: build/common.gypi

Issue 9863053: Re-enable use_canvas_skia=1 on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 9 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 | no next file » | 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 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after
427 'enable_automation%': 0, 427 'enable_automation%': 0,
428 }, { 428 }, {
429 'enable_automation%': 1, 429 'enable_automation%': 1,
430 }], 430 }],
431 431
432 # Enable Skia UI text drawing incrementally on different platforms. 432 # Enable Skia UI text drawing incrementally on different platforms.
433 # http://crbug.com/105550 433 # http://crbug.com/105550
434 # 434 #
435 # On Aura, this allows per-tile painting to be used in the browser 435 # On Aura, this allows per-tile painting to be used in the browser
436 # compositor. 436 # compositor.
437 ['use_aura==1', { 437 ['use_aura==1 or OS=="win"', {
438 'use_canvas_skia%': 1, 438 'use_canvas_skia%': 1,
439 }], 439 }],
440 ], 440 ],
441 }, 441 },
442 442
443 # Copy conditionally-set variables out one scope. 443 # Copy conditionally-set variables out one scope.
444 'branding%': '<(branding)', 444 'branding%': '<(branding)',
445 'buildtype%': '<(buildtype)', 445 'buildtype%': '<(buildtype)',
446 'target_arch%': '<(target_arch)', 446 'target_arch%': '<(target_arch)',
447 'host_arch%': '<(host_arch)', 447 'host_arch%': '<(host_arch)',
(...skipping 2507 matching lines...) Expand 10 before | Expand all | Expand 10 after
2955 # settings in target dicts. SYMROOT is a special case, because many other 2955 # settings in target dicts. SYMROOT is a special case, because many other
2956 # Xcode variables depend on it, including variables such as 2956 # Xcode variables depend on it, including variables such as
2957 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2957 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
2958 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 2958 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
2959 # files to appear (when present) in the UI as actual files and not red 2959 # files to appear (when present) in the UI as actual files and not red
2960 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 2960 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2961 # and therefore SYMROOT, needs to be set at the project level. 2961 # and therefore SYMROOT, needs to be set at the project level.
2962 'SYMROOT': '<(DEPTH)/xcodebuild', 2962 'SYMROOT': '<(DEPTH)/xcodebuild',
2963 }, 2963 },
2964 } 2964 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698