diff options
23 files changed, 26 insertions, 74 deletions
diff --git a/ash/desktop_background/desktop_background_controller_unittest.cc b/ash/desktop_background/desktop_background_controller_unittest.cc index 609ea14..fa2e2a4 100644 --- a/ash/desktop_background/desktop_background_controller_unittest.cc +++ b/ash/desktop_background/desktop_background_controller_unittest.cc @@ -94,8 +94,7 @@ class DesktopBackgroundControllerTest : public test::AshTestBase { // Creates an image of size |size|. gfx::ImageSkia CreateImage(int width, int height, SkColor color) { SkBitmap bitmap; - bitmap.setConfig(SkBitmap::kARGB_8888_Config, width, height); - bitmap.allocPixels(); + bitmap.allocN32Pixels(width, height); bitmap.eraseColor(color); gfx::ImageSkia image = gfx::ImageSkia::CreateFrom1xBitmap(bitmap); return image; diff --git a/ash/desktop_background/wallpaper_resizer_unittest.cc b/ash/desktop_background/wallpaper_resizer_unittest.cc index 240dc8e..fb951ef 100644 --- a/ash/desktop_background/wallpaper_resizer_unittest.cc +++ b/ash/desktop_background/wallpaper_resizer_unittest.cc @@ -27,8 +27,7 @@ gfx::ImageSkia CreateTestImage(const gfx::Size& size) { SkBitmap src; int w = size.width(); int h = size.height(); - src.setConfig(SkBitmap::kARGB_8888_Config, w, h); - src.allocPixels(); + src.allocN32Pixels(w, h); // Fill bitmap with data. for (int y = 0; y < h; ++y) { diff --git a/ash/shell/app_list.cc b/ash/shell/app_list.cc index e396848..f835153 100644 --- a/ash/shell/app_list.cc +++ b/ash/shell/app_list.cc @@ -67,8 +67,7 @@ class WindowTypeShelfItem : public app_list::AppListItem { const int kIconSize = 128; SkBitmap icon; - icon.setConfig(SkBitmap::kARGB_8888_Config, kIconSize, kIconSize); - icon.allocPixels(); + icon.allocN32Pixels(kIconSize, kIconSize); icon.eraseColor(kColors[static_cast<int>(type) % arraysize(kColors)]); return gfx::ImageSkia::CreateFrom1xBitmap(icon); } diff --git a/ash/shell/window_watcher.cc b/ash/shell/window_watcher.cc index 44edaa4..d7bc726 100644 --- a/ash/shell/window_watcher.cc +++ b/ash/shell/window_watcher.cc @@ -105,8 +105,7 @@ void WindowWatcher::OnWindowAdded(aura::Window* new_window) { id_to_window_[id] = new_window; SkBitmap icon_bitmap; - icon_bitmap.setConfig(SkBitmap::kARGB_8888_Config, 16, 16); - icon_bitmap.allocPixels(); + icon_bitmap.allocN32Pixels(16, 16); icon_bitmap.eraseARGB(255, image_count == 0 ? 255 : 0, image_count == 1 ? 255 : 0, diff --git a/ash/system/chromeos/network/network_icon.cc b/ash/system/chromeos/network/network_icon.cc index 228e970..a61f481 100644 --- a/ash/system/chromeos/network/network_icon.cc +++ b/ash/system/chromeos/network/network_icon.cc @@ -202,8 +202,7 @@ const SkBitmap GetEmptyBitmap(const gfx::Size pixel_size) { return iter->second; SkBitmap empty; - empty.setConfig(SkBitmap::kARGB_8888_Config, key.first, key.second); - empty.allocPixels(); + empty.allocN32Pixels(key.first, key.second); empty.eraseARGB(0, 0, 0, 0); (*s_empty_bitmaps)[key] = empty; return empty; diff --git a/athena/content/content_app_model_builder.cc b/athena/content/content_app_model_builder.cc index 0f5eed7..c90304d 100644 --- a/athena/content/content_app_model_builder.cc +++ b/athena/content/content_app_model_builder.cc @@ -28,11 +28,8 @@ ShellExtensionSystem* GetShellExtensionSystem( gfx::ImageSkia CreateFlatColorImage(SkColor color) { SkBitmap bitmap; - bitmap.setConfig( - SkBitmap::kARGB_8888_Config, - extension_misc::EXTENSION_ICON_MEDIUM, - extension_misc::EXTENSION_ICON_MEDIUM); - bitmap.allocPixels(); + bitmap.allocN32Pixels(extension_misc::EXTENSION_ICON_MEDIUM, + extension_misc::EXTENSION_ICON_MEDIUM); bitmap.eraseColor(color); return gfx::ImageSkia::CreateFrom1xBitmap(bitmap); } diff --git a/athena/test/test_app_model_builder.cc b/athena/test/test_app_model_builder.cc index f7db8a0..c4b5387 100644 --- a/athena/test/test_app_model_builder.cc +++ b/athena/test/test_app_model_builder.cc @@ -78,8 +78,7 @@ class DummyItem : public app_list::AppListItem { break; } SkBitmap bitmap; - bitmap.setConfig(SkBitmap::kARGB_8888_Config, kIconSize, kIconSize); - bitmap.allocPixels(); + bitmap.allocN32Pixels(kIconSize, kIconSize); bitmap.eraseColor(color); return gfx::ImageSkia::CreateFrom1xBitmap(bitmap); } diff --git a/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm b/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm index 3bb078b..c576670 100644 --- a/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm +++ b/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm @@ -343,8 +343,7 @@ TEST_F(HistoryMenuBridgeTest, GetFaviconForHistoryItem) { TEST_F(HistoryMenuBridgeTest, GotFaviconData) { // Create a dummy bitmap. SkBitmap bitmap; - bitmap.setConfig(SkBitmap::kARGB_8888_Config, 25, 25); - bitmap.allocPixels(); + bitmap.allocN32Pixels(25, 25); bitmap.eraseARGB(255, 255, 0, 0); // Set up the HistoryItem. 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 f27e9351..7138af8 100644 --- a/chrome/browser/ui/cocoa/table_row_nsimage_cache_unittest.mm +++ b/chrome/browser/ui/cocoa/table_row_nsimage_cache_unittest.mm @@ -31,8 +31,7 @@ class TestTable : public TableRowNSImageCache::Table { SkBitmap MakeImage(int width, int height) { SkBitmap image; - image.setConfig(SkBitmap::kARGB_8888_Config, width, height); - EXPECT_TRUE(image.allocPixels()); + EXPECT_TRUE(image.allocN32Pixels(width, height)); image.eraseARGB(255, 255, 0, 0); return image; } diff --git a/components/search_provider_logos/logo_tracker_unittest.cc b/components/search_provider_logos/logo_tracker_unittest.cc index 7872134..c32df2a 100644 --- a/components/search_provider_logos/logo_tracker_unittest.cc +++ b/components/search_provider_logos/logo_tracker_unittest.cc @@ -66,8 +66,7 @@ std::string EncodeBitmapAsPNGBase64(const SkBitmap& bitmap) { SkBitmap MakeBitmap(int width, int height) { SkBitmap bitmap; - bitmap.setConfig(SkBitmap::kARGB_8888_Config, width, height); - bitmap.allocPixels(); + bitmap.allocN32Pixels(width, height); bitmap.eraseColor(SK_ColorBLUE); return bitmap; } diff --git a/content/browser/renderer_host/render_widget_host_view_browsertest.cc b/content/browser/renderer_host/render_widget_host_view_browsertest.cc index 302f4fe..ae2b844 100644 --- a/content/browser/renderer_host/render_widget_host_view_browsertest.cc +++ b/content/browser/renderer_host/render_widget_host_view_browsertest.cc @@ -488,10 +488,8 @@ class CompositingRenderWidgetHostViewBrowserTestTabCapture media::SkCanvasVideoRenderer video_renderer; SkBitmap bitmap; - bitmap.allocPixels(SkImageInfo::Make(video_frame->visible_rect().width(), - video_frame->visible_rect().height(), - kPMColor_SkColorType, - kPremul_SkAlphaType)); + bitmap.allocN32Pixels(video_frame->visible_rect().width(), + video_frame->visible_rect().height()); bitmap.eraseColor(SK_ColorTRANSPARENT); SkCanvas canvas(bitmap); diff --git a/content/shell/renderer/test_runner/TestPlugin.cpp b/content/shell/renderer/test_runner/TestPlugin.cpp index 22f56f5..49606d5 100644 --- a/content/shell/renderer/test_runner/TestPlugin.cpp +++ b/content/shell/renderer/test_runner/TestPlugin.cpp @@ -429,9 +429,10 @@ void TestPlugin::drawSceneSoftware(void* memory, size_t bytes) { m_scene.backgroundColor[1], m_scene.backgroundColor[2]); + const SkImageInfo info = SkImageInfo::MakeN32Premul(m_rect.width, + m_rect.height); SkBitmap bitmap; - bitmap.setConfig(SkBitmap::kARGB_8888_Config, m_rect.width, m_rect.height); - bitmap.setPixels(memory); + bitmap.installPixels(info, memory, info.minRowBytes()); SkCanvas canvas(bitmap); canvas.clear(backgroundColor); diff --git a/extensions/browser/extension_icon_image_unittest.cc b/extensions/browser/extension_icon_image_unittest.cc index d931043..62462ff 100644 --- a/extensions/browser/extension_icon_image_unittest.cc +++ b/extensions/browser/extension_icon_image_unittest.cc @@ -30,10 +30,8 @@ namespace { SkBitmap CreateBlankBitmapForScale(int size_dip, ui::ScaleFactor scale_factor) { SkBitmap bitmap; const float scale = ui::GetScaleForScaleFactor(scale_factor); - bitmap.setConfig(SkBitmap::kARGB_8888_Config, - static_cast<int>(size_dip * scale), - static_cast<int>(size_dip * scale)); - bitmap.allocPixels(); + bitmap.allocN32Pixels(static_cast<int>(size_dip * scale), + static_cast<int>(size_dip * scale)); bitmap.eraseColor(SkColorSetARGB(0, 0, 0, 0)); return bitmap; } diff --git a/skia/config/SkUserConfig.h b/skia/config/SkUserConfig.h index 4e99d1d..07a8ef8 100644 --- a/skia/config/SkUserConfig.h +++ b/skia/config/SkUserConfig.h @@ -257,14 +257,6 @@ SK_API void SkDebugf_FileLine(const char* file, int line, bool fatal, #define SK_SUPPORT_LEGACY_BITMAP_CONFIG #endif -#ifndef SK_SUPPORT_LEGACY_N32_NAME - #define SK_SUPPORT_LEGACY_N32_NAME -#endif - -#ifndef SK_SUPPORT_LEGACY_SETCONFIG - #define SK_SUPPORT_LEGACY_SETCONFIG -#endif - // ===== End Chrome-specific definitions ===== #endif diff --git a/skia/ext/bitmap_platform_device_cairo.cc b/skia/ext/bitmap_platform_device_cairo.cc index f685830..6d5d77c 100644 --- a/skia/ext/bitmap_platform_device_cairo.cc +++ b/skia/ext/bitmap_platform_device_cairo.cc @@ -169,7 +169,7 @@ BitmapPlatformDevice::~BitmapPlatformDevice() { SkBaseDevice* BitmapPlatformDevice::onCreateDevice(const SkImageInfo& info, Usage /*usage*/) { - SkASSERT(info.colorType() == kPMColor_SkColorType); + SkASSERT(info.colorType() == kN32_SkColorType); return BitmapPlatformDevice::Create(info.width(), info.height(), info.isOpaque()); } diff --git a/skia/ext/bitmap_platform_device_skia.cc b/skia/ext/bitmap_platform_device_skia.cc index a105c77..0255444 100644 --- a/skia/ext/bitmap_platform_device_skia.cc +++ b/skia/ext/bitmap_platform_device_skia.cc @@ -53,7 +53,7 @@ BitmapPlatformDevice::~BitmapPlatformDevice() { SkBaseDevice* BitmapPlatformDevice::onCreateDevice(const SkImageInfo& info, Usage /*usage*/) { - SkASSERT(info.colorType() == kPMColor_SkColorType); + SkASSERT(info.colorType() == kN32_SkColorType); return BitmapPlatformDevice::Create(info.width(), info.height(), info.isOpaque()); } diff --git a/skia/ext/bitmap_platform_device_win.cc b/skia/ext/bitmap_platform_device_win.cc index f526488..e10a6de 100644 --- a/skia/ext/bitmap_platform_device_win.cc +++ b/skia/ext/bitmap_platform_device_win.cc @@ -272,7 +272,7 @@ const SkBitmap& BitmapPlatformDevice::onAccessBitmap() { SkBaseDevice* BitmapPlatformDevice::onCreateDevice(const SkImageInfo& info, Usage /*usage*/) { - SkASSERT(info.colorType() == kPMColor_SkColorType); + SkASSERT(info.colorType() == kN32_SkColorType); return BitmapPlatformDevice::CreateAndClear(info.width(), info.height(), info.isOpaque()); } diff --git a/skia/ext/pixel_ref_utils_unittest.cc b/skia/ext/pixel_ref_utils_unittest.cc index 1a0ff96..bddbe65 100644 --- a/skia/ext/pixel_ref_utils_unittest.cc +++ b/skia/ext/pixel_ref_utils_unittest.cc @@ -63,11 +63,7 @@ class TestDiscardableShader : public SkShader { }; void CreateBitmap(gfx::Size size, const char* uri, SkBitmap* bitmap) { - const SkImageInfo info = { - size.width(), size.height(), kPMColor_SkColorType, kPremul_SkAlphaType - }; - - bitmap->allocPixels(info); + bitmap->allocN32Pixels(size.width(), size.height()); bitmap->pixelRef()->setImmutable(); bitmap->pixelRef()->setURI(uri); } diff --git a/skia/ext/skia_utils_ios.mm b/skia/ext/skia_utils_ios.mm index 6f4814a..87900b7 100644 --- a/skia/ext/skia_utils_ios.mm +++ b/skia/ext/skia_utils_ios.mm @@ -18,13 +18,7 @@ SkBitmap CGImageToSkBitmap(CGImageRef image, CGSize size, bool is_opaque) { if (!image) return bitmap; - bitmap.setConfig(SkBitmap::kARGB_8888_Config, - size.width, - size.height, - 0, - is_opaque ? kOpaque_SkAlphaType : kPremul_SkAlphaType); - - if (!bitmap.allocPixels()) + if (!bitmap.allocN32Pixels(size.width, size.height, is_opaque)) return bitmap; void* data = bitmap.getPixels(); diff --git a/skia/ext/vector_platform_device_emf_win.cc b/skia/ext/vector_platform_device_emf_win.cc index 31059af..af245cd 100644 --- a/skia/ext/vector_platform_device_emf_win.cc +++ b/skia/ext/vector_platform_device_emf_win.cc @@ -693,18 +693,9 @@ void VectorPlatformDeviceEmf::LoadClipRegion() { LoadClippingRegionToDC(hdc_, clip_region_, t); } -#ifdef SK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG -SkBaseDevice* VectorPlatformDeviceEmf::onCreateCompatibleDevice( - SkBitmap::Config config, int width, int height, bool isOpaque, - Usage /*usage*/) { - SkASSERT(config == SkBitmap::kARGB_8888_Config); - return VectorPlatformDeviceEmf::CreateDevice(width, height, isOpaque, NULL); -} -#endif - SkBaseDevice* VectorPlatformDeviceEmf::onCreateDevice(const SkImageInfo& info, Usage /*usage*/) { - SkASSERT(info.colorType() == kPMColor_SkColorType); + SkASSERT(info.colorType() == kN32_SkColorType); return VectorPlatformDeviceEmf::CreateDevice( info.width(), info.height(), info.isOpaque(), NULL); } diff --git a/skia/ext/vector_platform_device_emf_win.h b/skia/ext/vector_platform_device_emf_win.h index 844624f..2d00940 100644 --- a/skia/ext/vector_platform_device_emf_win.h +++ b/skia/ext/vector_platform_device_emf_win.h @@ -79,11 +79,6 @@ class VectorPlatformDeviceEmf : public SkBitmapDevice, public PlatformDevice { void LoadClipRegion(); protected: -#ifdef SK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG - virtual SkBaseDevice* onCreateCompatibleDevice(SkBitmap::Config, int width, - int height, bool isOpaque, - Usage usage) OVERRIDE; -#endif virtual SkBaseDevice* onCreateDevice(const SkImageInfo& info, Usage usage) OVERRIDE; diff --git a/ui/app_list/cocoa/apps_grid_controller_unittest.mm b/ui/app_list/cocoa/apps_grid_controller_unittest.mm index fdb5e60..316a1e6 100644 --- a/ui/app_list/cocoa/apps_grid_controller_unittest.mm +++ b/ui/app_list/cocoa/apps_grid_controller_unittest.mm @@ -462,7 +462,7 @@ TEST_F(AppsGridControllerTest, ModelUpdate) { SkBitmap bitmap; const int kTestImageSize = 10; const int kTargetImageSize = 48; - bitmap.setConfig(SkBitmap::kARGB_8888_Config, kTestImageSize, kTestImageSize); + bitmap.setInfo(SkImageInfo::MakeN32Premul(kTestImageSize, kTestImageSize)); item_model->SetIcon(gfx::ImageSkia::CreateFrom1xBitmap(bitmap), false); icon_size = [[button image] size]; // Icon should always be resized to 48x48. diff --git a/ui/message_center/cocoa/notification_controller_unittest.mm b/ui/message_center/cocoa/notification_controller_unittest.mm index 91d1b1b..4a77441 100644 --- a/ui/message_center/cocoa/notification_controller_unittest.mm +++ b/ui/message_center/cocoa/notification_controller_unittest.mm @@ -405,8 +405,7 @@ TEST_F(NotificationControllerTest, MessageSize) { // Message, image and no title: 2 lines. SkBitmap bitmap; - bitmap.setConfig(SkBitmap::kARGB_8888_Config, 2, 2); - bitmap.allocPixels(); + bitmap.allocN32Pixels(2, 2); bitmap.eraseColor(SK_ColorGREEN); notification->set_title(ASCIIToUTF16("")); notification->set_image(gfx::Image::CreateFrom1xBitmap(bitmap)); |