Update from https://crrev.com/306655

cc/surfaces/display.h

Index: cc/surfaces/display.h
diff --git a/cc/surfaces/display.h b/cc/surfaces/display.h
index a0bb62ad0790f208226641ae3e8fb1a3a9b00e84..47c55bb4f90e59c2cad65c3b5a3c942643f7d405 100644
--- a/cc/surfaces/display.h
+++ b/cc/surfaces/display.h
@@ -51,9 +51,8 @@ class CC_SURFACES_EXPORT Display : public OutputSurfaceClient,
 
   // device_scale_factor is used to communicate to the external window system
   // what scale this was rendered at.
-  void Resize(SurfaceId id,
-              const gfx::Size& new_size,
-              float device_scale_factor);
+  void SetSurfaceId(SurfaceId id, float device_scale_factor);
+  void Resize(const gfx::Size& new_size);
   bool Draw();
 
   SurfaceId CurrentSurfaceId();