diff options
author | Feng Qian <fqian@google.com> | 2009-06-17 12:12:20 -0700 |
---|---|---|
committer | Feng Qian <fqian@google.com> | 2009-06-17 12:12:20 -0700 |
commit | 5f1ab04193ad0130ca8204aadaceae083aca9881 (patch) | |
tree | 5a92cd389e2cfe7fb67197ce14b38469462379f8 /WebCore/platform/image-decoders/ico | |
parent | 194315e5a908cc8ed67d597010544803eef1ac59 (diff) | |
download | external_webkit-5f1ab04193ad0130ca8204aadaceae083aca9881.zip external_webkit-5f1ab04193ad0130ca8204aadaceae083aca9881.tar.gz external_webkit-5f1ab04193ad0130ca8204aadaceae083aca9881.tar.bz2 |
Get WebKit r44544.
Diffstat (limited to 'WebCore/platform/image-decoders/ico')
-rw-r--r-- | WebCore/platform/image-decoders/ico/ICOImageDecoder.cpp | 6 | ||||
-rw-r--r-- | WebCore/platform/image-decoders/ico/ICOImageDecoder.h | 25 |
2 files changed, 13 insertions, 18 deletions
diff --git a/WebCore/platform/image-decoders/ico/ICOImageDecoder.cpp b/WebCore/platform/image-decoders/ico/ICOImageDecoder.cpp index 019340d..5b1a88f 100644 --- a/WebCore/platform/image-decoders/ico/ICOImageDecoder.cpp +++ b/WebCore/platform/image-decoders/ico/ICOImageDecoder.cpp @@ -26,8 +26,6 @@ #include "config.h" #include "ICOImageDecoder.h" -#if PLATFORM(CAIRO) || PLATFORM(QT) || PLATFORM(WX) - namespace WebCore { @@ -41,6 +39,4 @@ RGBA32Buffer* ICOImageDecoder::frameBufferAtIndex(size_t index) return 0; } -} - -#endif // PLATFORM(CAIRO) +} // namespace WebCore diff --git a/WebCore/platform/image-decoders/ico/ICOImageDecoder.h b/WebCore/platform/image-decoders/ico/ICOImageDecoder.h index a4f3dbd..56a74c3 100644 --- a/WebCore/platform/image-decoders/ico/ICOImageDecoder.h +++ b/WebCore/platform/image-decoders/ico/ICOImageDecoder.h @@ -23,27 +23,26 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ICO_DECODER_H_ -#define ICO_DECODER_H_ +#ifndef ICOImageDecoder_h +#define ICOImageDecoder_h #include "ImageDecoder.h" namespace WebCore { -class ICOImageReader; + class ICOImageReader; -// This class decodes the ICO and CUR image formats. -class ICOImageDecoder : public ImageDecoder -{ -public: - virtual String filenameExtension() const { return "ico"; } + // This class decodes the ICO and CUR image formats. + class ICOImageDecoder : public ImageDecoder { + public: + virtual String filenameExtension() const { return "ico"; } - // Whether or not the size information has been decoded yet. - virtual bool isSizeAvailable() const; + // Whether or not the size information has been decoded yet. + virtual bool isSizeAvailable() const; - virtual RGBA32Buffer* frameBufferAtIndex(size_t index); -}; + virtual RGBA32Buffer* frameBufferAtIndex(size_t index); + }; -} +} // namespace WebCore #endif |