cc: Use a struct for CalcDrawProps inputs

cc: Use a struct for CalcDrawProps inputs

This is just a refactoring and should not change any behavior.

[email protected]
BUG=none

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=213493

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=213841

[danakj, 2013-07-23 22:14:23]

https://codereview.chromium.org/19935003/diff/1/cc/trees/layer_tree_host_comm...
File cc/trees/layer_tree_host_common.h (right):

https://codereview.chromium.org/19935003/diff/1/cc/trees/layer_tree_host_comm...
cc/trees/layer_tree_host_common.h:188: std::numeric_limits<int>::max(), false,
false,
max() is bad (see ResourceProvider in software mode for an example) cuz it's
easy to hit overflow or something randomly.

Can you use max() / 2 here instead or something like that?

https://codereview.chromium.org/19935003/diff/1/cc/trees/layer_tree_host_comm...
File cc/trees/layer_tree_host_common_unittest.cc (left):

https://codereview.chromium.org/19935003/diff/1/cc/trees/layer_tree_host_comm...
cc/trees/layer_tree_host_common_unittest.cc:1781: true,  //
can_adjust_raster_scale
Did you mean to make can_adjust_raster_scale = false here?

https://codereview.chromium.org/19935003/diff/4001/cc/trees/layer_tree_host_c...
File cc/trees/layer_tree_host_common.h (right):

