diff options
author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-25 03:29:29 +0000 |
---|---|---|
committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-25 03:29:29 +0000 |
commit | ed511b8dbf23c216aa87e11e9d49c1e69d82de60 (patch) | |
tree | ff1bdc0c8c74a0357c07847d4f3e9f32190930df /cc/quads/texture_draw_quad.cc | |
parent | 69fc57001ee3a1496830488254710865bc8f52b3 (diff) | |
download | chromium_src-ed511b8dbf23c216aa87e11e9d49c1e69d82de60.zip chromium_src-ed511b8dbf23c216aa87e11e9d49c1e69d82de60.tar.gz chromium_src-ed511b8dbf23c216aa87e11e9d49c1e69d82de60.tar.bz2 |
cc: Fix capitalization style in chromified files.
Style-only change.
Many already-chromified files missed a variable or function name
here and there. This grabs (hopefully) all of them.
For the record, I found these with:
git gs '[^a-zA-Z0-9_>\."][a-jl-z]\+[A-Z][A-Za-z0-9_]*\($\|[ !=;,\.^&*)"]\)'
R=enne
BUG=
Review URL: https://chromiumcodereview.appspot.com/12676029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190326 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/quads/texture_draw_quad.cc')
-rw-r--r-- | cc/quads/texture_draw_quad.cc | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/cc/quads/texture_draw_quad.cc b/cc/quads/texture_draw_quad.cc index 6b3958f..04c9511 100644 --- a/cc/quads/texture_draw_quad.cc +++ b/cc/quads/texture_draw_quad.cc @@ -91,13 +91,13 @@ bool TextureDrawQuad::PerformClipping() { static_cast<float>(quadTransform().matrix().getDouble(1, 3))); // Transform the rect by the scale and offset. - gfx::RectF rectF = rect; - rectF.Scale(x_scale, y_scale); - rectF += offset; + gfx::RectF rect_f = rect; + rect_f.Scale(x_scale, y_scale); + rect_f += offset; // Perform clipping and check to see if the result is empty. - gfx::RectF clippedRect = IntersectRects(rectF, clipRect()); - if (clippedRect.IsEmpty()) { + gfx::RectF clipped_rect = IntersectRects(rect_f, clipRect()); + if (clipped_rect.IsEmpty()) { rect = gfx::Rect(); uv_top_left = gfx::PointF(); uv_bottom_right = gfx::PointF(); @@ -106,15 +106,15 @@ bool TextureDrawQuad::PerformClipping() { // Create a new uv-rect by clipping the old one to the new bounds. gfx::Vector2dF uv_scale(uv_bottom_right - uv_top_left); - uv_scale.Scale(1.f / rectF.width(), 1.f / rectF.height()); + uv_scale.Scale(1.f / rect_f.width(), 1.f / rect_f.height()); uv_bottom_right = uv_top_left + gfx::ScaleVector2d( - clippedRect.bottom_right() - rectF.origin(), + clipped_rect.bottom_right() - rect_f.origin(), uv_scale.x(), uv_scale.y()); uv_top_left = uv_top_left + gfx::ScaleVector2d( - clippedRect.origin() - rectF.origin(), + clipped_rect.origin() - rect_f.origin(), uv_scale.x(), uv_scale.y()); @@ -125,10 +125,10 @@ bool TextureDrawQuad::PerformClipping() { if (vertex_opacity[0] != vertex_opacity[1] || vertex_opacity[0] != vertex_opacity[2] || vertex_opacity[0] != vertex_opacity[3]) { - const float x1 = (clippedRect.x() - rectF.x()) / rectF.width(); - const float y1 = (clippedRect.y() - rectF.y()) / rectF.height(); - const float x3 = (clippedRect.right() - rectF.x()) / rectF.width(); - const float y3 = (clippedRect.bottom() - rectF.y()) / rectF.height(); + const float x1 = (clipped_rect.x() - rect_f.x()) / rect_f.width(); + const float y1 = (clipped_rect.y() - rect_f.y()) / rect_f.height(); + const float x3 = (clipped_rect.right() - rect_f.x()) / rect_f.width(); + const float y3 = (clipped_rect.bottom() - rect_f.y()) / rect_f.height(); const float x1y1 = x1 * vertex_opacity[2] + (1.0f - x1) * vertex_opacity[1]; const float x1y3 = x1 * vertex_opacity[3] + (1.0f - x1) * vertex_opacity[0]; const float x3y1 = x3 * vertex_opacity[2] + (1.0f - x3) * vertex_opacity[1]; @@ -140,12 +140,12 @@ bool TextureDrawQuad::PerformClipping() { } // Move the clipped rectangle back into its space. - clippedRect -= offset; - clippedRect.Scale(1.0f / x_scale, 1.0f / y_scale); - rect = gfx::Rect(static_cast<int>(clippedRect.x() + 0.5f), - static_cast<int>(clippedRect.y() + 0.5f), - static_cast<int>(clippedRect.width() + 0.5f), - static_cast<int>(clippedRect.height() + 0.5f)); + clipped_rect -= offset; + clipped_rect.Scale(1.0f / x_scale, 1.0f / y_scale); + rect = gfx::Rect(static_cast<int>(clipped_rect.x() + 0.5f), + static_cast<int>(clipped_rect.y() + 0.5f), + static_cast<int>(clipped_rect.width() + 0.5f), + static_cast<int>(clipped_rect.height() + 0.5f)); return true; } |