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 179383002: Add versions of isPointIn*() that take a Path parameter. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 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 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
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*, const String& winding = "nonzero");
152 void stroke(); 152 void stroke();
153 void stroke(DOMPath*); 153 void stroke(DOMPath*);
154 void clip(const String& winding = "nonzero"); 154 void clip(const String& winding = "nonzero");
155 void clip(DOMPath*, const String& winding = "nonzero"); 155 void clip(DOMPath*, const String& winding = "nonzero");
156 156
157 bool isPointInPath(const float x, const float y, const String& winding = "no nzero"); 157 bool isPointInPath(const float x, const float y, const String& winding = "no nzero");
158 bool isPointInPath(DOMPath*, const float x, const float y, const String& win ding = "nonzero");
Rik 2014/02/25 07:46:45 should the DOMPath have a name?
158 bool isPointInStroke(const float x, const float y); 159 bool isPointInStroke(const float x, const float y);
160 bool isPointInStroke(DOMPath*, 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);
166 void setShadow(float width, float height, float blur, float grayLevel); 168 void setShadow(float width, float height, float blur, float grayLevel);
167 void setShadow(float width, float height, float blur, const String& color, f loat alpha); 169 void setShadow(float width, float height, float blur, const String& color, f loat alpha);
168 void setShadow(float width, float height, float blur, float grayLevel, float alpha); 170 void setShadow(float width, float height, float blur, float grayLevel, float alpha);
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 void unwindStateStack(); 304 void unwindStateStack();
303 void realizeSaves(); 305 void realizeSaves();
304 306
305 void applyStrokePattern(); 307 void applyStrokePattern();
306 void applyFillPattern(); 308 void applyFillPattern();
307 309
308 void fillInternal(const Path&, const String& windingRuleString); 310 void fillInternal(const Path&, const String& windingRuleString);
309 void strokeInternal(const Path&); 311 void strokeInternal(const Path&);
310 void clipInternal(const Path&, const String& windingRuleString); 312 void clipInternal(const Path&, const String& windingRuleString);
311 313
314 bool isPointInPathInternal(const Path&, const float x, const float y, const String& windingRuleString);
Rik 2014/02/25 07:46:45 same here.
315 bool isPointInStrokeInternal(const Path&, const float x, const float y);
316
312 void drawTextInternal(const String& text, float x, float y, bool fill, float maxWidth = 0, bool useMaxWidth = false); 317 void drawTextInternal(const String& text, float x, float y, bool fill, float maxWidth = 0, bool useMaxWidth = false);
313 318
314 const Font& accessFont(); 319 const Font& accessFont();
315 320
316 void clearCanvas(); 321 void clearCanvas();
317 bool rectContainsTransformedRect(const FloatRect&, const FloatRect&) const; 322 bool rectContainsTransformedRect(const FloatRect&, const FloatRect&) const;
318 323
319 void inflateStrokeRect(FloatRect&) const; 324 void inflateStrokeRect(FloatRect&) const;
320 325
321 template<class T> void fullCanvasCompositedFill(const T&); 326 template<class T> void fullCanvasCompositedFill(const T&);
(...skipping 15 matching lines...) Expand all
337 bool m_usesCSSCompatibilityParseMode; 342 bool m_usesCSSCompatibilityParseMode;
338 bool m_hasAlpha; 343 bool m_hasAlpha;
339 MutableStylePropertyMap m_fetchedFonts; 344 MutableStylePropertyMap m_fetchedFonts;
340 }; 345 };
341 346
342 DEFINE_TYPE_CASTS(CanvasRenderingContext2D, CanvasRenderingContext, context, con text->is2d(), context.is2d()); 347 DEFINE_TYPE_CASTS(CanvasRenderingContext2D, CanvasRenderingContext, context, con text->is2d(), context.is2d());
343 348
344 } // namespace WebCore 349 } // namespace WebCore
345 350
346 #endif 351 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698