summaryrefslogtreecommitdiffstats
path: root/WebCore/html/HTMLCanvasElement.h
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-02-02 14:57:50 +0000
committerSteve Block <steveblock@google.com>2010-02-04 15:06:55 +0000
commitd0825bca7fe65beaee391d30da42e937db621564 (patch)
tree7461c49eb5844ffd1f35d1ba2c8b7584c1620823 /WebCore/html/HTMLCanvasElement.h
parent3db770bd97c5a59b6c7574ca80a39e5a51c1defd (diff)
downloadexternal_webkit-d0825bca7fe65beaee391d30da42e937db621564.zip
external_webkit-d0825bca7fe65beaee391d30da42e937db621564.tar.gz
external_webkit-d0825bca7fe65beaee391d30da42e937db621564.tar.bz2
Merge webkit.org at r54127 : Initial merge by git
Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
Diffstat (limited to 'WebCore/html/HTMLCanvasElement.h')
-rw-r--r--WebCore/html/HTMLCanvasElement.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/WebCore/html/HTMLCanvasElement.h b/WebCore/html/HTMLCanvasElement.h
index edae9e5..db80396 100644
--- a/WebCore/html/HTMLCanvasElement.h
+++ b/WebCore/html/HTMLCanvasElement.h
@@ -37,6 +37,7 @@
namespace WebCore {
+class CanvasContextAttributes;
class CanvasRenderingContext;
class FloatPoint;
class FloatRect;
@@ -68,7 +69,7 @@ public:
String toDataURL(const String& mimeType, ExceptionCode&);
- CanvasRenderingContext* getContext(const String&);
+ CanvasRenderingContext* getContext(const String&, CanvasContextAttributes* attributes = 0);
const IntSize& size() const { return m_size; }
void setSize(const IntSize& size)