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

Side by Side Diff: Source/platform/image-decoders/jpeg/JPEGImageDecoder.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) 2006 Apple Computer, Inc. All rights reserved. 2 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved.
3 * Copyright (C) 2008-2009 Torch Mobile, Inc. 3 * Copyright (C) 2008-2009 Torch Mobile, Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
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 26 matching lines...) Expand all
37 class JPEGImageReader; 37 class JPEGImageReader;
38 38
39 // This class decodes the JPEG image format. 39 // This class decodes the JPEG image format.
40 class PLATFORM_EXPORT JPEGImageDecoder : public ImageDecoder { 40 class PLATFORM_EXPORT JPEGImageDecoder : public ImageDecoder {
41 WTF_MAKE_NONCOPYABLE(JPEGImageDecoder); 41 WTF_MAKE_NONCOPYABLE(JPEGImageDecoder);
42 public: 42 public:
43 JPEGImageDecoder(ImageSource::AlphaOption, ImageSource::GammaAndColorProfile Option, size_t maxDecodedBytes); 43 JPEGImageDecoder(ImageSource::AlphaOption, ImageSource::GammaAndColorProfile Option, size_t maxDecodedBytes);
44 virtual ~JPEGImageDecoder(); 44 virtual ~JPEGImageDecoder();
45 45
46 // ImageDecoder 46 // ImageDecoder
47 virtual String filenameExtension() const OVERRIDE { return "jpg"; } 47 virtual String filenameExtension() const override { return "jpg"; }
48 virtual bool isSizeAvailable() OVERRIDE; 48 virtual bool isSizeAvailable() override;
49 virtual bool hasColorProfile() const OVERRIDE { return m_hasColorProfile; } 49 virtual bool hasColorProfile() const override { return m_hasColorProfile; }
50 virtual IntSize decodedSize() const OVERRIDE { return m_decodedSize; } 50 virtual IntSize decodedSize() const override { return m_decodedSize; }
51 virtual IntSize decodedYUVSize(int component, SizeType) const OVERRIDE; 51 virtual IntSize decodedYUVSize(int component, SizeType) const override;
52 virtual bool setSize(unsigned width, unsigned height) OVERRIDE; 52 virtual bool setSize(unsigned width, unsigned height) override;
53 virtual ImageFrame* frameBufferAtIndex(size_t) OVERRIDE; 53 virtual ImageFrame* frameBufferAtIndex(size_t) override;
54 // CAUTION: setFailed() deletes |m_reader|. Be careful to avoid 54 // CAUTION: setFailed() deletes |m_reader|. Be careful to avoid
55 // accessing deleted memory, especially when calling this from inside 55 // accessing deleted memory, especially when calling this from inside
56 // JPEGImageReader! 56 // JPEGImageReader!
57 virtual bool setFailed() OVERRIDE; 57 virtual bool setFailed() override;
58 virtual bool canDecodeToYUV() const OVERRIDE; 58 virtual bool canDecodeToYUV() const override;
59 virtual bool decodeToYUV() OVERRIDE; 59 virtual bool decodeToYUV() override;
60 virtual void setImagePlanes(PassOwnPtr<ImagePlanes>) OVERRIDE; 60 virtual void setImagePlanes(PassOwnPtr<ImagePlanes>) override;
61 bool hasImagePlanes() const { return m_imagePlanes; } 61 bool hasImagePlanes() const { return m_imagePlanes; }
62 62
63 bool outputScanlines(); 63 bool outputScanlines();
64 unsigned desiredScaleNumerator() const; 64 unsigned desiredScaleNumerator() const;
65 void jpegComplete(); 65 void jpegComplete();
66 66
67 void setOrientation(ImageOrientation orientation) { m_orientation = orientat ion; } 67 void setOrientation(ImageOrientation orientation) { m_orientation = orientat ion; }
68 void setHasColorProfile(bool hasColorProfile) { m_hasColorProfile = hasColor Profile; } 68 void setHasColorProfile(bool hasColorProfile) { m_hasColorProfile = hasColor Profile; }
69 void setDecodedSize(unsigned width, unsigned height); 69 void setDecodedSize(unsigned width, unsigned height);
70 70
71 private: 71 private:
72 // Decodes the image. If |onlySize| is true, stops decoding after 72 // Decodes the image. If |onlySize| is true, stops decoding after
73 // calculating the image size. If decoding fails but there is no more 73 // calculating the image size. If decoding fails but there is no more
74 // data coming, sets the "decode failure" flag. 74 // data coming, sets the "decode failure" flag.
75 void decode(bool onlySize); 75 void decode(bool onlySize);
76 76
77 OwnPtr<JPEGImageReader> m_reader; 77 OwnPtr<JPEGImageReader> m_reader;
78 OwnPtr<ImagePlanes> m_imagePlanes; 78 OwnPtr<ImagePlanes> m_imagePlanes;
79 IntSize m_decodedSize; 79 IntSize m_decodedSize;
80 bool m_hasColorProfile; 80 bool m_hasColorProfile;
81 }; 81 };
82 82
83 } // namespace blink 83 } // namespace blink
84 84
85 #endif 85 #endif
OLDNEW
« no previous file with comments | « Source/platform/image-decoders/ico/ICOImageDecoder.h ('k') | Source/platform/image-decoders/png/PNGImageDecoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698