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

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

Issue 2048003002: Remove DeferredImageDecoder::setEnabled and ImageDecoder::deferredImageDecodingEnabled (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 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) Research In Motion Limited 2009-2010. All rights reserved. 2 * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12 * Library General Public License for more details. 12 * Library General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU Library General Public License 14 * You should have received a copy of the GNU Library General Public License
15 * along with this library; see the file COPYING.LIB. If not, write to 15 * along with this library; see the file COPYING.LIB. If not, write to
16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
17 * Boston, MA 02110-1301, USA. 17 * Boston, MA 02110-1301, USA.
18 * 18 *
19 */ 19 */
20 20
21 #include "platform/image-decoders/ImageDecoder.h" 21 #include "platform/image-decoders/ImageDecoder.h"
22 22
23 #include "platform/PlatformInstrumentation.h" 23 #include "platform/PlatformInstrumentation.h"
24 #include "platform/graphics/DeferredImageDecoder.h"
25 #include "platform/image-decoders/bmp/BMPImageDecoder.h" 24 #include "platform/image-decoders/bmp/BMPImageDecoder.h"
26 #include "platform/image-decoders/gif/GIFImageDecoder.h" 25 #include "platform/image-decoders/gif/GIFImageDecoder.h"
27 #include "platform/image-decoders/ico/ICOImageDecoder.h" 26 #include "platform/image-decoders/ico/ICOImageDecoder.h"
28 #include "platform/image-decoders/jpeg/JPEGImageDecoder.h" 27 #include "platform/image-decoders/jpeg/JPEGImageDecoder.h"
29 #include "platform/image-decoders/png/PNGImageDecoder.h" 28 #include "platform/image-decoders/png/PNGImageDecoder.h"
30 #include "platform/image-decoders/webp/WEBPImageDecoder.h" 29 #include "platform/image-decoders/webp/WEBPImageDecoder.h"
31 #include "wtf/PassOwnPtr.h" 30 #include "wtf/PassOwnPtr.h"
32 31
33 namespace blink { 32 namespace blink {
34 33
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 { 176 {
178 area = static_cast<uint64_t>(size.width()) * size.height(); 177 area = static_cast<uint64_t>(size.width()) * size.height();
179 } 178 }
180 179
181 uint64_t area; 180 uint64_t area;
182 }; 181 };
183 182
184 return ImageSize(frameSizeAtIndex(index)).area * sizeof(ImageFrame::PixelDat a); 183 return ImageSize(frameSizeAtIndex(index)).area * sizeof(ImageFrame::PixelDat a);
185 } 184 }
186 185
187 bool ImageDecoder::deferredImageDecodingEnabled()
188 {
189 return DeferredImageDecoder::enabled();
190 }
191
192 size_t ImageDecoder::clearCacheExceptFrame(size_t clearExceptFrame) 186 size_t ImageDecoder::clearCacheExceptFrame(size_t clearExceptFrame)
193 { 187 {
194 // Don't clear if there are no frames or only one frame. 188 // Don't clear if there are no frames or only one frame.
195 if (m_frameBufferCache.size() <= 1) 189 if (m_frameBufferCache.size() <= 1)
196 return 0; 190 return 0;
197 191
198 size_t frameBytesCleared = 0; 192 size_t frameBytesCleared = 0;
199 for (size_t i = 0; i < m_frameBufferCache.size(); ++i) { 193 for (size_t i = 0; i < m_frameBufferCache.size(); ++i) {
200 if (i != clearExceptFrame) { 194 if (i != clearExceptFrame) {
201 frameBytesCleared += frameBytesAtIndex(i); 195 frameBytesCleared += frameBytesAtIndex(i);
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
369 363
370 qcms_data_type dataFormat = hasAlpha ? QCMS_DATA_RGBA_8 : QCMS_DATA_RGB_8; 364 qcms_data_type dataFormat = hasAlpha ? QCMS_DATA_RGBA_8 : QCMS_DATA_RGB_8;
371 365
372 // FIXME: Don't force perceptual intent if the image profile contains an int ent. 366 // FIXME: Don't force perceptual intent if the image profile contains an int ent.
373 m_sourceToOutputDeviceColorTransform.reset(qcms_transform_create(inputProfil e.get(), dataFormat, gOutputDeviceProfile, QCMS_DATA_RGBA_8, QCMS_INTENT_PERCEPT UAL)); 367 m_sourceToOutputDeviceColorTransform.reset(qcms_transform_create(inputProfil e.get(), dataFormat, gOutputDeviceProfile, QCMS_DATA_RGBA_8, QCMS_INTENT_PERCEPT UAL));
374 } 368 }
375 369
376 #endif // USE(QCMSLIB) 370 #endif // USE(QCMSLIB)
377 371
378 } // namespace blink 372 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698