roll skia DEPS to 14021

Chromium base revision: 261075 / fee4cc1 Old Skia revision: 14002 New Skia revision: 14021 Control CL: https://codereview.chromium.org/220593011 This CL was created by Skia's roll_deps.py script. Bypassing commit queue trybots: NOTRY=true R=bsalomon@google.com Review URL: https://codereview.chromium.org/221693005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261127 0039d316-1c4b-4281-b951-d872f2087c98
Denger-Network · Apr 2, 2014 · 7995394 · 7995394
1 parent cc24abe
commit 7995394
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/DEPS b/DEPS
@@ -45,8 +45,8 @@ vars = {
 
   "sfntly_revision": "228",
   "lighttpd_revision": "33737",
-  "skia_revision": "14011",
-  "skia_hash": "53e1e4d88a06db62898a3bf75751c042729d7160",
+  "skia_revision": "14021",
+  "skia_hash": "c282ba85bababb903d8cd43320508790195a98f9",
   # 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_library.gypi b/skia/skia_library.gypi
@@ -34,8 +34,6 @@
 
     '../third_party/skia/src/opts/opts_check_SSE2.cpp',
 
-    '../third_party/skia/src/ports/SkPurgeableMemoryBlock_none.cpp',
-
     '../third_party/skia/src/ports/SkFontConfigInterface_android.cpp',
     '../third_party/skia/src/ports/SkFontConfigInterface_direct.cpp',