diff options
Diffstat (limited to 'cc')
33 files changed, 120 insertions, 131 deletions
diff --git a/cc/base/math_util.h b/cc/base/math_util.h index 6512bb4..a83ab4f 100644 --- a/cc/base/math_util.h +++ b/cc/base/math_util.h @@ -30,6 +30,7 @@ namespace gfx { class QuadF; class Rect; class RectF; +class SizeF; class Transform; class Vector2dF; class Vector2d; diff --git a/cc/blink/web_layer_impl_fixed_bounds_unittest.cc b/cc/blink/web_layer_impl_fixed_bounds_unittest.cc index b72365c..65433fe 100644 --- a/cc/blink/web_layer_impl_fixed_bounds_unittest.cc +++ b/cc/blink/web_layer_impl_fixed_bounds_unittest.cc @@ -68,10 +68,10 @@ TEST(WebLayerImplFixedBoundsTest, BoundsScaleSimple) { } void ExpectEqualLayerRectsInTarget(cc::Layer* layer1, cc::Layer* layer2) { - gfx::RectF layer1_rect_in_target(layer1->bounds()); + gfx::RectF layer1_rect_in_target(gfx::SizeF(layer1->bounds())); layer1->draw_transform().TransformRect(&layer1_rect_in_target); - gfx::RectF layer2_rect_in_target(layer2->bounds()); + gfx::RectF layer2_rect_in_target(gfx::SizeF(layer2->bounds())); layer2->draw_transform().TransformRect(&layer2_rect_in_target); EXPECT_FLOAT_RECT_EQ(layer1_rect_in_target, layer2_rect_in_target); diff --git a/cc/input/input_handler.h b/cc/input/input_handler.h index 51db013..4696fb5 100644 --- a/cc/input/input_handler.h +++ b/cc/input/input_handler.h @@ -16,6 +16,7 @@ namespace gfx { class Point; class PointF; class ScrollOffset; +class SizeF; class Vector2d; class Vector2dF; } diff --git a/cc/input/page_scale_animation.cc b/cc/input/page_scale_animation.cc index 111502b..1e29544 100644 --- a/cc/input/page_scale_animation.cc +++ b/cc/input/page_scale_animation.cc @@ -147,7 +147,7 @@ void PageScaleAnimation::InferTargetAnchorFromScrollOffsets() { void PageScaleAnimation::ClampTargetScrollOffset() { gfx::Vector2dF max_scroll_offset = gfx::RectF(root_layer_size_).bottom_right() - - gfx::RectF(TargetViewportSize()).bottom_right(); + gfx::RectF(gfx::SizeF(TargetViewportSize())).bottom_right(); target_scroll_offset_.SetToMax(gfx::Vector2dF()); target_scroll_offset_.SetToMin(max_scroll_offset); } diff --git a/cc/input/page_scale_animation.h b/cc/input/page_scale_animation.h index 0e430c2..d73116c 100644 --- a/cc/input/page_scale_animation.h +++ b/cc/input/page_scale_animation.h @@ -9,7 +9,7 @@ #include "base/memory/scoped_ptr.h" #include "base/time/time.h" #include "cc/base/cc_export.h" -#include "ui/gfx/geometry/size.h" +#include "ui/gfx/geometry/size_f.h" #include "ui/gfx/geometry/vector2d.h" #include "ui/gfx/geometry/vector2d_f.h" diff --git a/cc/layers/heads_up_display_layer_impl.cc b/cc/layers/heads_up_display_layer_impl.cc index 4964522..1f76509 100644 --- a/cc/layers/heads_up_display_layer_impl.cc +++ b/cc/layers/heads_up_display_layer_impl.cc @@ -132,7 +132,7 @@ bool HeadsUpDisplayLayerImpl::WillDraw(DrawMode draw_mode, internal_contents_scale_ = GetIdealContentsScale(); internal_content_bounds_ = - gfx::ToCeiledSize(gfx::ScaleSize(bounds(), internal_contents_scale_)); + gfx::ScaleToCeiledSize(bounds(), internal_contents_scale_); ReleaseUnmatchedSizeResources(resource_provider); AcquireResource(resource_provider); diff --git a/cc/layers/layer.cc b/cc/layers/layer.cc index 62362f5..2185fd6 100644 --- a/cc/layers/layer.cc +++ b/cc/layers/layer.cc @@ -357,7 +357,7 @@ void Layer::SetBounds(const gfx::Size& size) { if (ClipNode* clip_node = layer_tree_host_->property_trees()->clip_tree.Node( clip_tree_index())) { if (clip_node->owner_id == id()) { - clip_node->data.clip.set_size(size); + clip_node->data.clip.set_size(gfx::SizeF(size)); layer_tree_host_->property_trees()->clip_tree.set_needs_update(true); } } diff --git a/cc/layers/layer_impl.cc b/cc/layers/layer_impl.cc index 49eaf8c..9d4f6ac 100644 --- a/cc/layers/layer_impl.cc +++ b/cc/layers/layer_impl.cc @@ -325,7 +325,7 @@ void LayerImpl::PopulateScaledSharedQuadState(SharedQuadState* state, gfx::Transform scaled_draw_transform = draw_properties_.target_space_transform; scaled_draw_transform.Scale(SK_MScalar1 / scale, SK_MScalar1 / scale); - gfx::Size scaled_bounds = gfx::ToCeiledSize(gfx::ScaleSize(bounds(), scale)); + gfx::Size scaled_bounds = gfx::ScaleToCeiledSize(bounds(), scale); gfx::Rect scaled_visible_layer_rect = gfx::ScaleToEnclosingRect(visible_layer_rect(), scale); scaled_visible_layer_rect.Intersect(gfx::Rect(scaled_bounds)); @@ -984,8 +984,8 @@ void LayerImpl::SetBoundsDelta(const gfx::Vector2dF& bounds_delta) { layer_tree_impl()->property_trees()->clip_tree.Node(clip_tree_index()); if (clip_node) { DCHECK(id() == clip_node->owner_id); - clip_node->data.clip = - gfx::RectF(gfx::PointF() + offset_to_transform_parent(), bounds()); + clip_node->data.clip = gfx::RectF( + gfx::PointF() + offset_to_transform_parent(), gfx::SizeF(bounds())); layer_tree_impl()->property_trees()->clip_tree.set_needs_update(true); } @@ -1528,8 +1528,9 @@ gfx::ScrollOffset LayerImpl::MaxScrollOffset() const { } gfx::SizeF scaled_scroll_bounds = - gfx::ToFlooredSize(gfx::ScaleSize(BoundsForScrolling(), scale_factor)); - scaled_scroll_bounds = gfx::ToFlooredSize(scaled_scroll_bounds); + gfx::ScaleSize(BoundsForScrolling(), scale_factor); + scaled_scroll_bounds.SetSize(std::floor(scaled_scroll_bounds.width()), + std::floor(scaled_scroll_bounds.height())); gfx::ScrollOffset max_offset( scaled_scroll_bounds.width() - scroll_clip_layer_->bounds().width(), @@ -1902,7 +1903,7 @@ gfx::Rect LayerImpl::GetScaledEnclosingRectInTargetSpace(float scale) const { gfx::Transform scaled_draw_transform = draw_properties_.target_space_transform; scaled_draw_transform.Scale(SK_MScalar1 / scale, SK_MScalar1 / scale); - gfx::Size scaled_bounds = gfx::ToCeiledSize(gfx::ScaleSize(bounds(), scale)); + gfx::Size scaled_bounds = gfx::ScaleToCeiledSize(bounds(), scale); return MathUtil::MapEnclosingClippedRect(scaled_draw_transform, gfx::Rect(scaled_bounds)); } diff --git a/cc/layers/painted_scrollbar_layer.cc b/cc/layers/painted_scrollbar_layer.cc index f537ffc..937c5c2 100644 --- a/cc/layers/painted_scrollbar_layer.cc +++ b/cc/layers/painted_scrollbar_layer.cc @@ -94,7 +94,7 @@ float PaintedScrollbarLayer::ClampScaleToMaxTextureSize(float scale) { // If the scaled bounds() is bigger than the max texture size of the // device, we need to clamp it by rescaling, since this is used // below to set the texture size. - gfx::Size scaled_bounds = gfx::ToCeiledSize(gfx::ScaleSize(bounds(), scale)); + gfx::Size scaled_bounds = gfx::ScaleToCeiledSize(bounds(), scale); if (scaled_bounds.width() > MaxTextureSize() || scaled_bounds.height() > MaxTextureSize()) { if (scaled_bounds.width() > scaled_bounds.height()) @@ -218,9 +218,9 @@ void PaintedScrollbarLayer::UpdateInternalContentScale() { bool changed = false; changed |= UpdateProperty(ClampScaleToMaxTextureSize(scale), &internal_contents_scale_); - changed |= UpdateProperty( - gfx::ToCeiledSize(gfx::ScaleSize(bounds(), internal_contents_scale_)), - &internal_content_bounds_); + changed |= + UpdateProperty(gfx::ScaleToCeiledSize(bounds(), internal_contents_scale_), + &internal_content_bounds_); if (changed) { // If the content scale or bounds change, repaint. SetNeedsDisplay(); diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc index b7b6b82..a550968 100644 --- a/cc/layers/picture_layer_impl.cc +++ b/cc/layers/picture_layer_impl.cc @@ -197,7 +197,7 @@ void PictureLayerImpl::AppendQuads(RenderPass* render_pass, DCHECK(raster_source_->HasRecordings()); gfx::Rect quad_content_rect = shared_quad_state->visible_quad_layer_rect; gfx::Size texture_size = quad_content_rect.size(); - gfx::RectF texture_rect = gfx::RectF(texture_size); + gfx::RectF texture_rect = gfx::RectF(gfx::SizeF(texture_size)); PictureDrawQuad* quad = render_pass->CreateAndAppendDrawQuad<PictureDrawQuad>(); @@ -980,8 +980,8 @@ void PictureLayerImpl::RecalculateRasterScales() { float maximum_scale = draw_properties().maximum_animation_contents_scale; float starting_scale = draw_properties().starting_animation_contents_scale; if (maximum_scale) { - gfx::Size bounds_at_maximum_scale = gfx::ToCeiledSize( - gfx::ScaleSize(raster_source_->GetSize(), maximum_scale)); + gfx::Size bounds_at_maximum_scale = + gfx::ScaleToCeiledSize(raster_source_->GetSize(), maximum_scale); int64 maximum_area = static_cast<int64>(bounds_at_maximum_scale.width()) * static_cast<int64>(bounds_at_maximum_scale.height()); gfx::Size viewport = layer_tree_impl()->device_viewport_size(); @@ -991,8 +991,8 @@ void PictureLayerImpl::RecalculateRasterScales() { can_raster_at_maximum_scale = true; } if (starting_scale && starting_scale > maximum_scale) { - gfx::Size bounds_at_starting_scale = gfx::ToCeiledSize( - gfx::ScaleSize(raster_source_->GetSize(), starting_scale)); + gfx::Size bounds_at_starting_scale = + gfx::ScaleToCeiledSize(raster_source_->GetSize(), starting_scale); int64 start_area = static_cast<int64>(bounds_at_starting_scale.width()) * static_cast<int64>(bounds_at_starting_scale.height()); gfx::Size viewport = layer_tree_impl()->device_viewport_size(); @@ -1021,8 +1021,8 @@ void PictureLayerImpl::RecalculateRasterScales() { // If this layer would create zero or one tiles at this content scale, // don't create a low res tiling. - gfx::Size raster_bounds = gfx::ToCeiledSize( - gfx::ScaleSize(raster_source_->GetSize(), raster_contents_scale_)); + gfx::Size raster_bounds = + gfx::ScaleToCeiledSize(raster_source_->GetSize(), raster_contents_scale_); gfx::Size tile_size = CalculateTileSize(raster_bounds); bool tile_covers_bounds = tile_size.width() >= raster_bounds.width() && tile_size.height() >= raster_bounds.height(); diff --git a/cc/layers/picture_layer_impl_unittest.cc b/cc/layers/picture_layer_impl_unittest.cc index 01b993a..2627785 100644 --- a/cc/layers/picture_layer_impl_unittest.cc +++ b/cc/layers/picture_layer_impl_unittest.cc @@ -1500,7 +1500,7 @@ TEST_F(PictureLayerImplTest, ScaledMaskLayer) { active_mask->GetContentsResourceId(&mask_resource_id, &mask_texture_size); EXPECT_NE(0u, mask_resource_id); gfx::Size expected_mask_texture_size = - gfx::ToCeiledSize(gfx::ScaleSize(active_mask->bounds(), 1.3f)); + gfx::ScaleToCeiledSize(active_mask->bounds(), 1.3f); EXPECT_EQ(mask_texture_size, expected_mask_texture_size); } diff --git a/cc/layers/render_surface_impl.cc b/cc/layers/render_surface_impl.cc index c10f697..560c75c 100644 --- a/cc/layers/render_surface_impl.cc +++ b/cc/layers/render_surface_impl.cc @@ -222,9 +222,9 @@ void RenderSurfaceImpl::AppendQuads(RenderPass* render_pass, gfx::Vector2dF owning_layer_draw_scale = MathUtil::ComputeTransform2dScaleComponents( owning_layer_->draw_transform(), 1.f); - gfx::SizeF unclipped_mask_target_size = - gfx::ScaleSize(owning_layer_->bounds(), owning_layer_draw_scale.x(), - owning_layer_draw_scale.y()); + gfx::SizeF unclipped_mask_target_size = gfx::ScaleSize( + gfx::SizeF(owning_layer_->bounds()), owning_layer_draw_scale.x(), + owning_layer_draw_scale.y()); mask_uv_scale = gfx::Vector2dF( content_rect_.width() / unclipped_mask_target_size.width(), content_rect_.height() / unclipped_mask_target_size.height()); diff --git a/cc/layers/viewport.cc b/cc/layers/viewport.cc index 77ebc26..80e711f 100644 --- a/cc/layers/viewport.cc +++ b/cc/layers/viewport.cc @@ -67,8 +67,8 @@ Viewport::ScrollResult Viewport::ScrollBy(const gfx::Vector2dF& delta, } void Viewport::SnapPinchAnchorIfWithinMargin(const gfx::Point& anchor) { - gfx::SizeF viewport_size = - host_impl_->active_tree()->InnerViewportContainerLayer()->bounds(); + gfx::SizeF viewport_size = gfx::SizeF( + host_impl_->active_tree()->InnerViewportContainerLayer()->bounds()); if (anchor.x() < kPinchZoomSnapMarginDips) pinch_anchor_adjustment_.set_x(-anchor.x()); diff --git a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc index 71c79e4..11a4b45 100644 --- a/cc/output/gl_renderer.cc +++ b/cc/output/gl_renderer.cc @@ -854,7 +854,7 @@ skia::RefPtr<SkImage> GLRenderer::ApplyBackgroundFilters( ScopedResource* background_texture) { DCHECK(ShouldApplyBackgroundFilters(quad)); skia::RefPtr<SkImageFilter> filter = RenderSurfaceFilters::BuildImageFilter( - quad->background_filters, background_texture->size()); + quad->background_filters, gfx::SizeF(background_texture->size())); skia::RefPtr<SkImage> background_with_filters = ApplyImageFilter( ScopedUseGrContext::Create(this, frame), resource_provider_, quad->rect, @@ -970,7 +970,7 @@ void GLRenderer::DrawRenderPassQuad(DrawingFrame* frame, bool use_color_matrix = false; if (!quad->filters.IsEmpty()) { skia::RefPtr<SkImageFilter> filter = RenderSurfaceFilters::BuildImageFilter( - quad->filters, contents_texture->size()); + quad->filters, gfx::SizeF(contents_texture->size())); if (filter) { skia::RefPtr<SkColorFilter> cf; @@ -1291,7 +1291,7 @@ static gfx::QuadF GetDeviceQuadWithAntialiasingOnExteriorEdges( const gfx::QuadF& tile_quad, const gfx::QuadF* clip_region, const DrawQuad* quad) { - gfx::RectF tile_rect = gfx::RectF(quad->visible_rect); + auto tile_rect = gfx::RectF(quad->visible_rect); gfx::PointF bottom_right = tile_quad.p3(); gfx::PointF bottom_left = tile_quad.p4(); @@ -1354,7 +1354,7 @@ float GetTotalQuadError(const gfx::QuadF* clipped_quad, // correctly. This is necessary because we check the edges of this // quad against the expected left/right/top/bottom for anti-aliasing. void AlignQuadToBoundingBox(gfx::QuadF* clipped_quad) { - gfx::QuadF bounding_quad = gfx::QuadF(clipped_quad->BoundingBox()); + auto bounding_quad = gfx::QuadF(clipped_quad->BoundingBox()); gfx::QuadF best_rotation = *clipped_quad; float least_error_amount = GetTotalQuadError(clipped_quad, &bounding_quad); for (size_t i = 1; i < 4; ++i) { @@ -1533,7 +1533,7 @@ void GLRenderer::DrawSolidColorQuad(const DrawingFrame* frame, if (!device_transform.IsInvertible()) return; - gfx::QuadF local_quad = gfx::QuadF(gfx::RectF(tile_rect)); + auto local_quad = gfx::QuadF(gfx::RectF(tile_rect)); gfx::QuadF device_layer_quad; bool use_aa = false; @@ -1598,7 +1598,7 @@ void GLRenderer::DrawSolidColorQuad(const DrawingFrame* frame, // quad_rect. gfx::RectF centered_rect( gfx::PointF(-0.5f * tile_rect.width(), -0.5f * tile_rect.height()), - tile_rect.size()); + gfx::SizeF(tile_rect.size())); DrawQuadGeometry(frame, quad->shared_quad_state->quad_to_target_transform, centered_rect, uniforms.matrix_location); } else { @@ -1729,7 +1729,7 @@ void GLRenderer::DrawContentQuadAA(const DrawingFrame* frame, TexCoordPrecision tex_coord_precision = TexCoordPrecisionRequired( gl_, &highp_threshold_cache_, highp_threshold_min_, quad->texture_size); - gfx::QuadF local_quad = gfx::QuadF(gfx::RectF(tile_rect)); + auto local_quad = gfx::QuadF(gfx::RectF(tile_rect)); float edge[24]; SetupQuadForClippingAndAntialiasing(device_transform, quad, &aa_quad, clip_region, &local_quad, edge); @@ -1797,7 +1797,7 @@ void GLRenderer::DrawContentQuadAA(const DrawingFrame* frame, // it. This is why this centered rect is used and not the original quad_rect. gfx::RectF centered_rect( gfx::PointF(-0.5f * tile_rect.width(), -0.5f * tile_rect.height()), - tile_rect.size()); + gfx::SizeF(tile_rect.size())); DrawQuadGeometry(frame, quad->shared_quad_state->quad_to_target_transform, centered_rect, uniforms.matrix_location); } @@ -2110,7 +2110,7 @@ void GLRenderer::DrawYUVVideoQuad(const DrawingFrame* frame, // un-antialiased quad should have and which vertex this is and the float // quad passed in via uniform is the actual geometry that gets used to draw // it. This is why this centered rect is used and not the original quad_rect. - gfx::RectF tile_rect = gfx::RectF(quad->rect); + auto tile_rect = gfx::RectF(quad->rect); gl_->UniformMatrix3fv(yuv_matrix_location, 1, 0, yuv_to_rgb); gl_->Uniform3fv(yuv_adj_location, 1, yuv_adjust); diff --git a/cc/output/renderer_pixeltest.cc b/cc/output/renderer_pixeltest.cc index 949985a..76fb2c3 100644 --- a/cc/output/renderer_pixeltest.cc +++ b/cc/output/renderer_pixeltest.cc @@ -2638,15 +2638,16 @@ TYPED_TEST(SoftwareRendererPixelTest, PictureDrawQuadNonIdentityScale) { PictureDrawQuad* green_quad1 = pass->CreateAndAppendDrawQuad<PictureDrawQuad>(); - green_quad1->SetNew(top_right_green_shared_quad_state, green_rect1, - gfx::Rect(), green_rect1, gfx::RectF(green_rect1.size()), - green_rect1.size(), nearest_neighbor, texture_format, - green_rect1, 1.f, green_raster_source); + green_quad1->SetNew( + top_right_green_shared_quad_state, green_rect1, gfx::Rect(), green_rect1, + gfx::RectF(gfx::SizeF(green_rect1.size())), green_rect1.size(), + nearest_neighbor, texture_format, green_rect1, 1.f, green_raster_source); PictureDrawQuad* green_quad2 = pass->CreateAndAppendDrawQuad<PictureDrawQuad>(); green_quad2->SetNew(top_right_green_shared_quad_state, green_rect2, - gfx::Rect(), green_rect2, gfx::RectF(green_rect2.size()), + gfx::Rect(), green_rect2, + gfx::RectF(gfx::SizeF(green_rect2.size())), green_rect2.size(), nearest_neighbor, texture_format, green_rect2, 1.f, green_raster_source.Pass()); diff --git a/cc/output/software_renderer.cc b/cc/output/software_renderer.cc index b9b46eb..ea980a8 100644 --- a/cc/output/software_renderer.cc +++ b/cc/output/software_renderer.cc @@ -519,7 +519,7 @@ void SoftwareRenderer::DrawRenderPassQuad(const DrawingFrame* frame, SkBitmap filter_bitmap; if (!quad->filters.IsEmpty()) { skia::RefPtr<SkImageFilter> filter = RenderSurfaceFilters::BuildImageFilter( - quad->filters, content_texture->size()); + quad->filters, gfx::SizeF(content_texture->size())); // TODO(ajuma): Apply the filter in the same pass as the content where // possible (e.g. when there's no origin offset). See crbug.com/308201. filter_bitmap = ApplyImageFilter(filter.get(), quad, content); @@ -731,7 +731,7 @@ skia::RefPtr<SkShader> SoftwareRenderer::GetBackgroundFilterShader( skia::RefPtr<SkImageFilter> filter = RenderSurfaceFilters::BuildImageFilter( quad->background_filters, - gfx::Size(backdrop_bitmap.width(), backdrop_bitmap.height())); + gfx::SizeF(backdrop_bitmap.width(), backdrop_bitmap.height())); SkBitmap filter_backdrop_bitmap = ApplyImageFilter(filter.get(), quad, &backdrop_bitmap); diff --git a/cc/output/software_renderer_unittest.cc b/cc/output/software_renderer_unittest.cc index f587718..488cf34 100644 --- a/cc/output/software_renderer_unittest.cc +++ b/cc/output/software_renderer_unittest.cc @@ -187,26 +187,14 @@ TEST_F(SoftwareRendererTest, TileQuad) { 0); TileDrawQuad* inner_quad = root_render_pass->CreateAndAppendDrawQuad<TileDrawQuad>(); - inner_quad->SetNew(shared_quad_state, - inner_rect, - inner_rect, - inner_rect, - resource_cyan, - gfx::RectF(inner_size), - inner_size, - false, - false); + inner_quad->SetNew(shared_quad_state, inner_rect, inner_rect, inner_rect, + resource_cyan, gfx::RectF(gfx::SizeF(inner_size)), + inner_size, false, false); TileDrawQuad* outer_quad = root_render_pass->CreateAndAppendDrawQuad<TileDrawQuad>(); - outer_quad->SetNew(shared_quad_state, - outer_rect, - outer_rect, - outer_rect, - resource_yellow, - gfx::RectF(outer_size), - outer_size, - false, - false); + outer_quad->SetNew(shared_quad_state, outer_rect, outer_rect, outer_rect, + resource_yellow, gfx::RectF(gfx::SizeF(outer_size)), + outer_size, false, false); RenderPassList list; list.push_back(root_render_pass.Pass()); @@ -266,15 +254,9 @@ TEST_F(SoftwareRendererTest, TileQuadVisibleRect) { 0); TileDrawQuad* quad = root_render_pass->CreateAndAppendDrawQuad<TileDrawQuad>(); - quad->SetNew(shared_quad_state, - tile_rect, - tile_rect, - tile_rect, - resource_cyan, - gfx::RectF(tile_size), - tile_size, - false, - false); + quad->SetNew(shared_quad_state, tile_rect, tile_rect, tile_rect, + resource_cyan, gfx::RectF(gfx::SizeF(tile_size)), tile_size, + false, false); quad->visible_rect = visible_rect; RenderPassList list; diff --git a/cc/playback/display_item_list_unittest.cc b/cc/playback/display_item_list_unittest.cc index dc8fd14..c490bbf 100644 --- a/cc/playback/display_item_list_unittest.cc +++ b/cc/playback/display_item_list_unittest.cc @@ -44,7 +44,7 @@ TEST(DisplayItemListTest, SingleDrawingItem) { DisplayItemList::Create(layer_rect, settings); gfx::PointF offset(8.f, 9.f); - gfx::RectF recording_rect(offset, layer_rect.size()); + gfx::RectF recording_rect(offset, gfx::SizeF(layer_rect.size())); canvas = skia::SharePtr( recorder.beginRecording(gfx::RectFToSkRect(recording_rect))); canvas->translate(offset.x(), offset.y()); @@ -89,7 +89,7 @@ TEST(DisplayItemListTest, ClipItem) { DisplayItemList::Create(layer_rect, settings); gfx::PointF first_offset(8.f, 9.f); - gfx::RectF first_recording_rect(first_offset, layer_rect.size()); + gfx::RectF first_recording_rect(first_offset, gfx::SizeF(layer_rect.size())); canvas = skia::SharePtr( recorder.beginRecording(gfx::RectFToSkRect(first_recording_rect))); canvas->translate(first_offset.x(), first_offset.y()); @@ -103,7 +103,8 @@ TEST(DisplayItemListTest, ClipItem) { item2->SetNew(clip_rect, std::vector<SkRRect>()); gfx::PointF second_offset(2.f, 3.f); - gfx::RectF second_recording_rect(second_offset, layer_rect.size()); + gfx::RectF second_recording_rect(second_offset, + gfx::SizeF(layer_rect.size())); canvas = skia::SharePtr( recorder.beginRecording(gfx::RectFToSkRect(second_recording_rect))); canvas->translate(second_offset.x(), second_offset.y()); @@ -151,7 +152,7 @@ TEST(DisplayItemListTest, TransformItem) { DisplayItemList::Create(layer_rect, settings); gfx::PointF first_offset(8.f, 9.f); - gfx::RectF first_recording_rect(first_offset, layer_rect.size()); + gfx::RectF first_recording_rect(first_offset, gfx::SizeF(layer_rect.size())); canvas = skia::SharePtr( recorder.beginRecording(gfx::RectFToSkRect(first_recording_rect))); canvas->translate(first_offset.x(), first_offset.y()); @@ -166,7 +167,8 @@ TEST(DisplayItemListTest, TransformItem) { item2->SetNew(transform); gfx::PointF second_offset(2.f, 3.f); - gfx::RectF second_recording_rect(second_offset, layer_rect.size()); + gfx::RectF second_recording_rect(second_offset, + gfx::SizeF(layer_rect.size())); canvas = skia::SharePtr( recorder.beginRecording(gfx::RectFToSkRect(second_recording_rect))); canvas->translate(second_offset.x(), second_offset.y()); @@ -262,7 +264,7 @@ TEST(DisplayItemListTest, CompactingItems) { unsigned char pixels[4 * 100 * 100] = {0}; gfx::PointF offset(8.f, 9.f); - gfx::RectF recording_rect(offset, layer_rect.size()); + gfx::RectF recording_rect(offset, gfx::SizeF(layer_rect.size())); DisplayItemListSettings no_caching_settings; no_caching_settings.use_cached_picture = false; diff --git a/cc/playback/display_list_raster_source_unittest.cc b/cc/playback/display_list_raster_source_unittest.cc index 062f34a..ef3af71 100644 --- a/cc/playback/display_list_raster_source_unittest.cc +++ b/cc/playback/display_list_raster_source_unittest.cc @@ -263,7 +263,7 @@ TEST(DisplayListRasterSourceTest, RasterFullContents) { recording_source.get(), false); gfx::Size content_bounds( - gfx::ToCeiledSize(gfx::ScaleSize(layer_bounds, contents_scale))); + gfx::ScaleToCeiledSize(layer_bounds, contents_scale)); // Simulate drawing into different tiles at different offsets. int step_x = std::ceil(content_bounds.width() / raster_divisions); @@ -328,7 +328,7 @@ TEST(DisplayListRasterSourceTest, RasterPartialContents) { recording_source.get(), false); gfx::Size content_bounds( - gfx::ToCeiledSize(gfx::ScaleSize(layer_bounds, contents_scale))); + gfx::ScaleToCeiledSize(layer_bounds, contents_scale)); SkBitmap bitmap; bitmap.allocN32Pixels(content_bounds.width(), content_bounds.height()); @@ -424,7 +424,7 @@ TEST(DisplayListRasterSourceTest, RasterPartialClear) { recording_source.get(), false); gfx::Size content_bounds( - gfx::ToCeiledSize(gfx::ScaleSize(layer_bounds, contents_scale))); + gfx::ScaleToCeiledSize(layer_bounds, contents_scale)); SkBitmap bitmap; bitmap.allocN32Pixels(content_bounds.width(), content_bounds.height()); @@ -471,8 +471,8 @@ TEST(DisplayListRasterSourceTest, RasterPartialClear) { // We're going to playback from alpha(18) white rectangle into a smaller area // of the recording resulting in a smaller lighter white rectangle over a // darker white background rectangle. - playback_rect = gfx::Rect( - gfx::ToCeiledSize(gfx::ScaleSize(partial_bounds, contents_scale))); + playback_rect = + gfx::Rect(gfx::ScaleToCeiledSize(partial_bounds, contents_scale)); raster->PlaybackToCanvas(&canvas, raster_full_rect, playback_rect, contents_scale); @@ -505,7 +505,7 @@ TEST(DisplayListRasterSourceTest, RasterContentsTransparent) { DisplayListRasterSource::CreateFromDisplayListRecordingSource( recording_source.get(), false); gfx::Size content_bounds( - gfx::ToCeiledSize(gfx::ScaleSize(layer_bounds, contents_scale))); + gfx::ScaleToCeiledSize(layer_bounds, contents_scale)); gfx::Rect canvas_rect(content_bounds); canvas_rect.Inset(0, 0, -1, -1); diff --git a/cc/test/layer_test_common.cc b/cc/test/layer_test_common.cc index 8ed49a2..04c6166 100644 --- a/cc/test/layer_test_common.cc +++ b/cc/test/layer_test_common.cc @@ -29,11 +29,9 @@ static bool CanRectFBeSafelyRoundedToRect(const gfx::RectF& r) { return false; // Ensure that the values are actually integers. - if (gfx::ToFlooredPoint(r.origin()) == r.origin() && - gfx::ToFlooredSize(r.size()) == r.size()) - return true; - - return false; + gfx::RectF floored_rect(std::floor(r.x()), std::floor(r.y()), + std::floor(r.width()), std::floor(r.height())); + return floored_rect == r; } void LayerTestCommon::VerifyQuadsExactlyCoverRect(const QuadList& quads, diff --git a/cc/test/layer_tree_test.cc b/cc/test/layer_tree_test.cc index e2d19b0..5d37c73 100644 --- a/cc/test/layer_tree_test.cc +++ b/cc/test/layer_tree_test.cc @@ -803,8 +803,8 @@ void LayerTreeTest::SetupTree() { } gfx::Size root_bounds = layer_tree_host_->root_layer()->bounds(); - gfx::Size device_root_bounds = gfx::ToCeiledSize( - gfx::ScaleSize(root_bounds, layer_tree_host_->device_scale_factor())); + gfx::Size device_root_bounds = gfx::ScaleToCeiledSize( + root_bounds, layer_tree_host_->device_scale_factor()); layer_tree_host_->SetViewportSize(device_root_bounds); } diff --git a/cc/tiles/picture_layer_tiling.cc b/cc/tiles/picture_layer_tiling.cc index 29255d5..be8a794 100644 --- a/cc/tiles/picture_layer_tiling.cc +++ b/cc/tiles/picture_layer_tiling.cc @@ -74,12 +74,12 @@ PictureLayerTiling::PictureLayerTiling( has_eventually_rect_tiles_(false), all_tiles_done_(true) { DCHECK(!raster_source->IsSolidColor()); - gfx::Size content_bounds = gfx::ToCeiledSize( - gfx::ScaleSize(raster_source_->GetSize(), contents_scale)); + gfx::Size content_bounds = + gfx::ScaleToCeiledSize(raster_source_->GetSize(), contents_scale); gfx::Size tile_size = client_->CalculateTileSize(content_bounds); - DCHECK(!gfx::ToFlooredSize(gfx::ScaleSize(raster_source_->GetSize(), - contents_scale)).IsEmpty()) + DCHECK(!gfx::ScaleToFlooredSize(raster_source_->GetSize(), contents_scale) + .IsEmpty()) << "Tiling created with scale too small as contents become empty." << " Layer bounds: " << raster_source_->GetSize().ToString() << " Contents scale: " << contents_scale; @@ -211,7 +211,7 @@ void PictureLayerTiling::SetRasterSourceAndResize( raster_source_.swap(raster_source); gfx::Size new_layer_bounds = raster_source_->GetSize(); gfx::Size content_bounds = - gfx::ToCeiledSize(gfx::ScaleSize(new_layer_bounds, contents_scale_)); + gfx::ScaleToCeiledSize(new_layer_bounds, contents_scale_); gfx::Size tile_size = client_->CalculateTileSize(content_bounds); if (tile_size != tiling_data_.max_texture_size()) { diff --git a/cc/tiles/picture_layer_tiling_set_unittest.cc b/cc/tiles/picture_layer_tiling_set_unittest.cc index 28cc5ca..a8afd82 100644 --- a/cc/tiles/picture_layer_tiling_set_unittest.cc +++ b/cc/tiles/picture_layer_tiling_set_unittest.cc @@ -45,7 +45,7 @@ TEST(PictureLayerTilingSetTest, NoResources) { float contents_scale = 2.0; gfx::Size content_bounds( - gfx::ToCeiledSize(gfx::ScaleSize(layer_bounds, contents_scale))); + gfx::ScaleToCeiledSize(layer_bounds, contents_scale)); gfx::Rect content_rect(content_bounds); Region remaining(content_rect); @@ -239,7 +239,7 @@ class PictureLayerTilingSetTestWithResources : public testing::Test { float max_contents_scale = scale; gfx::Size content_bounds( - gfx::ToCeiledSize(gfx::ScaleSize(layer_bounds, max_contents_scale))); + gfx::ScaleToCeiledSize(layer_bounds, max_contents_scale)); gfx::Rect content_rect(content_bounds); Region remaining(content_rect); diff --git a/cc/tiles/picture_layer_tiling_unittest.cc b/cc/tiles/picture_layer_tiling_unittest.cc index a55f625..ec3b870 100644 --- a/cc/tiles/picture_layer_tiling_unittest.cc +++ b/cc/tiles/picture_layer_tiling_unittest.cc @@ -31,9 +31,8 @@ static gfx::Rect ViewportInLayerSpace( if (!transform.GetInverse(&inverse)) return gfx::Rect(); - gfx::RectF viewport_in_layer_space = MathUtil::ProjectClippedRect( - inverse, gfx::RectF(gfx::Point(0, 0), device_viewport)); - return ToEnclosingRect(viewport_in_layer_space); + return MathUtil::ProjectEnclosingClippedRect(inverse, + gfx::Rect(device_viewport)); } class TestablePictureLayerTiling : public PictureLayerTiling { @@ -504,7 +503,7 @@ TEST_F(PictureLayerTilingIteratorTest, IteratorCoversLayerBoundsBothScale) { float scale = 6.7f; gfx::Size bounds(800, 600); - gfx::Rect full_rect(gfx::ToCeiledSize(gfx::ScaleSize(bounds, scale))); + gfx::Rect full_rect(gfx::ScaleToCeiledSize(bounds, scale)); Initialize(gfx::Size(256, 512), 5.2f, bounds); VerifyTilesExactlyCoverRect(scale, full_rect); VerifyTilesExactlyCoverRect(scale, gfx::Rect(2014, 1579, 867, 1033)); diff --git a/cc/trees/layer_tree_host_common.cc b/cc/trees/layer_tree_host_common.cc index 3e8054e..071a772 100644 --- a/cc/trees/layer_tree_host_common.cc +++ b/cc/trees/layer_tree_host_common.cc @@ -271,8 +271,9 @@ static gfx::Rect TranslateRectToTargetSpace(const LayerImpl& ancestor_layer, ComputeChangeOfBasisTranslation(ancestor_layer, descendant_layer); if (direction == TRANSLATE_RECT_DIRECTION_TO_DESCENDANT) translation.Scale(-1.f); + gfx::RectF rect_f = gfx::RectF(rect); return gfx::ToEnclosingRect( - gfx::RectF(rect.origin() + translation, rect.size())); + gfx::RectF(rect_f.origin() + translation, rect_f.size())); } // Attempts to update the clip rects for the given layer. If the layer has a diff --git a/cc/trees/layer_tree_host_common_perftest.cc b/cc/trees/layer_tree_host_common_perftest.cc index fbb38d1..f326ec2 100644 --- a/cc/trees/layer_tree_host_common_perftest.cc +++ b/cc/trees/layer_tree_host_common_perftest.cc @@ -156,7 +156,7 @@ class BspTreePerfTest : public CalcDrawPropsTest { for (LayerImplList::iterator it = base_list.begin(); it != base_list.end(); ++it) { DrawPolygon* draw_polygon = - new DrawPolygon(NULL, gfx::RectF((*it)->bounds()), + new DrawPolygon(NULL, gfx::RectF(gfx::SizeF((*it)->bounds())), (*it)->draw_transform(), polygon_counter++); polygon_list.push_back(scoped_ptr<DrawPolygon>(draw_polygon)); } diff --git a/cc/trees/layer_tree_host_common_unittest.cc b/cc/trees/layer_tree_host_common_unittest.cc index f0ca935..c1f95d1 100644 --- a/cc/trees/layer_tree_host_common_unittest.cc +++ b/cc/trees/layer_tree_host_common_unittest.cc @@ -3692,14 +3692,14 @@ TEST_F(LayerTreeHostCommonScalingTest, LayerTransformsInHighDPI) { parent->draw_transform()); // Verify results of transformed parent rects - gfx::RectF parent_bounds(parent->bounds()); + gfx::RectF parent_bounds(gfx::SizeF(parent->bounds())); gfx::RectF parent_draw_rect = MathUtil::MapClippedRect(parent->draw_transform(), parent_bounds); gfx::RectF parent_screen_space_rect = MathUtil::MapClippedRect(parent->screen_space_transform(), parent_bounds); - gfx::RectF expected_parent_draw_rect(parent->bounds()); + gfx::RectF expected_parent_draw_rect(gfx::SizeF(parent->bounds())); expected_parent_draw_rect.Scale(device_scale_factor); EXPECT_FLOAT_RECT_EQ(expected_parent_draw_rect, parent_draw_rect); EXPECT_FLOAT_RECT_EQ(expected_parent_draw_rect, parent_screen_space_rect); @@ -3720,7 +3720,7 @@ TEST_F(LayerTreeHostCommonScalingTest, LayerTransformsInHighDPI) { // Verify results of transformed child and child_empty rects. They should // match. - gfx::RectF child_bounds(child->bounds()); + gfx::RectF child_bounds(gfx::SizeF(child->bounds())); gfx::RectF child_draw_rect = MathUtil::MapClippedRect(child->draw_transform(), child_bounds); @@ -3732,7 +3732,8 @@ TEST_F(LayerTreeHostCommonScalingTest, LayerTransformsInHighDPI) { gfx::RectF child_empty_screen_space_rect = MathUtil::MapClippedRect( child_empty->screen_space_transform(), child_bounds); - gfx::RectF expected_child_draw_rect(child->position(), child->bounds()); + gfx::RectF expected_child_draw_rect(child->position(), + gfx::SizeF(child->bounds())); expected_child_draw_rect.Scale(device_scale_factor); EXPECT_FLOAT_RECT_EQ(expected_child_draw_rect, child_draw_rect); EXPECT_FLOAT_RECT_EQ(expected_child_draw_rect, child_screen_space_rect); diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc index b785dbb..4b74ce1 100644 --- a/cc/trees/layer_tree_host_impl.cc +++ b/cc/trees/layer_tree_host_impl.cc @@ -460,7 +460,7 @@ void LayerTreeHostImpl::StartPageScaleAnimation( gfx::ScrollOffset scroll_total = active_tree_->TotalScrollOffset(); gfx::SizeF scaled_scrollable_size = active_tree_->ScrollableSize(); gfx::SizeF viewport_size = - active_tree_->InnerViewportContainerLayer()->bounds(); + gfx::SizeF(active_tree_->InnerViewportContainerLayer()->bounds()); // Easing constants experimentally determined. scoped_ptr<TimingFunction> timing_function = @@ -2261,7 +2261,7 @@ void LayerTreeHostImpl::SetViewportSize(const gfx::Size& device_viewport_size) { SetFullRootLayerDamage(); active_tree_->set_needs_update_draw_properties(); active_tree_->property_trees()->clip_tree.SetViewportClip( - gfx::RectF(device_viewport_size)); + gfx::RectF(gfx::SizeF(device_viewport_size))); } void LayerTreeHostImpl::SetDeviceScaleFactor(float device_scale_factor) { diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc index f388371..5c7447f 100644 --- a/cc/trees/layer_tree_host_impl_unittest.cc +++ b/cc/trees/layer_tree_host_impl_unittest.cc @@ -2316,8 +2316,8 @@ void LayerTreeHostImplTest::SetupMouseMoveAtWithDeviceScale( settings.scrollbar_animator = LayerTreeSettings::THINNING; gfx::Size viewport_size(300, 200); - gfx::Size device_viewport_size = gfx::ToFlooredSize( - gfx::ScaleSize(viewport_size, device_scale_factor)); + gfx::Size device_viewport_size = + gfx::ScaleToFlooredSize(viewport_size, device_scale_factor); gfx::Size content_size(1000, 1000); CreateHostImpl(settings, CreateOutputSurface()); @@ -3642,12 +3642,14 @@ TEST_F(LayerTreeHostImplTopControlsTest, TopControlsAspectRatio) { host_impl_->active_tree()->OuterViewportContainerLayer(); LayerImpl* inner_container = host_impl_->active_tree()->InnerViewportContainerLayer(); - EXPECT_EQ(gfx::Size(100, 100+25), inner_container->BoundsForScrolling()); + EXPECT_EQ(gfx::SizeF(100.f, 100.f + 25.f), + inner_container->BoundsForScrolling()); // Outer viewport should match inner's aspect ratio. The bounds are ceiled. float aspect_ratio = inner_container->BoundsForScrolling().width() / inner_container->BoundsForScrolling().height(); - gfx::Size expected = gfx::ToCeiledSize(gfx::SizeF(200, 200 / aspect_ratio)); + gfx::SizeF expected = + gfx::SizeF(gfx::ToCeiledSize(gfx::SizeF(200, 200 / aspect_ratio))); EXPECT_EQ(expected, outer_container->BoundsForScrolling()); EXPECT_EQ(expected, host_impl_->InnerViewportScrollLayer()->BoundsForScrolling()); @@ -4712,7 +4714,7 @@ TEST_F(LayerTreeHostImplTest, RootLayerScrollOffsetDelegation) { host_impl_->pending_tree()->PushPageScaleFromMainThread(1.f, 1.f, 1.f); CreateScrollAndContentsLayers(host_impl_->pending_tree(), new_size); host_impl_->ActivateSyncTree(); - EXPECT_EQ(new_size, scroll_watcher.scrollable_size()); + EXPECT_EQ(gfx::SizeF(new_size), scroll_watcher.scrollable_size()); // Tear down the LayerTreeHostImpl before the InputHandlerClient. host_impl_.reset(); @@ -5492,7 +5494,7 @@ class LayerTreeHostImplViewportCoveredTest : public LayerTreeHostImplTest { continue; const TextureDrawQuad* texture_quad = TextureDrawQuad::MaterialCast(quad); gfx::SizeF gutter_texture_size_pixels = gfx::ScaleSize( - gutter_texture_size_, host_impl_->device_scale_factor()); + gfx::SizeF(gutter_texture_size_), host_impl_->device_scale_factor()); EXPECT_EQ(texture_quad->uv_top_left.x(), texture_quad->rect.x() / gutter_texture_size_pixels.width()); EXPECT_EQ(texture_quad->uv_top_left.y(), @@ -5507,8 +5509,7 @@ class LayerTreeHostImplViewportCoveredTest : public LayerTreeHostImplTest { } gfx::Size DipSizeToPixelSize(const gfx::Size& size) { - return gfx::ToRoundedSize( - gfx::ScaleSize(size, host_impl_->device_scale_factor())); + return gfx::ScaleToRoundedSize(size, host_impl_->device_scale_factor()); } DrawQuad::Material gutter_quad_material_; @@ -6281,7 +6282,7 @@ TEST_F(LayerTreeHostImplTest, FarAwayQuadsDontNeedAA) { host_impl_->SetDeviceScaleFactor(device_scale_factor); gfx::Size root_size(2000, 1000); gfx::Size device_viewport_size = - gfx::ToCeiledSize(gfx::ScaleSize(root_size, device_scale_factor)); + gfx::ScaleToCeiledSize(root_size, device_scale_factor); host_impl_->SetViewportSize(device_viewport_size); host_impl_->CreatePendingTree(); diff --git a/cc/trees/layer_tree_host_unittest_damage.cc b/cc/trees/layer_tree_host_unittest_damage.cc index e2cccb5..20667bf 100644 --- a/cc/trees/layer_tree_host_unittest_damage.cc +++ b/cc/trees/layer_tree_host_unittest_damage.cc @@ -358,9 +358,9 @@ class LayerTreeHostScrollbarDamageTest : public LayerTreeHostDamageTest { root_layer->AddChild(scrollbar_layer); gfx::RectF content_rect(content_layer->position(), - content_layer->bounds()); + gfx::SizeF(content_layer->bounds())); gfx::RectF scrollbar_rect(scrollbar_layer->position(), - scrollbar_layer->bounds()); + gfx::SizeF(scrollbar_layer->bounds())); EXPECT_FALSE(content_rect.Intersects(scrollbar_rect)); LayerTreeHostDamageTest::SetupTree(); diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc index 61a64d6..4625c28 100644 --- a/cc/trees/layer_tree_impl.cc +++ b/cc/trees/layer_tree_impl.cc @@ -162,7 +162,7 @@ static void UpdateClipTreeForBoundsDeltaOnLayer(LayerImpl* layer, ClipNode* clip_node = clip_tree->Node(layer->clip_tree_index()); if (clip_node) { DCHECK_EQ(layer->id(), clip_node->owner_id); - gfx::Size bounds = layer->bounds(); + gfx::SizeF bounds = gfx::SizeF(layer->bounds()); if (clip_node->data.clip.size() != bounds) { clip_node->data.clip.set_size(bounds); clip_tree->set_needs_update(true); @@ -719,7 +719,7 @@ gfx::SizeF LayerTreeImpl::ScrollableSize() const { ? OuterViewportScrollLayer() : InnerViewportScrollLayer(); if (!root_scroll_layer || root_scroll_layer->children().empty()) - return gfx::Size(); + return gfx::SizeF(); gfx::SizeF content_size = root_scroll_layer->children()[0]->BoundsForScrolling(); diff --git a/cc/trees/layer_tree_impl_unittest.cc b/cc/trees/layer_tree_impl_unittest.cc index e00e7c8..acd9fcb 100644 --- a/cc/trees/layer_tree_impl_unittest.cc +++ b/cc/trees/layer_tree_impl_unittest.cc @@ -118,7 +118,7 @@ TEST_F(LayerTreeImplTest, UpdateViewportAndHitTest) { host_impl->active_tree()->SetRootLayer(root.Pass()); host_impl->UpdateNumChildrenAndDrawPropertiesForActiveTree(); EXPECT_EQ( - gfx::RectF(bounds), + gfx::RectF(gfx::SizeF(bounds)), host_impl->active_tree()->property_trees()->clip_tree.ViewportClip()); EXPECT_EQ(gfx::Rect(bounds), host_impl->RootLayer()->visible_rect_from_property_trees()); @@ -128,7 +128,7 @@ TEST_F(LayerTreeImplTest, UpdateViewportAndHitTest) { gfx::Point test_point(51, 51); host_impl->active_tree()->FindLayerThatIsHitByPoint(test_point); EXPECT_EQ( - gfx::RectF(new_bounds), + gfx::RectF(gfx::SizeF(new_bounds)), host_impl->active_tree()->property_trees()->clip_tree.ViewportClip()); EXPECT_EQ(gfx::Rect(new_bounds), host_impl->RootLayer()->visible_rect_from_property_trees()); @@ -1495,8 +1495,8 @@ TEST_F(LayerTreeImplTest, float device_scale_factor = 3.f; float page_scale_factor = 5.f; - gfx::Size scaled_bounds_for_root = gfx::ToCeiledSize( - gfx::ScaleSize(root->bounds(), device_scale_factor * page_scale_factor)); + gfx::Size scaled_bounds_for_root = gfx::ScaleToCeiledSize( + root->bounds(), device_scale_factor * page_scale_factor); host_impl().SetViewportSize(scaled_bounds_for_root); host_impl().SetDeviceScaleFactor(device_scale_factor); @@ -1954,8 +1954,8 @@ TEST_F(LayerTreeImplTest, SelectionBoundsForScaledLayers) { float device_scale_factor = 3.f; float page_scale_factor = 5.f; - gfx::Size scaled_bounds_for_root = gfx::ToCeiledSize( - gfx::ScaleSize(root->bounds(), device_scale_factor * page_scale_factor)); + gfx::Size scaled_bounds_for_root = gfx::ScaleToCeiledSize( + root->bounds(), device_scale_factor * page_scale_factor); host_impl().SetViewportSize(scaled_bounds_for_root); host_impl().SetDeviceScaleFactor(device_scale_factor); diff --git a/cc/trees/property_tree_builder.cc b/cc/trees/property_tree_builder.cc index 36d7468..a38ec2d 100644 --- a/cc/trees/property_tree_builder.cc +++ b/cc/trees/property_tree_builder.cc @@ -136,8 +136,9 @@ void AddClipNodeIfNeeded(const DataForRecursion<LayerType>& data_from_ancestor, transform_parent = data_for_children->transform_fixed_parent; } ClipNode node; - node.data.clip = gfx::RectF( - gfx::PointF() + layer->offset_to_transform_parent(), layer->bounds()); + node.data.clip = + gfx::RectF(gfx::PointF() + layer->offset_to_transform_parent(), + gfx::SizeF(layer->bounds())); node.data.transform_id = transform_parent->transform_tree_index(); node.data.target_id = data_for_children->effect_tree->Node(data_for_children->render_target) |