diff options
author | senorblanco <senorblanco@chromium.org> | 2016-01-27 13:48:01 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-01-27 21:49:17 +0000 |
commit | dfcb362e77eff630f887efd4491814f076e3b8a2 (patch) | |
tree | f4dcb14e5c83550a54d1b0289670293108ba9a80 /cc/layers/render_surface_impl_unittest.cc | |
parent | 99a1683e8e9ba8e86161705c7e86dd16fa21ab3e (diff) | |
download | chromium_src-dfcb362e77eff630f887efd4491814f076e3b8a2.zip chromium_src-dfcb362e77eff630f887efd4491814f076e3b8a2.tar.gz chromium_src-dfcb362e77eff630f887efd4491814f076e3b8a2.tar.bz2 |
cc cleanup: simplify mask_uv_scale and MaskUVRect().
RenderPassDrawQuad::MaskUVRect() computes the UV rect by scaling
the quad->rect() by mask_uv_scale, then dividing by quad->rect size.
However, RenderSurfaceImpl::AppendQuads() computes the mask UV scale
as quad->rect() size / mask size. So let's just take the quad->rect() size
out of mask_uv_scale in the first place, so we don't have to divide
it back out in MaskUVRect().
BUG=
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1647573002
Cr-Commit-Position: refs/heads/master@{#371879}
Diffstat (limited to 'cc/layers/render_surface_impl_unittest.cc')
-rw-r--r-- | cc/layers/render_surface_impl_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cc/layers/render_surface_impl_unittest.cc b/cc/layers/render_surface_impl_unittest.cc index e8eb264..aa68c15 100644 --- a/cc/layers/render_surface_impl_unittest.cc +++ b/cc/layers/render_surface_impl_unittest.cc @@ -111,7 +111,7 @@ TEST(RenderSurfaceLayerImplTest, AppendQuadsWithScaledMask) { const RenderPassDrawQuad* quad = RenderPassDrawQuad::MaterialCast(render_pass->quad_list.front()); - EXPECT_EQ(gfx::Vector2dF(1.f, 1.f), quad->mask_uv_scale); + EXPECT_EQ(gfx::Vector2dF(0.0005f, 0.0005f), quad->mask_uv_scale); EXPECT_EQ(gfx::Vector2dF(2.f, 2.f), quad->filters_scale); } |