cc: Move draw params from SetExternalDrawConstraints to OnDraw

cc/trees/layer_tree_host_unittest.cc

 // Copyright 2011 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/trees/layer_tree_host.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/location.h"
@@ skipping 2084 matching lines @@
         FROM_HERE,
         base::Bind(
             &LayerTreeHostTestAbortedCommitDoesntStallSynchronousCompositor::
                 CallOnDraw,
             base::Unretained(this)));
   }
 
   void CallOnDraw() {
     // Synchronous compositor does not draw unless told to do so by the output
     // surface.
-    output_surface()->client()->OnDraw();
+    gfx::Transform identity;
+    gfx::Rect empty_rect;
+    bool resourceless_software_draw = false;
+    output_surface()->client()->OnDraw(identity, empty_rect, empty_rect,
+                                       resourceless_software_draw);
   }
 };
 
 MULTI_THREAD_TEST_F(
     LayerTreeHostTestAbortedCommitDoesntStallSynchronousCompositor);
 
 class LayerTreeHostTestAbortedCommitDoesntStallDisabledVsync
     : public LayerTreeHostTestAbortedCommitDoesntStall {
   void InitializeSettings(LayerTreeSettings* settings) override {
     LayerTreeHostTestAbortedCommitDoesntStall::InitializeSettings(settings);
@@ skipping 339 matching lines @@
     }
     return draw_result;
   }
 
   void SwapBuffersCompleteOnThread(LayerTreeHostImpl* host_impl) override {
     swap_count_++;
     switch (swap_count_) {
       case 1: {
         gfx::Transform identity;
         gfx::Rect empty_rect;
+        host_impl->SetExternalDrawConstraints(empty_rect, identity);
         bool resourceless_software_draw = true;
-        host_impl->SetExternalDrawConstraints(identity, empty_rect, empty_rect,
-                                              empty_rect, identity,
-                                              resourceless_software_draw);
+        host_impl->SetResourcelessSoftwareDrawForTesting(
+            resourceless_software_draw);
         host_impl->SetFullRootLayerDamage();
         host_impl->SetNeedsRedraw();
         break;
       }
       case 2:
         EndTest();
         break;
       default:
         NOTREACHED();
     }
@@ skipping 3922 matching lines @@
     EndTest();
   }
 
   void AfterTest() override {}
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestPaintedDeviceScaleFactor);
 
 }  // namespace
 }  // namespace cc