summaryrefslogtreecommitdiff
path: root/chromium/skia/skia_chrome.gypi
diff options
context:
space:
mode:
authorZeno Albisser <zeno.albisser@digia.com>2013-11-21 14:09:57 +0100
committerAndras Becsi <andras.becsi@digia.com>2013-11-29 15:14:36 +0100
commiteb32ba6f51d0c21d58cd7d89785285ff8fa64624 (patch)
tree2c7c940e1dbee81b89d935626110816b494aa32c /chromium/skia/skia_chrome.gypi
parent9427c1a0222ebd67efef1a2c7990a0fa5c9aac84 (diff)
downloadqtwebengine-chromium-eb32ba6f51d0c21d58cd7d89785285ff8fa64624.tar.gz
Update chromium to branch 1599.
Change-Id: I04e775a946a208bb4500d3b722bcb05c82b9d7cb Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'chromium/skia/skia_chrome.gypi')
-rw-r--r--chromium/skia/skia_chrome.gypi4
1 files changed, 3 insertions, 1 deletions
diff --git a/chromium/skia/skia_chrome.gypi b/chromium/skia/skia_chrome.gypi
index ecd9b4735c2..1d246057d17 100644
--- a/chromium/skia/skia_chrome.gypi
+++ b/chromium/skia/skia_chrome.gypi
@@ -49,6 +49,8 @@
'ext/lazy_pixel_ref_utils.cc',
'ext/lazy_pixel_ref_utils.h',
'ext/SkThread_chrome.cc',
+ 'ext/opacity_draw_filter.cc',
+ 'ext/opacity_draw_filter.h',
'ext/paint_simplifier.cc',
'ext/paint_simplifier.h',
'ext/platform_canvas.cc',
@@ -88,7 +90,7 @@
'ext/SkThread_chrome.cc',
],
}],
- [ 'OS == "android"', {
+ [ 'OS == "android" and enable_printing == 0', {
'sources!': [
'ext/vector_platform_device_skia.cc',
],