| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 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 are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * 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 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "public/platform/WebImage.h" | 31 #include "public/platform/WebImage.h" |
| 32 | 32 |
| 33 #include <algorithm> |
| 34 #include <memory> |
| 33 #include "platform/SharedBuffer.h" | 35 #include "platform/SharedBuffer.h" |
| 34 #include "platform/graphics/Image.h" | 36 #include "platform/graphics/Image.h" |
| 35 #include "platform/image-decoders/ImageDecoder.h" | 37 #include "platform/image-decoders/ImageDecoder.h" |
| 36 #include "public/platform/WebData.h" | 38 #include "public/platform/WebData.h" |
| 37 #include "public/platform/WebSize.h" | 39 #include "public/platform/WebSize.h" |
| 38 #include "third_party/skia/include/core/SkImage.h" | 40 #include "third_party/skia/include/core/SkImage.h" |
| 39 #include "wtf/PassRefPtr.h" | 41 #include "wtf/PassRefPtr.h" |
| 40 #include "wtf/Vector.h" | 42 #include "wtf/Vector.h" |
| 41 #include <algorithm> | |
| 42 #include <memory> | |
| 43 | 43 |
| 44 namespace blink { | 44 namespace blink { |
| 45 | 45 |
| 46 WebImage WebImage::fromData(const WebData& data, const WebSize& desiredSize) { | 46 WebImage WebImage::fromData(const WebData& data, const WebSize& desiredSize) { |
| 47 RefPtr<SharedBuffer> buffer = PassRefPtr<SharedBuffer>(data); | 47 RefPtr<SharedBuffer> buffer = PassRefPtr<SharedBuffer>(data); |
| 48 std::unique_ptr<ImageDecoder> decoder(ImageDecoder::create( | 48 std::unique_ptr<ImageDecoder> decoder(ImageDecoder::create( |
| 49 buffer, true, ImageDecoder::AlphaPremultiplied, ColorBehavior::ignore())); | 49 buffer, true, ImageDecoder::AlphaPremultiplied, ColorBehavior::ignore())); |
| 50 if (!decoder || !decoder->isSizeAvailable()) | 50 if (!decoder || !decoder->isSizeAvailable()) |
| 51 return WebImage(); | 51 return WebImage(); |
| 52 | 52 |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 133 return; | 133 return; |
| 134 | 134 |
| 135 // TODO(ccameron): WebImage needs to be consistent about color spaces. | 135 // TODO(ccameron): WebImage needs to be consistent about color spaces. |
| 136 // https://crbug.com/672315 | 136 // https://crbug.com/672315 |
| 137 if (sk_sp<SkImage> skImage = | 137 if (sk_sp<SkImage> skImage = |
| 138 image->imageForCurrentFrame(ColorBehavior::transformToGlobalTarget())) | 138 image->imageForCurrentFrame(ColorBehavior::transformToGlobalTarget())) |
| 139 skImage->asLegacyBitmap(&m_bitmap, SkImage::kRO_LegacyBitmapMode); | 139 skImage->asLegacyBitmap(&m_bitmap, SkImage::kRO_LegacyBitmapMode); |
| 140 } | 140 } |
| 141 | 141 |
| 142 } // namespace blink | 142 } // namespace blink |
| OLD | NEW |