diff options
| author | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-10 13:06:09 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-10 13:06:09 +0000 |
| commit | 9224a49c48157084f48a51a96973fd8eb977d810 (patch) | |
| tree | dd699e7542c662480bfee0bbf06b1d1875e897e0 /skia | |
| parent | 026bea26df8b48364e0ebd84f1c8640dd1b8076f (diff) | |
| download | chromium_src-9224a49c48157084f48a51a96973fd8eb977d810.zip chromium_src-9224a49c48157084f48a51a96973fd8eb977d810.tar.gz chromium_src-9224a49c48157084f48a51a96973fd8eb977d810.tar.bz2 | |
Roll Skia DEPS to r11688
R=bsalomon@google.com
Review URL: https://codereview.chromium.org/26702006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227916 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/skia_library.gypi | 1 | ||||
| -rw-r--r-- | skia/skia_library_opts.gyp | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/skia/skia_library.gypi b/skia/skia_library.gypi index 5c62a45..e57445a 100644 --- a/skia/skia_library.gypi +++ b/skia/skia_library.gypi @@ -41,6 +41,7 @@ 'SK_SUPPORT_GPU=<(skia_support_gpu)', 'GR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"', 'SK_ENABLE_LEGACY_API_ALIASING=1', + 'SK_CROP_RECT_IS_INT=1', ], 'default_font_cache_limit': '(20*1024*1024)', diff --git a/skia/skia_library_opts.gyp b/skia/skia_library_opts.gyp index 1526376..9db69d8 100644 --- a/skia/skia_library_opts.gyp +++ b/skia/skia_library_opts.gyp @@ -47,6 +47,7 @@ '../third_party/skia/src/opts/SkBlitRect_opts_SSE2.cpp', '../third_party/skia/src/opts/SkBlitRow_opts_SSE2.cpp', '../third_party/skia/src/opts/SkUtils_opts_SSE2.cpp', + '../third_party/skia/src/opts/SkXfermode_opts_none.cpp', '../third_party/skia/src/opts/SkBitmapFilter_opts_SSE2.cpp', ], 'dependencies': [ @@ -104,6 +105,7 @@ '../third_party/skia/src/opts/SkBlitMask_opts_none.cpp', '../third_party/skia/src/opts/SkBlitRow_opts_none.cpp', '../third_party/skia/src/opts/SkUtils_opts_none.cpp', + '../third_party/skia/src/opts/SkXfermode_opts_none.cpp', ], }], [ 'target_arch == "arm" and arm_version >= 6', { @@ -112,6 +114,7 @@ '../third_party/skia/src/opts/SkBlitRow_opts_arm.cpp', '../third_party/skia/src/opts/SkBlitRow_opts_arm.h', '../third_party/skia/src/opts/opts_check_arm.cpp', + '../third_party/skia/src/opts/SkXfermode_opts_none.cpp', ], }], [ 'target_arch == "mipsel"',{ @@ -123,6 +126,7 @@ '../third_party/skia/src/opts/SkBlitMask_opts_none.cpp', '../third_party/skia/src/opts/SkBlitRow_opts_none.cpp', '../third_party/skia/src/opts/SkUtils_opts_none.cpp', + '../third_party/skia/src/opts/SkXfermode_opts_none.cpp', ], }], ], @@ -184,6 +188,7 @@ '../third_party/skia/src/opts/SkBlitMask_opts_none.cpp', '../third_party/skia/src/opts/SkBlitRow_opts_none.cpp', '../third_party/skia/src/opts/SkUtils_opts_none.cpp', + '../third_party/skia/src/opts/SkXfermode_opts_none.cpp', ], }, ], |