Source/core/html/canvas/CanvasRenderingContext2D.h - Issue 179493002: Add null check to fill, stroke, clip method

Side by Side Diff: Source/core/html/canvas/CanvasRenderingContext2D.h

Issue 179493002: Add null check to fill, stroke, clip method (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: expected.txt Created 6 years, 9 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

« no previous file with comments | « LayoutTests/virtual/gpu/fast/canvas/canvas-path-context-stroke-expected.txt ('k') | Source/core/html/canvas/CanvasRenderingContext2D.cpp » ('j') | no next file with comments »
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 130 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
141 void setFillColor(const String& color, float alpha);	141 void setFillColor(const String& color, float alpha);

142 void setFillColor(float grayLevel, float alpha);	142 void setFillColor(float grayLevel, float alpha);

143 void setFillColor(float r, float g, float b, float a);	143 void setFillColor(float r, float g, float b, float a);

144 void setFillColor(float c, float m, float y, float k, float a);	144 void setFillColor(float c, float m, float y, float k, float a);

145	145

146 void beginPath();	146 void beginPath();

147	147

148 PassRefPtr<DOMPath> currentPath();	148 PassRefPtr<DOMPath> currentPath();

149 void setCurrentPath(DOMPath*);	149 void setCurrentPath(DOMPath*);

150 void fill(const String& winding = "nonzero");	150 void fill(const String& winding = "nonzero");

151 void fill(DOMPath*, const String& winding = "nonzero");	151 void fill(DOMPath*, ExceptionState&);

	152 void fill(DOMPath*, const String& winding, ExceptionState&);

152 void stroke();	153 void stroke();

153 void stroke(DOMPath*);	154 void stroke(DOMPath*, ExceptionState&);

154 void clip(const String& winding = "nonzero");	155 void clip(const String& winding = "nonzero");

155 void clip(DOMPath*, const String& winding = "nonzero");	156 void clip(DOMPath*, ExceptionState&);

	157 void clip(DOMPath*, const String& winding, ExceptionState&);

156	158

157 bool isPointInPath(const float x, const float y, const String& winding = "no nzero");	159 bool isPointInPath(const float x, const float y, const String& winding = "no nzero");

158 bool isPointInStroke(const float x, const float y);	160 bool isPointInStroke(const float x, const float y);

159	161

160 void clearRect(float x, float y, float width, float height);	162 void clearRect(float x, float y, float width, float height);

161 void fillRect(float x, float y, float width, float height);	163 void fillRect(float x, float y, float width, float height);

162 void strokeRect(float x, float y, float width, float height);	164 void strokeRect(float x, float y, float width, float height);

163	165

164 void setShadow(float width, float height, float blur);	166 void setShadow(float width, float height, float blur);

165 void setShadow(float width, float height, float blur, const String& color);	167 void setShadow(float width, float height, float blur, const String& color);

(...skipping 171 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
337 bool m_usesCSSCompatibilityParseMode;	339 bool m_usesCSSCompatibilityParseMode;

338 bool m_hasAlpha;	340 bool m_hasAlpha;

339 MutableStylePropertyMap m_fetchedFonts;	341 MutableStylePropertyMap m_fetchedFonts;

340 };	342 };

341	343

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

343	345

344 } // namespace WebCore	346 } // namespace WebCore

345	347

346 #endif	348 #endif

OLD	NEW