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

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

Issue 2173873003: Cancel image loads if decoding failed (attempt #2) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix UAF 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) 2004, 2005, 2006 Apple Computer, Inc. All rights reserved. 2 * Copyright (C) 2004, 2005, 2006 Apple Computer, 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
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #ifndef ImageSource_h 26 #ifndef ImageSource_h
27 #define ImageSource_h 27 #define ImageSource_h
28 28
29 #include "platform/PlatformExport.h" 29 #include "platform/PlatformExport.h"
30 #include "platform/graphics/DeferredImageDecoder.h"
30 #include "platform/graphics/ImageOrientation.h" 31 #include "platform/graphics/ImageOrientation.h"
31 #include "wtf/Forward.h" 32 #include "wtf/Forward.h"
32 #include "wtf/Noncopyable.h" 33 #include "wtf/Noncopyable.h"
33 #include <memory> 34 #include <memory>
34 35
35 class SkImage; 36 class SkImage;
36 37
37 namespace blink { 38 namespace blink {
38 39
39 class DeferredImageDecoder;
40 class ImageOrientation; 40 class ImageOrientation;
41 class IntPoint; 41 class IntPoint;
42 class IntSize; 42 class IntSize;
43 class SharedBuffer; 43 class SharedBuffer;
44 44
45 class PLATFORM_EXPORT ImageSource final { 45 class PLATFORM_EXPORT ImageSource final {
46 USING_FAST_MALLOC(ImageSource); 46 USING_FAST_MALLOC(ImageSource);
47 WTF_MAKE_NONCOPYABLE(ImageSource); 47 WTF_MAKE_NONCOPYABLE(ImageSource);
48 public: 48 public:
49 ImageSource(); 49 ImageSource();
(...skipping 13 matching lines...) Expand all
63 // from the beginning. 63 // from the beginning.
64 // 64 //
65 // Implementations may elect to preserve more frames than the one requested 65 // Implementations may elect to preserve more frames than the one requested
66 // here if doing so is likely to save CPU time in the future, but will pay 66 // here if doing so is likely to save CPU time in the future, but will pay
67 // an increased memory cost to do so. 67 // an increased memory cost to do so.
68 // 68 //
69 // Returns the number of bytes of frame data actually cleared. 69 // Returns the number of bytes of frame data actually cleared.
70 size_t clearCacheExceptFrame(size_t); 70 size_t clearCacheExceptFrame(size_t);
71 71
72 PassRefPtr<SharedBuffer> data(); 72 PassRefPtr<SharedBuffer> data();
73 void setData(SharedBuffer& data, bool allDataReceived); 73 ImageDecoder::SniffResult setData(SharedBuffer& data, bool allDataReceived);
74 String filenameExtension() const; 74 String filenameExtension() const;
75 75
76 bool isSizeAvailable(); 76 bool isSizeAvailable();
77 bool hasColorProfile() const; 77 bool hasColorProfile() const;
78 IntSize size(RespectImageOrientationEnum = DoNotRespectImageOrientation) con st; 78 IntSize size(RespectImageOrientationEnum = DoNotRespectImageOrientation) con st;
79 IntSize frameSizeAtIndex(size_t, RespectImageOrientationEnum = DoNotRespectI mageOrientation) const; 79 IntSize frameSizeAtIndex(size_t, RespectImageOrientationEnum = DoNotRespectI mageOrientation) const;
80 80
81 bool getHotSpot(IntPoint&) const; 81 bool getHotSpot(IntPoint&) const;
82 int repetitionCount(); 82 int repetitionCount();
83 83
(...skipping 11 matching lines...) Expand all
95 // frame has not yet begun to decode. 95 // frame has not yet begun to decode.
96 size_t frameBytesAtIndex(size_t) const; 96 size_t frameBytesAtIndex(size_t) const;
97 97
98 private: 98 private:
99 std::unique_ptr<DeferredImageDecoder> m_decoder; 99 std::unique_ptr<DeferredImageDecoder> m_decoder;
100 }; 100 };
101 101
102 } // namespace blink 102 } // namespace blink
103 103
104 #endif 104 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698