Introduce cc::LocalFrameId and use in SurfaceFactory

cc/surfaces/direct_compositor_frame_sink.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 CC_SURFACES_DIRECT_COMPOSITOR_FRAME_SINK_H_
 #define CC_SURFACES_DIRECT_COMPOSITOR_FRAME_SINK_H_
 
 #include "base/macros.h"
 #include "base/threading/thread_checker.h"
 #include "cc/output/compositor_frame_sink.h"
@@ skipping 45 matching lines @@
   void DisplayWillDrawAndSwap(bool will_draw_and_swap,
                               const RenderPassList& render_passes) override;
   void DisplayDidDrawAndSwap() override;
 
  private:
   void DidDrawCallback();
 
   // This class is only meant to be used on a single thread.
   base::ThreadChecker thread_checker_;
 
-  FrameSinkId frame_sink_id_;
+  const FrameSinkId frame_sink_id_;
+  LocalFrameId delegated_local_frame_id_;
   SurfaceManager* surface_manager_;
   SurfaceIdAllocator surface_id_allocator_;
   Display* display_;
   SurfaceFactory factory_;
-  SurfaceId delegated_surface_id_;
   gfx::Size last_swap_frame_size_;
   bool is_lost_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(DirectCompositorFrameSink);
 };
 
 }  // namespace cc
 
 #endif  // CC_SURFACES_DIRECT_COMPOSITOR_FRAME_SINK_H_