Index: content/shell/renderer/test_runner/WebTestProxy.cpp |
diff --git a/content/shell/renderer/test_runner/WebTestProxy.cpp b/content/shell/renderer/test_runner/WebTestProxy.cpp |
index 1a999e48ddf70297cbab64b29e3446477d921c5b..c47bf03238a76ee0964bd99c82f6bd241748db2d 100644 |
--- a/content/shell/renderer/test_runner/WebTestProxy.cpp |
+++ b/content/shell/renderer/test_runner/WebTestProxy.cpp |
@@ -609,7 +609,7 @@ void WebTestProxyBase::paintPagesWithBoundaries() |
int pageCount = webFrame->printBegin(pageSizeInPixels); |
int totalHeight = pageCount * (pageSizeInPixels.height + 1) - 1; |
- SkCanvas* testCanvas = skia::TryCreateBitmapCanvas(pageSizeInPixels.width, totalHeight, true); |
+ SkCanvas* testCanvas = skia::TryCreateBitmapCanvas(pageSizeInPixels.width, totalHeight, false); |
if (testCanvas) { |
discardBackingStore(); |
m_canvas.reset(testCanvas); |
@@ -632,7 +632,10 @@ SkCanvas* WebTestProxyBase::canvas() |
float deviceScaleFactor = webView()->deviceScaleFactor(); |
int scaledWidth = static_cast<int>(ceil(static_cast<float>(widgetSize.width) * deviceScaleFactor)); |
int scaledHeight = static_cast<int>(ceil(static_cast<float>(widgetSize.height) * deviceScaleFactor)); |
- m_canvas.reset(skia::CreateBitmapCanvas(scaledWidth, scaledHeight, true)); |
+ // We're allocating the canvas to be non-opaque (third parameter), so we |
+ // don't end up with uninitialized memory if a layout test doesn't damage |
+ // the entire view. |
+ m_canvas.reset(skia::CreateBitmapCanvas(scaledWidth, scaledHeight, false)); |
return m_canvas.get(); |
} |