diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-10 22:53:09 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-10 22:53:09 +0000 |
| commit | 831d9ba79c56fc142147b88287e787ed38395b76 (patch) | |
| tree | 1e3f9534472a9b76d874ef3a889db481f6fec036 /ui/views/controls | |
| parent | c192ea0ece21d496cf0caba87d09993eb1c326ce (diff) | |
| download | chromium_src-831d9ba79c56fc142147b88287e787ed38395b76.zip chromium_src-831d9ba79c56fc142147b88287e787ed38395b76.tar.gz chromium_src-831d9ba79c56fc142147b88287e787ed38395b76.tar.bz2 | |
Make tab/tabstrip high density compatible
added ImageSkiaOperations and replaced Bitmap with ImageSkiaRep/ImagSkia.
BUG=122992
TEST=manual
Review URL: https://chromiumcodereview.appspot.com/10704113
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145976 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/controls')
| -rw-r--r-- | ui/views/controls/glow_hover_controller.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ui/views/controls/glow_hover_controller.cc b/ui/views/controls/glow_hover_controller.cc index 88aee71..e86be4d 100644 --- a/ui/views/controls/glow_hover_controller.cc +++ b/ui/views/controls/glow_hover_controller.cc @@ -7,7 +7,7 @@ #include "third_party/skia/include/effects/SkGradientShader.h" #include "ui/gfx/canvas.h" #include "ui/gfx/image/image_skia.h" -#include "ui/gfx/skbitmap_operations.h" +#include "ui/gfx/image/image_skia_operations.h" #include "ui/views/view.h" namespace views { @@ -70,6 +70,7 @@ void GlowHoverController::Draw(gfx::Canvas* canvas, // Draw a radial gradient to hover_canvas. gfx::Canvas hover_canvas(gfx::Size(mask_image.width(), mask_image.height()), + canvas->scale_factor(), false); // Draw a radial gradient to hover_canvas. @@ -96,8 +97,8 @@ void GlowHoverController::Draw(gfx::Canvas* canvas, location_.y() - radius, radius * 2, radius * 2), paint); } - gfx::ImageSkia result = SkBitmapOperations::CreateMaskedBitmap( - hover_canvas.ExtractBitmap(), mask_image); + gfx::ImageSkia result = gfx::ImageSkiaOperations::CreateMaskedImage( + gfx::ImageSkia(hover_canvas.ExtractImageSkiaRep()), mask_image); canvas->DrawImageInt(result, (view_->width() - mask_image.width()) / 2, (view_->height() - mask_image.height()) / 2); } |