Switch from (deprecated) setIsOpaque to setAlphaType.

BUG=None
TEST=cc_unittests
R=reed@google.com,danakj@chromium.org,thakis@chromium.org

Review URL: https://codereview.chromium.org/57153002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233221 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 22 insertions, 9 deletions

diff --git a/cc/layers/ui_resource_layer_impl_unittest.cc b/cc/layers/ui_resource_layer_impl_unittest.cc
index 35ff05b..4a2a116 100644
--- a/cc/layers/ui_resource_layer_impl_unittest.cc
+++ b/cc/layers/ui_resource_layer_impl_unittest.cc
@@ -35,11 +35,13 @@ scoped_ptr<UIResourceLayerImpl> GenerateUIResourceLayer(
   layer->draw_properties().render_target = layer.get();
 
   SkBitmap skbitmap;
-  skbitmap.setConfig(
-      SkBitmap::kARGB_8888_Config, bitmap_size.width(), bitmap_size.height());
+  skbitmap.setConfig(SkBitmap::kARGB_8888_Config,
+                     bitmap_size.width(),
+                     bitmap_size.height(),
+                     0,
+                     opaque ? kOpaque_SkAlphaType : kPremul_SkAlphaType);
   skbitmap.allocPixels();
   skbitmap.setImmutable();
-  skbitmap.setIsOpaque(opaque);
   UIResourceBitmap bitmap(skbitmap);
 
   host_impl->CreateUIResource(uid, bitmap);
diff --git a/content/browser/renderer_host/compositing_iosurface_mac.mm b/content/browser/renderer_host/compositing_iosurface_mac.mm
index 07bd795..700d963 100644
--- a/content/browser/renderer_host/compositing_iosurface_mac.mm
+++ b/content/browser/renderer_host/compositing_iosurface_mac.mm
@@ -532,7 +532,11 @@ void CompositingIOSurfaceMac::CopyTo(
       const base::Callback<void(bool, const SkBitmap&)>& callback) {
   scoped_ptr<SkBitmap> output(new SkBitmap());
   output->setConfig(SkBitmap::kARGB_8888_Config,
-                    dst_pixel_size.width(), dst_pixel_size.height());
+                    dst_pixel_size.width(),
+                    dst_pixel_size.height(),
+                    0,
+                    kOpaque_SkAlphaType);
+
   if (!output->allocPixels()) {
     DLOG(ERROR) << "Failed to allocate SkBitmap pixels!";
     callback.Run(false, *output);
@@ -540,7 +544,6 @@ void CompositingIOSurfaceMac::CopyTo(
   }
   DCHECK_EQ(output->rowBytesAsPixels(), dst_pixel_size.width())
       << "Stride is required to be equal to width for GPU readback.";
-  output->setIsOpaque(true);
 
   CGLSetCurrentContext(context_->cgl_context());
   const base::Closure copy_done_callback = CopyToSelectedOutputWithinContext(
diff --git a/skia/ext/skia_utils_ios.mm b/skia/ext/skia_utils_ios.mm
index 80c50fd..6f4814a 100644
--- a/skia/ext/skia_utils_ios.mm
+++ b/skia/ext/skia_utils_ios.mm
@@ -18,11 +18,15 @@ SkBitmap CGImageToSkBitmap(CGImageRef image, CGSize size, bool is_opaque) {
   if (!image)
     return bitmap;
 
-  bitmap.setConfig(SkBitmap::kARGB_8888_Config, size.width, size.height);
+  bitmap.setConfig(SkBitmap::kARGB_8888_Config,
+                   size.width,
+                   size.height,
+                   0,
+                   is_opaque ? kOpaque_SkAlphaType : kPremul_SkAlphaType);
+
   if (!bitmap.allocPixels())
     return bitmap;
 
-  bitmap.setIsOpaque(is_opaque);
   void* data = bitmap.getPixels();
 
   // Allocate a bitmap context with 4 components per pixel (BGRA). Apple
diff --git a/skia/ext/skia_utils_mac.mm b/skia/ext/skia_utils_mac.mm
index 50217d0..e97d9b1 100644
--- a/skia/ext/skia_utils_mac.mm
+++ b/skia/ext/skia_utils_mac.mm
@@ -26,11 +26,15 @@ SkBitmap NSImageOrNSImageRepToSkBitmap(
   DCHECK((image != 0) ^ (image_rep != 0));
 
   SkBitmap bitmap;
-  bitmap.setConfig(SkBitmap::kARGB_8888_Config, size.width, size.height);
+  bitmap.setConfig(SkBitmap::kARGB_8888_Config,
+                   size.width,
+                   size.height,
+                   0,
+                   is_opaque ? kOpaque_SkAlphaType : kPremul_SkAlphaType);
+
   if (!bitmap.allocPixels())
     return bitmap;  // Return |bitmap| which should respond true to isNull().
 
-  bitmap.setIsOpaque(is_opaque);
 
   base::ScopedCFTypeRef<CGColorSpaceRef> color_space(
       CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB));