diff options
Diffstat (limited to 'chrome')
6 files changed, 7 insertions, 6 deletions
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: |