summaryrefslogtreecommitdiffstats
path: root/skia
diff options
context:
space:
mode:
authorreed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-01 13:27:11 +0000
committerreed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-01 13:27:11 +0000
commit21dec361c1f7d162bca8bdd3728b600c572022c1 (patch)
tree207d91bf3e33f39bb4e47bc484df49f6a7f93f06 /skia
parent705b50cceba5b7d7007fef64856ff4728c7d7723 (diff)
downloadchromium_src-21dec361c1f7d162bca8bdd3728b600c572022c1.zip
chromium_src-21dec361c1f7d162bca8bdd3728b600c572022c1.tar.gz
chromium_src-21dec361c1f7d162bca8bdd3728b600c572022c1.tar.bz2
remove reference to deprecated setBitmapDevice
this unblocks Skia DEPS roll Review URL: https://codereview.chromium.org/11014019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159477 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
-rw-r--r--skia/ext/skia_utils_mac_unittest.mm11
1 files changed, 1 insertions, 10 deletions
diff --git a/skia/ext/skia_utils_mac_unittest.mm b/skia/ext/skia_utils_mac_unittest.mm
index 7d9bc93..1ced586 100644
--- a/skia/ext/skia_utils_mac_unittest.mm
+++ b/skia/ext/skia_utils_mac_unittest.mm
@@ -126,8 +126,7 @@ void SkiaUtilsMacTest::RunBitLockerTest(BitLockerTest test) {
if (!(test & TestNoBits)) {
bitmap.setPixels(bits);
}
- SkCanvas canvas;
- canvas.setBitmapDevice(bitmap);
+ SkCanvas canvas(bitmap);
if (test & TestTranslate)
canvas.translate(width / 2, 0);
if (test & TestClip) {
@@ -141,14 +140,6 @@ void SkiaUtilsMacTest::RunBitLockerTest(BitLockerTest test) {
CGContextSetFillColorWithColor(cgContext, testColor);
CGRect cgRect = {{0, 0}, {width, height}};
CGContextFillRect(cgContext, cgRect);
- if (test & TestNoBits) {
- bitmap.setPixels(bits);
- canvas.setBitmapDevice(bitmap);
- if (test & TestClip) {
- SkRect clipRect = {0, height / 2, width, height};
- canvas.clipRect(clipRect);
- }
- }
}
const unsigned results[][storageSize] = {
{0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF}, // identity