diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-08 05:02:30 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-08 05:02:30 +0000 |
| commit | f756798f4a2372d778b88e3dbe9895a2ee8eb1fc (patch) | |
| tree | 5cfdbd797a4e404deab0fc4e8f286b21fa6493cf /skia/ext/bitmap_platform_device_mac.cc | |
| parent | d93d833fbc80b3cbe987b35c62b8fd290c6ee791 (diff) | |
| download | chromium_src-f756798f4a2372d778b88e3dbe9895a2ee8eb1fc.zip chromium_src-f756798f4a2372d778b88e3dbe9895a2ee8eb1fc.tar.gz chromium_src-f756798f4a2372d778b88e3dbe9895a2ee8eb1fc.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
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=70693
Review URL: http://codereview.chromium.org/6081006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70835 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/ext/bitmap_platform_device_mac.cc')
| -rw-r--r-- | skia/ext/bitmap_platform_device_mac.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/skia/ext/bitmap_platform_device_mac.cc b/skia/ext/bitmap_platform_device_mac.cc index bb7edc6..8435dbe 100644 --- a/skia/ext/bitmap_platform_device_mac.cc +++ b/skia/ext/bitmap_platform_device_mac.cc @@ -49,7 +49,8 @@ static CGContextRef CGContextForData(void* data, int width, int height) { } // namespace -SkDevice* BitmapPlatformDeviceFactory::newDevice(SkBitmap::Config config, +SkDevice* BitmapPlatformDeviceFactory::newDevice(SkCanvas* ignored, + SkBitmap::Config config, int width, int height, bool isOpaque, bool isForLayer) { |