From 4d2692ae3cf879014d4094996561a8671428df2a Mon Sep 17 00:00:00 2001 From: "oshima@chromium.org" Date: Mon, 7 Jan 2013 22:04:31 +0000 Subject: Don't scale mask image for new tab button. MatchScale's 2x routine uses canvas which can't scale mask image. This routine should be gone, so I fixed it in tab_strip, rather than fixing this routine. I'll flip the default value of the flag "scaling-in-image-skia-operation" so that mismatch will result in CHECK failure. BUG=163372 TEST=none Review URL: https://codereview.chromium.org/11684002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175394 0039d316-1c4b-4281-b951-d872f2087c98 --- ui/gfx/image/image_skia_operations.cc | 1 - 1 file changed, 1 deletion(-) (limited to 'ui') diff --git a/ui/gfx/image/image_skia_operations.cc b/ui/gfx/image/image_skia_operations.cc index b07993d..b0940d1 100644 --- a/ui/gfx/image/image_skia_operations.cc +++ b/ui/gfx/image/image_skia_operations.cc @@ -167,7 +167,6 @@ class MaskedImageSource : public gfx::ImageSkiaSource { virtual ImageSkiaRep GetImageForScale(ui::ScaleFactor scale_factor) OVERRIDE { ImageSkiaRep rgb_rep = rgb_.GetRepresentation(scale_factor); ImageSkiaRep alpha_rep = alpha_.GetRepresentation(scale_factor); - MatchScale(&rgb_rep, &alpha_rep); return ImageSkiaRep(SkBitmapOperations::CreateMaskedBitmap( rgb_rep.sk_bitmap(), alpha_rep.sk_bitmap()), rgb_rep.scale_factor()); -- cgit v1.1