cc: Move draw params from SetExternalDrawConstraints to OnDraw

cc/surfaces/display.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/surfaces/display.h"
 
 #include "base/thread_task_runner_handle.h"
 #include "base/trace_event/trace_event.h"
 #include "cc/debug/benchmark_instrumentation.h"
 #include "cc/output/compositor_frame.h"
@@ skipping 279 matching lines @@
 
 void Display::CommitVSyncParameters(base::TimeTicks timebase,
                                     base::TimeDelta interval) {
   client_->CommitVSyncParameters(timebase, interval);
 }
 
 void Display::SetMemoryPolicy(const ManagedMemoryPolicy& policy) {
   client_->SetMemoryPolicy(policy);
 }
 
-void Display::OnDraw() {
+void Display::OnDraw(const gfx::Transform& transform,
+                     const gfx::Rect& viewport,
+                     const gfx::Rect& clip,
+                     bool resourceless_software_draw) {
   NOTREACHED();
 }
 
 void Display::SetNeedsRedrawRect(const gfx::Rect& damage_rect) {
   aggregator_->SetFullDamageForSurface(current_surface_id_);
   if (scheduler_)
     scheduler_->SurfaceDamaged(current_surface_id_);
 }
 
 void Display::ReclaimResources(const CompositorFrameAck* ack) {
   NOTREACHED();
 }
 
 void Display::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) {
+    const gfx::Transform& transform_for_tile_priority) {
   NOTREACHED();
 }
 
 void Display::SetTreeActivationCallback(const base::Closure& callback) {
   NOTREACHED();
 }
 
 void Display::SetFullRootLayerDamage() {
   if (aggregator_ && !current_surface_id_.is_null())
     aggregator_->SetFullDamageForSurface(current_surface_id_);
@@ skipping 21 matching lines @@
 
   if (surface_id == current_surface_id_)
     UpdateRootSurfaceResourcesLocked();
 }
 
 SurfaceId Display::CurrentSurfaceId() {
   return current_surface_id_;
 }
 
 }  // namespace cc