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

Side by Side Diff: third_party/WebKit/Source/core/html/HTMLCanvasElement.h

Issue 1414553002: Fix out-of-memory crashes related to ArrayBuffer allocation Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase+more tweaks Created 5 years, 1 month 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) 2004, 2006, 2009, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2004, 2006, 2009, 2010 Apple Inc. All rights reserved.
3 * Copyright (C) 2007 Alp Toker <alp@atoker.com> 3 * Copyright (C) 2007 Alp Toker <alp@atoker.com>
4 * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved. 4 * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 186
187 PassOwnPtr<ImageBufferSurface> createImageBufferSurface(const IntSize& devic eSize, int* msaaSampleCount); 187 PassOwnPtr<ImageBufferSurface> createImageBufferSurface(const IntSize& devic eSize, int* msaaSampleCount);
188 void createImageBuffer(); 188 void createImageBuffer();
189 void createImageBufferInternal(PassOwnPtr<ImageBufferSurface> externalSurfac e); 189 void createImageBufferInternal(PassOwnPtr<ImageBufferSurface> externalSurfac e);
190 bool shouldUseDisplayList(const IntSize& deviceSize); 190 bool shouldUseDisplayList(const IntSize& deviceSize);
191 191
192 void setSurfaceSize(const IntSize&); 192 void setSurfaceSize(const IntSize&);
193 193
194 bool paintsIntoCanvasBuffer() const; 194 bool paintsIntoCanvasBuffer() const;
195 195
196 ImageData* toImageData(SourceDrawingBuffer) const; 196 ImageData* toImageData(SourceDrawingBuffer, ExceptionState&) const;
197 String toDataURLInternal(const String& mimeType, const double& quality, Sour ceDrawingBuffer) const; 197 String toDataURLInternal(const String& mimeType, const double& quality, Sour ceDrawingBuffer, ExceptionState&) const;
198 198
199 IntSize m_size; 199 IntSize m_size;
200 200
201 OwnPtrWillBeMember<CanvasRenderingContext> m_context; 201 OwnPtrWillBeMember<CanvasRenderingContext> m_context;
202 202
203 bool m_ignoreReset; 203 bool m_ignoreReset;
204 FloatRect m_dirtyRect; 204 FloatRect m_dirtyRect;
205 205
206 mutable intptr_t m_externallyAllocatedMemory; 206 mutable intptr_t m_externallyAllocatedMemory;
207 207
208 bool m_originClean; 208 bool m_originClean;
209 209
210 // It prevents HTMLCanvasElement::buffer() from continuously re-attempting t o allocate an imageBuffer 210 // It prevents HTMLCanvasElement::buffer() from continuously re-attempting t o allocate an imageBuffer
211 // after the first attempt failed. 211 // after the first attempt failed.
212 mutable bool m_didFailToCreateImageBuffer; 212 mutable bool m_didFailToCreateImageBuffer;
213 bool m_imageBufferIsClear; 213 bool m_imageBufferIsClear;
214 OwnPtr<ImageBuffer> m_imageBuffer; 214 OwnPtr<ImageBuffer> m_imageBuffer;
215 215
216 mutable RefPtr<Image> m_copiedImage; // FIXME: This is temporary for platfor ms that have to copy the image buffer to render (and for CSSCanvasValue). 216 mutable RefPtr<Image> m_copiedImage; // FIXME: This is temporary for platfor ms that have to copy the image buffer to render (and for CSSCanvasValue).
217 }; 217 };
218 218
219 } // namespace blink 219 } // namespace blink
220 220
221 #endif // HTMLCanvasElement_h 221 #endif // HTMLCanvasElement_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/fileapi/FileReaderSync.cpp ('k') | third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698