diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-07 00:52:32 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-07 00:52:32 +0000 |
| commit | 4008f80a0b75ed761a77dc539cda0de1a51f3223 (patch) | |
| tree | dc64f4efc7da30b5241032a74ef3702eecd8a455 /skia/ext/bitmap_platform_device_mac.h | |
| parent | 4a20d63ab03d4a01fae68f4a33f751c9d5892c51 (diff) | |
| download | chromium_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 'skia/ext/bitmap_platform_device_mac.h')
| -rw-r--r-- | skia/ext/bitmap_platform_device_mac.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/skia/ext/bitmap_platform_device_mac.h b/skia/ext/bitmap_platform_device_mac.h index 484d923..20d8918 100644 --- a/skia/ext/bitmap_platform_device_mac.h +++ b/skia/ext/bitmap_platform_device_mac.h @@ -12,7 +12,8 @@ namespace skia { class BitmapPlatformDeviceFactory : public SkDeviceFactory { public: - virtual SkDevice* newDevice(SkBitmap::Config config, int width, int height, + virtual SkDevice* newDevice(SkCanvas* ignored, SkBitmap::Config config, + int width, int height, bool isOpaque, bool isForLayer); }; |