Commit ea988281 authored by jochen@chromium.org's avatar jochen@chromium.org

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
parent e1d7da9a
......@@ -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();
}
......
......@@ -6357,26 +6357,6 @@
fun:_ZN3net14URLFetcherCore19DidInitializeWriterEi
fun:_ZN3net14URLFetcherCore15StartOnIOThreadEv
}
{
bug_332271a
Memcheck:Param
write(buf)
obj:*libpthread*
fun:_ZN3IPC7Channel11ChannelImpl23ProcessOutgoingMessagesEv
fun:_ZN3IPC7Channel11ChannelImpl29OnFileCanWriteWithoutBlockingEi
fun:_ZN4base19MessagePumpLibevent21FileDescriptorWatcher29OnFileCanWriteWithoutBlocking*
fun:_ZN4base19MessagePumpLibevent22OnLibeventNotificationEisPv
}
{
bug_332271b
Memcheck:Param
write(buf)
obj:*libpthread*
fun:_ZN3IPC7Channel11ChannelImpl23ProcessOutgoingMessagesEv
fun:_ZN3IPC7Channel11ChannelImpl4SendEPNS_7MessageE
fun:_ZN3IPC7Channel4SendEPNS_7MessageE
fun:_ZN3IPC12ChannelProxy7Context13OnSendMessage*
}
{
bug_332328
Memcheck:Leak
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment