Index: cc/output/software_renderer.cc |
diff --git a/cc/output/software_renderer.cc b/cc/output/software_renderer.cc |
index 79ac13fb6448aa984d510a1e99c7fefabafd5bce..8b2b7d1f3662fd93e2926ed2fd146f7048c0686a 100644 |
--- a/cc/output/software_renderer.cc |
+++ b/cc/output/software_renderer.cc |
@@ -102,8 +102,7 @@ const RendererCapabilitiesImpl& SoftwareRenderer::Capabilities() const { |
void SoftwareRenderer::BeginDrawingFrame(DrawingFrame* frame) { |
TRACE_EVENT0("cc", "SoftwareRenderer::BeginDrawingFrame"); |
- root_canvas_ = output_device_->BeginPaint( |
- gfx::ToEnclosingRect(frame->root_damage_rect)); |
+ root_canvas_ = output_device_->BeginPaint(frame->root_damage_rect); |
} |
void SoftwareRenderer::FinishDrawingFrame(DrawingFrame* frame) { |
@@ -254,7 +253,7 @@ void SoftwareRenderer::DoDrawQuad(DrawingFrame* frame, |
gfx::Transform quad_rect_matrix; |
QuadRectTransform(&quad_rect_matrix, |
quad->shared_quad_state->quad_to_target_transform, |
- quad->rect); |
+ gfx::RectF(quad->rect)); |
gfx::Transform contents_device_transform = |
frame->window_matrix * frame->projection_matrix * quad_rect_matrix; |
contents_device_transform.FlattenTo2d(); |
@@ -396,7 +395,7 @@ void SoftwareRenderer::DrawPictureQuad(const DrawingFrame* frame, |
void SoftwareRenderer::DrawSolidColorQuad(const DrawingFrame* frame, |
const SolidColorDrawQuad* quad) { |
gfx::RectF visible_quad_vertex_rect = MathUtil::ScaleRectProportional( |
- QuadVertexRect(), quad->rect, quad->visible_rect); |
+ QuadVertexRect(), gfx::RectF(quad->rect), gfx::RectF(quad->visible_rect)); |
current_paint_.setColor(quad->color); |
current_paint_.setAlpha(quad->shared_quad_state->opacity * |
SkColorGetA(quad->color)); |
@@ -421,11 +420,11 @@ void SoftwareRenderer::DrawTextureQuad(const DrawingFrame* frame, |
quad->uv_bottom_right), |
bitmap->width(), |
bitmap->height()); |
- gfx::RectF visible_uv_rect = |
- MathUtil::ScaleRectProportional(uv_rect, quad->rect, quad->visible_rect); |
+ gfx::RectF visible_uv_rect = MathUtil::ScaleRectProportional( |
+ uv_rect, gfx::RectF(quad->rect), gfx::RectF(quad->visible_rect)); |
SkRect sk_uv_rect = gfx::RectFToSkRect(visible_uv_rect); |
gfx::RectF visible_quad_vertex_rect = MathUtil::ScaleRectProportional( |
- QuadVertexRect(), quad->rect, quad->visible_rect); |
+ QuadVertexRect(), gfx::RectF(quad->rect), gfx::RectF(quad->visible_rect)); |
SkRect quad_rect = gfx::RectFToSkRect(visible_quad_vertex_rect); |
if (quad->y_flipped) |
@@ -478,9 +477,10 @@ void SoftwareRenderer::DrawTileQuad(const DrawingFrame* frame, |
DCHECK_EQ(GL_CLAMP_TO_EDGE, lock.wrap_mode()); |
gfx::RectF visible_tex_coord_rect = MathUtil::ScaleRectProportional( |
- quad->tex_coord_rect, quad->rect, quad->visible_rect); |
+ quad->tex_coord_rect, gfx::RectF(quad->rect), |
+ gfx::RectF(quad->visible_rect)); |
gfx::RectF visible_quad_vertex_rect = MathUtil::ScaleRectProportional( |
- QuadVertexRect(), quad->rect, quad->visible_rect); |
+ QuadVertexRect(), gfx::RectF(quad->rect), gfx::RectF(quad->visible_rect)); |
SkRect uv_rect = gfx::RectFToSkRect(visible_tex_coord_rect); |
current_paint_.setFilterQuality( |
@@ -505,8 +505,9 @@ void SoftwareRenderer::DrawRenderPassQuad(const DrawingFrame* frame, |
SkShader::TileMode content_tile_mode = WrapModeToTileMode(lock.wrap_mode()); |
SkRect dest_rect = gfx::RectFToSkRect(QuadVertexRect()); |
- SkRect dest_visible_rect = gfx::RectFToSkRect(MathUtil::ScaleRectProportional( |
- QuadVertexRect(), quad->rect, quad->visible_rect)); |
+ SkRect dest_visible_rect = gfx::RectFToSkRect( |
+ MathUtil::ScaleRectProportional(QuadVertexRect(), gfx::RectF(quad->rect), |
+ gfx::RectF(quad->visible_rect))); |
SkRect content_rect = SkRect::MakeWH(quad->rect.width(), quad->rect.height()); |
SkMatrix content_mat; |
@@ -712,7 +713,7 @@ skia::RefPtr<SkShader> SoftwareRenderer::GetBackgroundFilterShader( |
gfx::Transform quad_rect_matrix; |
QuadRectTransform(&quad_rect_matrix, |
quad->shared_quad_state->quad_to_target_transform, |
- quad->rect); |
+ gfx::RectF(quad->rect)); |
gfx::Transform contents_device_transform = |
frame->window_matrix * frame->projection_matrix * quad_rect_matrix; |
contents_device_transform.FlattenTo2d(); |