Enforce constant size and device scale factor for surfaces

cc/surfaces/surface.h

Index: cc/surfaces/surface.h
diff --git a/cc/surfaces/surface.h b/cc/surfaces/surface.h
index 603036fe90e069fe4f8203e81c2944e0f4e66721..51048362cc1c3c8e665fb391aac60446cc9175b7 100644
--- a/cc/surfaces/surface.h
+++ b/cc/surfaces/surface.h
@@ -22,7 +22,7 @@
 #include "cc/surfaces/frame_sink_id.h"
 #include "cc/surfaces/pending_frame_observer.h"
 #include "cc/surfaces/surface_factory.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"
@@ -42,10 +42,11 @@ class CC_SURFACES_EXPORT Surface {
   using DrawCallback = SurfaceFactory::DrawCallback;
   using WillDrawCallback = SurfaceFactory::WillDrawCallback;
 
-  Surface(const SurfaceId& id, base::WeakPtr<SurfaceFactory> factory);
+  Surface(const SurfaceInfo& surface_info_,
+          base::WeakPtr<SurfaceFactory> factory);
   ~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_;
   }
@@ -153,7 +154,7 @@ class CC_SURFACES_EXPORT Surface {
       CompositorFrame* frame,
       std::vector<ui::LatencyInfo>* latency_info);
 
-  SurfaceId surface_id_;
+  SurfaceInfo surface_info_;
   SurfaceId previous_frame_surface_id_;
   base::WeakPtr<SurfaceFactory> factory_;