Introduce cc::LocalFrameId and use in SurfaceFactory

components/exo/surface.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 COMPONENTS_EXO_SURFACE_H_
 #define COMPONENTS_EXO_SURFACE_H_
 
 #include <list>
 #include <memory>
 #include <set>
@@ skipping 49 matching lines @@
 // contents of Buffers. It's keeped alive by references from
 // release_callbacks_. It's destroyed when its owning Surface is destroyed and
 // the last outstanding release callback is called.
 class SurfaceFactoryOwner : public base::RefCounted<SurfaceFactoryOwner>,
                             public cc::SurfaceFactoryClient {
  public:
   SurfaceFactoryOwner();
 
   // Overridden from cc::SurfaceFactoryClient:
   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;
 
  private:
   friend class base::RefCounted<SurfaceFactoryOwner>;
   friend class Surface;
 
   ~SurfaceFactoryOwner() override;
 
   std::map<int,
@@ skipping 14 matching lines @@
   using PropertyDeallocator = void (*)(int64_t value);
 
   Surface();
   ~Surface() override;
 
   // Type-checking downcast routine.
   static Surface* AsSurface(const aura::Window* window);
 
   aura::Window* window() { return window_.get(); }
 
-  const cc::SurfaceId& surface_id() const { return surface_id_; }
+  const cc::LocalFrameId& local_frame_id() const { return local_frame_id_; }
+  cc::SurfaceId GetSurfaceId() const;
 
   // Set a buffer as the content of this surface. A buffer can only be attached
   // to one surface at a time.
   void Attach(Buffer* buffer);
 
   // Describe the regions where the pending buffer is different from the
   // current surface contents, and where the surface therefore needs to be
   // repainted.
   void Damage(const gfx::Rect& rect);
 
@@ skipping 92 matching lines @@
   bool HasPendingDamageForTesting(const gfx::Rect& damage) const {
     return pending_damage_.contains(gfx::RectToSkIRect(damage));
   }
 
   // Overridden from ui::LayerOwnerDelegate:
   void OnLayerRecreated(ui::Layer* old_layer, ui::Layer* new_layer) override;
 
   // Overridden from ui::ContextFactoryObserver.
   void OnLostResources() override;
 
-  void WillDraw(const cc::SurfaceId& surface_id);
+  void WillDraw(const cc::LocalFrameId& local_frame_id);
 
   // Check whether this Surface and its children need to create new cc::Surface
   // IDs for their contents next time they get new buffer contents.
   void CheckIfSurfaceHierarchyNeedsCommitToNewSurfaces();
 
   gfx::Size content_size() const { return content_size_; }
 
   // Sets the |value| of the given surface |property|. Setting to the default
   // value (e.g., NULL) removes the property. The caller is responsible for the
   // lifetime of any object set as a property on the Surface.
@@ skipping 101 matching lines @@
   bool has_pending_contents_ = false;
 
   // The buffer that will become the content of surface when Commit() is called.
   BufferAttachment pending_buffer_;
 
   cc::SurfaceManager* surface_manager_;
 
   scoped_refptr<SurfaceFactoryOwner> factory_owner_;
 
   // The Surface Id currently attached to the window.
-  cc::SurfaceId surface_id_;
+  cc::LocalFrameId local_frame_id_;
 
   // The next resource id the buffer will be attached to.
   int next_resource_id_ = 1;
 
   // The damage region to schedule paint for when Commit() is called.
   SkRegion pending_damage_;
 
   // These lists contains the callbacks to notify the client when it is a good
   // time to start producing a new frame. These callbacks move to
   // |frame_callbacks_| when Commit() is called. Later they are moved to
@@ skipping 49 matching lines @@
 
   // Surface observer list. Surface does not own the observers.
   base::ObserverList<SurfaceObserver, true> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(Surface);
 };
 
 }  // namespace exo
 
 #endif  // COMPONENTS_EXO_SURFACE_H_