diff options
| author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-23 18:11:05 +0000 |
|---|---|---|
| committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-23 18:11:05 +0000 |
| commit | bfc6a9b7707a7bbbc1ad282b7792904fbf196d0c (patch) | |
| tree | c035fd77714d4cc9712878fcd14f35c09ff4e212 /ui/gfx/canvas.cc | |
| parent | 54c1b722ee8da87be17670e20ad70e8d838d1a23 (diff) | |
| download | chromium_src-bfc6a9b7707a7bbbc1ad282b7792904fbf196d0c.zip chromium_src-bfc6a9b7707a7bbbc1ad282b7792904fbf196d0c.tar.gz chromium_src-bfc6a9b7707a7bbbc1ad282b7792904fbf196d0c.tar.bz2 | |
Fixes regressions in canvas due to 10245003
BUG=128951
TEST=Manual
Review URL: https://chromiumcodereview.appspot.com/10417041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138528 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/canvas.cc')
| -rw-r--r-- | ui/gfx/canvas.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ui/gfx/canvas.cc b/ui/gfx/canvas.cc index aeabc12..0baed6e5 100644 --- a/ui/gfx/canvas.cc +++ b/ui/gfx/canvas.cc @@ -272,7 +272,8 @@ void Canvas::DrawBitmapInt(const gfx::ImageSkia& image, SkFloatToScalar(1.0f / bitmap_scale)); canvas_->drawBitmap(bitmap, SkFloatToScalar(x * bitmap_scale), - SkFloatToScalar(y * bitmap_scale)); + SkFloatToScalar(y * bitmap_scale), + &paint); canvas_->restore(); } @@ -315,7 +316,7 @@ void Canvas::DrawBitmapInt(const gfx::ImageSkia& image, SkIntToScalar(dest_y + dest_h) }; if (src_w == dest_w && src_h == dest_h && - bitmap_scale == 1.0f && bitmap_scale == 1.0f) { + user_scale_x == 1.0f && user_scale_y == 1.0f && bitmap_scale == 1.0f) { // Workaround for apparent bug in Skia that causes image to occasionally // shift. SkIRect src_rect = { src_x, src_y, src_x + src_w, src_y + src_h }; |