| 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 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 204 const SkImageInfo info = | 204 const SkImageInfo info = |
| 205 SkImageInfo::MakeN32(size.Width(), size.Height(), kPremul_SkAlphaType, | 205 SkImageInfo::MakeN32(size.Width(), size.Height(), kPremul_SkAlphaType, |
| 206 decoder->ColorSpaceForSkImages()); | 206 decoder->ColorSpaceForSkImages()); |
| 207 | 207 |
| 208 RefPtr<ImageFrameGenerator> frame = | 208 RefPtr<ImageFrameGenerator> frame = |
| 209 ImageFrameGenerator::Create(SkISize::Make(size.Width(), size.Height()), | 209 ImageFrameGenerator::Create(SkISize::Make(size.Width(), size.Height()), |
| 210 false, decoder->GetColorBehavior()); | 210 false, decoder->GetColorBehavior()); |
| 211 if (!frame) | 211 if (!frame) |
| 212 return nullptr; | 212 return nullptr; |
| 213 | 213 |
| 214 return new DecodingImageGenerator(frame, info, segment_reader.Release(), true, | 214 return new DecodingImageGenerator(frame, info, std::move(segment_reader), |
| 215 0); | 215 true, 0); |
| 216 } | 216 } |
| 217 | 217 |
| 218 } // namespace blink | 218 } // namespace blink |
| OLD | NEW |