Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(119)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/gfx/image/image_skia_operations.cc

Issue 24175004: Remove dependency on ui::ScaleFactor from ui/gfx (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/extensions/extension_icon_image.h ('K') | « ui/gfx/image/image_skia.cc ('k') | ui/gfx/image/image_skia_rep.h » ('j') | ui/views/controls/button/image_button.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/image/image_skia_operations.cc
diff --git a/ui/gfx/image/image_skia_operations.cc b/ui/gfx/image/image_skia_operations.cc
index 663156044d4213cbbad551d6b516c3182ae2d716..6953b59301ffa4a6584c73fa5bfbe7a9f48387d1 100644
--- a/ui/gfx/image/image_skia_operations.cc
+++ b/ui/gfx/image/image_skia_operations.cc
@@ -7,7 +7,6 @@
#include "base/command_line.h"
#include "base/logging.h"
#include "skia/ext/image_operations.h"
-#include "ui/base/layout.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/image/canvas_image_source.h"
#include "ui/gfx/image/image_skia.h"
@@ -37,14 +36,13 @@ gfx::Rect DIPToPixelBounds(gfx::Rect dip_bounds, float scale) {
// Returns an image rep for the ImageSkiaSource to return to visually indicate
// an error.
-ImageSkiaRep GetErrorImageRep(ui::ScaleFactor scale_factor,
- const gfx::Size& pixel_size) {
+ImageSkiaRep GetErrorImageRep(float scale, const gfx::Size& pixel_size) {
SkBitmap bitmap;
bitmap.setConfig(
SkBitmap::kARGB_8888_Config, pixel_size.width(), pixel_size.height());
bitmap.allocPixels();
bitmap.eraseColor(SK_ColorRED);
- return gfx::ImageSkiaRep(bitmap, scale_factor);
+ return gfx::ImageSkiaRep(bitmap, scale);
}
// A base image source class that creates an image from two source images.
@@ -62,27 +60,25 @@ class BinaryImageSource : public gfx::ImageSkiaSource {
}
// gfx::ImageSkiaSource overrides:
- virtual ImageSkiaRep GetImageForScale(ui::ScaleFactor scale_factor) OVERRIDE {
- ImageSkiaRep first_rep = first_.GetRepresentation(scale_factor);
- ImageSkiaRep second_rep = second_.GetRepresentation(scale_factor);
+ virtual ImageSkiaRep GetImageForScale(float scale) OVERRIDE {
+ ImageSkiaRep first_rep = first_.GetRepresentation(scale);
+ ImageSkiaRep second_rep = second_.GetRepresentation(scale);
if (first_rep.pixel_size() != second_rep.pixel_size()) {
- DCHECK_NE(first_rep.scale_factor(), second_rep.scale_factor());
- if (first_rep.scale_factor() == second_rep.scale_factor()) {
+ DCHECK_NE(first_rep.scale(), second_rep.scale());
+ if (first_rep.scale() == second_rep.scale()) {
LOG(ERROR) << "ImageSkiaRep size mismatch in " << source_name_;
- return GetErrorImageRep(first_rep.scale_factor(),
- first_rep.pixel_size());
+ return GetErrorImageRep(first_rep.scale(),first_rep.pixel_size());
}
- first_rep = first_.GetRepresentation(ui::SCALE_FACTOR_100P);
- second_rep = second_.GetRepresentation(ui::SCALE_FACTOR_100P);
+ first_rep = first_.GetRepresentation(1.0f);
+ second_rep = second_.GetRepresentation(1.0f);
DCHECK_EQ(first_rep.pixel_width(), second_rep.pixel_width());
DCHECK_EQ(first_rep.pixel_height(), second_rep.pixel_height());
if (first_rep.pixel_size() != second_rep.pixel_size()) {
LOG(ERROR) << "ImageSkiaRep size mismatch in " << source_name_;
- return GetErrorImageRep(first_rep.scale_factor(),
- first_rep.pixel_size());
+ return GetErrorImageRep(first_rep.scale(), first_rep.pixel_size());
}
} else {
- DCHECK_EQ(first_rep.scale_factor(), second_rep.scale_factor());
+ DCHECK_EQ(first_rep.scale(), second_rep.scale());
}
return CreateImageSkiaRep(first_rep, second_rep);
}
@@ -121,7 +117,7 @@ class BlendingImageSource : public BinaryImageSource {
const ImageSkiaRep& second_rep) const OVERRIDE {
SkBitmap blended = SkBitmapOperations::CreateBlendedBitmap(
first_rep.sk_bitmap(), second_rep.sk_bitmap(), alpha_);
- return ImageSkiaRep(blended, first_rep.scale_factor());
+ return ImageSkiaRep(blended, first_rep.scale());
}
private:
@@ -167,8 +163,8 @@ class TransparentImageSource : public gfx::ImageSkiaSource {
private:
// gfx::ImageSkiaSource overrides:
- virtual ImageSkiaRep GetImageForScale(ui::ScaleFactor scale_factor) OVERRIDE {
- ImageSkiaRep image_rep = image_.GetRepresentation(scale_factor);
+ virtual ImageSkiaRep GetImageForScale(float scale) OVERRIDE {
+ ImageSkiaRep image_rep = image_.GetRepresentation(scale);
SkBitmap alpha;
alpha.setConfig(SkBitmap::kARGB_8888_Config,
image_rep.pixel_width(),
@@ -177,7 +173,7 @@ class TransparentImageSource : public gfx::ImageSkiaSource {
alpha.eraseColor(SkColorSetARGB(alpha_ * 255, 0, 0, 0));
return ImageSkiaRep(
SkBitmapOperations::CreateMaskedBitmap(image_rep.sk_bitmap(), alpha),
- image_rep.scale_factor());
+ image_rep.scale());
}
ImageSkia image_;
@@ -201,7 +197,7 @@ class MaskedImageSource : public BinaryImageSource {
const ImageSkiaRep& second_rep) const OVERRIDE {
return ImageSkiaRep(SkBitmapOperations::CreateMaskedBitmap(
first_rep.sk_bitmap(), second_rep.sk_bitmap()),
- first_rep.scale_factor());
+ first_rep.scale());
}
private:
@@ -224,16 +220,15 @@ class TiledImageSource : public gfx::ImageSkiaSource {
}
// gfx::ImageSkiaSource overrides:
- virtual ImageSkiaRep GetImageForScale(ui::ScaleFactor scale_factor) OVERRIDE {
- ImageSkiaRep source_rep = source_.GetRepresentation(scale_factor);
- float scale = ui::GetScaleFactorScale(source_rep.scale_factor());
+ virtual ImageSkiaRep GetImageForScale(float scale) OVERRIDE {
+ ImageSkiaRep source_rep = source_.GetRepresentation(scale);
gfx::Rect bounds = DIPToPixelBounds(gfx::Rect(src_x_, src_y_, dst_w_,
- dst_h_), scale);
+ dst_h_), source_rep.scale());
return ImageSkiaRep(
SkBitmapOperations::CreateTiledBitmap(
source_rep.sk_bitmap(),
bounds.x(), bounds.y(), bounds.width(), bounds.height()),
- source_rep.scale_factor());
+ source_rep.scale());
}
private:
@@ -258,11 +253,11 @@ class HSLImageSource : public gfx::ImageSkiaSource {
}
// gfx::ImageSkiaSource overrides:
- virtual ImageSkiaRep GetImageForScale(ui::ScaleFactor scale_factor) OVERRIDE {
- ImageSkiaRep image_rep = image_.GetRepresentation(scale_factor);
+ virtual ImageSkiaRep GetImageForScale(float scale) OVERRIDE {
+ ImageSkiaRep image_rep = image_.GetRepresentation(scale);
return gfx::ImageSkiaRep(
SkBitmapOperations::CreateHSLShiftedBitmap(image_rep.sk_bitmap(),
- hsl_shift_), image_rep.scale_factor());
+ hsl_shift_), image_rep.scale());
}
private:
@@ -288,17 +283,17 @@ class ButtonImageSource: public gfx::ImageSkiaSource {
}
// gfx::ImageSkiaSource overrides:
- virtual ImageSkiaRep GetImageForScale(ui::ScaleFactor scale_factor) OVERRIDE {
- ImageSkiaRep image_rep = image_.GetRepresentation(scale_factor);
- ImageSkiaRep mask_rep = mask_.GetRepresentation(scale_factor);
- if (image_rep.scale_factor() != mask_rep.scale_factor()) {
- image_rep = image_.GetRepresentation(ui::SCALE_FACTOR_100P);
- mask_rep = mask_.GetRepresentation(ui::SCALE_FACTOR_100P);
+ virtual ImageSkiaRep GetImageForScale(float scale) OVERRIDE {
+ ImageSkiaRep image_rep = image_.GetRepresentation(scale);
+ ImageSkiaRep mask_rep = mask_.GetRepresentation(scale);
+ if (image_rep.scale() != mask_rep.scale()) {
+ image_rep = image_.GetRepresentation(1.0f);
+ mask_rep = mask_.GetRepresentation(1.0f);
}
return gfx::ImageSkiaRep(
SkBitmapOperations::CreateButtonBackground(color_,
image_rep.sk_bitmap(), mask_rep.sk_bitmap()),
- image_rep.scale_factor());
+ image_rep.scale());
}
private:
@@ -323,16 +318,15 @@ class ExtractSubsetImageSource: public gfx::ImageSkiaSource {
}
// gfx::ImageSkiaSource overrides:
- virtual ImageSkiaRep GetImageForScale(ui::ScaleFactor scale_factor) OVERRIDE {
- ImageSkiaRep image_rep = image_.GetRepresentation(scale_factor);
- float scale_to_pixel = ui::GetScaleFactorScale(image_rep.scale_factor());
+ virtual ImageSkiaRep GetImageForScale(float scale) OVERRIDE {
+ ImageSkiaRep image_rep = image_.GetRepresentation(scale);
SkIRect subset_bounds_in_pixel = RectToSkIRect(
- DIPToPixelBounds(subset_bounds_, scale_to_pixel));
+ DIPToPixelBounds(subset_bounds_, image_rep.scale()));
SkBitmap dst;
bool success = image_rep.sk_bitmap().extractSubset(&dst,
subset_bounds_in_pixel);
DCHECK(success);
- return gfx::ImageSkiaRep(dst, image_rep.scale_factor());
+ return gfx::ImageSkiaRep(dst, image_rep.scale());
}
private:
@@ -356,20 +350,19 @@ class ResizeSource : public ImageSkiaSource {
virtual ~ResizeSource() {}
// gfx::ImageSkiaSource overrides:
- virtual ImageSkiaRep GetImageForScale(ui::ScaleFactor scale_factor) OVERRIDE {
- const ImageSkiaRep& image_rep = source_.GetRepresentation(scale_factor);
+ virtual ImageSkiaRep GetImageForScale(float scale) OVERRIDE {
+ const ImageSkiaRep& image_rep = source_.GetRepresentation(scale);
if (image_rep.GetWidth() == target_dip_size_.width() &&
image_rep.GetHeight() == target_dip_size_.height())
return image_rep;
- const float scale = ui::GetScaleFactorScale(scale_factor);
const Size target_pixel_size = DIPToPixelSize(target_dip_size_, scale);
const SkBitmap resized = skia::ImageOperations::Resize(
image_rep.sk_bitmap(),
resize_method_,
target_pixel_size.width(),
target_pixel_size.height());
- return ImageSkiaRep(resized, scale_factor);
+ return ImageSkiaRep(resized, scale);
}
private:
@@ -392,10 +385,9 @@ class DropShadowSource : public ImageSkiaSource {
virtual ~DropShadowSource() {}
// gfx::ImageSkiaSource overrides:
- virtual ImageSkiaRep GetImageForScale(ui::ScaleFactor scale_factor) OVERRIDE {
- const ImageSkiaRep& image_rep = source_.GetRepresentation(scale_factor);
+ virtual ImageSkiaRep GetImageForScale(float scale) OVERRIDE {
+ const ImageSkiaRep& image_rep = source_.GetRepresentation(scale);
- const float scale = image_rep.GetScale();
ShadowValues shadows_in_pixel;
for (size_t i = 0; i < shaodws_in_dip_.size(); ++i)
shadows_in_pixel.push_back(shaodws_in_dip_[i].Scale(scale));
@@ -403,7 +395,7 @@ class DropShadowSource : public ImageSkiaSource {
const SkBitmap shadow_bitmap = SkBitmapOperations::CreateDropShadow(
image_rep.sk_bitmap(),
shadows_in_pixel);
- return ImageSkiaRep(shadow_bitmap, image_rep.scale_factor());
+ return ImageSkiaRep(shadow_bitmap, image_rep.scale());
}
private:
@@ -425,11 +417,11 @@ class RotatedSource : public ImageSkiaSource {
virtual ~RotatedSource() {}
// gfx::ImageSkiaSource overrides:
- virtual ImageSkiaRep GetImageForScale(ui::ScaleFactor scale_factor) OVERRIDE {
- const ImageSkiaRep& image_rep = source_.GetRepresentation(scale_factor);
+ virtual ImageSkiaRep GetImageForScale(float scale) OVERRIDE {
+ const ImageSkiaRep& image_rep = source_.GetRepresentation(scale);
const SkBitmap rotated_bitmap =
SkBitmapOperations::Rotate(image_rep.sk_bitmap(), rotation_);
- return ImageSkiaRep(rotated_bitmap, image_rep.scale_factor());
+ return ImageSkiaRep(rotated_bitmap, image_rep.scale());
}
private:
« chrome/browser/extensions/extension_icon_image.h ('K') | « ui/gfx/image/image_skia.cc ('k') | ui/gfx/image/image_skia_rep.h » ('j') | ui/views/controls/button/image_button.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698