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

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: clean up idl Created 6 years, 11 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 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 void setFillColor(const String& color, float alpha); 143 void setFillColor(const String& color, float alpha);
144 void setFillColor(float grayLevel, float alpha); 144 void setFillColor(float grayLevel, float alpha);
145 void setFillColor(float r, float g, float b, float a); 145 void setFillColor(float r, float g, float b, float a);
146 void setFillColor(float c, float m, float y, float k, float a); 146 void setFillColor(float c, float m, float y, float k, float a);
147 147
148 void beginPath(); 148 void beginPath();
149 149
150 PassRefPtr<DOMPath> currentPath(); 150 PassRefPtr<DOMPath> currentPath();
151 void setCurrentPath(DOMPath*); 151 void setCurrentPath(DOMPath*);
152 void fill(const String& winding = "nonzero"); 152 void fill(const String& winding = "nonzero");
153 void fill(DOMPath*, const String& winding = "nonzero");
153 void stroke(); 154 void stroke();
155 void stroke(DOMPath*);
154 void clip(const String& winding = "nonzero"); 156 void clip(const String& winding = "nonzero");
157 void clip(DOMPath*, const String& winding = "nonzero");
155 158
156 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");
157 bool isPointInStroke(const float x, const float y); 160 bool isPointInStroke(const float x, const float y);
158 161
159 void clearRect(float x, float y, float width, float height); 162 void clearRect(float x, float y, float width, float height);
160 void fillRect(float x, float y, float width, float height); 163 void fillRect(float x, float y, float width, float height);
161 void strokeRect(float x, float y, float width, float height); 164 void strokeRect(float x, float y, float width, float height);
162 165
163 void setShadow(float width, float height, float blur); 166 void setShadow(float width, float height, float blur);
164 void setShadow(float width, float height, float blur, const String& color); 167 void setShadow(float width, float height, float blur, const String& color);
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 void realizeSaves() 302 void realizeSaves()
300 { 303 {
301 if (m_unrealizedSaveCount) 304 if (m_unrealizedSaveCount)
302 realizeSavesLoop(); 305 realizeSavesLoop();
303 } 306 }
304 void realizeSavesLoop(); 307 void realizeSavesLoop();
305 308
306 void applyStrokePattern(); 309 void applyStrokePattern();
307 void applyFillPattern(); 310 void applyFillPattern();
308 311
312 void fillImpl(const Path&, const String& windingRuleString);
313 void strokeImpl(const Path&);
314 void clipImpl(const Path&, const String& windingRuleString);
315
309 void drawTextInternal(const String& text, float x, float y, bool fill, float maxWidth = 0, bool useMaxWidth = false); 316 void drawTextInternal(const String& text, float x, float y, bool fill, float maxWidth = 0, bool useMaxWidth = false);
310 317
311 const Font& accessFont(); 318 const Font& accessFont();
312 319
313 void clearCanvas(); 320 void clearCanvas();
314 bool rectContainsTransformedRect(const FloatRect&, const FloatRect&) const; 321 bool rectContainsTransformedRect(const FloatRect&, const FloatRect&) const;
315 322
316 void inflateStrokeRect(FloatRect&) const; 323 void inflateStrokeRect(FloatRect&) const;
317 324
318 template<class T> void fullCanvasCompositedFill(const T&); 325 template<class T> void fullCanvasCompositedFill(const T&);
(...skipping 16 matching lines...) Expand all
335 bool m_usesCSSCompatibilityParseMode; 342 bool m_usesCSSCompatibilityParseMode;
336 bool m_hasAlpha; 343 bool m_hasAlpha;
337 MutableStylePropertyMap m_fetchedFonts; 344 MutableStylePropertyMap m_fetchedFonts;
338 }; 345 };
339 346
340 DEFINE_TYPE_CASTS(CanvasRenderingContext2D, CanvasRenderingContext, context, con text->is2d(), context.is2d()); 347 DEFINE_TYPE_CASTS(CanvasRenderingContext2D, CanvasRenderingContext, context, con text->is2d(), context.is2d());
341 348
342 } // namespace WebCore 349 } // namespace WebCore
343 350
344 #endif 351 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698