Introduce cc::LocalFrameId and use in SurfaceFactory

content/browser/renderer_host/delegated_frame_host.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_BROWSER_RENDERER_HOST_DELEGATED_FRAME_HOST_H_
 #define CONTENT_BROWSER_RENDERER_HOST_DELEGATED_FRAME_HOST_H_
 
 #include <stdint.h>
 
 #include <vector>
@@ skipping 101 matching lines @@
   void OnLayerRecreated(ui::Layer* old_layer, ui::Layer* new_layer) override;
 
   // ImageTransportFactoryObserver implementation.
   void OnLostResources() override;
 
   // DelegatedFrameEvictorClient implementation.
   void EvictDelegatedFrame() override;
 
   // cc::SurfaceFactoryClient implementation.
   void ReturnResources(const cc::ReturnedResourceArray& resources) override;
-  void WillDrawSurface(const cc::SurfaceId& id,
+  void WillDrawSurface(const cc::LocalFrameId& id,
                        const gfx::Rect& damage_rect) override;
   void SetBeginFrameSource(cc::BeginFrameSource* begin_frame_source) override;
 
   bool CanCopyToBitmap() const;
 
   // Public interface exposed to RenderWidgetHostView.
 
   void SwapDelegatedFrame(uint32_t compositor_frame_sink_id,
                           cc::CompositorFrame frame);
   void ClearDelegatedFrame();
@@ skipping 36 matching lines @@
 
   // Given a RenderWidgetHostViewBase that renders to a Surface that is
   // contained within this class' Surface, find the relative transform between
   // the Surfaces and apply it to a point. If a Surface has not yet been
   // created this returns the same point with no transform applied.
   gfx::Point TransformPointToCoordSpaceForView(
       const gfx::Point& point,
       RenderWidgetHostViewBase* target_view);
 
   // Exposed for tests.
-  cc::SurfaceId SurfaceIdForTesting() const { return surface_id_; }
+  cc::SurfaceId SurfaceIdForTesting() const {
+    return cc::SurfaceId(frame_sink_id_, local_frame_id_);
+  }
+
+  const cc::LocalFrameId& LocalFrameIdForTesting() const {
+    return local_frame_id_;
+  }
+
   void OnCompositingDidCommitForTesting(ui::Compositor* compositor) {
     OnCompositingDidCommit(compositor);
   }
   bool ReleasedFrontLockActiveForTesting() const {
     return !!released_front_lock_.get();
   }
   void SetRequestCopyOfOutputCallbackForTesting(
       const base::Callback<void(std::unique_ptr<cc::CopyOutputRequest>)>&
           callback) {
     request_copy_of_output_callback_for_testing_ = callback;
@@ skipping 52 matching lines @@
 
   void SendReclaimCompositorResources(uint32_t compositor_frame_sink_id,
                                       bool is_swap_ack);
   void SurfaceDrawn(uint32_t compositor_frame_sink_id);
 
   // Called to consult the current |frame_subscriber_|, to determine and maybe
   // initiate a copy-into-video-frame request.
   void AttemptFrameSubscriberCapture(const gfx::Rect& damage_rect);
 
   const cc::FrameSinkId frame_sink_id_;
+  cc::LocalFrameId local_frame_id_;
   DelegatedFrameHostClient* const client_;
   ui::Compositor* compositor_;
 
   // The vsync manager we are observing for changes, if any.
   scoped_refptr<ui::CompositorVSyncManager> vsync_manager_;
 
   // The current VSync timebase and interval. These are zero until the first
   // call to SetVSyncParameters().
   base::TimeTicks vsync_timebase_;
   base::TimeDelta vsync_interval_;
@@ skipping 17 matching lines @@
 
   std::unique_ptr<ui::Layer> right_gutter_;
   std::unique_ptr<ui::Layer> bottom_gutter_;
 
   // This is the last root background color from a swapped frame.
   SkColor background_color_;
 
   // State for rendering into a Surface.
   std::unique_ptr<cc::SurfaceIdAllocator> id_allocator_;
   std::unique_ptr<cc::SurfaceFactory> surface_factory_;
-  cc::SurfaceId surface_id_;
   gfx::Size current_surface_size_;
   float current_scale_factor_;
   cc::ReturnedResourceArray surface_returned_resources_;
 
   // This lock is the one waiting for a frame of the right size to come back
   // from the renderer/GPU process. It is set from the moment the aura window
   // got resized, to the moment we committed the renderer frame of the same
   // size. It keeps track of the size we expect from the renderer, and locks the
   // compositor, as well as the UI for a short time to give a chance to the
   // renderer of producing a frame of the right size.
@@ skipping 30 matching lines @@
   // YUV readback pipeline.
   std::unique_ptr<display_compositor::ReadbackYUVInterface>
       yuv_readback_pipeline_;
 
   std::unique_ptr<DelegatedFrameEvictor> delegated_frame_evictor_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_DELEGATED_FRAME_HOST_H_