diff options
| author | Steve Block <steveblock@google.com> | 2011-06-03 15:16:57 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 16:02:00 +0100 |
| commit | 62e058dbf665f2830337230b16ac602d022b513b (patch) | |
| tree | 64ba51217f9d7719789611dadfdc388b74fdcabd /Source/WebCore/html | |
| parent | 2f4ef9300ef5b74c660927a63057e2fcff0e1905 (diff) | |
| download | external_webkit-62e058dbf665f2830337230b16ac602d022b513b.zip external_webkit-62e058dbf665f2830337230b16ac602d022b513b.tar.gz external_webkit-62e058dbf665f2830337230b16ac602d022b513b.tar.bz2 | |
Merge WebKit at r82507: Don't use new loss-free code path in HTMLCanvasElement::toDataURL()
See http://trac.webkit.org/changeset/81213
Change-Id: I1280ec90bd80fbb5cb4450e892f96678b988fa66
Diffstat (limited to 'Source/WebCore/html')
| -rw-r--r-- | Source/WebCore/html/HTMLCanvasElement.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/WebCore/html/HTMLCanvasElement.cpp b/Source/WebCore/html/HTMLCanvasElement.cpp index fbedbf2..67d1caa 100644 --- a/Source/WebCore/html/HTMLCanvasElement.cpp +++ b/Source/WebCore/html/HTMLCanvasElement.cpp @@ -363,7 +363,8 @@ String HTMLCanvasElement::toDataURL(const String& mimeType, const double* qualit if (mimeType.isNull() || !MIMETypeRegistry::isSupportedImageMIMETypeForEncoding(lowercaseMimeType)) lowercaseMimeType = "image/png"; -#if PLATFORM(CG) || USE(SKIA) +#if PLATFORM(CG) || (USE(SKIA) && !PLATFORM(ANDROID)) + // FIXME: Consider using this code path on Android. http://b/4572024 // Try to get ImageData first, as that may avoid lossy conversions. RefPtr<ImageData> imageData = getImageData(); |