From 4008f80a0b75ed761a77dc539cda0de1a51f3223 Mon Sep 17 00:00:00 2001 From: "thakis@chromium.org" Date: Fri, 7 Jan 2011 00:52:32 +0000 Subject: roll skia 636:673 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- skia/skia.gyp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'skia/skia.gyp') diff --git a/skia/skia.gyp b/skia/skia.gyp index d5382d1..c08f405 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -302,6 +302,8 @@ '../third_party/skia/src/effects/Sk1DPathEffect.cpp', '../third_party/skia/src/effects/Sk2DPathEffect.cpp', '../third_party/skia/src/effects/SkAvoidXfermode.cpp', + '../third_party/skia/src/effects/SkBitmapCache.cpp', + '../third_party/skia/src/effects/SkBitmapCache.h', '../third_party/skia/src/effects/SkBlurDrawLooper.cpp', '../third_party/skia/src/effects/SkBlurMask.cpp', '../third_party/skia/src/effects/SkBlurMask.h', -- cgit v1.1