diff options
| author | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-22 04:37:31 +0000 |
|---|---|---|
| committer | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-22 04:37:31 +0000 |
| commit | c0392f4294b5e9530ef575544a6716d893cb45d7 (patch) | |
| tree | bde8e63bc41862a13d6ab41f2cedbfda69bd6a83 /cc | |
| parent | bfdaed16a6da3f5189291539d49964620bd39c91 (diff) | |
| download | chromium_src-c0392f4294b5e9530ef575544a6716d893cb45d7.zip chromium_src-c0392f4294b5e9530ef575544a6716d893cb45d7.tar.gz chromium_src-c0392f4294b5e9530ef575544a6716d893cb45d7.tar.bz2 | |
cc: Remove duplicate transform logic in GLRenderer
BUG=none
Review URL: https://codereview.chromium.org/243743003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@265157 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/output/gl_renderer.cc | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc index 51c83dd..9ce3731 100644 --- a/cc/output/gl_renderer.cc +++ b/cc/output/gl_renderer.cc @@ -202,7 +202,7 @@ GLRenderer::GLRenderer(RendererClient* client, int highp_threshold_min) : DirectRenderer(client, settings, output_surface, resource_provider), offscreen_framebuffer_id_(0), - shared_geometry_quad_(gfx::RectF(-0.5f, -0.5f, 1.0f, 1.0f)), + shared_geometry_quad_(QuadVertexRect()), gl_(output_surface->context_provider()->ContextGL()), context_support_(output_surface->context_provider()->ContextSupport()), texture_mailbox_deleter_(texture_mailbox_deleter), @@ -461,10 +461,8 @@ void GLRenderer::DrawDebugBorderQuad(const DrawingFrame* frame, // Use the full quad_rect for debug quads to not move the edges based on // partial swaps. gfx::Rect layer_rect = quad->rect; - gfx::Transform render_matrix = quad->quadTransform(); - render_matrix.Translate(0.5f * layer_rect.width() + layer_rect.x(), - 0.5f * layer_rect.height() + layer_rect.y()); - render_matrix.Scale(layer_rect.width(), layer_rect.height()); + gfx::Transform render_matrix; + QuadRectTransform(&render_matrix, quad->quadTransform(), layer_rect); GLRenderer::ToGLMatrix(&gl_matrix[0], frame->projection_matrix * render_matrix); GLC(gl_, @@ -799,11 +797,8 @@ scoped_ptr<ScopedResource> GLRenderer::GetBackgroundWithFilters( // Copy the readback pixels from device to the background texture for the // surface. gfx::Transform device_to_framebuffer_transform; - device_to_framebuffer_transform.Translate( - quad->rect.width() * 0.5f + quad->rect.x(), - quad->rect.height() * 0.5f + quad->rect.y()); - device_to_framebuffer_transform.Scale(quad->rect.width(), - quad->rect.height()); + QuadRectTransform( + &device_to_framebuffer_transform, gfx::Transform(), quad->rect); device_to_framebuffer_transform.PreconcatTransform( contents_device_transform_inverse); |