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

Side by Side Diff: Source/platform/image-decoders/webp/WEBPImageDecoder.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) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 23 matching lines...) Expand all
34 #include "webp/decode.h" 34 #include "webp/decode.h"
35 #include "webp/demux.h" 35 #include "webp/demux.h"
36 36
37 namespace blink { 37 namespace blink {
38 38
39 class PLATFORM_EXPORT WEBPImageDecoder : public ImageDecoder { 39 class PLATFORM_EXPORT WEBPImageDecoder : public ImageDecoder {
40 public: 40 public:
41 WEBPImageDecoder(ImageSource::AlphaOption, ImageSource::GammaAndColorProfile Option, size_t maxDecodedBytes); 41 WEBPImageDecoder(ImageSource::AlphaOption, ImageSource::GammaAndColorProfile Option, size_t maxDecodedBytes);
42 virtual ~WEBPImageDecoder(); 42 virtual ~WEBPImageDecoder();
43 43
44 virtual String filenameExtension() const OVERRIDE { return "webp"; } 44 virtual String filenameExtension() const override { return "webp"; }
45 virtual bool isSizeAvailable() OVERRIDE; 45 virtual bool isSizeAvailable() override;
46 virtual bool hasColorProfile() const OVERRIDE { return m_hasColorProfile; } 46 virtual bool hasColorProfile() const override { return m_hasColorProfile; }
47 virtual size_t frameCount() OVERRIDE; 47 virtual size_t frameCount() override;
48 virtual ImageFrame* frameBufferAtIndex(size_t) OVERRIDE; 48 virtual ImageFrame* frameBufferAtIndex(size_t) override;
49 virtual void setData(SharedBuffer* data, bool allDataReceived) OVERRIDE; 49 virtual void setData(SharedBuffer* data, bool allDataReceived) override;
50 virtual int repetitionCount() const OVERRIDE; 50 virtual int repetitionCount() const override;
51 virtual bool frameIsCompleteAtIndex(size_t) const OVERRIDE; 51 virtual bool frameIsCompleteAtIndex(size_t) const override;
52 virtual float frameDurationAtIndex(size_t) const OVERRIDE; 52 virtual float frameDurationAtIndex(size_t) const override;
53 virtual size_t clearCacheExceptFrame(size_t) OVERRIDE; 53 virtual size_t clearCacheExceptFrame(size_t) override;
54 54
55 private: 55 private:
56 bool decode(const uint8_t* dataBytes, size_t dataSize, bool onlySize, size_t frameIndex); 56 bool decode(const uint8_t* dataBytes, size_t dataSize, bool onlySize, size_t frameIndex);
57 57
58 WebPIDecoder* m_decoder; 58 WebPIDecoder* m_decoder;
59 WebPDecBuffer m_decoderBuffer; 59 WebPDecBuffer m_decoderBuffer;
60 int m_formatFlags; 60 int m_formatFlags;
61 bool m_frameBackgroundHasAlpha; 61 bool m_frameBackgroundHasAlpha;
62 bool m_hasColorProfile; 62 bool m_hasColorProfile;
63 63
64 #if USE(QCMSLIB) 64 #if USE(QCMSLIB)
65 qcms_transform* colorTransform() const { return m_transform; } 65 qcms_transform* colorTransform() const { return m_transform; }
66 bool createColorTransform(const char* data, size_t); 66 bool createColorTransform(const char* data, size_t);
67 void clearColorTransform(); 67 void clearColorTransform();
68 void readColorProfile(); 68 void readColorProfile();
69 69
70 bool m_haveReadProfile; 70 bool m_haveReadProfile;
71 qcms_transform* m_transform; 71 qcms_transform* m_transform;
72 #endif 72 #endif
73 73
74 bool updateDemuxer(); 74 bool updateDemuxer();
75 bool initFrameBuffer(size_t frameIndex); 75 bool initFrameBuffer(size_t frameIndex);
76 void applyPostProcessing(size_t frameIndex); 76 void applyPostProcessing(size_t frameIndex);
77 virtual void clearFrameBuffer(size_t frameIndex) OVERRIDE; 77 virtual void clearFrameBuffer(size_t frameIndex) override;
78 78
79 WebPDemuxer* m_demux; 79 WebPDemuxer* m_demux;
80 WebPDemuxState m_demuxState; 80 WebPDemuxState m_demuxState;
81 bool m_haveAlreadyParsedThisData; 81 bool m_haveAlreadyParsedThisData;
82 bool m_haveReadAnimationParameters; 82 bool m_haveReadAnimationParameters;
83 int m_repetitionCount; 83 int m_repetitionCount;
84 int m_decodedHeight; 84 int m_decodedHeight;
85 85
86 typedef void (*AlphaBlendFunction)(ImageFrame&, ImageFrame&, int, int, int); 86 typedef void (*AlphaBlendFunction)(ImageFrame&, ImageFrame&, int, int, int);
87 AlphaBlendFunction m_blendFunction; 87 AlphaBlendFunction m_blendFunction;
88 88
89 void clear(); 89 void clear();
90 void clearDecoder(); 90 void clearDecoder();
91 }; 91 };
92 92
93 } // namespace blink 93 } // namespace blink
94 94
95 #endif 95 #endif
OLDNEW
« no previous file with comments | « Source/platform/image-decoders/png/PNGImageDecoder.h ('k') | Source/platform/mac/ScrollAnimatorMac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698