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

Side by Side Diff: Source/platform/image-decoders/ico/ICOImageDecoder.h

Issue 630853002: Replacing the OVERRIDE with override in third_party/WebKit/Source/platform (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase build fix Created 6 years, 2 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) 2008, 2009, Google Inc. All rights reserved. 2 * Copyright (c) 2008, 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 26 matching lines...) Expand all
37 37
38 class PNGImageDecoder; 38 class PNGImageDecoder;
39 39
40 // This class decodes the ICO and CUR image formats. 40 // This class decodes the ICO and CUR image formats.
41 class PLATFORM_EXPORT ICOImageDecoder : public ImageDecoder { 41 class PLATFORM_EXPORT ICOImageDecoder : public ImageDecoder {
42 public: 42 public:
43 ICOImageDecoder(ImageSource::AlphaOption, ImageSource::GammaAndColorProfileO ption, size_t maxDecodedBytes); 43 ICOImageDecoder(ImageSource::AlphaOption, ImageSource::GammaAndColorProfileO ption, size_t maxDecodedBytes);
44 virtual ~ICOImageDecoder(); 44 virtual ~ICOImageDecoder();
45 45
46 // ImageDecoder 46 // ImageDecoder
47 virtual String filenameExtension() const OVERRIDE { return "ico"; } 47 virtual String filenameExtension() const override { return "ico"; }
48 virtual void setData(SharedBuffer*, bool allDataReceived) OVERRIDE; 48 virtual void setData(SharedBuffer*, bool allDataReceived) override;
49 virtual bool isSizeAvailable() OVERRIDE; 49 virtual bool isSizeAvailable() override;
50 virtual IntSize size() const OVERRIDE; 50 virtual IntSize size() const override;
51 virtual IntSize frameSizeAtIndex(size_t) const OVERRIDE; 51 virtual IntSize frameSizeAtIndex(size_t) const override;
52 virtual bool setSize(unsigned width, unsigned height) OVERRIDE; 52 virtual bool setSize(unsigned width, unsigned height) override;
53 virtual size_t frameCount() OVERRIDE; 53 virtual size_t frameCount() override;
54 virtual ImageFrame* frameBufferAtIndex(size_t) OVERRIDE; 54 virtual ImageFrame* frameBufferAtIndex(size_t) override;
55 // CAUTION: setFailed() deletes all readers and decoders. Be careful to 55 // CAUTION: setFailed() deletes all readers and decoders. Be careful to
56 // avoid accessing deleted memory, especially when calling this from 56 // avoid accessing deleted memory, especially when calling this from
57 // inside BMPImageReader! 57 // inside BMPImageReader!
58 virtual bool setFailed() OVERRIDE; 58 virtual bool setFailed() override;
59 virtual bool hotSpot(IntPoint&) const OVERRIDE; 59 virtual bool hotSpot(IntPoint&) const override;
60 60
61 private: 61 private:
62 enum ImageType { 62 enum ImageType {
63 Unknown, 63 Unknown,
64 BMP, 64 BMP,
65 PNG, 65 PNG,
66 }; 66 };
67 67
68 enum FileType { 68 enum FileType {
69 ICON = 1, 69 ICON = 1,
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 PNGDecoders m_pngDecoders; 147 PNGDecoders m_pngDecoders;
148 148
149 // Valid only while a BMPImageReader is decoding, this holds the size 149 // Valid only while a BMPImageReader is decoding, this holds the size
150 // for the particular entry being decoded. 150 // for the particular entry being decoded.
151 IntSize m_frameSize; 151 IntSize m_frameSize;
152 }; 152 };
153 153
154 } // namespace blink 154 } // namespace blink
155 155
156 #endif 156 #endif
OLDNEW
« no previous file with comments | « Source/platform/image-decoders/gif/GIFImageDecoder.h ('k') | Source/platform/image-decoders/jpeg/JPEGImageDecoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698