diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
commit | 8995b83bcbfbb68245f779b64e5517627c6cc6ea (patch) | |
tree | 17985605dab9263cc2444bd4d45f189e142cca7c /Source/WebCore/platform/image-decoders/ImageDecoder.h | |
parent | b9c9652036d5e9f1e29c574f40bc73a35c81ace6 (diff) |
Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592)
New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well
as the previously cherry-picked changes
Diffstat (limited to 'Source/WebCore/platform/image-decoders/ImageDecoder.h')
-rw-r--r-- | Source/WebCore/platform/image-decoders/ImageDecoder.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/platform/image-decoders/ImageDecoder.h b/Source/WebCore/platform/image-decoders/ImageDecoder.h index 303d7599a..d0cc53b14 100644 --- a/Source/WebCore/platform/image-decoders/ImageDecoder.h +++ b/Source/WebCore/platform/image-decoders/ImageDecoder.h @@ -177,10 +177,10 @@ namespace WebCore { Vector<PixelData> m_backingStore; PixelData* m_bytes; // The memory is backed by m_backingStore. IntSize m_size; - bool m_hasAlpha; // FIXME: Do we need m_colorProfile anymore? ColorProfile m_colorProfile; #endif + bool m_hasAlpha; IntRect m_originalFrameRect; // This will always just be the entire // buffer except for GIF frames whose // original rect was smaller than the |