[WIP] cc: Plumb SurfaceId from clients

content/renderer/gpu/compositor_output_surface.h

 // Copyright (c) 2012 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_GPU_COMPOSITOR_OUTPUT_SURFACE_H_
 #define CONTENT_RENDERER_GPU_COMPOSITOR_OUTPUT_SURFACE_H_
 
 #include <stdint.h>
 
 #include <memory>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/threading/platform_thread.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "cc/output/begin_frame_args.h"
 #include "cc/output/output_surface.h"
+#include "cc/surfaces/surface_id_allocator.h"
 #include "content/renderer/gpu/compositor_forwarding_message_filter.h"
 #include "ipc/ipc_sync_message_filter.h"
 
 namespace IPC {
 class Message;
 }
 
 namespace cc {
 class CompositorFrame;
 class CompositorFrameAck;
@@ skipping 59 matching lines @@
   void OnReclaimCompositorResources(uint32_t output_surface_id,
                                     bool is_swap_ack,
                                     const cc::ReturnedResourceArray& resources);
   bool Send(IPC::Message* message);
 
   scoped_refptr<CompositorForwardingMessageFilter> output_surface_filter_;
   CompositorForwardingMessageFilter::Handler output_surface_filter_handler_;
   scoped_refptr<CompositorOutputSurfaceProxy> output_surface_proxy_;
   scoped_refptr<IPC::SyncMessageFilter> message_sender_;
   scoped_refptr<FrameSwapMessageQueue> frame_swap_message_queue_;
+  cc::SurfaceIdAllocator allocator_;
+  cc::SurfaceId surface_id_;
+  gfx::Size current_surface_size_;
+  gfx::Size current_surface_size_in_dip_;
+  float current_scale_factor_;
   int routing_id_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_GPU_COMPOSITOR_OUTPUT_SURFACE_H_