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

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

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

Powered by Google App Engine
This is Rietveld 408576698