diff options
| author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
| commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
| tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/WebCore/html/canvas/CanvasStyle.h | |
| parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
| download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 | |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/WebCore/html/canvas/CanvasStyle.h')
| -rw-r--r-- | Source/WebCore/html/canvas/CanvasStyle.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/WebCore/html/canvas/CanvasStyle.h b/Source/WebCore/html/canvas/CanvasStyle.h index 91dc923..1c136d3 100644 --- a/Source/WebCore/html/canvas/CanvasStyle.h +++ b/Source/WebCore/html/canvas/CanvasStyle.h @@ -35,13 +35,14 @@ namespace WebCore { class CanvasGradient; class CanvasPattern; + class Document; class GraphicsContext; class HTMLCanvasElement; class CanvasStyle : public RefCounted<CanvasStyle> { public: static PassRefPtr<CanvasStyle> createFromRGBA(RGBA32 rgba) { return adoptRef(new CanvasStyle(rgba)); } - static PassRefPtr<CanvasStyle> createFromString(const String& color); + static PassRefPtr<CanvasStyle> createFromString(const String& color, Document* = 0); static PassRefPtr<CanvasStyle> createFromStringWithOverrideAlpha(const String& color, float alpha); static PassRefPtr<CanvasStyle> createFromGrayLevelWithAlpha(float grayLevel, float alpha) { return adoptRef(new CanvasStyle(grayLevel, alpha)); } static PassRefPtr<CanvasStyle> createFromRGBAChannels(float r, float g, float b, float a) { return adoptRef(new CanvasStyle(r, g, b, a)); } |