Introducing SurfaceReferenceFactory

content/renderer/child_frame_compositing_helper.h

 // Copyright 2014 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.
 
 #ifndef CONTENT_RENDERER_CHILD_FRAME_COMPOSITING_HELPER_H_
 #define CONTENT_RENDERER_CHILD_FRAME_COMPOSITING_HELPER_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/shared_memory.h"
 #include "base/memory/weak_ptr.h"
 #include "cc/surfaces/surface_id.h"
+#include "cc/surfaces/surface_reference_factory.h"
 #include "content/common/content_export.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace cc {
 struct SurfaceSequence;
 
 class Layer;
 }
 
 namespace blink {
 class WebLayer;
 class WebPluginContainer;
 class WebRemoteFrame;
 }
 
 namespace gfx {
 class Size;
 }
 
 namespace content {
 
 class BrowserPlugin;
 class RenderFrameProxy;
-class ThreadSafeSender;
 
 class CONTENT_EXPORT ChildFrameCompositingHelper
     : public base::RefCounted<ChildFrameCompositingHelper> {
  public:
   static ChildFrameCompositingHelper* CreateForBrowserPlugin(
       const base::WeakPtr<BrowserPlugin>& browser_plugin);
   static ChildFrameCompositingHelper* CreateForRenderFrameProxy(
       RenderFrameProxy* render_frame_proxy);
 
   void OnContainerDestroy();
@@ skipping 17 matching lines @@
       RenderFrameProxy* render_frame_proxy,
       int host_routing_id);
 
   virtual ~ChildFrameCompositingHelper();
 
   blink::WebPluginContainer* GetContainer();
 
   void CheckSizeAndAdjustLayerProperties(const gfx::Size& new_size,
                                          float device_scale_factor,
                                          cc::Layer* layer);
-  static void SatisfyCallback(scoped_refptr<ThreadSafeSender> sender,
-                              int host_routing_id,
-                              const cc::SurfaceSequence& sequence);
-  static void SatisfyCallbackBrowserPlugin(
-      scoped_refptr<ThreadSafeSender> sender,
-      int host_routing_id,
-      int browser_plugin_instance_id,
-      const cc::SurfaceSequence& sequence);
-  static void RequireCallback(scoped_refptr<ThreadSafeSender> sender,
-                              int host_routing_id,
-                              const cc::SurfaceId& id,
-                              const cc::SurfaceSequence& sequence);
-  static void RequireCallbackBrowserPlugin(
-      scoped_refptr<ThreadSafeSender> sender,
-      int host_routing_id,
-      int browser_plugin_instance_id,
-      const cc::SurfaceId& id,
-      const cc::SurfaceSequence& sequence);
   void UpdateWebLayer(std::unique_ptr<blink::WebLayer> layer);
 
-  int host_routing_id_;
+  const int host_routing_id_;
 
   gfx::Size buffer_size_;
 
   // The lifetime of this weak pointer should be greater than the lifetime of
   // other member objects, as they may access this pointer during their
   // destruction.
-  base::WeakPtr<BrowserPlugin> browser_plugin_;
-  RenderFrameProxy* render_frame_proxy_;
+  const base::WeakPtr<BrowserPlugin> browser_plugin_;
+  RenderFrameProxy* const render_frame_proxy_;
 
   std::unique_ptr<blink::WebLayer> web_layer_;
   cc::SurfaceId surface_id_;
   blink::WebRemoteFrame* frame_;
 
+  scoped_refptr<cc::SurfaceReferenceFactory> surface_reference_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(ChildFrameCompositingHelper);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_CHILD_FRAME_COMPOSITING_HELPER_H_