diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-09 10:45:29 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-09 10:45:29 +0000 |
| commit | ea988281a796efc3b58055534712236b85d8d152 (patch) | |
| tree | 9fa10cd35e3c9c1d139786fba3559d00e5c05083 /content/shell | |
| parent | e1d7da9abb4ae6a21f16ade0e03fa372199c432c (diff) | |
| download | chromium_src-ea988281a796efc3b58055534712236b85d8d152.zip chromium_src-ea988281a796efc3b58055534712236b85d8d152.tar.gz chromium_src-ea988281a796efc3b58055534712236b85d8d152.tar.bz2 | |
Revert 243791 "Revert of https://codereview.chromium.org/128443002/"
Will rebaseline.
> Revert of https://codereview.chromium.org/128443002/
> Reason for revert: a bunch of video* layout tests failed http://build.chromium.org/p/chromium.webkit/builders/WebKit%20Linux/builds/24977
>
> TBR=reed@google.com,thestig@chromium.org,jochen@chromium.org
> NOTREECHECKS=true
> NOTRY=true
> BUG=332271
>
> Review URL: https://codereview.chromium.org/130963002
TBR=alph@chromium.org
Review URL: https://codereview.chromium.org/131443002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243838 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell')
| -rw-r--r-- | content/shell/renderer/test_runner/WebTestProxy.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/content/shell/renderer/test_runner/WebTestProxy.cpp b/content/shell/renderer/test_runner/WebTestProxy.cpp index 1a999e48..c47bf03 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(); } |