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

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

Issue 1213003004: Fix virtual/override/final usage in Source/platform/. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 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 side-by-side diff with in-line comments
Download patch
Index: Source/platform/image-decoders/ico/ICOImageDecoder.h
diff --git a/Source/platform/image-decoders/ico/ICOImageDecoder.h b/Source/platform/image-decoders/ico/ICOImageDecoder.h
index 1fa4cc410217cc3f3e0951168c61b13b635f63ed..a31e520fa4e62f572d152fd61194d7f5fb78154a 100644
--- a/Source/platform/image-decoders/ico/ICOImageDecoder.h
+++ b/Source/platform/image-decoders/ico/ICOImageDecoder.h
@@ -41,19 +41,19 @@ class PNGImageDecoder;
class PLATFORM_EXPORT ICOImageDecoder : public ImageDecoder {
public:
ICOImageDecoder(ImageSource::AlphaOption, ImageSource::GammaAndColorProfileOption, size_t maxDecodedBytes);
- virtual ~ICOImageDecoder();
+ ~ICOImageDecoder() override;
// ImageDecoder:
- virtual String filenameExtension() const override { return "ico"; }
- virtual void setData(SharedBuffer*, bool allDataReceived) override;
- virtual IntSize size() const override;
- virtual IntSize frameSizeAtIndex(size_t) const override;
- virtual bool setSize(unsigned width, unsigned height) override;
+ String filenameExtension() const override { return "ico"; }
+ void setData(SharedBuffer*, bool allDataReceived) override;
+ IntSize size() const override;
+ IntSize frameSizeAtIndex(size_t) const override;
+ bool setSize(unsigned width, unsigned height) override;
// CAUTION: setFailed() deletes all readers and decoders. Be careful to
// avoid accessing deleted memory, especially when calling this from
// inside BMPImageReader!
- virtual bool setFailed() override;
- virtual bool hotSpot(IntPoint&) const override;
+ bool setFailed() override;
+ bool hotSpot(IntPoint&) const override;
private:
enum ImageType {
@@ -80,8 +80,8 @@ private:
// ImageDecoder:
virtual void decodeSize() { decode(0, true); }
- virtual size_t decodeFrameCount() override;
- virtual void decode(size_t index) override { decode(index, false); }
+ size_t decodeFrameCount() override;
+ void decode(size_t index) override { decode(index, false); }
inline uint16_t readUint16(int offset) const
{
« 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