summaryrefslogtreecommitdiffstats
path: root/WebCore/dom/CanvasSurface.h
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2010-06-15 19:36:43 +0100
committerBen Murdoch <benm@google.com>2010-06-16 14:52:28 +0100
commit545e470e52f0ac6a3a072bf559c796b42c6066b6 (patch)
treec0c14763654d84d37577dde512c3d3b4699a9e86 /WebCore/dom/CanvasSurface.h
parent719298a66237d38ea5c05f1547123ad8aacbc237 (diff)
downloadexternal_webkit-545e470e52f0ac6a3a072bf559c796b42c6066b6.zip
external_webkit-545e470e52f0ac6a3a072bf559c796b42c6066b6.tar.gz
external_webkit-545e470e52f0ac6a3a072bf559c796b42c6066b6.tar.bz2
Merge webkit.org at r61121: Initial merge by git.
Change-Id: Icd6db395c62285be384d137164d95d7466c98760
Diffstat (limited to 'WebCore/dom/CanvasSurface.h')
-rw-r--r--WebCore/dom/CanvasSurface.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/WebCore/dom/CanvasSurface.h b/WebCore/dom/CanvasSurface.h
index 3660c05..3601381 100644
--- a/WebCore/dom/CanvasSurface.h
+++ b/WebCore/dom/CanvasSurface.h
@@ -59,9 +59,8 @@ public:
int width() const { return m_size.width(); }
int height() const { return m_size.height(); }
- String toDataURL(const String& mimeType, double quality, ExceptionCode&);
-
- String toDataURL(const String& mimeType, ExceptionCode& ec) { return toDataURL(mimeType, 1.0, ec); }
+ String toDataURL(const String& mimeType, const double* quality, ExceptionCode&);
+ String toDataURL(const String& mimeType, ExceptionCode& ec) { return toDataURL(mimeType, 0, ec); }
const IntSize& size() const { return m_size; }