Index: Source/core/html/HTMLCanvasElement.cpp |
diff --git a/Source/core/html/HTMLCanvasElement.cpp b/Source/core/html/HTMLCanvasElement.cpp |
index 54f25ea62e6ae151385ddb556821a6cb4390dd09..b6ad06aa5730fb49977eb278cac14d8ad53b72f2 100644 |
--- a/Source/core/html/HTMLCanvasElement.cpp |
+++ b/Source/core/html/HTMLCanvasElement.cpp |
@@ -381,13 +381,13 @@ String HTMLCanvasElement::toEncodingMimeType(const String& mimeType) |
return lowercaseMimeType; |
} |
-String HTMLCanvasElement::toDataURL(const String& mimeType, const double* quality, ExceptionState& exceptionState) |
+const AtomicString HTMLCanvasElement::imageSourceURL() const |
{ |
- if (!m_originClean) { |
- exceptionState.throwSecurityError("Tainted canvases may not be exported."); |
- return String(); |
- } |
+ return AtomicString(toDataURLInternal("image/png", 0)); |
+} |
+String HTMLCanvasElement::toDataURLInternal(const String& mimeType, const double* quality) const |
+{ |
if (m_size.isEmpty() || !buffer()) |
return String("data:,"); |
@@ -405,7 +405,17 @@ String HTMLCanvasElement::toDataURL(const String& mimeType, const double* qualit |
return buffer()->toDataURL(encodingMimeType, quality); |
} |
-PassRefPtrWillBeRawPtr<ImageData> HTMLCanvasElement::getImageData() |
+String HTMLCanvasElement::toDataURL(const String& mimeType, const double* quality, ExceptionState& exceptionState) |
Justin Novosad
2014/04/24 14:19:39
I know it was like this before, but this method sh
|
+{ |
+ if (!m_originClean) { |
+ exceptionState.throwSecurityError("Tainted canvases may not be exported."); |
+ return String(); |
+ } |
+ |
+ return toDataURLInternal(mimeType, quality); |
+} |
+ |
+PassRefPtrWillBeRawPtr<ImageData> HTMLCanvasElement::getImageData() const |
{ |
if (!m_context || !m_context->is3d()) |
return nullptr; |