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

Side by Side Diff: sky/engine/platform/image-decoders/png/PNGImageDecoder.cpp

Issue 1206763002: Really remove config.h (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 6 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. 2 * Copyright (C) 2006 Apple Computer, Inc.
3 * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved. 3 * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved.
4 * 4 *
5 * Portions are Copyright (C) 2001 mozilla.org 5 * Portions are Copyright (C) 2001 mozilla.org
6 * 6 *
7 * Other contributors: 7 * Other contributors:
8 * Stuart Parmenter <stuart@mozilla.com> 8 * Stuart Parmenter <stuart@mozilla.com>
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 18 matching lines...) Expand all
29 * applicable instead of those above. If you wish to allow use of your 29 * applicable instead of those above. If you wish to allow use of your
30 * version of this file only under the terms of one of those two 30 * version of this file only under the terms of one of those two
31 * licenses (the MPL or the GPL) and not to allow others to use your 31 * licenses (the MPL or the GPL) and not to allow others to use your
32 * version of this file under the LGPL, indicate your decision by 32 * version of this file under the LGPL, indicate your decision by
33 * deletingthe provisions above and replace them with the notice and 33 * deletingthe provisions above and replace them with the notice and
34 * other provisions required by the MPL or the GPL, as the case may be. 34 * other provisions required by the MPL or the GPL, as the case may be.
35 * If you do not delete the provisions above, a recipient may use your 35 * If you do not delete the provisions above, a recipient may use your
36 * version of this file under any of the LGPL, the MPL or the GPL. 36 * version of this file under any of the LGPL, the MPL or the GPL.
37 */ 37 */
38 38
39 #include "sky/engine/config.h"
40 #include "platform/image-decoders/png/PNGImageDecoder.h" 39 #include "platform/image-decoders/png/PNGImageDecoder.h"
41 40
42 #include "sky/engine/wtf/PassOwnPtr.h" 41 #include "sky/engine/wtf/PassOwnPtr.h"
43 42
44 #include "png.h" 43 #include "png.h"
45 #if USE(QCMSLIB) 44 #if USE(QCMSLIB)
46 #include "qcms.h" 45 #include "qcms.h"
47 #endif 46 #endif
48 47
49 #if defined(PNG_LIBPNG_VER_MAJOR) && defined(PNG_LIBPNG_VER_MINOR) && (PNG_LIBPN G_VER_MAJOR > 1 || (PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4)) 48 #if defined(PNG_LIBPNG_VER_MAJOR) && defined(PNG_LIBPNG_VER_MINOR) && (PNG_LIBPN G_VER_MAJOR > 1 || (PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4))
(...skipping 488 matching lines...) Expand 10 before | Expand all | Expand 10 after
538 // has failed. 537 // has failed.
539 if (!m_reader->decode(*m_data, onlySize) && isAllDataReceived()) 538 if (!m_reader->decode(*m_data, onlySize) && isAllDataReceived())
540 setFailed(); 539 setFailed();
541 // If we're done decoding the image, we don't need the PNGImageReader 540 // If we're done decoding the image, we don't need the PNGImageReader
542 // anymore. (If we failed, |m_reader| has already been cleared.) 541 // anymore. (If we failed, |m_reader| has already been cleared.)
543 else if (isComplete()) 542 else if (isComplete())
544 m_reader.clear(); 543 m_reader.clear();
545 } 544 }
546 545
547 } // namespace blink 546 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698