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

Side by Side Diff: Source/core/platform/image-decoders/jpeg/JPEGImageDecoder.cpp

Issue 14810003: Move CPU() macro to it's own header from wtf/Platform.h (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Move CPU() macro to it's own header from wtf/Platform.h Created 7 years, 7 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
« no previous file with comments | « Source/core/platform/image-decoders/bmp/BMPImageReader.h ('k') | Source/wtf/Atomics.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006 Apple Computer, Inc. 2 * Copyright (C) 2006 Apple Computer, Inc.
3 * 3 *
4 * Portions are Copyright (C) 2001-6 mozilla.org 4 * Portions are Copyright (C) 2001-6 mozilla.org
5 * 5 *
6 * Other contributors: 6 * Other contributors:
7 * Stuart Parmenter <stuart@mozilla.com> 7 * Stuart Parmenter <stuart@mozilla.com>
8 * 8 *
9 * Copyright (C) 2007-2009 Torch Mobile, Inc. 9 * Copyright (C) 2007-2009 Torch Mobile, Inc.
10 * 10 *
(...skipping 22 matching lines...) Expand all
33 * version of this file under the LGPL, indicate your decision by 33 * version of this file under the LGPL, indicate your decision by
34 * deletingthe provisions above and replace them with the notice and 34 * deletingthe provisions above and replace them with the notice and
35 * other provisions required by the MPL or the GPL, as the case may be. 35 * other provisions required by the MPL or the GPL, as the case may be.
36 * If you do not delete the provisions above, a recipient may use your 36 * If you do not delete the provisions above, a recipient may use your
37 * version of this file under any of the LGPL, the MPL or the GPL. 37 * version of this file under any of the LGPL, the MPL or the GPL.
38 */ 38 */
39 39
40 #include "config.h" 40 #include "config.h"
41 #include "core/platform/PlatformInstrumentation.h" 41 #include "core/platform/PlatformInstrumentation.h"
42 #include "core/platform/image-decoders/jpeg/JPEGImageDecoder.h" 42 #include "core/platform/image-decoders/jpeg/JPEGImageDecoder.h"
43 #include <wtf/PassOwnPtr.h> 43 #include "wtf/CPU.h"
44 #include "wtf/PassOwnPtr.h"
44 45
45 extern "C" { 46 extern "C" {
46 #if USE(ICCJPEG) 47 #if USE(ICCJPEG)
47 #include "iccjpeg.h" 48 #include "iccjpeg.h"
48 #endif 49 #endif
49 #if USE(QCMSLIB) 50 #if USE(QCMSLIB)
50 #include "qcms.h" 51 #include "qcms.h"
51 #endif 52 #endif
52 #include <setjmp.h> 53 #include <setjmp.h>
53 } 54 }
(...skipping 728 matching lines...) Expand 10 before | Expand all | Expand 10 after
782 // has failed. 783 // has failed.
783 if (!m_reader->decode(*m_data, onlySize) && isAllDataReceived()) 784 if (!m_reader->decode(*m_data, onlySize) && isAllDataReceived())
784 setFailed(); 785 setFailed();
785 // If we're done decoding the image, we don't need the JPEGImageReader 786 // If we're done decoding the image, we don't need the JPEGImageReader
786 // anymore. (If we failed, |m_reader| has already been cleared.) 787 // anymore. (If we failed, |m_reader| has already been cleared.)
787 else if (!m_frameBufferCache.isEmpty() && (m_frameBufferCache[0].status() == ImageFrame::FrameComplete)) 788 else if (!m_frameBufferCache.isEmpty() && (m_frameBufferCache[0].status() == ImageFrame::FrameComplete))
788 m_reader.clear(); 789 m_reader.clear();
789 } 790 }
790 791
791 } 792 }
OLDNEW
« no previous file with comments | « Source/core/platform/image-decoders/bmp/BMPImageReader.h ('k') | Source/wtf/Atomics.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698