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

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

Issue 137353004: Add versions of stroke, fill, and clip that take a Path parameter. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Add tests for null Path object passed in. Created 6 years, 10 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
OLDNEW
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 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 void setFillColor(const String& color, float alpha); 144 void setFillColor(const String& color, float alpha);
145 void setFillColor(float grayLevel, float alpha); 145 void setFillColor(float grayLevel, float alpha);
146 void setFillColor(float r, float g, float b, float a); 146 void setFillColor(float r, float g, float b, float a);
147 void setFillColor(float c, float m, float y, float k, float a); 147 void setFillColor(float c, float m, float y, float k, float a);
148 148
149 void beginPath(); 149 void beginPath();
150 150
151 PassRefPtr<DOMPath> currentPath(); 151 PassRefPtr<DOMPath> currentPath();
152 void setCurrentPath(DOMPath*); 152 void setCurrentPath(DOMPath*);
153 void fill(const String& winding = "nonzero"); 153 void fill(const String& winding = "nonzero");
154 void fill(DOMPath*, const String& winding = "nonzero");
154 void stroke(); 155 void stroke();
156 void stroke(DOMPath*);
155 void clip(const String& winding = "nonzero"); 157 void clip(const String& winding = "nonzero");
158 void clip(DOMPath*, const String& winding = "nonzero");
156 159
157 bool isPointInPath(const float x, const float y, const String& winding = "no nzero"); 160 bool isPointInPath(const float x, const float y, const String& winding = "no nzero");
158 bool isPointInStroke(const float x, const float y); 161 bool isPointInStroke(const float x, const float y);
159 162
160 void clearRect(float x, float y, float width, float height); 163 void clearRect(float x, float y, float width, float height);
161 void fillRect(float x, float y, float width, float height); 164 void fillRect(float x, float y, float width, float height);
162 void strokeRect(float x, float y, float width, float height); 165 void strokeRect(float x, float y, float width, float height);
163 166
164 void setShadow(float width, float height, float blur); 167 void setShadow(float width, float height, float blur);
165 void setShadow(float width, float height, float blur, const String& color); 168 void setShadow(float width, float height, float blur, const String& color);
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
301 void realizeSaves() 304 void realizeSaves()
302 { 305 {
303 if (m_unrealizedSaveCount) 306 if (m_unrealizedSaveCount)
304 realizeSavesLoop(); 307 realizeSavesLoop();
305 } 308 }
306 void realizeSavesLoop(); 309 void realizeSavesLoop();
307 310
308 void applyStrokePattern(); 311 void applyStrokePattern();
309 void applyFillPattern(); 312 void applyFillPattern();
310 313
314 void fillImpl(const Path&, const String& windingRuleString);
Justin Novosad 2014/02/19 15:36:41 Blinkism nit: Impl->Internal
jcgregorio 2014/02/20 18:48:53 Done.
315 void strokeImpl(const Path&);
316 void clipImpl(const Path&, const String& windingRuleString);
317
311 void drawTextInternal(const String& text, float x, float y, bool fill, float maxWidth = 0, bool useMaxWidth = false); 318 void drawTextInternal(const String& text, float x, float y, bool fill, float maxWidth = 0, bool useMaxWidth = false);
312 319
313 const Font& accessFont(); 320 const Font& accessFont();
314 321
315 void clearCanvas(); 322 void clearCanvas();
316 bool rectContainsTransformedRect(const FloatRect&, const FloatRect&) const; 323 bool rectContainsTransformedRect(const FloatRect&, const FloatRect&) const;
317 324
318 void inflateStrokeRect(FloatRect&) const; 325 void inflateStrokeRect(FloatRect&) const;
319 326
320 template<class T> void fullCanvasCompositedFill(const T&); 327 template<class T> void fullCanvasCompositedFill(const T&);
(...skipping 16 matching lines...) Expand all
337 bool m_usesCSSCompatibilityParseMode; 344 bool m_usesCSSCompatibilityParseMode;
338 bool m_hasAlpha; 345 bool m_hasAlpha;
339 MutableStylePropertyMap m_fetchedFonts; 346 MutableStylePropertyMap m_fetchedFonts;
340 }; 347 };
341 348
342 DEFINE_TYPE_CASTS(CanvasRenderingContext2D, CanvasRenderingContext, context, con text->is2d(), context.is2d()); 349 DEFINE_TYPE_CASTS(CanvasRenderingContext2D, CanvasRenderingContext, context, con text->is2d(), context.is2d());
343 350
344 } // namespace WebCore 351 } // namespace WebCore
345 352
346 #endif 353 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698