summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfmalita@chromium.org <fmalita@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-10 02:48:00 +0000
committerfmalita@chromium.org <fmalita@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-10 02:48:00 +0000
commit1358f2708fe4c0b91ab7c10be1e9b8b84d3144b1 (patch)
tree6b44bf3d613671293e00f7533392bc9d0c09c25f
parenta3f1d98f5530f8e68fab9e601147240ea79cfb6e (diff)
downloadchromium_src-1358f2708fe4c0b91ab7c10be1e9b8b84d3144b1.zip
chromium_src-1358f2708fe4c0b91ab7c10be1e9b8b84d3144b1.tar.gz
chromium_src-1358f2708fe4c0b91ab7c10be1e9b8b84d3144b1.tar.bz2
Scrub deprecated Skia APIs.
Refactor clients using equivalent non-deprecated methods. R=reed@google.com,enne@chromium.org,sky@chromium.org Review URL: https://codereview.chromium.org/271653003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269497 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--cc/output/software_renderer.cc4
-rw-r--r--chrome/browser/media/fake_desktop_media_list.cc2
-rw-r--r--chrome/browser/thumbnails/content_based_thumbnailing_algorithm_unittest.cc2
-rw-r--r--chrome/browser/ui/app_list/fast_show_pickler.cc2
-rw-r--r--chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm2
-rw-r--r--chrome/browser/ui/cocoa/table_row_nsimage_cache_unittest.mm2
-rw-r--r--chrome/browser/ui/libgtk2ui/gtk2_ui.cc3
-rw-r--r--content/browser/renderer_host/compositing_iosurface_transformer_mac_unittest.cc2
-rw-r--r--content/common/gpu/client/gl_helper_unittest.cc12
-rw-r--r--media/filters/skcanvas_video_renderer.cc2
-rw-r--r--skia/ext/skia_utils_mac_unittest.mm4
-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
-rw-r--r--ui/message_center/views/proportional_image_view.cc2
-rw-r--r--ui/views/controls/image_view.cc2
20 files changed, 34 insertions, 72 deletions
diff --git a/cc/output/software_renderer.cc b/cc/output/software_renderer.cc
index dc117ef..348e57d 100644
--- a/cc/output/software_renderer.cc
+++ b/cc/output/software_renderer.cc
@@ -290,7 +290,7 @@ void SoftwareRenderer::DoDrawQuad(DrawingFrame* frame, const DrawQuad* quad) {
quad->IsRightEdge();
if (settings_->allow_antialiasing && all_four_edges_are_exterior)
current_paint_.setAntiAlias(true);
- current_paint_.setFilterBitmap(true);
+ current_paint_.setFilterLevel(SkPaint::kLow_FilterLevel);
}
if (quad->ShouldDrawWithBlending()) {
@@ -488,7 +488,7 @@ void SoftwareRenderer::DrawTileQuad(const DrawingFrame* frame,
QuadVertexRect(), quad->rect, quad->visible_rect);
SkRect uv_rect = gfx::RectFToSkRect(visible_tex_coord_rect);
- current_paint_.setFilterBitmap(true);
+ current_paint_.setFilterLevel(SkPaint::kLow_FilterLevel);
current_canvas_->drawBitmapRectToRect(
*lock.sk_bitmap(),
&uv_rect,
diff --git a/chrome/browser/media/fake_desktop_media_list.cc b/chrome/browser/media/fake_desktop_media_list.cc
index b289f2b..53852af 100644
--- a/chrome/browser/media/fake_desktop_media_list.cc
+++ b/chrome/browser/media/fake_desktop_media_list.cc
@@ -54,7 +54,7 @@ void FakeDesktopMediaList::StartUpdating(DesktopMediaListObserver* observer) {
SkBitmap bitmap;
bitmap.setConfig(SkBitmap::kARGB_8888_Config, 150, 150);
bitmap.allocPixels();
- bitmap.eraseRGB(0, 255, 0);
+ bitmap.eraseARGB(255, 0, 255, 0);
thumbnail_ = gfx::ImageSkia::CreateFrom1xBitmap(bitmap);
}
diff --git a/chrome/browser/thumbnails/content_based_thumbnailing_algorithm_unittest.cc b/chrome/browser/thumbnails/content_based_thumbnailing_algorithm_unittest.cc
index 1e8eae7..3115f1b 100644
--- a/chrome/browser/thumbnails/content_based_thumbnailing_algorithm_unittest.cc
+++ b/chrome/browser/thumbnails/content_based_thumbnailing_algorithm_unittest.cc
@@ -107,7 +107,7 @@ TEST_F(ContentBasedThumbnailingAlgorithmTest, PrepareSourceBitmap) {
SkBitmap source;
source.setConfig(SkBitmap::kARGB_8888_Config, 800, 600);
source.allocPixels();
- source.eraseRGB(50, 150, 200);
+ source.eraseARGB(255, 50, 150, 200);
SkBitmap result = ContentBasedThumbnailingAlgorithm::PrepareSourceBitmap(
source, thumbnail_size, context.get());
EXPECT_EQ(CLIP_RESULT_SOURCE_SAME_AS_TARGET, context->clip_result);
diff --git a/chrome/browser/ui/app_list/fast_show_pickler.cc b/chrome/browser/ui/app_list/fast_show_pickler.cc
index 132f82e..3afe5d6 100644
--- a/chrome/browser/ui/app_list/fast_show_pickler.cc
+++ b/chrome/browser/ui/app_list/fast_show_pickler.cc
@@ -84,7 +84,7 @@ bool PickleImage(Pickle* pickle, const gfx::ImageSkia& image) {
pickle->WriteInt(it->pixel_width());
pickle->WriteInt(it->pixel_height());
ImageFormat format = NONE;
- if (!ConfigToFormat(it->sk_bitmap().getConfig(), &format))
+ if (!ConfigToFormat(it->sk_bitmap().config(), &format))
return false;
pickle->WriteInt(static_cast<int>(format));
int size = static_cast<int>(it->sk_bitmap().getSafeSize());
diff --git a/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm b/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm
index ead2f46..3bb078b 100644
--- a/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm
+++ b/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm
@@ -345,7 +345,7 @@ TEST_F(HistoryMenuBridgeTest, GotFaviconData) {
SkBitmap bitmap;
bitmap.setConfig(SkBitmap::kARGB_8888_Config, 25, 25);
bitmap.allocPixels();
- bitmap.eraseRGB(255, 0, 0);
+ bitmap.eraseARGB(255, 255, 0, 0);
// Set up the HistoryItem.
HistoryMenuBridge::HistoryItem item;
diff --git a/chrome/browser/ui/cocoa/table_row_nsimage_cache_unittest.mm b/chrome/browser/ui/cocoa/table_row_nsimage_cache_unittest.mm
index fb1fcc2..f27e9351 100644
--- a/chrome/browser/ui/cocoa/table_row_nsimage_cache_unittest.mm
+++ b/chrome/browser/ui/cocoa/table_row_nsimage_cache_unittest.mm
@@ -33,7 +33,7 @@ SkBitmap MakeImage(int width, int height) {
SkBitmap image;
image.setConfig(SkBitmap::kARGB_8888_Config, width, height);
EXPECT_TRUE(image.allocPixels());
- image.eraseRGB(255, 0, 0);
+ image.eraseARGB(255, 255, 0, 0);
return image;
}
diff --git a/chrome/browser/ui/libgtk2ui/gtk2_ui.cc b/chrome/browser/ui/libgtk2ui/gtk2_ui.cc
index b56ddf3..2730216 100644
--- a/chrome/browser/ui/libgtk2ui/gtk2_ui.cc
+++ b/chrome/browser/ui/libgtk2ui/gtk2_ui.cc
@@ -1035,7 +1035,8 @@ SkBitmap Gtk2UI::GenerateGtkThemeBitmap(int id) const {
bitmap.setConfig(SkBitmap::kARGB_8888_Config,
kToolbarImageWidth, kToolbarImageHeight);
bitmap.allocPixels();
- bitmap.eraseRGB(color->red >> 8, color->green >> 8, color->blue >> 8);
+ bitmap.eraseARGB(0xff, color->red >> 8, color->green >> 8,
+ color->blue >> 8);
return bitmap;
}
case IDR_THEME_TAB_BACKGROUND:
diff --git a/content/browser/renderer_host/compositing_iosurface_transformer_mac_unittest.cc b/content/browser/renderer_host/compositing_iosurface_transformer_mac_unittest.cc
index 7d9452f..07c5942 100644
--- a/content/browser/renderer_host/compositing_iosurface_transformer_mac_unittest.cc
+++ b/content/browser/renderer_host/compositing_iosurface_transformer_mac_unittest.cc
@@ -194,7 +194,7 @@ SkBitmap ScaleBitmapWithSkia(const SkBitmap& src,
canvas.scale(static_cast<double>(result.width()) / cropped_src.width(),
static_cast<double>(result.height()) / cropped_src.height());
SkPaint paint;
- paint.setFilterBitmap(true); // Use bilinear filtering.
+ paint.setFilterLevel(SkPaint::kLow_FilterLevel); // Use bilinear filtering.
canvas.drawBitmap(cropped_src, 0, 0, &paint);
return result;
diff --git a/content/common/gpu/client/gl_helper_unittest.cc b/content/common/gpu/client/gl_helper_unittest.cc
index acb1f59..5e5b555 100644
--- a/content/common/gpu/client/gl_helper_unittest.cc
+++ b/content/common/gpu/client/gl_helper_unittest.cc
@@ -855,9 +855,9 @@ class GLHelperTest : public testing::Test {
for (int x = 0; x < w; ++x) {
bool on_grid = (y_on_grid || ((x % grid_pitch) < grid_width));
- if (bmp.getConfig() == SkBitmap::kARGB_8888_Config) {
+ if (bmp.config() == SkBitmap::kARGB_8888_Config) {
*bmp.getAddr32(x, y) = (on_grid ? grid_color : background_color);
- } else if (bmp.getConfig() == SkBitmap::kRGB_565_Config) {
+ } else if (bmp.config() == SkBitmap::kRGB_565_Config) {
*bmp.getAddr16(x, y) = (on_grid ? grid_color : background_color);
}
}
@@ -879,9 +879,9 @@ class GLHelperTest : public testing::Test {
bool x_bit = (((x / rect_w) & 0x1) == 0);
bool use_color2 = (x_bit != y_bit); // xor
- if (bmp.getConfig() == SkBitmap::kARGB_8888_Config) {
+ if (bmp.config() == SkBitmap::kARGB_8888_Config) {
*bmp.getAddr32(x, y) = (use_color2 ? color2 : color1);
- } else if (bmp.getConfig() == SkBitmap::kRGB_565_Config) {
+ } else if (bmp.config() == SkBitmap::kRGB_565_Config) {
*bmp.getAddr16(x, y) = (use_color2 ? color2 : color1);
}
}
@@ -930,7 +930,7 @@ class GLHelperTest : public testing::Test {
LOG(ERROR) << "Bitmap geometry check failure";
return false;
}
- if (bmp1.getConfig() != bmp2.getConfig())
+ if (bmp1.config() != bmp2.config())
return false;
SkAutoLockPixels lock1(bmp1);
@@ -943,7 +943,7 @@ class GLHelperTest : public testing::Test {
for (int x = 0; x < bmp1.width(); ++x) {
if (!ColorsClose(bmp1.getColor(x,y),
bmp2.getColor(x,y),
- bmp1.getConfig())) {
+ bmp1.config())) {
LOG(ERROR) << "Bitmap color comparision failure";
return false;
}
diff --git a/media/filters/skcanvas_video_renderer.cc b/media/filters/skcanvas_video_renderer.cc
index 998a640..c0fe146 100644
--- a/media/filters/skcanvas_video_renderer.cc
+++ b/media/filters/skcanvas_video_renderer.cc
@@ -340,7 +340,7 @@ void SkCanvasVideoRenderer::Paint(media::VideoFrame* video_frame,
}
// Do a slower paint using |last_frame_|.
- paint.setFilterBitmap(true);
+ paint.setFilterLevel(SkPaint::kLow_FilterLevel);
canvas->drawBitmapRect(last_frame_, NULL, dest, &paint);
}
diff --git a/skia/ext/skia_utils_mac_unittest.mm b/skia/ext/skia_utils_mac_unittest.mm
index bc0d422..dd46702 100644
--- a/skia/ext/skia_utils_mac_unittest.mm
+++ b/skia/ext/skia_utils_mac_unittest.mm
@@ -52,9 +52,9 @@ SkBitmap SkiaUtilsMacTest::CreateSkBitmap(int width, int height,
bitmap.allocPixels();
if (isred)
- bitmap.eraseRGB(0xff, 0, 0);
+ bitmap.eraseARGB(0xff, 0xff, 0, 0);
else
- bitmap.eraseRGB(0, 0, 0xff);
+ bitmap.eraseARGB(0xff, 0, 0, 0xff);
return bitmap;
}
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;
}
diff --git a/ui/message_center/views/proportional_image_view.cc b/ui/message_center/views/proportional_image_view.cc
index daf92dc..a1afd2e 100644
--- a/ui/message_center/views/proportional_image_view.cc
+++ b/ui/message_center/views/proportional_image_view.cc
@@ -38,7 +38,7 @@ void ProportionalImageView::OnPaint(gfx::Canvas* canvas) {
canvas->DrawImageInt(image_, draw_bounds.x(), draw_bounds.y());
} else {
SkPaint paint;
- paint.setFilterBitmap(true);
+ paint.setFilterLevel(SkPaint::kLow_FilterLevel);
// This call resizes the image while drawing into the canvas.
canvas->DrawImageInt(
diff --git a/ui/views/controls/image_view.cc b/ui/views/controls/image_view.cc
index c5e2f41..8ee1ad9 100644
--- a/ui/views/controls/image_view.cc
+++ b/ui/views/controls/image_view.cc
@@ -224,7 +224,7 @@ void ImageView::OnPaintImage(gfx::Canvas* canvas) {
if (image_bounds.size() != gfx::Size(image_.width(), image_.height())) {
// Resize case
SkPaint paint;
- paint.setFilterBitmap(true);
+ paint.setFilterLevel(SkPaint::kLow_FilterLevel);
canvas->DrawImageInt(image_, 0, 0, image_.width(), image_.height(),
image_bounds.x(), image_bounds.y(), image_bounds.width(),
image_bounds.height(), true, paint);