cc: Move draw params from SetExternalDrawConstraints to OnDraw

cc/surfaces/display.h

Index: cc/surfaces/display.h
diff --git a/cc/surfaces/display.h b/cc/surfaces/display.h
index 3873d133cec14b1da355b57734e51d36d9d627fe..cc45858c6e93449eca130051d532e65cd8d214e9 100644
--- a/cc/surfaces/display.h
+++ b/cc/surfaces/display.h
@@ -85,15 +85,14 @@ class CC_SURFACES_EXPORT Display : public DisplaySchedulerClient,
   void ReclaimResources(const CompositorFrameAck* ack) override;
   void DidLoseOutputSurface() override;
   void SetExternalDrawConstraints(
-      const gfx::Transform& transform,
-      const gfx::Rect& viewport,
-      const gfx::Rect& clip,
       const gfx::Rect& viewport_rect_for_tile_priority,
-      const gfx::Transform& transform_for_tile_priority,
-      bool resourceless_software_draw) override;
+      const gfx::Transform& transform_for_tile_priority) override;
   void SetMemoryPolicy(const ManagedMemoryPolicy& policy) override;
   void SetTreeActivationCallback(const base::Closure& callback) override;
-  void OnDraw() override;
+  void OnDraw(const gfx::Transform& transform,
+              const gfx::Rect& viewport,
+              const gfx::Rect& clip,
+              bool resourceless_software_draw) override;
 
   // RendererClient implementation.
   void SetFullRootLayerDamage() override;