Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(35)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/trees/layer_tree_host_common_unittest.cc

Issue 634683003: Converted LayerImpl::bounds() to return SizeF. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/trees/damage_tracker_unittest.cc ('k') | cc/trees/layer_tree_host_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_host_common_unittest.cc
diff --git a/cc/trees/layer_tree_host_common_unittest.cc b/cc/trees/layer_tree_host_common_unittest.cc
index 7278b336e0b31376c5cf2781a75faaf97d748a52..7a13f8d76fc068b637462f097bbea532853a650c 100644
--- a/cc/trees/layer_tree_host_common_unittest.cc
+++ b/cc/trees/layer_tree_host_common_unittest.cc
@@ -30,6 +30,7 @@
#include "cc/trees/single_thread_proxy.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/gfx/geometry/size_conversions.h"
#include "ui/gfx/quad_f.h"
#include "ui/gfx/transform.h"
@@ -1158,7 +1159,10 @@ TEST_F(LayerTreeHostCommonTest, TransformAboveRootLayer) {
{
RenderSurfaceLayerList render_surface_layer_list;
LayerTreeHostCommon::CalcDrawPropsMainInputsForTesting inputs(
- root.get(), root->bounds(), translate, &render_surface_layer_list);
+ root.get(),
+ gfx::ToCeiledSize(root->bounds()),
+ translate,
+ &render_surface_layer_list);
inputs.can_adjust_raster_scales = true;
LayerTreeHostCommon::CalculateDrawProperties(&inputs);
EXPECT_EQ(translate, root->draw_properties().target_space_transform);
@@ -1173,7 +1177,10 @@ TEST_F(LayerTreeHostCommonTest, TransformAboveRootLayer) {
{
RenderSurfaceLayerList render_surface_layer_list;
LayerTreeHostCommon::CalcDrawPropsMainInputsForTesting inputs(
- root.get(), root->bounds(), scale, &render_surface_layer_list);
+ root.get(),
+ gfx::ToCeiledSize(root->bounds()),
+ scale,
+ &render_surface_layer_list);
inputs.can_adjust_raster_scales = true;
LayerTreeHostCommon::CalculateDrawProperties(&inputs);
EXPECT_EQ(scale, root->draw_properties().target_space_transform);
@@ -1188,7 +1195,10 @@ TEST_F(LayerTreeHostCommonTest, TransformAboveRootLayer) {
{
RenderSurfaceLayerList render_surface_layer_list;
LayerTreeHostCommon::CalcDrawPropsMainInputsForTesting inputs(
- root.get(), root->bounds(), rotate, &render_surface_layer_list);
+ root.get(),
+ gfx::ToCeiledSize(root->bounds()),
+ rotate,
+ &render_surface_layer_list);
inputs.can_adjust_raster_scales = true;
LayerTreeHostCommon::CalculateDrawProperties(&inputs);
EXPECT_EQ(rotate, root->draw_properties().target_space_transform);
@@ -1205,7 +1215,10 @@ TEST_F(LayerTreeHostCommonTest, TransformAboveRootLayer) {
{
RenderSurfaceLayerList render_surface_layer_list;
LayerTreeHostCommon::CalcDrawPropsMainInputsForTesting inputs(
- root.get(), root->bounds(), composite, &render_surface_layer_list);
+ root.get(),
+ gfx::ToCeiledSize(root->bounds()),
+ composite,
+ &render_surface_layer_list);
inputs.can_adjust_raster_scales = true;
LayerTreeHostCommon::CalculateDrawProperties(&inputs);
EXPECT_EQ(composite, root->draw_properties().target_space_transform);
@@ -1219,7 +1232,10 @@ TEST_F(LayerTreeHostCommonTest, TransformAboveRootLayer) {
{
RenderSurfaceLayerList render_surface_layer_list;
LayerTreeHostCommon::CalcDrawPropsMainInputsForTesting inputs(
- root.get(), root->bounds(), translate, &render_surface_layer_list);
+ root.get(),
+ gfx::ToCeiledSize(root->bounds()),
+ translate,
+ &render_surface_layer_list);
inputs.device_scale_factor = device_scale_factor;
inputs.can_adjust_raster_scales = true;
LayerTreeHostCommon::CalculateDrawProperties(&inputs);
@@ -1241,7 +1257,10 @@ TEST_F(LayerTreeHostCommonTest, TransformAboveRootLayer) {
{
RenderSurfaceLayerList render_surface_layer_list;
LayerTreeHostCommon::CalcDrawPropsMainInputsForTesting inputs(
- root.get(), root->bounds(), translate, &render_surface_layer_list);
+ root.get(),
+ gfx::ToCeiledSize(root->bounds()),
+ translate,
+ &render_surface_layer_list);
inputs.page_scale_factor = page_scale_factor;
inputs.page_scale_application_layer = root.get();
inputs.can_adjust_raster_scales = true;
@@ -1262,7 +1281,10 @@ TEST_F(LayerTreeHostCommonTest, TransformAboveRootLayer) {
{
RenderSurfaceLayerList render_surface_layer_list;
LayerTreeHostCommon::CalcDrawPropsMainInputsForTesting inputs(
- root.get(), root->bounds(), composite, &render_surface_layer_list);
+ root.get(),
+ gfx::ToCeiledSize(root->bounds()),
+ composite,
+ &render_surface_layer_list);
inputs.can_adjust_raster_scales = true;
LayerTreeHostCommon::CalculateDrawProperties(&inputs);
gfx::Transform compositeSquared = composite;
@@ -4471,7 +4493,9 @@ TEST_F(LayerTreeHostCommonTest, ContentsScale) {
{
RenderSurfaceLayerList render_surface_layer_list;
LayerTreeHostCommon::CalcDrawPropsMainInputsForTesting inputs(
- root.get(), root->bounds(), &render_surface_layer_list);
+ root.get(),
+ gfx::ToCeiledSize(root->bounds()),
+ &render_surface_layer_list);
inputs.device_scale_factor = device_scale_factor;
inputs.page_scale_factor = page_scale_factor;
inputs.page_scale_application_layer = root.get();
@@ -4514,7 +4538,9 @@ TEST_F(LayerTreeHostCommonTest, ContentsScale) {
{
RenderSurfaceLayerList render_surface_layer_list;
LayerTreeHostCommon::CalcDrawPropsMainInputsForTesting inputs(
- root.get(), root->bounds(), &render_surface_layer_list);
+ root.get(),
+ gfx::ToCeiledSize(root->bounds()),
+ &render_surface_layer_list);
inputs.device_scale_factor = device_scale_factor;
inputs.page_scale_factor = page_scale_factor;
inputs.page_scale_application_layer = root.get();
@@ -4542,7 +4568,9 @@ TEST_F(LayerTreeHostCommonTest, ContentsScale) {
{
RenderSurfaceLayerList render_surface_layer_list;
LayerTreeHostCommon::CalcDrawPropsMainInputsForTesting inputs(
- root.get(), root->bounds(), &render_surface_layer_list);
+ root.get(),
+ gfx::ToCeiledSize(root->bounds()),
+ &render_surface_layer_list);
inputs.device_scale_factor = device_scale_factor;
inputs.page_scale_factor = page_scale_factor;
inputs.page_scale_application_layer = root.get();
@@ -4567,7 +4595,9 @@ TEST_F(LayerTreeHostCommonTest, ContentsScale) {
{
RenderSurfaceLayerList render_surface_layer_list;
LayerTreeHostCommon::CalcDrawPropsMainInputsForTesting inputs(
- root.get(), root->bounds(), &render_surface_layer_list);
+ root.get(),
+ gfx::ToCeiledSize(root->bounds()),
+ &render_surface_layer_list);
inputs.device_scale_factor = device_scale_factor;
inputs.page_scale_factor = page_scale_factor;
inputs.page_scale_application_layer = root.get();
@@ -4655,7 +4685,9 @@ TEST_F(LayerTreeHostCommonTest,
float page_scale_factor = 1.f;
LayerTreeHostCommon::CalcDrawPropsMainInputsForTesting inputs(
- root.get(), root->bounds(), &render_surface_layer_list);
+ root.get(),
+ gfx::ToCeiledSize(root->bounds()),
+ &render_surface_layer_list);
inputs.device_scale_factor = device_scale_factor;
inputs.page_scale_factor = page_scale_factor;
inputs.page_scale_application_layer = root.get(),
@@ -4737,7 +4769,9 @@ TEST_F(LayerTreeHostCommonTest, SmallContentsScale) {
{
RenderSurfaceLayerList render_surface_layer_list;
LayerTreeHostCommon::CalcDrawPropsMainInputsForTesting inputs(
- root.get(), root->bounds(), &render_surface_layer_list);
+ root.get(),
+ gfx::ToCeiledSize(root->bounds()),
+ &render_surface_layer_list);
inputs.device_scale_factor = device_scale_factor;
inputs.page_scale_factor = page_scale_factor;
inputs.page_scale_application_layer = root.get();
@@ -4763,7 +4797,9 @@ TEST_F(LayerTreeHostCommonTest, SmallContentsScale) {
{
RenderSurfaceLayerList render_surface_layer_list;
LayerTreeHostCommon::CalcDrawPropsMainInputsForTesting inputs(
- root.get(), root->bounds(), &render_surface_layer_list);
+ root.get(),
+ gfx::ToCeiledSize(root->bounds()),
+ &render_surface_layer_list);
inputs.device_scale_factor = device_scale_factor;
inputs.page_scale_factor = page_scale_factor;
inputs.page_scale_application_layer = root.get();
@@ -4884,7 +4920,9 @@ TEST_F(LayerTreeHostCommonTest, ContentsScaleForSurfaces) {
RenderSurfaceLayerList render_surface_layer_list;
LayerTreeHostCommon::CalcDrawPropsMainInputsForTesting inputs(
- root.get(), root->bounds(), &render_surface_layer_list);
+ root.get(),
+ gfx::ToCeiledSize(root->bounds()),
+ &render_surface_layer_list);
inputs.device_scale_factor = device_scale_factor;
inputs.page_scale_factor = page_scale_factor;
inputs.page_scale_application_layer = root.get();
@@ -5085,7 +5123,9 @@ TEST_F(LayerTreeHostCommonTest,
SkMScalar device_scale_factor = 5.0;
SkMScalar page_scale_factor = 7.0;
LayerTreeHostCommon::CalcDrawPropsMainInputsForTesting inputs(
- root.get(), root->bounds(), &render_surface_layer_list);
+ root.get(),
+ gfx::ToCeiledSize(root->bounds()),
+ &render_surface_layer_list);
inputs.device_scale_factor = device_scale_factor;
inputs.page_scale_factor = page_scale_factor;
inputs.page_scale_application_layer = root.get();
@@ -5230,7 +5270,9 @@ TEST_F(LayerTreeHostCommonTest, ContentsScaleForAnimatingLayer) {
{
RenderSurfaceLayerList render_surface_layer_list;
LayerTreeHostCommon::CalcDrawPropsMainInputsForTesting inputs(
- root.get(), root->bounds(), &render_surface_layer_list);
+ root.get(),
+ gfx::ToCeiledSize(root->bounds()),
+ &render_surface_layer_list);
inputs.can_adjust_raster_scales = true;
LayerTreeHostCommon::CalculateDrawProperties(&inputs);
@@ -5246,7 +5288,9 @@ TEST_F(LayerTreeHostCommonTest, ContentsScaleForAnimatingLayer) {
{
RenderSurfaceLayerList render_surface_layer_list;
LayerTreeHostCommon::CalcDrawPropsMainInputsForTesting inputs(
- root.get(), root->bounds(), &render_surface_layer_list);
+ root.get(),
+ gfx::ToCeiledSize(root->bounds()),
+ &render_surface_layer_list);
inputs.can_adjust_raster_scales = true;
LayerTreeHostCommon::CalculateDrawProperties(&inputs);
@@ -5657,7 +5701,9 @@ TEST_F(LayerTreeHostCommonTest, OpacityAnimatingOnPendingTree) {
LayerImplList render_surface_layer_list;
LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
- root.get(), root->bounds(), &render_surface_layer_list);
+ root.get(),
+ gfx::ToCeiledSize(root->bounds()),
+ &render_surface_layer_list);
inputs.can_adjust_raster_scales = true;
LayerTreeHostCommon::CalculateDrawProperties(&inputs);
@@ -5867,7 +5913,9 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHidden_SingleLayer) {
RenderSurfaceLayerList render_surface_layer_list;
LayerTreeHostCommon::CalcDrawPropsMainInputsForTesting inputs(
- root.get(), root->bounds(), &render_surface_layer_list);
+ root.get(),
+ gfx::ToCeiledSize(root->bounds()),
+ &render_surface_layer_list);
inputs.can_adjust_raster_scales = true;
LayerTreeHostCommon::CalculateDrawProperties(&inputs);
@@ -5923,7 +5971,9 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHidden_SingleLayerImpl) {
LayerImplList render_surface_layer_list;
LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
- root.get(), root->bounds(), &render_surface_layer_list);
+ root.get(),
+ gfx::ToCeiledSize(root->bounds()),
+ &render_surface_layer_list);
inputs.can_adjust_raster_scales = true;
LayerTreeHostCommon::CalculateDrawProperties(&inputs);
@@ -5981,7 +6031,9 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHidden_TwoLayers) {
RenderSurfaceLayerList render_surface_layer_list;
LayerTreeHostCommon::CalcDrawPropsMainInputsForTesting inputs(
- root.get(), root->bounds(), &render_surface_layer_list);
+ root.get(),
+ gfx::ToCeiledSize(root->bounds()),
+ &render_surface_layer_list);
inputs.can_adjust_raster_scales = true;
LayerTreeHostCommon::CalculateDrawProperties(&inputs);
@@ -6036,7 +6088,9 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHidden_TwoLayersImpl) {
LayerImplList render_surface_layer_list;
LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
- root.get(), root->bounds(), &render_surface_layer_list);
+ root.get(),
+ gfx::ToCeiledSize(root->bounds()),
+ &render_surface_layer_list);
inputs.can_adjust_raster_scales = true;
LayerTreeHostCommon::CalculateDrawProperties(&inputs);
@@ -6148,7 +6202,9 @@ TEST_F(LayerTreeHostCommonTest, SubtreeHiddenWithCopyRequest) {
RenderSurfaceLayerList render_surface_layer_list;
LayerTreeHostCommon::CalcDrawPropsMainInputsForTesting inputs(
- root.get(), root->bounds(), &render_surface_layer_list);
+ root.get(),
+ gfx::ToCeiledSize(root->bounds()),
+ &render_surface_layer_list);
inputs.can_adjust_raster_scales = true;
LayerTreeHostCommon::CalculateDrawProperties(&inputs);
@@ -6257,7 +6313,9 @@ TEST_F(LayerTreeHostCommonTest, ClippedOutCopyRequest) {
RenderSurfaceLayerList render_surface_layer_list;
LayerTreeHostCommon::CalcDrawPropsMainInputsForTesting inputs(
- root.get(), root->bounds(), &render_surface_layer_list);
+ root.get(),
+ gfx::ToCeiledSize(root->bounds()),
+ &render_surface_layer_list);
inputs.can_adjust_raster_scales = true;
LayerTreeHostCommon::CalculateDrawProperties(&inputs);
@@ -6317,7 +6375,9 @@ TEST_F(LayerTreeHostCommonTest, VisibleContentRectInsideSurface) {
RenderSurfaceLayerList render_surface_layer_list;
LayerTreeHostCommon::CalcDrawPropsMainInputsForTesting inputs(
- root.get(), root->bounds(), &render_surface_layer_list);
+ root.get(),
+ gfx::ToCeiledSize(root->bounds()),
+ &render_surface_layer_list);
inputs.can_adjust_raster_scales = true;
LayerTreeHostCommon::CalculateDrawProperties(&inputs);
@@ -6946,7 +7006,9 @@ TEST_F(LayerTreeHostCommonTest, CanRenderToSeparateSurface) {
LayerImplList render_surface_layer_list;
FakeLayerTreeHostImpl::RecursiveUpdateNumChildren(root.get());
LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
- root.get(), root->bounds(), &render_surface_layer_list);
+ root.get(),
+ gfx::ToCeiledSize(root->bounds()),
+ &render_surface_layer_list);
inputs.can_render_to_separate_surface = true;
LayerTreeHostCommon::CalculateDrawProperties(&inputs);
@@ -6956,7 +7018,9 @@ TEST_F(LayerTreeHostCommonTest, CanRenderToSeparateSurface) {
{
LayerImplList render_surface_layer_list;
LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
- root.get(), root->bounds(), &render_surface_layer_list);
+ root.get(),
+ gfx::ToCeiledSize(root->bounds()),
+ &render_surface_layer_list);
inputs.can_render_to_separate_surface = false;
LayerTreeHostCommon::CalculateDrawProperties(&inputs);
@@ -7501,7 +7565,7 @@ TEST_F(LayerTreeHostCommonTest, OutOfOrderClippingRequiresRSLLSorting) {
RenderSurfaceLayerList render_surface_layer_list;
LayerTreeHostCommon::CalcDrawPropsMainInputsForTesting inputs(
root.get(),
- root->bounds(),
+ gfx::ToCeiledSize(root->bounds()),
identity_transform,
&render_surface_layer_list);
@@ -7637,7 +7701,9 @@ TEST_F(LayerTreeHostCommonTest, DoNotClobberSorting) {
LayerImplList render_surface_layer_list;
LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
- root.get(), root->bounds(), &render_surface_layer_list);
+ root.get(),
+ gfx::ToCeiledSize(root->bounds()),
+ &render_surface_layer_list);
LayerTreeHostCommon::CalculateDrawProperties(&inputs);
@@ -7732,7 +7798,9 @@ TEST_F(LayerTreeHostCommonTest, ScrollCompensationWithRounding) {
LayerImplList render_surface_layer_list;
LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
- root.get(), root->bounds(), &render_surface_layer_list);
+ root.get(),
+ gfx::ToCeiledSize(root->bounds()),
+ &render_surface_layer_list);
LayerTreeHostCommon::CalculateDrawProperties(&inputs);
EXPECT_TRANSFORMATION_MATRIX_EQ(
@@ -7755,7 +7823,9 @@ TEST_F(LayerTreeHostCommonTest, ScrollCompensationWithRounding) {
LayerImplList render_surface_layer_list;
LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
- root.get(), root->bounds(), &render_surface_layer_list);
+ root.get(),
+ gfx::ToCeiledSize(root->bounds()),
+ &render_surface_layer_list);
LayerTreeHostCommon::CalculateDrawProperties(&inputs);
EXPECT_TRANSFORMATION_MATRIX_EQ(
@@ -7780,7 +7850,9 @@ TEST_F(LayerTreeHostCommonTest, ScrollCompensationWithRounding) {
LayerImplList render_surface_layer_list;
LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
- root.get(), root->bounds(), &render_surface_layer_list);
+ root.get(),
+ gfx::ToCeiledSize(root->bounds()),
+ &render_surface_layer_list);
LayerTreeHostCommon::CalculateDrawProperties(&inputs);
EXPECT_TRANSFORMATION_MATRIX_EQ(
@@ -7804,7 +7876,9 @@ TEST_F(LayerTreeHostCommonTest, ScrollCompensationWithRounding) {
LayerImplList render_surface_layer_list;
LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
- root.get(), root->bounds(), &render_surface_layer_list);
+ root.get(),
+ gfx::ToCeiledSize(root->bounds()),
+ &render_surface_layer_list);
LayerTreeHostCommon::CalculateDrawProperties(&inputs);
EXPECT_VECTOR_EQ(
« no previous file with comments | « cc/trees/damage_tracker_unittest.cc ('k') | cc/trees/layer_tree_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698