cc: Move draw params from SetExternalDrawConstraints to OnDraw

cc/output/output_surface_client.h

Index: cc/output/output_surface_client.h
diff --git a/cc/output/output_surface_client.h b/cc/output/output_surface_client.h
index 98010dc43378160add8cf9bd5072d3c4ea60a924..3d6f1dce669458b6b09f0644e28db14b20d5e943 100644
--- a/cc/output/output_surface_client.h
+++ b/cc/output/output_surface_client.h
@@ -31,12 +31,8 @@ class CC_EXPORT OutputSurfaceClient {
   virtual void ReclaimResources(const CompositorFrameAck* ack) = 0;
   virtual void DidLoseOutputSurface() = 0;
   virtual 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) = 0;
+      const gfx::Transform& transform_for_tile_priority) = 0;
   virtual void SetMemoryPolicy(const ManagedMemoryPolicy& policy) = 0;
   // If set, |callback| will be called subsequent to each new tree activation,
   // regardless of the compositor visibility or damage. |callback| must remain
@@ -44,7 +40,10 @@ class CC_EXPORT OutputSurfaceClient {
   // use SetTreeActivationCallback(base::Closure()) to unregister it.
   virtual void SetTreeActivationCallback(const base::Closure& callback) = 0;
   // This allows the output surface to ask it's client for a draw.
-  virtual void OnDraw() = 0;
+  virtual void OnDraw(const gfx::Transform& transform,
+                      const gfx::Rect& viewport,
+                      const gfx::Rect& clip,
+                      bool resourceless_software_draw) = 0;
 
  protected:
   virtual ~OutputSurfaceClient() {}