https://codereview.chromium.org/19935003/diff/4001/cc/trees/layer_tree_host_c...
cc/trees/layer_tree_host_common.h:49: CalcDrawPropsInputsForTesting(
Can we drop this constructor?

[enne (OOO), 2013-07-23 22:22:36]

https://codereview.chromium.org/19935003/diff/1/cc/trees/layer_tree_host_comm...
File cc/trees/layer_tree_host_common.h (right):

https://codereview.chromium.org/19935003/diff/1/cc/trees/layer_tree_host_comm...
cc/trees/layer_tree_host_common.h:188: std::numeric_limits<int>::max(), false,
false,
On 2013/07/23 22:14:24, danakj wrote:
> max() is bad (see ResourceProvider in software mode for an example) cuz it's
> easy to hit overflow or something randomly.
> 
> Can you use max() / 2 here instead or something like that?

Done.

https://codereview.chromium.org/19935003/diff/1/cc/trees/layer_tree_host_comm...
File cc/trees/layer_tree_host_common_unittest.cc (left):

https://codereview.chromium.org/19935003/diff/1/cc/trees/layer_tree_host_comm...
cc/trees/layer_tree_host_common_unittest.cc:1781: true,  //
can_adjust_raster_scale
On 2013/07/23 22:14:24, danakj wrote:
> Did you mean to make can_adjust_raster_scale = false here?

Nope.  Good catch.

I do plan to submit a followup patch to remove most of these
can_adjust_raster_scales = true.  I don't think they're needed except in a few
tests.

https://codereview.chromium.org/19935003/diff/4001/cc/trees/layer_tree_host_c...
File cc/trees/layer_tree_host_common.h (right):

https://codereview.chromium.org/19935003/diff/4001/cc/trees/layer_tree_host_c...
cc/trees/layer_tree_host_common.h:49: CalcDrawPropsInputsForTesting(
On 2013/07/23 22:14:24, danakj wrote:
> Can we drop this constructor?

It's used ~6 times in layer_tree_host_common_unittest.cc.

[danakj, 2013-07-23 22:36:40]

LGTM!

https://codereview.chromium.org/19935003/diff/4001/cc/trees/layer_tree_host_c...
File cc/trees/layer_tree_host_common.h (right):

https://codereview.chromium.org/19935003/diff/4001/cc/trees/layer_tree_host_c...
cc/trees/layer_tree_host_common.h:49: CalcDrawPropsInputsForTesting(
On 2013/07/23 22:22:36, enne wrote:
> On 2013/07/23 22:14:24, danakj wrote:
> > Can we drop this constructor?
> 
> It's used ~6 times in layer_tree_host_common_unittest.cc.

Oh, I guess they can't easily be like inputs.device_transform = blah;

https://codereview.chromium.org/19935003/diff/4001/cc/trees/layer_tree_host_c...
cc/trees/layer_tree_host_common.h:60: gfx::Transform identity_transform_;
nit: static const?

[enne (OOO), 2013-07-23 22:40:46]

https://codereview.chromium.org/19935003/diff/4001/cc/trees/layer_tree_host_c...
File cc/trees/layer_tree_host_common.h (right):

https://codereview.chromium.org/19935003/diff/4001/cc/trees/layer_tree_host_c...
cc/trees/layer_tree_host_common.h:49: CalcDrawPropsInputsForTesting(
On 2013/07/23 22:36:40, danakj wrote:
> On 2013/07/23 22:22:36, enne wrote:
> > On 2013/07/23 22:14:24, danakj wrote:
> > > Can we drop this constructor?
> > 
> > It's used ~6 times in layer_tree_host_common_unittest.cc.
> 
> Oh, I guess they can't easily be like inputs.device_transform = blah;

Yeah, that's exactly it.

https://codereview.chromium.org/19935003/diff/4001/cc/trees/layer_tree_host_c...
cc/trees/layer_tree_host_common.h:60: gfx::Transform identity_transform_;
On 2013/07/23 22:36:40, danakj wrote:
> nit: static const?

Boo, statics.

[danakj, 2013-07-23 22:41:53]

https://codereview.chromium.org/19935003/diff/4001/cc/trees/layer_tree_host_c...
File cc/trees/layer_tree_host_common.h (right):

https://codereview.chromium.org/19935003/diff/4001/cc/trees/layer_tree_host_c...
cc/trees/layer_tree_host_common.h:60: gfx::Transform identity_transform_;
On 2013/07/23 22:40:46, enne wrote:
> On 2013/07/23 22:36:40, danakj wrote:
> > nit: static const?
> 
> Boo, statics.

Actually, static is probably worse since this file is part of prod. Just const.

[enne (OOO), 2013-07-23 22:44:29]

https://codereview.chromium.org/19935003/diff/4001/cc/trees/layer_tree_host_c...
File cc/trees/layer_tree_host_common.h (right):

https://codereview.chromium.org/19935003/diff/4001/cc/trees/layer_tree_host_c...
cc/trees/layer_tree_host_common.h:60: gfx::Transform identity_transform_;
On 2013/07/23 22:41:53, danakj wrote:
> On 2013/07/23 22:40:46, enne wrote:
> > On 2013/07/23 22:36:40, danakj wrote:
> > > nit: static const?
> > 
> > Boo, statics.
> 
> Actually, static is probably worse since this file is part of prod. Just
const.

Done.

[commit-bot: I haz the power, 2013-07-23 22:55:28]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/19935003/26002

[commit-bot: I haz the power, 2013-07-23 23:19:55]

Sorry for I got bad news for ya.
Compile failed with a clobber build on linux_aura.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_aura...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2013-07-23 23:23:28]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/19935003/48001

[commit-bot: I haz the power, 2013-07-24 03:53:53]

Retried try job too often on win_rel for step(s) browser_tests,
chrome_frame_net_tests, chrome_frame_tests, chrome_frame_unittests,
content_browsertests, mini_installer_test, nacl_integration,
sync_integration_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...

[commit-bot: I haz the power, 2013-07-24 15:08:52]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/19935003/48001

[commit-bot: I haz the power, 2013-07-24 15:08:55]

Failed to apply patch for cc/trees/layer_tree_host_common.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file cc/trees/layer_tree_host_common.cc
  Hunk #1 FAILED at 1586.
  Hunk #2 FAILED at 1642.
  Hunk #3 succeeded at 1716 (offset 11 lines).
  2 out of 3 hunks FAILED -- saving rejects to file
cc/trees/layer_tree_host_common.cc.rej

Patch:       cc/trees/layer_tree_host_common.cc
Index: cc/trees/layer_tree_host_common.cc
diff --git a/cc/trees/layer_tree_host_common.cc
b/cc/trees/layer_tree_host_common.cc
index
50a2d3937968a011af974d1a88db8812435fa90b..3ad6b640b15eada3cb905b333aa76ce6dd49dfda
100644
--- a/cc/trees/layer_tree_host_common.cc
+++ b/cc/trees/layer_tree_host_common.cc
@@ -1586,55 +1586,47 @@ static void CalculateDrawPropertiesInternal(
 }
 
 void LayerTreeHostCommon::CalculateDrawProperties(
-    Layer* root_layer,
-    gfx::Size device_viewport_size,
-    const gfx::Transform& device_transform,
-    float device_scale_factor,
-    float page_scale_factor,
-    Layer* page_scale_application_layer,
-    int max_texture_size,
-    bool can_use_lcd_text,
-    bool can_adjust_raster_scales,
-    RenderSurfaceLayerList* render_surface_layer_list) {
+    CalcDrawPropsMainInputs* inputs) {
+  DCHECK(inputs->root_layer);
+  DCHECK(IsRootLayer(inputs->root_layer));
+  DCHECK(inputs->render_surface_layer_list);
   gfx::Rect total_drawable_content_rect;
   gfx::Transform identity_matrix;
-  gfx::Transform scaled_device_transform = device_transform;
-  scaled_device_transform.Scale(device_scale_factor, device_scale_factor);
+  gfx::Transform scaled_device_transform = inputs->device_transform;
+  scaled_device_transform.Scale(inputs->device_scale_factor,
+                                inputs->device_scale_factor);
   RenderSurfaceLayerList dummy_layer_list;
 
   // The root layer's render_surface should receive the device viewport as the
   // initial clip rect.
   bool subtree_should_be_clipped = true;
-  gfx::Rect device_viewport_rect(device_viewport_size);
+  gfx::Rect device_viewport_rect(inputs->device_viewport_size);
   bool in_subtree_of_page_scale_application_layer = false;
   bool subtree_is_visible = true;
 
-  // This function should have received a root layer.
-  DCHECK(IsRootLayer(root_layer));
-
   PreCalculateMetaInformationRecursiveData recursive_data;
-  PreCalculateMetaInformation(root_layer, &recursive_data);
+  PreCalculateMetaInformation(inputs->root_layer, &recursive_data);
 
   CalculateDrawPropertiesInternal<Layer, RenderSurfaceLayerList,
RenderSurface>(
-      root_layer,
+      inputs->root_layer,
       scaled_device_transform,
       identity_matrix,
       identity_matrix,
-      root_layer,
+      inputs->root_layer,
       device_viewport_rect,
       device_viewport_rect,
       subtree_should_be_clipped,
       NULL,
-      render_surface_layer_list,
+      inputs->render_surface_layer_list,
       &dummy_layer_list,
       NULL,
-      max_texture_size,
-      device_scale_factor,
-      page_scale_factor,
-      page_scale_application_layer,
+      inputs->max_texture_size,
+      inputs->device_scale_factor,
+      inputs->page_scale_factor,
+      inputs->page_scale_application_layer,
       in_subtree_of_page_scale_application_layer,
-      can_use_lcd_text,
-      can_adjust_raster_scales,
+      inputs->can_use_lcd_text,
+      inputs->can_adjust_raster_scales,
       subtree_is_visible,
       &total_drawable_content_rect);
 
@@ -1642,62 +1634,53 @@ void LayerTreeHostCommon::CalculateDrawProperties(
   DCHECK_EQ(0u, dummy_layer_list.size());
   // A root layer render_surface should always exist after
   // CalculateDrawProperties.
-  DCHECK(root_layer->render_surface());
+  DCHECK(inputs->root_layer->render_surface());
 }
 
 void LayerTreeHostCommon::CalculateDrawProperties(
-    LayerImpl* root_layer,
-    gfx::Size device_viewport_size,
-    const gfx::Transform& device_transform,
-    float device_scale_factor,
-    float page_scale_factor,
-    LayerImpl* page_scale_application_layer,
-    int max_texture_size,
-    bool can_use_lcd_text,
-    bool can_adjust_raster_scales,
-    LayerImplList* render_surface_layer_list) {
+    CalcDrawPropsImplInputs* inputs) {
+  DCHECK(inputs->root_layer);
+  DCHECK(IsRootLayer(inputs->root_layer));
+  DCHECK(inputs->render_surface_layer_list);
+
   gfx::Rect total_drawable_content_rect;
   gfx::Transform identity_matrix;
-  gfx::Transform scaled_device_transform = device_transform;
-  scaled_device_transform.Scale(device_scale_factor, device_scale_factor);
+  gfx::Transform scaled_device_transform = inputs->device_transform;
+  scaled_device_transform.Scale(inputs->device_scale_factor,
+                                inputs->device_scale_factor);
   LayerImplList dummy_layer_list;
   LayerSorter layer_sorter;
 
   // The root layer's render_surface should receive the device viewport as the
   // initial clip rect.
   bool subtree_should_be_clipped = true;
-  gfx::Rect device_viewport_rect(device_viewport_size);
+  gfx::Rect device_viewport_rect(inputs->device_viewport_size);
   bool in_subtree_of_page_scale_application_layer = false;
   bool subtree_is_visible = true;
 
-  // This function should have received a root layer.
-  DCHECK(IsRootLayer(root_layer));
-
   PreCalculateMetaInformationRecursiveData recursive_data;
-  PreCalculateMetaInformation(root_layer, &recursive_data);
+  PreCalculateMetaInformation(inputs->root_layer, &recursive_data);
 
-  CalculateDrawPropertiesInternal<LayerImpl,
-                                  LayerImplList,
-                                  RenderSurfaceImpl>(
-      root_layer,
+  CalculateDrawPropertiesInternal<LayerImpl, LayerImplList, RenderSurfaceImpl>(
+      inputs->root_layer,
       scaled_device_transform,
       identity_matrix,
       identity_matrix,
-      root_layer,
+      inputs->root_layer,
       device_viewport_rect,
       device_viewport_rect,
       subtree_should_be_clipped,
       NULL,
-      render_surface_layer_list,
+      inputs->render_surface_layer_list,
       &dummy_layer_list,
       &layer_sorter,
-      max_texture_size,
-      device_scale_factor,
-      page_scale_factor,
-      page_scale_application_layer,
+      inputs->max_texture_size,
+      inputs->device_scale_factor,
+      inputs->page_scale_factor,
+      inputs->page_scale_application_layer,
       in_subtree_of_page_scale_application_layer,
-      can_use_lcd_text,
-      can_adjust_raster_scales,
+      inputs->can_use_lcd_text,
+      inputs->can_adjust_raster_scales,
       subtree_is_visible,
       &total_drawable_content_rect);
 
@@ -1705,7 +1688,7 @@ void LayerTreeHostCommon::CalculateDrawProperties(
   DCHECK_EQ(0u, dummy_layer_list.size());
   // A root layer render_surface should always exist after
   // CalculateDrawProperties.
-  DCHECK(root_layer->render_surface());
+  DCHECK(inputs->root_layer->render_surface());
 }
 
 static bool PointHitsRect(

[commit-bot: I haz the power, 2013-07-24 17:04:33]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/19935003/64001

[commit-bot: I haz the power, 2013-07-24 19:46:38]

Change committed as 213493

[commit-bot: I haz the power, 2013-07-24 20:59:27]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/19935003/80001

[commit-bot: I haz the power, 2013-07-25 13:40:01]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/19935003/80001

[commit-bot: I haz the power, 2013-07-26 01:34:22]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/19935003/80001

[commit-bot: I haz the power, 2013-07-26 11:25:55]

Change committed as 213841