diff options
| author | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-22 23:37:46 +0000 |
|---|---|---|
| committer | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-22 23:37:46 +0000 |
| commit | fe674603a5c8787a5e39993617b685a2ec7a66aa (patch) | |
| tree | 1e23fda486477e08541843cc220de792b80a3fa2 | |
| parent | 51485966913e5480f8874f38776417871f1ff5b7 (diff) | |
| download | chromium_src-fe674603a5c8787a5e39993617b685a2ec7a66aa.zip chromium_src-fe674603a5c8787a5e39993617b685a2ec7a66aa.tar.gz chromium_src-fe674603a5c8787a5e39993617b685a2ec7a66aa.tar.bz2 | |
Roll skia to tip of tree 593 -> 599
Looks like ARM work and some refactoring.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/3432012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60235 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | skia/skia.gyp | 1 |
2 files changed, 2 insertions, 1 deletions
@@ -4,7 +4,7 @@ vars = { "nacl_trunk": "http://src.chromium.org/native_client/trunk", "webkit_revision": "67965", "ffmpeg_revision": "58574", - "skia_revision": "593", + "skia_revision": "599", "chromium_git": "http://src.chromium.org/git", "swig_revision": "40423", "nacl_revision": "3186", diff --git a/skia/skia.gyp b/skia/skia.gyp index 20e593d..a873237 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -239,6 +239,7 @@ '../third_party/skia/src/core/SkGraphics.cpp', '../third_party/skia/src/core/SkLineClipper.cpp', '../third_party/skia/src/core/SkMMapStream.cpp', + '../third_party/skia/src/core/SkMallocPixelRef.cpp', '../third_party/skia/src/core/SkMask.cpp', '../third_party/skia/src/core/SkMaskFilter.cpp', '../third_party/skia/src/core/SkMath.cpp', |