Chromium Code Reviews| 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 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 126 // This method is called to populate a discardable memory owned by Skia. | 126 // This method is called to populate a discardable memory owned by Skia. |
| 127 | 127 |
| 128 // Prevents concurrent decode or scale operations on the same image data. | 128 // Prevents concurrent decode or scale operations on the same image data. |
| 129 MutexLocker lock(m_decodeMutex); | 129 MutexLocker lock(m_decodeMutex); |
| 130 | 130 |
| 131 // This implementation does not support scaling so check the requested size. | 131 // This implementation does not support scaling so check the requested size. |
| 132 SkISize scaledSize = SkISize::Make(info.fWidth, info.fHeight); | 132 SkISize scaledSize = SkISize::Make(info.fWidth, info.fHeight); |
| 133 ASSERT(m_fullSize == scaledSize); | 133 ASSERT(m_fullSize == scaledSize); |
| 134 | 134 |
| 135 if (m_decodeFailedAndEmpty) | 135 if (m_decodeFailedAndEmpty) |
| 136 return 0; | 136 return false; |
|
Noel Gordon
2014/07/25 15:55:01
This change seems unrelated to yuv decoding. Perh
sugoi1
2014/07/25 16:56:47
Done.
| |
| 137 | 137 |
| 138 TRACE_EVENT2("blink", "ImageFrameGenerator::decodeAndScale", "generator", th is, "decodeCount", static_cast<int>(m_decodeCount)); | 138 TRACE_EVENT2("blink", "ImageFrameGenerator::decodeAndScale", "generator", th is, "decodeCount", static_cast<int>(m_decodeCount)); |
| 139 | 139 |
| 140 // Don't use discardable memory for decoding if Skia is providing output | 140 // Don't use discardable memory for decoding if Skia is providing output |
| 141 // memory. Instead use ExternalMemoryAllocator such that we can | 141 // memory. Instead use ExternalMemoryAllocator such that we can |
| 142 // write directly to the memory given by Skia. | 142 // write directly to the memory given by Skia. |
| 143 // | 143 // |
| 144 // TODO: | 144 // TODO: |
| 145 // This is not pretty because this class is used in two different code | 145 // This is not pretty because this class is used in two different code |
| 146 // paths: discardable memory decoding on Android and discardable memory | 146 // paths: discardable memory decoding on Android and discardable memory |
| (...skipping 171 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 |