diff options
| -rw-r--r-- | printing/emf_win.cc | 2 | ||||
| -rw-r--r-- | skia/ext/vector_platform_device_emf_win.cc | 2 | ||||
| -rw-r--r-- | ui/gfx/color_utils.cc | 4 | ||||
| -rw-r--r-- | ui/gfx/icon_util.cc | 4 | ||||
| -rw-r--r-- | ui/gfx/skbitmap_operations.cc | 4 | ||||
| -rw-r--r-- | webkit/plugins/ppapi/ppapi_plugin_instance.cc | 4 |
6 files changed, 10 insertions, 10 deletions
diff --git a/printing/emf_win.cc b/printing/emf_win.cc index bb6e3d6..984c8b3 100644 --- a/printing/emf_win.cc +++ b/printing/emf_win.cc @@ -291,7 +291,7 @@ bool Emf::Record::SafePlayback(const XFORM* base_matrix) const { DCHECK(bitmap.get()); if (bitmap.get()) { SkAutoLockPixels lock(*bitmap.get()); - DCHECK_EQ(bitmap->getConfig(), SkBitmap::kARGB_8888_Config); + DCHECK_EQ(bitmap->config(), SkBitmap::kARGB_8888_Config); const uint32_t* pixels = static_cast<const uint32_t*>(bitmap->getPixels()); if (pixels == NULL) { diff --git a/skia/ext/vector_platform_device_emf_win.cc b/skia/ext/vector_platform_device_emf_win.cc index 55c84fb..e088c55 100644 --- a/skia/ext/vector_platform_device_emf_win.cc +++ b/skia/ext/vector_platform_device_emf_win.cc @@ -778,7 +778,7 @@ void VectorPlatformDeviceEmf::InternalDrawBitmap(const SkBitmap& bitmap, bitmap_header.bV4AlphaMask = 0xff000000; SkAutoLockPixels lock(bitmap); - SkASSERT(bitmap.getConfig() == SkBitmap::kARGB_8888_Config); + SkASSERT(bitmap.config() == SkBitmap::kARGB_8888_Config); const uint32_t* pixels = static_cast<const uint32_t*>(bitmap.getPixels()); if (pixels == NULL) { SkASSERT(false); diff --git a/ui/gfx/color_utils.cc b/ui/gfx/color_utils.cc index 0012b24..16d8990 100644 --- a/ui/gfx/color_utils.cc +++ b/ui/gfx/color_utils.cc @@ -212,7 +212,7 @@ SkColor GetAverageColorOfFavicon(SkBitmap* favicon, SkAlpha alpha) { return SkColorSetARGB(alpha, 0, 0, 0); // Assume ARGB_8888 format. - DCHECK(favicon->getConfig() == SkBitmap::kARGB_8888_Config); + DCHECK(favicon->config() == SkBitmap::kARGB_8888_Config); SkColor* current_color = pixels; DCHECK(favicon->width() <= 16 && favicon->height() <= 16); @@ -248,7 +248,7 @@ void BuildLumaHistogram(const SkBitmap& bitmap, int histogram[256]) { return; // Assume ARGB_8888 format. - DCHECK(bitmap.getConfig() == SkBitmap::kARGB_8888_Config); + DCHECK(bitmap.config() == SkBitmap::kARGB_8888_Config); int pixel_width = bitmap.width(); int pixel_height = bitmap.height(); diff --git a/ui/gfx/icon_util.cc b/ui/gfx/icon_util.cc index c3055cc..b6652f0 100644 --- a/ui/gfx/icon_util.cc +++ b/ui/gfx/icon_util.cc @@ -55,7 +55,7 @@ HICON IconUtil::CreateHICONFromSkBitmap(const SkBitmap& bitmap) { // Only 32 bit ARGB bitmaps are supported. We also try to perform as many // validations as we can on the bitmap. SkAutoLockPixels bitmap_lock(bitmap); - if ((bitmap.getConfig() != SkBitmap::kARGB_8888_Config) || + if ((bitmap.config() != SkBitmap::kARGB_8888_Config) || (bitmap.width() <= 0) || (bitmap.height() <= 0) || (bitmap.getPixels() == NULL)) return NULL; @@ -235,7 +235,7 @@ bool IconUtil::CreateIconFileFromSkBitmap(const SkBitmap& bitmap, // Only 32 bit ARGB bitmaps are supported. We also make sure the bitmap has // been properly initialized. SkAutoLockPixels bitmap_lock(bitmap); - if ((bitmap.getConfig() != SkBitmap::kARGB_8888_Config) || + if ((bitmap.config() != SkBitmap::kARGB_8888_Config) || (bitmap.height() <= 0) || (bitmap.width() <= 0) || (bitmap.getPixels() == NULL)) return false; diff --git a/ui/gfx/skbitmap_operations.cc b/ui/gfx/skbitmap_operations.cc index fb0572e..269f10b 100644 --- a/ui/gfx/skbitmap_operations.cc +++ b/ui/gfx/skbitmap_operations.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -574,7 +574,7 @@ SkBitmap SkBitmapOperations::CreateHSLShiftedBitmap( SkBitmap SkBitmapOperations::CreateTiledBitmap(const SkBitmap& source, int src_x, int src_y, int dst_w, int dst_h) { - DCHECK(source.getConfig() == SkBitmap::kARGB_8888_Config); + DCHECK(source.config() == SkBitmap::kARGB_8888_Config); SkBitmap cropped; cropped.setConfig(SkBitmap::kARGB_8888_Config, dst_w, dst_h, 0); diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.cc b/webkit/plugins/ppapi/ppapi_plugin_instance.cc index 3135a3c..aa8ac8f 100644 --- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc +++ b/webkit/plugins/ppapi/ppapi_plugin_instance.cc @@ -1606,7 +1606,7 @@ bool PluginInstance::DrawJPEGToPlatformDC( // However, Skia currently has no JPEG compression code and we cannot // depend on gfx/jpeg_codec.h in Skia. So we do the compression here. SkAutoLockPixels lock(bitmap); - DCHECK(bitmap.getConfig() == SkBitmap::kARGB_8888_Config); + DCHECK(bitmap.config() == SkBitmap::kARGB_8888_Config); const uint32_t* pixels = static_cast<const uint32_t*>(bitmap.getPixels()); std::vector<unsigned char> compressed_image; @@ -1646,7 +1646,7 @@ void PluginInstance::DrawSkBitmapToCanvas( const gfx::Rect& dest_rect, int canvas_height) { SkAutoLockPixels lock(bitmap); - DCHECK(bitmap.getConfig() == SkBitmap::kARGB_8888_Config); + DCHECK(bitmap.config() == SkBitmap::kARGB_8888_Config); base::mac::ScopedCFTypeRef<CGDataProviderRef> data_provider( CGDataProviderCreateWithData( NULL, bitmap.getAddr32(0, 0), |