summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-07 00:52:32 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-07 00:52:32 +0000
commit4008f80a0b75ed761a77dc539cda0de1a51f3223 (patch)
treedc64f4efc7da30b5241032a74ef3702eecd8a455 /DEPS
parent4a20d63ab03d4a01fae68f4a33f751c9d5892c51 (diff)
downloadchromium_src-4008f80a0b75ed761a77dc539cda0de1a51f3223.zip
chromium_src-4008f80a0b75ed761a77dc539cda0de1a51f3223.tar.gz
chromium_src-4008f80a0b75ed761a77dc539cda0de1a51f3223.tar.bz2
roll skia 636:673
I need r666 (r667 and r668 are build fixes for r666. r673 fixes a regression that was introduced in r637 – found by the chromium trybots). Some code changes required due to r637, which changed the signature of a pure virtual method and the signatures of several non-virtual methods. I added OVERRIDEs on windows to let this be a compile error in the future. I also added SkBitmapCache.h/cpp to the gyp file which was added in r655. SkGradientShader depends on this. BUG=none TEST=none Review URL: http://codereview.chromium.org/6081006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70693 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'DEPS')
-rw-r--r--DEPS2
1 files changed, 1 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 7335da2..1714e16 100644
--- a/DEPS
+++ b/DEPS
@@ -5,7 +5,7 @@ vars = {
"webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk",
"nacl_trunk": "http://src.chromium.org/native_client/trunk",
"webkit_revision": "75164",
- "skia_revision": "636",
+ "skia_revision": "673",
"chromium_git": "http://git.chromium.org/git",
"swig_revision": "69281",
"nacl_revision": "4074",