summaryrefslogtreecommitdiffstats
path: root/ui/gfx
diff options
context:
space:
mode:
Diffstat (limited to 'ui/gfx')
-rw-r--r--ui/gfx/android/java_bitmap.cc2
-rw-r--r--ui/gfx/canvas.cc39
-rw-r--r--ui/gfx/canvas.h12
-rw-r--r--ui/gfx/color_analysis_unittest.cc6
-rw-r--r--ui/gfx/image/image.cc2
-rw-r--r--ui/gfx/image/image_unittest.cc2
-rw-r--r--ui/gfx/image/image_unittest_util.cc2
7 files changed, 13 insertions, 52 deletions
diff --git a/ui/gfx/android/java_bitmap.cc b/ui/gfx/android/java_bitmap.cc
index 1cc6948..a5b891a 100644
--- a/ui/gfx/android/java_bitmap.cc
+++ b/ui/gfx/android/java_bitmap.cc
@@ -82,7 +82,7 @@ ScopedJavaLocalRef<jobject> CreateJavaBitmapFromAndroidResource(
ScopedJavaLocalRef<jobject> ConvertToJavaBitmap(const SkBitmap* skbitmap) {
DCHECK(skbitmap);
DCHECK(!skbitmap->isNull());
- SkBitmap::Config bitmap_config = skbitmap->getConfig();
+ SkBitmap::Config bitmap_config = skbitmap->config();
DCHECK((bitmap_config == SkBitmap::kRGB_565_Config) ||
(bitmap_config == SkBitmap::kARGB_8888_Config));
ScopedJavaLocalRef<jobject> jbitmap = CreateJavaBitmap(
diff --git a/ui/gfx/canvas.cc b/ui/gfx/canvas.cc
index a541c5a..36baa97 100644
--- a/ui/gfx/canvas.cc
+++ b/ui/gfx/canvas.cc
@@ -335,7 +335,7 @@ void Canvas::DrawImageInt(const ImageSkia& image,
int x,
int y,
const SkPaint& paint) {
- const ImageSkiaRep& image_rep = GetImageRepToPaint(image);
+ const ImageSkiaRep& image_rep = image.GetRepresentation(image_scale_);
if (image_rep.is_null())
return;
const SkBitmap& bitmap = image_rep.sk_bitmap();
@@ -441,7 +441,7 @@ void Canvas::DrawImageInPath(const ImageSkia& image,
int y,
const SkPath& path,
const SkPaint& paint) {
- const ImageSkiaRep& image_rep = GetImageRepToPaint(image);
+ const ImageSkiaRep& image_rep = image.GetRepresentation(image_scale_);
if (image_rep.is_null())
return;
@@ -504,8 +504,7 @@ void Canvas::TileImageInt(const ImageSkia& image,
if (!IntersectsClipRectInt(dest_x, dest_y, w, h))
return;
- const ImageSkiaRep& image_rep = GetImageRepToPaint(
- image, image_scale_, tile_scale_x, tile_scale_y);
+ const ImageSkiaRep& image_rep = image.GetRepresentation(image_scale_);
if (image_rep.is_null())
return;
@@ -562,32 +561,6 @@ bool Canvas::IntersectsClipRect(const Rect& rect) {
rect.width(), rect.height());
}
-const ImageSkiaRep& Canvas::GetImageRepToPaint(const ImageSkia& image) const {
- return GetImageRepToPaint(image, image_scale_, 1.0f, 1.0f);
-}
-
-const ImageSkiaRep& Canvas::GetImageRepToPaint(
- const ImageSkia& image,
- float image_scale,
- float user_additional_scale_x,
- float user_additional_scale_y) const {
- const ImageSkiaRep& image_rep = image.GetRepresentation(image_scale);
-
- if (!image_rep.is_null()) {
- SkMatrix m = canvas_->getTotalMatrix();
- float scale_x = SkScalarToFloat(SkScalarAbs(m.getScaleX())) *
- user_additional_scale_x;
- float scale_y = SkScalarToFloat(SkScalarAbs(m.getScaleY())) *
- user_additional_scale_y;
-
- float bitmap_scale = image_rep.scale();
- if (scale_x < bitmap_scale || scale_y < bitmap_scale)
- const_cast<SkBitmap&>(image_rep.sk_bitmap()).buildMipMap();
- }
-
- return image_rep;
-}
-
void Canvas::DrawImageIntHelper(const ImageSkia& image,
int src_x,
int src_y,
@@ -614,8 +587,7 @@ void Canvas::DrawImageIntHelper(const ImageSkia& image,
float user_scale_x = static_cast<float>(dest_w) / src_w;
float user_scale_y = static_cast<float>(dest_h) / src_h;
- const ImageSkiaRep& image_rep = GetImageRepToPaint(image,
- image_scale, user_scale_x, user_scale_y);
+ const ImageSkiaRep& image_rep = image.GetRepresentation(image_scale);
if (image_rep.is_null())
return;
@@ -654,7 +626,8 @@ void Canvas::DrawImageIntHelper(const ImageSkia& image,
// Set up our paint to use the shader & release our reference (now just owned
// by the paint).
SkPaint p(paint);
- p.setFilterBitmap(filter);
+ p.setFilterLevel(filter ? SkPaint::kLow_FilterLevel
+ : SkPaint::kNone_FilterLevel);
p.setShader(shader.get());
// The rect will be filled by the bitmap.
diff --git a/ui/gfx/canvas.h b/ui/gfx/canvas.h
index 93171d5..9467b9c 100644
--- a/ui/gfx/canvas.h
+++ b/ui/gfx/canvas.h
@@ -443,18 +443,6 @@ class GFX_EXPORT Canvas {
bool IntersectsClipRectInt(int x, int y, int w, int h);
bool IntersectsClipRect(const Rect& rect);
- // Returns the image rep which best matches the canvas |image_scale_|.
- // Returns a null image rep if |image| contains no image reps.
- // Builds mip map for returned image rep if necessary.
- //
- // An optional additional user defined scale can be provided.
- const ImageSkiaRep& GetImageRepToPaint(const ImageSkia& image) const;
- const ImageSkiaRep& GetImageRepToPaint(
- const ImageSkia& image,
- float image_scale,
- float user_defined_scale_factor_x,
- float user_defined_scale_factor_y) const;
-
// Helper for the DrawImageInt functions declared above. The |pixel|
// parameter if true indicates that the bounds and the image are to
// be assumed to be in pixels, i.e. no scaling needs to be performed.
diff --git a/ui/gfx/color_analysis_unittest.cc b/ui/gfx/color_analysis_unittest.cc
index b8234d6..9592d0d 100644
--- a/ui/gfx/color_analysis_unittest.cc
+++ b/ui/gfx/color_analysis_unittest.cc
@@ -279,7 +279,7 @@ TEST_F(ColorAnalysisTest, ComputeColorCovarianceTrivial) {
EXPECT_EQ(gfx::Matrix3F::Zeros(),
color_utils::ComputeColorCovariance(bitmap));
bitmap.allocPixels();
- bitmap.eraseRGB(50, 150, 200);
+ bitmap.eraseARGB(255, 50, 150, 200);
gfx::Matrix3F covariance = color_utils::ComputeColorCovariance(bitmap);
// The answer should be all zeros.
EXPECT_TRUE(covariance == gfx::Matrix3F::Zeros());
@@ -315,7 +315,7 @@ TEST_F(ColorAnalysisTest, ApplyColorReductionSingleColor) {
source.allocPixels();
result.allocPixels();
- source.eraseRGB(50, 150, 200);
+ source.eraseARGB(255, 50, 150, 200);
gfx::Vector3dF transform(1.0f, .5f, 0.1f);
// This transform, if not scaled, should result in GL=145.
@@ -436,7 +436,7 @@ TEST_F(ColorAnalysisTest, ComputePrincipalComponentImageNotComputable) {
source.allocPixels();
result.allocPixels();
- source.eraseRGB(50, 150, 200);
+ source.eraseARGB(255, 50, 150, 200);
// This computation should fail since all colors always vary together.
EXPECT_FALSE(color_utils::ComputePrincipalComponentImage(source, &result));
diff --git a/ui/gfx/image/image.cc b/ui/gfx/image/image.cc
index 0a5564d..7bfcacd 100644
--- a/ui/gfx/image/image.cc
+++ b/ui/gfx/image/image.cc
@@ -58,7 +58,7 @@ ImageSkia* GetErrorImageSkia() {
SkBitmap bitmap;
bitmap.setConfig(SkBitmap::kARGB_8888_Config, 16, 16);
bitmap.allocPixels();
- bitmap.eraseRGB(0xff, 0, 0);
+ bitmap.eraseARGB(0xff, 0xff, 0, 0);
return new gfx::ImageSkia(gfx::ImageSkiaRep(bitmap, 1.0f));
}
diff --git a/ui/gfx/image/image_unittest.cc b/ui/gfx/image/image_unittest.cc
index 1e137e0..a0fbe3e 100644
--- a/ui/gfx/image/image_unittest.cc
+++ b/ui/gfx/image/image_unittest.cc
@@ -472,7 +472,7 @@ TEST_F(ImageTest, SkBitmapConversionPreservesOrientation) {
const int height = 50;
SkBitmap bitmap;
bitmap.allocN32Pixels(width, height);
- bitmap.eraseRGB(0, 255, 0);
+ bitmap.eraseARGB(255, 0, 255, 0);
// Paint the upper half of the image in red (lower half is in green).
SkCanvas canvas(bitmap);
diff --git a/ui/gfx/image/image_unittest_util.cc b/ui/gfx/image/image_unittest_util.cc
index aa7094c..b66ace5 100644
--- a/ui/gfx/image/image_unittest_util.cc
+++ b/ui/gfx/image/image_unittest_util.cc
@@ -56,7 +56,7 @@ const SkBitmap CreateBitmap(int width, int height) {
SkBitmap bitmap;
bitmap.setConfig(SkBitmap::kARGB_8888_Config, width, height);
bitmap.allocPixels();
- bitmap.eraseRGB(0, 255, 0);
+ bitmap.eraseARGB(255, 0, 255, 0);
return bitmap;
}
generated by cgit v1.1 at 2025-03-18 03:47:01 +0000