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

Side by Side Diff: Source/WebCore/platform/image-decoders/webp/WEBPImageDecoder.h

Issue 10860057: Merge 125869 - Source/WebCore: libwebp-0.2.0: handle alpha channel if present (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1229/
Patch Set: Created 8 years, 4 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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 virtual ~WEBPImageDecoder(); 43 virtual ~WEBPImageDecoder();
44 44
45 virtual String filenameExtension() const { return "webp"; } 45 virtual String filenameExtension() const { return "webp"; }
46 virtual bool isSizeAvailable(); 46 virtual bool isSizeAvailable();
47 virtual ImageFrame* frameBufferAtIndex(size_t index); 47 virtual ImageFrame* frameBufferAtIndex(size_t index);
48 48
49 private: 49 private:
50 bool decode(bool onlySize); 50 bool decode(bool onlySize);
51 51
52 WebPIDecoder* m_decoder; 52 WebPIDecoder* m_decoder;
53 bool m_hasAlpha;
53 }; 54 };
54 55
55 } // namespace WebCore 56 } // namespace WebCore
56 57
57 #endif 58 #endif
58 59
59 #endif 60 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698