SkColorType instead of (deprecated) SkBitmap::Config

cc/resources/ui_resource_bitmap.cc

 // Copyright 2013 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.
 
 #include "cc/resources/ui_resource_bitmap.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkMallocPixelRef.h"
@@ skipping 11 matching lines @@
   format_ = format;
   size_ = size;
   pixel_ref_ = pixel_ref;
 
   // Default values for secondary parameters.
   wrap_mode_ = CLAMP_TO_EDGE;
   opaque_ = (format == ETC1);
 }
 
 UIResourceBitmap::UIResourceBitmap(const SkBitmap& skbitmap) {
-  DCHECK_EQ(skbitmap.config(), SkBitmap::kARGB_8888_Config);
+  DCHECK_EQ(skbitmap.colorType(), kPMColor_SkColorType);
   DCHECK_EQ(skbitmap.width(), skbitmap.rowBytesAsPixels());
   DCHECK(skbitmap.isImmutable());
 
   skia::RefPtr<SkPixelRef> pixel_ref = skia::SharePtr(skbitmap.pixelRef());
   const SkImageInfo& info = pixel_ref->info();
   Create(
       pixel_ref, gfx::Size(info.fWidth, info.fHeight), UIResourceBitmap::RGBA8);
 
   SetOpaque(skbitmap.isOpaque());
 }
 
+UIResourceBitmap::UIResourceBitmap(int width, int height, bool isOpaque) {
+  SkAlphaType alphaType = isOpaque ? kOpaque_SkAlphaType : kPremul_SkAlphaType;
+  SkImageInfo info = SkImageInfo::MakeN32(width, height, alphaType);
+  skia::RefPtr<SkPixelRef> pixel_ref = skia::AdoptRef(
+      SkMallocPixelRef::NewAllocate(info, info.minRowBytes(), NULL));
+  Create(pixel_ref,
+         gfx::Size(info.width(), info.height()),
+         UIResourceBitmap::RGBA8);
+  SetOpaque(isOpaque);

[Stephen White, 2014/03/18 20:14:07]

This new constructor doesn't seem to be calling setImmutable() on the pixelref.
Is that done elsewhere? (Create() asserts on it anyway, so I assume tests would
blow up in Debug if it wasn't.)

[reed1, 2014/03/21 20:49:01]

Done.

+}
+
 UIResourceBitmap::UIResourceBitmap(const skia::RefPtr<SkPixelRef>& pixel_ref,
                                    gfx::Size size) {
   Create(pixel_ref, size, UIResourceBitmap::ETC1);
 }
 
 UIResourceBitmap::~UIResourceBitmap() {}
 
 AutoLockUIResourceBitmap::AutoLockUIResourceBitmap(
     const UIResourceBitmap& bitmap) : bitmap_(bitmap) {
   bitmap_.pixel_ref_->lockPixels();
 }
 
 AutoLockUIResourceBitmap::~AutoLockUIResourceBitmap() {
   bitmap_.pixel_ref_->unlockPixels();
 }
 
 const uint8_t* AutoLockUIResourceBitmap::GetPixels() const {
   return static_cast<const uint8_t*>(bitmap_.pixel_ref_->pixels());
 }
 
 }  // namespace cc