| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 45 public: | 45 public: |
| 46 ExternalMemoryAllocator(const SkImageInfo& info, void* pixels, size_t rowByt
es) | 46 ExternalMemoryAllocator(const SkImageInfo& info, void* pixels, size_t rowByt
es) |
| 47 : m_info(info) | 47 : m_info(info) |
| 48 , m_pixels(pixels) | 48 , m_pixels(pixels) |
| 49 , m_rowBytes(rowBytes) | 49 , m_rowBytes(rowBytes) |
| 50 { | 50 { |
| 51 } | 51 } |
| 52 | 52 |
| 53 virtual bool allocPixelRef(SkBitmap* dst, SkColorTable* ctable) OVERRIDE | 53 virtual bool allocPixelRef(SkBitmap* dst, SkColorTable* ctable) OVERRIDE |
| 54 { | 54 { |
| 55 SkImageInfo info; | 55 const SkImageInfo& info = dst->info(); |
| 56 if (!dst->asImageInfo(&info)) | 56 if (kUnknown_SkColorType == info.colorType()) |
| 57 return false; | 57 return false; |
| 58 | 58 |
| 59 if (info != m_info || m_rowBytes != dst->rowBytes()) | 59 if (info != m_info || m_rowBytes != dst->rowBytes()) |
| 60 return false; | 60 return false; |
| 61 | 61 |
| 62 if (!dst->installPixels(m_info, m_pixels, m_rowBytes, 0, 0)) | 62 if (!dst->installPixels(m_info, m_pixels, m_rowBytes)) |
| 63 return false; | 63 return false; |
| 64 dst->lockPixels(); | 64 dst->lockPixels(); |
| 65 return true; | 65 return true; |
| 66 } | 66 } |
| 67 | 67 |
| 68 private: | 68 private: |
| 69 SkImageInfo m_info; | 69 SkImageInfo m_info; |
| 70 void* m_pixels; | 70 void* m_pixels; |
| 71 size_t m_rowBytes; | 71 size_t m_rowBytes; |
| 72 }; | 72 }; |
| (...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 318 | 318 |
| 319 bool ImageFrameGenerator::hasAlpha(size_t index) | 319 bool ImageFrameGenerator::hasAlpha(size_t index) |
| 320 { | 320 { |
| 321 MutexLocker lock(m_alphaMutex); | 321 MutexLocker lock(m_alphaMutex); |
| 322 if (index < m_hasAlpha.size()) | 322 if (index < m_hasAlpha.size()) |
| 323 return m_hasAlpha[index]; | 323 return m_hasAlpha[index]; |
| 324 return true; | 324 return true; |
| 325 } | 325 } |
| 326 | 326 |
| 327 } // namespace | 327 } // namespace |
| OLD | NEW |