OOPIF support for layout test pixel dumps.

content/shell/browser/layout_test/blink_test_controller.h

Index: content/shell/browser/layout_test/blink_test_controller.h
diff --git a/content/shell/browser/layout_test/blink_test_controller.h b/content/shell/browser/layout_test/blink_test_controller.h
index 5bdc5900b3230e23138fe400e5f68c83edab6658..9a2878fe68af5d96dd2742dd62b9146c28c14cae 100644
--- a/content/shell/browser/layout_test/blink_test_controller.h
+++ b/content/shell/browser/layout_test/blink_test_controller.h
@@ -23,6 +23,7 @@
 #include "content/public/browser/gpu_data_manager_observer.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
+#include "content/public/browser/readback_types.h"
 #include "content/public/browser/render_process_host_observer.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/web_preferences.h"
@@ -202,8 +203,13 @@ class BlinkTestController : public WebContentsObserver,
   void OnImageDump(const std::string& actual_pixel_hash, const SkBitmap& image);
   void OnTextDump(const std::string& dump);
   void OnInitiateLayoutDump();
+  void OnInitiatePixelsDump();
+  void TriggerCompositingIfAllChildrenHaveBeenComposited();
+  void TriggerCompositing(RenderFrameHost* frame);
+  void OnTriggerCompositingResponse(int frame_tree_node_id, int process_id);
   void OnDumpFrameLayoutResponse(int frame_tree_node_id,
                                  const std::string& dump);
+  void OnPixelsDumpCaptured(const SkBitmap& dump, ReadbackResponse response);
   void OnPrintMessageToStderr(const std::string& message);
   void OnPrintMessage(const std::string& message);
   void OnOverridePreferences(const WebPreferences& prefs);
@@ -280,11 +286,15 @@ class BlinkTestController : public WebContentsObserver,
 
   std::unique_ptr<LayoutTestBluetoothChooserFactory> bluetooth_chooser_factory_;
 
-  // Map from frame_tree_node_id into frame-specific dumps.
+  // Map from frame_tree_node_id into frame-specific text/layout dumps.
   std::map<int, std::string> frame_to_layout_dump_map_;
   // Number of LayoutTestControl.DumpFrameLayout responses we are waiting for.
   int pending_layout_dumps_;
 
+  // Stores frame tree node ids of already composited frames (frames for which
+  // OnTriggerCompositingResponse was already called).
+  std::set<int> composited_frames_;
+
   // Renderer processes are observed to detect crashes.
   ScopedObserver<RenderProcessHost, RenderProcessHostObserver>
       render_process_host_observer_;