Canvas.toDataURL to use SkBitmap::readPixels to avoid uninitialized memory

Source/core/html/HTMLCanvasElement.cpp

 /*
  * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alp Toker <alp@atoker.com>
  * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 451 matching lines @@
 {
     return AtomicString(toDataURLInternal("image/png", 0, FrontBuffer));
 }
 
 String HTMLCanvasElement::toDataURLInternal(const String& mimeType, const double* quality, SourceDrawingBuffer sourceBuffer) const
 {
     if (!isPaintable())
         return String("data:,");
 
     String encodingMimeType = toEncodingMimeType(mimeType);
-    if (!m_context) {
-        ImageData* imageData = ImageData::create(m_size);
+
+    if (is3D()) {
+        // Get non-premultiplied data because of inaccurate premultiplied alpha conversion of buffer()->toDataURL().
+        ImageData* imageData = m_context->paintRenderingResultsToImageData(sourceBuffer);
         ScopedDisposal<ImageData> disposer(imageData);
+        if (imageData) {

[Stephen White, 2015/07/16 19:13:01]

I think this would be clearer and have less code duplication if we did:

ImageData* HTMLCanvasElement::toImageData(...)

which always returns a non-NULL ImageData (transferring ownership). Then
refactor out the ScopedDisposal and the ImageDataBuffer::toDataURL() conversion:

HTMLCanvasElement::toDataURLInternal(...)
{
  ImageData *imageData = toImageData(...);
  ScopedDisposal<ImageData> disposer(imageData);
  return ImageDataBuffer(imageData->size(),
imageData->data()->data()).toDataURL(...);
}

(Would be even nicer if ScopedDisposal had a get() method, so we wouldn't need
two local vars, but that's another issue.)

WDYT?

+            return ImageDataBuffer(imageData->size(), imageData->data()->data()).toDataURL(encodingMimeType, quality);
+        }
+        m_context->paintRenderingResultsToCanvas(sourceBuffer);
+        imageData = ImageData::create(m_size);
+        ScopedDisposal<ImageData> disposer2(imageData);
         return ImageDataBuffer(imageData->size(), imageData->data()->data()).toDataURL(encodingMimeType, quality);
     }
 
-    if (m_context->is3d()) {
-        // Get non-premultiplied data because of inaccurate premultiplied alpha conversion of buffer()->toDataURL().
-        ImageData* imageData = m_context->paintRenderingResultsToImageData(sourceBuffer);
-        ScopedDisposal<ImageData> disposer(imageData);
-        if (imageData)
-            return ImageDataBuffer(imageData->size(), imageData->data()->data()).toDataURL(encodingMimeType, quality);
-        m_context->paintRenderingResultsToCanvas(sourceBuffer);
+    ImageData* imageData = ImageData::create(m_size);
+    ScopedDisposal<ImageData> disposer(imageData);
+
+    if (m_context) {
+        ASSERT(m_context->is2d());
+        SkImageInfo imageInfo = SkImageInfo::Make(width(), height(), kRGBA_8888_SkColorType, kUnpremul_SkAlphaType);
+        buffer()->bitmap().readPixels(imageInfo, imageData->data()->data(), imageInfo.minRowBytes(), 0, 0);
     }
 
-    return buffer()->toDataURL(encodingMimeType, quality);
+    return ImageDataBuffer(imageData->size(), imageData->data()->data()).toDataURL(encodingMimeType, quality);
 }
 
 String HTMLCanvasElement::toDataURL(const String& mimeType, const ScriptValue& qualityArgument, ExceptionState& exceptionState) const
 {
     if (!originClean()) {
         exceptionState.throwSecurityError("Tainted canvases may not be exported.");
         return String();
     }
     double quality;
     double* qualityPtr = nullptr;
@@ skipping 363 matching lines @@
 {
     return FloatSize(width(), height());
 }
 
 bool HTMLCanvasElement::isOpaque() const
 {
     return m_context && !m_context->hasAlpha();
 }
 
 } // blink