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

Side by Side Diff: third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.cpp

Issue 1812273003: Eliminate copies of encoded image data (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 8 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) 2008, 2009, Google Inc. All rights reserved. 2 * Copyright (c) 2008, 2009, 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * 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 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 : ImageDecoder(alphaOption, colorOptions, maxDecodedBytes) 47 : ImageDecoder(alphaOption, colorOptions, maxDecodedBytes)
48 , m_fastReader(nullptr) 48 , m_fastReader(nullptr)
49 , m_decodedOffset(0) 49 , m_decodedOffset(0)
50 { 50 {
51 } 51 }
52 52
53 ICOImageDecoder::~ICOImageDecoder() 53 ICOImageDecoder::~ICOImageDecoder()
54 { 54 {
55 } 55 }
56 56
57 void ICOImageDecoder::onSetData(SharedBuffer* data) 57 void ICOImageDecoder::onSetData(SegmentReader* data)
58 { 58 {
59 m_fastReader.setData(data); 59 m_fastReader.setData(data);
60 60
61 for (BMPReaders::iterator i(m_bmpReaders.begin()); i != m_bmpReaders.end(); ++i) { 61 for (BMPReaders::iterator i(m_bmpReaders.begin()); i != m_bmpReaders.end(); ++i) {
62 if (*i) 62 if (*i)
63 (*i)->setData(data); 63 (*i)->setData(data);
64 } 64 }
65 for (size_t i = 0; i < m_pngDecoders.size(); ++i) 65 for (size_t i = 0; i < m_pngDecoders.size(); ++i)
66 setDataForPNGDecoderAtIndex(i); 66 setDataForPNGDecoderAtIndex(i);
67 } 67 }
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 ASSERT_WITH_SECURITY_IMPLICATION(index < m_dirEntries.size()); 298 ASSERT_WITH_SECURITY_IMPLICATION(index < m_dirEntries.size());
299 const uint32_t imageOffset = m_dirEntries[index].m_imageOffset; 299 const uint32_t imageOffset = m_dirEntries[index].m_imageOffset;
300 if ((imageOffset > m_data->size()) || ((m_data->size() - imageOffset) < 4)) 300 if ((imageOffset > m_data->size()) || ((m_data->size() - imageOffset) < 4))
301 return Unknown; 301 return Unknown;
302 char buffer[4]; 302 char buffer[4];
303 const char* data = m_fastReader.getConsecutiveData(imageOffset, 4, buffer); 303 const char* data = m_fastReader.getConsecutiveData(imageOffset, 4, buffer);
304 return strncmp(data, "\x89PNG", 4) ? BMP : PNG; 304 return strncmp(data, "\x89PNG", 4) ? BMP : PNG;
305 } 305 }
306 306
307 } // namespace blink 307 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698