Don't use return value of compositeAndReadbackAsync so it can be void.

This pulls out the piece from https://codereview.chromium.org/266243002/
to stop using the return value of compositeAndReadbackAsync in order
to remove the return value and replace it with an ASSERT in
this: https://codereview.chromium.org/263253002/.

R=abarth
BUG=251960

Review URL: https://codereview.chromium.org/270463003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@268958 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 4 deletions

diff --git a/content/shell/renderer/test_runner/WebTestProxy.cpp b/content/shell/renderer/test_runner/WebTestProxy.cpp
index e35e4de..8a30f27 100644
--- a/content/shell/renderer/test_runner/WebTestProxy.cpp
+++ b/content/shell/renderer/test_runner/WebTestProxy.cpp
@@ -488,24 +488,30 @@ void WebTestProxyBase::didCompositeAndReadback(const SkBitmap& bitmap) {
                bitmap.info().fHeight);
   SkCanvas canvas(bitmap);
   DrawSelectionRect(&canvas);
+  DCHECK(!m_compositeAndReadbackCallback.is_null());
   base::ResetAndReturn(&m_compositeAndReadbackCallback).Run(bitmap);
 }
 
 void WebTestProxyBase::CapturePixelsAsync(
     base::Callback<void(const SkBitmap&)> callback) {
-  m_compositeAndReadbackCallback = 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()->compositeAndReadbackAsync(this)) {
+  if (!webWidget()->isAcceleratedCompositingActive()) {
     TRACE_EVENT0("shell",
                  "WebTestProxyBase::CapturePixelsAsync "
-                 "compositeAndReadbackAsync failed");
-    didCompositeAndReadback(SkBitmap());
+                 "isAcceleratedCompositingActive false");
+    callback.Run(SkBitmap());
+    return;
   }
+
+  DCHECK(!callback.is_null());
+  DCHECK(m_compositeAndReadbackCallback.is_null());
+  m_compositeAndReadbackCallback = callback;
+  webWidget()->compositeAndReadbackAsync(this);
 }
 
 void WebTestProxyBase::setLogConsoleOutput(bool enabled)