third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.h - Issue 1414553002: Fix out-of-memory crashes related to ArrayBuffer allocation

Side by Side Diff: third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.h

Issue 1414553002: Fix out-of-memory crashes related to ArrayBuffer allocation Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 2 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

« third_party/WebKit/Source/core/dom/DOMTypedArray.h ('K') | « third_party/WebKit/Source/modules/bluetooth/ConvertWebVectorToArrayBuffer.cpp ('k') | third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.cpp » ('j') | third_party/WebKit/Source/wtf/ArrayBufferBuilder.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2006, 2007, 2009, 2010, 2011, 2012 Apple Inc. All rights reserv ed.	2 * Copyright (C) 2006, 2007, 2009, 2010, 2011, 2012 Apple Inc. All rights reserv ed.

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	5 * modification, are permitted provided that the following conditions

6 * are met:	6 * are met:

7 * 1. Redistributions of source code must retain the above copyright	7 * 1. Redistributions of source code must retain the above copyright

8 * notice, this list of conditions and the following disclaimer.	8 * notice, this list of conditions and the following disclaimer.

9 * 2. Redistributions in binary form must reproduce the above copyright	9 * 2. Redistributions in binary form must reproduce the above copyright

10 * notice, this list of conditions and the following disclaimer in the	10 * notice, this list of conditions and the following disclaimer in the

(...skipping 155 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
166	166

167 void drawImage(const CanvasImageSourceUnion&, float x, float y, ExceptionSta te&);	167 void drawImage(const CanvasImageSourceUnion&, float x, float y, ExceptionSta te&);

168 void drawImage(const CanvasImageSourceUnion&, float x, float y, float width, float height, ExceptionState&);	168 void drawImage(const CanvasImageSourceUnion&, float x, float y, float width, float height, ExceptionState&);

169 void drawImage(const CanvasImageSourceUnion&, float sx, float sy, float sw, float sh, float dx, float dy, float dw, float dh, ExceptionState&);	169 void drawImage(const CanvasImageSourceUnion&, float sx, float sy, float sw, float sh, float dx, float dy, float dw, float dh, ExceptionState&);

170 void drawImage(CanvasImageSource*, float sx, float sy, float sw, float sh, f loat dx, float dy, float dw, float dh, ExceptionState&);	170 void drawImage(CanvasImageSource*, float sx, float sy, float sw, float sh, f loat dx, float dy, float dw, float dh, ExceptionState&);

171	171

172 CanvasGradient* createLinearGradient(float x0, float y0, float x1, float y1) ;	172 CanvasGradient* createLinearGradient(float x0, float y0, float x1, float y1) ;

173 CanvasGradient* createRadialGradient(float x0, float y0, float r0, float x1, float y1, float r1, ExceptionState&);	173 CanvasGradient* createRadialGradient(float x0, float y0, float r0, float x1, float y1, float r1, ExceptionState&);

174 CanvasPattern* createPattern(const CanvasImageSourceUnion&, const String& re petitionType, ExceptionState&);	174 CanvasPattern* createPattern(const CanvasImageSourceUnion&, const String& re petitionType, ExceptionState&);

175	175

176 ImageData* createImageData(ImageData*) const;	176 ImageData* createImageData(ImageData*, ExceptionState&) const;

177 ImageData* createImageData(float width, float height, ExceptionState&) const ;	177 ImageData* createImageData(float width, float height, ExceptionState&) const ;

178 ImageData* getImageData(float sx, float sy, float sw, float sh, ExceptionSta te&) const;	178 ImageData* getImageData(float sx, float sy, float sw, float sh, ExceptionSta te&) const;

179 void putImageData(ImageData*, float dx, float dy);	179 void putImageData(ImageData*, float dx, float dy);

180 void putImageData(ImageData*, float dx, float dy, float dirtyX, float dirtyY , float dirtyWidth, float dirtyHeight);	180 void putImageData(ImageData*, float dx, float dy, float dirtyX, float dirtyY , float dirtyWidth, float dirtyHeight);

181	181

182 void reset() override;	182 void reset() override;

183	183

184 String font() const;	184 String font() const;

185 void setFont(const String&) override;	185 void setFont(const String&) override;

186	186

(...skipping 129 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
316 HashMap<String, Font> m_fontsResolvedUsingCurrentStyle;	316 HashMap<String, Font> m_fontsResolvedUsingCurrentStyle;

317 bool m_pruneLocalFontCacheScheduled;	317 bool m_pruneLocalFontCacheScheduled;

318 ListHashSet<String> m_fontLRUList;	318 ListHashSet<String> m_fontLRUList;

319 };	319 };

320	320

321 DEFINE_TYPE_CASTS(CanvasRenderingContext2D, CanvasRenderingContext, context, con text->is2d(), context.is2d());	321 DEFINE_TYPE_CASTS(CanvasRenderingContext2D, CanvasRenderingContext, context, con text->is2d(), context.is2d());

322	322

323 } // namespace blink	323 } // namespace blink

324	324

325 #endif // CanvasRenderingContext2D_h	325 #endif // CanvasRenderingContext2D_h

OLD	NEW