Index: cc/surfaces/surface.h |
diff --git a/cc/surfaces/surface.h b/cc/surfaces/surface.h |
index 2e0996821ec35630b863bf340b78a4146c369029..8ddfa5e094b9b35a934ab3d482b1e68c43948edc 100644 |
--- a/cc/surfaces/surface.h |
+++ b/cc/surfaces/surface.h |
@@ -21,7 +21,7 @@ |
#include "cc/output/copy_output_request.h" |
#include "cc/surfaces/compositor_frame_sink_support.h" |
#include "cc/surfaces/frame_sink_id.h" |
-#include "cc/surfaces/surface_id.h" |
+#include "cc/surfaces/surface_info.h" |
#include "cc/surfaces/surface_sequence.h" |
#include "cc/surfaces/surfaces_export.h" |
#include "ui/gfx/geometry/size.h" |
@@ -41,11 +41,11 @@ class CC_SURFACES_EXPORT Surface { |
base::RepeatingCallback<void(const LocalSurfaceId&, const gfx::Rect&)>; |
Surface( |
- const SurfaceId& id, |
+ const SurfaceInfo& surface_info, |
base::WeakPtr<CompositorFrameSinkSupport> compositor_frame_sink_support); |
~Surface(); |
- const SurfaceId& surface_id() const { return surface_id_; } |
+ const SurfaceId& surface_id() const { return surface_info_.id(); } |
const SurfaceId& previous_frame_surface_id() const { |
return previous_frame_surface_id_; |
} |
@@ -156,7 +156,7 @@ class CC_SURFACES_EXPORT Surface { |
CompositorFrame* frame, |
std::vector<ui::LatencyInfo>* latency_info); |
- const SurfaceId surface_id_; |
+ SurfaceInfo surface_info_; |
SurfaceId previous_frame_surface_id_; |
base::WeakPtr<CompositorFrameSinkSupport> compositor_frame_sink_support_; |
SurfaceManager* const surface_manager_; |