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

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

Issue 238543002: We don't need overloading about fill, clip, isPointInPath anymore. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 8 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 | « no previous file | Source/core/html/canvas/CanvasRenderingContext2D.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 void setFillColor(const String& color, float alpha); 145 void setFillColor(const String& color, float alpha);
146 void setFillColor(float grayLevel, float alpha); 146 void setFillColor(float grayLevel, float alpha);
147 void setFillColor(float r, float g, float b, float a); 147 void setFillColor(float r, float g, float b, float a);
148 void setFillColor(float c, float m, float y, float k, float a); 148 void setFillColor(float c, float m, float y, float k, float a);
149 149
150 void beginPath(); 150 void beginPath();
151 151
152 PassRefPtr<Path2D> currentPath(); 152 PassRefPtr<Path2D> currentPath();
153 void setCurrentPath(Path2D*); 153 void setCurrentPath(Path2D*);
154 void fill(const String& winding = "nonzero"); 154 void fill(const String& winding = "nonzero");
155 void fill(Path2D*); 155 void fill(Path2D*, const String& winding = "nonzero");
156 void fill(Path2D*, const String& winding);
157 void stroke(); 156 void stroke();
158 void stroke(Path2D*); 157 void stroke(Path2D*);
159 void clip(const String& winding = "nonzero"); 158 void clip(const String& winding = "nonzero");
160 void clip(Path2D*); 159 void clip(Path2D*, const String& winding = "nonzero");
161 void clip(Path2D*, const String& winding);
162 160
163 bool isPointInPath(const float x, const float y, const String& winding = "no nzero"); 161 bool isPointInPath(const float x, const float y, const String& winding = "no nzero");
164 bool isPointInPath(Path2D*, const float x, const float y); 162 bool isPointInPath(Path2D*, const float x, const float y, const String& wind ing = "nonzero");
165 bool isPointInPath(Path2D*, const float x, const float y, const String& wind ing);
166 bool isPointInStroke(const float x, const float y); 163 bool isPointInStroke(const float x, const float y);
167 bool isPointInStroke(Path2D*, const float x, const float y); 164 bool isPointInStroke(Path2D*, const float x, const float y);
168 165
169 void scrollPathIntoView(); 166 void scrollPathIntoView();
170 void scrollPathIntoView(Path2D*); 167 void scrollPathIntoView(Path2D*);
171 168
172 void clearRect(float x, float y, float width, float height); 169 void clearRect(float x, float y, float width, float height);
173 void fillRect(float x, float y, float width, float height); 170 void fillRect(float x, float y, float width, float height);
174 void strokeRect(float x, float y, float width, float height); 171 void strokeRect(float x, float y, float width, float height);
175 172
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 Timer<CanvasRenderingContext2D> m_dispatchContextLostEventTimer; 354 Timer<CanvasRenderingContext2D> m_dispatchContextLostEventTimer;
358 Timer<CanvasRenderingContext2D> m_dispatchContextRestoredEventTimer; 355 Timer<CanvasRenderingContext2D> m_dispatchContextRestoredEventTimer;
359 Timer<CanvasRenderingContext2D> m_tryRestoreContextEventTimer; 356 Timer<CanvasRenderingContext2D> m_tryRestoreContextEventTimer;
360 }; 357 };
361 358
362 DEFINE_TYPE_CASTS(CanvasRenderingContext2D, CanvasRenderingContext, context, con text->is2d(), context.is2d()); 359 DEFINE_TYPE_CASTS(CanvasRenderingContext2D, CanvasRenderingContext, context, con text->is2d(), context.is2d());
363 360
364 } // namespace WebCore 361 } // namespace WebCore
365 362
366 #endif 363 #endif
OLDNEW
« no previous file with comments | « no previous file | Source/core/html/canvas/CanvasRenderingContext2D.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698