diff options
| author | mtklein <mtklein@chromium.org> | 2015-10-20 14:36:21 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-20 21:37:44 +0000 |
| commit | 7fcfad71dc615e929b5e080a168dc3399deee2af (patch) | |
| tree | b4d48bf94453cf6263504cc22cbe84beab33cbd3 /skia/skia_library.gypi | |
| parent | e9a0ee342d8c663a6787d1a42ab29d3dbf265395 (diff) | |
| download | chromium_src-7fcfad71dc615e929b5e080a168dc3399deee2af.zip chromium_src-7fcfad71dc615e929b5e080a168dc3399deee2af.tar.gz chromium_src-7fcfad71dc615e929b5e080a168dc3399deee2af.tar.bz2 | |
Manually roll Skia to c752badbe3e4af84ca4c2b1d10adabbe4096e204
(A normal roll with GN/GYP fixes for deleted files.)
Summary of changes available at:
https://chromium.googlesource.com/skia/+log/0bccd87..c752bad
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
TBR=caryclark@google.com
Commits in this roll:
c752bad caryclark@google.com remove debug statement
a1bde7d mtklein@chromium.org Remove SkThread::setProcessorAffinity()
1d3ff43 senorblanco@chromium.org Image filters: Replace all use of tryAllocPixels() with createDevice().
BUG=
Review URL: https://codereview.chromium.org/1420603002
Cr-Commit-Position: refs/heads/master@{#355158}
Diffstat (limited to 'skia/skia_library.gypi')
| -rw-r--r-- | skia/skia_library.gypi | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/skia/skia_library.gypi b/skia/skia_library.gypi index b61385a..fccbf89 100644 --- a/skia/skia_library.gypi +++ b/skia/skia_library.gypi @@ -79,10 +79,6 @@ '../third_party/skia/src/utils/SkParsePath.cpp', '../third_party/skia/src/utils/SkSHA1.cpp', - # We don't currently need to change thread affinity, so leave out this complexity for now. - "../third_party/skia/src/utils/SkThreadUtils_pthread_mach.cpp", - "../third_party/skia/src/utils/SkThreadUtils_pthread_linux.cpp", - #windows '../third_party/skia/src/utils/win/SkAutoCoInitialize.cpp', '../third_party/skia/src/utils/win/SkIStream.cpp', @@ -143,11 +139,10 @@ 'sources!': [ # Keeping _win.cpp "../third_party/skia/src/utils/SkThreadUtils_pthread.cpp", - "../third_party/skia/src/utils/SkThreadUtils_pthread_other.cpp", ], },{ 'sources!': [ - # Keeping _pthread.cpp and _pthread_other.cpp + # Keeping _pthread.cpp "../third_party/skia/src/utils/SkThreadUtils_win.cpp", ], }], |