Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(17)

Side by Side Diff: third_party/WebKit/Source/platform/graphics/ImageSource.cpp

Issue 2173603003: Revert of Cancel image loads if decoding failed. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. 2 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved.
3 * Copyright (C) 2007 Alp Toker <alp.toker@collabora.co.uk> 3 * Copyright (C) 2007 Alp Toker <alp.toker@collabora.co.uk>
4 * Copyright (C) 2008, Google Inc. All rights reserved. 4 * Copyright (C) 2008, Google Inc. All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 size_t ImageSource::clearCacheExceptFrame(size_t clearExceptFrame) 44 size_t ImageSource::clearCacheExceptFrame(size_t clearExceptFrame)
45 { 45 {
46 return m_decoder ? m_decoder->clearCacheExceptFrame(clearExceptFrame) : 0; 46 return m_decoder ? m_decoder->clearCacheExceptFrame(clearExceptFrame) : 0;
47 } 47 }
48 48
49 PassRefPtr<SharedBuffer> ImageSource::data() 49 PassRefPtr<SharedBuffer> ImageSource::data()
50 { 50 {
51 return m_decoder ? m_decoder->data() : nullptr; 51 return m_decoder ? m_decoder->data() : nullptr;
52 } 52 }
53 53
54 ImageDecoder::SniffResult ImageSource::setData(SharedBuffer& data, bool allDataR eceived) 54 void ImageSource::setData(SharedBuffer& data, bool allDataReceived)
55 { 55 {
56 ImageDecoder::SniffResult result = ImageDecoder::determineImageType(data); 56 // Create a decoder by sniffing the encoded data. If insufficient data bytes are available to
57 // determine the encoded image type, no decoder is created.
57 if (!m_decoder) 58 if (!m_decoder)
58 m_decoder = DeferredImageDecoder::create(result, ImageDecoder::AlphaPrem ultiplied, ImageDecoder::GammaAndColorProfileApplied); 59 m_decoder = DeferredImageDecoder::create(data, ImageDecoder::AlphaPremul tiplied, ImageDecoder::GammaAndColorProfileApplied);
59 60
60 if (m_decoder) 61 if (m_decoder)
61 m_decoder->setData(data, allDataReceived); 62 m_decoder->setData(data, allDataReceived);
62
63 return result;
64 } 63 }
65 64
66 String ImageSource::filenameExtension() const 65 String ImageSource::filenameExtension() const
67 { 66 {
68 return m_decoder ? m_decoder->filenameExtension() : String(); 67 return m_decoder ? m_decoder->filenameExtension() : String();
69 } 68 }
70 69
71 bool ImageSource::isSizeAvailable() 70 bool ImageSource::isSizeAvailable()
72 { 71 {
73 return m_decoder && m_decoder->isSizeAvailable(); 72 return m_decoder && m_decoder->isSizeAvailable();
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 { 146 {
148 return m_decoder && m_decoder->frameIsCompleteAtIndex(index); 147 return m_decoder && m_decoder->frameIsCompleteAtIndex(index);
149 } 148 }
150 149
151 size_t ImageSource::frameBytesAtIndex(size_t index) const 150 size_t ImageSource::frameBytesAtIndex(size_t index) const
152 { 151 {
153 return m_decoder ? m_decoder->frameBytesAtIndex(index) : 0; 152 return m_decoder ? m_decoder->frameBytesAtIndex(index) : 0;
154 } 153 }
155 154
156 } // namespace blink 155 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698