| 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 8a30f274bf10374b0f32cc2b27bb2f27ec9f7007..4295806e7b6ae075fc0ea01de9c3a8a7a0227262 100644
|
| --- a/content/shell/renderer/test_runner/WebTestProxy.cpp
|
| +++ b/content/shell/renderer/test_runner/WebTestProxy.cpp
|
| @@ -496,18 +496,7 @@ void WebTestProxyBase::CapturePixelsAsync(
|
| base::Callback<void(const SkBitmap&)> callback) {
|
| TRACE_EVENT0("shell", "WebTestProxyBase::CapturePixelsAsync");
|
|
|
| - // Do a layout here because it might leave compositing mode! x.x
|
| - // TODO(danakj): Remove this when we have kForceCompositingMode everywhere.
|
| - webWidget()->layout();
|
| -
|
| - if (!webWidget()->isAcceleratedCompositingActive()) {
|
| - TRACE_EVENT0("shell",
|
| - "WebTestProxyBase::CapturePixelsAsync "
|
| - "isAcceleratedCompositingActive false");
|
| - callback.Run(SkBitmap());
|
| - return;
|
| - }
|
| -
|
| + DCHECK(webWidget()->isAcceleratedCompositingActive());
|
| DCHECK(!callback.is_null());
|
| DCHECK(m_compositeAndReadbackCallback.is_null());
|
| m_compositeAndReadbackCallback = callback;
|
|
|