testRunner.layoutAndPaintAsyncThen ==> testRunner.compositeAsyncThen

components/test_runner/pixel_dump.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/test_runner/pixel_dump.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 36 matching lines @@
  public:
   CaptureCallback(const base::Callback<void(const SkBitmap&)>& callback);
   virtual ~CaptureCallback();
 
   void set_wait_for_popup(bool wait) { wait_for_popup_ = wait; }
   void set_popup_position(const gfx::Point& position) {
     popup_position_ = position;
   }
 
   // WebCompositeAndReadbackAsyncCallback implementation.
+  bool needsBitmap() const override;
   void didCompositeAndReadback(const SkBitmap& bitmap) override;
 
  private:
   base::Callback<void(const SkBitmap&)> callback_;
   SkBitmap main_bitmap_;
   bool wait_for_popup_;
   gfx::Point popup_position_;
 };
 
 void DrawSelectionRect(const PixelsDumpRequest& dump_request,
@@ skipping 43 matching lines @@
   const SkBitmap bitmap = skia::ReadPixels(canvas.get());
   dump_request->callback.Run(bitmap);
 }
 
 CaptureCallback::CaptureCallback(
     const base::Callback<void(const SkBitmap&)>& callback)
     : callback_(callback), wait_for_popup_(false) {}
 
 CaptureCallback::~CaptureCallback() {}
 
+bool CaptureCallback::needsBitmap() const {
+  return true;
+}
+
 void CaptureCallback::didCompositeAndReadback(const SkBitmap& bitmap) {
   TRACE_EVENT2("shell", "CaptureCallback::didCompositeAndReadback", "x",
                bitmap.info().width(), "y", bitmap.info().height());
   if (!wait_for_popup_) {
     callback_.Run(bitmap);
     delete this;
     return;
   }
   if (main_bitmap_.isNull()) {
     bitmap.deepCopyTo(&main_bitmap_);
@@ skipping 66 matching lines @@
 
   blink::WebImage image = static_cast<blink::WebMockClipboard*>(
                               blink::Platform::current()->clipboard())
                               ->readRawImage(blink::WebClipboard::Buffer());
   const SkBitmap& bitmap = image.getSkBitmap();
   SkAutoLockPixels autoLock(bitmap);
   callback.Run(bitmap);
 }
 
 }  // namespace test_runner