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

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

Issue 64643009: Remove duplicated headers from core/ (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 7 years 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 "config.h" 21 #include "config.h"
22 #include "core/platform/image-decoders/ImageDecoder.h" 22 #include "core/platform/image-decoders/ImageDecoder.h"
23 23
24 #include "platform/SharedBuffer.h"
25 #include "core/platform/image-decoders/bmp/BMPImageDecoder.h" 24 #include "core/platform/image-decoders/bmp/BMPImageDecoder.h"
26 #include "core/platform/image-decoders/gif/GIFImageDecoder.h" 25 #include "core/platform/image-decoders/gif/GIFImageDecoder.h"
27 #include "core/platform/image-decoders/ico/ICOImageDecoder.h" 26 #include "core/platform/image-decoders/ico/ICOImageDecoder.h"
28 #include "core/platform/image-decoders/jpeg/JPEGImageDecoder.h" 27 #include "core/platform/image-decoders/jpeg/JPEGImageDecoder.h"
29 #include "core/platform/image-decoders/png/PNGImageDecoder.h" 28 #include "core/platform/image-decoders/png/PNGImageDecoder.h"
30 #include "core/platform/image-decoders/webp/WEBPImageDecoder.h" 29 #include "core/platform/image-decoders/webp/WEBPImageDecoder.h"
31 #include "public/platform/Platform.h"
32 #include "wtf/PassOwnPtr.h" 30 #include "wtf/PassOwnPtr.h"
33 31
34 namespace WebCore { 32 namespace WebCore {
35 33
36 static unsigned copyFromSharedBuffer(char* buffer, unsigned bufferLength, const SharedBuffer& sharedBuffer, unsigned offset) 34 static unsigned copyFromSharedBuffer(char* buffer, unsigned bufferLength, const SharedBuffer& sharedBuffer, unsigned offset)
37 { 35 {
38 unsigned bytesExtracted = 0; 36 unsigned bytesExtracted = 0;
39 const char* moreData; 37 const char* moreData;
40 while (unsigned moreDataLength = sharedBuffer.getSomeData(moreData, offset)) { 38 while (unsigned moreDataLength = sharedBuffer.getSomeData(moreData, offset)) {
41 unsigned bytesToCopy = std::min(bufferLength - bytesExtracted, moreDataL ength); 39 unsigned bytesToCopy = std::min(bufferLength - bytesExtracted, moreDataL ength);
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 // Otherwise, the previous frame contributes to this frame. 192 // Otherwise, the previous frame contributes to this frame.
195 return (prevBuffer->originalFrameRect().contains(IntRect(IntPoint(), siz e())) 193 return (prevBuffer->originalFrameRect().contains(IntRect(IntPoint(), siz e()))
196 || (prevBuffer->requiredPreviousFrameIndex() == kNotFound)) ? kNotFo und : prevFrame; 194 || (prevBuffer->requiredPreviousFrameIndex() == kNotFound)) ? kNotFo und : prevFrame;
197 default: 195 default:
198 ASSERT_NOT_REACHED(); 196 ASSERT_NOT_REACHED();
199 return kNotFound; 197 return kNotFound;
200 } 198 }
201 } 199 }
202 200
203 } // namespace WebCore 201 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/platform/graphics/win/UniscribeHelper.cpp ('k') | Source/core/platform/image-decoders/bmp/BMPImageDecoder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698