float contents_scale_x;
float contents_scale_y;
gfx::Size content_bounds;
- layer->CalculateContentsScale(2.f, 3.f, 4.f, false,
- &contents_scale_x, &contents_scale_y,
+ layer->CalculateContentsScale(2.f,
+ 3.f,
+ 4.f,
+ 1.f,
+ false,
+ &contents_scale_x,
+ &contents_scale_y,
&content_bounds);
EXPECT_FLOAT_EQ(1.f, contents_scale_x);
EXPECT_FLOAT_EQ(1.f, contents_scale_y);
float contents_scale_x;
float contents_scale_y;
gfx::Size content_bounds;
- layer->CalculateContentsScale(2.f, 3.f, 4.f, false,
- &contents_scale_x, &contents_scale_y,
+ layer->CalculateContentsScale(2.f,
+ 3.f,
+ 4.f,
+ 1.f,
+ false,
+ &contents_scale_x,
+ &contents_scale_y,
&content_bounds);
layer->UpdateTilePriorities();
const float suggested_ideal_contents_scale = 2.f;
const float device_scale_factor = 3.f;
const float page_scale_factor = 4.f;
+ const float maximum_animation_contents_scale = 1.f;
const bool animating_transform_to_screen = false;
float contents_scale_x;
float contents_scale_y;
pending_layer->CalculateContentsScale(suggested_ideal_contents_scale,
device_scale_factor,
page_scale_factor,
+ maximum_animation_contents_scale,
animating_transform_to_screen,
&contents_scale_x,
&contents_scale_y,
active_layer->CalculateContentsScale(suggested_ideal_contents_scale,
device_scale_factor,
page_scale_factor,
+ maximum_animation_contents_scale,
animating_transform_to_screen,
&contents_scale_x,
&contents_scale_y,
// Create tile and resource.
active_layer->tilings()->tiling_at(0)->CreateAllTilesForTesting();
host_impl_.tile_manager()->InitializeTilesWithResourcesForTesting(
- active_layer->tilings()->tiling_at(0)->AllTilesForTesting(),
- host_impl_.resource_provider());
+ active_layer->tilings()->tiling_at(0)->AllTilesForTesting());
// Draw.
active_layer->draw_properties().visible_content_rect =