diff options
| author | Steve Block <steveblock@google.com> | 2009-11-05 09:23:40 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-11-10 22:41:12 +0000 |
| commit | cac0f67c402d107cdb10971b95719e2ff9c7c76b (patch) | |
| tree | d182c7f87211c6f201a5f038e332336493ebdbe7 /WebCore/platform/graphics/qt/ImageDecoderQt.h | |
| parent | 4b2ef0f288e7c6c4602f621b7a0e9feed304b70e (diff) | |
| download | external_webkit-cac0f67c402d107cdb10971b95719e2ff9c7c76b.zip external_webkit-cac0f67c402d107cdb10971b95719e2ff9c7c76b.tar.gz external_webkit-cac0f67c402d107cdb10971b95719e2ff9c7c76b.tar.bz2 | |
Merge webkit.org at r50258 : Initial merge by git.
Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
Diffstat (limited to 'WebCore/platform/graphics/qt/ImageDecoderQt.h')
| -rw-r--r-- | WebCore/platform/graphics/qt/ImageDecoderQt.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/platform/graphics/qt/ImageDecoderQt.h b/WebCore/platform/graphics/qt/ImageDecoderQt.h index 7b3b686..d11b938 100644 --- a/WebCore/platform/graphics/qt/ImageDecoderQt.h +++ b/WebCore/platform/graphics/qt/ImageDecoderQt.h @@ -40,7 +40,7 @@ namespace WebCore { class ImageDecoderQt : public ImageDecoder { public: - ImageDecoderQt(const QByteArray& imageFormat); + ImageDecoderQt(); ~ImageDecoderQt(); virtual void setData(SharedBuffer* data, bool allDataReceived); @@ -65,7 +65,7 @@ private: void failRead(); private: - String m_format; + QByteArray m_format; QBuffer* m_buffer; QImageReader* m_reader; mutable int m_repetitionCount; |