Introduce cc::LocalFrameId and use in SurfaceFactory

blimp/client/core/compositor/blimp_compositor.h

 // Copyright 2015 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 BLIMP_CLIENT_CORE_COMPOSITOR_BLIMP_COMPOSITOR_H_
 #define BLIMP_CLIENT_CORE_COMPOSITOR_BLIMP_COMPOSITOR_H_
 
 #include <memory>
 #include <vector>
 
@@ skipping 17 matching lines @@
 
 namespace cc {
 namespace proto {
 class CompositorMessage;
 }  // namespace proto
 
 class ContextProvider;
 class Layer;
 class LayerTreeHost;
 class LayerTreeSettings;
+class LocalFrameid;
 class Surface;
 class SurfaceFactory;
-class SurfaceId;
 class SurfaceIdAllocator;
 }  // namespace cc
 
 namespace blimp {
 class BlimpMessage;
 
 namespace client {
 
 class BlimpCompositorDependencies;
 
@@ skipping 144 matching lines @@
 
   // The SurfaceFactory is bound to the lifetime of the |proxy_client_|. When
   // detached, the surface factory will be destroyed.
   std::unique_ptr<cc::SurfaceFactory> surface_factory_;
   base::WeakPtr<BlimpCompositorFrameSinkProxyClient> proxy_client_;
 
   // Whether or not |host_| has asked for a new CompositorFrameSink.
   bool compositor_frame_sink_request_pending_;
 
   // Data for the current frame.
-  cc::SurfaceId surface_id_;
+  cc::LocalFrameId local_frame_id_;
   gfx::Size current_surface_size_;
 
   base::ThreadChecker thread_checker_;
 
   // Surfaces related stuff and layer which holds the delegated content from the
   // compositor.
   std::unique_ptr<cc::SurfaceIdAllocator> surface_id_allocator_;
   scoped_refptr<cc::Layer> layer_;
 
   // To be notified of any incoming compositor protos that are specifically sent
@@ skipping 20 matching lines @@
 
   base::WeakPtrFactory<BlimpCompositor> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BlimpCompositor);
 };
 
 }  // namespace client
 }  // namespace blimp
 
 #endif  // BLIMP_CLIENT_CORE_COMPOSITOR_BLIMP_COMPOSITOR_H_