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

Unified Diff: cc/output/gl_renderer.cc

Issue 1357423009: gfx: Make conversions from Size to SizeF be explicit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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
Index: cc/output/gl_renderer.cc
diff --git a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc
index 71c79e468548e13d8387fc2611a1514812758316..a980433c313b2e60f5d5d6d7929cc2bc7646e4b5 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;
@@ -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 {
@@ -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);
}

Powered by Google App Engine
This is Rietveld 408576698