diff options
| author | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-18 13:16:04 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-18 13:16:04 +0000 |
| commit | 04ff5ddd0b856fc8dd4ae01929259dc22c50ced8 (patch) | |
| tree | b4b795a02077008a933379a5a618c3d840411a36 | |
| parent | 6ecf0ef4edbc84335e2bd2163d0db97ba94d3307 (diff) | |
| download | chromium_src-04ff5ddd0b856fc8dd4ae01929259dc22c50ced8.zip chromium_src-04ff5ddd0b856fc8dd4ae01929259dc22c50ced8.tar.gz chromium_src-04ff5ddd0b856fc8dd4ae01929259dc22c50ced8.tar.bz2 | |
Roll Skia DEPS to r8183
control: https://codereview.chromium.org/12849005/
Review URL: https://codereview.chromium.org/12849006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188723 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | skia/skia.gyp | 5 |
2 files changed, 6 insertions, 1 deletions
@@ -29,7 +29,7 @@ vars = { "ffmpeg_hash": "bb82a38d45e65c1fba378c15180b98ad76ebe1ca", "sfntly_revision": "134", - "skia_revision": "8166", + "skia_revision": "8183", # Three lines of non-changing comments so that # the commit queue can handle CLs rolling Skia # and V8 without interference from each other. diff --git a/skia/skia.gyp b/skia/skia.gyp index 729072a..cc52aea 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -87,6 +87,10 @@ '../third_party/skia/src/pdf/SkPDFUtils.cpp', '../third_party/skia/src/pdf/SkPDFUtils.h', + #'../third_party/skia/src/ports/SkPurgeableMemoryBlock_android.cpp', + #'../third_party/skia/src/ports/SkPurgeableMemoryBlock_mac.cpp', + '../third_party/skia/src/ports/SkPurgeableMemoryBlock_none.cpp', + '../third_party/skia/src/ports/FontHostConfiguration_android.cpp', #'../third_party/skia/src/ports/SkFontHost_FONTPATH.cpp', '../third_party/skia/src/ports/SkFontHost_FreeType.cpp', @@ -215,6 +219,7 @@ '../third_party/skia/src/image', '../third_party/skia/src/sfnt', '../third_party/skia/src/utils', + '../third_party/skia/src/lazy', ], 'msvs_disabled_warnings': [4244, 4267, 4341, 4345, 4390, 4554, 4748, 4800], 'defines': [ |