summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorasvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-30 14:12:32 +0000
committerasvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-30 14:12:32 +0000
commit9197a92803e21c475e9c3a253eae0627e7fbacde (patch)
tree1a5e3f6cdb0e56b3ed3f366875b88b3fcf49710f /build
parentb247421a509a5fb21c2ca1b13b5c2cca4b1817ed (diff)
downloadchromium_src-9197a92803e21c475e9c3a253eae0627e7fbacde.zip
chromium_src-9197a92803e21c475e9c3a253eae0627e7fbacde.tar.gz
chromium_src-9197a92803e21c475e9c3a253eae0627e7fbacde.tar.bz2
Revert 139139 - Revert 139125 - Switch use_canvas_skia=1 for Linux/GTK.
This is so we can get rid of canvas_linux.cc and start standardizing what the different canvas flags mean between platforms. BUG=105550, 130001 TEST=No visual change in Chrome UI. Review URL: https://chromiumcodereview.appspot.com/10452023 TBR=asvitkine@chromium.org Review URL: https://chromiumcodereview.appspot.com/10444039 TBR=asargent@chromium.org Review URL: https://chromiumcodereview.appspot.com/10444088 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139534 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/common.gypi2
1 files changed, 1 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi
index 65aa2d6..479e5f4 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -497,7 +497,7 @@
#
# On Aura, this allows per-tile painting to be used in the browser
# compositor.
- ['use_aura==1 or OS=="win"', {
+ ['OS!="mac" and OS!="android"', {
'use_canvas_skia%': 1,
}],
],