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

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

Issue 178673002: Rename Path to Path2D (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@path
Patch Set: Merge to head which includes isPoint and addPath changes. 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 | « Source/core/core.gypi ('k') | 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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 #include "wtf/Vector.h" 43 #include "wtf/Vector.h"
44 #include "wtf/text/WTFString.h" 44 #include "wtf/text/WTFString.h"
45 45
46 namespace blink { class WebLayer; } 46 namespace blink { class WebLayer; }
47 47
48 namespace WebCore { 48 namespace WebCore {
49 49
50 class CanvasGradient; 50 class CanvasGradient;
51 class CanvasPattern; 51 class CanvasPattern;
52 class CanvasStyle; 52 class CanvasStyle;
53 class DOMPath; 53 class Path2D;
54 class Element; 54 class Element;
55 class ExceptionState; 55 class ExceptionState;
56 class FloatRect; 56 class FloatRect;
57 class GraphicsContext; 57 class GraphicsContext;
58 class HTMLCanvasElement; 58 class HTMLCanvasElement;
59 class HTMLImageElement; 59 class HTMLImageElement;
60 class HTMLVideoElement; 60 class HTMLVideoElement;
61 class ImageBitmap; 61 class ImageBitmap;
62 class ImageData; 62 class ImageData;
63 class TextMetrics; 63 class TextMetrics;
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 139
140 void setFillColor(const String& color); 140 void setFillColor(const String& color);
141 void setFillColor(float grayLevel); 141 void setFillColor(float grayLevel);
142 void setFillColor(const String& color, float alpha); 142 void setFillColor(const String& color, float alpha);
143 void setFillColor(float grayLevel, float alpha); 143 void setFillColor(float grayLevel, float alpha);
144 void setFillColor(float r, float g, float b, float a); 144 void setFillColor(float r, float g, float b, float a);
145 void setFillColor(float c, float m, float y, float k, float a); 145 void setFillColor(float c, float m, float y, float k, float a);
146 146
147 void beginPath(); 147 void beginPath();
148 148
149 PassRefPtr<DOMPath> currentPath(); 149 PassRefPtr<Path2D> currentPath();
150 void setCurrentPath(DOMPath*); 150 void setCurrentPath(Path2D*);
151 void fill(const String& winding = "nonzero"); 151 void fill(const String& winding = "nonzero");
152 void fill(DOMPath*, ExceptionState&); 152 void fill(Path2D*, ExceptionState&);
153 void fill(DOMPath*, const String& winding, ExceptionState&); 153 void fill(Path2D*, const String& winding, ExceptionState&);
154 void stroke(); 154 void stroke();
155 void stroke(DOMPath*, ExceptionState&); 155 void stroke(Path2D*, ExceptionState&);
156 void clip(const String& winding = "nonzero"); 156 void clip(const String& winding = "nonzero");
157 void clip(DOMPath*, ExceptionState&); 157 void clip(Path2D*, ExceptionState&);
158 void clip(DOMPath*, const String& winding, ExceptionState&); 158 void clip(Path2D*, const String& winding, ExceptionState&);
159 159
160 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");
161 bool isPointInPath(DOMPath*, const float x, const float y, ExceptionState&); 161 bool isPointInPath(Path2D*, const float x, const float y, ExceptionState&);
162 bool isPointInPath(DOMPath*, const float x, const float y, const String& win ding, ExceptionState&); 162 bool isPointInPath(Path2D*, const float x, const float y, const String& wind ing, ExceptionState&);
163 bool isPointInStroke(const float x, const float y); 163 bool isPointInStroke(const float x, const float y);
164 bool isPointInStroke(DOMPath*, const float x, const float y, ExceptionState& ); 164 bool isPointInStroke(Path2D*, const float x, const float y, ExceptionState&) ;
165 165
166 void clearRect(float x, float y, float width, float height); 166 void clearRect(float x, float y, float width, float height);
167 void fillRect(float x, float y, float width, float height); 167 void fillRect(float x, float y, float width, float height);
168 void strokeRect(float x, float y, float width, float height); 168 void strokeRect(float x, float y, float width, float height);
169 169
170 void setShadow(float width, float height, float blur); 170 void setShadow(float width, float height, float blur);
171 void setShadow(float width, float height, float blur, const String& color); 171 void setShadow(float width, float height, float blur, const String& color);
172 void setShadow(float width, float height, float blur, float grayLevel); 172 void setShadow(float width, float height, float blur, float grayLevel);
173 void setShadow(float width, float height, float blur, const String& color, f loat alpha); 173 void setShadow(float width, float height, float blur, const String& color, f loat alpha);
174 void setShadow(float width, float height, float blur, float grayLevel, float alpha); 174 void setShadow(float width, float height, float blur, float grayLevel, float alpha);
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 bool m_usesCSSCompatibilityParseMode; 346 bool m_usesCSSCompatibilityParseMode;
347 bool m_hasAlpha; 347 bool m_hasAlpha;
348 MutableStylePropertyMap m_fetchedFonts; 348 MutableStylePropertyMap m_fetchedFonts;
349 }; 349 };
350 350
351 DEFINE_TYPE_CASTS(CanvasRenderingContext2D, CanvasRenderingContext, context, con text->is2d(), context.is2d()); 351 DEFINE_TYPE_CASTS(CanvasRenderingContext2D, CanvasRenderingContext, context, con text->is2d(), context.is2d());
352 352
353 } // namespace WebCore 353 } // namespace WebCore
354 354
355 #endif 355 #endif
OLDNEW
« no previous file with comments | « Source/core/core.gypi ('k') | Source/core/html/canvas/CanvasRenderingContext2D.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698