Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "cc/resources/ui_resource_bitmap.h" | 5 #include "cc/resources/ui_resource_bitmap.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | |
| 7 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "third_party/skia/include/core/SkBitmap.h" | |
| 8 | 10 |
| 9 namespace cc { | 11 namespace cc { |
| 10 | 12 |
| 11 scoped_refptr<UIResourceBitmap> | 13 uint8_t* UIResourceBitmap::GetPixels() const { |
| 12 UIResourceBitmap::Create(uint8_t* pixels, | 14 if (!pixel_ref_) |
| 13 UIResourceFormat format, | 15 return NULL; |
| 14 UIResourceWrapMode wrap_mode, | 16 return static_cast<uint8_t*>(pixel_ref_->pixels()); |
| 15 gfx::Size size) { | |
| 16 scoped_refptr<UIResourceBitmap> ret = new UIResourceBitmap(); | |
| 17 ret->pixels_ = scoped_ptr<uint8_t[]>(pixels); | |
| 18 ret->format_ = format; | |
| 19 ret->wrap_mode_ = wrap_mode; | |
| 20 ret->size_ = size; | |
| 21 | |
| 22 return ret; | |
| 23 } | 17 } |
| 24 | 18 |
| 25 UIResourceBitmap::UIResourceBitmap() {} | 19 void UIResourceBitmap::Create(const skia::RefPtr<SkPixelRef>& pixel_ref, |
| 20 UIResourceFormat format, | |
| 21 UIResourceWrapMode wrap_mode, | |
| 22 gfx::Size size) { | |
| 23 DCHECK(size.width() && size.height()); | |
| 24 DCHECK(pixel_ref && pixel_ref->isImmutable()); | |
|
aelias_OOO_until_Jul13
2013/09/09 23:11:11
Please separate these into 4 DCHECKs. In general,
powei
2013/09/10 00:42:44
Done.
| |
| 25 format_ = format; | |
| 26 wrap_mode_ = wrap_mode; | |
| 27 size_ = size; | |
| 28 pixel_ref_ = pixel_ref; | |
| 29 } | |
| 30 | |
| 31 UIResourceBitmap::UIResourceBitmap(const SkBitmap& skbitmap, | |
| 32 UIResourceWrapMode wrap_mode) { | |
| 33 DCHECK_EQ(skbitmap.config(), SkBitmap::kARGB_8888_Config); | |
|
aelias_OOO_until_Jul13
2013/09/09 23:11:11
Please also DCHECK(skbitmap.width(), skbitmap.rowB
powei
2013/09/10 00:42:44
Yes. This was a problem. I will try to be more c
| |
| 34 DCHECK(skbitmap.isImmutable()); | |
| 35 skia::RefPtr<SkPixelRef> pixel_ref = skia::SharePtr(skbitmap.pixelRef()); | |
| 36 Create(pixel_ref, | |
| 37 UIResourceBitmap::RGBA8, | |
| 38 wrap_mode, | |
| 39 gfx::Size(skbitmap.width(), skbitmap.height())); | |
| 40 } | |
| 41 | |
| 26 UIResourceBitmap::~UIResourceBitmap() {} | 42 UIResourceBitmap::~UIResourceBitmap() {} |
| 27 | 43 |
| 28 } // namespace cc | 44 } // namespace cc |
| OLD | NEW |